From 725c22e776925cf4748e55aaa08fbbd7f9bfc39c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 Mar 2023 17:12:17 +0400
Subject: [PATCH 001/676] Update API scheme to layer 158.

---
 Telegram/Resources/tl/api.tl                  | 47 +++++++++--
 Telegram/SourceFiles/api/api_peer_photo.cpp   |  5 ++
 .../SourceFiles/data/data_chat_filters.cpp    | 84 ++++++++++++++++---
 Telegram/SourceFiles/data/data_chat_filters.h | 22 +++--
 4 files changed, 127 insertions(+), 31 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index eeb3dc749..c2ac7601d 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -110,7 +110,7 @@ storage.fileMp4#b3cea0e4 = storage.FileType;
 storage.fileWebp#1081464c = storage.FileType;
 
 userEmpty#d3bc4b7a id:long = User;
-user#8f97c628 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> = User;
+user#8f97c628 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> = User;
 
 userProfilePhotoEmpty#4f11bae1 = UserProfilePhoto;
 userProfilePhoto#82d1f706 flags:# has_video:flags.0?true personal:flags.2?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = UserProfilePhoto;
@@ -191,7 +191,7 @@ messageActionSetChatTheme#aa786345 emoticon:string = MessageAction;
 messageActionChatJoinedByRequest#ebbca3cb = MessageAction;
 messageActionWebViewDataSentMe#47dd8079 text:string data:string = MessageAction;
 messageActionWebViewDataSent#b4c38cb5 text:string = MessageAction;
-messageActionGiftPremium#aba0f5c6 currency:string amount:long months:int = MessageAction;
+messageActionGiftPremium#c83d6aec flags:# currency:string amount:long months:int crypto_currency:flags.0?string crypto_amount:flags.0?long = MessageAction;
 messageActionTopicCreate#d999256 flags:# title:string icon_color:int icon_emoji_id:flags.0?long = MessageAction;
 messageActionTopicEdit#c0944820 flags:# title:flags.0?string icon_emoji_id:flags.1?long closed:flags.2?Bool hidden:flags.3?Bool = MessageAction;
 messageActionSuggestProfilePhoto#57de635e photo:Photo = MessageAction;
@@ -737,7 +737,7 @@ auth.sentCodeTypeSms#c000bba2 length:int = auth.SentCodeType;
 auth.sentCodeTypeCall#5353e5a7 length:int = auth.SentCodeType;
 auth.sentCodeTypeFlashCall#ab03c6d9 pattern:string = auth.SentCodeType;
 auth.sentCodeTypeMissedCall#82006484 prefix:string length:int = auth.SentCodeType;
-auth.sentCodeTypeEmailCode#5a159841 flags:# apple_signin_allowed:flags.0?true google_signin_allowed:flags.1?true email_pattern:string length:int next_phone_login_date:flags.2?int = auth.SentCodeType;
+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;
@@ -1227,6 +1227,7 @@ payments.bankCardData#3e24e573 title:string open_urls:Vector<BankCardOpenUrl> =
 
 dialogFilter#7438f7e8 flags:# contacts:flags.0?true non_contacts:flags.1?true groups:flags.2?true broadcasts:flags.3?true bots:flags.4?true exclude_muted:flags.11?true exclude_read:flags.12?true exclude_archived:flags.13?true id:int title:string emoticon:flags.25?string pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> exclude_peers:Vector<InputPeer> = DialogFilter;
 dialogFilterDefault#363293ae = DialogFilter;
+dialogFilterCommunity#d8565037 flags:# id:int title:string emoticon:flags.25?string pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> = DialogFilter;
 
 dialogFilterSuggested#77744d4a filter:DialogFilter description:string = DialogFilterSuggested;
 
@@ -1524,6 +1525,21 @@ inlineBotWebView#b57295d5 text:string url:string = InlineBotWebView;
 
 readParticipantDate#4a4ff172 user_id:long date:int = ReadParticipantDate;
 
+inputCommunityDialogFilter#1ae107a1 filter_id:int = InputCommunity;
+
+exportedCommunityInvite#ebddc1aa flags:# title:string url:string peers:Vector<Peer> = ExportedCommunityInvite;
+
+communities.exportedCommunityInvite#6b97a8ea filter:DialogFilter invite:ExportedCommunityInvite = communities.ExportedCommunityInvite;
+
+communities.exportedInvites#ffd75fa7 invites:Vector<ExportedCommunityInvite> chats:Vector<Chat> users:Vector<User> = communities.ExportedInvites;
+
+communities.communityInviteAlready#c745ee07 filter_id:int missing_peers:Vector<Peer> already_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = communities.CommunityInvite;
+communities.communityInvite#3857da1 flags:# title:string emoticon:flags.0?string peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = communities.CommunityInvite;
+
+communities.communityUpdates#e74660b3 missing_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = communities.CommunityUpdates;
+
+bots.botInfo#e8a775b0 name:string about:string description:string = bots.BotInfo;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1555,6 +1571,7 @@ 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.resetLoginEmail#7e960193 phone_number:string phone_code_hash:string = auth.SentCode;
 
 account.registerDevice#ec86017a flags:# no_muted:flags.0?true token_type:int token:string app_sandbox:Bool secret:bytes other_uids:Vector<long> = Bool;
 account.unregisterDevice#6a0d3206 token_type:int token:string other_uids:Vector<long> = Bool;
@@ -1864,8 +1881,8 @@ updates.getState#edd4882a = updates.State;
 updates.getDifference#25939651 flags:# pts:int pts_total_limit:flags.0?int date:int qts:int = updates.Difference;
 updates.getChannelDifference#3173d78 flags:# force:flags.0?true channel:InputChannel filter:ChannelMessagesFilter pts:int limit:int = updates.ChannelDifference;
 
-photos.updateProfilePhoto#1c3d5956 flags:# fallback:flags.0?true id:InputPhoto = photos.Photo;
-photos.uploadProfilePhoto#93c9a51 flags:# fallback:flags.3?true file:flags.0?InputFile video:flags.1?InputFile video_start_ts:flags.2?double video_emoji_markup:flags.4?VideoSize = photos.Photo;
+photos.updateProfilePhoto#9e82039 flags:# fallback:flags.0?true bot:flags.1?InputUser id:InputPhoto = photos.Photo;
+photos.uploadProfilePhoto#388a3b5 flags:# fallback:flags.3?true bot:flags.5?InputUser file:flags.0?InputFile video:flags.1?InputFile video_start_ts:flags.2?double video_emoji_markup:flags.4?VideoSize = photos.Photo;
 photos.deletePhotos#87cf7f2f id:Vector<InputPhoto> = Vector<long>;
 photos.getUserPhotos#91cd32a8 user_id:InputUser offset:int max_id:long limit:int = photos.Photos;
 photos.uploadContactProfilePhoto#e14c4a71 flags:# suggest:flags.3?true save:flags.4?true user_id:InputUser file:flags.0?InputFile video:flags.1?InputFile video_start_ts:flags.2?double video_emoji_markup:flags.5?VideoSize = photos.Photo;
@@ -1968,8 +1985,10 @@ bots.setBotMenuButton#4504d54f user_id:InputUser button:BotMenuButton = Bool;
 bots.getBotMenuButton#9c60eb28 user_id:InputUser = BotMenuButton;
 bots.setBotBroadcastDefaultAdminRights#788464e1 admin_rights:ChatAdminRights = Bool;
 bots.setBotGroupDefaultAdminRights#925ec9ea admin_rights:ChatAdminRights = Bool;
-bots.setBotInfo#a365df7a flags:# lang_code:string about:flags.0?string description:flags.1?string = Bool;
-bots.getBotInfo#75ec12e6 lang_code:string = Vector<string>;
+bots.setBotInfo#10cf3123 flags:# bot:flags.2?InputUser lang_code:string name:flags.3?string about:flags.0?string description:flags.1?string = Bool;
+bots.getBotInfo#dcd914fd flags:# bot:flags.0?InputUser lang_code:string = bots.BotInfo;
+bots.reorderUsernames#9709b1c2 bot:InputUser order:Vector<string> = Bool;
+bots.toggleUsername#53ca973 bot:InputUser username:string active:Bool = Bool;
 
 payments.getPaymentForm#37148dbb flags:# invoice:InputInvoice theme_params:flags.0?DataJSON = payments.PaymentForm;
 payments.getPaymentReceipt#2478d1cc peer:InputPeer msg_id:int = payments.PaymentReceipt;
@@ -2033,7 +2052,6 @@ langpack.getLanguages#42c6978f lang_pack:string = Vector<LangPackLanguage>;
 langpack.getLanguage#6a596502 lang_pack:string lang_code:string = LangPackLanguage;
 
 folders.editPeerFolders#6847d0ab folder_peers:Vector<InputFolderPeer> = Updates;
-folders.deleteFolder#1c295881 folder_id:int = Updates;
 
 stats.getBroadcastStats#ab42441a flags:# dark:flags.0?true channel:InputChannel = stats.BroadcastStats;
 stats.loadAsyncGraph#621d5fa0 flags:# token:string x:flags.0?long = StatsGraph;
@@ -2041,4 +2059,15 @@ stats.getMegagroupStats#dcdf8607 flags:# dark:flags.0?true channel:InputChannel
 stats.getMessagePublicForwards#5630281b channel:InputChannel msg_id:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats;
 
-// LAYER 155
+communities.exportCommunityInvite#41fe69d9 community:InputCommunity title:string peers:Vector<InputPeer> = communities.ExportedCommunityInvite;
+communities.deleteExportedInvite#f96e4616 community:InputCommunity slug:string = Bool;
+communities.editExportedInvite#27140512 flags:# community:InputCommunity slug:string title:flags.1?string peers:flags.2?Vector<InputPeer> = ExportedCommunityInvite;
+communities.getExportedInvites#4688a39d community:InputCommunity = communities.ExportedInvites;
+communities.checkCommunityInvite#99ba9e5 slug:string = communities.CommunityInvite;
+communities.joinCommunityInvite#4eff927 slug:string peers:Vector<InputPeer> = Updates;
+communities.getCommunityUpdates#2956d635 community:InputCommunity = communities.CommunityUpdates;
+communities.joinCommunityUpdates#51d42216 community:InputCommunity peers:Vector<InputPeer> = Updates;
+communities.hideCommunityUpdates#d678baf community:InputCommunity = Bool;
+communities.leaveCommunity#35d9755f community:InputCommunity peers:Vector<InputPeer> = Updates;
+
+// LAYER 158
diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index 892ca1090..5056473d6 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -186,6 +186,7 @@ void PeerPhoto::updateSelf(
 		const auto usedFileReference = photo->fileReference();
 		_api.request(MTPphotos_UpdateProfilePhoto(
 			MTP_flags(0),
+			MTPInputUser(), // bot
 			photo->mtpInput()
 		)).done([=](const MTPphotos_Photo &result) {
 			result.match([&](const MTPDphotos_photo &data) {
@@ -252,6 +253,7 @@ void PeerPhoto::clear(not_null<PhotoData*> photo) {
 	if (self->userpicPhotoId() == photo->id) {
 		_api.request(MTPphotos_UpdateProfilePhoto(
 			MTP_flags(0),
+			MTPInputUser(), // bot
 			MTP_inputPhotoEmpty()
 		)).done([=](const MTPphotos_Photo &result) {
 			self->setPhoto(MTP_userProfilePhotoEmpty());
@@ -276,6 +278,7 @@ void PeerPhoto::clear(not_null<PhotoData*> photo) {
 		if (fallbackPhotoId && (*fallbackPhotoId) == photo->id) {
 			_api.request(MTPphotos_UpdateProfilePhoto(
 				MTP_flags(MTPphotos_UpdateProfilePhoto::Flag::f_fallback),
+				MTPInputUser(), // bot
 				MTP_inputPhotoEmpty()
 			)).send();
 			_session->storage().add(Storage::UserPhotosSetBack(
@@ -321,6 +324,7 @@ void PeerPhoto::set(not_null<PeerData*> peer, not_null<PhotoData*> photo) {
 	if (peer == _session->user()) {
 		_api.request(MTPphotos_UpdateProfilePhoto(
 			MTP_flags(0),
+			MTPInputUser(), // bot
 			photo->mtpInput()
 		)).done([=](const MTPphotos_Photo &result) {
 			result.match([&](const MTPDphotos_photo &data) {
@@ -370,6 +374,7 @@ void PeerPhoto::ready(
 			MTP_flags((file ? Flag::f_file : none)
 				| (videoSize ? Flag::f_video_emoji_markup : none)
 				| ((type == UploadType::Fallback) ? Flag::f_fallback : none)),
+			MTPInputUser(), // bot
 			file ? (*file) : MTPInputFile(),
 			MTPInputFile(), // video
 			MTPdouble(), // video_start_ts
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 02c308b38..fb0531c14 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -109,22 +109,54 @@ ChatFilter ChatFilter::FromTL(
 			{ never.begin(), never.end() });
 	}, [](const MTPDdialogFilterDefault &d) {
 		return ChatFilter();
+	}, [&](const MTPDdialogFilterCommunity &data) {
+		auto &&to_histories = ranges::views::transform([&](
+				const MTPInputPeer &data) {
+			const auto peer = data.match([&](const MTPDinputPeerUser &data) {
+				const auto user = owner->user(data.vuser_id().v);
+				user->setAccessHash(data.vaccess_hash().v);
+				return (PeerData*)user;
+			}, [&](const MTPDinputPeerChat &data) {
+				return (PeerData*)owner->chat(data.vchat_id().v);
+			}, [&](const MTPDinputPeerChannel &data) {
+				const auto channel = owner->channel(data.vchannel_id().v);
+				channel->setAccessHash(data.vaccess_hash().v);
+				return (PeerData*)channel;
+			}, [&](const MTPDinputPeerSelf &data) {
+				return (PeerData*)owner->session().user();
+			}, [&](const auto &data) {
+				return (PeerData*)nullptr;
+			});
+			return peer ? owner->history(peer).get() : nullptr;
+		}) | ranges::views::filter([](History *history) {
+			return history != nullptr;
+		}) | ranges::views::transform([](History *history) {
+			return not_null<History*>(history);
+		});
+		auto &&always = ranges::views::concat(
+			data.vinclude_peers().v
+		) | to_histories;
+		auto pinned = ranges::views::all(
+			data.vpinned_peers().v
+		) | to_histories | ranges::to_vector;
+		auto &&all = ranges::views::concat(always, pinned);
+		auto list = base::flat_set<not_null<History*>>{
+			all.begin(),
+			all.end()
+		};
+		return ChatFilter(
+			data.vid().v,
+			qs(data.vtitle()),
+			qs(data.vemoticon().value_or_empty()),
+			(Flag::Community
+				| (data.is_community_can_admin() ? Flag::Admin : Flag())),
+			std::move(list),
+			std::move(pinned),
+			{});
 	});
 }
 
 MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
-	using TLFlag = MTPDdialogFilter::Flag;
-	const auto flags = TLFlag(0)
-		| ((_flags & Flag::Contacts) ? TLFlag::f_contacts : TLFlag(0))
-		| ((_flags & Flag::NonContacts) ? TLFlag::f_non_contacts : TLFlag(0))
-		| ((_flags & Flag::Groups) ? TLFlag::f_groups : TLFlag(0))
-		| ((_flags & Flag::Channels) ? TLFlag::f_broadcasts : TLFlag(0))
-		| ((_flags & Flag::Bots) ? TLFlag::f_bots : TLFlag(0))
-		| ((_flags & Flag::NoMuted) ? TLFlag::f_exclude_muted : TLFlag(0))
-		| ((_flags & Flag::NoRead) ? TLFlag::f_exclude_read : TLFlag(0))
-		| ((_flags & Flag::NoArchived)
-			? TLFlag::f_exclude_archived
-			: TLFlag(0));
 	auto always = _always;
 	auto pinned = QVector<MTPInputPeer>();
 	pinned.reserve(_pinned.size());
@@ -137,13 +169,39 @@ MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	for (const auto &history : always) {
 		include.push_back(history->peer->input);
 	}
+	if (_flags & Flag::Community) {
+		using TLFlag = MTPDdialogFilterCommunity::Flag;
+		const auto flags = TLFlag::f_emoticon
+			| ((_flags & Flag::Admin)
+				? TLFlag::f_community_can_admin
+				: TLFlag(0));
+		return MTP_dialogFilterCommunity(
+			MTP_flags(flags),
+			MTP_int(replaceId ? replaceId : _id),
+			MTP_string(_title),
+			MTP_string(_iconEmoji),
+			MTP_vector<MTPInputPeer>(pinned),
+			MTP_vector<MTPInputPeer>(include));
+	}
+	using TLFlag = MTPDdialogFilter::Flag;
+	const auto flags = TLFlag::f_emoticon
+		| ((_flags & Flag::Contacts) ? TLFlag::f_contacts : TLFlag(0))
+		| ((_flags & Flag::NonContacts) ? TLFlag::f_non_contacts : TLFlag(0))
+		| ((_flags & Flag::Groups) ? TLFlag::f_groups : TLFlag(0))
+		| ((_flags & Flag::Channels) ? TLFlag::f_broadcasts : TLFlag(0))
+		| ((_flags & Flag::Bots) ? TLFlag::f_bots : TLFlag(0))
+		| ((_flags & Flag::NoMuted) ? TLFlag::f_exclude_muted : TLFlag(0))
+		| ((_flags & Flag::NoRead) ? TLFlag::f_exclude_read : TLFlag(0))
+		| ((_flags & Flag::NoArchived)
+			? TLFlag::f_exclude_archived
+			: TLFlag(0));
 	auto never = QVector<MTPInputPeer>();
 	never.reserve(_never.size());
 	for (const auto &history : _never) {
 		never.push_back(history->peer->input);
 	}
 	return MTP_dialogFilter(
-		MTP_flags(flags | TLFlag::f_emoticon),
+		MTP_flags(flags),
 		MTP_int(replaceId ? replaceId : _id),
 		MTP_string(_title),
 		MTP_string(_iconEmoji),
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index 4e2cf9cc0..96214f96a 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -22,15 +22,18 @@ class Session;
 
 class ChatFilter final {
 public:
-	enum class Flag : uchar {
-		Contacts    = 0x01,
-		NonContacts = 0x02,
-		Groups      = 0x04,
-		Channels    = 0x08,
-		Bots        = 0x10,
-		NoMuted     = 0x20,
-		NoRead      = 0x40,
-		NoArchived  = 0x80,
+	enum class Flag : ushort {
+		Contacts    = (1 << 0),
+		NonContacts = (1 << 1),
+		Groups      = (1 << 2),
+		Channels    = (1 << 3),
+		Bots        = (1 << 4),
+		NoMuted     = (1 << 5),
+		NoRead      = (1 << 6),
+		NoArchived  = (1 << 7),
+
+		Community   = (1 << 8),
+		Admin       = (1 << 9),
 	};
 	friend constexpr inline bool is_flag_type(Flag) { return true; };
 	using Flags = base::flags<Flag>;
@@ -54,6 +57,7 @@ public:
 	[[nodiscard]] QString title() const;
 	[[nodiscard]] QString iconEmoji() const;
 	[[nodiscard]] Flags flags() const;
+	[[nodiscard]] bool admin() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &always() const;
 	[[nodiscard]] const std::vector<not_null<History*>> &pinned() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &never() const;

From b7d9d549ff846382ccec6aadba2ec3c775d1a8ef Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 Mar 2023 20:27:16 +0400
Subject: [PATCH 002/676] Start filter share links management.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../Resources/icons/settings/folder_links.png | Bin 0 -> 467 bytes
 .../icons/settings/folder_links@2x.png        | Bin 0 -> 883 bytes
 .../icons/settings/folder_links@3x.png        | Bin 0 -> 1356 bytes
 Telegram/Resources/langs/lang.strings         |  25 +
 .../boxes/filters/edit_filter_box.cpp         | 202 +++-
 .../boxes/filters/edit_filter_box.h           |   3 +-
 .../boxes/filters/edit_filter_chats_list.cpp  |  14 +-
 .../boxes/filters/edit_filter_chats_list.h    |   1 +
 .../boxes/filters/edit_filter_links.cpp       | 871 ++++++++++++++++++
 .../boxes/filters/edit_filter_links.h         |  47 +
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   4 +
 Telegram/SourceFiles/boxes/peer_list_box.h    |   5 +
 .../boxes/peers/edit_peer_invite_link.cpp     |  10 +-
 .../boxes/peers/edit_peer_invite_link.h       |   7 +
 .../SourceFiles/data/data_chat_filters.cpp    | 105 ++-
 Telegram/SourceFiles/data/data_chat_filters.h |  32 +-
 Telegram/SourceFiles/settings/settings.style  |   1 +
 .../SourceFiles/settings/settings_folders.cpp |  87 +-
 19 files changed, 1347 insertions(+), 69 deletions(-)
 create mode 100644 Telegram/Resources/icons/settings/folder_links.png
 create mode 100644 Telegram/Resources/icons/settings/folder_links@2x.png
 create mode 100644 Telegram/Resources/icons/settings/folder_links@3x.png
 create mode 100644 Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
 create mode 100644 Telegram/SourceFiles/boxes/filters/edit_filter_links.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2419fa804..709a7290b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -173,6 +173,8 @@ PRIVATE
     boxes/filters/edit_filter_box.h
     boxes/filters/edit_filter_chats_list.cpp
     boxes/filters/edit_filter_chats_list.h
+    boxes/filters/edit_filter_links.cpp
+    boxes/filters/edit_filter_links.h
     boxes/peers/add_bot_to_chat_box.cpp
     boxes/peers/add_bot_to_chat_box.h
     boxes/peers/add_participants_box.cpp
diff --git a/Telegram/Resources/icons/settings/folder_links.png b/Telegram/Resources/icons/settings/folder_links.png
new file mode 100644
index 0000000000000000000000000000000000000000..da8497860bd8cd3ceacfbd7818e16a773899e398
GIT binary patch
literal 467
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%+}MzF~maf
z>6DFKEe<?wU%9wzg+#Trt)s1_55~#6Y}xSfE=&C3I02FG%!xD3?kcXh{We$7Xr_<Z
z&wrA-ukZhlx!${o<9E4G=B&QQJKp~;l!>TO`hM!>Hd~&<yVm92ZcBV&!6!D~<Fbi)
z*4JA5^Tjg9ANfpDxw7kG_`K))-gj#~-}KrlZO@%u;yg_Zar2(<wPh1mTO>X)P{egw
zsuqX-jm3+*JlJ;?2nt^<-J2`DHN@=7%NK8R8{|b;@2*<4qA4`Ape~Wc{>oMUn6QWQ
zeO5X4<t<#nWq3MU-{<Tbfq=|QjWT~0tT0=!y4dpZiw3ETMVFQ^TV9-a#$a9jm3NzT
zE}KkEU8%I|u*>>#C;y61{#Pp){R2-o>BY?OIO6Lar`)wb_R7On*G#1griD9oJmcrr
mnSa@Jhpoh9ubS=e)qmONRV;V*TIIb46ri52elF{r5}E)ed$2_S

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/folder_links@2x.png b/Telegram/Resources/icons/settings/folder_links@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..26dfa285efff645450e8e87a5b0874ec3bab64df
GIT binary patch
literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NE-AP12R9Fe^m@%p<F%*V<SFJ2;
z1hvz`#!5F}FBVqf0u%&Sp_{O<w6_pkfjh9V&<!YPCtQT5?|pX;gu$0dGULd-@FrE}
z%*mfW$vOYYOe&SMWCxNR_|JCWSG?=3)oS&6y;LdzdpsU@yWQb%h<6Gnw0u54nN0Tk
z{hxmtMqc6I1Qd(Ya5%hNE`BDzz2>*zfLkonnLsj`%xpH3i64*0a=GmH`{i=^!)tVS
z#K<f0!I>c@#8=({&15pucDrpf8bN5h!a;Ega(l_{XR}(Za=Dxt4u|!6Eu7wRcH{9_
z(AlJHHfv@hZ{Z~SL_EbG<L!3)dc7_d3r9A>iL;Y<nog%KYY69)PN%~S@Vq7L(1HkK
z-!g=}le0!bwG(`3t?x5#HX8v)(6zHT5hACEV&X;%@nkF%3dLga$*3Mrr_=p@=TXXw
zvWMuX3@3`MantE^KD`#i3CTppIknMf6oQ0uRcwGDr<7gWfz9o9!xKvElhz0MmKf@G
zyIKc}QB?-3-Y7P3q92574eFqQUv?x_R)ZFs^~RA6n9<W7F_jvQyqYV6JDX;+DZ<Ew
z<ZH#D8e`ZV#v7_8fbMKwEgf>(VuuaOaA(7bbM6uVgTcUnsegrx%3xwp?-6EiU?ZUe
zCRq{$XtI-&LWnHY`jOS-Ha_N@lCkK8pg{{A(E?hGs1^_?7&@kPMfW`Y`{dNL4$6p@
zqNt!bvWdhum7)SvDiw;r`FvJ$YdiS#dcA73I-k#3q1MN4v>urqBC3b}MEIT(z*egj
z6*=y4E@>Y$r?mzL4K&%gWfF;2VSIuh!^tV4*zvCNG~D#)UOE(tUvIcSDSK=kRb2Uk
zF_$x@#6fAXV}?f|s;(dAPeH1teB!w4O%yhaL0A<h;)$hGOup@7SuKLIbNQVRrE01<
z!gh#p@=mmXbMZHf+*RWG7!Ccy>ZkmY3cI6;f3gF~4*b|1_zNQzqDTLv`#Asr002ov
JPDHLkV1gwNgiZhe

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/folder_links@3x.png b/Telegram/Resources/icons/settings/folder_links@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fef135b0dbd2215849e7011f6c91eac4e4905b5c
GIT binary patch
literal 1356
zcmY*ZeK->c7~hA_xy59uNo}*CO_-0CL#(hVcI+{940CSdlxZP7DTlHf))bY{CGvUq
zbiQXLjQLzi4BIZbp6)C{sHt<Mn}6<}-rw_kfA7~n@B7Eg52BKx5CjAO06_gIJ~XXT
zwrBv-dX*4kq7~q28u>8b-stXmZQ}ENxIZf}5P;Lh1^^&00id%rq9sC0003M81c0>)
z+^SW8{_9dI!2icvgM|dYHvoW6yT1=9Bwlx^^s&7i$!t))EtZLD;_4b1rR_kYB}Pb?
z@JAhEWT;0@cuZfZc_R{S8jHH}ljVW%4h(uxs{Z8LFLw2;QKzH|_Yhr;8Xk<grEb<9
z8YQP%zs!6N`VxfwD|qW}i*t#IiP6!sZ-mhd#*Ef(3ul*?m*?l}%O1IiRVvlo+}!Bs
z=yRjbuP*70xWFfcGje%rXXnSYHQLT#s&O$Mk58WGQL?xh86Q_y3FOr$JdsGm<LPf+
z=o<Rlcv>p;fgsE+o12@tOeTt~eE(i1llAxaZ*Fc53=A|h;4ZG*IKV;H5WS5F+`P-0
z^E$4st`QLt?bprC&8w=a;BYwV=$N~c6R7%eM^jU<y~4Y#rR6)ksI@hO!LS4kFK1un
zH!IJ!8jdIE2YGsW22!bC*Y)b1yKrGg`o1^Bsqyvo_IPl^ix*7&kX&6ybY9C{u~>OL
zByu1t3mA;G##QA#v|a_C(wv^-a5%)lGw8aYoKMzl!_C0?2YuUYi6@9eB9FJV)x^X^
zSy@@q;S=|!r^7O4#>Pw>T9kH*gP4=qd!Mmp^D?dGHYAiay2$b&%a!%kw^&`K(WD0d
zDiVdME+M@16sxOEG4b*7g=u$k-5sYqZQR*0sHekS>VV$-oi{Za%`oJ%jX=?x&ZMqO
zB$7<ag-|kiP<ttfgv4goUgftuO&^+^q+^e{G<!>3yu9`byo%-*7VdX<6Ti(4?4#--
zl~8?tE*238fJb%I*4kV(uz)K{h*0;l0)kE^o5gamgT)V7E(S<Z?FJRG&%=ul(4i?E
zg+fu1iv<am0!&G|)W25Jq?G-X;cB#1pLyAN=LS>1J#zZueP8)UT&C`V8uClgnf$<d
zX8jz=-=_;%S!LZq2p0Rk$3;q6G&if9G4=<FkPk7Gn@MZrD<KFxzvMjZaYGQ7v|}$k
zF)EkkfQd{fR_zyq{|Ps=JB0fIQceREOdNA-%_~T?t<>0ioeJ5wL$5>jT0k5-@8&{p
z<6+x7TP5{Ov(lbO7#tHFR(|UiJVxs3lt#(1^$*`21glcw3pX&QB8QSMGfYpK<do*6
z1e2s~dL>}o#qIQb#?ec8%&DoVM~-n&U(_y;6ReTI89C^PyzViivli!vy@_}JxvxOi
zEHxdIiOrw9-LvgT-0t-fnWO((GY4oSgE3q&8){GpyJgXzwY0RvPr1%({mjda`16WA
zm!2UXA0MBY5mdIdwW-x=GMUV`6?B)DmiE4_S+Djkf7MlJh-v>L?wixE2ZjgNnhbF-
zQ4`PZKkHELN-3B118|+m37_a)3@~R==9?5W(|9FXDf$gtPy$l%yj0cbP?&Jz1Y!hm
zPFw+UCOO_nGQBfiLF<_|dXdPFT1ygNb6Jc-V++82YPBq?QTHohW!%)o;tdWBNj=oP
zL7S;_P{ynuk9~p~Jo6#U$B_LYnC@`&i5uUzaN(L@Np_%k%qCK>uc6u**!94pTYhZu
zNPr19XM|xT;?Dg(^7?h66FBx&QPFmG-&sEn@C#(Uvs*FuNPeUuybJHy`egpTRG)i?
HW3vARc8g%i

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c10c0ca3c..e694cc160 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3541,6 +3541,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_toast_add" = "{chat} added to {folder} folder";
 "lng_filters_toast_remove" = "{chat} removed from {folder} folder";
 
+"lng_filters_link" = "Invite Link";
+"lng_filters_link_create" = "Share Folder";
+"lng_filters_link_add" = "Add Link";
+"lng_filters_link_cant" = "You can only share folders that have several explicit chats selected, no general chat types and no exclusions.";
+"lng_filters_link_about" = "Share access to some of this folder's groups and channels with others.";
+"lng_filters_link_title" = "Share Folder";
+"lng_filters_link_select" = "Select the chats you want to share with the link.";
+"lng_filters_by_link_title" = "Add Folder";
+"lng_filters_by_link_sure" = "Do you want to add a new chat folder {folder} and join its groups and channels?";
+"lng_filters_by_link_join#one" = "{count} chat to join";
+"lng_filters_by_link_join#other" = "{count} chats to join";
+"lng_filters_by_link_add" = "Add {folder}";
+"lng_filters_by_link_more" = "Add Chats to Folder";
+"lng_filters_by_link_more_sure" = "Do you want to join chats and add them to your folder {folder}?";
+"lng_filters_by_link_about" = "You can deselect the chats you don't want to join.";
+"lng_filters_by_link_join_button" = "Join Chats";
+"lng_filters_by_link_remove" = "Remove Folder";
+"lng_filters_by_link_remove_sure" = "Do you want to quit the chats you joined when added the folder {folder}?";
+"lng_filters_by_link_quit#one" = "{count} chat to quit";
+"lng_filters_by_link_quit#other" = "{count} chats to quit";
+"lng_filters_by_link_select" = "Select All";
+"lng_filters_by_link_deselect" = "Deselect All";
+"lng_filters_by_link_remove_button" = "Remove Folder";
+"lng_filters_by_link_quit_button" = "Remove Folder and Chats";
+
 "lng_chat_theme_change" = "Change colors";
 "lng_chat_theme_none" = "No\nTheme";
 "lng_chat_theme_apply" = "Apply Theme";
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index e8fd6a843..26a0a6d31 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -8,20 +8,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/filters/edit_filter_box.h"
 
 #include "boxes/filters/edit_filter_chats_list.h"
+#include "boxes/filters/edit_filter_links.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_options.h"
+#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/effects/panel_animation.h"
 #include "ui/filter_icons.h"
 #include "ui/filter_icon_panel.h"
 #include "ui/painter.h"
+#include "data/data_channel.h"
 #include "data/data_chat_filters.h"
 #include "data/data_peer.h"
 #include "data/data_peer_values.h" // Data::AmPremiumValue.
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "settings/settings_common.h"
@@ -37,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_window.h"
 #include "styles/style_chat.h"
+#include "styles/style_menu_icons.h"
 
 namespace {
 
@@ -499,6 +505,24 @@ void CreateIconSelector(
 	return QString();
 }
 
+not_null<Ui::SettingsButton*> AddToggledButton(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<bool> shown,
+		rpl::producer<QString> text,
+		const style::SettingsButton &st,
+		IconDescriptor &&descriptor) {
+	const auto toggled = container->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			container,
+			CreateButton(
+				container,
+				std::move(text),
+				st,
+				std::move(descriptor)))
+	)->toggleOn(std::move(shown), anim::type::instant)->setDuration(0);
+	return toggled->entity();
+}
+
 [[nodiscard]] QString TrimDefaultTitle(const QString &title) {
 	return (title.size() <= kMaxFilterTitleLength) ? title : QString();
 }
@@ -509,7 +533,12 @@ void EditFilterBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionController*> window,
 		const Data::ChatFilter &filter,
-		Fn<void(const Data::ChatFilter &)> doneCallback) {
+		Fn<void(const Data::ChatFilter &)> doneCallback,
+		Fn<void(
+			const Data::ChatFilter &data,
+			Fn<void(Data::ChatFilter)> next)> saveAnd) {
+	using namespace rpl::mappers;
+
 	const auto creating = filter.title().isEmpty();
 	box->setWidth(st::boxWideWidth);
 	box->setTitle(creating ? tr::lng_filters_new() : tr::lng_filters_edit());
@@ -521,8 +550,27 @@ void EditFilterBox(
 		box->closeBox();
 	}, box->lifetime());
 
-	using State = rpl::variable<Data::ChatFilter>;
-	const auto data = box->lifetime().make_state<State>(filter);
+	struct State {
+		rpl::variable<Data::ChatFilter> rules;
+		rpl::variable<std::vector<Data::ChatFilterLink>> links;
+		rpl::variable<bool> hasLinks;
+		rpl::variable<bool> community;
+	};
+	const auto owner = &window->session().data();
+	const auto state = box->lifetime().make_state<State>(State{
+		.rules = filter,
+		.community = filter.community(),
+	});
+	state->links = owner->chatsFilters().communityLinks(filter.id()),
+	state->hasLinks = state->links.value() | rpl::map([=](const auto &v) {
+		return !v.empty();
+	});
+	if (!state->community.current()) {
+		state->community = state->hasLinks.value() | rpl::filter(
+			_1
+		) | rpl::take(1);
+	}
+	const auto data = &state->rules;
 
 	const auto content = box->verticalLayout();
 	const auto name = content->add(
@@ -604,24 +652,123 @@ void EditFilterBox(
 	AddDividerText(content, tr::lng_filters_include_about());
 	AddSkip(content);
 
-	AddSubsectionTitle(content, tr::lng_filters_exclude());
+	auto excludeWrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content))
+	)->setDuration(0);
+	excludeWrap->toggleOn(state->community.value() | rpl::map(!_1));
+	const auto excludeInner = excludeWrap->entity();
+
+	AddSubsectionTitle(excludeInner, tr::lng_filters_exclude());
 
 	const auto excludeAdd = AddButton(
-		content,
+		excludeInner,
 		tr::lng_filters_remove_chats(),
 		st::settingsButtonActive,
 		{ &st::settingsIconRemove, 0, IconType::Round, &st::windowBgActive });
 
 	const auto exclude = SetupChatsPreview(
-		content,
+		excludeInner,
 		data,
 		updateDefaultTitle,
 		kExcludeTypes,
 		&Data::ChatFilter::never);
 
-	AddSkip(content);
-	AddDividerText(content, tr::lng_filters_exclude_about());
+	AddSkip(excludeInner);
+	AddDividerText(excludeInner, tr::lng_filters_exclude_about());
+	AddSkip(excludeInner);
 
+	const auto collect = [=]() -> std::optional<Data::ChatFilter> {
+		const auto title = name->getLastText().trimmed();
+		const auto rules = data->current();
+		const auto result = Data::ChatFilter(
+			rules.id(),
+			title,
+			rules.iconEmoji(),
+			rules.flags(),
+			rules.always(),
+			rules.pinned(),
+			rules.never());
+		if (title.isEmpty()) {
+			name->showError();
+			return {};
+		} else if (!(rules.flags() & kTypes) && rules.always().empty()) {
+			window->window().showToast(tr::lng_filters_empty(tr::now));
+			return {};
+		} else if ((rules.flags() == (kTypes | Flag::NoArchived))
+			&& rules.always().empty()
+			&& rules.never().empty()) {
+			window->window().showToast(tr::lng_filters_default(tr::now));
+			return {};
+		}
+		return result;
+	};
+
+	AddSubsectionTitle(content, tr::lng_filters_link());
+
+	if (filter.community()) {
+		window->session().data().chatsFilters().reloadCommunityLinks(
+			filter.id());
+	}
+
+	const auto createLink = AddToggledButton(
+		content,
+		state->hasLinks.value() | rpl::map(!rpl::mappers::_1),
+		tr::lng_filters_link_create(),
+		st::settingsButtonActive,
+		{ &st::settingsFolderShareIcon, 0, IconType::Simple });
+	const auto addLink = AddToggledButton(
+		content,
+		state->hasLinks.value(),
+		tr::lng_group_invite_add(),
+		st::settingsButtonActive,
+		{ &st::settingsIconAdd, 0, IconType::Round, &st::windowBgActive });
+
+	SetupFilterLinks(
+		content,
+		window,
+		state->links.value(),
+		[=] { return collect().value_or(Data::ChatFilter()); });
+
+	rpl::merge(
+		createLink->clicks(),
+		addLink->clicks()
+	) | rpl::filter(
+		(rpl::mappers::_1 == Qt::LeftButton)
+	) | rpl::start_with_next([=](Qt::MouseButton button) {
+		const auto result = collect();
+		if (!result || !GoodForExportFilterLink(window, *result)) {
+			return;
+		}
+		const auto shared = CollectFilterLinkChats(*result);
+		if (shared.empty()) {
+			// langs
+			Ui::ShowMultilineToast({
+				.parentOverride = Window::Show(window).toastParent(),
+				.text = { tr::lng_filters_link_cant(tr::now) },
+			});
+			return;
+		}
+		saveAnd(*result, crl::guard(box, [=](Data::ChatFilter updated) {
+			box->setTitle(tr::lng_filters_edit());
+			nameEditing->custom = true;
+
+			*data = updated;
+			const auto id = updated.id();
+			state->links = owner->chatsFilters().communityLinks(id);
+			ExportFilterLink(id, shared, [=](Data::ChatFilterLink link) {
+				Expects(link.id == id);
+
+				window->show(ShowLinkBox(window, updated, link));
+			});
+		}));
+	}, createLink->lifetime());
+
+	AddSkip(content);
+	AddDividerText(content, tr::lng_filters_link_about());
+
+	const auto show = std::make_shared<Ui::BoxShow>(box);
 	const auto refreshPreviews = [=] {
 		include->updateData(
 			data->current().flags() & kTypes,
@@ -634,7 +781,7 @@ void EditFilterBox(
 		EditExceptions(
 			window,
 			box,
-			kTypes,
+			kTypes | (state->community.current() ? Flag::Community : Flag()),
 			data,
 			updateDefaultTitle,
 			refreshPreviews);
@@ -650,32 +797,12 @@ void EditFilterBox(
 	});
 
 	const auto save = [=] {
-		const auto title = name->getLastText().trimmed();
-		const auto rules = data->current();
-		const auto result = Data::ChatFilter(
-			rules.id(),
-			title,
-			rules.iconEmoji(),
-			rules.flags(),
-			rules.always(),
-			rules.pinned(),
-			rules.never());
-		if (title.isEmpty()) {
-			name->showError();
-			return;
-		} else if (!(rules.flags() & kTypes) && rules.always().empty()) {
-			window->window().showToast(tr::lng_filters_empty(tr::now));
-			return;
-		} else if ((rules.flags() == (kTypes | Flag::NoArchived))
-			&& rules.always().empty()
-			&& rules.never().empty()) {
-			window->window().showToast(tr::lng_filters_default(tr::now));
-			return;
+		if (const auto result = collect()) {
+			box->closeBox();
+			doneCallback(*result);
 		}
-		box->closeBox();
-
-		doneCallback(result);
 	};
+
 	box->addButton(
 		creating ? tr::lng_filters_create_button() : tr::lng_settings_save(),
 		save);
@@ -707,9 +834,16 @@ void EditExistingFilter(
 			tl
 		)).send();
 	};
+	const auto saveAnd = [=](
+			const Data::ChatFilter &data,
+			Fn<void(Data::ChatFilter)> next) {
+		doneCallback(data);
+		next(data);
+	};
 	window->window().show(Box(
 		EditFilterBox,
 		window,
 		*i,
-		crl::guard(session, doneCallback)));
+		crl::guard(session, doneCallback),
+		crl::guard(session, saveAnd)));
 }
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.h b/Telegram/SourceFiles/boxes/filters/edit_filter_box.h
index 43b97adb1..695dbbe92 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.h
@@ -21,7 +21,8 @@ void EditFilterBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Window::SessionController*> window,
 	const Data::ChatFilter &filter,
-	Fn<void(const Data::ChatFilter &)> doneCallback);
+	Fn<void(const Data::ChatFilter &)> doneCallback,
+	Fn<void(const Data::ChatFilter &, Fn<void(Data::ChatFilter)>)> saveAnd);
 
 void EditExistingFilter(
 	not_null<Window::SessionController*> window,
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index e1aacddf9..ae50f0bcc 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -343,9 +343,10 @@ EditFilterChatsListController::EditFilterChatsListController(
 , _session(session)
 , _title(std::move(title))
 , _peers(peers)
-, _options(options)
+, _options(options & ~Flag::Community)
 , _selected(selected)
-, _limit(Limit(session)) {
+, _limit(Limit(session))
+, _community(options & Flag::Community) {
 }
 
 Main::Session &EditFilterChatsListController::session() const {
@@ -353,8 +354,11 @@ Main::Session &EditFilterChatsListController::session() const {
 }
 
 int EditFilterChatsListController::selectedTypesCount() const {
-	Expects(_typesDelegate != nullptr);
+	Expects(_community || _typesDelegate != nullptr);
 
+	if (_community) {
+		return 0;
+	}
 	auto result = 0;
 	for (auto i = 0; i != _typesDelegate->peerListFullRowsCount(); ++i) {
 		if (_typesDelegate->peerListRowAt(i)->checked()) {
@@ -396,7 +400,9 @@ bool EditFilterChatsListController::handleDeselectForeignRow(
 
 void EditFilterChatsListController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	delegate()->peerListSetAboveWidget(prepareTypesList());
+	if (!_community) {
+		delegate()->peerListSetAboveWidget(prepareTypesList());
+	}
 
 	const auto count = int(_peers.size());
 	const auto rows = std::make_unique<std::optional<ExceptionRow>[]>(count);
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
index f6a658672..b752fb739 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
@@ -75,6 +75,7 @@ private:
 	Flags _options;
 	Flags _selected;
 	int _limit = 0;
+	bool _community = false;
 
 	Fn<void(PeerListRowId)> _deselectOption;
 
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
new file mode 100644
index 000000000..5a6a6fa72
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -0,0 +1,871 @@
+/*
+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/filters/edit_filter_links.h"
+
+#include "apiwrap.h"
+#include "boxes/peers/edit_peer_invite_link.h" // InviteLinkQrBox.
+#include "boxes/peer_list_box.h"
+#include "data/data_channel.h"
+#include "data/data_chat_filters.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/invite_link_buttons.h"
+#include "ui/controls/invite_link_label.h"
+#include "ui/toasts/common_toasts.h"
+#include "ui/widgets/input_fields.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/painter.h"
+#include "window/window_session_controller.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+#include <xxhash.h>
+
+namespace {
+
+constexpr auto kMaxLinkTitleLength = 32;
+
+using InviteLinkData = Data::ChatFilterLink;
+class Row;
+
+enum class Color {
+	Permanent,
+
+	Count,
+};
+
+struct InviteLinkAction {
+	enum class Type {
+		Copy,
+		Share,
+		Edit,
+		Delete,
+	};
+	QString link;
+	Type type = Type::Copy;
+};
+
+[[nodiscard]] std::optional<QString> ErrorForSharing(
+		not_null<History*> history) {
+	const auto peer = history->peer;
+	if (const auto user = peer->asUser()) { // langs
+		return user->isBot()
+			? u"you can't share chats with bots"_q
+			: u"you can't share private chats"_q;
+	} else if (const auto channel = history->peer->asChannel()) {
+		if (!channel->canHaveInviteLink()) {
+			return u"you can't invite others here"_q;
+		}
+		return std::nullopt;
+	} else {
+		return u"you can't share this :("_q;
+	}
+}
+
+void ChatFilterLinkBox(
+		not_null<Ui::GenericBox*> box,
+		Data::ChatFilterLink data) {
+	using namespace rpl::mappers;
+
+	const auto link = data.url;
+	box->setTitle(tr::lng_group_invite_edit_title());
+
+	const auto container = box->verticalLayout();
+	const auto addTitle = [&](
+			not_null<Ui::VerticalLayout*> container,
+			rpl::producer<QString> text) {
+		container->add(
+			object_ptr<Ui::FlatLabel>(
+				container,
+				std::move(text),
+				st::settingsSubsectionTitle),
+			(st::settingsSubsectionTitlePadding
+				+ style::margins(0, st::settingsSectionSkip, 0, 0)));
+	};
+	const auto addDivider = [&](
+			not_null<Ui::VerticalLayout*> container,
+			rpl::producer<QString> text,
+			style::margins margins = style::margins()) {
+		container->add(
+			object_ptr<Ui::DividerLabel>(
+				container,
+				object_ptr<Ui::FlatLabel>(
+					container,
+					std::move(text),
+					st::boxDividerLabel),
+				st::settingsDividerLabelPadding),
+			margins);
+	};
+
+	struct State {
+	};
+	const auto state = box->lifetime().make_state<State>(State{
+	});
+
+	const auto labelField = container->add(
+		object_ptr<Ui::InputField>(
+			container,
+			st::defaultInputField,
+			tr::lng_group_invite_label_header(),
+			data.title),
+		style::margins(
+			st::settingsSubsectionTitlePadding.left(),
+			st::settingsSectionSkip,
+			st::settingsSubsectionTitlePadding.right(),
+			st::settingsSectionSkip * 2));
+	labelField->setMaxLength(kMaxLinkTitleLength);
+	Settings::AddDivider(container);
+
+	const auto &saveLabel = link.isEmpty()
+		? tr::lng_formatting_link_create
+		: tr::lng_settings_save;
+	box->addButton(saveLabel(), [=] {});
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+class RowDelegate {
+public:
+	virtual void rowUpdateRow(not_null<Row*> row) = 0;
+	virtual void rowPaintIcon(
+		QPainter &p,
+		int x,
+		int y,
+		int size,
+		Color color) = 0;
+};
+
+class Row final : public PeerListRow {
+public:
+	Row(not_null<RowDelegate*> delegate, const InviteLinkData &data);
+
+	void update(const InviteLinkData &data);
+
+	[[nodiscard]] InviteLinkData data() const;
+
+	QString generateName() override;
+	QString generateShortName() override;
+	PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
+	void rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+
+private:
+	const not_null<RowDelegate*> _delegate;
+	InviteLinkData _data;
+	QString _status;
+	Color _color = Color::Permanent;
+
+};
+
+[[nodiscard]] uint64 ComputeRowId(const QString &link) {
+	return XXH64(link.data(), link.size() * sizeof(ushort), 0);
+}
+
+[[nodiscard]] uint64 ComputeRowId(const InviteLinkData &data) {
+	return ComputeRowId(data.url);
+}
+
+[[nodiscard]] Color ComputeColor(const InviteLinkData &link) {
+	return Color::Permanent;
+}
+
+[[nodiscard]] QString ComputeStatus(const InviteLinkData &link) {
+	return tr::lng_filters_chats_count(tr::now, lt_count, link.chats.size());
+}
+
+Row::Row(not_null<RowDelegate*> delegate, const InviteLinkData &data)
+: PeerListRow(ComputeRowId(data))
+, _delegate(delegate)
+, _data(data)
+, _color(ComputeColor(data)) {
+	setCustomStatus(ComputeStatus(data));
+}
+
+void Row::update(const InviteLinkData &data) {
+	_data = data;
+	_color = ComputeColor(data);
+	setCustomStatus(ComputeStatus(data));
+	refreshName(st::inviteLinkList.item);
+	_delegate->rowUpdateRow(this);
+}
+
+InviteLinkData Row::data() const {
+	return _data;
+}
+
+QString Row::generateName() {
+	if (!_data.title.isEmpty()) {
+		return _data.title;
+	}
+	auto result = _data.url;
+	return result.replace(
+		u"https://"_q,
+		QString()
+	).replace(
+		u"t.me/+"_q,
+		QString()
+	).replace(
+		u"t.me/joinchat/"_q,
+		QString()
+	);
+}
+
+QString Row::generateShortName() {
+	return generateName();
+}
+
+PaintRoundImageCallback Row::generatePaintUserpicCallback(bool forceRound) {
+	return [=](
+			QPainter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) {
+		_delegate->rowPaintIcon(p, x, y, size, _color);
+	};
+}
+
+QSize Row::rightActionSize() const {
+	return QSize(
+		st::inviteLinkThreeDotsIcon.width(),
+		st::inviteLinkThreeDotsIcon.height());
+}
+
+QMargins Row::rightActionMargins() const {
+	return QMargins(
+		0,
+		(st::inviteLinkList.item.height - rightActionSize().height()) / 2,
+		st::inviteLinkThreeDotsSkip,
+		0);
+}
+
+void Row::rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	(actionSelected
+		? st::inviteLinkThreeDotsIconOver
+		: st::inviteLinkThreeDotsIcon).paint(p, x, y, outerWidth);
+}
+
+class LinksController final
+	: public PeerListController
+	, public RowDelegate
+	, public base::has_weak_ptr {
+public:
+	LinksController(
+		not_null<Window::SessionController*> window,
+		rpl::producer<std::vector<InviteLinkData>> content,
+		Fn<Data::ChatFilter()> currentFilter);
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowRightActionClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+	void rowUpdateRow(not_null<Row*> row) override;
+	void rowPaintIcon(
+		QPainter &p,
+		int x,
+		int y,
+		int size,
+		Color color) override;
+
+private:
+	void appendRow(const InviteLinkData &data);
+	bool removeRow(const QString &link);
+
+	void rebuild(const std::vector<InviteLinkData> &rows);
+
+	[[nodiscard]] base::unique_qptr<Ui::PopupMenu> createRowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row);
+
+	const not_null<Window::SessionController*> _window;
+	Fn<Data::ChatFilter()> _currentFilter;
+	rpl::variable<std::vector<InviteLinkData>> _rows;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	std::array<QImage, int(Color::Count)> _icons;
+	rpl::lifetime _lifetime;
+
+};
+
+class LinkController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	LinkController(
+		not_null<Window::SessionController*> window,
+		const Data::ChatFilter &filter,
+		InviteLinkData data);
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+	void showFinished() override;
+
+	[[nodiscard]] rpl::producer<bool> hasChangesValue() const;
+
+private:
+	void setupAboveWidget();
+	void addHeader(not_null<Ui::VerticalLayout*> container);
+	void addLinkBlock(not_null<Ui::VerticalLayout*> container);
+
+	const not_null<Window::SessionController*> _window;
+	InviteLinkData _data;
+
+	base::flat_set<not_null<History*>> _filterChats;
+	base::flat_set<not_null<PeerData*>> _allowed;
+	rpl::variable<int> _selected = 0;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	QString _link;
+
+	Ui::RpWidget *_headerWidget = nullptr;
+	rpl::variable<int> _addedHeight;
+	rpl::variable<bool> _hasChanges = false;
+
+	rpl::event_stream<> _showFinished;
+
+	rpl::lifetime _lifetime;
+
+};
+
+LinkController::LinkController(
+	not_null<Window::SessionController*> window,
+	const Data::ChatFilter &filter,
+	InviteLinkData data)
+: _window(window)
+, _filterChats(filter.always()) {
+	_data = std::move(data);
+	_link = _data.url;
+}
+
+void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
+	using namespace Settings;
+
+	const auto divider = Ui::CreateChild<Ui::BoxContentDivider>(
+		container.get());
+	const auto verticalLayout = container->add(
+		object_ptr<Ui::VerticalLayout>(container.get()));
+
+	auto icon = CreateLottieIcon(
+		verticalLayout,
+		{
+			.name = u"filters"_q,
+			.sizeOverride = {
+				st::settingsFilterIconSize,
+				st::settingsFilterIconSize,
+			},
+		},
+		st::settingsFilterIconPadding);
+	_showFinished.events(
+	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+		animate(anim::repeat::once);
+	}, verticalLayout->lifetime());
+	verticalLayout->add(std::move(icon.widget));
+
+	verticalLayout->add(
+		object_ptr<Ui::CenterWrap<>>(
+			verticalLayout,
+			object_ptr<Ui::FlatLabel>(
+				verticalLayout,
+				tr::lng_filters_about(), // langs
+				st::settingsFilterDividerLabel)),
+		st::settingsFilterDividerLabelPadding);
+
+	verticalLayout->geometryValue(
+	) | rpl::start_with_next([=](const QRect &r) {
+		divider->setGeometry(r);
+	}, divider->lifetime());
+}
+
+void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
+	using namespace Settings;
+
+	const auto link = _data.url;
+	const auto weak = Ui::MakeWeak(container);
+	const auto copyLink = crl::guard(weak, [=] {
+		CopyInviteLink(delegate()->peerListToastParent(), link);
+	});
+	const auto shareLink = crl::guard(weak, [=] {
+		delegate()->peerListShowBox(
+			ShareInviteLinkBox(&_window->session(), link),
+			Ui::LayerOption::KeepOther);
+	});
+	const auto getLinkQr = crl::guard(weak, [=] {
+		delegate()->peerListShowBox(
+			InviteLinkQrBox(link),
+			Ui::LayerOption::KeepOther);
+	});
+	const auto editLink = crl::guard(weak, [=] {
+		//delegate()->peerListShowBox(
+		//	EditLinkBox(_window, _data.current()),
+		//	Ui::LayerOption::KeepOther);
+	});
+	const auto deleteLink = crl::guard(weak, [=] {
+		//delegate()->peerListShowBox(
+		//	DeleteLinkBox(_window, _data.current()),
+		//	Ui::LayerOption::KeepOther);
+	});
+
+	const auto createMenu = [=] {
+		auto result = base::make_unique_q<Ui::PopupMenu>(
+			container,
+			st::popupMenuWithIcons);
+		result->addAction(
+			tr::lng_group_invite_context_copy(tr::now),
+			copyLink,
+			&st::menuIconCopy);
+		result->addAction(
+			tr::lng_group_invite_context_share(tr::now),
+			shareLink,
+			&st::menuIconShare);
+		result->addAction(
+			tr::lng_group_invite_context_qr(tr::now),
+			getLinkQr,
+			&st::menuIconQrCode);
+		result->addAction(
+			tr::lng_group_invite_context_edit(tr::now),
+			editLink,
+			&st::menuIconEdit);
+		result->addAction(
+			tr::lng_group_invite_context_delete(tr::now),
+			deleteLink,
+			&st::menuIconDelete);
+		return result;
+	};
+
+	AddSubsectionTitle(container, tr::lng_manage_peer_link_invite());
+
+	const auto prefix = u"https://"_q;
+	const auto label = container->lifetime().make_state<Ui::InviteLinkLabel>(
+		container,
+		rpl::single(link.startsWith(prefix)
+			? link.mid(prefix.size())
+			: link),
+		createMenu);
+	container->add(
+		label->take(),
+		st::inviteLinkFieldPadding);
+
+	label->clicks(
+	) | rpl::start_with_next(copyLink, label->lifetime());
+
+	AddCopyShareLinkButtons(container, copyLink, shareLink);
+
+	AddSkip(container, st::inviteLinkJoinedRowPadding.bottom() * 2);
+
+	AddSkip(container);
+
+	AddDivider(container);
+}
+
+void LinkController::prepare() {
+	setupAboveWidget();
+	auto selected = 0;
+	for (const auto &history : _data.chats) {
+		const auto peer = history->peer;
+		_allowed.emplace(peer);
+		auto row = std::make_unique<PeerListRow>(peer);
+		const auto raw = row.get();
+		delegate()->peerListAppendRow(std::move(row));
+		delegate()->peerListSetRowChecked(raw, true);
+		++selected;
+	}
+	for (const auto &history : _filterChats) {
+		if (delegate()->peerListFindRow(history->peer->id.value)) {
+			continue;
+		}
+		const auto peer = history->peer;
+		auto row = std::make_unique<PeerListRow>(peer);
+		const auto raw = row.get();
+		delegate()->peerListAppendRow(std::move(row));
+		if (const auto error = ErrorForSharing(history)) {
+			raw->setCustomStatus(*error);
+		} else {
+			_allowed.emplace(peer);
+		}
+	}
+	delegate()->peerListRefreshRows();
+	_selected = selected;
+}
+
+void LinkController::rowClicked(not_null<PeerListRow*> row) {
+	if (_allowed.contains(row->peer())) {
+		const auto checked = row->checked();
+		delegate()->peerListSetRowChecked(row, !checked);
+		_selected = _selected.current() + (checked ? -1 : 1);
+	}
+}
+
+void LinkController::showFinished() {
+	_showFinished.fire({});
+}
+
+void LinkController::setupAboveWidget() {
+	using namespace Settings;
+
+	auto wrap = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = wrap.data();
+
+	addHeader(container);
+	if (!_data.url.isEmpty()) {
+		addLinkBlock(container);
+	}
+
+	Settings::AddSubsectionTitle(
+		container,
+		rpl::single(u"3 chats selected"_q));
+
+	delegate()->peerListSetAboveWidget(std::move(wrap));
+}
+
+Main::Session &LinkController::session() const {
+	return _window->session();
+}
+
+rpl::producer<bool> LinkController::hasChangesValue() const {
+	return _hasChanges.value();
+}
+
+LinksController::LinksController(
+	not_null<Window::SessionController*> window,
+	rpl::producer<std::vector<InviteLinkData>> content,
+	Fn<Data::ChatFilter()> currentFilter)
+: _window(window)
+, _currentFilter(std::move(currentFilter))
+, _rows(std::move(content)) {
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		for (auto &image : _icons) {
+			image = QImage();
+		}
+	}, _lifetime);
+}
+
+void LinksController::prepare() {
+	_rows.value(
+	) | rpl::start_with_next([=](const std::vector<InviteLinkData> &rows) {
+		rebuild(rows);
+	}, _lifetime);
+}
+
+void LinksController::rebuild(const std::vector<InviteLinkData> &rows) {
+	auto i = 0;
+	auto count = delegate()->peerListFullRowsCount();
+	while (i < rows.size()) {
+		if (i < count) {
+			const auto row = delegate()->peerListRowAt(i);
+			static_cast<Row*>(row.get())->update(rows[i]);
+		} else {
+			appendRow(rows[i]);
+		}
+		++i;
+	}
+	while (i < count) {
+		delegate()->peerListRemoveRow(delegate()->peerListRowAt(i));
+		--count;
+	}
+	delegate()->peerListRefreshRows();
+}
+
+void LinksController::rowClicked(not_null<PeerListRow*> row) {
+	const auto link = static_cast<Row*>(row.get())->data();
+	delegate()->peerListShowBox(
+		ShowLinkBox(_window, _currentFilter(), link),
+		Ui::LayerOption::KeepOther);
+}
+
+void LinksController::rowRightActionClicked(not_null<PeerListRow*> row) {
+	delegate()->peerListShowRowMenu(row, true);
+}
+
+base::unique_qptr<Ui::PopupMenu> LinksController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	auto result = createRowContextMenu(parent, row);
+
+	if (result) {
+		// First clear _menu value, so that we don't check row positions yet.
+		base::take(_menu);
+
+		// Here unique_qptr is used like a shared pointer, where
+		// not the last destroyed pointer destroys the object, but the first.
+		_menu = base::unique_qptr<Ui::PopupMenu>(result.get());
+	}
+
+	return result;
+}
+
+base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	const auto real = static_cast<Row*>(row.get());
+	const auto data = real->data();
+	const auto link = data.url;
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {
+		//CopyInviteLink(delegate()->peerListToastParent(), link);
+	}, &st::menuIconCopy);
+	result->addAction(tr::lng_group_invite_context_share(tr::now), [=] {
+		//delegate()->peerListShowBox(
+		//	ShareInviteLinkBox(_peer, link),
+		//	Ui::LayerOption::KeepOther);
+	}, &st::menuIconShare);
+	result->addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
+		//delegate()->peerListShowBox(
+		//	InviteLinkQrBox(link),
+		//	Ui::LayerOption::KeepOther);
+	}, &st::menuIconQrCode);
+	result->addAction(tr::lng_group_invite_context_edit(tr::now), [=] {
+		//delegate()->peerListShowBox(
+		//	EditLinkBox(_peer, data),
+		//	Ui::LayerOption::KeepOther);
+	}, &st::menuIconEdit);
+	result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] {
+		//delegate()->peerListShowBox(
+		//	DeleteLinkBox(_peer, _admin, link),
+		//	Ui::LayerOption::KeepOther);
+	}, &st::menuIconDelete);
+	return result;
+}
+
+Main::Session &LinksController::session() const {
+	return _window->session();
+}
+
+void LinksController::appendRow(const InviteLinkData &data) {
+	delegate()->peerListAppendRow(std::make_unique<Row>(this, data));
+}
+
+bool LinksController::removeRow(const QString &link) {
+	if (const auto row = delegate()->peerListFindRow(ComputeRowId(link))) {
+		delegate()->peerListRemoveRow(row);
+		return true;
+	}
+	return false;
+}
+
+void LinksController::rowUpdateRow(not_null<Row*> row) {
+	delegate()->peerListUpdateRow(row);
+}
+
+void LinksController::rowPaintIcon(
+		QPainter &p,
+		int x,
+		int y,
+		int size,
+		Color color) {
+	const auto skip = st::inviteLinkIconSkip;
+	const auto inner = size - 2 * skip;
+	const auto bg = [&] {
+		switch (color) {
+		case Color::Permanent: return &st::msgFile1Bg;
+		}
+		Unexpected("Color in LinksController::rowPaintIcon.");
+	}();
+	const auto stroke = st::inviteLinkIconStroke;
+	auto &icon = _icons[int(color)];
+	if (icon.isNull()) {
+		icon = QImage(
+			QSize(inner, inner) * style::DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
+		icon.fill(Qt::transparent);
+		icon.setDevicePixelRatio(style::DevicePixelRatio());
+
+		auto p = QPainter(&icon);
+		p.setPen(Qt::NoPen);
+		p.setBrush(*bg);
+		{
+			auto hq = PainterHighQualityEnabler(p);
+			p.drawEllipse(QRect(0, 0, inner, inner));
+		}
+		st::inviteLinkIcon.paintInCenter(p, { 0, 0, inner, inner });
+	}
+	p.drawImage(x + skip, y + skip, icon);
+}
+
+class LinkChatsController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	LinkChatsController(
+		not_null<Window::SessionController*> controller,
+		FilterId id,
+		const InviteLinkData &data);
+	~LinkChatsController();
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+private:
+	const not_null<Window::SessionController*> _controller;
+	const FilterId _id = 0;
+	InviteLinkData _data;
+
+};
+
+LinkChatsController::LinkChatsController(
+	not_null<Window::SessionController*> controller,
+	FilterId id,
+	const InviteLinkData &data)
+: _controller(controller)
+, _id(id)
+, _data(data) {
+}
+
+LinkChatsController::~LinkChatsController() = default;
+
+void LinkChatsController::prepare() {
+	for (const auto &history : _data.chats) {
+		delegate()->peerListAppendRow(
+			std::make_unique<PeerListRow>(history->peer));
+	}
+	delegate()->peerListRefreshRows();
+}
+
+void LinkChatsController::rowClicked(not_null<PeerListRow*> row) {
+}
+
+Main::Session &LinkChatsController::session() const {
+	return _controller->session();
+}
+
+} // namespace
+
+std::vector<not_null<PeerData*>> CollectFilterLinkChats(
+		const Data::ChatFilter &filter) {
+	return filter.always() | ranges::views::filter([](
+			not_null<History*> history) {
+		return !ErrorForSharing(history);
+	}) | ranges::views::transform(&History::peer) | ranges::to_vector;
+}
+
+bool GoodForExportFilterLink(
+		not_null<Window::SessionController*> window,
+		const Data::ChatFilter &filter) {
+	using Flag = Data::ChatFilter::Flag;
+	if (!filter.never().empty() || (filter.flags() & ~Flag::Community)) {
+		Ui::ShowMultilineToast({
+			.parentOverride = Window::Show(window).toastParent(),
+			.text = { tr::lng_filters_link_cant(tr::now) },
+		});
+		return false;
+	}
+	return true;
+}
+
+void ExportFilterLink(
+		FilterId id,
+		const std::vector<not_null<PeerData*>> &peers,
+		Fn<void(Data::ChatFilterLink)> done) {
+	Expects(!peers.empty());
+
+	const auto front = peers.front();
+	const auto session = &front->session();
+	auto mtpPeers = peers | ranges::views::transform(
+		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
+	) | ranges::to<QVector>();
+	session->api().request(MTPcommunities_ExportCommunityInvite(
+		MTP_inputCommunityDialogFilter(MTP_int(id)),
+		MTP_string(),
+		MTP_vector<MTPInputPeer>(std::move(mtpPeers))
+	)).done([=](const MTPcommunities_ExportedCommunityInvite &result) {
+		const auto &data = result.data();
+		session->data().chatsFilters().apply(MTP_updateDialogFilter(
+			MTP_flags(MTPDupdateDialogFilter::Flag::f_filter),
+			MTP_int(id),
+			data.vfilter()));
+		const auto link = session->data().chatsFilters().add(
+			id,
+			data.vinvite());
+		done(link);
+	}).fail([=](const MTP::Error &error) {
+		done({ .id = id });
+	}).send();
+}
+
+object_ptr<Ui::BoxContent> ShowLinkBox(
+		not_null<Window::SessionController*> window,
+		const Data::ChatFilter &filter,
+		const Data::ChatFilterLink &link) {
+	auto controller = std::make_unique<LinkController>(window, filter, link);
+	const auto raw = controller.get();
+	auto initBox = [=](not_null<Ui::BoxContent*> box) {
+		box->setTitle(!link.title.isEmpty()
+			? rpl::single(link.title)
+			: tr::lng_manage_peer_link_invite());
+
+		raw->hasChangesValue(
+		) | rpl::start_with_next([=](bool has) {
+			box->clearButtons();
+			if (has) {
+				box->addButton(tr::lng_settings_save(), [=] {
+
+				});
+				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+			} else {
+				box->addButton(tr::lng_about_done(), [=] {
+					box->closeBox();
+				});
+			}
+		}, box->lifetime());
+	};
+	return Box<PeerListBox>(std::move(controller), std::move(initBox));
+}
+
+void SetupFilterLinks(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> window,
+		rpl::producer<std::vector<Data::ChatFilterLink>> value,
+		Fn<Data::ChatFilter()> currentFilter) {
+	auto &lifetime = container->lifetime();
+	const auto delegate = lifetime.make_state<PeerListContentDelegateShow>(
+		std::make_shared<Window::Show>(window));
+	const auto controller = lifetime.make_state<LinksController>(
+		window,
+		std::move(value),
+		std::move(currentFilter));
+	controller->setStyleOverrides(&st::inviteLinkList);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+}
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
new file mode 100644
index 000000000..d632d3472
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+
+namespace Ui {
+class Show;
+class BoxContent;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Data {
+class ChatFilter;
+struct ChatFilterLink;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+[[nodiscard]] std::vector<not_null<PeerData*>> CollectFilterLinkChats(
+	const Data::ChatFilter &filter);
+[[nodiscard]] bool GoodForExportFilterLink(
+	not_null<Window::SessionController*> window,
+	const Data::ChatFilter &filter);
+
+void ExportFilterLink(
+	FilterId id,
+	const std::vector<not_null<PeerData*>> &peers,
+	Fn<void(Data::ChatFilterLink)> done);
+
+object_ptr<Ui::BoxContent> ShowLinkBox(
+	not_null<Window::SessionController*> window,
+	const Data::ChatFilter &filter,
+	const Data::ChatFilterLink &link);
+
+void SetupFilterLinks(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Window::SessionController*> window,
+	rpl::producer<std::vector<Data::ChatFilterLink>> value,
+	Fn<Data::ChatFilter()> currentFilter);
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index eda808ae6..2dbe7c67a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -143,6 +143,10 @@ void PeerListBox::setAddedTopScrollSkip(int skip) {
 	updateScrollSkips();
 }
 
+void PeerListBox::showFinished() {
+	_controller->showFinished();
+}
+
 int PeerListBox::getTopScrollSkip() const {
 	auto result = _addedTopScrollSkip;
 	if (_select && !_select->isHidden()) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 3a09aebf9..1f1c0e10a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -447,6 +447,9 @@ public:
 
 	virtual void prepare() = 0;
 
+	virtual void showFinished() {
+	}
+
 	virtual void rowClicked(not_null<PeerListRow*> row) = 0;
 	virtual void rowRightActionClicked(not_null<PeerListRow*> row) {
 	}
@@ -1050,6 +1053,8 @@ public:
 
 	void setAddedTopScrollSkip(int skip);
 
+	void showFinished() override;
+
 protected:
 	void prepare() override;
 	void setInnerFocus() override;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 416c4ecb7..050dccc99 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -1128,6 +1128,12 @@ void CopyInviteLink(not_null<QWidget*> toastParent, const QString &link) {
 object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		not_null<PeerData*> peer,
 		const QString &link) {
+	return ShareInviteLinkBox(&peer->session(), link);
+}
+
+object_ptr<Ui::BoxContent> ShareInviteLinkBox(
+		not_null<Main::Session*> session,
+		const QString &link) {
 	const auto sending = std::make_shared<bool>();
 	const auto box = std::make_shared<QPointer<ShareBox>>();
 
@@ -1187,7 +1193,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		} else {
 			comment.text = link;
 		}
-		auto &api = peer->session().api();
+		auto &api = session->api();
 		for (const auto thread : result) {
 			auto message = Api::MessageToSend(
 				Api::SendAction(thread, options));
@@ -1204,7 +1210,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		return Data::CanSendTexts(thread);
 	};
 	auto object = Box<ShareBox>(ShareBox::Descriptor{
-		.session = &peer->session(),
+		.session = session,
 		.copyCallback = std::move(copyCallback),
 		.submitCallback = std::move(submitCallback),
 		.filterCallback = std::move(filterCallback),
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
index 0c190da4c..7fc9c2d53 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
@@ -15,6 +15,10 @@ namespace Api {
 struct InviteLink;
 } // namespace Api
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Ui {
 class VerticalLayout;
 class Show;
@@ -38,6 +42,9 @@ void CopyInviteLink(not_null<QWidget*> toastParent, const QString &link);
 [[nodiscard]] object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	not_null<PeerData*> peer,
 	const QString &link);
+[[nodiscard]] object_ptr<Ui::BoxContent> ShareInviteLinkBox(
+	not_null<Main::Session*> session,
+	const QString &link);
 [[nodiscard]] object_ptr<Ui::BoxContent> InviteLinkQrBox(const QString &link);
 [[nodiscard]] object_ptr<Ui::BoxContent> RevokeLinkBox(
 	not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index fb0531c14..7f255f4a6 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -148,14 +148,19 @@ ChatFilter ChatFilter::FromTL(
 			data.vid().v,
 			qs(data.vtitle()),
 			qs(data.vemoticon().value_or_empty()),
-			(Flag::Community
-				| (data.is_community_can_admin() ? Flag::Admin : Flag())),
+			Flag::Community,
 			std::move(list),
 			std::move(pinned),
 			{});
 	});
 }
 
+ChatFilter ChatFilter::withId(FilterId id) const {
+	auto result = *this;
+	result._id = id;
+	return result;
+}
+
 MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	auto always = _always;
 	auto pinned = QVector<MTPInputPeer>();
@@ -171,10 +176,7 @@ MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	}
 	if (_flags & Flag::Community) {
 		using TLFlag = MTPDdialogFilterCommunity::Flag;
-		const auto flags = TLFlag::f_emoticon
-			| ((_flags & Flag::Admin)
-				? TLFlag::f_community_can_admin
-				: TLFlag(0));
+		const auto flags = TLFlag::f_emoticon;
 		return MTP_dialogFilterCommunity(
 			MTP_flags(flags),
 			MTP_int(replaceId ? replaceId : _id),
@@ -226,6 +228,10 @@ ChatFilter::Flags ChatFilter::flags() const {
 	return _flags;
 }
 
+bool ChatFilter::community() const {
+	return _flags & Flag::Community;
+}
+
 const base::flat_set<not_null<History*>> &ChatFilter::always() const {
 	return _always;
 }
@@ -392,6 +398,93 @@ void ChatFilters::apply(const MTPUpdate &update) {
 	});
 }
 
+ChatFilterLink ChatFilters::add(
+		FilterId id,
+		const MTPExportedCommunityInvite &update) {
+	const auto i = ranges::find(_list, id, &ChatFilter::id);
+	if (i == end(_list) || !i->community()) {
+		LOG(("Api Error: "
+			"Attempt to add community link to a non-community filter: %1"
+			).arg(id));
+		return {};
+	}
+	auto &links = _communityLinks[id];
+	const auto &data = update.data();
+	const auto url = qs(data.vurl());
+	const auto title = qs(data.vtitle());
+	auto chats = data.vpeers().v | ranges::views::transform([&](
+			const MTPPeer &peer) {
+		return _owner->history(peerFromMTP(peer));
+	}) | ranges::to_vector;
+	const auto j = ranges::find(links, url, &ChatFilterLink::url);
+	if (j != end(links)) {
+		if (j->title != title || j->chats != chats) {
+			j->title = title;
+			j->chats = std::move(chats);
+			_communityLinksUpdated.fire_copy(id);
+		}
+		return *j;
+	}
+	links.push_back({
+		.id = id,
+		.url = url,
+		.title = title,
+		.chats = std::move(chats),
+	});
+	_communityLinksUpdated.fire_copy(id);
+	return links.back();
+}
+
+void ChatFilters::edit(
+		FilterId id,
+		const QString &url,
+		const QString &title) {
+	auto &links = _communityLinks[id];
+	const auto i = ranges::find(links, url, &ChatFilterLink::url);
+	if (i != end(links)) {
+		i->title = title;
+		_communityLinksUpdated.fire_copy(id);
+	}
+}
+
+void ChatFilters::remove(FilterId id, const QString &url) {
+	auto &links = _communityLinks[id];
+	const auto i = ranges::find(links, url, &ChatFilterLink::url);
+	if (i != end(links)) {
+		links.erase(i);
+		_communityLinksUpdated.fire_copy(id);
+	}
+}
+
+rpl::producer<std::vector<ChatFilterLink>> ChatFilters::communityLinks(
+		FilterId id) const {
+	return _communityLinksUpdated.events_starting_with_copy(
+		id
+	) | rpl::filter(rpl::mappers::_1 == id) | rpl::map([=] {
+		const auto i = _communityLinks.find(id);
+		return (i != end(_communityLinks))
+			? i->second
+			: std::vector<ChatFilterLink>();
+	});
+}
+
+void ChatFilters::reloadCommunityLinks(FilterId id) {
+	const auto api = &_owner->session().api();
+	api->request(_linksRequestId).cancel();
+	_linksRequestId = api->request(MTPcommunities_GetExportedInvites(
+		MTP_inputCommunityDialogFilter(MTP_int(id))
+	)).done([=](const MTPcommunities_ExportedInvites &result) {
+		const auto &data = result.data();
+		_owner->processUsers(data.vusers());
+		_owner->processChats(data.vchats());
+		_communityLinks[id].clear();
+		for (const auto &link : data.vinvites().v) {
+			add(id, link);
+		}
+		_communityLinksUpdated.fire_copy(id);
+	}).send();
+}
+
 void ChatFilters::set(ChatFilter filter) {
 	if (!filter.id()) {
 		return;
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index 96214f96a..ff5e697a4 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -33,7 +33,6 @@ public:
 		NoArchived  = (1 << 7),
 
 		Community   = (1 << 8),
-		Admin       = (1 << 9),
 	};
 	friend constexpr inline bool is_flag_type(Flag) { return true; };
 	using Flags = base::flags<Flag>;
@@ -48,6 +47,8 @@ public:
 		std::vector<not_null<History*>> pinned,
 		base::flat_set<not_null<History*>> never);
 
+	[[nodiscard]] ChatFilter withId(FilterId id) const;
+
 	[[nodiscard]] static ChatFilter FromTL(
 		const MTPDialogFilter &data,
 		not_null<Session*> owner);
@@ -57,7 +58,7 @@ public:
 	[[nodiscard]] QString title() const;
 	[[nodiscard]] QString iconEmoji() const;
 	[[nodiscard]] Flags flags() const;
-	[[nodiscard]] bool admin() const;
+	[[nodiscard]] bool community() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &always() const;
 	[[nodiscard]] const std::vector<not_null<History*>> &pinned() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &never() const;
@@ -87,6 +88,17 @@ inline bool operator!=(const ChatFilter &a, const ChatFilter &b) {
 	return !(a == b);
 }
 
+struct ChatFilterLink {
+	FilterId id = 0;
+	QString url;
+	QString title;
+	std::vector<not_null<History*>> chats;
+
+	friend inline bool operator==(
+		const ChatFilterLink &a,
+		const ChatFilterLink &b) = default;
+};
+
 struct SuggestedFilter {
 	ChatFilter filter;
 	QString description;
@@ -134,6 +146,18 @@ public:
 		-> const std::vector<SuggestedFilter> &;
 	[[nodiscard]] rpl::producer<> suggestedUpdated() const;
 
+	ChatFilterLink add(
+		FilterId id,
+		const MTPExportedCommunityInvite &update);
+	void edit(
+		FilterId id,
+		const QString &url,
+		const QString &title);
+	void remove(FilterId id, const QString &url);
+	rpl::producer<std::vector<ChatFilterLink>> communityLinks(
+		FilterId id) const;
+	void reloadCommunityLinks(FilterId id);
+
 private:
 	void load(bool force);
 	void received(const QVector<MTPDialogFilter> &list);
@@ -160,6 +184,10 @@ private:
 	std::deque<FilterId> _exceptionsToLoad;
 	mtpRequestId _exceptionsLoadRequestId = 0;
 
+	base::flat_map<FilterId, std::vector<ChatFilterLink>> _communityLinks;
+	rpl::event_stream<FilterId> _communityLinksUpdated;
+	mtpRequestId _linksRequestId = 0;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index e2a72af3b..85a982fb6 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -133,6 +133,7 @@ settingsTTLChatsOn: icon {{ "settings/ttl/autodelete_on", windowActiveTextFg }};
 
 settingsIconAdd: icon {{ "settings/add", windowFgActive }};
 settingsIconRemove: icon {{ "settings/remove", windowFgActive }};
+settingsFolderShareIcon: icon {{ "settings/folder_links", lightButtonFg }};
 
 settingsCheckbox: Checkbox(defaultBoxCheckbox) {
 	textPosition: point(15px, 1px);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 414455bea..4a8dc7e70 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -334,16 +334,24 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	AddSkip(container, st::settingsSectionSkip);
 	AddSubsectionTitle(container, tr::lng_filters_subtitle());
 
-	const auto rows = lifetime.make_state<std::vector<FilterRow>>();
-	const auto rowsCount = lifetime.make_state<rpl::variable<int>>();
+	struct State {
+		std::vector<FilterRow> rows;
+		rpl::variable<int> count;
+		rpl::variable<int> suggested;
+		Fn<void(const FilterRowButton*, Fn<void(Data::ChatFilter)>)> save;
+	};
+
+	const auto state = lifetime.make_state<State>();
 	const auto find = [=](not_null<FilterRowButton*> button) {
-		const auto i = ranges::find(*rows, button, &FilterRow::button);
-		Assert(i != end(*rows));
+		const auto i = ranges::find(state->rows, button, &FilterRow::button);
+		Assert(i != end(state->rows));
 		return &*i;
 	};
 	const auto showLimitReached = [=] {
-		const auto removed = ranges::count_if(*rows, &FilterRow::removed);
-		if (rows->size() < limit() + removed) {
+		const auto removed = ranges::count_if(
+			state->rows,
+			&FilterRow::removed);
+		if (state->rows.size() < limit() + removed) {
 			return false;
 		}
 		controller->show(Box(FiltersLimitBox, session));
@@ -376,14 +384,23 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				find(button)->filter = result;
 				button->updateData(result);
 			};
+			const auto saveAnd = [=](
+					const Data::ChatFilter &data,
+					Fn<void(Data::ChatFilter)> next) {
+				const auto found = find(button);
+				found->filter = data;
+				button->updateData(data);
+				state->save(button, next);
+			};
 			controller->window().show(Box(
 				EditFilterBox,
 				controller,
 				found->filter,
-				crl::guard(button, doneCallback)));
+				crl::guard(button, doneCallback),
+				crl::guard(button, saveAnd)));
 		});
-		rows->push_back({ button, filter });
-		*rowsCount = rows->size();
+		state->rows.push_back({ button, filter });
+		state->count = state->rows.size();
 
 		const auto filters = &controller->session().data().chatsFilters();
 		const auto id = filter.id();
@@ -418,6 +435,8 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		}
 
 		wrap->resizeToWidth(container->width());
+
+		return button;
 	};
 	const auto &list = session->data().chatsFilters().list();
 	for (const auto &filter : list) {
@@ -438,11 +457,17 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto doneCallback = [=](const Data::ChatFilter &result) {
 			addFilter(result);
 		};
+		const auto saveAnd = [=](
+				const Data::ChatFilter &data,
+				Fn<void(Data::ChatFilter)> next) {
+			state->save(addFilter(data), next);
+		};
 		controller->window().show(Box(
 			EditFilterBox,
 			controller,
 			Data::ChatFilter(),
-			crl::guard(container, doneCallback)));
+			crl::guard(container, doneCallback),
+			crl::guard(container, saveAnd)));
 	});
 	AddSkip(container);
 	const auto nonEmptyAbout = container->add(
@@ -455,7 +480,6 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	AddSkip(aboutRows);
 	AddSubsectionTitle(aboutRows, tr::lng_filters_recommended());
 
-	const auto suggested = lifetime.make_state<rpl::variable<int>>();
 	rpl::single(rpl::empty) | rpl::then(
 		session->data().chatsFilters().suggestedUpdated()
 	) | rpl::map([=] {
@@ -468,10 +492,10 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			const std::vector<Data::SuggestedFilter> &suggestions) {
 		for (const auto &suggestion : suggestions) {
 			const auto &filter = suggestion.filter;
-			if (ranges::contains(*rows, filter, &FilterRow::filter)) {
+			if (ranges::contains(state->rows, filter, &FilterRow::filter)) {
 				continue;
 			}
-			*suggested = suggested->current() + 1;
+			state->suggested = state->suggested.current() + 1;
 			const auto button = aboutRows->add(object_ptr<FilterRowButton>(
 				aboutRows,
 				filter,
@@ -482,7 +506,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 					return;
 				}
 				addFilter(filter);
-				*suggested = suggested->current() - 1;
+				state->suggested = state->suggested.current() - 1;
 				delete button;
 			}, button->lifetime());
 		}
@@ -491,8 +515,8 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	}, aboutRows->lifetime());
 
 	auto showSuggestions = rpl::combine(
-		suggested->value(),
-		rowsCount->value(),
+		state->suggested.value(),
+		state->count.value(),
 		Data::AmPremiumValue(session)
 	) | rpl::map([limit](int suggested, int count, bool) {
 		return suggested > 0 && count < limit();
@@ -511,7 +535,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			return localId;
 		};
 		auto result = base::flat_map<not_null<FilterRowButton*>, FilterId>();
-		for (auto &row : *rows) {
+		for (auto &row : state->rows) {
 			const auto id = row.filter.id();
 			if (row.removed) {
 				continue;
@@ -523,9 +547,13 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		return result;
 	};
 
-	return [=] {
+	state->save = [=](
+			const FilterRowButton *single,
+			Fn<void(Data::ChatFilter)> next) {
 		auto ids = prepareGoodIdsForNewFilters();
 
+		auto updated = Data::ChatFilter();
+
 		auto order = std::vector<FilterId>();
 		auto updates = std::vector<MTPUpdate>();
 		auto addRequests = std::vector<MTPmessages_UpdateDialogFilter>();
@@ -533,8 +561,11 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 
 		auto &realFilters = session->data().chatsFilters();
 		const auto &list = realFilters.list();
-		order.reserve(rows->size());
-		for (const auto &row : *rows) {
+		order.reserve(state->rows.size());
+		for (auto &row : state->rows) {
+			if (row.button.get() == single) {
+				updated = row.filter;
+			}
 			const auto id = row.filter.id();
 			const auto removed = row.removed;
 			const auto i = ranges::find(list, id, &Data::ChatFilter::id);
@@ -545,6 +576,13 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				continue;
 			}
 			const auto newId = ids.take(row.button).value_or(id);
+			if (newId != id) {
+				row.filter = row.filter.withId(newId);
+				row.button->updateData(row.filter);
+				if (row.button.get() == single) {
+					updated = row.filter;
+				}
+			}
 			const auto tl = removed
 				? MTPDialogFilter()
 				: row.filter.tl(newId);
@@ -582,6 +620,8 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		}
 		crl::on_main(session, [
 			session,
+			next,
+			updated,
 			order = std::move(order),
 			updates = std::move(updates),
 			addRequests = std::move(addRequests),
@@ -604,8 +644,15 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			if (!order.empty() && !addRequests.empty()) {
 				filters->saveOrder(order, previousId);
 			}
+			if (next) {
+				Assert(updated.id() != 0);
+				next(updated);
+			}
 		});
 	};
+	return [copy = state->save] {
+		copy(nullptr, nullptr);
+	};
 }
 
 void SetupTopContent(

From 8a9d13c6e417da53d7f416e3aa9ebc146730a587 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 Mar 2023 18:14:53 +0400
Subject: [PATCH 003/676] Initial add filter / chats / edit filter link.

---
 Telegram/SourceFiles/api/api_chat_filters.cpp | 388 +++++++++++++++++-
 Telegram/SourceFiles/api/api_chat_filters.h   |   8 +
 Telegram/SourceFiles/apiwrap.cpp              |  10 +
 Telegram/SourceFiles/apiwrap.h                |   5 +
 .../boxes/filters/edit_filter_links.cpp       |  80 +++-
 .../SourceFiles/core/local_url_handlers.cpp   |  19 +
 .../SourceFiles/data/data_chat_filters.cpp    |  12 +-
 Telegram/SourceFiles/data/data_chat_filters.h |   2 +
 Telegram/SourceFiles/settings/settings.style  |  10 +
 9 files changed, 520 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 7efcaf01a..837af84d9 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -7,12 +7,331 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "api/api_chat_filters.h"
 
-#include "data/data_session.h"
-#include "data/data_chat_filters.h"
-#include "main/main_session.h"
 #include "apiwrap.h"
+#include "boxes/peer_list_box.h"
+#include "core/application.h"
+#include "data/data_chat_filters.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/toasts/common_toasts.h"
+#include "ui/widgets/buttons.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
 
 namespace Api {
+namespace {
+
+enum class ToggleAction {
+	Adding,
+	Removing,
+};
+
+enum class HeaderType {
+	AddingFilter,
+	AddingChats,
+	AllAdded,
+	Removing,
+};
+
+struct HeaderDescriptor {
+	base::required<HeaderType> type;
+	base::required<QString> title;
+	int badge = 0;
+};
+
+class ToggleChatsController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	ToggleChatsController(
+		not_null<Window::SessionController*> window,
+		ToggleAction action,
+		const QString &slug,
+		FilterId filterId,
+		const QString &title,
+		std::vector<not_null<PeerData*>> chats);
+
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	Main::Session &session() const override;
+
+	[[nodiscard]] auto selectedValue() const
+		-> rpl::producer<base::flat_set<not_null<PeerData*>>>;
+
+private:
+	void setupAboveWidget();
+
+	const not_null<Window::SessionController*> _window;
+
+	ToggleAction _action = ToggleAction::Adding;
+	QString _slug;
+	FilterId _filterId = 0;
+	QString _filterTitle;
+	std::vector<not_null<PeerData*>> _chats;
+	rpl::variable<base::flat_set<not_null<PeerData*>>> _selected;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	rpl::lifetime _lifetime;
+
+};
+
+[[nodiscard]] rpl::producer<QString> TitleText(HeaderType type) {
+	// langs
+	switch (type) {
+	case HeaderType::AddingFilter:
+		return rpl::single(u"Add Folder"_q);
+	case HeaderType::AddingChats:
+		return rpl::single(u"Add Chats to Folder"_q);
+	case HeaderType::AllAdded:
+		return rpl::single(u"Folder Already Added"_q);
+	case HeaderType::Removing:
+		return rpl::single(u"Remove Folder"_q);
+	}
+	Unexpected("HeaderType in TitleText.");
+}
+
+void FillHeader(
+		not_null<Ui::VerticalLayout*> container,
+		HeaderDescriptor descriptor) {
+	// langs
+	const auto description = (descriptor.type == HeaderType::AddingFilter)
+		? (u"Do you want to add a new chat folder "_q
+			+ descriptor.title
+			+ u" and join its groups and channels?"_q)
+		: (descriptor.type == HeaderType::AddingChats)
+		? (u"Do you want to join "_q
+			+ QString::number(descriptor.badge)
+			+ u" chats and add them to your folder "_q
+			+ descriptor.title + '?')
+		: (descriptor.type == HeaderType::AllAdded)
+		? (u"You have already added the folder "_q
+			+ descriptor.title
+			+ u" and all its chats."_q)
+		: (u"Do you want to quit the chats you joined "
+			"when adding the folder "_q
+			+ descriptor.title + '?');
+	container->add(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			description,
+			st::boxDividerLabel),
+		st::boxRowPadding);
+}
+
+void ImportInvite(
+		base::weak_ptr<Window::SessionController> weak,
+		const QString &slug,
+		const base::flat_set<not_null<PeerData*>> &peers) {
+	Expects(!peers.empty());
+
+	const auto peer = peers.front();
+	const auto api = &peer->session().api();
+	const auto callback = [=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+	};
+	const auto error = [=](const MTP::Error &error) {
+		if (const auto strong = weak.get()) {
+			Ui::ShowMultilineToast({
+				.parentOverride = Window::Show(strong).toastParent(),
+				.text = { error.description() },
+			});
+		}
+	};
+	auto inputs = peers | ranges::views::transform([](auto peer) {
+		return MTPInputPeer(peer->input);
+	}) | ranges::to<QVector>();
+	api->request(MTPcommunities_JoinCommunityInvite(
+		MTP_string(slug),
+		MTP_vector<MTPInputPeer>(std::move(inputs))
+	)).done(callback).fail(error).send();
+}
+
+ToggleChatsController::ToggleChatsController(
+		not_null<Window::SessionController*> window,
+		ToggleAction action,
+		const QString &slug,
+		FilterId filterId,
+		const QString &title,
+		std::vector<not_null<PeerData*>> chats)
+: _window(window)
+, _action(action)
+, _slug(slug)
+, _filterId(filterId)
+, _filterTitle(title)
+, _chats(std::move(chats)) {
+}
+
+void ToggleChatsController::prepare() {
+	setupAboveWidget();
+	auto selected = base::flat_set<not_null<PeerData*>>();
+	for (const auto &peer : _chats) {
+		auto row = std::make_unique<PeerListRow>(peer);
+		const auto raw = row.get();
+		delegate()->peerListAppendRow(std::move(row));
+		delegate()->peerListSetRowChecked(raw, true);
+		selected.emplace(peer);
+	}
+	delegate()->peerListRefreshRows();
+	_selected = std::move(selected);
+}
+
+void ToggleChatsController::rowClicked(not_null<PeerListRow*> row) {
+	const auto peer = row->peer();
+	const auto checked = row->checked();
+	auto selected = _selected.current();
+	delegate()->peerListSetRowChecked(row, !checked);
+	if (checked) {
+		selected.remove(peer);
+	} else {
+		selected.emplace(peer);
+	}
+	_selected = std::move(selected);
+}
+
+void ToggleChatsController::setupAboveWidget() {
+	using namespace Settings;
+
+	auto wrap = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = wrap.data();
+
+	const auto type = !_filterId
+		? HeaderType::AddingFilter
+		: (_action == ToggleAction::Adding)
+		? HeaderType::AddingChats
+		: HeaderType::Removing;
+	delegate()->peerListSetTitle(TitleText(type));
+	FillHeader(container, {
+		.type = type,
+		.title = _filterTitle,
+		.badge = (type == HeaderType::AddingChats) ? int(_chats.size()) : 0,
+	});
+
+	delegate()->peerListSetAboveWidget(std::move(wrap));
+}
+
+Main::Session &ToggleChatsController::session() const {
+	return _window->session();
+}
+
+auto ToggleChatsController::selectedValue() const
+-> rpl::producer<base::flat_set<not_null<PeerData*>>> {
+	return _selected.value();
+}
+
+[[nodiscard]] void AlreadyFilterBox(
+		not_null<Ui::GenericBox*> box,
+		const QString &title) {
+	// langs
+	box->setTitle(TitleText(HeaderType::AllAdded));
+
+	FillHeader(box->verticalLayout(), {
+		.type = HeaderType::AllAdded,
+		.title = title,
+	});
+
+	box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+}
+
+void ProcessFilterInvite(
+		base::weak_ptr<Window::SessionController> weak,
+		const QString &slug,
+		FilterId filterId,
+		const QString &title,
+		std::vector<not_null<PeerData*>> peers) {
+	const auto strong = weak.get();
+	if (!strong) {
+		return;
+	}
+	Core::App().hideMediaView();
+	if (peers.empty()) {
+		if (filterId) {
+			strong->show(Box(AlreadyFilterBox, title));
+		} else {
+			Ui::ShowMultilineToast({
+				.parentOverride = Window::Show(strong).toastParent(),
+				.text = { tr::lng_group_invite_bad_link(tr::now) },
+			});
+		}
+		return;
+	}
+	auto controller = std::make_unique<ToggleChatsController>(
+		strong,
+		ToggleAction::Adding,
+		slug,
+		filterId,
+		title,
+		std::move(peers));
+	const auto raw = controller.get();
+	auto initBox = [=](not_null<Ui::BoxContent*> box) {
+		box->setStyle(st::filterInviteBox);
+		raw->selectedValue(
+		) | rpl::start_with_next([=](
+				base::flat_set<not_null<PeerData*>> &&peers) {
+			const auto count = int(peers.size());
+
+			box->clearButtons();
+			auto button = object_ptr<Ui::RoundButton>(
+				box,
+				rpl::single(count
+					? u"Add %1 Chats"_q.arg(count)
+					: u"Don't add chats"_q),
+				st::defaultActiveButton);
+			const auto raw = button.data();
+
+			box->widthValue(
+			) | rpl::start_with_next([=](int width) {
+				const auto &padding = st::filterInviteBox.buttonPadding;
+				raw->resizeToWidth(width
+					- padding.left()
+					- padding.right());
+				raw->moveToLeft(padding.left(), padding.top());
+			}, raw->lifetime());
+
+			raw->setClickedCallback([=] {
+				if (!count) {
+					box->closeBox();
+				//} else if (count + alreadyInFilter() >= ...) {
+					// #TODO filters
+				} else {
+					ImportInvite(weak, slug, peers);
+				}
+			});
+
+			box->addButton(std::move(button));
+		}, box->lifetime());
+	};
+	strong->show(
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
+}
+
+void ProcessFilterInvite(
+		base::weak_ptr<Window::SessionController> weak,
+		const QString &slug,
+		FilterId filterId,
+		std::vector<not_null<PeerData*>> peers) {
+	const auto strong = weak.get();
+	if (!strong) {
+		return;
+	}
+	Core::App().hideMediaView();
+	const auto &list = strong->session().data().chatsFilters().list();
+	const auto it = ranges::find(list, filterId, &Data::ChatFilter::id);
+	if (it == end(list)) {
+		Ui::ShowMultilineToast({
+			.parentOverride = Window::Show(strong).toastParent(),
+			.text = { u"Filter not found :shrug:"_q },
+		});
+		return;
+	}
+	ProcessFilterInvite(weak, slug, filterId, it->title(), std::move(peers));
+}
+
+} // namespace
 
 void SaveNewFilterPinned(
 		not_null<Main::Session*> session,
@@ -25,7 +344,70 @@ void SaveNewFilterPinned(
 		MTP_int(filterId),
 		filter.tl()
 	)).send();
+}
 
+void CheckFilterInvite(
+		not_null<Window::SessionController*> controller,
+		const QString &slug) {
+	const auto session = &controller->session();
+	const auto weak = base::make_weak(controller);
+	session->api().checkFilterInvite(slug, [=](
+			const MTPcommunities_CommunityInvite &result) {
+		const auto strong = weak.get();
+		if (!strong) {
+			return;
+		}
+		auto title = QString();
+		auto filterId = FilterId();
+		auto peers = std::vector<not_null<PeerData*>>();
+		auto already = std::vector<not_null<PeerData*>>();
+		auto &owner = strong->session().data();
+		result.match([&](const auto &data) {
+			owner.processUsers(data.vusers());
+			owner.processChats(data.vchats());
+		});
+		const auto parseList = [&](const MTPVector<MTPPeer> &list) {
+			auto result = std::vector<not_null<PeerData*>>();
+			result.reserve(list.v.size());
+			for (const auto &peer : list.v) {
+				result.push_back(owner.peer(peerFromMTP(peer)));
+			}
+			return result;
+		};
+		result.match([&](const MTPDcommunities_communityInvite &data) {
+			title = qs(data.vtitle());
+			peers = parseList(data.vpeers());
+		}, [&](const MTPDcommunities_communityInviteAlready &data) {
+			filterId = data.vfilter_id().v;
+			peers = parseList(data.vmissing_peers());
+			already = parseList(data.valready_peers());
+		});
+
+		const auto &filters = owner.chatsFilters();
+		const auto notLoaded = filterId
+			&& !ranges::contains(
+				owner.chatsFilters().list(),
+				filterId,
+				&Data::ChatFilter::id);
+		if (notLoaded) {
+			const auto lifetime = std::make_shared<rpl::lifetime>();
+			owner.chatsFilters().changed(
+			) | rpl::start_with_next([=] {
+				lifetime->destroy();
+				ProcessFilterInvite(weak, slug, filterId, std::move(peers));
+			}, *lifetime);
+			owner.chatsFilters().reload();
+		} else if (filterId) {
+			ProcessFilterInvite(weak, slug, filterId, std::move(peers));
+		} else {
+			ProcessFilterInvite(weak, slug, filterId, title, std::move(peers));
+		}
+	}, [=](const MTP::Error &error) {
+		if (error.code() != 400) {
+			return;
+		}
+		ProcessFilterInvite(weak, slug, FilterId(), QString(), {});
+	});
 }
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_filters.h b/Telegram/SourceFiles/api/api_chat_filters.h
index 59c29f72b..99fce06a2 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.h
+++ b/Telegram/SourceFiles/api/api_chat_filters.h
@@ -11,10 +11,18 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Api {
 
 void SaveNewFilterPinned(
 	not_null<Main::Session*> session,
 	FilterId filterId);
 
+void CheckFilterInvite(
+	not_null<Window::SessionController*> controller,
+	const QString &slug);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 282683741..f7a097d26 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -380,6 +380,16 @@ void ApiWrap::checkChatInvite(
 	)).done(std::move(done)).fail(std::move(fail)).send();
 }
 
+void ApiWrap::checkFilterInvite(
+		const QString &slug,
+		FnMut<void(const MTPcommunities_CommunityInvite &)> done,
+		Fn<void(const MTP::Error &)> fail) {
+	request(base::take(_checkFilterInviteRequestId)).cancel();
+	_checkFilterInviteRequestId = request(
+		MTPcommunities_CheckCommunityInvite(MTP_string(slug))
+	).done(std::move(done)).fail(std::move(fail)).send();
+}
+
 void ApiWrap::savePinnedOrder(Data::Folder *folder) {
 	const auto &order = _session->data().pinnedChatsOrder(folder);
 	const auto input = [](Dialogs::Key key) {
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index ec71c781b..a142e09a9 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -202,6 +202,10 @@ public:
 		const QString &hash,
 		FnMut<void(const MTPChatInvite &)> done,
 		Fn<void(const MTP::Error &)> fail);
+	void checkFilterInvite(
+		const QString &slug,
+		FnMut<void(const MTPcommunities_CommunityInvite &)> done,
+		Fn<void(const MTP::Error &)> fail);
 
 	void processFullPeer(
 		not_null<PeerData*> peer,
@@ -653,6 +657,7 @@ private:
 	mtpRequestId _termsUpdateRequestId = 0;
 
 	mtpRequestId _checkInviteRequestId = 0;
+	mtpRequestId _checkFilterInviteRequestId = 0;
 
 	struct MigrateCallbacks {
 		FnMut<void(not_null<ChannelData*>)> done;
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 5a6a6fa72..3fa2aeeee 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -77,6 +77,14 @@ struct InviteLinkAction {
 	}
 }
 
+void ShowEmptyLinkError(not_null<Window::SessionController*> window) {
+	// langs
+	Ui::ShowMultilineToast({
+		.parentOverride = Window::Show(window).toastParent(),
+		.text = { u"Link should have at least one chat shared."_q },
+	});
+}
+
 void ChatFilterLinkBox(
 		not_null<Ui::GenericBox*> box,
 		Data::ChatFilterLink data) {
@@ -336,6 +344,7 @@ public:
 	void showFinished() override;
 
 	[[nodiscard]] rpl::producer<bool> hasChangesValue() const;
+	[[nodiscard]] base::flat_set<not_null<PeerData*>> selected() const;
 
 private:
 	void setupAboveWidget();
@@ -347,14 +356,13 @@ private:
 
 	base::flat_set<not_null<History*>> _filterChats;
 	base::flat_set<not_null<PeerData*>> _allowed;
-	rpl::variable<int> _selected = 0;
+	rpl::variable<base::flat_set<not_null<PeerData*>>> _selected;
+	base::flat_set<not_null<PeerData*>> _initial;
 
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
 	QString _link;
 
-	Ui::RpWidget *_headerWidget = nullptr;
-	rpl::variable<int> _addedHeight;
 	rpl::variable<bool> _hasChanges = false;
 
 	rpl::event_stream<> _showFinished;
@@ -495,7 +503,6 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 
 void LinkController::prepare() {
 	setupAboveWidget();
-	auto selected = 0;
 	for (const auto &history : _data.chats) {
 		const auto peer = history->peer;
 		_allowed.emplace(peer);
@@ -503,7 +510,7 @@ void LinkController::prepare() {
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
 		delegate()->peerListSetRowChecked(raw, true);
-		++selected;
+		_initial.emplace(peer);
 	}
 	for (const auto &history : _filterChats) {
 		if (delegate()->peerListFindRow(history->peer->id.value)) {
@@ -520,14 +527,23 @@ void LinkController::prepare() {
 		}
 	}
 	delegate()->peerListRefreshRows();
-	_selected = selected;
+	_selected = _initial;
 }
 
 void LinkController::rowClicked(not_null<PeerListRow*> row) {
 	if (_allowed.contains(row->peer())) {
+		const auto peer = row->peer();
 		const auto checked = row->checked();
+		auto selected = _selected.current();
 		delegate()->peerListSetRowChecked(row, !checked);
-		_selected = _selected.current() + (checked ? -1 : 1);
+		if (checked) {
+			selected.remove(peer);
+		} else {
+			selected.emplace(peer);
+		}
+		const auto has = (_initial != selected);
+		_selected = std::move(selected);
+		_hasChanges = has;
 	}
 }
 
@@ -546,9 +562,16 @@ void LinkController::setupAboveWidget() {
 		addLinkBlock(container);
 	}
 
+	// langs
+	auto subtitle = _selected.value(
+	) | rpl::map([](const base::flat_set<not_null<PeerData*>> &selected) {
+		return selected.empty()
+			? u"No chats selected"_q
+			: (QString::number(selected.size()) + u" chats selected"_q);
+	});
 	Settings::AddSubsectionTitle(
 		container,
-		rpl::single(u"3 chats selected"_q));
+		std::move(subtitle));
 
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
@@ -561,6 +584,10 @@ rpl::producer<bool> LinkController::hasChangesValue() const {
 	return _hasChanges.value();
 }
 
+base::flat_set<not_null<PeerData*>> LinkController::selected() const {
+	return _selected.current();
+}
+
 LinksController::LinksController(
 	not_null<Window::SessionController*> window,
 	rpl::producer<std::vector<InviteLinkData>> content,
@@ -804,7 +831,7 @@ void ExportFilterLink(
 	) | ranges::to<QVector>();
 	session->api().request(MTPcommunities_ExportCommunityInvite(
 		MTP_inputCommunityDialogFilter(MTP_int(id)),
-		MTP_string(),
+		MTP_string(), // title
 		MTP_vector<MTPInputPeer>(std::move(mtpPeers))
 	)).done([=](const MTPcommunities_ExportedCommunityInvite &result) {
 		const auto &data = result.data();
@@ -821,6 +848,34 @@ void ExportFilterLink(
 	}).send();
 }
 
+void EditLinkChats(
+		const Data::ChatFilterLink &link,
+		base::flat_set<not_null<PeerData*>> peers) {
+	Expects(!peers.empty());
+	Expects(link.id != 0);
+	Expects(!link.url.isEmpty());
+
+	const auto id = link.id;
+	const auto front = peers.front();
+	const auto session = &front->session();
+	auto mtpPeers = peers | ranges::views::transform(
+		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
+	) | ranges::to<QVector>();
+	session->api().request(MTPcommunities_EditExportedInvite(
+		MTP_flags(MTPcommunities_EditExportedInvite::Flag::f_peers),
+		MTP_inputCommunityDialogFilter(MTP_int(link.id)),
+		MTP_string(link.url),
+		MTPstring(), // title
+		MTP_vector<MTPInputPeer>(std::move(mtpPeers))
+	)).done([=](const MTPExportedCommunityInvite &result) {
+		const auto &data = result.data();
+		const auto link = session->data().chatsFilters().add(id, result);
+		//done(link);
+	}).fail([=](const MTP::Error &error) {
+		//done({ .id = id });
+	}).send();
+}
+
 object_ptr<Ui::BoxContent> ShowLinkBox(
 		not_null<Window::SessionController*> window,
 		const Data::ChatFilter &filter,
@@ -837,7 +892,12 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 			box->clearButtons();
 			if (has) {
 				box->addButton(tr::lng_settings_save(), [=] {
-
+					const auto chosen = raw->selected();
+					if (chosen.empty()) {
+						ShowEmptyLinkError(window);
+					} else {
+						EditLinkChats(link, chosen);
+					}
 				});
 				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 			} else {
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 19fce2ad3..cf6673c44 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_authorizations.h"
 #include "api/api_confirm_phone.h"
 #include "api/api_text_entities.h"
+#include "api/api_chat_filters.h"
 #include "api/api_chat_invite.h"
 #include "base/qthelp_regex.h"
 #include "base/qthelp_url.h"
@@ -78,6 +79,18 @@ bool JoinGroupByHash(
 	return true;
 }
 
+bool JoinFilterBySlug(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	Api::CheckFilterInvite(controller, match->captured(1));
+	controller->window().activate();
+	return true;
+}
+
 bool ShowStickerSet(
 		Window::SessionController *controller,
 		const Match &match,
@@ -829,6 +842,10 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			u"^join/?\\?invite=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"_q,
 			JoinGroupByHash
 		},
+		{
+			u"^list/?\\?slug=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"_q,
+			JoinFilterBySlug
+		},
 		{
 			u"^(addstickers|addemoji)/?\\?set=([a-zA-Z0-9\\.\\_]+)(&|$)"_q,
 			ShowStickerSet
@@ -953,6 +970,8 @@ QString TryConvertUrlToLocal(QString url) {
 			return u"tg://resolve?phone="_q + phoneMatch->captured(1) + (params.isEmpty() ? QString() : '&' + params);
 		} else if (const auto joinChatMatch = regex_match(u"^(joinchat/|\\+|\\%20)([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
 			return u"tg://join?invite="_q + url_encode(joinChatMatch->captured(2));
+		} else if (const auto joinFilterMatch = regex_match(u"^(list/)([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
+			return u"tg://list?slug="_q + url_encode(joinFilterMatch->captured(2));
 		} else if (const auto stickerSetMatch = regex_match(u"^(addstickers|addemoji)/([a-zA-Z0-9\\.\\_]+)(\\?|$)"_q, query, matchOptions)) {
 			return u"tg://"_q + stickerSetMatch->captured(1) + "?set=" + url_encode(stickerSetMatch->captured(2));
 		} else if (const auto themeMatch = regex_match(u"^addtheme/([a-zA-Z0-9\\.\\_]+)(\\?|$)"_q, query, matchOptions)) {
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 7f255f4a6..1404c5fdd 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -329,6 +329,11 @@ void ChatFilters::load() {
 	load(false);
 }
 
+void ChatFilters::reload() {
+	_reloading = true;
+	load();
+}
+
 void ChatFilters::load(bool force) {
 	if (_loadRequestId && !force) {
 		return;
@@ -341,6 +346,10 @@ void ChatFilters::load(bool force) {
 		_loadRequestId = 0;
 	}).fail([=] {
 		_loadRequestId = 0;
+		if (_reloading) {
+			_reloading = false;
+			_listChanged.fire({});
+		}
 	}).send();
 }
 
@@ -372,8 +381,9 @@ void ChatFilters::received(const QVector<MTPDialogFilter> &list) {
 	if (!ranges::contains(begin(_list), end(_list), 0, &ChatFilter::id)) {
 		_list.insert(begin(_list), ChatFilter());
 	}
-	if (changed || !_loaded) {
+	if (changed || !_loaded || _reloading) {
 		_loaded = true;
+		_reloading = false;
 		_listChanged.fire({});
 	}
 }
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index ff5e697a4..69999a124 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -112,6 +112,7 @@ public:
 	void setPreloaded(const QVector<MTPDialogFilter> &result);
 
 	void load();
+	void reload();
 	void apply(const MTPUpdate &update);
 	void set(ChatFilter filter);
 	void remove(FilterId id);
@@ -175,6 +176,7 @@ private:
 	mtpRequestId _saveOrderRequestId = 0;
 	mtpRequestId _saveOrderAfterId = 0;
 	bool _loaded = false;
+	bool _reloading = false;
 
 	mtpRequestId _suggestedRequestId = 0;
 	std::vector<SuggestedFilter> _suggested;
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 85a982fb6..b5b304ec7 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -538,3 +538,13 @@ powerSavingButtonNoIcon: SettingsButton(powerSavingButton) {
 	padding: margins(22px, 8px, 22px, 8px);
 }
 powerSavingSubtitlePadding: margins(0px, 4px, 0px, -2px);
+
+filterInviteBox: Box(defaultBox) {
+	buttonPadding: margins(12px, 12px, 12px, 12px);
+	buttonHeight: 44px;
+	button: RoundButton(defaultActiveButton) {
+		height: 44px;
+		textTop: 12px;
+		font: font(13px semibold);
+	}
+}

From fb16375a195dc9f52cb476ab93810683eeb84aa2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 Mar 2023 20:24:54 +0400
Subject: [PATCH 004/676] Delete filter links, edit filter link names.

---
 .../boxes/filters/edit_filter_box.cpp         |   1 +
 .../boxes/filters/edit_filter_links.cpp       | 110 +++++++++++++-----
 .../SourceFiles/data/data_chat_filters.cpp    |  23 +++-
 Telegram/SourceFiles/data/data_chat_filters.h |   2 +-
 .../SourceFiles/settings/settings_folders.cpp |  20 +++-
 5 files changed, 117 insertions(+), 39 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 26a0a6d31..c52d16202 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -692,6 +692,7 @@ void EditFilterBox(
 			rules.never());
 		if (title.isEmpty()) {
 			name->showError();
+			box->scrollToY(0);
 			return {};
 		} else if (!(rules.flags() & kTypes) && rules.always().empty()) {
 			window->window().showToast(tr::lng_filters_empty(tr::now));
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 3fa2aeeee..30298fb72 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -87,6 +87,7 @@ void ShowEmptyLinkError(not_null<Window::SessionController*> window) {
 
 void ChatFilterLinkBox(
 		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
 		Data::ChatFilterLink data) {
 	using namespace rpl::mappers;
 
@@ -139,10 +140,20 @@ void ChatFilterLinkBox(
 	labelField->setMaxLength(kMaxLinkTitleLength);
 	Settings::AddDivider(container);
 
+	box->setFocusCallback([=] {
+		labelField->setFocusFast();
+	});
+
 	const auto &saveLabel = link.isEmpty()
 		? tr::lng_formatting_link_create
 		: tr::lng_settings_save;
-	box->addButton(saveLabel(), [=] {});
+	box->addButton(saveLabel(), [=] {
+		session->data().chatsFilters().edit(
+			data.id,
+			data.url,
+			labelField->getLastText().trimmed());
+		box->closeBox();
+	});
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
@@ -420,6 +431,19 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 	}, divider->lifetime());
 }
 
+object_ptr<Ui::BoxContent> DeleteLinkBox(
+		not_null<Window::SessionController*> window,
+		const InviteLinkData &link) {
+	const auto sure = [=](Fn<void()> &&close) {
+		window->session().data().chatsFilters().destroy(link.id, link.url);
+		close();
+	};
+	return Ui::MakeConfirmBox({
+		u"Are you sure you want to delete this link?"_q, // langs
+		sure,
+	});
+}
+
 void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 	using namespace Settings;
 
@@ -439,14 +463,14 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			Ui::LayerOption::KeepOther);
 	});
 	const auto editLink = crl::guard(weak, [=] {
-		//delegate()->peerListShowBox(
-		//	EditLinkBox(_window, _data.current()),
-		//	Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(
+			Box(ChatFilterLinkBox, &_window->session(), _data),
+			Ui::LayerOption::KeepOther);
 	});
 	const auto deleteLink = crl::guard(weak, [=] {
-		//delegate()->peerListShowBox(
-		//	DeleteLinkBox(_window, _data.current()),
-		//	Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(
+			DeleteLinkBox(_window, _data),
+			Ui::LayerOption::KeepOther);
 	});
 
 	const auto createMenu = [=] {
@@ -466,7 +490,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			getLinkQr,
 			&st::menuIconQrCode);
 		result->addAction(
-			tr::lng_group_invite_context_edit(tr::now),
+			u"Name Link"_q, // langs
 			editLink,
 			&st::menuIconEdit);
 		result->addAction(
@@ -502,6 +526,8 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 }
 
 void LinkController::prepare() {
+	Expects(!_data.url.isEmpty() || _data.chats.empty());
+
 	setupAboveWidget();
 	for (const auto &history : _data.chats) {
 		const auto peer = history->peer;
@@ -522,7 +548,7 @@ void LinkController::prepare() {
 		delegate()->peerListAppendRow(std::move(row));
 		if (const auto error = ErrorForSharing(history)) {
 			raw->setCustomStatus(*error);
-		} else {
+		} else if (!_data.url.isEmpty()) {
 			_allowed.emplace(peer);
 		}
 	}
@@ -663,32 +689,52 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 	const auto real = static_cast<Row*>(row.get());
 	const auto data = real->data();
 	const auto link = data.url;
+	const auto copyLink = [=] {
+		CopyInviteLink(delegate()->peerListToastParent(), link);
+	};
+	const auto shareLink = [=] {
+		delegate()->peerListShowBox(
+			ShareInviteLinkBox(&_window->session(), link),
+			Ui::LayerOption::KeepOther);
+	};
+	const auto getLinkQr = [=] {
+		delegate()->peerListShowBox(
+			InviteLinkQrBox(link),
+			Ui::LayerOption::KeepOther);
+	};
+	const auto editLink = [=] {
+		delegate()->peerListShowBox(
+			Box(ChatFilterLinkBox, &_window->session(), data),
+			Ui::LayerOption::KeepOther);
+	};
+	const auto deleteLink = [=] {
+		delegate()->peerListShowBox(
+			DeleteLinkBox(_window, data),
+			Ui::LayerOption::KeepOther);
+	};
 	auto result = base::make_unique_q<Ui::PopupMenu>(
 		parent,
 		st::popupMenuWithIcons);
-	result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {
-		//CopyInviteLink(delegate()->peerListToastParent(), link);
-	}, &st::menuIconCopy);
-	result->addAction(tr::lng_group_invite_context_share(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	ShareInviteLinkBox(_peer, link),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconShare);
-	result->addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	InviteLinkQrBox(link),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconQrCode);
-	result->addAction(tr::lng_group_invite_context_edit(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	EditLinkBox(_peer, data),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconEdit);
-	result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] {
-		//delegate()->peerListShowBox(
-		//	DeleteLinkBox(_peer, _admin, link),
-		//	Ui::LayerOption::KeepOther);
-	}, &st::menuIconDelete);
+	result->addAction(
+		tr::lng_group_invite_context_copy(tr::now),
+		copyLink,
+		&st::menuIconCopy);
+	result->addAction(
+		tr::lng_group_invite_context_share(tr::now),
+		shareLink,
+		&st::menuIconShare);
+	result->addAction(
+		tr::lng_group_invite_context_qr(tr::now),
+		getLinkQr,
+		&st::menuIconQrCode);
+	result->addAction(
+		u"Name Link"_q, // langs
+		editLink,
+		&st::menuIconEdit);
+	result->addAction(
+		tr::lng_group_invite_context_delete(tr::now),
+		deleteLink,
+		&st::menuIconDelete);
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 1404c5fdd..8cf286943 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -454,15 +454,36 @@ void ChatFilters::edit(
 	if (i != end(links)) {
 		i->title = title;
 		_communityLinksUpdated.fire_copy(id);
+
+		_owner->session().api().request(MTPcommunities_EditExportedInvite(
+			MTP_flags(MTPcommunities_EditExportedInvite::Flag::f_title),
+			MTP_inputCommunityDialogFilter(MTP_int(id)),
+			MTP_string(url),
+			MTP_string(title),
+			MTPVector<MTPInputPeer>() // peers
+		)).done([=](const MTPExportedCommunityInvite &result) {
+			//const auto &data = result.data();
+			//const auto link = _owner->chatsFilters().add(id, result);
+			//done(link);
+		}).fail([=](const MTP::Error &error) {
+			//done({ .id = id });
+		}).send();
 	}
 }
 
-void ChatFilters::remove(FilterId id, const QString &url) {
+void ChatFilters::destroy(FilterId id, const QString &url) {
 	auto &links = _communityLinks[id];
 	const auto i = ranges::find(links, url, &ChatFilterLink::url);
 	if (i != end(links)) {
 		links.erase(i);
 		_communityLinksUpdated.fire_copy(id);
+
+		const auto api = &_owner->session().api();
+		api->request(_linksRequestId).cancel();
+		_linksRequestId = api->request(MTPcommunities_DeleteExportedInvite(
+			MTP_inputCommunityDialogFilter(MTP_int(id)),
+			MTP_string(url)
+		)).send();
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index 69999a124..83875fd43 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -154,7 +154,7 @@ public:
 		FilterId id,
 		const QString &url,
 		const QString &title);
-	void remove(FilterId id, const QString &url);
+	void destroy(FilterId id, const QString &url);
 	rpl::producer<std::vector<ChatFilterLink>> communityLinks(
 		FilterId id) const;
 	void reloadCommunityLinks(FilterId id);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 4a8dc7e70..a34a584aa 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -629,6 +629,15 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		] {
 			const auto api = &session->api();
 			const auto filters = &session->data().chatsFilters();
+			const auto ids = std::make_shared<
+				base::flat_set<mtpRequestId>
+			>();
+			const auto checkFinished = [=] {
+				if (ids->empty() && next) {
+					Assert(updated.id() != 0);
+					next(updated);
+				}
+			};
 			for (const auto &update : updates) {
 				filters->apply(update);
 			}
@@ -639,15 +648,16 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			for (auto &request : requests) {
 				previousId = api->request(
 					std::move(request)
-				).afterRequest(previousId).send();
+				).done([=](const auto &, mtpRequestId id) {
+					ids->remove(id);
+					checkFinished();
+				}).afterRequest(previousId).send();
+				ids->emplace(previousId);
 			}
 			if (!order.empty() && !addRequests.empty()) {
 				filters->saveOrder(order, previousId);
 			}
-			if (next) {
-				Assert(updated.id() != 0);
-				next(updated);
-			}
+			checkFinished();
 		});
 	};
 	return [copy = state->save] {

From 86f9875662705c5b4d6d852b3736efed24f66702 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 Mar 2023 15:11:06 +0400
Subject: [PATCH 005/676] Add most of the phrases to the langpack.

---
 Telegram/Resources/langs/lang.strings         |  49 +++++++-
 Telegram/SourceFiles/api/api_chat_filters.cpp |  87 ++++++++-----
 .../boxes/filters/edit_filter_box.cpp         |  13 +-
 .../boxes/filters/edit_filter_links.cpp       | 118 +++++++++++++-----
 4 files changed, 197 insertions(+), 70 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e694cc160..b41c7d502 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -232,6 +232,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_file_size_limit1" = "The document can't be sent, because it is larger than {size}.";
 "lng_file_size_limit2" = "You can double this limit to {size} per document by subscribing to **Telegram Premium**.";
 
+"lng_filter_links_limit_title" = "Limit Reached";
+"lng_filter_links_limit1#one" = "Sorry, you can't create more than **{count}** invite link.";
+"lng_filter_links_limit1#other" = "Sorry, you can't create more than **{count}** invite links.";
+"lng_filter_links_limit2#one" = "You can increase the limit to **{count}** link by subscribing to **Telegram Premium**.";
+"lng_filter_links_limit2#other" = "You can increase the limit to **{count}** links by subscribing to **Telegram Premium**.";
+
+"lng_filter_shared_limit_title" = "Limit Reached";
+"lng_filter_shared_limit1#one" = "Sorry, you can't add more than **{count}** shareable folders.";
+"lng_filter_shared_limit1#other" = "Sorry, you can't add more than **{count}** shareable folders.";
+"lng_filter_shared_limit2#one" = "You can increase the limit up to **{count}** folder by subscribing to **Telegram Premium**.";
+"lng_filter_shared_limit2#other" = "You can increase the limit up to **{count}** folders by subscribing to **Telegram Premium**.";
+
 "lng_limits_increase" = "Increase Limit";
 
 "lng_sticker_premium_text" = "This pack contains premium stickers like this one.";
@@ -3541,22 +3553,46 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_toast_add" = "{chat} added to {folder} folder";
 "lng_filters_toast_remove" = "{chat} removed from {folder} folder";
 
-"lng_filters_link" = "Invite Link";
+"lng_filters_link" = "Invite links";
+"lng_filters_link_badge" = "New";
 "lng_filters_link_create" = "Share Folder";
-"lng_filters_link_add" = "Add Link";
-"lng_filters_link_cant" = "You can only share folders that have several explicit chats selected, no general chat types and no exclusions.";
+"lng_filters_link_cant" = "No way to share folders with chat types or excluded chats.";
 "lng_filters_link_about" = "Share access to some of this folder's groups and channels with others.";
+"lng_filters_link_about_many" = "Create more links to set up different access levels for different people.";
 "lng_filters_link_title" = "Share Folder";
-"lng_filters_link_select" = "Select the chats you want to share with the link.";
+"lng_filters_link_share_about" = "Anyone with this link can add the {folder} folder and the chats selected below.";
+"lng_filters_link_subtitle" = "Invite link";
+"lng_filters_link_chats_none" = "No chats selected";
+"lng_filters_link_chats#one" = "{count} chat selected";
+"lng_filters_link_chats#other" = "{count} chats selected";
+"lng_filters_link_bot_status" = "you can't share chats with bots";
+"lng_filters_link_bot_error" = "Chat's with bots can't be shared You can't share chats with bots";
+"lng_filters_link_private_status" = "you can't share private chats";
+"lng_filters_link_private_error" = "You can't share private chats";
+"lng_filters_link_noadmin_status" = "you can't invite others here";
+"lng_filters_link_noadmin_group_error" = "You don't have the admin rights to share invite links to this group chat.";
+"lng_filters_link_noadmin_channel_error" = "You don't have the admin rights to share invite links to this channel.";
+"lng_filters_link_chats_about" = "Select groups and channels that you want everyone who adds the folder via invite link to join.";
+"lng_filters_link_no_about" = "There are no chats in this folder that you can share with others.";
+"lng_filters_link_chats_no" = "These chats cannot be shared";
+"lng_filters_link_chats_no_about" = "You can only share groups and channels in which you are allowed to create invite links.";
+"lng_filters_link_name_it" = "Name Link";
+"lng_filters_link_delete_sure" = "Are you sure you want to delete this link?";
 "lng_filters_by_link_title" = "Add Folder";
 "lng_filters_by_link_sure" = "Do you want to add a new chat folder {folder} and join its groups and channels?";
 "lng_filters_by_link_join#one" = "{count} chat to join";
 "lng_filters_by_link_join#other" = "{count} chats to join";
-"lng_filters_by_link_add" = "Add {folder}";
+"lng_filters_by_link_add_button" = "Add {folder}";
+"lng_filters_by_link_add_no" = "Do not add this folder";
 "lng_filters_by_link_more" = "Add Chats to Folder";
 "lng_filters_by_link_more_sure" = "Do you want to join chats and add them to your folder {folder}?";
 "lng_filters_by_link_about" = "You can deselect the chats you don't want to join.";
 "lng_filters_by_link_join_button" = "Join Chats";
+"lng_filters_by_link_join_no" = "Do not join any chats";
+"lng_filters_by_link_already" = "Folder already added";
+"lng_filters_by_link_already_about" = "You have already added the folder {folder} and all its chats.";
+"lng_filters_by_link_in#one" = "{count} chat in this folder";
+"lng_filters_by_link_in#other" = "{count} chats in this folder";
 "lng_filters_by_link_remove" = "Remove Folder";
 "lng_filters_by_link_remove_sure" = "Do you want to quit the chats you joined when added the folder {folder}?";
 "lng_filters_by_link_quit#one" = "{count} chat to quit";
@@ -3565,6 +3601,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_by_link_deselect" = "Deselect All";
 "lng_filters_by_link_remove_button" = "Remove Folder";
 "lng_filters_by_link_quit_button" = "Remove Folder and Chats";
+"lng_filters_bar_you_can#one" = "You can join {count} new chat";
+"lng_filters_bar_you_can#other" = "You can join {count} new chats";
+"lng_filters_bar_view" = "Click here to view them";
 
 "lng_chat_theme_change" = "Change colors";
 "lng_chat_theme_none" = "No\nTheme";
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 837af84d9..5396f14f7 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "window/window_session_controller.h"
@@ -64,6 +65,7 @@ public:
 
 private:
 	void setupAboveWidget();
+	void setupBelowWidget();
 
 	const not_null<Window::SessionController*> _window;
 
@@ -81,16 +83,15 @@ private:
 };
 
 [[nodiscard]] rpl::producer<QString> TitleText(HeaderType type) {
-	// langs
 	switch (type) {
 	case HeaderType::AddingFilter:
-		return rpl::single(u"Add Folder"_q);
+		return tr::lng_filters_by_link_title();
 	case HeaderType::AddingChats:
-		return rpl::single(u"Add Chats to Folder"_q);
+		return tr::lng_filters_by_link_more();
 	case HeaderType::AllAdded:
-		return rpl::single(u"Folder Already Added"_q);
+		return tr::lng_filters_by_link_already();
 	case HeaderType::Removing:
-		return rpl::single(u"Remove Folder"_q);
+		return tr::lng_filters_by_link_remove();
 	}
 	Unexpected("HeaderType in TitleText.");
 }
@@ -98,27 +99,44 @@ private:
 void FillHeader(
 		not_null<Ui::VerticalLayout*> container,
 		HeaderDescriptor descriptor) {
-	// langs
-	const auto description = (descriptor.type == HeaderType::AddingFilter)
-		? (u"Do you want to add a new chat folder "_q
-			+ descriptor.title
-			+ u" and join its groups and channels?"_q)
+	const auto phrase = (descriptor.type == HeaderType::AddingFilter)
+		? tr::lng_filters_by_link_sure
 		: (descriptor.type == HeaderType::AddingChats)
-		? (u"Do you want to join "_q
-			+ QString::number(descriptor.badge)
-			+ u" chats and add them to your folder "_q
-			+ descriptor.title + '?')
+		? tr::lng_filters_by_link_more_sure
 		: (descriptor.type == HeaderType::AllAdded)
-		? (u"You have already added the folder "_q
-			+ descriptor.title
-			+ u" and all its chats."_q)
-		: (u"Do you want to quit the chats you joined "
-			"when adding the folder "_q
-			+ descriptor.title + '?');
+		? tr::lng_filters_by_link_already_about
+		: tr::lng_filters_by_link_remove_sure;
+	auto boldTitle = Ui::Text::Bold(descriptor.title);
+	auto description = (descriptor.type == HeaderType::AddingFilter)
+		? tr::lng_filters_by_link_sure(
+			tr::now,
+			lt_folder,
+			std::move(boldTitle),
+			Ui::Text::WithEntities)
+		: (descriptor.type == HeaderType::AddingChats)
+		? tr::lng_filters_by_link_more_sure(
+			tr::now,
+			lt_folder,
+			std::move(boldTitle),
+			Ui::Text::WithEntities)
+		: (descriptor.type == HeaderType::AllAdded)
+		? tr::lng_filters_by_link_already_about(
+			tr::now,
+			lt_folder,
+			std::move(boldTitle),
+			Ui::Text::WithEntities)
+		: tr::lng_filters_by_link_remove_sure(
+			tr::now,
+			lt_folder,
+			std::move(boldTitle),
+			Ui::Text::WithEntities);
 	container->add(
 		object_ptr<Ui::FlatLabel>(
 			container,
-			description,
+			phrase(
+				lt_folder,
+				rpl::single(Ui::Text::Bold(descriptor.title)),
+				Ui::Text::WithEntities),
 			st::boxDividerLabel),
 		st::boxRowPadding);
 }
@@ -152,12 +170,12 @@ void ImportInvite(
 }
 
 ToggleChatsController::ToggleChatsController(
-		not_null<Window::SessionController*> window,
-		ToggleAction action,
-		const QString &slug,
-		FilterId filterId,
-		const QString &title,
-		std::vector<not_null<PeerData*>> chats)
+	not_null<Window::SessionController*> window,
+	ToggleAction action,
+	const QString &slug,
+	FilterId filterId,
+	const QString &title,
+	std::vector<not_null<PeerData*>> chats)
 : _window(window)
 , _action(action)
 , _slug(slug)
@@ -168,6 +186,7 @@ ToggleChatsController::ToggleChatsController(
 
 void ToggleChatsController::prepare() {
 	setupAboveWidget();
+	setupBelowWidget();
 	auto selected = base::flat_set<not_null<PeerData*>>();
 	for (const auto &peer : _chats) {
 		auto row = std::make_unique<PeerListRow>(peer);
@@ -211,9 +230,22 @@ void ToggleChatsController::setupAboveWidget() {
 		.badge = (type == HeaderType::AddingChats) ? int(_chats.size()) : 0,
 	});
 
+	// lng_filters_by_link_join; // langs
+
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
 
+void ToggleChatsController::setupBelowWidget() {
+	delegate()->peerListSetBelowWidget(
+		object_ptr<Ui::DividerLabel>(
+			(QWidget*)nullptr,
+			object_ptr<Ui::FlatLabel>(
+				(QWidget*)nullptr,
+				tr::lng_filters_by_link_about(),
+				st::boxDividerLabel),
+			st::settingsDividerLabelPadding));
+}
+
 Main::Session &ToggleChatsController::session() const {
 	return _window->session();
 }
@@ -226,7 +258,6 @@ auto ToggleChatsController::selectedValue() const
 [[nodiscard]] void AlreadyFilterBox(
 		not_null<Ui::GenericBox*> box,
 		const QString &title) {
-	// langs
 	box->setTitle(TitleText(HeaderType::AllAdded));
 
 	FillHeader(box->verticalLayout(), {
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index c52d16202..003efe022 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -744,11 +744,7 @@ void EditFilterBox(
 		}
 		const auto shared = CollectFilterLinkChats(*result);
 		if (shared.empty()) {
-			// langs
-			Ui::ShowMultilineToast({
-				.parentOverride = Window::Show(window).toastParent(),
-				.text = { tr::lng_filters_link_cant(tr::now) },
-			});
+			window->show(ShowLinkBox(window, *result, {}));
 			return;
 		}
 		saveAnd(*result, crl::guard(box, [=](Data::ChatFilter updated) {
@@ -767,7 +763,12 @@ void EditFilterBox(
 	}, createLink->lifetime());
 
 	AddSkip(content);
-	AddDividerText(content, tr::lng_filters_link_about());
+	AddDividerText(
+		content,
+		rpl::conditional(
+			state->hasLinks.value(),
+			tr::lng_filters_link_about_many(),
+			tr::lng_filters_link_about()));
 
 	const auto show = std::make_shared<Ui::BoxShow>(box);
 	const auto refreshPreviews = [=] {
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 30298fb72..a181d3dac 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_peer_invite_link.h" // InviteLinkQrBox.
 #include "boxes/peer_list_box.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_chat_filters.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -22,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/invite_link_buttons.h"
 #include "ui/controls/invite_link_label.h"
+#include "ui/text/text_utilities.h"
 #include "ui/toasts/common_toasts.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/popup_menu.h"
@@ -60,28 +62,49 @@ struct InviteLinkAction {
 	Type type = Type::Copy;
 };
 
-[[nodiscard]] std::optional<QString> ErrorForSharing(
+struct Errors {
+	QString status;
+	QString toast;
+};
+
+[[nodiscard]] std::optional<Errors> ErrorForSharing(
 		not_null<History*> history) {
+	const auto result = [](const QString &status, const QString &toast) {
+		return Errors{ status, toast };
+	};
 	const auto peer = history->peer;
-	if (const auto user = peer->asUser()) { // langs
+	if (const auto user = peer->asUser()) {
 		return user->isBot()
-			? u"you can't share chats with bots"_q
-			: u"you can't share private chats"_q;
-	} else if (const auto channel = history->peer->asChannel()) {
-		if (!channel->canHaveInviteLink()) {
-			return u"you can't invite others here"_q;
+			? result(
+				tr::lng_filters_link_bot_status(tr::now),
+				tr::lng_filters_link_bot_error(tr::now))
+			: result(
+				tr::lng_filters_link_private_status(tr::now),
+				tr::lng_filters_link_private_error(tr::now));
+	} else if (const auto chat = history->peer->asChat()) {
+		if (!chat->canHaveInviteLink()) {
+			return result(
+				tr::lng_filters_link_noadmin_status(tr::now),
+				tr::lng_filters_link_noadmin_group_error(tr::now));
+		}
+		return std::nullopt;
+	} else if (const auto channel = history->peer->asChannel()) {
+		if (!channel->canHaveInviteLink()) {
+			return result(
+				tr::lng_filters_link_noadmin_status(tr::now),
+				(channel->isMegagroup()
+					? tr::lng_filters_link_noadmin_group_error(tr::now)
+					: tr::lng_filters_link_noadmin_channel_error(tr::now)));
 		}
 		return std::nullopt;
-	} else {
-		return u"you can't share this :("_q;
 	}
+	Unexpected("Peer type in ErrorForSharing.");
 }
 
 void ShowEmptyLinkError(not_null<Window::SessionController*> window) {
-	// langs
 	Ui::ShowMultilineToast({
 		.parentOverride = Window::Show(window).toastParent(),
-		.text = { u"Link should have at least one chat shared."_q },
+		.text = { tr::lng_filters_empty(tr::now) },
 	});
 }
 
@@ -359,14 +382,16 @@ public:
 
 private:
 	void setupAboveWidget();
+	void setupBelowWidget();
 	void addHeader(not_null<Ui::VerticalLayout*> container);
 	void addLinkBlock(not_null<Ui::VerticalLayout*> container);
 
 	const not_null<Window::SessionController*> _window;
 	InviteLinkData _data;
 
+	QString _filterTitle;
 	base::flat_set<not_null<History*>> _filterChats;
-	base::flat_set<not_null<PeerData*>> _allowed;
+	base::flat_map<not_null<PeerData*>, QString> _denied;
 	rpl::variable<base::flat_set<not_null<PeerData*>>> _selected;
 	base::flat_set<not_null<PeerData*>> _initial;
 
@@ -387,6 +412,7 @@ LinkController::LinkController(
 	const Data::ChatFilter &filter,
 	InviteLinkData data)
 : _window(window)
+, _filterTitle(filter.title())
 , _filterChats(filter.always()) {
 	_data = std::move(data);
 	_link = _data.url;
@@ -421,7 +447,12 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 			verticalLayout,
 			object_ptr<Ui::FlatLabel>(
 				verticalLayout,
-				tr::lng_filters_about(), // langs
+				(_data.url.isEmpty()
+					? tr::lng_filters_link_no_about(Ui::Text::WithEntities)
+					: tr::lng_filters_link_share_about(
+						lt_folder,
+						rpl::single(Ui::Text::Bold(_filterTitle)),
+						Ui::Text::WithEntities)),
 				st::settingsFilterDividerLabel)),
 		st::settingsFilterDividerLabelPadding);
 
@@ -439,8 +470,9 @@ object_ptr<Ui::BoxContent> DeleteLinkBox(
 		close();
 	};
 	return Ui::MakeConfirmBox({
-		u"Are you sure you want to delete this link?"_q, // langs
-		sure,
+		.text = tr::lng_filters_link_delete_sure(tr::now),
+		.confirmed = sure,
+		.confirmText = tr::lng_box_delete(tr::now),
 	});
 }
 
@@ -490,7 +522,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			getLinkQr,
 			&st::menuIconQrCode);
 		result->addAction(
-			u"Name Link"_q, // langs
+			tr::lng_filters_link_name_it(tr::now),
 			editLink,
 			&st::menuIconEdit);
 		result->addAction(
@@ -499,8 +531,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			&st::menuIconDelete);
 		return result;
 	};
-
-	AddSubsectionTitle(container, tr::lng_manage_peer_link_invite());
+	AddSubsectionTitle(container, tr::lng_filters_link_subtitle());
 
 	const auto prefix = u"https://"_q;
 	const auto label = container->lifetime().make_state<Ui::InviteLinkLabel>(
@@ -529,9 +560,9 @@ void LinkController::prepare() {
 	Expects(!_data.url.isEmpty() || _data.chats.empty());
 
 	setupAboveWidget();
+	setupBelowWidget();
 	for (const auto &history : _data.chats) {
 		const auto peer = history->peer;
-		_allowed.emplace(peer);
 		auto row = std::make_unique<PeerListRow>(peer);
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
@@ -547,9 +578,10 @@ void LinkController::prepare() {
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
 		if (const auto error = ErrorForSharing(history)) {
-			raw->setCustomStatus(*error);
-		} else if (!_data.url.isEmpty()) {
-			_allowed.emplace(peer);
+			raw->setCustomStatus(error->status);
+			_denied.emplace(peer, error->toast);
+		} else if (_data.url.isEmpty()) {
+			_denied.emplace(peer);
 		}
 	}
 	delegate()->peerListRefreshRows();
@@ -557,8 +589,15 @@ void LinkController::prepare() {
 }
 
 void LinkController::rowClicked(not_null<PeerListRow*> row) {
-	if (_allowed.contains(row->peer())) {
-		const auto peer = row->peer();
+	const auto peer = row->peer();
+	if (const auto i = _denied.find(peer); i != end(_denied)) {
+		if (!i->second.isEmpty()) {
+			Ui::ShowMultilineToast({
+				.parentOverride = delegate()->peerListToastParent(),
+				.text = { i->second },
+			});
+		}
+	} else {
 		const auto checked = row->checked();
 		auto selected = _selected.current();
 		delegate()->peerListSetRowChecked(row, !checked);
@@ -588,12 +627,16 @@ void LinkController::setupAboveWidget() {
 		addLinkBlock(container);
 	}
 
-	// langs
 	auto subtitle = _selected.value(
-	) | rpl::map([](const base::flat_set<not_null<PeerData*>> &selected) {
-		return selected.empty()
-			? u"No chats selected"_q
-			: (QString::number(selected.size()) + u" chats selected"_q);
+	) | rpl::map([=](const base::flat_set<not_null<PeerData*>> &selected) {
+		return _data.url.isEmpty()
+			? tr::lng_filters_link_chats_no(tr::now)
+			: selected.empty()
+			? tr::lng_filters_link_chats_none(tr::now)
+			: tr::lng_filters_link_chats(
+				tr::now,
+				lt_count,
+				float64(selected.size()));
 	});
 	Settings::AddSubsectionTitle(
 		container,
@@ -602,6 +645,19 @@ void LinkController::setupAboveWidget() {
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
 
+void LinkController::setupBelowWidget() {
+	delegate()->peerListSetBelowWidget(
+		object_ptr<Ui::DividerLabel>(
+			(QWidget*)nullptr,
+			object_ptr<Ui::FlatLabel>(
+				(QWidget*)nullptr,
+				(_data.url.isEmpty()
+					? tr::lng_filters_link_chats_no_about()
+					: tr::lng_filters_link_chats_about()),
+				st::boxDividerLabel),
+			st::settingsDividerLabelPadding));
+}
+
 Main::Session &LinkController::session() const {
 	return _window->session();
 }
@@ -728,7 +784,7 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 		getLinkQr,
 		&st::menuIconQrCode);
 	result->addAction(
-		u"Name Link"_q, // langs
+		tr::lng_filters_link_name_it(tr::now),
 		editLink,
 		&st::menuIconEdit);
 	result->addAction(
@@ -931,7 +987,7 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 	auto initBox = [=](not_null<Ui::BoxContent*> box) {
 		box->setTitle(!link.title.isEmpty()
 			? rpl::single(link.title)
-			: tr::lng_manage_peer_link_invite());
+			: tr::lng_filters_link_title());
 
 		raw->hasChangesValue(
 		) | rpl::start_with_next([=](bool has) {

From 7684dbc7011e9e6c5ec7700f3be348b7b16da7c4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 Mar 2023 17:11:04 +0400
Subject: [PATCH 006/676] Allow "Nobody" in group/channel invites privacy.

---
 .../SourceFiles/settings/settings_privacy_controllers.cpp     | 4 ----
 Telegram/SourceFiles/settings/settings_privacy_controllers.h  | 1 -
 2 files changed, 5 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index f983f856c..f28b44e96 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -686,10 +686,6 @@ rpl::producer<QString> GroupsInvitePrivacyController::title() const {
 	return tr::lng_edit_privacy_groups_title();
 }
 
-bool GroupsInvitePrivacyController::hasOption(Option option) const {
-	return (option != Option::Nobody);
-}
-
 rpl::producer<QString> GroupsInvitePrivacyController::optionsTitleKey(
 		) const {
 	return tr::lng_edit_privacy_groups_header();
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index 2d7d26ae6..3aa1e36d2 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -126,7 +126,6 @@ public:
 	Key key() const override;
 
 	rpl::producer<QString> title() const override;
-	bool hasOption(Option option) const override;
 	rpl::producer<QString> optionsTitleKey() const override;
 	rpl::producer<QString> exceptionButtonTextKey(
 		Exception exception) const override;

From 0faadc8fa0791d61bdbe3a0320b380446f7f3dcc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 Mar 2023 17:23:21 +0400
Subject: [PATCH 007/676] Implement folder link add / join design.

---
 Telegram/SourceFiles/api/api_chat_filters.cpp | 260 ++++++----
 .../boxes/filters/edit_filter_links.cpp       |   8 +-
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   1 +
 .../SourceFiles/mtproto/session_private.cpp   |   5 +
 .../platform/platform_overlay_widget.cpp      |  17 +-
 Telegram/SourceFiles/settings/settings.style  |  48 +-
 .../ui/controls/filter_link_header.cpp        | 446 ++++++++++++++++++
 .../ui/controls/filter_link_header.h          |  49 ++
 Telegram/cmake/td_ui.cmake                    |   2 +
 Telegram/lib_ui                               |   2 +-
 10 files changed, 725 insertions(+), 113 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/controls/filter_link_header.cpp
 create mode 100644 Telegram/SourceFiles/ui/controls/filter_link_header.h

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 5396f14f7..03149b6e3 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -15,11 +15,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/controls/filter_link_header.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "window/window_session_controller.h"
+#include "styles/style_filter_icons.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
 
@@ -31,19 +34,6 @@ enum class ToggleAction {
 	Removing,
 };
 
-enum class HeaderType {
-	AddingFilter,
-	AddingChats,
-	AllAdded,
-	Removing,
-};
-
-struct HeaderDescriptor {
-	base::required<HeaderType> type;
-	base::required<QString> title;
-	int badge = 0;
-};
-
 class ToggleChatsController final
 	: public PeerListController
 	, public base::has_weak_ptr {
@@ -63,11 +53,14 @@ public:
 	[[nodiscard]] auto selectedValue() const
 		-> rpl::producer<base::flat_set<not_null<PeerData*>>>;
 
+	void setAddedTopHeight(int addedTopHeight);
+
 private:
 	void setupAboveWidget();
 	void setupBelowWidget();
 
 	const not_null<Window::SessionController*> _window;
+	Ui::RpWidget *_addedTopWidget = nullptr;
 
 	ToggleAction _action = ToggleAction::Adding;
 	QString _slug;
@@ -82,44 +75,42 @@ private:
 
 };
 
-[[nodiscard]] rpl::producer<QString> TitleText(HeaderType type) {
+[[nodiscard]] tr::phrase<> TitleText(Ui::FilterLinkHeaderType type) {
+	using Type = Ui::FilterLinkHeaderType;
 	switch (type) {
-	case HeaderType::AddingFilter:
-		return tr::lng_filters_by_link_title();
-	case HeaderType::AddingChats:
-		return tr::lng_filters_by_link_more();
-	case HeaderType::AllAdded:
-		return tr::lng_filters_by_link_already();
-	case HeaderType::Removing:
-		return tr::lng_filters_by_link_remove();
+	case Type::AddingFilter: return tr::lng_filters_by_link_title;
+	case Type::AddingChats: return tr::lng_filters_by_link_more;
+	case Type::AllAdded: return tr::lng_filters_by_link_already;
+	case Type::Removing: return tr::lng_filters_by_link_remove;
 	}
-	Unexpected("HeaderType in TitleText.");
+	Unexpected("Ui::FilterLinkHeaderType in TitleText.");
 }
 
-void FillHeader(
-		not_null<Ui::VerticalLayout*> container,
-		HeaderDescriptor descriptor) {
-	const auto phrase = (descriptor.type == HeaderType::AddingFilter)
+[[nodiscard]] TextWithEntities AboutText(
+		Ui::FilterLinkHeaderType type,
+		const QString &title) {
+	using Type = Ui::FilterLinkHeaderType;
+	const auto phrase = (type == Type::AddingFilter)
 		? tr::lng_filters_by_link_sure
-		: (descriptor.type == HeaderType::AddingChats)
+		: (type == Type::AddingChats)
 		? tr::lng_filters_by_link_more_sure
-		: (descriptor.type == HeaderType::AllAdded)
+		: (type == Type::AllAdded)
 		? tr::lng_filters_by_link_already_about
 		: tr::lng_filters_by_link_remove_sure;
-	auto boldTitle = Ui::Text::Bold(descriptor.title);
-	auto description = (descriptor.type == HeaderType::AddingFilter)
+	auto boldTitle = Ui::Text::Bold(title);
+	return (type == Type::AddingFilter)
 		? tr::lng_filters_by_link_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
 			Ui::Text::WithEntities)
-		: (descriptor.type == HeaderType::AddingChats)
+		: (type == Type::AddingChats)
 		? tr::lng_filters_by_link_more_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
 			Ui::Text::WithEntities)
-		: (descriptor.type == HeaderType::AllAdded)
+		: (type == Type::AllAdded)
 		? tr::lng_filters_by_link_already_about(
 			tr::now,
 			lt_folder,
@@ -130,35 +121,92 @@ void FillHeader(
 			lt_folder,
 			std::move(boldTitle),
 			Ui::Text::WithEntities);
-	container->add(
-		object_ptr<Ui::FlatLabel>(
-			container,
-			phrase(
-				lt_folder,
-				rpl::single(Ui::Text::Bold(descriptor.title)),
-				Ui::Text::WithEntities),
-			st::boxDividerLabel),
-		st::boxRowPadding);
+}
+
+void InitFilterLinkHeader(
+		not_null<PeerListBox*> box,
+		Fn<void(int)> setAddedTopHeight,
+		Ui::FilterLinkHeaderType type,
+		const QString &title,
+		rpl::producer<int> count) {
+	auto header = Ui::MakeFilterLinkHeader(box, {
+		.type = type,
+		.title = TitleText(type)(tr::now),
+		.about = AboutText(type, title),
+		.folderTitle = title,
+		.folderIcon = &st::foldersCustomActive,
+		.badge = (type == Ui::FilterLinkHeaderType::AddingChats
+			? std::move(count)
+			: rpl::single(0)),
+	});
+	const auto widget = header.widget;
+	widget->resizeToWidth(st::boxWideWidth);
+	Ui::SendPendingMoveResizeEvents(widget);
+
+	const auto min = widget->minimumHeight(), max = widget->maximumHeight();
+	widget->resize(st::boxWideWidth, max);
+
+	box->setAddedTopScrollSkip(max);
+	std::move(
+		header.wheelEvents
+	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+		box->sendScrollViewportEvent(e);
+	}, widget->lifetime());
+
+	struct State {
+		bool processing = false;
+		int addedTopHeight = 0;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+
+	box->scrolls(
+	) | rpl::filter([=] {
+		return !state->processing;
+	}) | rpl::start_with_next([=] {
+		state->processing = true;
+		const auto guard = gsl::finally([&] { state->processing = false; });
+
+		const auto top = box->scrollTop();
+		const auto height = box->scrollHeight();
+		const auto headerHeight = std::max(max - top, min);
+		const auto addedTopHeight = max - headerHeight;
+		widget->resize(widget->width(), headerHeight);
+		if (state->addedTopHeight < addedTopHeight) {
+			setAddedTopHeight(addedTopHeight);
+			box->setAddedTopScrollSkip(headerHeight);
+		} else {
+			box->setAddedTopScrollSkip(headerHeight);
+			setAddedTopHeight(addedTopHeight);
+		}
+		state->addedTopHeight = addedTopHeight;
+		box->peerListRefreshRows();
+	}, widget->lifetime());
+
+	box->setNoContentMargin(true);
 }
 
 void ImportInvite(
 		base::weak_ptr<Window::SessionController> weak,
 		const QString &slug,
-		const base::flat_set<not_null<PeerData*>> &peers) {
+		const base::flat_set<not_null<PeerData*>> &peers,
+		Fn<void()> done,
+		Fn<void()> fail) {
 	Expects(!peers.empty());
 
 	const auto peer = peers.front();
 	const auto api = &peer->session().api();
 	const auto callback = [=](const MTPUpdates &result) {
 		api->applyUpdates(result);
+		done();
 	};
 	const auto error = [=](const MTP::Error &error) {
 		if (const auto strong = weak.get()) {
 			Ui::ShowMultilineToast({
 				.parentOverride = Window::Show(strong).toastParent(),
-				.text = { error.description() },
+				.text = { error.type() },
 			});
 		}
+		fail();
 	};
 	auto inputs = peers | ranges::views::transform([](auto peer) {
 		return MTPInputPeer(peer->input);
@@ -182,6 +230,7 @@ ToggleChatsController::ToggleChatsController(
 , _filterId(filterId)
 , _filterTitle(title)
 , _chats(std::move(chats)) {
+	setStyleOverrides(&st::filterLinkChatsList);
 }
 
 void ToggleChatsController::prepare() {
@@ -218,19 +267,14 @@ void ToggleChatsController::setupAboveWidget() {
 	auto wrap = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
 	const auto container = wrap.data();
 
-	const auto type = !_filterId
-		? HeaderType::AddingFilter
-		: (_action == ToggleAction::Adding)
-		? HeaderType::AddingChats
-		: HeaderType::Removing;
-	delegate()->peerListSetTitle(TitleText(type));
-	FillHeader(container, {
-		.type = type,
-		.title = _filterTitle,
-		.badge = (type == HeaderType::AddingChats) ? int(_chats.size()) : 0,
-	});
-
-	// lng_filters_by_link_join; // langs
+	_addedTopWidget = container->add(object_ptr<Ui::RpWidget>(container));
+	AddDivider(container);
+	AddSubsectionTitle(
+		container,
+		tr::lng_filters_by_link_join(
+			lt_count,
+			rpl::single(float64(_chats.size()))),
+		st::filterLinkSubsectionTitlePadding);
 
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
@@ -241,7 +285,7 @@ void ToggleChatsController::setupBelowWidget() {
 			(QWidget*)nullptr,
 			object_ptr<Ui::FlatLabel>(
 				(QWidget*)nullptr,
-				tr::lng_filters_by_link_about(),
+				tr::lng_filters_by_link_about(tr::now),
 				st::boxDividerLabel),
 			st::settingsDividerLabelPadding));
 }
@@ -255,17 +299,10 @@ auto ToggleChatsController::selectedValue() const
 	return _selected.value();
 }
 
-[[nodiscard]] void AlreadyFilterBox(
-		not_null<Ui::GenericBox*> box,
-		const QString &title) {
-	box->setTitle(TitleText(HeaderType::AllAdded));
+void ToggleChatsController::setAddedTopHeight(int addedTopHeight) {
+	Expects(addedTopHeight >= 0);
 
-	FillHeader(box->verticalLayout(), {
-		.type = HeaderType::AllAdded,
-		.title = title,
-	});
-
-	box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+	_addedTopWidget->resize(_addedTopWidget->width(), addedTopHeight);
 }
 
 void ProcessFilterInvite(
@@ -279,15 +316,11 @@ void ProcessFilterInvite(
 		return;
 	}
 	Core::App().hideMediaView();
-	if (peers.empty()) {
-		if (filterId) {
-			strong->show(Box(AlreadyFilterBox, title));
-		} else {
-			Ui::ShowMultilineToast({
-				.parentOverride = Window::Show(strong).toastParent(),
-				.text = { tr::lng_group_invite_bad_link(tr::now) },
-			});
-		}
+	if (peers.empty() && !filterId) {
+		Ui::ShowMultilineToast({
+			.parentOverride = Window::Show(strong).toastParent(),
+			.text = { tr::lng_group_invite_bad_link(tr::now) },
+		});
 		return;
 	}
 	auto controller = std::make_unique<ToggleChatsController>(
@@ -298,42 +331,61 @@ void ProcessFilterInvite(
 		title,
 		std::move(peers));
 	const auto raw = controller.get();
-	auto initBox = [=](not_null<Ui::BoxContent*> box) {
+	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setStyle(st::filterInviteBox);
+
+		using Type = Ui::FilterLinkHeaderType;
+		const auto type = !filterId
+			? Type::AddingFilter
+			: Type::AddingChats;
+		auto badge = raw->selectedValue(
+		) | rpl::map([=](const base::flat_set<not_null<PeerData*>> &peers) {
+			return int(peers.size());
+		});
+		InitFilterLinkHeader(box, [=](int addedTopHeight) {
+			raw->setAddedTopHeight(addedTopHeight);
+		}, type, title, rpl::duplicate(badge));
+
+		auto owned = Ui::FilterLinkProcessButton(
+			box,
+			type,
+			title,
+			std::move(badge));
+
+		const auto button = owned.data();
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			const auto &padding = st::filterInviteBox.buttonPadding;
+			button->resizeToWidth(width
+				- padding.left()
+				- padding.right());
+			button->moveToLeft(padding.left(), padding.top());
+		}, button->lifetime());
+
+		box->addButton(std::move(owned));
+
+		struct State {
+			bool importing = false;
+		};
+		const auto state = box->lifetime().make_state<State>();
+
 		raw->selectedValue(
 		) | rpl::start_with_next([=](
 				base::flat_set<not_null<PeerData*>> &&peers) {
-			const auto count = int(peers.size());
-
-			box->clearButtons();
-			auto button = object_ptr<Ui::RoundButton>(
-				box,
-				rpl::single(count
-					? u"Add %1 Chats"_q.arg(count)
-					: u"Don't add chats"_q),
-				st::defaultActiveButton);
-			const auto raw = button.data();
-
-			box->widthValue(
-			) | rpl::start_with_next([=](int width) {
-				const auto &padding = st::filterInviteBox.buttonPadding;
-				raw->resizeToWidth(width
-					- padding.left()
-					- padding.right());
-				raw->moveToLeft(padding.left(), padding.top());
-			}, raw->lifetime());
-
-			raw->setClickedCallback([=] {
-				if (!count) {
+			button->setClickedCallback([=] {
+				if (peers.empty()) {
 					box->closeBox();
 				//} else if (count + alreadyInFilter() >= ...) {
 					// #TODO filters
-				} else {
-					ImportInvite(weak, slug, peers);
+				} else if (!state->importing) {
+					state->importing = true;
+					ImportInvite(weak, slug, peers, crl::guard(box, [=] {
+						box->closeBox();
+					}), crl::guard(box, [=] {
+						state->importing = false;
+					}));
 				}
 			});
-
-			box->addButton(std::move(button));
 		}, box->lifetime());
 	};
 	strong->show(
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index a181d3dac..d9f01e55f 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -531,7 +531,10 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 			&st::menuIconDelete);
 		return result;
 	};
-	AddSubsectionTitle(container, tr::lng_filters_link_subtitle());
+	AddSubsectionTitle(
+		container,
+		tr::lng_filters_link_subtitle(),
+		st::filterLinkSubsectionTitlePadding);
 
 	const auto prefix = u"https://"_q;
 	const auto label = container->lifetime().make_state<Ui::InviteLinkLabel>(
@@ -640,7 +643,8 @@ void LinkController::setupAboveWidget() {
 	});
 	Settings::AddSubsectionTitle(
 		container,
-		std::move(subtitle));
+		std::move(subtitle),
+		st::filterLinkSubsectionTitlePadding);
 
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 2dbe7c67a..db5076952 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -140,6 +140,7 @@ void PeerListBox::createMultiSelect() {
 
 void PeerListBox::setAddedTopScrollSkip(int skip) {
 	_addedTopScrollSkip = skip;
+	_scrollBottomFixed = false;
 	updateScrollSkips();
 }
 
diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index fe4beb835..729a95ed6 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -1630,6 +1630,11 @@ SessionPrivate::HandleResult SessionPrivate::handleOneReceived(
 		_sessionSalt = data.vnew_server_salt().v;
 		correctUnixtimeWithBadLocal(info.serverTime);
 
+		if (_bindMsgId) {
+			LOG(("Message Info: bad_server_salt received while binding temp key, restarting."));
+			return HandleResult::RestartConnection;
+		}
+
 		if (setState(ConnectedState, ConnectingState)) {
 			resendAll();
 		}
diff --git a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
index 5707b54f3..90bda5624 100644
--- a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
+++ b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
@@ -224,9 +224,20 @@ rpl::producer<> DefaultOverlayWidgetHelper::controlsActivations() {
 }
 
 rpl::producer<bool> DefaultOverlayWidgetHelper::controlsSideRightValue() {
-	return Ui::Platform::TitleControlsLayoutValue() | rpl::map([=] {
-		return _controls->controls.geometry().center().x()
-			> _controls->wrap.geometry().center().x();
+	using namespace Ui::Platform;
+
+	return TitleControlsLayoutValue(
+	) | rpl::map([=](const TitleControls::Layout &layout) {
+		// See TitleControls::updateControlsPosition.
+		if (ranges::contains(layout.left, TitleControl::Close)) {
+			return false;
+		} else if (ranges::contains(layout.right, TitleControl::Close)) {
+			return true;
+		} else if (layout.left.size() > layout.right.size()) {
+			return false;
+		} else {
+			return true;
+		}
 	}) | rpl::distinct_until_changed();
 }
 
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index b5b304ec7..2af9de650 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -540,11 +540,53 @@ powerSavingButtonNoIcon: SettingsButton(powerSavingButton) {
 powerSavingSubtitlePadding: margins(0px, 4px, 0px, -2px);
 
 filterInviteBox: Box(defaultBox) {
-	buttonPadding: margins(12px, 12px, 12px, 12px);
-	buttonHeight: 44px;
+	buttonPadding: margins(10px, 9px, 10px, 9px);
+	buttonHeight: 42px;
 	button: RoundButton(defaultActiveButton) {
-		height: 44px;
+		height: 42px;
 		textTop: 12px;
 		font: font(13px semibold);
 	}
 }
+filterInviteButtonStyle: TextStyle(defaultTextStyle) {
+	font: font(13px semibold);
+	linkFont: font(13px underline);
+	linkFontOver: font(13px underline);
+}
+filterInviteButtonBadgeStyle: TextStyle(defaultTextStyle) {
+	font: font(12px semibold);
+	linkFont: font(12px underline);
+	linkFontOver: font(12px underline);
+}
+filterInviteButtonBadgePadding: margins(5px, 0px, 5px, 2px);
+filterInviteButtonBadgeSkip: 5px;
+filterLinkTitlePadding: margins(0px, 15px, 0px, 17px);
+filterLinkAboutTextStyle: TextStyle(defaultTextStyle) {
+	font: font(12px);
+	linkFont: font(12px underline);
+	linkFontOver: font(12px underline);
+	lineHeight: 17px;
+}
+filterLinkAbout: FlatLabel(defaultFlatLabel) {
+	style: filterLinkAboutTextStyle;
+	align: align(top);
+	minWidth: 190px;
+}
+filterLinkAboutTop: 170px;
+filterLinkAboutBottom: 15px;
+filterLinkPreview: 96px;
+filterLinkPreviewRadius: 13px;
+filterLinkPreviewTop: 30px;
+filterLinkPreviewColumn: 65px;
+filterLinkPreviewAllBottom: 18px;
+filterLinkPreviewAllTop: 17px;
+filterLinkPreviewMyBottom: 74px;
+filterLinkPreviewMyTop: 73px;
+filterLinkPreviewChatSize: 36px;
+filterLinkPreviewChatSkip: 10px;
+filterLinkPreviewBadgeLeft: 40px;
+filterLinkPreviewBadgeTop: 38px;
+filterLinkSubsectionTitlePadding: margins(0px, 5px, 0px, -4px);
+filterLinkChatsList: PeerList(peerListBox) {
+	padding: margins(0px, 0px, 0px, membersMarginBottom);
+}
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
new file mode 100644
index 000000000..f35ad1a61
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
@@ -0,0 +1,446 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/filter_link_header.h"
+
+#include "lang/lang_keys.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "ui/image/image_prepare.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_filter_icons.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+#include "styles/style_window.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kBodyAnimationPart = 0.90;
+constexpr auto kTitleAdditionalScale = 0.05;
+
+class Widget final : public RpWidget {
+public:
+	Widget(
+		not_null<QWidget*> parent,
+		FilterLinkHeaderDescriptor &&descriptor);
+
+	void setTitlePosition(int x, int y);
+	void updateDimensions(int newWidth);
+
+	[[nodiscard]] rpl::producer<not_null<QWheelEvent*>> wheelEvents() const;
+
+private:
+	void resizeEvent(QResizeEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
+
+	[[nodiscard]] QRectF previewRect(
+		float64 topProgress,
+		float64 sizeProgress) const;
+	void refreshTitleText();
+
+	const not_null<FlatLabel*> _about;
+	QMargins _aboutPadding;
+
+	struct {
+		float64 top = 0.;
+		float64 body = 0.;
+		float64 title = 0.;
+		float64 scaleTitle = 0.;
+	} _progress;
+
+	rpl::variable<int> _badge;
+	QImage _preview;
+	QRectF _previewRect;
+
+	QString _titleText;
+	style::font _titleFont;
+	QMargins _titlePadding;
+	QPoint _titlePosition;
+	QPainterPath _titlePath;
+
+	QString _folderTitle;
+	not_null<const style::icon*> _folderIcon;
+
+	int _maxHeight = 0;
+
+	rpl::event_stream<not_null<QWheelEvent*>> _wheelEvents;
+
+};
+
+[[nodiscard]] QImage GeneratePreview(
+		const QString &title,
+		not_null<const style::icon*> icon,
+		int badge) {
+	const auto size = st::filterLinkPreview;
+	const auto ratio = style::DevicePixelRatio();
+	const auto radius = st::filterLinkPreviewRadius;
+	const auto full = QSize(size, size) * ratio;
+	auto result = QImage(full, QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(st::windowBg->c);
+
+	auto p = QPainter(&result);
+
+	const auto column = st::filterLinkPreviewColumn;
+	p.fillRect(0, 0, column, size, st::sideBarBg);
+	p.fillRect(column, 0, size - column, size, st::emojiPanCategories);
+
+	const auto &st = st::windowFiltersButton;
+	const auto skip = st.style.font->spacew;
+	const auto available = column - 2 * skip;
+	const auto iconWidth = st::foldersAll.width();
+	const auto iconHeight = st::foldersAll.height();
+	const auto iconLeft = (column - iconWidth) / 2;
+	const auto allIconTop = st::filterLinkPreviewAllBottom - iconHeight;
+	st::foldersAll.paint(p, iconLeft, allIconTop, size);
+	const auto myIconTop = st::filterLinkPreviewMyBottom - iconHeight;
+	icon->paint(p, iconLeft, myIconTop, size);
+
+	const auto paintName = [&](const QString &text, int top) {
+		const auto &font = st.style.font;
+		p.drawText(
+			QRect(0, top, column, font->height),
+			font->elided(text, available),
+			style::al_top);
+	};
+	p.setFont(st.style.font);
+	p.setPen(st.textFg);
+	paintName(tr::lng_filters_all(tr::now), st::filterLinkPreviewAllTop);
+	p.setPen(st.textFgActive);
+	paintName(title, st::filterLinkPreviewMyTop);
+
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto chatSize = st::filterLinkPreviewChatSize;
+	const auto chatLeft = size + st::lineWidth - (chatSize / 2);
+	const auto paintChat = [&](int top, const style::color &bg) {
+		p.setBrush(bg);
+		p.drawEllipse(chatLeft, top, chatSize, chatSize);
+	};
+	const auto chatSkip = st::filterLinkPreviewChatSkip;
+	const auto chat1Top = (size - 2 * chatSize - chatSkip) / 2;
+	const auto chat2Top = size - chat1Top - chatSize;
+	p.setPen(Qt::NoPen);
+	paintChat(chat1Top, st::historyPeer4UserpicBg);
+	paintChat(chat2Top, st::historyPeer8UserpicBg);
+
+	if (badge > 0) {
+		const auto font = st.badgeStyle.font;
+		const auto badgeHeight = st.badgeHeight;
+		const auto countBadgeWidth = [&](const QString &text) {
+			return std::max(
+				font->width(text) + 2 * st.badgeSkip,
+				badgeHeight);
+		};
+		const auto defaultBadgeWidth = countBadgeWidth(u"+3"_q);
+		const auto badgeText = '+' + QString::number(badge);
+		const auto badgeWidth = countBadgeWidth(badgeText);
+		const auto defaultBadgeLeft = st::filterLinkPreviewBadgeLeft;
+		const auto badgeLeft = defaultBadgeLeft
+			+ (defaultBadgeWidth - badgeWidth) / 2;
+		const auto badgeTop = st::filterLinkPreviewBadgeTop;
+
+		const auto add = st::lineWidth;
+		auto pen = st.textBg->p;
+		pen.setWidthF(add * 2.);
+		p.setPen(pen);
+		p.setBrush(st.badgeBg);
+		const auto radius = (badgeHeight / 2) + add;
+		const auto rect = QRect(badgeLeft, badgeTop, badgeWidth, badgeHeight)
+			+ QMargins(add, add, add, add);
+		p.drawRoundedRect(rect, radius, radius);
+
+		p.setPen(st.badgeFg);
+		p.setFont(st.badgeStyle.font);
+		p.drawText(rect, badgeText, style::al_center);
+	}
+
+	auto pen = st::shadowFg->p;
+	pen.setWidthF(st::lineWidth * 2.);
+	p.setPen(pen);
+	p.setBrush(Qt::NoBrush);
+	p.drawRoundedRect(0, 0, size, size, radius, radius);
+	p.end();
+
+	return Images::Round(std::move(result), Images::CornersMask(radius));
+}
+
+Widget::Widget(
+	not_null<QWidget*> parent,
+	FilterLinkHeaderDescriptor &&descriptor)
+: RpWidget(parent)
+, _about(CreateChild<Ui::FlatLabel>(
+	this,
+	rpl::single(descriptor.about.value()),
+	st::filterLinkAbout))
+, _aboutPadding(st::boxRowPadding)
+, _badge(std::move(descriptor.badge))
+, _titleText(descriptor.title)
+, _titleFont(st::boxTitle.style.font)
+, _titlePadding(st::filterLinkTitlePadding)
+, _folderTitle(descriptor.folderTitle)
+, _folderIcon(descriptor.folderIcon) {
+	setMinimumHeight(st::boxTitleHeight);
+	refreshTitleText();
+	setTitlePosition(st::boxTitlePosition.x(), st::boxTitlePosition.y());
+
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		_preview = QImage();
+	}, lifetime());
+
+	_badge.changes() | rpl::start_with_next([=] {
+		_preview = QImage();
+		update();
+	}, lifetime());
+}
+
+void Widget::refreshTitleText() {
+	_titlePath = QPainterPath();
+	_titlePath.addText(0, _titleFont->ascent, _titleFont, _titleText);
+	update();
+}
+
+void Widget::setTitlePosition(int x, int y) {
+	_titlePosition = { x, y };
+}
+
+rpl::producer<not_null<QWheelEvent*>> Widget::wheelEvents() const {
+	return _wheelEvents.events();
+}
+
+void Widget::resizeEvent(QResizeEvent *e) {
+	const auto &padding = _aboutPadding;
+	const auto availableWidth = width() - padding.left() - padding.right();
+	if (availableWidth <= 0) {
+		return;
+	}
+	_about->resizeToWidth(availableWidth);
+
+	const auto minHeight = minimumHeight();
+	const auto maxHeight = st::filterLinkAboutTop
+		+ _about->height()
+		+ st::filterLinkAboutBottom;
+	if (maxHeight <= minHeight) {
+		return;
+	} else if (_maxHeight != maxHeight) {
+		_maxHeight = maxHeight;
+		setMaximumHeight(maxHeight);
+	}
+
+	const auto progress = (height() - minHeight)
+		/ float64(_maxHeight - minHeight);
+	_progress.top = 1. -
+		std::clamp(
+			(1. - progress) / kBodyAnimationPart,
+			0.,
+			1.);
+	_progress.body = _progress.top;
+	_progress.title = 1. - progress;
+	_progress.scaleTitle = 1. + kTitleAdditionalScale * progress;
+
+	_previewRect = previewRect(_progress.top, _progress.body);
+
+	const auto titleTop = _previewRect.top()
+		+ _previewRect.height()
+		+ _titlePadding.top();
+	const auto titlePathRect = _titlePath.boundingRect();
+	const auto aboutTop = titleTop
+		+ titlePathRect.height()
+		+ _titlePadding.bottom();
+	_about->moveToLeft(_aboutPadding.left(), aboutTop);
+	_about->setOpacity(_progress.body);
+
+	update();
+}
+
+QRectF Widget::previewRect(
+		float64 topProgress,
+		float64 sizeProgress) const {
+	const auto size = st::filterLinkPreview;
+	return QRectF(
+		(width() - size) / 2.,
+		st::filterLinkPreviewTop * topProgress,
+		size,
+		size);
+};
+
+void Widget::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	p.setOpacity(_progress.body);
+	p.translate(_previewRect.center());
+	p.scale(_progress.body, _progress.body);
+	p.translate(-_previewRect.center());
+	if (_progress.top) {
+		auto hq = PainterHighQualityEnabler(p);
+		if (_preview.isNull()) {
+			_preview = GeneratePreview(
+				_folderTitle,
+				_folderIcon,
+				_badge.current());
+		}
+		p.drawImage(_previewRect, _preview);
+	}
+	p.resetTransform();
+
+	const auto titlePathRect = _titlePath.boundingRect();
+
+	// Title.
+	PainterHighQualityEnabler hq(p);
+	p.setOpacity(1.);
+	p.setFont(_titleFont);
+	p.setPen(st::boxTitleFg);
+	const auto fullPreviewRect = previewRect(1., 1.);
+	const auto fullTitleTop = fullPreviewRect.top()
+		+ fullPreviewRect.height()
+		+ _titlePadding.top();
+	p.translate(
+		anim::interpolate(
+			(width() - titlePathRect.width()) / 2,
+			_titlePosition.x(),
+			_progress.title),
+		anim::interpolate(fullTitleTop, _titlePosition.y(), _progress.title));
+
+	p.translate(titlePathRect.center());
+	p.scale(_progress.scaleTitle, _progress.scaleTitle);
+	p.translate(-titlePathRect.center());
+	p.fillPath(_titlePath, st::boxTitleFg);
+}
+
+void Widget::wheelEvent(QWheelEvent *e) {
+	_wheelEvents.fire(e);
+}
+
+} // namespace
+
+[[nodiscard]] FilterLinkHeader MakeFilterLinkHeader(
+		not_null<QWidget*> parent,
+		FilterLinkHeaderDescriptor &&descriptor) {
+	const auto result = CreateChild<Widget>(
+		parent.get(),
+		std::move(descriptor));
+	return { .widget = result, .wheelEvents = result->wheelEvents() };
+}
+
+object_ptr<RoundButton> FilterLinkProcessButton(
+		not_null<QWidget*> parent,
+		FilterLinkHeaderType type,
+		const QString &title,
+		rpl::producer<int> badge) {
+	const auto st = &st::filterInviteBox.button;
+	const auto badgeSt = &st::filterInviteButtonBadgeStyle;
+	auto result = object_ptr<RoundButton>(parent, rpl::single(u""_q), *st);
+
+	struct Data {
+		QString text;
+		QString badge;
+	};
+	auto data = std::move(
+		badge
+	) | rpl::map([=](int count) {
+		const auto badge = count ? QString::number(count) : QString();
+		const auto with = [&](QString badge) {
+			return rpl::map([=](QString text) {
+				return Data{ text, badge };
+			});
+		};
+		switch (type) {
+		case FilterLinkHeaderType::AddingFilter:
+			return badge.isEmpty()
+				? tr::lng_filters_by_link_add_no() | with(QString())
+				: tr::lng_filters_by_link_add_button(
+					lt_folder,
+					rpl::single(title)
+				) | with(badge);
+		case FilterLinkHeaderType::AddingChats:
+			return badge.isEmpty()
+				? tr::lng_filters_by_link_join_no() | with(QString())
+				: tr::lng_filters_by_link_join_button() | with(badge);
+		case FilterLinkHeaderType::AllAdded:
+			return tr::lng_box_ok() | with(QString());
+		case FilterLinkHeaderType::Removing:
+			return badge.isEmpty()
+				? tr::lng_filters_by_link_remove_button() | with(QString())
+				: tr::lng_filters_by_link_quit_button() | with(badge);
+		}
+		Unexpected("Type in FilterLinkProcessButton.");
+	}) | rpl::flatten_latest();
+
+	struct Label : RpWidget {
+		using RpWidget::RpWidget;
+
+		Text::String text;
+		Text::String badge;
+	};
+	const auto label = result->lifetime().make_state<Label>(result.data());
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	result->sizeValue() | rpl::start_with_next([=](QSize size) {
+		const auto xskip = st->font->spacew;
+		const auto yskip = xskip / 2;
+		label->setGeometry(QRect(QPoint(), size).marginsRemoved(
+			{ xskip, yskip, xskip, yskip }));
+	}, label->lifetime());
+	label->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = Painter(label);
+		const auto width = label->width();
+		const auto hasBadge = !label->badge.isEmpty();
+		const auto &badgePadding = st::filterInviteButtonBadgePadding;
+		const auto badgeInnerWidth = label->badge.maxWidth();
+		const auto badgeInnerHeight = badgeSt->font->height;
+		const auto badgeSize = QRect(
+			0,
+			0,
+			badgeInnerWidth,
+			badgeInnerHeight
+		).marginsAdded(badgePadding).size();
+		const auto skip = st::filterInviteButtonBadgeSkip;
+		const auto badgeWithSkip = hasBadge ? (skip + badgeSize.width()) : 0;
+		const auto full = label->text.maxWidth() + badgeWithSkip;
+		const auto use = std::min(full, width);
+		const auto left = (width - use) / 2;
+		const auto top = st->textTop - label->y();
+		const auto available = use - badgeWithSkip;
+
+		p.setPen(st->textFg);
+		label->text.drawLeftElided(p, left, top, available + skip, width);
+		if (hasBadge) {
+			p.setPen(Qt::NoPen);
+			p.setBrush(st->textFg);
+			auto hq = PainterHighQualityEnabler(p);
+			const auto radius = badgeSize.height() / 2;
+			const auto badgePosition = QPoint(
+				left + available + skip,
+				top - badgePadding.top());
+			p.drawRoundedRect(
+				QRect(badgePosition, badgeSize),
+				radius,
+				radius);
+			p.setPen(st->textBg);
+			label->badge.drawLeftElided(
+				p,
+				badgePosition.x() + badgePadding.left(),
+				badgePosition.y() + badgePadding.top(),
+				badgeInnerWidth + skip,
+				width);
+		}
+	}, label->lifetime());
+
+	std::move(data) | rpl::start_with_next([=](Data data) {
+		label->text.setText(st::filterInviteButtonStyle, data.text);
+		label->badge.setText(st::filterInviteButtonBadgeStyle, data.badge);
+		label->update();
+	}, label->lifetime());
+
+	return result;
+}
+
+} // namespace Ui
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.h b/Telegram/SourceFiles/ui/controls/filter_link_header.h
new file mode 100644
index 000000000..7e40ce7ca
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.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
+
+#include "base/object_ptr.h"
+#include "base/required.h"
+
+namespace Ui {
+
+class RpWidget;
+class RoundButton;
+
+enum class FilterLinkHeaderType {
+	AddingFilter,
+	AddingChats,
+	AllAdded,
+	Removing,
+};
+
+struct FilterLinkHeaderDescriptor {
+	base::required<FilterLinkHeaderType> type;
+	base::required<QString> title;
+	base::required<TextWithEntities> about;
+	base::required<QString> folderTitle;
+	not_null<const style::icon*> folderIcon;
+	rpl::producer<int> badge;
+};
+
+struct FilterLinkHeader {
+	not_null<RpWidget*> widget;
+	rpl::producer<not_null<QWheelEvent*>> wheelEvents;
+};
+
+[[nodiscard]] FilterLinkHeader MakeFilterLinkHeader(
+	not_null<QWidget*> parent,
+	FilterLinkHeaderDescriptor &&descriptor);
+
+[[nodiscard]] object_ptr<RoundButton> FilterLinkProcessButton(
+	not_null<QWidget*> parent,
+	FilterLinkHeaderType type,
+	const QString &title,
+	rpl::producer<int> badge);
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index be9ad16a0..cae79a558 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -236,6 +236,8 @@ PRIVATE
     ui/controls/download_bar.h
     ui/controls/emoji_button.cpp
     ui/controls/emoji_button.h
+    ui/controls/filter_link_header.cpp
+    ui/controls/filter_link_header.h
     ui/controls/jump_down_button.cpp
     ui/controls/jump_down_button.h
     ui/controls/invite_link_buttons.cpp
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f5fb56705..aa5cc61b6 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f5fb567052d9ce47c3c694ef81936e28a1c7315e
+Subproject commit aa5cc61b6b65ec1fb8f1c1be8b2c9c559aadd958

From 7a9961b0e93f5c965cb22f7f4d2efd0d4f1b45d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 Mar 2023 17:51:52 +0400
Subject: [PATCH 008/676] Improve folder link chats list edit design.

---
 Telegram/Resources/langs/lang.strings         |   4 +-
 .../boxes/filters/edit_filter_box.cpp         |   9 +-
 .../boxes/filters/edit_filter_links.cpp       | 204 +++++++++++++++---
 .../boxes/filters/edit_filter_links.h         |   3 +-
 Telegram/SourceFiles/info/info.style          |   3 +
 Telegram/SourceFiles/settings/settings.style  |   1 +
 .../SourceFiles/settings/settings_folders.cpp |   6 +-
 7 files changed, 195 insertions(+), 35 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b41c7d502..46f9e69dc 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3566,9 +3566,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_link_chats#one" = "{count} chat selected";
 "lng_filters_link_chats#other" = "{count} chats selected";
 "lng_filters_link_bot_status" = "you can't share chats with bots";
-"lng_filters_link_bot_error" = "Chat's with bots can't be shared You can't share chats with bots";
+"lng_filters_link_bot_error" = "Chats with bots can't be shared.";
 "lng_filters_link_private_status" = "you can't share private chats";
-"lng_filters_link_private_error" = "You can't share private chats";
+"lng_filters_link_private_error" = "Private chats can't be shared.";
 "lng_filters_link_noadmin_status" = "you can't invite others here";
 "lng_filters_link_noadmin_group_error" = "You don't have the admin rights to share invite links to this group chat.";
 "lng_filters_link_noadmin_channel_error" = "You don't have the admin rights to share invite links to this channel.";
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 003efe022..9c519991f 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -751,13 +751,20 @@ void EditFilterBox(
 			box->setTitle(tr::lng_filters_edit());
 			nameEditing->custom = true;
 
-			*data = updated;
+			// Comparison of ChatFilter-s don't take id into account!
+			data->force_assign(updated);
 			const auto id = updated.id();
 			state->links = owner->chatsFilters().communityLinks(id);
 			ExportFilterLink(id, shared, [=](Data::ChatFilterLink link) {
 				Expects(link.id == id);
 
 				window->show(ShowLinkBox(window, updated, link));
+			}, [=](QString error) {
+				if (error == "COMMUNITIES_TOO_MUCH") {
+					// #TODO filters
+				} else {
+					window->show(ShowLinkBox(window, updated, { .id = id }));
+				}
 			});
 		}));
 	}, createLink->lifetime());
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index d9f01e55f..0f7333a02 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -43,7 +43,7 @@ namespace {
 constexpr auto kMaxLinkTitleLength = 32;
 
 using InviteLinkData = Data::ChatFilterLink;
-class Row;
+class LinkRow;
 
 enum class Color {
 	Permanent,
@@ -89,7 +89,7 @@ struct Errors {
 		}
 		return std::nullopt;
 	} else if (const auto channel = history->peer->asChannel()) {
-		if (!channel->canHaveInviteLink()) {
+		if (!channel->canHaveInviteLink() && !channel->hasUsername()) {
 			return result(
 				tr::lng_filters_link_noadmin_status(tr::now),
 				(channel->isMegagroup()
@@ -180,9 +180,9 @@ void ChatFilterLinkBox(
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
-class RowDelegate {
+class LinkRowDelegate {
 public:
-	virtual void rowUpdateRow(not_null<Row*> row) = 0;
+	virtual void rowUpdateRow(not_null<LinkRow*> row) = 0;
 	virtual void rowPaintIcon(
 		QPainter &p,
 		int x,
@@ -191,9 +191,9 @@ public:
 		Color color) = 0;
 };
 
-class Row final : public PeerListRow {
+class LinkRow final : public PeerListRow {
 public:
-	Row(not_null<RowDelegate*> delegate, const InviteLinkData &data);
+	LinkRow(not_null<LinkRowDelegate*> delegate, const InviteLinkData &data);
 
 	void update(const InviteLinkData &data);
 
@@ -215,13 +215,28 @@ public:
 		bool actionSelected) override;
 
 private:
-	const not_null<RowDelegate*> _delegate;
+	const not_null<LinkRowDelegate*> _delegate;
 	InviteLinkData _data;
 	QString _status;
 	Color _color = Color::Permanent;
 
 };
 
+class ChatRow final : public PeerListRow {
+public:
+	ChatRow(not_null<PeerData*> peer, const QString &status, bool disabled);
+
+	PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+
+private:
+	const bool _disabled = false;
+	QImage _disabledFrame;
+	InMemoryKey _userpicKey;
+	int _paletteVersion = 0;
+
+};
+
 [[nodiscard]] uint64 ComputeRowId(const QString &link) {
 	return XXH64(link.data(), link.size() * sizeof(ushort), 0);
 }
@@ -238,7 +253,9 @@ private:
 	return tr::lng_filters_chats_count(tr::now, lt_count, link.chats.size());
 }
 
-Row::Row(not_null<RowDelegate*> delegate, const InviteLinkData &data)
+LinkRow::LinkRow(
+	not_null<LinkRowDelegate*> delegate,
+	const InviteLinkData &data)
 : PeerListRow(ComputeRowId(data))
 , _delegate(delegate)
 , _data(data)
@@ -246,7 +263,7 @@ Row::Row(not_null<RowDelegate*> delegate, const InviteLinkData &data)
 	setCustomStatus(ComputeStatus(data));
 }
 
-void Row::update(const InviteLinkData &data) {
+void LinkRow::update(const InviteLinkData &data) {
 	_data = data;
 	_color = ComputeColor(data);
 	setCustomStatus(ComputeStatus(data));
@@ -254,11 +271,11 @@ void Row::update(const InviteLinkData &data) {
 	_delegate->rowUpdateRow(this);
 }
 
-InviteLinkData Row::data() const {
+InviteLinkData LinkRow::data() const {
 	return _data;
 }
 
-QString Row::generateName() {
+QString LinkRow::generateName() {
 	if (!_data.title.isEmpty()) {
 		return _data.title;
 	}
@@ -275,11 +292,12 @@ QString Row::generateName() {
 	);
 }
 
-QString Row::generateShortName() {
+QString LinkRow::generateShortName() {
 	return generateName();
 }
 
-PaintRoundImageCallback Row::generatePaintUserpicCallback(bool forceRound) {
+PaintRoundImageCallback LinkRow::generatePaintUserpicCallback(
+		bool forceRound) {
 	return [=](
 			QPainter &p,
 			int x,
@@ -290,13 +308,13 @@ PaintRoundImageCallback Row::generatePaintUserpicCallback(bool forceRound) {
 	};
 }
 
-QSize Row::rightActionSize() const {
+QSize LinkRow::rightActionSize() const {
 	return QSize(
 		st::inviteLinkThreeDotsIcon.width(),
 		st::inviteLinkThreeDotsIcon.height());
 }
 
-QMargins Row::rightActionMargins() const {
+QMargins LinkRow::rightActionMargins() const {
 	return QMargins(
 		0,
 		(st::inviteLinkList.item.height - rightActionSize().height()) / 2,
@@ -304,7 +322,7 @@ QMargins Row::rightActionMargins() const {
 		0);
 }
 
-void Row::rightActionPaint(
+void LinkRow::rightActionPaint(
 		Painter &p,
 		int x,
 		int y,
@@ -316,9 +334,106 @@ void Row::rightActionPaint(
 		: st::inviteLinkThreeDotsIcon).paint(p, x, y, outerWidth);
 }
 
+ChatRow::ChatRow(
+	not_null<PeerData*> peer,
+	const QString &status,
+	bool disabled)
+: PeerListRow(peer)
+, _disabled(disabled) {
+	if (!status.isEmpty()) {
+		setCustomStatus(status);
+	}
+}
+
+PaintRoundImageCallback ChatRow::generatePaintUserpicCallback(
+		bool forceRound) {
+	const auto peer = this->peer();
+	const auto saved = peer->isSelf();
+	const auto replies = peer->isRepliesChat();
+	auto userpic = (saved || replies)
+		? Ui::PeerUserpicView()
+		: ensureUserpicView();
+	auto paint = [=](
+			Painter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) mutable {
+		if (forceRound && peer->isForum()) {
+			ForceRoundUserpicCallback(peer)(p, x, y, outerWidth, size);
+		} else if (saved) {
+			Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
+		} else if (replies) {
+			Ui::EmptyUserpic::PaintRepliesMessages(p, x, y, outerWidth, size);
+		} else {
+			peer->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
+		}
+	};
+	return [=](
+			Painter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) mutable {
+		if (!_disabled) {
+			paint(p, x, y, outerWidth, size);
+			return;
+		}
+		const auto wide = size + style::ConvertScale(3);
+		const auto full = QSize(wide, wide) * style::DevicePixelRatio();
+		auto repaint = false;
+		if (_disabledFrame.size() != full) {
+			repaint = true;
+			_disabledFrame = QImage(
+				full,
+				QImage::Format_ARGB32_Premultiplied);
+			_disabledFrame.setDevicePixelRatio(style::DevicePixelRatio());
+		} else {
+			repaint = (_paletteVersion != style::PaletteVersion())
+				|| (!saved
+					&& !replies
+					&& (_userpicKey != peer->userpicUniqueKey(userpic)));
+		}
+		if (repaint) {
+			_paletteVersion = style::PaletteVersion();
+			_userpicKey = peer->userpicUniqueKey(userpic);
+
+			_disabledFrame.fill(Qt::transparent);
+			auto p = Painter(&_disabledFrame);
+			paint(p, 0, 0, wide, size);
+
+			auto hq = PainterHighQualityEnabler(p);
+			p.setBrush(st::boxBg);
+			p.setPen(Qt::NoPen);
+			const auto two = style::ConvertScaleExact(2.5);
+			const auto half = size / 2.;
+			const auto rect = QRectF(half, half, half, half).translated(
+				{ two, two });
+			p.drawEllipse(rect);
+
+			auto pen = st::windowSubTextFg->p;
+			const auto width = style::ConvertScaleExact(1.5);
+			const auto dash = 0.55;
+			const auto dashWithCaps = dash + 1.;
+			pen.setWidthF(width);
+			// 11 parts = M_PI * half / ((dashWithCaps + space) * width)
+			// 11 = M_PI * half / ((dashWithCaps + space) * width)
+			// space = (M_PI * half / (11 * width)) - dashWithCaps
+			const auto space = M_PI * half / (11 * width) - dashWithCaps;
+			pen.setDashPattern(QVector<qreal>{ dash, space });
+			pen.setDashOffset(1.);
+			pen.setCapStyle(Qt::RoundCap);
+			p.setBrush(Qt::NoBrush);
+			p.setPen(pen);
+			p.drawEllipse(rect.marginsRemoved({ two, two, two, two }));
+		}
+		p.drawImage(x, y, _disabledFrame);
+	};
+}
+
 class LinksController final
 	: public PeerListController
-	, public RowDelegate
+	, public LinkRowDelegate
 	, public base::has_weak_ptr {
 public:
 	LinksController(
@@ -334,7 +449,7 @@ public:
 		not_null<PeerListRow*> row) override;
 	Main::Session &session() const override;
 
-	void rowUpdateRow(not_null<Row*> row) override;
+	void rowUpdateRow(not_null<LinkRow*> row) override;
 	void rowPaintIcon(
 		QPainter &p,
 		int x,
@@ -454,7 +569,7 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 						rpl::single(Ui::Text::Bold(_filterTitle)),
 						Ui::Text::WithEntities)),
 				st::settingsFilterDividerLabel)),
-		st::settingsFilterDividerLabelPadding);
+		st::filterLinkDividerLabelPadding);
 
 	verticalLayout->geometryValue(
 	) | rpl::start_with_next([=](const QRect &r) {
@@ -564,9 +679,26 @@ void LinkController::prepare() {
 
 	setupAboveWidget();
 	setupBelowWidget();
+	const auto countStatus = [&](not_null<PeerData*> peer) {
+		if (const auto chat = peer->asChat()) {
+			if (const auto count = chat->count; count > 0) {
+				return tr::lng_chat_status_members(tr::now, lt_count, count);
+			}
+		} else if (const auto channel = peer->asChannel()) {
+			if (channel->membersCountKnown()) {
+				return (channel->isBroadcast()
+					? tr::lng_chat_status_subscribers
+					: tr::lng_chat_status_members)(
+						tr::now,
+						lt_count,
+						channel->membersCount());
+			}
+		}
+		return QString();
+	};
 	for (const auto &history : _data.chats) {
 		const auto peer = history->peer;
-		auto row = std::make_unique<PeerListRow>(peer);
+		auto row = std::make_unique<ChatRow>(peer, countStatus(peer), false);
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
 		delegate()->peerListSetRowChecked(raw, true);
@@ -577,11 +709,14 @@ void LinkController::prepare() {
 			continue;
 		}
 		const auto peer = history->peer;
-		auto row = std::make_unique<PeerListRow>(peer);
+		const auto error = ErrorForSharing(history);
+		auto row = std::make_unique<ChatRow>(
+			peer,
+			error ? error->status : countStatus(peer),
+			error.has_value());
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
-		if (const auto error = ErrorForSharing(history)) {
-			raw->setCustomStatus(error->status);
+		if (error) {
 			_denied.emplace(peer, error->toast);
 		} else if (_data.url.isEmpty()) {
 			_denied.emplace(peer);
@@ -646,6 +781,11 @@ void LinkController::setupAboveWidget() {
 		std::move(subtitle),
 		st::filterLinkSubsectionTitlePadding);
 
+	// Fix label cutting on text change from smaller to longer.
+	_selected.changes() | rpl::start_with_next([=] {
+		container->resizeToWidth(container->widthNoMargins());
+	}, container->lifetime());
+
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
 
@@ -702,7 +842,7 @@ void LinksController::rebuild(const std::vector<InviteLinkData> &rows) {
 	while (i < rows.size()) {
 		if (i < count) {
 			const auto row = delegate()->peerListRowAt(i);
-			static_cast<Row*>(row.get())->update(rows[i]);
+			static_cast<LinkRow*>(row.get())->update(rows[i]);
 		} else {
 			appendRow(rows[i]);
 		}
@@ -716,7 +856,7 @@ void LinksController::rebuild(const std::vector<InviteLinkData> &rows) {
 }
 
 void LinksController::rowClicked(not_null<PeerListRow*> row) {
-	const auto link = static_cast<Row*>(row.get())->data();
+	const auto link = static_cast<LinkRow*>(row.get())->data();
 	delegate()->peerListShowBox(
 		ShowLinkBox(_window, _currentFilter(), link),
 		Ui::LayerOption::KeepOther);
@@ -746,7 +886,7 @@ base::unique_qptr<Ui::PopupMenu> LinksController::rowContextMenu(
 base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row) {
-	const auto real = static_cast<Row*>(row.get());
+	const auto real = static_cast<LinkRow*>(row.get());
 	const auto data = real->data();
 	const auto link = data.url;
 	const auto copyLink = [=] {
@@ -803,7 +943,7 @@ Main::Session &LinksController::session() const {
 }
 
 void LinksController::appendRow(const InviteLinkData &data) {
-	delegate()->peerListAppendRow(std::make_unique<Row>(this, data));
+	delegate()->peerListAppendRow(std::make_unique<LinkRow>(this, data));
 }
 
 bool LinksController::removeRow(const QString &link) {
@@ -814,7 +954,7 @@ bool LinksController::removeRow(const QString &link) {
 	return false;
 }
 
-void LinksController::rowUpdateRow(not_null<Row*> row) {
+void LinksController::rowUpdateRow(not_null<LinkRow*> row) {
 	delegate()->peerListUpdateRow(row);
 }
 
@@ -927,7 +1067,8 @@ bool GoodForExportFilterLink(
 void ExportFilterLink(
 		FilterId id,
 		const std::vector<not_null<PeerData*>> &peers,
-		Fn<void(Data::ChatFilterLink)> done) {
+		Fn<void(Data::ChatFilterLink)> done,
+		Fn<void(QString)> fail) {
 	Expects(!peers.empty());
 
 	const auto front = peers.front();
@@ -950,7 +1091,7 @@ void ExportFilterLink(
 			data.vinvite());
 		done(link);
 	}).fail([=](const MTP::Error &error) {
-		done({ .id = id });
+		fail(error.type());
 	}).send();
 }
 
@@ -987,6 +1128,7 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 		const Data::ChatFilter &filter,
 		const Data::ChatFilterLink &link) {
 	auto controller = std::make_unique<LinkController>(window, filter, link);
+	controller->setStyleOverrides(&st::inviteLinkChatList);
 	const auto raw = controller.get();
 	auto initBox = [=](not_null<Ui::BoxContent*> box) {
 		box->setTitle(!link.title.isEmpty()
@@ -995,6 +1137,8 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 
 		raw->hasChangesValue(
 		) | rpl::start_with_next([=](bool has) {
+			box->setCloseByOutsideClick(!has);
+			box->setCloseByEscape(!has);
 			box->clearButtons();
 			if (has) {
 				box->addButton(tr::lng_settings_save(), [=] {
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
index d632d3472..a2024faa4 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
@@ -33,7 +33,8 @@ class SessionController;
 void ExportFilterLink(
 	FilterId id,
 	const std::vector<not_null<PeerData*>> &peers,
-	Fn<void(Data::ChatFilterLink)> done);
+	Fn<void(Data::ChatFilterLink)> done,
+	Fn<void(QString)> fail);
 
 object_ptr<Ui::BoxContent> ShowLinkBox(
 	not_null<Window::SessionController*> window,
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index dfafc3ef6..d4c146ce7 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -800,6 +800,9 @@ inviteLinkList: PeerList(defaultPeerList) {
 	item: inviteLinkListItem;
 	padding: margins(0px, 4px, 0px, 0px);
 }
+inviteLinkChatList: PeerList(peerListBox) {
+	padding: margins(0px, 4px, 0px, 6px);
+}
 inviteLinkAdminsList: PeerList(inviteLinkList) {
 	item: PeerListItem(inviteLinkListItem) {
 		photoPosition: point(16px, 9px);
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 2af9de650..e5da33b9b 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -560,6 +560,7 @@ filterInviteButtonBadgeStyle: TextStyle(defaultTextStyle) {
 }
 filterInviteButtonBadgePadding: margins(5px, 0px, 5px, 2px);
 filterInviteButtonBadgeSkip: 5px;
+filterLinkDividerLabelPadding: margins(0px, 10px, 0px, 17px);
 filterLinkTitlePadding: margins(0px, 15px, 0px, 17px);
 filterLinkAboutTextStyle: TextStyle(defaultTextStyle) {
 	font: font(12px);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index a34a584aa..0dd60090e 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -150,9 +150,12 @@ struct FilterRow {
 		const Data::ChatFilter &filter,
 		bool check = false) {
 	const auto count = ComputeCount(session, filter, check);
-	return count
+	const auto result = count
 		? tr::lng_filters_chats_count(tr::now, lt_count_short, count)
 		: tr::lng_filters_no_chats(tr::now);
+	return filter.community()
+		? result + QString::fromUtf8(" \xE2\x80\xA2 shareable folder")
+		: result;
 }
 
 FilterRowButton::FilterRowButton(
@@ -327,6 +330,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		not_null<Ui::VerticalLayout*> container) {
 	auto &lifetime = container->lifetime();
 
+	const auto weak = Ui::MakeWeak(container);
 	const auto session = &controller->session();
 	const auto limit = [=] {
 		return Data::PremiumLimits(session).dialogFiltersCurrent();

From 44448444436c92000dec4fd81b171ffbbdcf6f1c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 Mar 2023 13:06:13 +0400
Subject: [PATCH 009/676] Update API scheme on layer 158.

---
 Telegram/Resources/langs/lang.strings         |  5 ++++
 Telegram/Resources/tl/api.tl                  | 11 +++++----
 Telegram/SourceFiles/api/api_invite_links.cpp |  1 +
 Telegram/SourceFiles/api/api_invite_links.h   |  1 +
 .../boxes/peers/edit_peer_invite_link.cpp     |  9 +++++--
 .../SourceFiles/data/data_file_origin.cpp     |  2 ++
 .../export/data/export_data_types.cpp         | 10 ++++++++
 .../export/data/export_data_types.h           |  7 +++++-
 .../export/output/export_output_html.cpp      |  2 ++
 .../export/output/export_output_json.cpp      |  3 +++
 .../admin_log/history_admin_log_item.cpp      | 10 +++++---
 Telegram/SourceFiles/history/history_item.cpp | 24 +++++++++++++++++++
 12 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 46f9e69dc..82a31ced1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1521,6 +1521,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_suggested_video" = "{user} suggests you to use this profile video.";
 "lng_action_suggested_video_button" = "View Video";
 "lng_action_attach_menu_bot_allowed" = "You allowed this bot to message you when you added it in the attachment menu.";
+"lng_action_set_wallpaper_me" = "You set a new background for this chat.";
+"lng_action_set_wallpaper" = "{user} set a new background for this chat.";
 "lng_action_topic_created_inside" = "Topic created";
 "lng_action_topic_closed_inside" = "Topic closed";
 "lng_action_topic_reopened_inside" = "Topic reopened";
@@ -1580,6 +1582,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_invite_no_joined" = "No one joined yet";
 "lng_group_invite_joined#one" = "{count} joined";
 "lng_group_invite_joined#other" = "{count} joined";
+"lng_group_invite_joined_via_filter" = "joined via a folder invite link";
 "lng_group_invite_remaining#one" = "{count} remaining";
 "lng_group_invite_remaining#other" = "{count} remaining";
 "lng_group_invite_requested#one" = "{count} requested";
@@ -3095,6 +3098,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_participant_joined_channel" = "{from} joined the channel";
 "lng_admin_log_participant_joined_by_link" = "{from} joined the group via {link}";
 "lng_admin_log_participant_joined_by_link_channel" = "{from} joined the channel via {link}";
+"lng_admin_log_participant_joined_by_filter_link" = "{from} joined the group via {link} from a folder";
+"lng_admin_log_participant_joined_by_filter_link_channel" = "{from} joined the channel via {link} from a folder";
 "lng_admin_log_participant_approved_by_link" = "{from} was approved to join the group via {link} by {user}";
 "lng_admin_log_participant_approved_by_link_channel" = "{from} was approved to join the channel via {link} by {user}";
 "lng_admin_log_participant_approved_by_request" = "{from} joined to the group via public request, approved by {user}";
diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index c2ac7601d..e0b47d985 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -196,6 +196,7 @@ messageActionTopicCreate#d999256 flags:# title:string icon_color:int icon_emoji_
 messageActionTopicEdit#c0944820 flags:# title:flags.0?string icon_emoji_id:flags.1?long closed:flags.2?Bool hidden:flags.3?Bool = MessageAction;
 messageActionSuggestProfilePhoto#57de635e photo:Photo = MessageAction;
 messageActionRequestedPeer#fe77345d button_id:int peer:Peer = MessageAction;
+messageActionSetChatWallPaper#bc44a927 wallpaper:WallPaper = MessageAction;
 
 dialog#d58a08c6 flags:# pinned:flags.2?true unread_mark:flags.3?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int ttl_period:flags.5?int = Dialog;
 dialogFolder#71bd134c flags:# pinned:flags.2?true folder:Folder peer:Peer top_message:int unread_muted_peers_count:int unread_unmuted_peers_count:int unread_muted_messages_count:int unread_unmuted_messages_count:int = Dialog;
@@ -247,7 +248,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#f8d32aed flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> = UserFull;
+userFull#93eadb53 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -385,7 +386,7 @@ updateGroupCallParticipants#f2ebdb4e call:InputGroupCall participants:Vector<Gro
 updateGroupCall#14b24500 chat_id:long call:GroupCall = Update;
 updatePeerHistoryTTL#bb9bb9a5 flags:# peer:Peer ttl_period:flags.0?int = Update;
 updateChatParticipant#d087663a flags:# chat_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChatParticipant new_participant:flags.1?ChatParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
-updateChannelParticipant#985d3abb flags:# channel_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
+updateChannelParticipant#985d3abb flags:# via_community:flags.3?true channel_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
 updateBotStopped#c4870a49 user_id:long date:int stopped:Bool qts:int = Update;
 updateGroupCallConnection#b783982 flags:# presentation:flags.0?true params:DataJSON = Update;
 updateBotCommands#4d712f2e peer:Peer bot_id:long commands:Vector<BotCommand> = Update;
@@ -959,7 +960,7 @@ channelAdminLogEventActionDiscardGroupCall#db9f9140 call:InputGroupCall = Channe
 channelAdminLogEventActionParticipantMute#f92424d2 participant:GroupCallParticipant = ChannelAdminLogEventAction;
 channelAdminLogEventActionParticipantUnmute#e64429c0 participant:GroupCallParticipant = ChannelAdminLogEventAction;
 channelAdminLogEventActionToggleGroupCallSetting#56d6a247 join_muted:Bool = ChannelAdminLogEventAction;
-channelAdminLogEventActionParticipantJoinByInvite#5cdada77 invite:ExportedChatInvite = ChannelAdminLogEventAction;
+channelAdminLogEventActionParticipantJoinByInvite#fe9fc158 flags:# via_community:flags.0?true invite:ExportedChatInvite = ChannelAdminLogEventAction;
 channelAdminLogEventActionExportedInviteDelete#5a50fca4 invite:ExportedChatInvite = ChannelAdminLogEventAction;
 channelAdminLogEventActionExportedInviteRevoke#410a134e invite:ExportedChatInvite = ChannelAdminLogEventAction;
 channelAdminLogEventActionExportedInviteEdit#e90ebb59 prev_invite:ExportedChatInvite new_invite:ExportedChatInvite = ChannelAdminLogEventAction;
@@ -1306,7 +1307,7 @@ messages.historyImportParsed#5e0fb7b9 flags:# pm:flags.0?true group:flags.1?true
 
 messages.affectedFoundMessages#ef8d3e6c pts:int pts_count:int offset:int messages:Vector<int> = messages.AffectedFoundMessages;
 
-chatInviteImporter#8c5adfd9 flags:# requested:flags.0?true user_id:long date:int about:flags.2?string approved_by:flags.1?long = ChatInviteImporter;
+chatInviteImporter#8c5adfd9 flags:# requested:flags.0?true via_community:flags.3?true user_id:long date:int about:flags.2?string approved_by:flags.1?long = ChatInviteImporter;
 
 messages.exportedChatInvites#bdc62dcc count:int invites:Vector<ExportedChatInvite> users:Vector<User> = messages.ExportedChatInvites;
 
@@ -1876,6 +1877,7 @@ messages.searchCustomEmoji#2c11c0d7 emoticon:string hash:long = EmojiList;
 messages.togglePeerTranslations#e47cb579 flags:# disabled:flags.0?true peer:InputPeer = Bool;
 messages.getBotApp#34fdc5c3 app:InputBotApp hash:long = messages.BotApp;
 messages.requestAppWebView#8c5a3b3c flags:# write_allowed:flags.0?true peer:InputPeer app:InputBotApp start_param:flags.1?string theme_params:flags.2?DataJSON platform:string = AppWebViewResult;
+messages.setChatWallPaper#bddd7eaa peer:InputPeer wallpaper:InputWallPaper settings:WallPaperSettings = Updates;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#25939651 flags:# pts:int pts_total_limit:flags.0?int date:int qts:int = updates.Difference;
@@ -2068,6 +2070,7 @@ communities.joinCommunityInvite#4eff927 slug:string peers:Vector<InputPeer> = Up
 communities.getCommunityUpdates#2956d635 community:InputCommunity = communities.CommunityUpdates;
 communities.joinCommunityUpdates#51d42216 community:InputCommunity peers:Vector<InputPeer> = Updates;
 communities.hideCommunityUpdates#d678baf community:InputCommunity = Bool;
+communities.getLeaveCommunitySuggestions#ee4e9ae2 community:InputCommunity = Vector<Peer>;
 communities.leaveCommunity#35d9755f community:InputCommunity peers:Vector<InputPeer> = Updates;
 
 // LAYER 158
diff --git a/Telegram/SourceFiles/api/api_invite_links.cpp b/Telegram/SourceFiles/api/api_invite_links.cpp
index e6d8182f3..8958285f7 100644
--- a/Telegram/SourceFiles/api/api_invite_links.cpp
+++ b/Telegram/SourceFiles/api/api_invite_links.cpp
@@ -58,6 +58,7 @@ JoinedByLinkSlice ParseJoinedByLinkSlice(
 				result.users.push_back({
 					.user = owner.user(data.vuser_id()),
 					.date = data.vdate().v,
+					.viaFilterLink = data.is_via_community(),
 				});
 			});
 		}
diff --git a/Telegram/SourceFiles/api/api_invite_links.h b/Telegram/SourceFiles/api/api_invite_links.h
index 14f510796..09b43c086 100644
--- a/Telegram/SourceFiles/api/api_invite_links.h
+++ b/Telegram/SourceFiles/api/api_invite_links.h
@@ -34,6 +34,7 @@ struct PeerInviteLinks {
 struct JoinedByLinkUser {
 	not_null<UserData*> user;
 	TimeId date = 0;
+	bool viaFilterLink = false;
 };
 
 struct JoinedByLinkSlice {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 050dccc99..681ce1f64 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -731,9 +731,14 @@ void Controller::loadMoreRows() {
 void Controller::appendSlice(const Api::JoinedByLinkSlice &slice) {
 	for (const auto &user : slice.users) {
 		_lastUser = user;
-		delegate()->peerListAppendRow((_role == Role::Requested)
+		auto row = (_role == Role::Requested)
 			? std::make_unique<RequestedRow>(user.user, user.date)
-			: std::make_unique<PeerListRow>(user.user));
+			: std::make_unique<PeerListRow>(user.user);
+		if (_role != Role::Requested && user.viaFilterLink) {
+			row->setCustomStatus(
+				tr::lng_group_invite_joined_via_filter(tr::now));
+		}
+		delegate()->peerListAppendRow(std::move(row));
 	}
 	delegate()->peerListRefreshRows();
 	if (delegate()->peerListFullRowsCount() > 0) {
diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index ee9a24ca4..92750b49f 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -97,6 +97,8 @@ struct FileReferenceAccumulator {
 				push(data.vphoto());
 			}, [&](const MTPDmessageActionSuggestProfilePhoto &data) {
 				push(data.vphoto());
+			}, [&](const MTPDmessageActionSetChatWallPaper &data) {
+				push(data.vwallpaper());
 			}, [](const auto &data) {
 			});
 		}, [](const MTPDmessageEmpty &data) {
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index e8d9b86bf..34d4d3897 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1182,6 +1182,10 @@ ServiceAction ParseServiceAction(
 			+ "photos/"
 			+ PreparePhotoFileName(++context.photos, date));
 		result.content = content;
+	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
+		auto content = ActionSetChatWallPaper();
+		// #TODO wallpapers
+		result.content = content;
 	}, [&](const MTPDmessageActionRequestedPeer &data) {
 		auto content = ActionRequestedPeer();
 		content.peerId = ParsePeerId(data.vpeer());
@@ -1198,6 +1202,9 @@ File &Message::file() {
 	} else if (const auto photo = std::get_if<ActionSuggestProfilePhoto>(
 			content)) {
 		return photo->photo.image.file;
+	} else if (const auto wallpaper = std::get_if<ActionSetChatWallPaper>(
+			content)) {
+		// #TODO wallpapers
 	}
 	return media.file();
 }
@@ -1209,6 +1216,9 @@ const File &Message::file() const {
 	} else if (const auto photo = std::get_if<ActionSuggestProfilePhoto>(
 			content)) {
 		return photo->photo.image.file;
+	} else if (const auto wallpaper = std::get_if<ActionSetChatWallPaper>(
+			content)) {
+		// #TODO wallpapers
 	}
 	return media.file();
 }
diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h
index 71bae17f8..fa472850b 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.h
+++ b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -515,6 +515,10 @@ struct ActionSuggestProfilePhoto {
 	Photo photo;
 };
 
+struct ActionSetChatWallPaper {
+	// #TODO wallpapers
+};
+
 struct ActionRequestedPeer {
 	PeerId peerId = 0;
 	int buttonId = 0;
@@ -556,7 +560,8 @@ struct ServiceAction {
 		ActionTopicCreate,
 		ActionTopicEdit,
 		ActionSuggestProfilePhoto,
-		ActionRequestedPeer> content;
+		ActionRequestedPeer,
+		ActionSetChatWallPaper> content;
 };
 
 ServiceAction ParseServiceAction(
diff --git a/Telegram/SourceFiles/export/output/export_output_html.cpp b/Telegram/SourceFiles/export/output/export_output_html.cpp
index 59c176bae..53f78c704 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html.cpp
@@ -1173,6 +1173,8 @@ auto HtmlWriter::Wrap::pushMessage(
 		return serviceFrom + " suggests to use this photo";
 	}, [&](const ActionRequestedPeer &data) {
 		return "requested: "_q/* + data.peerId*/;
+	}, [&](const ActionSetChatWallPaper &data) {
+		return serviceFrom + " set a new background for this chat";
 	}, [](v::null_t) { return QByteArray(); });
 
 	if (!serviceText.isEmpty()) {
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index e24a364ba..142addf97 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -590,6 +590,9 @@ QByteArray SerializeMessage(
 		pushAction("requested_peer");
 		push("button_id", data.buttonId);
 		push("peer_id", data.peerId.value);
+	}, [&](const ActionSetChatWallPaper &data) {
+		pushActor();
+		pushAction("set_chat_wallpaper");
 	}, [](v::null_t) {});
 
 	if (v::is_null(message.action.content)) {
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 b92ed2736..3cb49004c 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -1392,9 +1392,13 @@ void GenerateItems(
 
 	const auto createParticipantJoinByInvite = [&](
 			const LogJoinByInvite &data) {
-		const auto text = (channel->isMegagroup()
-			? tr::lng_admin_log_participant_joined_by_link
-			: tr::lng_admin_log_participant_joined_by_link_channel);
+		const auto text = data.is_via_community()
+			? (channel->isMegagroup()
+				? tr::lng_admin_log_participant_joined_by_filter_link
+				: tr::lng_admin_log_participant_joined_by_filter_link_channel)
+			: (channel->isMegagroup()
+				? tr::lng_admin_log_participant_joined_by_link
+				: tr::lng_admin_log_participant_joined_by_link_channel);
 		addInviteLinkServiceMessage(
 			text(
 				tr::now,
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 2a312bb4a..d92f088d7 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -4157,6 +4157,26 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		return result;
 	};
 
+	auto prepareSetChatWallPaper = [&](
+			const MTPDmessageActionSetChatWallPaper &action) {
+		const auto isSelf = (_from->id == _from->session().userPeerId());
+		const auto peer = isSelf ? history()->peer : _from;
+		const auto user = peer->asUser();
+		const auto name = (user && !user->firstName.isEmpty())
+			? user->firstName
+			: peer->name();
+		auto result = PreparedServiceText{};
+		result.links.push_back(peer->createOpenLink());
+		result.text = isSelf
+			? tr::lng_action_set_wallpaper(
+				tr::now,
+				lt_user,
+				Ui::Text::Link(name, 1), // Link 1.
+				Ui::Text::WithEntities)
+			: tr::lng_action_set_wallpaper_me(tr::now, Ui::Text::WithEntities);
+		return result;
+	};
+
 	setServiceText(action.match([&](
 			const MTPDmessageActionChatAddUser &data) {
 		return prepareChatAddUserText(data);
@@ -4233,6 +4253,8 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		return prepareSuggestProfilePhoto(data);
 	}, [&](const MTPDmessageActionRequestedPeer &data) {
 		return prepareRequestedPeer(data);
+	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
+		return prepareSetChatWallPaper(data);
 	}, [](const MTPDmessageActionEmpty &) {
 		return PreparedServiceText{ { tr::lng_message_empty(tr::now) } };
 	}));
@@ -4296,6 +4318,8 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 				history()->owner().processPhoto(photo));
 		}, [](const MTPDphotoEmpty &) {
 		});
+	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
+		//_media = std::make_unique.. #TODO wallpapers
 	}, [](const auto &) {
 	});
 }

From 6be2fb979095678e7b1d6af0e429fd629336dc89 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 Mar 2023 22:55:19 +0400
Subject: [PATCH 010/676] Support nice leaving of shareable folder.

---
 Telegram/Resources/langs/lang.strings         |  15 +-
 Telegram/SourceFiles/api/api_chat_filters.cpp | 239 +++++++++++++++---
 Telegram/SourceFiles/api/api_chat_filters.h   |   8 +
 .../boxes/filters/edit_filter_box.cpp         |  11 +-
 .../boxes/filters/edit_filter_links.cpp       |  42 +--
 .../boxes/filters/edit_filter_links.h         |   3 +-
 Telegram/SourceFiles/data/data_session.cpp    |   3 +
 .../SourceFiles/settings/settings_folders.cpp | 154 +++++++++--
 8 files changed, 396 insertions(+), 79 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 82a31ced1..0037d48c7 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3558,9 +3558,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_toast_add" = "{chat} added to {folder} folder";
 "lng_filters_toast_remove" = "{chat} removed from {folder} folder";
 
-"lng_filters_link" = "Invite links";
+"lng_filters_delete_sure" = "Are you sure you want to delete this folder? This will also deactivate all the invite links used to share this folder.";
+"lng_filters_link" = "Share Folder";
+"lng_filters_link_has" = "Invite links";
 "lng_filters_link_badge" = "New";
-"lng_filters_link_create" = "Share Folder";
+"lng_filters_link_create" = "Create an Invite Link";
 "lng_filters_link_cant" = "No way to share folders with chat types or excluded chats.";
 "lng_filters_link_about" = "Share access to some of this folder's groups and channels with others.";
 "lng_filters_link_about_many" = "Create more links to set up different access levels for different people.";
@@ -3577,6 +3579,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_link_noadmin_status" = "you can't invite others here";
 "lng_filters_link_noadmin_group_error" = "You don't have the admin rights to share invite links to this group chat.";
 "lng_filters_link_noadmin_channel_error" = "You don't have the admin rights to share invite links to this channel.";
+"lng_filters_link_already_group" = "you are already a member";
+"lng_filters_link_already_channel" = "you are already subscribed";
 "lng_filters_link_chats_about" = "Select groups and channels that you want everyone who adds the folder via invite link to join.";
 "lng_filters_link_no_about" = "There are no chats in this folder that you can share with others.";
 "lng_filters_link_chats_no" = "These chats cannot be shared";
@@ -3604,8 +3608,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_by_link_quit#other" = "{count} chats to quit";
 "lng_filters_by_link_select" = "Select All";
 "lng_filters_by_link_deselect" = "Deselect All";
+"lng_filters_by_link_about_quit" = "You can deselect the chats you don't want to quit.";
 "lng_filters_by_link_remove_button" = "Remove Folder";
 "lng_filters_by_link_quit_button" = "Remove Folder and Chats";
+"lng_filters_added_title" = "Folder {folder} Added";
+"lng_filters_added_also#one" = "You also joined {count} chat.";
+"lng_filters_added_also#other" = "You also joined {count} chats.";
+"lng_filters_updated_title" = "Folder {folder} Updated";
+"lng_filters_updated_also#one" = "You have joined {count} new chat.";
+"lng_filters_updated_also#other" = "You have joined {count} new chats.";
 "lng_filters_bar_you_can#one" = "You can join {count} new chat";
 "lng_filters_bar_you_can#other" = "You can join {count} new chats";
 "lng_filters_bar_view" = "Click here to view them";
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 03149b6e3..332afd22f 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "boxes/peer_list_box.h"
+#include "boxes/filters/edit_filter_links.h" // FilterChatStatusText
 #include "core/application.h"
 #include "data/data_chat_filters.h"
 #include "data/data_peer.h"
@@ -21,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
+#include "ui/filter_icons.h"
 #include "window/window_session_controller.h"
 #include "styles/style_filter_icons.h"
 #include "styles/style_layers.h"
@@ -41,10 +43,9 @@ public:
 	ToggleChatsController(
 		not_null<Window::SessionController*> window,
 		ToggleAction action,
-		const QString &slug,
-		FilterId filterId,
 		const QString &title,
-		std::vector<not_null<PeerData*>> chats);
+		std::vector<not_null<PeerData*>> chats,
+		std::vector<not_null<PeerData*>> additional);
 
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
@@ -63,10 +64,9 @@ private:
 	Ui::RpWidget *_addedTopWidget = nullptr;
 
 	ToggleAction _action = ToggleAction::Adding;
-	QString _slug;
-	FilterId _filterId = 0;
 	QString _filterTitle;
 	std::vector<not_null<PeerData*>> _chats;
+	std::vector<not_null<PeerData*>> _additional;
 	rpl::variable<base::flat_set<not_null<PeerData*>>> _selected;
 
 	base::unique_qptr<Ui::PopupMenu> _menu;
@@ -128,13 +128,18 @@ void InitFilterLinkHeader(
 		Fn<void(int)> setAddedTopHeight,
 		Ui::FilterLinkHeaderType type,
 		const QString &title,
+		const QString &iconEmoji,
 		rpl::producer<int> count) {
+	const auto icon = Ui::LookupFilterIcon(
+		Ui::LookupFilterIconByEmoji(
+			iconEmoji
+		).value_or(Ui::FilterIcon::Custom)).active;
 	auto header = Ui::MakeFilterLinkHeader(box, {
 		.type = type,
 		.title = TitleText(type)(tr::now),
 		.about = AboutText(type, title),
 		.folderTitle = title,
-		.folderIcon = &st::foldersCustomActive,
+		.folderIcon = icon,
 		.badge = (type == Ui::FilterLinkHeaderType::AddingChats
 			? std::move(count)
 			: rpl::single(0)),
@@ -220,16 +225,14 @@ void ImportInvite(
 ToggleChatsController::ToggleChatsController(
 	not_null<Window::SessionController*> window,
 	ToggleAction action,
-	const QString &slug,
-	FilterId filterId,
 	const QString &title,
-	std::vector<not_null<PeerData*>> chats)
+	std::vector<not_null<PeerData*>> chats,
+	std::vector<not_null<PeerData*>> additional)
 : _window(window)
 , _action(action)
-, _slug(slug)
-, _filterId(filterId)
 , _filterTitle(title)
-, _chats(std::move(chats)) {
+, _chats(std::move(chats))
+, _additional(std::move(additional)) {
 	setStyleOverrides(&st::filterLinkChatsList);
 }
 
@@ -237,12 +240,34 @@ void ToggleChatsController::prepare() {
 	setupAboveWidget();
 	setupBelowWidget();
 	auto selected = base::flat_set<not_null<PeerData*>>();
-	for (const auto &peer : _chats) {
+	const auto add = [&](not_null<PeerData*> peer, bool additional = false) {
 		auto row = std::make_unique<PeerListRow>(peer);
+		if (delegate()->peerListFindRow(peer->id.value)) {
+			return;
+		}
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
-		delegate()->peerListSetRowChecked(raw, true);
-		selected.emplace(peer);
+		if (!additional || _action == ToggleAction::Removing) {
+			if (const auto status = FilterChatStatusText(peer)
+				; !status.isEmpty()) {
+				raw->setCustomStatus(status);
+			}
+		}
+		if (!additional) {
+			delegate()->peerListSetRowChecked(raw, true);
+			selected.emplace(peer);
+		} else if (_action == ToggleAction::Adding) {
+			raw->setDisabledState(PeerListRow::State::DisabledChecked);
+			raw->setCustomStatus(peer->isBroadcast()
+				? tr::lng_filters_link_already_channel(tr::now)
+				: tr::lng_filters_link_already_group(tr::now));
+		}
+	};
+	for (const auto &peer : _chats) {
+		add(peer);
+	}
+	for (const auto &peer : _additional) {
+		add(peer, true);
 	}
 	delegate()->peerListRefreshRows();
 	_selected = std::move(selected);
@@ -269,23 +294,51 @@ void ToggleChatsController::setupAboveWidget() {
 
 	_addedTopWidget = container->add(object_ptr<Ui::RpWidget>(container));
 	AddDivider(container);
+	const auto totalCount = [&] {
+		if (_chats.empty()) {
+			return _additional.size();
+		} else if (_additional.empty()) {
+			return _chats.size();
+		}
+		auto result = _chats.size();
+		for (const auto &peer : _additional) {
+			if (!ranges::contains(_chats, peer)) {
+				++result;
+			}
+		}
+		return result;
+	};
+	const auto count = (_action == ToggleAction::Removing)
+		? totalCount()
+		: _chats.empty()
+		? _additional.size()
+		: _chats.size();
 	AddSubsectionTitle(
 		container,
-		tr::lng_filters_by_link_join(
-			lt_count,
-			rpl::single(float64(_chats.size()))),
+		(_action == ToggleAction::Removing
+			? tr::lng_filters_by_link_quit
+			: _chats.empty()
+			? tr::lng_filters_by_link_in
+			: tr::lng_filters_by_link_join)(
+				lt_count,
+				rpl::single(float64(count))),
 		st::filterLinkSubsectionTitlePadding);
 
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
 
 void ToggleChatsController::setupBelowWidget() {
+	if (_chats.empty()) {
+		return;
+	}
 	delegate()->peerListSetBelowWidget(
 		object_ptr<Ui::DividerLabel>(
 			(QWidget*)nullptr,
 			object_ptr<Ui::FlatLabel>(
 				(QWidget*)nullptr,
-				tr::lng_filters_by_link_about(tr::now),
+				(_action == ToggleAction::Removing
+					? tr::lng_filters_by_link_about_quit
+					: tr::lng_filters_by_link_about)(tr::now),
 				st::boxDividerLabel),
 			st::settingsDividerLabelPadding));
 }
@@ -305,12 +358,40 @@ void ToggleChatsController::setAddedTopHeight(int addedTopHeight) {
 	_addedTopWidget->resize(_addedTopWidget->width(), addedTopHeight);
 }
 
+void ShowImportToast(
+		base::weak_ptr<Window::SessionController> weak,
+		const QString &title,
+		Ui::FilterLinkHeaderType type,
+		int added) {
+	const auto strong = weak.get();
+	if (!strong) {
+		return;
+	}
+	const auto created = (type == Ui::FilterLinkHeaderType::AddingFilter);
+	const auto phrase = created
+		? tr::lng_filters_added_title
+		: tr::lng_filters_updated_title;
+	auto text = Ui::Text::Bold(phrase(tr::now, lt_folder, title));
+	if (added > 0) {
+		const auto phrase = created
+			? tr::lng_filters_added_also
+			: tr::lng_filters_updated_also;
+		text.append('\n').append(phrase(tr::now, lt_count, added));
+	}
+	Ui::ShowMultilineToast({
+		.parentOverride = Window::Show(strong).toastParent(),
+		.text = { std::move(text) },
+	});
+}
+
 void ProcessFilterInvite(
 		base::weak_ptr<Window::SessionController> weak,
 		const QString &slug,
 		FilterId filterId,
 		const QString &title,
-		std::vector<not_null<PeerData*>> peers) {
+		const QString &iconEmoji,
+		std::vector<not_null<PeerData*>> peers,
+		std::vector<not_null<PeerData*>> already) {
 	const auto strong = weak.get();
 	if (!strong) {
 		return;
@@ -323,19 +404,21 @@ void ProcessFilterInvite(
 		});
 		return;
 	}
+	const auto fullyAdded = (peers.empty() && filterId);
 	auto controller = std::make_unique<ToggleChatsController>(
 		strong,
 		ToggleAction::Adding,
-		slug,
-		filterId,
 		title,
-		std::move(peers));
+		std::move(peers),
+		std::move(already));
 	const auto raw = controller.get();
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setStyle(st::filterInviteBox);
 
 		using Type = Ui::FilterLinkHeaderType;
-		const auto type = !filterId
+		const auto type = fullyAdded
+			? Type::AllAdded
+			: !filterId
 			? Type::AddingFilter
 			: Type::AddingChats;
 		auto badge = raw->selectedValue(
@@ -344,7 +427,7 @@ void ProcessFilterInvite(
 		});
 		InitFilterLinkHeader(box, [=](int addedTopHeight) {
 			raw->setAddedTopHeight(addedTopHeight);
-		}, type, title, rpl::duplicate(badge));
+		}, type, title, iconEmoji, rpl::duplicate(badge));
 
 		auto owned = Ui::FilterLinkProcessButton(
 			box,
@@ -380,6 +463,7 @@ void ProcessFilterInvite(
 				} else if (!state->importing) {
 					state->importing = true;
 					ImportInvite(weak, slug, peers, crl::guard(box, [=] {
+						ShowImportToast(weak, title, type, peers.size());
 						box->closeBox();
 					}), crl::guard(box, [=] {
 						state->importing = false;
@@ -396,7 +480,8 @@ void ProcessFilterInvite(
 		base::weak_ptr<Window::SessionController> weak,
 		const QString &slug,
 		FilterId filterId,
-		std::vector<not_null<PeerData*>> peers) {
+		std::vector<not_null<PeerData*>> peers,
+		std::vector<not_null<PeerData*>> already) {
 	const auto strong = weak.get();
 	if (!strong) {
 		return;
@@ -411,7 +496,14 @@ void ProcessFilterInvite(
 		});
 		return;
 	}
-	ProcessFilterInvite(weak, slug, filterId, it->title(), std::move(peers));
+	ProcessFilterInvite(
+		weak,
+		slug,
+		filterId,
+		it->title(),
+		it->iconEmoji(),
+		std::move(peers),
+		std::move(already));
 }
 
 } // namespace
@@ -441,6 +533,7 @@ void CheckFilterInvite(
 			return;
 		}
 		auto title = QString();
+		auto iconEmoji = QString();
 		auto filterId = FilterId();
 		auto peers = std::vector<not_null<PeerData*>>();
 		auto already = std::vector<not_null<PeerData*>>();
@@ -459,6 +552,7 @@ void CheckFilterInvite(
 		};
 		result.match([&](const MTPDcommunities_communityInvite &data) {
 			title = qs(data.vtitle());
+			iconEmoji = data.vemoticon().value_or_empty();
 			peers = parseList(data.vpeers());
 		}, [&](const MTPDcommunities_communityInviteAlready &data) {
 			filterId = data.vfilter_id().v;
@@ -477,20 +571,103 @@ void CheckFilterInvite(
 			owner.chatsFilters().changed(
 			) | rpl::start_with_next([=] {
 				lifetime->destroy();
-				ProcessFilterInvite(weak, slug, filterId, std::move(peers));
+				ProcessFilterInvite(
+					weak,
+					slug,
+					filterId,
+					std::move(peers),
+					std::move(already));
 			}, *lifetime);
 			owner.chatsFilters().reload();
 		} else if (filterId) {
-			ProcessFilterInvite(weak, slug, filterId, std::move(peers));
+			ProcessFilterInvite(
+				weak,
+				slug,
+				filterId,
+				std::move(peers),
+				std::move(already));
 		} else {
-			ProcessFilterInvite(weak, slug, filterId, title, std::move(peers));
+			ProcessFilterInvite(
+				weak,
+				slug,
+				filterId,
+				title,
+				iconEmoji,
+				std::move(peers),
+				std::move(already));
 		}
 	}, [=](const MTP::Error &error) {
 		if (error.code() != 400) {
 			return;
 		}
-		ProcessFilterInvite(weak, slug, FilterId(), QString(), {});
+		ProcessFilterInvite(weak, slug, {}, {}, {}, {}, {});
 	});
 }
 
+void ProcessFilterRemove(
+		base::weak_ptr<Window::SessionController> weak,
+		const QString &title,
+		const QString &iconEmoji,
+		std::vector<not_null<PeerData*>> all,
+		std::vector<not_null<PeerData*>> suggest,
+		Fn<void(std::vector<not_null<PeerData*>>)> done) {
+	const auto strong = weak.get();
+	if (!strong) {
+		return;
+	}
+	Core::App().hideMediaView();
+	if (all.empty() && suggest.empty()) {
+		done({});
+		return;
+	}
+	auto controller = std::make_unique<ToggleChatsController>(
+		strong,
+		ToggleAction::Removing,
+		title,
+		std::move(suggest),
+		std::move(all));
+	const auto raw = controller.get();
+	auto initBox = [=](not_null<PeerListBox*> box) {
+		box->setStyle(st::filterInviteBox);
+
+		const auto type = Ui::FilterLinkHeaderType::Removing;
+		auto badge = raw->selectedValue(
+		) | rpl::map([=](const base::flat_set<not_null<PeerData*>> &peers) {
+			return int(peers.size());
+		});
+		InitFilterLinkHeader(box, [=](int addedTopHeight) {
+			raw->setAddedTopHeight(addedTopHeight);
+		}, type, title, iconEmoji, rpl::single(0));
+
+		auto owned = Ui::FilterLinkProcessButton(
+			box,
+			type,
+			title,
+			std::move(badge));
+
+		const auto button = owned.data();
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			const auto &padding = st::filterInviteBox.buttonPadding;
+			button->resizeToWidth(width
+				- padding.left()
+				- padding.right());
+			button->moveToLeft(padding.left(), padding.top());
+		}, button->lifetime());
+
+		box->addButton(std::move(owned));
+
+		raw->selectedValue(
+		) | rpl::start_with_next([=](
+				base::flat_set<not_null<PeerData*>> &&peers) {
+			button->setClickedCallback([=] {
+				done(peers | ranges::to_vector);
+				box->closeBox();
+			});
+		}, box->lifetime());
+	};
+	strong->show(
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_filters.h b/Telegram/SourceFiles/api/api_chat_filters.h
index 99fce06a2..7691d899b 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.h
+++ b/Telegram/SourceFiles/api/api_chat_filters.h
@@ -25,4 +25,12 @@ void CheckFilterInvite(
 	not_null<Window::SessionController*> controller,
 	const QString &slug);
 
+void ProcessFilterRemove(
+	base::weak_ptr<Window::SessionController> weak,
+	const QString &title,
+	const QString &iconEmoji,
+	std::vector<not_null<PeerData*>> all,
+	std::vector<not_null<PeerData*>> suggest,
+	Fn<void(std::vector<not_null<PeerData*>>)> done);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 9c519991f..6bbded27c 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -706,7 +706,16 @@ void EditFilterBox(
 		return result;
 	};
 
-	AddSubsectionTitle(content, tr::lng_filters_link());
+	AddSubsectionTitle(
+		content,
+		rpl::conditional(
+			state->hasLinks.value(),
+			tr::lng_filters_link_has(),
+			tr::lng_filters_link()));
+
+	state->hasLinks.changes() | rpl::start_with_next([=] {
+		content->resizeToWidth(content->widthNoMargins());
+	}, content->lifetime());
 
 	if (filter.community()) {
 		window->session().data().chatsFilters().reloadCommunityLinks(
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 0f7333a02..0aee58f6d 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -679,26 +679,12 @@ void LinkController::prepare() {
 
 	setupAboveWidget();
 	setupBelowWidget();
-	const auto countStatus = [&](not_null<PeerData*> peer) {
-		if (const auto chat = peer->asChat()) {
-			if (const auto count = chat->count; count > 0) {
-				return tr::lng_chat_status_members(tr::now, lt_count, count);
-			}
-		} else if (const auto channel = peer->asChannel()) {
-			if (channel->membersCountKnown()) {
-				return (channel->isBroadcast()
-					? tr::lng_chat_status_subscribers
-					: tr::lng_chat_status_members)(
-						tr::now,
-						lt_count,
-						channel->membersCount());
-			}
-		}
-		return QString();
-	};
 	for (const auto &history : _data.chats) {
 		const auto peer = history->peer;
-		auto row = std::make_unique<ChatRow>(peer, countStatus(peer), false);
+		auto row = std::make_unique<ChatRow>(
+			peer,
+			FilterChatStatusText(peer),
+			false);
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
 		delegate()->peerListSetRowChecked(raw, true);
@@ -712,7 +698,7 @@ void LinkController::prepare() {
 		const auto error = ErrorForSharing(history);
 		auto row = std::make_unique<ChatRow>(
 			peer,
-			error ? error->status : countStatus(peer),
+			error ? error->status : FilterChatStatusText(peer),
 			error.has_value());
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
@@ -1160,6 +1146,24 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 	return Box<PeerListBox>(std::move(controller), std::move(initBox));
 }
 
+QString FilterChatStatusText(not_null<PeerData*> peer) {
+	if (const auto chat = peer->asChat()) {
+		if (const auto count = chat->count; count > 0) {
+			return tr::lng_chat_status_members(tr::now, lt_count, count);
+		}
+	} else if (const auto channel = peer->asChannel()) {
+		if (channel->membersCountKnown()) {
+			return (channel->isBroadcast()
+				? tr::lng_chat_status_subscribers
+				: tr::lng_chat_status_members)(
+					tr::now,
+					lt_count,
+					channel->membersCount());
+		}
+	}
+	return QString();
+}
+
 void SetupFilterLinks(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> window,
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
index a2024faa4..dca57121a 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
@@ -36,10 +36,11 @@ void ExportFilterLink(
 	Fn<void(Data::ChatFilterLink)> done,
 	Fn<void(QString)> fail);
 
-object_ptr<Ui::BoxContent> ShowLinkBox(
+[[nodiscard]] object_ptr<Ui::BoxContent> ShowLinkBox(
 	not_null<Window::SessionController*> window,
 	const Data::ChatFilter &filter,
 	const Data::ChatFilterLink &link);
+[[nodiscard]] QString FilterChatStatusText(not_null<PeerData*> peer);
 
 void SetupFilterLinks(
 	not_null<Ui::VerticalLayout*> container,
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 18b74ec05..3fc5717d8 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1354,6 +1354,9 @@ void Session::setupChannelLeavingViewer() {
 				history->removeJoinedMessage();
 				history->updateChatListExistence();
 				history->updateChatListSortPosition();
+				if (!history->inChatList()) {
+					history->clearFolder();
+				}
 			}
 		}
 	}, _lifetime);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 0dd60090e..479883322 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_folders.h"
 
 #include "apiwrap.h"
+#include "api/api_chat_filters.h" // ProcessFilterRemove.
 #include "boxes/premium_limits_box.h"
 #include "boxes/filters/edit_filter_box.h"
 #include "core/application.h"
@@ -22,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lottie/lottie_icon.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/filter_icons.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
@@ -102,6 +104,10 @@ struct FilterRow {
 	not_null<FilterRowButton*> button;
 	Data::ChatFilter filter;
 	bool removed = false;
+	bool removeHasLinks = false;
+	mtpRequestId removePeersRequestId = 0;
+	std::vector<not_null<PeerData*>> suggestRemovePeers;
+	std::vector<not_null<PeerData*>> removePeers;
 	bool added = false;
 	bool postponedCountUpdate = false;
 };
@@ -361,6 +367,81 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		controller->show(Box(FiltersLimitBox, session));
 		return true;
 	};
+	const auto markForRemovalSure = [=](not_null<FilterRowButton*> button) {
+		const auto row = find(button);
+		if (row->removed || row->removePeersRequestId > 0) {
+			return;
+		} else if (row->filter.community()
+			&& !row->filter.always().empty()) {
+			const auto chosen = crl::guard(button, [=](
+					std::vector<not_null<PeerData*>> peers) {
+				const auto row = find(button);
+				row->removePeers = std::move(peers);
+				row->removed = true;
+				button->setRemoved(true);
+			});
+			Api::ProcessFilterRemove(
+				controller,
+				row->filter.title(),
+				row->filter.iconEmoji(),
+				row->filter.always() | ranges::views::transform(
+					&History::peer
+				) | ranges::to_vector,
+				row->suggestRemovePeers,
+				chosen);
+		} else {
+			row->removePeers = {};
+			row->removed = true;
+			button->setRemoved(true);
+		}
+	};
+	const auto markForRemoval = [=](not_null<FilterRowButton*> button) {
+		const auto row = find(button);
+		if (row->removed || row->removePeersRequestId > 0) {
+			return;
+		} else if (row->filter.community() && row->removeHasLinks) {
+			controller->show(Ui::MakeConfirmBox({
+				.text = { tr::lng_filters_delete_sure(tr::now) },
+				.confirmed = crl::guard(button, [=](Fn<void()> close) {
+					markForRemovalSure(button);
+					close();
+				}),
+				.confirmText = tr::lng_box_delete(),
+				.confirmStyle = &st::attentionBoxButton,
+			}));
+		} else {
+			markForRemovalSure(button);
+		}
+	};
+	const auto remove = [=](not_null<FilterRowButton*> button) {
+		const auto row = find(button);
+		if (row->removed || row->removePeersRequestId > 0) {
+			return;
+		} else if (row->filter.community() && !row->removePeersRequestId) {
+			row->removePeersRequestId = session->api().request(
+				MTPcommunities_GetLeaveCommunitySuggestions(
+					MTP_inputCommunityDialogFilter(
+						MTP_int(row->filter.id())))
+			).done(crl::guard(button, [=](const MTPVector<MTPPeer> &result) {
+				const auto row = find(button);
+				row->removePeersRequestId = -1;
+				row->suggestRemovePeers = ranges::views::all(
+					result.v
+				) | ranges::views::transform([=](const MTPPeer &peer) {
+					return session->data().peer(peerFromMTP(peer));
+				}) | ranges::to_vector;
+				row->removeHasLinks = true; // #TODO filters
+				markForRemoval(button);
+			})).fail(crl::guard(button, [=] {
+				const auto row = find(button);
+				row->removePeersRequestId = -1;
+				row->removeHasLinks = false;
+				markForRemoval(button);
+			})).send();
+		} else {
+			markForRemoval(button);
+		}
+	};
 	const auto wrap = container->add(object_ptr<Ui::VerticalLayout>(
 		container));
 	const auto addFilter = [=](const Data::ChatFilter &filter) {
@@ -368,8 +449,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			object_ptr<FilterRowButton>(wrap, session, filter));
 		button->removeRequests(
 		) | rpl::start_with_next([=] {
-			button->setRemoved(true);
-			find(button)->removed = true;
+			remove(button);
 		}, button->lifetime());
 		button->restoreRequests(
 		) | rpl::start_with_next([=] {
@@ -562,6 +642,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		auto updates = std::vector<MTPUpdate>();
 		auto addRequests = std::vector<MTPmessages_UpdateDialogFilter>();
 		auto removeRequests = std::vector<MTPmessages_UpdateDialogFilter>();
+		auto removeCommunityRequests = std::vector<MTPcommunities_LeaveCommunity>();
 
 		auto &realFilters = session->data().chatsFilters();
 		const auto &list = realFilters.list();
@@ -590,17 +671,32 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			const auto tl = removed
 				? MTPDialogFilter()
 				: row.filter.tl(newId);
-			const auto request = MTPmessages_UpdateDialogFilter(
-				MTP_flags(removed
-					? MTPmessages_UpdateDialogFilter::Flag(0)
-					: MTPmessages_UpdateDialogFilter::Flag::f_filter),
-				MTP_int(newId),
-				tl);
-			if (removed) {
-				removeRequests.push_back(request);
+			const auto removeCommunityWithChats = removed
+				&& row.filter.community()
+				&& !row.removePeers.empty();
+			if (removeCommunityWithChats) {
+				auto inputs = ranges::views::all(
+					row.removePeers
+				) | ranges::views::transform([](not_null<PeerData*> peer) {
+					return MTPInputPeer(peer->input);
+				}) | ranges::to<QVector>();
+				removeCommunityRequests.push_back(
+					MTPcommunities_LeaveCommunity(
+						MTP_inputCommunityDialogFilter(MTP_int(newId)),
+						MTP_vector<MTPInputPeer>(std::move(inputs))));
 			} else {
-				addRequests.push_back(request);
-				order.push_back(newId);
+				const auto request = MTPmessages_UpdateDialogFilter(
+					MTP_flags(removed
+						? MTPmessages_UpdateDialogFilter::Flag(0)
+						: MTPmessages_UpdateDialogFilter::Flag::f_filter),
+					MTP_int(newId),
+					tl);
+				if (removed) {
+					removeRequests.push_back(request);
+				} else {
+					addRequests.push_back(request);
+					order.push_back(newId);
+				}
 			}
 			updates.push_back(MTP_updateDialogFilter(
 				MTP_flags(removed
@@ -629,7 +725,8 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			order = std::move(order),
 			updates = std::move(updates),
 			addRequests = std::move(addRequests),
-			removeRequests = std::move(removeRequests)
+			removeRequests = std::move(removeRequests),
+			removeCommunityRequests = std::move(removeCommunityRequests)
 		] {
 			const auto api = &session->api();
 			const auto filters = &session->data().chatsFilters();
@@ -646,18 +743,25 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				filters->apply(update);
 			}
 			auto previousId = mtpRequestId(0);
-			auto &&requests = ranges::views::concat(
-				removeRequests,
-				addRequests);
-			for (auto &request : requests) {
-				previousId = api->request(
-					std::move(request)
-				).done([=](const auto &, mtpRequestId id) {
-					ids->remove(id);
-					checkFinished();
-				}).afterRequest(previousId).send();
-				ids->emplace(previousId);
-			}
+			const auto sendRequests = [&](const auto &requests) {
+				for (auto &request : requests) {
+					previousId = api->request(
+						std::move(request)
+					).done([=](const auto &result, mtpRequestId id) {
+						if constexpr (std::is_same_v<
+								std::decay_t<decltype(result)>,
+								MTPUpdates>) {
+							session->api().applyUpdates(result);
+						}
+						ids->remove(id);
+						checkFinished();
+					}).afterRequest(previousId).send();
+					ids->emplace(previousId);
+				}
+			};
+			sendRequests(removeRequests);
+			sendRequests(removeCommunityRequests);
+			sendRequests(addRequests);
 			if (!order.empty() && !addRequests.empty()) {
 				filters->saveOrder(order, previousId);
 			}

From 312aa4b130f01f1fc24d3252bb7570f3b4be91a4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Apr 2023 11:58:30 +0400
Subject: [PATCH 011/676] Update API scheme on layer 158.

---
 Telegram/Resources/langs/lang.strings         | 13 ++--
 Telegram/Resources/tl/api.tl                  | 49 +++++++-------
 Telegram/SourceFiles/api/api_chat_filters.cpp |  8 +--
 Telegram/SourceFiles/api/api_invite_links.cpp |  2 +-
 Telegram/SourceFiles/apiwrap.cpp              |  4 +-
 Telegram/SourceFiles/apiwrap.h                |  2 +-
 .../boxes/filters/edit_filter_box.cpp         | 22 +++----
 .../boxes/filters/edit_filter_chats_list.cpp  | 10 +--
 .../boxes/filters/edit_filter_chats_list.h    |  2 +-
 .../boxes/filters/edit_filter_links.cpp       | 20 +++---
 .../boxes/peers/edit_peer_invite_link.cpp     | 15 +++--
 .../boxes/peers/edit_peer_invite_link.h       |  4 +-
 .../boxes/peers/edit_peer_invite_links.cpp    |  2 +-
 .../SourceFiles/data/data_chat_filters.cpp    | 66 +++++++++----------
 Telegram/SourceFiles/data/data_chat_filters.h | 14 ++--
 .../export/data/export_data_types.cpp         |  2 +
 .../export/data/export_data_types.h           |  6 +-
 .../export/output/export_output_html.cpp      |  5 ++
 .../export/output/export_output_json.cpp      |  4 ++
 .../admin_log/history_admin_log_item.cpp      |  2 +-
 Telegram/SourceFiles/history/history_item.cpp | 37 +++++++++++
 .../history/history_item_components.h         |  5 ++
 .../SourceFiles/settings/settings_folders.cpp | 30 ++++-----
 .../window/themes/window_theme.cpp            |  1 +
 24 files changed, 198 insertions(+), 127 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0037d48c7..4e8314d3e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1523,6 +1523,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_attach_menu_bot_allowed" = "You allowed this bot to message you when you added it in the attachment menu.";
 "lng_action_set_wallpaper_me" = "You set a new background for this chat.";
 "lng_action_set_wallpaper" = "{user} set a new background for this chat.";
+"lng_action_set_same_wallpaper_me" = "You set {background} for this chat.";
+"lng_action_set_same_wallpaper" = "{user} set {background} for this chat.";
+"lng_action_set_same_background" = "the same background";
 "lng_action_topic_created_inside" = "Topic created";
 "lng_action_topic_closed_inside" = "Topic closed";
 "lng_action_topic_reopened_inside" = "Topic reopened";
@@ -3577,8 +3580,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_link_private_status" = "you can't share private chats";
 "lng_filters_link_private_error" = "Private chats can't be shared.";
 "lng_filters_link_noadmin_status" = "you can't invite others here";
-"lng_filters_link_noadmin_group_error" = "You don't have the admin rights to share invite links to this group chat.";
-"lng_filters_link_noadmin_channel_error" = "You don't have the admin rights to share invite links to this channel.";
+"lng_filters_link_noadmin_group_error" = "You don't have the admin rights to share invite links to this private group chat.";
+"lng_filters_link_noadmin_channel_error" = "You don't have the admin rights to share invite links to this private channel.";
 "lng_filters_link_already_group" = "you are already a member";
 "lng_filters_link_already_channel" = "you are already subscribed";
 "lng_filters_link_chats_about" = "Select groups and channels that you want everyone who adds the folder via invite link to join.";
@@ -3587,6 +3590,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_link_chats_no_about" = "You can only share groups and channels in which you are allowed to create invite links.";
 "lng_filters_link_name_it" = "Name Link";
 "lng_filters_link_delete_sure" = "Are you sure you want to delete this link?";
+"lng_filters_link_qr_about" = "Everyone on Telegram can scan this code to add this folder and join the chats included in this invite link.";
 "lng_filters_by_link_title" = "Add Folder";
 "lng_filters_by_link_sure" = "Do you want to add a new chat folder {folder} and join its groups and channels?";
 "lng_filters_by_link_join#one" = "{count} chat to join";
@@ -3603,7 +3607,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_by_link_in#one" = "{count} chat in this folder";
 "lng_filters_by_link_in#other" = "{count} chats in this folder";
 "lng_filters_by_link_remove" = "Remove Folder";
-"lng_filters_by_link_remove_sure" = "Do you want to quit the chats you joined when added the folder {folder}?";
+"lng_filters_by_link_remove_sure" = "Do you also want to quit the chats included in the folder {folder}?";
 "lng_filters_by_link_quit#one" = "{count} chat to quit";
 "lng_filters_by_link_quit#other" = "{count} chats to quit";
 "lng_filters_by_link_select" = "Select All";
@@ -3619,7 +3623,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_updated_also#other" = "You have joined {count} new chats.";
 "lng_filters_bar_you_can#one" = "You can join {count} new chat";
 "lng_filters_bar_you_can#other" = "You can join {count} new chats";
-"lng_filters_bar_view" = "Click here to view them";
+"lng_filters_bar_view#one" = "Click here to view it";
+"lng_filters_bar_view#other" = "Click here to view them";
 
 "lng_chat_theme_change" = "Change colors";
 "lng_chat_theme_none" = "No\nTheme";
diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index e0b47d985..015391c6c 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -197,6 +197,7 @@ messageActionTopicEdit#c0944820 flags:# title:flags.0?string icon_emoji_id:flags
 messageActionSuggestProfilePhoto#57de635e photo:Photo = MessageAction;
 messageActionRequestedPeer#fe77345d button_id:int peer:Peer = MessageAction;
 messageActionSetChatWallPaper#bc44a927 wallpaper:WallPaper = MessageAction;
+messageActionSetSameChatWallPaper#da54583a = MessageAction;
 
 dialog#d58a08c6 flags:# pinned:flags.2?true unread_mark:flags.3?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int ttl_period:flags.5?int = Dialog;
 dialogFolder#71bd134c flags:# pinned:flags.2?true folder:Folder peer:Peer top_message:int unread_muted_peers_count:int unread_unmuted_peers_count:int unread_muted_messages_count:int unread_unmuted_messages_count:int = Dialog;
@@ -386,7 +387,7 @@ updateGroupCallParticipants#f2ebdb4e call:InputGroupCall participants:Vector<Gro
 updateGroupCall#14b24500 chat_id:long call:GroupCall = Update;
 updatePeerHistoryTTL#bb9bb9a5 flags:# peer:Peer ttl_period:flags.0?int = Update;
 updateChatParticipant#d087663a flags:# chat_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChatParticipant new_participant:flags.1?ChatParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
-updateChannelParticipant#985d3abb flags:# via_community:flags.3?true channel_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
+updateChannelParticipant#985d3abb flags:# via_chatlist:flags.3?true channel_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
 updateBotStopped#c4870a49 user_id:long date:int stopped:Bool qts:int = Update;
 updateGroupCallConnection#b783982 flags:# presentation:flags.0?true params:DataJSON = Update;
 updateBotCommands#4d712f2e peer:Peer bot_id:long commands:Vector<BotCommand> = Update;
@@ -960,7 +961,7 @@ channelAdminLogEventActionDiscardGroupCall#db9f9140 call:InputGroupCall = Channe
 channelAdminLogEventActionParticipantMute#f92424d2 participant:GroupCallParticipant = ChannelAdminLogEventAction;
 channelAdminLogEventActionParticipantUnmute#e64429c0 participant:GroupCallParticipant = ChannelAdminLogEventAction;
 channelAdminLogEventActionToggleGroupCallSetting#56d6a247 join_muted:Bool = ChannelAdminLogEventAction;
-channelAdminLogEventActionParticipantJoinByInvite#fe9fc158 flags:# via_community:flags.0?true invite:ExportedChatInvite = ChannelAdminLogEventAction;
+channelAdminLogEventActionParticipantJoinByInvite#fe9fc158 flags:# via_chatlist:flags.0?true invite:ExportedChatInvite = ChannelAdminLogEventAction;
 channelAdminLogEventActionExportedInviteDelete#5a50fca4 invite:ExportedChatInvite = ChannelAdminLogEventAction;
 channelAdminLogEventActionExportedInviteRevoke#410a134e invite:ExportedChatInvite = ChannelAdminLogEventAction;
 channelAdminLogEventActionExportedInviteEdit#e90ebb59 prev_invite:ExportedChatInvite new_invite:ExportedChatInvite = ChannelAdminLogEventAction;
@@ -1228,7 +1229,7 @@ payments.bankCardData#3e24e573 title:string open_urls:Vector<BankCardOpenUrl> =
 
 dialogFilter#7438f7e8 flags:# contacts:flags.0?true non_contacts:flags.1?true groups:flags.2?true broadcasts:flags.3?true bots:flags.4?true exclude_muted:flags.11?true exclude_read:flags.12?true exclude_archived:flags.13?true id:int title:string emoticon:flags.25?string pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> exclude_peers:Vector<InputPeer> = DialogFilter;
 dialogFilterDefault#363293ae = DialogFilter;
-dialogFilterCommunity#d8565037 flags:# id:int title:string emoticon:flags.25?string pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> = DialogFilter;
+dialogFilterChatlist#d64a04a8 flags:# has_my_invites:flags.26?true id:int title:string emoticon:flags.25?string pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> = DialogFilter;
 
 dialogFilterSuggested#77744d4a filter:DialogFilter description:string = DialogFilterSuggested;
 
@@ -1307,7 +1308,7 @@ messages.historyImportParsed#5e0fb7b9 flags:# pm:flags.0?true group:flags.1?true
 
 messages.affectedFoundMessages#ef8d3e6c pts:int pts_count:int offset:int messages:Vector<int> = messages.AffectedFoundMessages;
 
-chatInviteImporter#8c5adfd9 flags:# requested:flags.0?true via_community:flags.3?true user_id:long date:int about:flags.2?string approved_by:flags.1?long = ChatInviteImporter;
+chatInviteImporter#8c5adfd9 flags:# requested:flags.0?true via_chatlist:flags.3?true user_id:long date:int about:flags.2?string approved_by:flags.1?long = ChatInviteImporter;
 
 messages.exportedChatInvites#bdc62dcc count:int invites:Vector<ExportedChatInvite> users:Vector<User> = messages.ExportedChatInvites;
 
@@ -1526,18 +1527,18 @@ inlineBotWebView#b57295d5 text:string url:string = InlineBotWebView;
 
 readParticipantDate#4a4ff172 user_id:long date:int = ReadParticipantDate;
 
-inputCommunityDialogFilter#1ae107a1 filter_id:int = InputCommunity;
+inputChatlistDialogFilter#f3e0da33 filter_id:int = InputChatlist;
 
-exportedCommunityInvite#ebddc1aa flags:# title:string url:string peers:Vector<Peer> = ExportedCommunityInvite;
+exportedChatlistInvite#c5181ac flags:# title:string url:string peers:Vector<Peer> = ExportedChatlistInvite;
 
-communities.exportedCommunityInvite#6b97a8ea filter:DialogFilter invite:ExportedCommunityInvite = communities.ExportedCommunityInvite;
+chatlists.exportedChatlistInvite#10e6e3a6 filter:DialogFilter invite:ExportedChatlistInvite = chatlists.ExportedChatlistInvite;
 
-communities.exportedInvites#ffd75fa7 invites:Vector<ExportedCommunityInvite> chats:Vector<Chat> users:Vector<User> = communities.ExportedInvites;
+chatlists.exportedInvites#10ab6dc7 invites:Vector<ExportedChatlistInvite> chats:Vector<Chat> users:Vector<User> = chatlists.ExportedInvites;
 
-communities.communityInviteAlready#c745ee07 filter_id:int missing_peers:Vector<Peer> already_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = communities.CommunityInvite;
-communities.communityInvite#3857da1 flags:# title:string emoticon:flags.0?string peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = communities.CommunityInvite;
+chatlists.chatlistInviteAlready#fa87f659 filter_id:int missing_peers:Vector<Peer> already_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = chatlists.ChatlistInvite;
+chatlists.chatlistInvite#1dcd839d flags:# title:string emoticon:flags.0?string peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = chatlists.ChatlistInvite;
 
-communities.communityUpdates#e74660b3 missing_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = communities.CommunityUpdates;
+chatlists.chatlistUpdates#93bd878d missing_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = chatlists.ChatlistUpdates;
 
 bots.botInfo#e8a775b0 name:string about:string description:string = bots.BotInfo;
 
@@ -1623,7 +1624,7 @@ account.getContactSignUpNotification#9f07c728 = Bool;
 account.setContactSignUpNotification#cff43f61 silent:Bool = Bool;
 account.getNotifyExceptions#53577479 flags:# compare_sound:flags.1?true peer:flags.0?InputNotifyPeer = Updates;
 account.getWallPaper#fc8ddbea wallpaper:InputWallPaper = WallPaper;
-account.uploadWallPaper#dd853661 file:InputFile mime_type:string settings:WallPaperSettings = WallPaper;
+account.uploadWallPaper#e39a8f03 flags:# for_chat:flags.0?true file:InputFile mime_type:string settings:WallPaperSettings = WallPaper;
 account.saveWallPaper#6c5a5b37 wallpaper:InputWallPaper unsave:Bool settings:WallPaperSettings = Bool;
 account.installWallPaper#feed5769 wallpaper:InputWallPaper settings:WallPaperSettings = Bool;
 account.resetWallPapers#bb3b9804 = Bool;
@@ -1877,7 +1878,7 @@ messages.searchCustomEmoji#2c11c0d7 emoticon:string hash:long = EmojiList;
 messages.togglePeerTranslations#e47cb579 flags:# disabled:flags.0?true peer:InputPeer = Bool;
 messages.getBotApp#34fdc5c3 app:InputBotApp hash:long = messages.BotApp;
 messages.requestAppWebView#8c5a3b3c flags:# write_allowed:flags.0?true peer:InputPeer app:InputBotApp start_param:flags.1?string theme_params:flags.2?DataJSON platform:string = AppWebViewResult;
-messages.setChatWallPaper#bddd7eaa peer:InputPeer wallpaper:InputWallPaper settings:WallPaperSettings = Updates;
+messages.setChatWallPaper#dbaaba25 flags:# peer:InputPeer wallpaper:flags.0?InputWallPaper settings:flags.0?WallPaperSettings id:flags.1?int = Updates;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#25939651 flags:# pts:int pts_total_limit:flags.0?int date:int qts:int = updates.Difference;
@@ -2061,16 +2062,16 @@ stats.getMegagroupStats#dcdf8607 flags:# dark:flags.0?true channel:InputChannel
 stats.getMessagePublicForwards#5630281b channel:InputChannel msg_id:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats;
 
-communities.exportCommunityInvite#41fe69d9 community:InputCommunity title:string peers:Vector<InputPeer> = communities.ExportedCommunityInvite;
-communities.deleteExportedInvite#f96e4616 community:InputCommunity slug:string = Bool;
-communities.editExportedInvite#27140512 flags:# community:InputCommunity slug:string title:flags.1?string peers:flags.2?Vector<InputPeer> = ExportedCommunityInvite;
-communities.getExportedInvites#4688a39d community:InputCommunity = communities.ExportedInvites;
-communities.checkCommunityInvite#99ba9e5 slug:string = communities.CommunityInvite;
-communities.joinCommunityInvite#4eff927 slug:string peers:Vector<InputPeer> = Updates;
-communities.getCommunityUpdates#2956d635 community:InputCommunity = communities.CommunityUpdates;
-communities.joinCommunityUpdates#51d42216 community:InputCommunity peers:Vector<InputPeer> = Updates;
-communities.hideCommunityUpdates#d678baf community:InputCommunity = Bool;
-communities.getLeaveCommunitySuggestions#ee4e9ae2 community:InputCommunity = Vector<Peer>;
-communities.leaveCommunity#35d9755f community:InputCommunity peers:Vector<InputPeer> = Updates;
+chatlists.exportChatlistInvite#8472478e chatlist:InputChatlist title:string peers:Vector<InputPeer> = chatlists.ExportedChatlistInvite;
+chatlists.deleteExportedInvite#719c5c5e chatlist:InputChatlist slug:string = Bool;
+chatlists.editExportedInvite#653db63d flags:# chatlist:InputChatlist slug:string title:flags.1?string peers:flags.2?Vector<InputPeer> = ExportedChatlistInvite;
+chatlists.getExportedInvites#ce03da83 chatlist:InputChatlist = chatlists.ExportedInvites;
+chatlists.checkChatlistInvite#41c10fff slug:string = chatlists.ChatlistInvite;
+chatlists.joinChatlistInvite#a6b1e39a slug:string peers:Vector<InputPeer> = Updates;
+chatlists.getChatlistUpdates#89419521 chatlist:InputChatlist = chatlists.ChatlistUpdates;
+chatlists.joinChatlistUpdates#e089f8f5 chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
+chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
+chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
+chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
 // LAYER 158
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 332afd22f..7908ddc40 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -216,7 +216,7 @@ void ImportInvite(
 	auto inputs = peers | ranges::views::transform([](auto peer) {
 		return MTPInputPeer(peer->input);
 	}) | ranges::to<QVector>();
-	api->request(MTPcommunities_JoinCommunityInvite(
+	api->request(MTPchatlists_JoinChatlistInvite(
 		MTP_string(slug),
 		MTP_vector<MTPInputPeer>(std::move(inputs))
 	)).done(callback).fail(error).send();
@@ -527,7 +527,7 @@ void CheckFilterInvite(
 	const auto session = &controller->session();
 	const auto weak = base::make_weak(controller);
 	session->api().checkFilterInvite(slug, [=](
-			const MTPcommunities_CommunityInvite &result) {
+			const MTPchatlists_ChatlistInvite &result) {
 		const auto strong = weak.get();
 		if (!strong) {
 			return;
@@ -550,11 +550,11 @@ void CheckFilterInvite(
 			}
 			return result;
 		};
-		result.match([&](const MTPDcommunities_communityInvite &data) {
+		result.match([&](const MTPDchatlists_chatlistInvite &data) {
 			title = qs(data.vtitle());
 			iconEmoji = data.vemoticon().value_or_empty();
 			peers = parseList(data.vpeers());
-		}, [&](const MTPDcommunities_communityInviteAlready &data) {
+		}, [&](const MTPDchatlists_chatlistInviteAlready &data) {
 			filterId = data.vfilter_id().v;
 			peers = parseList(data.vmissing_peers());
 			already = parseList(data.valready_peers());
diff --git a/Telegram/SourceFiles/api/api_invite_links.cpp b/Telegram/SourceFiles/api/api_invite_links.cpp
index 8958285f7..1f02b78c1 100644
--- a/Telegram/SourceFiles/api/api_invite_links.cpp
+++ b/Telegram/SourceFiles/api/api_invite_links.cpp
@@ -58,7 +58,7 @@ JoinedByLinkSlice ParseJoinedByLinkSlice(
 				result.users.push_back({
 					.user = owner.user(data.vuser_id()),
 					.date = data.vdate().v,
-					.viaFilterLink = data.is_via_community(),
+					.viaFilterLink = data.is_via_chatlist(),
 				});
 			});
 		}
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index f7a097d26..a589be492 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -382,11 +382,11 @@ void ApiWrap::checkChatInvite(
 
 void ApiWrap::checkFilterInvite(
 		const QString &slug,
-		FnMut<void(const MTPcommunities_CommunityInvite &)> done,
+		FnMut<void(const MTPchatlists_ChatlistInvite &)> done,
 		Fn<void(const MTP::Error &)> fail) {
 	request(base::take(_checkFilterInviteRequestId)).cancel();
 	_checkFilterInviteRequestId = request(
-		MTPcommunities_CheckCommunityInvite(MTP_string(slug))
+		MTPchatlists_CheckChatlistInvite(MTP_string(slug))
 	).done(std::move(done)).fail(std::move(fail)).send();
 }
 
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index a142e09a9..e747f0f07 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -204,7 +204,7 @@ public:
 		Fn<void(const MTP::Error &)> fail);
 	void checkFilterInvite(
 		const QString &slug,
-		FnMut<void(const MTPcommunities_CommunityInvite &)> done,
+		FnMut<void(const MTPchatlists_ChatlistInvite &)> done,
 		Fn<void(const MTP::Error &)> fail);
 
 	void processFullPeer(
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 6bbded27c..ba170509b 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -554,19 +554,19 @@ void EditFilterBox(
 		rpl::variable<Data::ChatFilter> rules;
 		rpl::variable<std::vector<Data::ChatFilterLink>> links;
 		rpl::variable<bool> hasLinks;
-		rpl::variable<bool> community;
+		rpl::variable<bool> chatlist;
 	};
 	const auto owner = &window->session().data();
 	const auto state = box->lifetime().make_state<State>(State{
 		.rules = filter,
-		.community = filter.community(),
+		.chatlist = filter.chatlist(),
 	});
-	state->links = owner->chatsFilters().communityLinks(filter.id()),
+	state->links = owner->chatsFilters().chatlistLinks(filter.id()),
 	state->hasLinks = state->links.value() | rpl::map([=](const auto &v) {
 		return !v.empty();
 	});
-	if (!state->community.current()) {
-		state->community = state->hasLinks.value() | rpl::filter(
+	if (!state->chatlist.current()) {
+		state->chatlist = state->hasLinks.value() | rpl::filter(
 			_1
 		) | rpl::take(1);
 	}
@@ -657,7 +657,7 @@ void EditFilterBox(
 			content,
 			object_ptr<Ui::VerticalLayout>(content))
 	)->setDuration(0);
-	excludeWrap->toggleOn(state->community.value() | rpl::map(!_1));
+	excludeWrap->toggleOn(state->chatlist.value() | rpl::map(!_1));
 	const auto excludeInner = excludeWrap->entity();
 
 	AddSubsectionTitle(excludeInner, tr::lng_filters_exclude());
@@ -717,8 +717,8 @@ void EditFilterBox(
 		content->resizeToWidth(content->widthNoMargins());
 	}, content->lifetime());
 
-	if (filter.community()) {
-		window->session().data().chatsFilters().reloadCommunityLinks(
+	if (filter.chatlist()) {
+		window->session().data().chatsFilters().reloadChatlistLinks(
 			filter.id());
 	}
 
@@ -763,13 +763,13 @@ void EditFilterBox(
 			// Comparison of ChatFilter-s don't take id into account!
 			data->force_assign(updated);
 			const auto id = updated.id();
-			state->links = owner->chatsFilters().communityLinks(id);
+			state->links = owner->chatsFilters().chatlistLinks(id);
 			ExportFilterLink(id, shared, [=](Data::ChatFilterLink link) {
 				Expects(link.id == id);
 
 				window->show(ShowLinkBox(window, updated, link));
 			}, [=](QString error) {
-				if (error == "COMMUNITIES_TOO_MUCH") {
+				if (error == "CHATLISTS_TOO_MUCH") {
 					// #TODO filters
 				} else {
 					window->show(ShowLinkBox(window, updated, { .id = id }));
@@ -799,7 +799,7 @@ void EditFilterBox(
 		EditExceptions(
 			window,
 			box,
-			kTypes | (state->community.current() ? Flag::Community : Flag()),
+			kTypes | (state->chatlist.current() ? Flag::Chatlist : Flag()),
 			data,
 			updateDefaultTitle,
 			refreshPreviews);
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index ae50f0bcc..8e393c583 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -343,10 +343,10 @@ EditFilterChatsListController::EditFilterChatsListController(
 , _session(session)
 , _title(std::move(title))
 , _peers(peers)
-, _options(options & ~Flag::Community)
+, _options(options & ~Flag::Chatlist)
 , _selected(selected)
 , _limit(Limit(session))
-, _community(options & Flag::Community) {
+, _chatlist(options & Flag::Chatlist) {
 }
 
 Main::Session &EditFilterChatsListController::session() const {
@@ -354,9 +354,9 @@ Main::Session &EditFilterChatsListController::session() const {
 }
 
 int EditFilterChatsListController::selectedTypesCount() const {
-	Expects(_community || _typesDelegate != nullptr);
+	Expects(_chatlist || _typesDelegate != nullptr);
 
-	if (_community) {
+	if (_chatlist) {
 		return 0;
 	}
 	auto result = 0;
@@ -400,7 +400,7 @@ bool EditFilterChatsListController::handleDeselectForeignRow(
 
 void EditFilterChatsListController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	if (!_community) {
+	if (!_chatlist) {
 		delegate()->peerListSetAboveWidget(prepareTypesList());
 	}
 
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
index b752fb739..ce4583184 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
@@ -75,7 +75,7 @@ private:
 	Flags _options;
 	Flags _selected;
 	int _limit = 0;
-	bool _community = false;
+	bool _chatlist = false;
 
 	Fn<void(PeerListRowId)> _deselectOption;
 
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 0aee58f6d..cd3df0782 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -606,7 +606,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 	});
 	const auto getLinkQr = crl::guard(weak, [=] {
 		delegate()->peerListShowBox(
-			InviteLinkQrBox(link),
+			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()),
 			Ui::LayerOption::KeepOther);
 	});
 	const auto editLink = crl::guard(weak, [=] {
@@ -885,7 +885,7 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 	};
 	const auto getLinkQr = [=] {
 		delegate()->peerListShowBox(
-			InviteLinkQrBox(link),
+			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()),
 			Ui::LayerOption::KeepOther);
 	};
 	const auto editLink = [=] {
@@ -1040,7 +1040,7 @@ bool GoodForExportFilterLink(
 		not_null<Window::SessionController*> window,
 		const Data::ChatFilter &filter) {
 	using Flag = Data::ChatFilter::Flag;
-	if (!filter.never().empty() || (filter.flags() & ~Flag::Community)) {
+	if (!filter.never().empty() || (filter.flags() & ~Flag::Chatlist)) {
 		Ui::ShowMultilineToast({
 			.parentOverride = Window::Show(window).toastParent(),
 			.text = { tr::lng_filters_link_cant(tr::now) },
@@ -1062,11 +1062,11 @@ void ExportFilterLink(
 	auto mtpPeers = peers | ranges::views::transform(
 		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
 	) | ranges::to<QVector>();
-	session->api().request(MTPcommunities_ExportCommunityInvite(
-		MTP_inputCommunityDialogFilter(MTP_int(id)),
+	session->api().request(MTPchatlists_ExportChatlistInvite(
+		MTP_inputChatlistDialogFilter(MTP_int(id)),
 		MTP_string(), // title
 		MTP_vector<MTPInputPeer>(std::move(mtpPeers))
-	)).done([=](const MTPcommunities_ExportedCommunityInvite &result) {
+	)).done([=](const MTPchatlists_ExportedChatlistInvite &result) {
 		const auto &data = result.data();
 		session->data().chatsFilters().apply(MTP_updateDialogFilter(
 			MTP_flags(MTPDupdateDialogFilter::Flag::f_filter),
@@ -1094,13 +1094,13 @@ void EditLinkChats(
 	auto mtpPeers = peers | ranges::views::transform(
 		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
 	) | ranges::to<QVector>();
-	session->api().request(MTPcommunities_EditExportedInvite(
-		MTP_flags(MTPcommunities_EditExportedInvite::Flag::f_peers),
-		MTP_inputCommunityDialogFilter(MTP_int(link.id)),
+	session->api().request(MTPchatlists_EditExportedInvite(
+		MTP_flags(MTPchatlists_EditExportedInvite::Flag::f_peers),
+		MTP_inputChatlistDialogFilter(MTP_int(link.id)),
 		MTP_string(link.url),
 		MTPstring(), // title
 		MTP_vector<MTPInputPeer>(std::move(mtpPeers))
-	)).done([=](const MTPExportedCommunityInvite &result) {
+	)).done([=](const MTPExportedChatlistInvite &result) {
 		const auto &data = result.data();
 		const auto link = session->data().chatsFilters().add(id, result);
 		//done(link);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 681ce1f64..0d3844362 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -274,6 +274,7 @@ QImage QrForShare(const QString &text) {
 void QrBox(
 		not_null<Ui::GenericBox*> box,
 		const QString &link,
+		rpl::producer<QString> about,
 		Fn<void(QImage, std::shared_ptr<Ui::BoxShow>)> share) {
 	box->setTitle(tr::lng_group_invite_qr_title());
 
@@ -307,7 +308,7 @@ void QrBox(
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
-			tr::lng_group_invite_qr_about(),
+			std::move(about),
 			st::boxLabel),
 		st::inviteLinkQrValuePadding);
 
@@ -354,7 +355,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 	});
 	const auto getLinkQr = crl::guard(weak, [=] {
 		delegate()->peerListShowBox(
-			InviteLinkQrBox(link),
+			InviteLinkQrBox(link, tr::lng_group_invite_qr_about()),
 			Ui::LayerOption::KeepOther);
 	});
 	const auto revokeLink = crl::guard(weak, [=] {
@@ -973,7 +974,9 @@ void AddPermanentLinkBlock(
 	const auto getLinkQr = crl::guard(weak, [=] {
 		if (const auto current = value->current(); !current.link.isEmpty()) {
 			show->showBox(
-				InviteLinkQrBox(current.link),
+				InviteLinkQrBox(
+					current.link,
+					tr::lng_group_invite_qr_about()),
 				Ui::LayerOption::KeepOther);
 		}
 	});
@@ -1224,8 +1227,10 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	return object;
 }
 
-object_ptr<Ui::BoxContent> InviteLinkQrBox(const QString &link) {
-	return Box(QrBox, link, [=](
+object_ptr<Ui::BoxContent> InviteLinkQrBox(
+		const QString &link,
+		rpl::producer<QString> about) {
+	return Box(QrBox, link, std::move(about), [=](
 			const QImage &image,
 			std::shared_ptr<Ui::BoxShow> show) {
 		auto mime = std::make_unique<QMimeData>();
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
index 7fc9c2d53..40654776e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
@@ -45,7 +45,9 @@ void CopyInviteLink(not_null<QWidget*> toastParent, const QString &link);
 [[nodiscard]] object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	not_null<Main::Session*> session,
 	const QString &link);
-[[nodiscard]] object_ptr<Ui::BoxContent> InviteLinkQrBox(const QString &link);
+[[nodiscard]] object_ptr<Ui::BoxContent> InviteLinkQrBox(
+	const QString &link,
+	rpl::producer<QString> about);
 [[nodiscard]] object_ptr<Ui::BoxContent> RevokeLinkBox(
 	not_null<PeerData*> peer,
 	not_null<UserData*> admin,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
index 1be67226d..82a46aff6 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
@@ -594,7 +594,7 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 		}, &st::menuIconShare);
 		result->addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
 			delegate()->peerListShowBox(
-				InviteLinkQrBox(link),
+				InviteLinkQrBox(link, tr::lng_group_invite_qr_about()),
 				Ui::LayerOption::KeepOther);
 		}, &st::menuIconQrCode);
 		result->addAction(tr::lng_group_invite_context_edit(tr::now), [=] {
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 8cf286943..e70665205 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -109,7 +109,7 @@ ChatFilter ChatFilter::FromTL(
 			{ never.begin(), never.end() });
 	}, [](const MTPDdialogFilterDefault &d) {
 		return ChatFilter();
-	}, [&](const MTPDdialogFilterCommunity &data) {
+	}, [&](const MTPDdialogFilterChatlist &data) {
 		auto &&to_histories = ranges::views::transform([&](
 				const MTPInputPeer &data) {
 			const auto peer = data.match([&](const MTPDinputPeerUser &data) {
@@ -148,7 +148,7 @@ ChatFilter ChatFilter::FromTL(
 			data.vid().v,
 			qs(data.vtitle()),
 			qs(data.vemoticon().value_or_empty()),
-			Flag::Community,
+			Flag::Chatlist,
 			std::move(list),
 			std::move(pinned),
 			{});
@@ -174,10 +174,10 @@ MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	for (const auto &history : always) {
 		include.push_back(history->peer->input);
 	}
-	if (_flags & Flag::Community) {
-		using TLFlag = MTPDdialogFilterCommunity::Flag;
+	if (_flags & Flag::Chatlist) {
+		using TLFlag = MTPDdialogFilterChatlist::Flag;
 		const auto flags = TLFlag::f_emoticon;
-		return MTP_dialogFilterCommunity(
+		return MTP_dialogFilterChatlist(
 			MTP_flags(flags),
 			MTP_int(replaceId ? replaceId : _id),
 			MTP_string(_title),
@@ -228,8 +228,8 @@ ChatFilter::Flags ChatFilter::flags() const {
 	return _flags;
 }
 
-bool ChatFilter::community() const {
-	return _flags & Flag::Community;
+bool ChatFilter::chatlist() const {
+	return _flags & Flag::Chatlist;
 }
 
 const base::flat_set<not_null<History*>> &ChatFilter::always() const {
@@ -410,15 +410,15 @@ void ChatFilters::apply(const MTPUpdate &update) {
 
 ChatFilterLink ChatFilters::add(
 		FilterId id,
-		const MTPExportedCommunityInvite &update) {
+		const MTPExportedChatlistInvite &update) {
 	const auto i = ranges::find(_list, id, &ChatFilter::id);
-	if (i == end(_list) || !i->community()) {
+	if (i == end(_list) || !i->chatlist()) {
 		LOG(("Api Error: "
-			"Attempt to add community link to a non-community filter: %1"
+			"Attempt to add chatlist link to a non-chatlist filter: %1"
 			).arg(id));
 		return {};
 	}
-	auto &links = _communityLinks[id];
+	auto &links = _chatlistLinks[id];
 	const auto &data = update.data();
 	const auto url = qs(data.vurl());
 	const auto title = qs(data.vtitle());
@@ -431,7 +431,7 @@ ChatFilterLink ChatFilters::add(
 		if (j->title != title || j->chats != chats) {
 			j->title = title;
 			j->chats = std::move(chats);
-			_communityLinksUpdated.fire_copy(id);
+			_chatlistLinksUpdated.fire_copy(id);
 		}
 		return *j;
 	}
@@ -441,7 +441,7 @@ ChatFilterLink ChatFilters::add(
 		.title = title,
 		.chats = std::move(chats),
 	});
-	_communityLinksUpdated.fire_copy(id);
+	_chatlistLinksUpdated.fire_copy(id);
 	return links.back();
 }
 
@@ -449,19 +449,19 @@ void ChatFilters::edit(
 		FilterId id,
 		const QString &url,
 		const QString &title) {
-	auto &links = _communityLinks[id];
+	auto &links = _chatlistLinks[id];
 	const auto i = ranges::find(links, url, &ChatFilterLink::url);
 	if (i != end(links)) {
 		i->title = title;
-		_communityLinksUpdated.fire_copy(id);
+		_chatlistLinksUpdated.fire_copy(id);
 
-		_owner->session().api().request(MTPcommunities_EditExportedInvite(
-			MTP_flags(MTPcommunities_EditExportedInvite::Flag::f_title),
-			MTP_inputCommunityDialogFilter(MTP_int(id)),
+		_owner->session().api().request(MTPchatlists_EditExportedInvite(
+			MTP_flags(MTPchatlists_EditExportedInvite::Flag::f_title),
+			MTP_inputChatlistDialogFilter(MTP_int(id)),
 			MTP_string(url),
 			MTP_string(title),
 			MTPVector<MTPInputPeer>() // peers
-		)).done([=](const MTPExportedCommunityInvite &result) {
+		)).done([=](const MTPExportedChatlistInvite &result) {
 			//const auto &data = result.data();
 			//const auto link = _owner->chatsFilters().add(id, result);
 			//done(link);
@@ -472,47 +472,47 @@ void ChatFilters::edit(
 }
 
 void ChatFilters::destroy(FilterId id, const QString &url) {
-	auto &links = _communityLinks[id];
+	auto &links = _chatlistLinks[id];
 	const auto i = ranges::find(links, url, &ChatFilterLink::url);
 	if (i != end(links)) {
 		links.erase(i);
-		_communityLinksUpdated.fire_copy(id);
+		_chatlistLinksUpdated.fire_copy(id);
 
 		const auto api = &_owner->session().api();
 		api->request(_linksRequestId).cancel();
-		_linksRequestId = api->request(MTPcommunities_DeleteExportedInvite(
-			MTP_inputCommunityDialogFilter(MTP_int(id)),
+		_linksRequestId = api->request(MTPchatlists_DeleteExportedInvite(
+			MTP_inputChatlistDialogFilter(MTP_int(id)),
 			MTP_string(url)
 		)).send();
 	}
 }
 
-rpl::producer<std::vector<ChatFilterLink>> ChatFilters::communityLinks(
+rpl::producer<std::vector<ChatFilterLink>> ChatFilters::chatlistLinks(
 		FilterId id) const {
-	return _communityLinksUpdated.events_starting_with_copy(
+	return _chatlistLinksUpdated.events_starting_with_copy(
 		id
 	) | rpl::filter(rpl::mappers::_1 == id) | rpl::map([=] {
-		const auto i = _communityLinks.find(id);
-		return (i != end(_communityLinks))
+		const auto i = _chatlistLinks.find(id);
+		return (i != end(_chatlistLinks))
 			? i->second
 			: std::vector<ChatFilterLink>();
 	});
 }
 
-void ChatFilters::reloadCommunityLinks(FilterId id) {
+void ChatFilters::reloadChatlistLinks(FilterId id) {
 	const auto api = &_owner->session().api();
 	api->request(_linksRequestId).cancel();
-	_linksRequestId = api->request(MTPcommunities_GetExportedInvites(
-		MTP_inputCommunityDialogFilter(MTP_int(id))
-	)).done([=](const MTPcommunities_ExportedInvites &result) {
+	_linksRequestId = api->request(MTPchatlists_GetExportedInvites(
+		MTP_inputChatlistDialogFilter(MTP_int(id))
+	)).done([=](const MTPchatlists_ExportedInvites &result) {
 		const auto &data = result.data();
 		_owner->processUsers(data.vusers());
 		_owner->processChats(data.vchats());
-		_communityLinks[id].clear();
+		_chatlistLinks[id].clear();
 		for (const auto &link : data.vinvites().v) {
 			add(id, link);
 		}
-		_communityLinksUpdated.fire_copy(id);
+		_chatlistLinksUpdated.fire_copy(id);
 	}).send();
 }
 
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index 83875fd43..f07ec5a1b 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -32,7 +32,7 @@ public:
 		NoRead      = (1 << 6),
 		NoArchived  = (1 << 7),
 
-		Community   = (1 << 8),
+		Chatlist   = (1 << 8),
 	};
 	friend constexpr inline bool is_flag_type(Flag) { return true; };
 	using Flags = base::flags<Flag>;
@@ -58,7 +58,7 @@ public:
 	[[nodiscard]] QString title() const;
 	[[nodiscard]] QString iconEmoji() const;
 	[[nodiscard]] Flags flags() const;
-	[[nodiscard]] bool community() const;
+	[[nodiscard]] bool chatlist() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &always() const;
 	[[nodiscard]] const std::vector<not_null<History*>> &pinned() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &never() const;
@@ -149,15 +149,15 @@ public:
 
 	ChatFilterLink add(
 		FilterId id,
-		const MTPExportedCommunityInvite &update);
+		const MTPExportedChatlistInvite &update);
 	void edit(
 		FilterId id,
 		const QString &url,
 		const QString &title);
 	void destroy(FilterId id, const QString &url);
-	rpl::producer<std::vector<ChatFilterLink>> communityLinks(
+	rpl::producer<std::vector<ChatFilterLink>> chatlistLinks(
 		FilterId id) const;
-	void reloadCommunityLinks(FilterId id);
+	void reloadChatlistLinks(FilterId id);
 
 private:
 	void load(bool force);
@@ -186,8 +186,8 @@ private:
 	std::deque<FilterId> _exceptionsToLoad;
 	mtpRequestId _exceptionsLoadRequestId = 0;
 
-	base::flat_map<FilterId, std::vector<ChatFilterLink>> _communityLinks;
-	rpl::event_stream<FilterId> _communityLinksUpdated;
+	base::flat_map<FilterId, std::vector<ChatFilterLink>> _chatlistLinks;
+	rpl::event_stream<FilterId> _chatlistLinksUpdated;
 	mtpRequestId _linksRequestId = 0;
 
 };
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 34d4d3897..b0bd24268 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1186,6 +1186,8 @@ ServiceAction ParseServiceAction(
 		auto content = ActionSetChatWallPaper();
 		// #TODO wallpapers
 		result.content = content;
+	}, [&](const MTPDmessageActionSetSameChatWallPaper &data) {
+		result.content = ActionSetSameChatWallPaper();
 	}, [&](const MTPDmessageActionRequestedPeer &data) {
 		auto content = ActionRequestedPeer();
 		content.peerId = ParsePeerId(data.vpeer());
diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h
index fa472850b..d383fdb94 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.h
+++ b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -519,6 +519,9 @@ struct ActionSetChatWallPaper {
 	// #TODO wallpapers
 };
 
+struct ActionSetSameChatWallPaper {
+};
+
 struct ActionRequestedPeer {
 	PeerId peerId = 0;
 	int buttonId = 0;
@@ -561,7 +564,8 @@ struct ServiceAction {
 		ActionTopicEdit,
 		ActionSuggestProfilePhoto,
 		ActionRequestedPeer,
-		ActionSetChatWallPaper> content;
+		ActionSetChatWallPaper,
+		ActionSetSameChatWallPaper> content;
 };
 
 ServiceAction ParseServiceAction(
diff --git a/Telegram/SourceFiles/export/output/export_output_html.cpp b/Telegram/SourceFiles/export/output/export_output_html.cpp
index 53f78c704..00c4155ad 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html.cpp
@@ -1175,6 +1175,11 @@ auto HtmlWriter::Wrap::pushMessage(
 		return "requested: "_q/* + data.peerId*/;
 	}, [&](const ActionSetChatWallPaper &data) {
 		return serviceFrom + " set a new background for this chat";
+	}, [&](const ActionSetSameChatWallPaper &data) {
+		return serviceFrom
+			+ " set "
+			+ wrapReplyToLink("the same background")
+			+ " for this chat";
 	}, [](v::null_t) { return QByteArray(); });
 
 	if (!serviceText.isEmpty()) {
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index 142addf97..1c6ba2c87 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -593,6 +593,10 @@ QByteArray SerializeMessage(
 	}, [&](const ActionSetChatWallPaper &data) {
 		pushActor();
 		pushAction("set_chat_wallpaper");
+	}, [&](const ActionSetSameChatWallPaper &data) {
+		pushActor();
+		pushAction("set_same_chat_wallpaper");
+		pushReplyToMsgId("message_id");
 	}, [](v::null_t) {});
 
 	if (v::is_null(message.action.content)) {
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 3cb49004c..3379417d5 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -1392,7 +1392,7 @@ void GenerateItems(
 
 	const auto createParticipantJoinByInvite = [&](
 			const LogJoinByInvite &data) {
-		const auto text = data.is_via_community()
+		const auto text = data.is_via_chatlist()
 			? (channel->isMegagroup()
 				? tr::lng_admin_log_participant_joined_by_filter_link
 				: tr::lng_admin_log_participant_joined_by_filter_link_channel)
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index d92f088d7..2ab72b019 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -672,6 +672,8 @@ HistoryServiceDependentData *HistoryItem::GetServiceDependentData() {
 		return payment;
 	} else if (const auto info = Get<HistoryServiceTopicInfo>()) {
 		return info;
+	} else if (const auto same = Get<HistoryServiceSameBackground>()) {
+		return same;
 	}
 	return nullptr;
 }
@@ -3426,6 +3428,8 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 				}
 			}, call->lifetime);
 		}
+	} else if (type == mtpc_messageActionSetSameChatWallPaper) {
+		UpdateComponents(HistoryServiceSameBackground::Bit());
 	}
 	if (const auto replyTo = message.vreply_to()) {
 		replyTo->match([&](const MTPDmessageReplyHeader &data) {
@@ -4177,6 +4181,37 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		return result;
 	};
 
+	auto prepareSetSameChatWallPaper = [&](
+			const MTPDmessageActionSetSameChatWallPaper &action) {
+		const auto isSelf = (_from->id == _from->session().userPeerId());
+		const auto peer = isSelf ? history()->peer : _from;
+		const auto user = peer->asUser();
+		const auto name = (user && !user->firstName.isEmpty())
+			? user->firstName
+			: peer->name();
+		auto result = PreparedServiceText{};
+		if (!isSelf) {
+			result.links.push_back(peer->createOpenLink());
+		}
+		if (const auto dependent = GetServiceDependentData()) {
+			result.links.push_back(dependent->lnk);
+		}
+		result.text = isSelf
+			? tr::lng_action_set_same_wallpaper(
+				tr::now,
+				lt_user,
+				Ui::Text::Link(name, 1), // Link 1.
+				lt_background,
+				Ui::Text::Link(tr::lng_action_set_same_background(tr::now), 2),
+				Ui::Text::WithEntities)
+			: tr::lng_action_set_same_wallpaper_me(
+				tr::now,
+				lt_background,
+				Ui::Text::Link(tr::lng_action_set_same_background(tr::now), 1),
+				Ui::Text::WithEntities);
+		return result;
+	};
+
 	setServiceText(action.match([&](
 			const MTPDmessageActionChatAddUser &data) {
 		return prepareChatAddUserText(data);
@@ -4255,6 +4290,8 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		return prepareRequestedPeer(data);
 	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
 		return prepareSetChatWallPaper(data);
+	}, [&](const MTPDmessageActionSetSameChatWallPaper &data) {
+		return prepareSetSameChatWallPaper(data);
 	}, [](const MTPDmessageActionEmpty &) {
 		return PreparedServiceText{ { tr::lng_message_empty(tr::now) } };
 	}));
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 5fc0e6e1c..5b92c6cfc 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -530,6 +530,11 @@ struct HistoryServicePayment
 	bool recurringUsed = false;
 };
 
+struct HistoryServiceSameBackground
+: public RuntimeComponent<HistoryServiceSameBackground, HistoryItem>
+, public HistoryServiceDependentData {
+};
+
 enum class HistorySelfDestructType {
 	Photo,
 	Video,
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 479883322..6b2c3aea0 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -159,7 +159,7 @@ struct FilterRow {
 	const auto result = count
 		? tr::lng_filters_chats_count(tr::now, lt_count_short, count)
 		: tr::lng_filters_no_chats(tr::now);
-	return filter.community()
+	return filter.chatlist()
 		? result + QString::fromUtf8(" \xE2\x80\xA2 shareable folder")
 		: result;
 }
@@ -371,7 +371,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto row = find(button);
 		if (row->removed || row->removePeersRequestId > 0) {
 			return;
-		} else if (row->filter.community()
+		} else if (row->filter.chatlist()
 			&& !row->filter.always().empty()) {
 			const auto chosen = crl::guard(button, [=](
 					std::vector<not_null<PeerData*>> peers) {
@@ -399,7 +399,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto row = find(button);
 		if (row->removed || row->removePeersRequestId > 0) {
 			return;
-		} else if (row->filter.community() && row->removeHasLinks) {
+		} else if (row->filter.chatlist() && row->removeHasLinks) {
 			controller->show(Ui::MakeConfirmBox({
 				.text = { tr::lng_filters_delete_sure(tr::now) },
 				.confirmed = crl::guard(button, [=](Fn<void()> close) {
@@ -417,10 +417,10 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto row = find(button);
 		if (row->removed || row->removePeersRequestId > 0) {
 			return;
-		} else if (row->filter.community() && !row->removePeersRequestId) {
+		} else if (row->filter.chatlist() && !row->removePeersRequestId) {
 			row->removePeersRequestId = session->api().request(
-				MTPcommunities_GetLeaveCommunitySuggestions(
-					MTP_inputCommunityDialogFilter(
+				MTPchatlists_GetLeaveChatlistSuggestions(
+					MTP_inputChatlistDialogFilter(
 						MTP_int(row->filter.id())))
 			).done(crl::guard(button, [=](const MTPVector<MTPPeer> &result) {
 				const auto row = find(button);
@@ -642,7 +642,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		auto updates = std::vector<MTPUpdate>();
 		auto addRequests = std::vector<MTPmessages_UpdateDialogFilter>();
 		auto removeRequests = std::vector<MTPmessages_UpdateDialogFilter>();
-		auto removeCommunityRequests = std::vector<MTPcommunities_LeaveCommunity>();
+		auto removeChatlistRequests = std::vector<MTPchatlists_LeaveChatlist>();
 
 		auto &realFilters = session->data().chatsFilters();
 		const auto &list = realFilters.list();
@@ -671,18 +671,18 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			const auto tl = removed
 				? MTPDialogFilter()
 				: row.filter.tl(newId);
-			const auto removeCommunityWithChats = removed
-				&& row.filter.community()
+			const auto removeChatlistWithChats = removed
+				&& row.filter.chatlist()
 				&& !row.removePeers.empty();
-			if (removeCommunityWithChats) {
+			if (removeChatlistWithChats) {
 				auto inputs = ranges::views::all(
 					row.removePeers
 				) | ranges::views::transform([](not_null<PeerData*> peer) {
 					return MTPInputPeer(peer->input);
 				}) | ranges::to<QVector>();
-				removeCommunityRequests.push_back(
-					MTPcommunities_LeaveCommunity(
-						MTP_inputCommunityDialogFilter(MTP_int(newId)),
+				removeChatlistRequests.push_back(
+					MTPchatlists_LeaveChatlist(
+						MTP_inputChatlistDialogFilter(MTP_int(newId)),
 						MTP_vector<MTPInputPeer>(std::move(inputs))));
 			} else {
 				const auto request = MTPmessages_UpdateDialogFilter(
@@ -726,7 +726,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			updates = std::move(updates),
 			addRequests = std::move(addRequests),
 			removeRequests = std::move(removeRequests),
-			removeCommunityRequests = std::move(removeCommunityRequests)
+			removeChatlistRequests = std::move(removeChatlistRequests)
 		] {
 			const auto api = &session->api();
 			const auto filters = &session->data().chatsFilters();
@@ -760,7 +760,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				}
 			};
 			sendRequests(removeRequests);
-			sendRequests(removeCommunityRequests);
+			sendRequests(removeChatlistRequests);
 			sendRequests(addRequests);
 			if (!order.empty() && !addRequests.empty()) {
 				filters->saveOrder(order, previousId);
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index b296da493..286781b8c 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -644,6 +644,7 @@ void ChatBackground::checkUploadWallPaper() {
 		_wallPaperUploadId = FullMsgId();
 		_wallPaperRequestId = _session->api().request(
 			MTPaccount_UploadWallPaper(
+				MTP_flags(0),
 				data.info.file,
 				MTP_string("image/jpeg"),
 				_paper.mtpSettings()

From 63960c647b1082b7da51c05ee857029672b750e5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Apr 2023 12:16:57 +0400
Subject: [PATCH 012/676] Don't allow sharing public groups with requests in
 folders.

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

diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index cd3df0782..c750c47f8 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -89,7 +89,8 @@ struct Errors {
 		}
 		return std::nullopt;
 	} else if (const auto channel = history->peer->asChannel()) {
-		if (!channel->canHaveInviteLink() && !channel->hasUsername()) {
+		if (!channel->canHaveInviteLink()
+			&& (!channel->hasUsername() || channel->requestToJoin())) {
 			return result(
 				tr::lng_filters_link_noadmin_status(tr::now),
 				(channel->isMegagroup()

From 77939ae9bd64ce76865e68115b8a402aab1677bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Apr 2023 16:16:38 +0400
Subject: [PATCH 013/676] Add more-chats-added bar to cloud folders.

---
 .../Resources/animations/cloud_filters.tgs    | Bin 0 -> 9372 bytes
 .../Resources/qrc/telegram/animations.qrc     |   1 +
 Telegram/SourceFiles/api/api_chat_filters.cpp |  52 ++--
 Telegram/SourceFiles/api/api_chat_filters.h   |   5 +
 .../boxes/filters/edit_filter_links.cpp       |  34 ++-
 .../SourceFiles/data/data_chat_filters.cpp    | 126 +++++++++-
 Telegram/SourceFiles/data/data_chat_filters.h |  25 ++
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  60 ++++-
 Telegram/SourceFiles/dialogs/dialogs_widget.h |   4 +
 Telegram/SourceFiles/ui/chat/chat.style       |  18 ++
 .../SourceFiles/ui/chat/more_chats_bar.cpp    | 223 ++++++++++++++++++
 Telegram/SourceFiles/ui/chat/more_chats_bar.h |  73 ++++++
 Telegram/cmake/td_ui.cmake                    |   2 +
 13 files changed, 599 insertions(+), 24 deletions(-)
 create mode 100644 Telegram/Resources/animations/cloud_filters.tgs
 create mode 100644 Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/more_chats_bar.h

diff --git a/Telegram/Resources/animations/cloud_filters.tgs b/Telegram/Resources/animations/cloud_filters.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..3e71d25b4086c5c420c09f6373579e7775cdeeda
GIT binary patch
literal 9372
zcmV;NBxBnjiwFP!000021MOYek{m~J{1w_fcbDaT@KFc#vL?xNJi+h)EkF_?mY@OH
zU9GM0-{tO+RbAavJr`zhkiA^YQPXv0W<+>IctrmF>cbE3ufFxWtG`@*dzGg=g{$4w
z_wTO0EpB)9`j@M3@$D_Xb$sNnSKnqIc2_@+??3+u=ltWFw|{>5&3A9#ynOZUoA4K$
z{qp5Yo%Z7W`&S=u@n_F>S8rbY?bSQ}{P*S0uYZ228-MuQ)wgk6>|g);4}bXPyMOz`
zKmGH6;6m@;=>tFEyuV+)<(C&a^Cx`$b$9j4IO25#SANX{|A#+Lb$5lUdVJ{Za;)hX
zPyB!z;_>-7A(vfDW#{mWAMn{{Zs+Wm*UK-z?$(!X8<#HYOQ+SPgLn71blSLdSYJBF
z)urplUOKKXUDE2(soi>MoYLItl*}>w6@R*Ve{Ncyaqz~!=eqYZzr%meS5NhfgE{_<
z&&>DK*p8?4&h5s(qZfU~Hy!_OxJB5Fe;c>Ji;P=@U2hM)L)?vj8+Rzx?x3rO<qr5u
zcN?$w{8yaz;;qTdK_ERP@;y%S`2IhC(nOvJS1{p9L%9C%`sbe@RlmG=_v+^lI=m@h
zTl2QO>d9;RQs)=c&tsOxYsBTnQeR%o7RfJ1()`Rr?_dziRI&}ziyQxb7?AfrzWC*p
z=@q`})erCRhOa+tAJCvU8x)**HNW|`4ry@+2!A>f9AE1A3w}C&WnJLeGl|UjS|``S
zu1%?7xjoz0Ddey#Q}uQE$liy^)w<hz40UWg0v*;e4os!T=g)Qb`Leh~#^1^mTe4rV
z1omypzARU4Q%RWzedJyJ6nonFDY%T^;?!_Pn?lf~|H4aqk0**ySW}36uzkdb+b-h4
zTGsDjick^}Yuf3y_^Cos;7OC$Bl|S@h69+aSh4V*g)~*ycYAzKo)-yqs*$hR@phf}
z{^QlR-@kbC{?)Jd*0Sk_0grgSGKJpkMOxZ*JW@Z5HzpzAIWnFv+GzJyINGWC)6q^?
zdX*QjiNV#=ZjZqaak*ZaGS9{+dmC+OP+T+Xk9gM|CaE7rJEo~)AVQm}jT9D1DZ7Mk
z-P<`B{G6xayDr#^-v!J-<zKl<V1EN<j5EP0NqC!zIp^(T#MyYBICX#17~gJg%Goi-
zBV;HbK7s}?PkhB1)@vGfz-kDb4gHRXE?h1RYvE*!F`QWbe1SAhEs#E(TSHo|Sf-9e
zyziLUqCsh%8n$=+tyL_}spq^5ate~+oF<o}jZ^n&R~kO0C&Jo>VrsZXi{rK)Q=Ks@
zfpZ<Ep8O7%Nsc#+xCtz9z*5kvNe~(6@8~Cw$G+!49~<9#cA(qTpgl0WChK`>AwqO(
zKa2~cyoJQooa{CDJY3B2y6Pxe_|O%#+L;|MjHAxA^*D2)I0;f0e#(LNu1f%b5p$*f
zD(Rp+I-YVDD<sY9nSIl^m#T+`Qi;$;C1{{{0FRLqN3K;{8*#!T^J~z0r#NIzXXBr7
zzN;C_BjYKrjq}QGZjK-1s!Y*d-p8Vs@9V)U7*VQ%lx_4}k5UD3WAt*QDu=j@Q+qaD
zkXPC#aFu!rrO9rB_+#{X(C9^~CM@82>_Vhz!y?Oh$Tk;g<|387@R;2acLir=8@w<T
z3^p`~G!W$hN*1<}YhQy^Jm0cN7X_?}UUo1r;dJb1X9W!Y{l$kLzwt1KKfav*x*O&b
z07K`jjWKOh#!LF(v*W_Z&iCS)hbZz*^*3L8s5!5I(Q*NRfM4ZItd2DtdGkj>mN);a
zZ-O-A0sr&EySG2RI`fDhXyH%rgxf?B<LLVnY_Z_Tt9RFYjIAes|I@XPy?=4-kRJTM
z-o5zw{r7L*{psr0=i|`7ynFlSU-T;D4X?k^=f^C>6i|Km)}w?dJD~|v8^Z*^>V*QS
zY+B_G)&lbE>WR>tAQ4(#Vh`t!%<&9ph6qBl(<awoYB~Z$K#RAwNX;JWy=H=qh!-km
z=OYD~;-T|kQ$3It4`d-0iUO_#<(ciJ5*$B>UyYI@e7*oFM535J5D$$C^nES<sldu9
z6iIm5CM?lYJ_Bh0ysGD5pJJ609D=imBJlVtvwQ+)@Y&p{?!0MYjAFNmF9%Bs0Ou-!
z9PE%2#K7kx9y8IpbFeajDqkaF5On}(z~MlEK9CYmP4*uPMOF$Xz+wJ6mXszdn$4I}
zZcl|-P7w*b31~*>&m7x1U<2)~b?r`v`V@@tGypmb>uRh|VGRbgb75!MRs1<|h=7jM
zYOFD@bf~d}vQP&er375W2?~`$t16Sthpq`C2Q8b2sVrC<5tcJzCG>%~u~xK{C>dC4
zn6uKK3a*@B5j-r=3kSXn*KT1NETzKLTynoY#z#P;(d2QBtgdy6Xm}m3^*jSp?}UvH
z;2V}RMO{{!3m_YMK$t{pI{_x}5;5~qwzlP*VW<ToA+eZ7oad5BSxo}xSwe@Ar>oio
z67LCCPQeH!z1ox36t^G^UK1mCs&Y>u2=Oe2t+~D)wj(G*(6G`1iAav4mTEtsJU2P>
zeX`a(eMS1HL>$sxImi=*!tA;#{1;9bhA(=<%L)1@I04fgT}}WSjC<|&vKg2U<CtQ-
zAeAo$sf3%5%5NKcT>?m#0MaFZbO|6`0!Wtt(j|cOm;t1oOM@?xvg^`wH~ji}VA)<_
z0V)u<b@zcY9QED!ehDc(Jf!rfL8MO>HTtYUB5DN<UJs8E7xJyj2BfEr15v+HHHT0>
zZ{P=i#S~y3?Lj_1))RznOG-}_+krU1Z%q-#H-FZE4jlf#*T|(jN(d)68PH(C<fjPQ
zGz~375$S1yG#%QGURtP+6P-yx;h9jME*ygw@c2DT(_Jk6muu<o9g<<l84?DKS>jh1
zZF+9Rr!+I4S~BL-zMo@0#bf4^IEq*I;5)Ur5V!R6U06>;V=SDfe1`J0fw49fv|nrJ
zHPtSZk0t&cU7Gx{<=XIE?tbmOaqWC`>At#j@%OkiboIR$ocS(<#Uo~>YcpZ-L>e;v
zbv!wcKspwTO=jF($bbqn*q04H;5`0)7ds%~Lm7v+++<KkyWdr+y3PCK-S~IIeNI2K
zzDXFb(%h~^+24(u6gsox%MJHArHZca69-g=9j!nMxvWW)GmggH0VA$aC~sm6KA~q6
zkI_AGOs7dFJSO%7imSlis{mP>0?;1uaXz3bdh<RjDV^OKy+?i8&@PjfUf1sZ0N!hX
z(-VLvJp%@Un?OOdVT`LNm<(VJP@7gqBK)A%0G!~O)v%q=I&oa+I2qt4l2&Rr`mE?;
zTg9C4F<|lpD3}iJ3XXa>TX=F`<L27|0}(wD?5tuSl@VeHkatPxBfMNo3OD;iTqXpF
zTjBMCr^_ejg@HIO5kQ`STt5c#+-yhiy!o2Q&P#h1pEgVgh6cl5Qm;Ld3Y~lKKuWE;
zOf^tkZ7KTV3Saqj8kVG2s(7m<>7`TBA?Z~TW4zv8^pf`a5~C?`D<Y7(c`^Z>PZ?ez
zSA}^1SSW`0yM_AXTuT<S1qzskNkyTH%D8n|RL()gOwL0!!9QpgBS~0~@cK*U%2Uv!
zGG{wN6PXX9dpO-=pD9jlC&ypcE?E5KAo^H*SkYY`R5+xUYwhxcAmLdO+@Y@k%;DNO
z$!o6Uj8L)V1bt8xObAN1!<(X$E{z4t6QHs7u}qS32f2r@$LlI0ab3xsDne5PAKv}>
ztd2W4u8|H?(%a=eHE+&wQKS{R8z^Jn;d4ITYyg%N1zd_7k?v9$fe+01Xtv<y!8eZc
zWI4HoOwWxV^T~7+40|$_n$t?7HmFNa6r^ASls}wMGKDHv8J`4d9*#SXV1}wCI5JLR
zL>szkDvGs4xagj)dW}qKDZ7M~(mbR2PSL#Un)yU|AI-<(>t&3^UG;K_)WlfVSgcgU
z=DcEjT@;>a4j+iIw0whJ&OW+wI~n1km+$TSejdF{3B&TmH&+L*i@C%-qqGO))|6EN
znv&=-VHO~xEgm?H37X5uOHgK6S^?{7%Dh%*zQ5cBem&OHM5wb8hAjIk$%VG9Cf<=T
zx+g|Vcb3X#5v1-)Wssx6T2Zumij+#IP5!T@0{F8bmG?XQB9&WG8NW=ajKsTcBs7|Z
zOCe*$ujHT`@h#<UA=8}bP12|yL;>bVfCZ2u$#qIh0Kv4!G+*s5V!3)8N204zGR>WR
z8uAO;E>i`p<T6xoQfW|=Oml>(j+9iG+KW(LgmM<j^yLX9DPT>Un`-__6!OHnZOW`+
zsdw{b7^EQFge&6@G>Uym5+h|>avjkQPwExD1fzmftez1GfrC$6pN@E}ax9om22yTW
zl$6TkUr?4yY@iImCU2UQw626vYUJH%@maj$_Ato$Ra0VCMTzGo?5|giGSl6%kF^)E
zV#1AY8^rSh1kZy@!}Kfjibf9PkdkBW86P>&#i|Vol%SvFs^n;+=1CFDLK;OZ9YgcV
z<?@xg<3m>_0qaGxTr`Vmmi(m#NA{UqvwTdQfC3?B&jb-`x=D<U_D5eli6_F}XTc*S
z9p~ty%as^(7!G<DPZb!T8I#r50<jY{(U}gSJSP!XTR!kl;P*+ONw}1SPh_Sk1PL!$
zY^;(C%bgAfDugeRSX&2Ow*ZB^b<`HPp4?C!$%~V4hw#O%gO$lZFm2+cCGIg?i6lPL
zT}h0bYlDV2?TsA1F7JYmgMn1sI{DS0k#>ovNPgt{BkzRa_8m%96kWy(JhK2$_{MM{
zAC^I994NY7=?orW*dm_G0!2`L0Z+)VLk<4^QHCGBzuFct%Q6lD`GFt!MJdUj9<ub0
zh#HF$q^b%sMyAC2$jUTJt1Hmk@wWU{i>So<a!nuZWLo%DL5Rj2gsxO`&{1Bg!3ywF
zRd=hc+1HU+d4DZ`w!>s_1YceM3%p8lxR%V<&?+xpzJB%dhi|@n{pQVYNl}(BPf<cH
zBPQIFOB*d}S)C~XNOuigc+A+mQz3^gGLK|}y-#VT;6hq!A2^Hb8ZJSFCyQ^piZx`+
z8Ur!_U;smV>NcwdD7NZ!p*Rs^u)d*=WKZ@agEw#Ntkm(E!i$t{yCs!hE^{V{{8pY<
z4~VBU0YWi?^zgZ+!9~K&i?msS+NeCWd(r}>N`<U21Pw2s_@y`gErTFp(If#S3}Eqt
zdw)HThT|Gknv5FmppfCpRVuVe5o!icn=)pxHH#xx`h^(#VO}u1Kyy%xt=&8^%))xr
z4wSo2j#nuj0Ch8ThO2aig4+n-l2zY|Dm_L-d25ECUC9h5V6|$;&1tH>FxkbB5-@BO
zHg)vWxg?kz98qOv1z|Dp7a2u5!G)}=LXNmfQZTEYM8cVw7MZTV69hbg8JKG+!5YNO
zC;6~FAj<sxn<t7gcY~zfHR<?%hzyq%XR4O6nf+6uFV<dr_R`%v5P&kg04@`WB{D&L
z1H3)5U>b+tnr5zFo@UPQ1q%@hz6r8;m069<p6HHP|H6$<>Sd3G+-eyL0H~?Qp-?I2
zrU1yQj6*Y5X!8o6x8=3)mq72?@%uQ#<v3I`WVi`LSw%bqk{M_+c#Xbkx3bb0pUeV4
zBx7o`YVIZJ*<5NjI^dhBJ@}ynka!|X;WG|b%_23!aC35xr5$}+J5y;;xej!^vqWQ?
z6N0xZXOf^R(^IVRI-VD5U`@oRoj5ly>Ds*THJKw#`P|e{y^h3R6?|@Zh&{}8RJklQ
zeinDwX5I6OtlDt#?9^md`V}eV6x!(otx~Z}_VGBAeQbVkF4<R9>4E_%GE|C9lJ-nn
zoANr@N7NCw)iQa`jcS>^6feC@Fu>enaQ><FGM2#I^s-1wTME|{GW0Bz^6utef7dFv
z-N5biM(tGni1nu1CU&M{V&`}7-v0by)zi+Oa6C`j%&{mdC}SVD`^*I;3786ZWpm_u
z-r@fmyU)%kJE^u|)<S83Bcjz@Km!#(UWjo7SU(HT4szB^H+iqh4yHd&&ZM&N3_>!Z
z(Z*+^h~|Ne04tI41Z>QnoE88aigWl0s^U2tQ<*?1<n1Rb{RvF51gg$>@(fFb1|MX8
zj`0}FQ&0m&7xb3?z><e9&ahcP&IHx=LU8;UW1(>@b}C5?fT14V!d#5p1EV>+UPty*
z!Bdj@r7i7BxI&QGVw~7CY6?TgvVBZ6vxz4aNriA+1P4BXLLGQm)6$+MjG(@^;cfX!
zzW%N<)tauEsfQO9HPQa5`B%lZW11W^F!8X}U9t`vY8WUWDh9r%AHu?yS~n+%W-yp_
z(Xdk7Xs&4jx7S6NFUn_0>*5FBtpY2w?S<g1Ne%0HM%n<rqt#%=xq<{P8^A(d)u(64
zHs({#-@Y4(NhU6hs9j-nABXV3&F0)$d4N|HMV~*#U@?tc7|X|b5ft|<2QUeP!ArE)
zUKRN|!s^yyM~YRca>eQpKdov_I;TpyLzbLE{+{+56IQwIZ(0ZUt&mbsPlXR9Y^;OE
z8r@b5B~XSG;p=gX6od{7A*~8w*I$Em6>224Siu>6Jk~|G?S&vjVh<A!l|hlBVAXoP
zY~H92`WIkN7|9<@^sZoGl~D$muvAzn7gwE37@VxE-Y8UiCd!H4Hs&7BZfMt&0YMIP
zmG&|f!$+c?NHeL6%fa|&4CM+!_e>s>ir_|xEwE-|WThzWq9e}U4M(ETzVE!t&aNi~
z5SSe{K8PQLK3~ZDg;IdtDdC=r;ii(Wn`{SH1AGW5y;xRe;jG0NUor4OF^oluHz(d(
zeHoh)t)>{rFImN6$!8|sD}j!6=+{qL$?RjP`AYJW84i+zO=0XAUT@xJJ7k;M%xFrp
z*|u5p<l_S=P?h&$`L{G|K;|QwilAda;fJPfM!9K>ut2XhPOff9mxHI_NH*)0`2<?r
zY|$h&R-KWX`E*f2NodVdc&6>@rmxc7WgZ_gkEC+QRa<O1RR^nTtLoqewH3d&Wv21F
zQ_(W*&zPM|WgXLO#p(D&iY%-0UAkooFMW+J9T=|@ys>-*Zn|$r62T-4X1@4Sim+4W
zp0KyCF_IVAm|W~5nL8B2W3f86UJE1@n0BLNnJez4$_zexSxQq<Mcqqwjp%qjP>53*
zpa_qMQ)dXEs4?wkSdWH^eptcUua8FZ^w5~gTKPXtOq1!{STMX%S!|sYgpopk_GXDh
zWmZ($n3=+6MW0dqh&((fYPecP_JRkvHv-wttvw=I8#(C72VwV?j@L$HFL^8LIb9l<
zz0O3=dTA70B)f8EG*X#5!xg!XRy7LDb*#(PXy8Ly8Ex?2JwrQy^Q|&muLDJFmButk
zc|^4GsRbpnUru9I6W<38C@K<M4+qCOtR#hSx9aV?!dk?Wp2J}o@7s;}Z|^l9m{w1B
z$*LbrjM`k1j!)Cbj3ze(xqj4debVyW%7Oc_)xe3hiliBAWw#-P3@XqAjK7xzclh$G
z==MtYtfORyDf8qGjX}tQPul?}MKaisE->31HqmdAKS=4c&_iS{m?*NT`iO|$`d^%j
zYBA&>0Bl81%tVub3_s8O%OgQQj%rc)=DB`IX>GEA5-Eiyy{#y}sd|EuC1A>%ktfE!
zhEE%bOjWm(r(iv-;N{4Hp>NZyL0jSz$T=Zekf6spk~VBHWihMFBr)q1*mvWA7Xq~b
zGc=DG#=2(FNlPjkt94tPeUoD!rZXN0FF|j;kE*T6-Zq-^6i$2ju|FKaNLV{d>cS!_
zcixVRW$Dm88zhDi>tI_r_RblZ@d8hf@hQJ*i8jCn<AEdVKVuZ&ww%)vc=B~eJw5Vw
zw8xDtc-W@S8W{Gbc;~)BQ(OF|uy;~ZurV1Mi?N+-M=YVvID`}XGq=H3Q?ycRAm!1r
zjDbv-%8spTa(K+>)D}n~w&ReHD?7_4$#gE4nF<^!&#{KHzO4GKwX`kG*;a2D#_k~E
zTKJQ9=b}(vWijm9vJJ})f;&KyoXy$93Tx4Ibaf6Z(~I<}j|Z`mAogesdG>uVn?byf
zROc8IyJ9g4pF$cjCdVhwEIgDjVs@huib?TNzbnGGXcC(&nmWU{ES>eJF{Ta0yth&a
zb+ai)nwcdRXLYl)&@yR$chSp>sNPE(Z(*%t6&#LL@BmQEXdaX+<3*gxV6(zQ%mXv~
z9qVv4vgk~tvv^a~aHl#$s0>G17J(#ev4Svu=4&uzz$A(%H`E&huNFM#6-NkZ#%Ih2
zr@MuaF4HtZO9b92P{rCbIn(5YJ(TiX{Y>Lg$ZnNttx4&29vQtTOOR8IE2dG}Y&Ep1
z{|R%L=!R)}QZniaHnWKrzxL&;D5Xin(4wD<!R9I^lG<~)wgr;e;mvPxK$#jNTi5??
zIH2*1gvduxVy4<4#eVe8*vsyC3$*qJ1c_O9lPp74%C%m-jK(%oFeVKnq#okf7~!r_
zVivjJ#1!Y!*0W(^!Xp~g*avY4Ksb^hBtGJZ(QjpQVQ#HY3($2QMS0Qql7zqBv@Vl&
z>XyikB39m$2$dw^m6>IEAWn9*5N@}pPUvC^*a5fAjrZ=5yY)&uwvi@37wG4X3YN1Z
zclHe4Ri6X$P%Vqx0FbL!-)0NmHA~5b8`86Mf!L;!Y49{h<nEGrWkr*G7nXgEWLq3m
zGTx+HD6h|{S8ng3MN8&epD9k3Zu=a$*V}Td7(TCN-RE4=CH3OXEpa{GC3kwTqRNbt
zUwdQ1lq+1gH5;2&qnnMDJQ@pM%Y(A4jzuAbX`3>-!jlL`|6@2An|aWzzVI%OmuAA8
z^=lO3)<0Dq^pR3!Po5Mb-=tK{OlkK>TavlSlw_-O&wf%JncHscYx<e8mS6Fx-zCYI
zxdl>DX4v%io-9pDK%@SOH{=-~GtGEJn!MJ%Q(W_#fAzm#Vq>~X)5<<Kt>h-o+vLW4
zOm6(oA78wD`_~n_vE0mVWUVxl+*YT&F=WI5Ed8M;bdP;>KW*sNSU`C=b__!GcodPX
zYHnohyJyjkPTjFB?R4Be3HBwa(@8%va;CDFRy>LkN0Q;wD1c^hHunZM%tTEf@6xZg
zp-Z;MgM7QOdqRoq1hngMQMH-KPeMO$Wx=XPcJ%IK)Q1sni_O^X%{YRQb&yHQ*OG9w
z!fgG}SVLDI5ka1gyLOFH=jpc6l@A#FM83sNjfstfDv0UhynzPyCCN4q*{|Ecv+`xn
zM%VRj^UxW-WKS>RlQ^T1lz<<ZqP609BYt8Ys4CO!(Fb}e9iy%}XK8|P6Kn6sh6<fT
zd$Xa{0=P~av~)JPs*fA=Jh%SU_%V`;Ig?l!Zq{7XyUhiA1#nA@yeiU-Dj2mQt@bhF
zPtS)8Ur#h)^$Bb(pb3b~TBq3{W(JVsoGg?@Gyq6UuklVxd;30WIA9J{VJDPt4jiYo
zxJZAY-g^#ii&B1NI*0*9Mw-dQ80(rvm9-hgxy?u9-7rHF>q2>CvxqjAVwhK?0Kenj
zgu}P(QcTu)R6}3H=j>5As=GxLe*;6xeMqy0v<@aPJFHWqu}*3bV`Id?G2&@-7#mYH
zNEBqYO(i*|VMJ-eAd;LP(}%-16#@o!xCml}jb0b7GIDoY>-GE?*o_Tcol<5T#=E09
zmNjLiNm9Fn>%Kx*#Hd;jwJeP43FbC@-*q<qS(ut^L`_`O4{`X$Tr_aes6k){2NCIE
zhOH2Tf|Lb}%4FV9>bhHF+N^vHxaimxGiW$8tTpv~L|oKi*;)LU#wHMot3=0GDET>Y
zPIZv9$}ram?x=rIF@xJ>yxC+#o`0#sK{n<WBW<kQt7es1!`C>;_m9gw7#XP~k{ev*
z@|e(wQOeV-??a$bblRCng(iJQMpab=ZB<BARnlKZ3xPdBW>>a4G2l0Vk)V>-CaDID
zl3`Ovvm;pum9YZKj}I4EbR8Dar4lTv%OP<p$#N)Z#zhL-v`FKnLB+dK9#a@x194x%
z;J$=D!y?wO(1eEzEV>OAv2M>`Q6JQOjj6@x=%?jd#`N>RqWCBwEp~NQkXu^`-W?W2
z?fp8wUzmPRAV6ED;G6(Gz!tFk2`f?9YG-(1)b9-G%&o(SiqtUM!+ov`DiTGlj0d2d
zWr?Fuk)^^YJ*-ySH}2sk+u%r=Cn~D-0*cnNz+7SOY6)RXFrgx58H9@5Qd^W2tIyp0
zcy8+!)dU?9sE}MQM!HfOaqJFPRe)e5Ig8&@i&;c4yH6G`Vn3Y3Y_nThM?MNH3Rd4V
z@(v#Xi#BY@JP8L|61kT_7hg4uvP}9EF=#&mgQf&V7PJ%mtRrG%*wksOxR0HMPYsQp
zSPh+lMrlNh$`Ug2#p-s`5;01nu+ds|a8RpJLYJW@FQUvab*QTwhyK$*qt7s;4~0fW
z-Psj|i%TxR8#QIt?l%nS=Rrm(KT@)fd%%8$wS%V#KW<^BgkLz@&7>SB{Qlv^AAh=g
zGZXa^hA?6!sT<KozK{Fqinqs(6kl04lfvGk+@+PBk^8D+1j}?16HEDshT6En{S=SL
z;^MK+*|UYd#5QXFgu>507yBX;e$W_k?j9WnFT0AO6qm}0Y&}bu%(qM*^+dIPsXncV
z1<}~5E8Ie65hpK&u%fjVg@uQ6x~|URE({6gyO*&W?4I;rm(+^DyuCdn70@y6)G^l2
zeNBSmY2=``Sq0Tl&C5#0IADE?o-ogwn6gug0t+PTSxE>9{-%?hRBl$YP)lWwdXPxQ
zj?v%@x)KAaK^9?Lul>=>LzfZ{58ROF9c7lI^c`u0)}%pe`B(>Seqp~k24uz{EsT+_
z_2W}I<uEeK?)r|rvNSdi=3c8B`PpI^2@Td@)kApFR!OiU>&3?oz<H{xPkB+=Fyi@S
z88FYuG@F|ZmPVG{PgtTi+O#OmhK0oJW*<DcOq$G2fu`)2Pm$cV7Yw#45LN!EPk5fM
z54&EXcB(65LpNfvWS}>WZEH#TVwI0VTfuBTK(^P3j75zdX4xlFB*Ucbp&z?Eb}5+j
zoqd6-pHro5+)Te}X&GMwDRvf`KBx=sZB3!7Yjq*#=1^LzJ;O`WzD_y$YYT(bMnu_Z
zI4yW?GW*$fb@X~GVp;Z8bDL^y<JhZY4b7>w83_q%O)_}zel*yD{$b;hb>UE=Kz6Gk
zn}b|kt&X`y%7Aj6-5?a8&m%*~$h_rU6=yUjqU!x^N!hVf<yPvV-Fhx4l&nB-pL>Kx
zRy&QXm*6*>$e3TmDx%nic5w10N*WcXq%o-uiIGk2JoVT`!;2Ph31AT3+e%MAi5ZzM
zeQZ0HYd@L2h-NReG1@Q~iM#&vqs|yL8q<4e@hE1Qc8d@EVRp-s*JcQ`3T-qWtlDRQ
z^(lHHs({i)JHQZTt&p^FHP(gmX$0$g9d^W;k(t?0v%y(|9n412?nQU5mA=gGS3kR#
zo+y`|C~G$$s1rTQ6K&ZYcE|N`M_aU_$)6YT@)3RjW36l(&8D@YwTn0JM}f1TkC0z#
z{S){A0FVHIZG;#STiG&V7U$hJedk7va1@v}Oa~{RTfTg57TaK+$5wN}y5B8M04wH#
zf#N2~C9^q|wG+TT-_a_Y1qH&~ZI|9iodXpX(Kc~UqmgflPvrw7f`4tTk#2DToMrqJ
zFMqfTP;K+zX%xN#QWo=b4Cg(e2hd3Kb&1n8N2S>$N0l-I+q1JL0bf)B=FCs;+TbUK
z(N9@FT5U5!eFoeVgXJ<%U56idznG(t2L<fl0x-s94FZ_vF4Fx;SuNsy_C1g0PGqCG
zE-pZgT8vNQ0%SEErp=o78ezXYRzvj?9>WFTh!^!Ujn}~dku_PbRpC6Ao6~Zpd0V%j
zy<&Wra`<=;z^Mp_-6`XV3&1=#qm(AOK6`P8Ijy7IgWEbqBgl@nnQYP^4sxBrzWQhz
z55gK+tl&SFZ9RhjTquSr7Wf~^T-6?|Y;<UbIywjyX$De7&1;0dpW94l|3v8D38Y}{
z`}%3%;jzW|H0V%$KURj~dUXn0PfAAw)wYa7-On98!ci1kvupL(2Ykpqe0x8_hpaH_
z@dzKrrR{HUs_7Fa#$w%zy^yC_j^JVD)*bDh;QunYU+?68szP@b{;G6c+bAtN9<eF7
zw*9j`j`UqSDOK$a#~jW^sr#Ny(Y6{w$?BNJ%~P};kuE)<K93jC#&%%-s0|R?ZtN1F
zTYCCjf`jPC(TL?*DuMep5?OOU8)GqkA~zy`!KsAwc~S`q?6*+@`{`2&Y6y*$z?vNY
zi5-cJR6-UDl{H)CKv4QZQVHp)QwcCz5mS@Rr`#*&UYT>BQwtyIMi8GXUWPflEtN1Q
zH)7CMSktOc`h&d(5x%+an6Kex@8Ns`0h(>V5R%xe%>p4r{!9r33aNaGWpC|E0^zZ6
z<|Tn}ncd$)0^u>72-|eEmAZWO+GEw(4y<8()fTMUVRiYs?M2i9;ZMB?*w4;YU_GaQ
W&rP%L&{E;~um2Aa!?@kjyZ``a=M2^W

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index 06a600c00..01ab9a5f7 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -3,6 +3,7 @@
     <file alias="change_number.tgs">../../animations/change_number.tgs</file>
     <file alias="blocked_peers_empty.tgs">../../animations/blocked_peers_empty.tgs</file>
     <file alias="filters.tgs">../../animations/filters.tgs</file>
+    <file alias="cloud_filters.tgs">../../animations/cloud_filters.tgs</file>
     <file alias="local_passcode_enter.tgs">../../animations/local_passcode_enter.tgs</file>
     <file alias="cloud_password/intro.tgs">../../animations/cloud_password/intro.tgs</file>
     <file alias="cloud_password/password_input.tgs">../../animations/cloud_password/password_input.tgs</file>
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 7908ddc40..1e1476b11 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -191,35 +191,39 @@ void InitFilterLinkHeader(
 }
 
 void ImportInvite(
-		base::weak_ptr<Window::SessionController> weak,
 		const QString &slug,
+		FilterId filterId,
 		const base::flat_set<not_null<PeerData*>> &peers,
 		Fn<void()> done,
-		Fn<void()> fail) {
+		Fn<void(QString)> fail) {
 	Expects(!peers.empty());
 
 	const auto peer = peers.front();
 	const auto api = &peer->session().api();
 	const auto callback = [=](const MTPUpdates &result) {
 		api->applyUpdates(result);
+		if (slug.isEmpty()) {
+			peer->owner().chatsFilters().moreChatsHide(filterId, true);
+		}
 		done();
 	};
 	const auto error = [=](const MTP::Error &error) {
-		if (const auto strong = weak.get()) {
-			Ui::ShowMultilineToast({
-				.parentOverride = Window::Show(strong).toastParent(),
-				.text = { error.type() },
-			});
-		}
-		fail();
+		fail(error.type());
 	};
 	auto inputs = peers | ranges::views::transform([](auto peer) {
 		return MTPInputPeer(peer->input);
 	}) | ranges::to<QVector>();
-	api->request(MTPchatlists_JoinChatlistInvite(
-		MTP_string(slug),
-		MTP_vector<MTPInputPeer>(std::move(inputs))
-	)).done(callback).fail(error).send();
+	if (!slug.isEmpty()) {
+		api->request(MTPchatlists_JoinChatlistInvite(
+			MTP_string(slug),
+			MTP_vector<MTPInputPeer>(std::move(inputs))
+		)).done(callback).fail(error).send();
+	} else {
+		api->request(MTPchatlists_JoinChatlistUpdates(
+			MTP_inputChatlistDialogFilter(MTP_int(filterId)),
+			MTP_vector<MTPInputPeer>(std::move(inputs))
+		)).done(callback).fail(error).send();
+	}
 }
 
 ToggleChatsController::ToggleChatsController(
@@ -462,10 +466,17 @@ void ProcessFilterInvite(
 					// #TODO filters
 				} else if (!state->importing) {
 					state->importing = true;
-					ImportInvite(weak, slug, peers, crl::guard(box, [=] {
+					ImportInvite(slug, filterId, peers, crl::guard(box, [=] {
 						ShowImportToast(weak, title, type, peers.size());
 						box->closeBox();
-					}), crl::guard(box, [=] {
+					}), crl::guard(box, [=](QString text) {
+						if (const auto strong = weak.get()) {
+							Ui::ShowMultilineToast({
+								.parentOverride = Window::Show(
+									strong).toastParent(),
+								.text = { text },
+							});
+						}
 						state->importing = false;
 					}));
 				}
@@ -604,6 +615,17 @@ void CheckFilterInvite(
 	});
 }
 
+void ProcessFilterUpdate(
+		base::weak_ptr<Window::SessionController> weak,
+		FilterId filterId,
+		std::vector<not_null<PeerData*>> missing) {
+	if (const auto strong = missing.empty() ? weak.get() : nullptr) {
+		strong->session().data().chatsFilters().moreChatsHide(filterId);
+		return;
+	}
+	ProcessFilterInvite(weak, QString(), filterId, std::move(missing), {});
+}
+
 void ProcessFilterRemove(
 		base::weak_ptr<Window::SessionController> weak,
 		const QString &title,
diff --git a/Telegram/SourceFiles/api/api_chat_filters.h b/Telegram/SourceFiles/api/api_chat_filters.h
index 7691d899b..c9d7e6732 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.h
+++ b/Telegram/SourceFiles/api/api_chat_filters.h
@@ -25,6 +25,11 @@ void CheckFilterInvite(
 	not_null<Window::SessionController*> controller,
 	const QString &slug);
 
+void ProcessFilterUpdate(
+	base::weak_ptr<Window::SessionController> weak,
+	FilterId filterId,
+	std::vector<not_null<PeerData*>> missing);
+
 void ProcessFilterRemove(
 	base::weak_ptr<Window::SessionController> weak,
 	const QString &title,
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index c750c47f8..15ee8c07f 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -102,13 +102,19 @@ struct Errors {
 	Unexpected("Peer type in ErrorForSharing.");
 }
 
-void ShowEmptyLinkError(not_null<Window::SessionController*> window) {
+void ShowSaveError(
+		not_null<Window::SessionController*> window,
+		QString error) {
 	Ui::ShowMultilineToast({
 		.parentOverride = Window::Show(window).toastParent(),
-		.text = { tr::lng_filters_empty(tr::now) },
+		.text = { error },
 	});
 }
 
+void ShowEmptyLinkError(not_null<Window::SessionController*> window) {
+	ShowSaveError(window, tr::lng_filters_empty(tr::now));
+}
+
 void ChatFilterLinkBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
@@ -545,7 +551,7 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 	auto icon = CreateLottieIcon(
 		verticalLayout,
 		{
-			.name = u"filters"_q,
+			.name = u"cloud_filters"_q,
 			.sizeOverride = {
 				st::settingsFilterIconSize,
 				st::settingsFilterIconSize,
@@ -1084,7 +1090,8 @@ void ExportFilterLink(
 
 void EditLinkChats(
 		const Data::ChatFilterLink &link,
-		base::flat_set<not_null<PeerData*>> peers) {
+		base::flat_set<not_null<PeerData*>> peers,
+		Fn<void(QString)> done) {
 	Expects(!peers.empty());
 	Expects(link.id != 0);
 	Expects(!link.url.isEmpty());
@@ -1104,9 +1111,9 @@ void EditLinkChats(
 	)).done([=](const MTPExportedChatlistInvite &result) {
 		const auto &data = result.data();
 		const auto link = session->data().chatsFilters().add(id, result);
-		//done(link);
+		done(QString());
 	}).fail([=](const MTP::Error &error) {
-		//done({ .id = id });
+		done(error.type());
 	}).send();
 }
 
@@ -1122,6 +1129,7 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 			? rpl::single(link.title)
 			: tr::lng_filters_link_title());
 
+		const auto saving = std::make_shared<bool>(false);
 		raw->hasChangesValue(
 		) | rpl::start_with_next([=](bool has) {
 			box->setCloseByOutsideClick(!has);
@@ -1129,11 +1137,23 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 			box->clearButtons();
 			if (has) {
 				box->addButton(tr::lng_settings_save(), [=] {
+					if (*saving) {
+						return;
+					}
 					const auto chosen = raw->selected();
 					if (chosen.empty()) {
 						ShowEmptyLinkError(window);
 					} else {
-						EditLinkChats(link, chosen);
+						*saving = true;
+						EditLinkChats(link, chosen, crl::guard(box, [=](
+								QString error) {
+							*saving = false;
+							if (error.isEmpty()) {
+								box->closeBox();
+							} else {
+								ShowSaveError(window, error);
+							}
+						}));
 					}
 				});
 				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index e70665205..9d815ca18 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_unread_things.h"
 #include "ui/ui_utility.h"
+#include "ui/chat/more_chats_bar.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "main/main_app_config.h"
@@ -31,6 +32,12 @@ constexpr auto kRefreshSuggestedTimeout = 7200 * crl::time(1000);
 constexpr auto kLoadExceptionsAfter = 100;
 constexpr auto kLoadExceptionsPerRequest = 100;
 
+[[nodiscard]] crl::time RequestUpdatesEach(not_null<Session*> owner) {
+	const auto appConfig = &owner->session().account().appConfig();
+	return appConfig->get<int>(u"chatlist_update_period"_q, 3600)
+		* crl::time(1000);
+}
+
 } // namespace
 
 ChatFilter::ChatFilter(
@@ -287,7 +294,9 @@ bool ChatFilter::contains(not_null<History*> history) const {
 		|| _always.contains(history);
 }
 
-ChatFilters::ChatFilters(not_null<Session*> owner) : _owner(owner) {
+ChatFilters::ChatFilters(not_null<Session*> owner)
+: _owner(owner)
+, _moreChatsTimer([=] { checkLoadMoreChatsLists(); }) {
 	_list.emplace_back();
 	crl::on_main(&owner->session(), [=] { load(); });
 }
@@ -855,4 +864,119 @@ rpl::producer<> ChatFilters::suggestedUpdated() const {
 	return _suggestedUpdated.events();
 }
 
+rpl::producer<Ui::MoreChatsBarContent> ChatFilters::moreChatsContent(
+		FilterId id) {
+	if (!id) {
+		return rpl::single(Ui::MoreChatsBarContent{ .count = 0 });
+	}
+	return [=](auto consumer) {
+		auto result = rpl::lifetime();
+
+		auto &entry = _moreChatsData[id];
+		auto watching = entry.watching.lock();
+		if (!watching) {
+			watching = std::make_shared<bool>(true);
+			entry.watching = watching;
+		}
+		result.add([watching] {});
+
+		_moreChatsUpdated.events_starting_with_copy(
+			id
+		) | rpl::start_with_next([=] {
+			consumer.put_next(Ui::MoreChatsBarContent{
+				.count = int(moreChats(id).size()),
+			});
+		}, result);
+		loadMoreChatsList(id);
+
+		return result;
+	};
+}
+
+const std::vector<not_null<PeerData*>> &ChatFilters::moreChats(
+		FilterId id) const {
+	static const auto kEmpty = std::vector<not_null<PeerData*>>();
+	if (!id) {
+		return kEmpty;
+	}
+	const auto i = _moreChatsData.find(id);
+	return (i != end(_moreChatsData)) ? i->second.missing : kEmpty;
+}
+
+void ChatFilters::moreChatsHide(FilterId id, bool localOnly) {
+	if (!localOnly) {
+		const auto api = &_owner->session().api();
+		api->request(MTPchatlists_HideChatlistUpdates(
+			MTP_inputChatlistDialogFilter(MTP_int(id))
+		)).send();
+	}
+
+	const auto i = _moreChatsData.find(id);
+	if (i != end(_moreChatsData)) {
+		if (const auto requestId = base::take(i->second.requestId)) {
+			_owner->session().api().request(requestId).cancel();
+		}
+		i->second.missing = {};
+		i->second.lastUpdate = crl::now();
+		_moreChatsUpdated.fire_copy(id);
+	}
+}
+
+void ChatFilters::loadMoreChatsList(FilterId id) {
+	Expects(id != 0);
+
+	const auto i = ranges::find(_list, id, &ChatFilter::id);
+	if (i == end(_list) || !i->chatlist()) {
+		return;
+	}
+
+	auto &entry = _moreChatsData[id];
+	const auto now = crl::now();
+	if (!entry.watching.lock() || entry.requestId) {
+		return;
+	}
+	const auto last = entry.lastUpdate;
+	const auto next = last ? (last + RequestUpdatesEach(_owner)) : 0;
+	if (next > now) {
+		if (!_moreChatsTimer.isActive()) {
+			_moreChatsTimer.callOnce(next - now);
+		}
+		return;
+	}
+	auto &api = _owner->session().api();
+	entry.requestId = api.request(MTPchatlists_GetChatlistUpdates(
+		MTP_inputChatlistDialogFilter(MTP_int(id))
+	)).done([=](const MTPchatlists_ChatlistUpdates &result) {
+		const auto &data = result.data();
+		_owner->processUsers(data.vusers());
+		_owner->processChats(data.vchats());
+		auto list = ranges::views::all(
+			data.vmissing_peers().v
+		) | ranges::views::transform([&](const MTPPeer &peer) {
+			return _owner->peer(peerFromMTP(peer));
+		}) | ranges::to_vector;
+
+		auto &entry = _moreChatsData[id];
+		entry.requestId = 0;
+		entry.lastUpdate = crl::now();
+		if (!_moreChatsTimer.isActive()) {
+			_moreChatsTimer.callOnce(RequestUpdatesEach(_owner));
+		}
+		if (entry.missing != list) {
+			entry.missing = std::move(list);
+			_moreChatsUpdated.fire_copy(id);
+		}
+	}).fail([=] {
+		auto &entry = _moreChatsData[id];
+		entry.requestId = 0;
+		entry.lastUpdate = crl::now();
+	}).send();
+}
+
+void ChatFilters::checkLoadMoreChatsLists() {
+	for (const auto &[id, entry] : _moreChatsData) {
+		loadMoreChatsList(id);
+	}
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index f07ec5a1b..024240061 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/flags.h"
+#include "base/timer.h"
 
 class History;
 
@@ -16,6 +17,10 @@ class MainList;
 class Key;
 } // namespace Dialogs
 
+namespace Ui {
+struct MoreChatsBarContent;
+} // namespace Ui
+
 namespace Data {
 
 class Session;
@@ -159,7 +164,20 @@ public:
 		FilterId id) const;
 	void reloadChatlistLinks(FilterId id);
 
+	[[nodiscard]] rpl::producer<Ui::MoreChatsBarContent> moreChatsContent(
+		FilterId id);
+	[[nodiscard]] const std::vector<not_null<PeerData*>> &moreChats(
+		FilterId id) const;
+	void moreChatsHide(FilterId id, bool localOnly = false);
+
 private:
+	struct MoreChatsData {
+		std::vector<not_null<PeerData*>> missing;
+		crl::time lastUpdate = 0;
+		mtpRequestId requestId = 0;
+		std::weak_ptr<bool> watching;
+	};
+
 	void load(bool force);
 	void received(const QVector<MTPDialogFilter> &list);
 	bool applyOrder(const QVector<MTPint> &order);
@@ -167,6 +185,9 @@ private:
 	void applyInsert(ChatFilter filter, int position);
 	void applyRemove(int position);
 
+	void checkLoadMoreChatsLists();
+	void loadMoreChatsList(FilterId id);
+
 	const not_null<Session*> _owner;
 
 	std::vector<ChatFilter> _list;
@@ -190,6 +211,10 @@ private:
 	rpl::event_stream<FilterId> _chatlistLinksUpdated;
 	mtpRequestId _linksRequestId = 0;
 
+	base::flat_map<FilterId, MoreChatsData> _moreChatsData;
+	rpl::event_stream<FilterId> _moreChatsUpdated;
+	base::Timer _moreChatsTimer;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 91e5ac701..9f4522e47 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/radial_animation.h"
 #include "ui/chat/requests_bar.h"
 #include "ui/chat/group_call_bar.h"
+#include "ui/chat/more_chats_bar.h"
 #include "ui/controls/download_bar.h"
 #include "ui/controls/jump_down_button.h"
 #include "ui/painter.h"
@@ -34,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "api/api_chat_filters.h"
 #include "apiwrap.h"
 #include "base/event_filter.h"
 #include "core/application.h"
@@ -440,6 +442,7 @@ Widget::Widget(
 			_searchForNarrowFilters->setRippleColorOverride(color);
 		}, lifetime());
 
+		setupMoreChatsBar();
 		setupDownloadBar();
 	}
 }
@@ -542,6 +545,49 @@ void Widget::setupScrollUpButton() {
 	updateScrollUpVisibility();
 }
 
+void Widget::setupMoreChatsBar() {
+	if (_layout == Layout::Child) {
+		return;
+	}
+	controller()->activeChatsFilter(
+	) | rpl::start_with_next([=](FilterId id) {
+		if (!id) {
+			_moreChatsBar = nullptr;
+			updateControlsGeometry();
+			return;
+		}
+		const auto filters = &session().data().chatsFilters();
+		_moreChatsBar = std::make_unique<Ui::MoreChatsBar>(
+			this,
+			filters->moreChatsContent(id));
+
+		_moreChatsBar->barClicks(
+		) | rpl::start_with_next([=] {
+			if (const auto missing = filters->moreChats(id)
+				; !missing.empty()) {
+				Api::ProcessFilterUpdate(controller(), id, missing);
+			}
+		}, _moreChatsBar->lifetime());
+
+		_moreChatsBar->closeClicks(
+		) | rpl::start_with_next([=] {
+			Api::ProcessFilterUpdate(controller(), id, {});
+		}, _moreChatsBar->lifetime());
+
+		if (_showAnimation) {
+			_moreChatsBar->hide();
+		} else {
+			_moreChatsBar->show();
+			_moreChatsBar->finishAnimating();
+		}
+
+		_moreChatsBar->heightValue(
+		) | rpl::start_with_next([=] {
+			updateControlsGeometry();
+		}, _moreChatsBar->lifetime());
+	}, lifetime());
+}
+
 void Widget::setupDownloadBar() {
 	if (_layout == Layout::Child) {
 		return;
@@ -735,6 +781,9 @@ void Widget::updateControlsVisibility(bool fast) {
 		_updateTelegram->show();
 	}
 	_searchControls->setVisible(!_openedFolder && !_openedForum);
+	if (_moreChatsBar) {
+		_moreChatsBar->show();
+	}
 	if (_openedFolder || _openedForum) {
 		_subsectionTopBar->show();
 		if (_forumTopShadow) {
@@ -1165,6 +1214,9 @@ void Widget::startSlideAnimation(
 	if (_subsectionTopBar) {
 		_subsectionTopBar->hide();
 	}
+	if (_moreChatsBar) {
+		_moreChatsBar->hide();
+	}
 	if (_forumTopShadow) {
 		_forumTopShadow->hide();
 	}
@@ -2417,7 +2469,13 @@ void Widget::updateControlsGeometry() {
 			barw,
 			st::lineWidth);
 	}
-	const auto forumGroupCallTop = filterAreaTop + filterAreaHeight;
+	const auto moreChatsBarTop = filterAreaTop + filterAreaHeight;
+	if (_moreChatsBar) {
+		_moreChatsBar->move(0, moreChatsBarTop);
+		_moreChatsBar->resizeToWidth(barw);
+	}
+	const auto forumGroupCallTop = moreChatsBarTop
+		+ (_moreChatsBar ? _moreChatsBar->height() : 0);
 	if (_forumGroupCallBar) {
 		_forumGroupCallBar->move(0, forumGroupCallTop);
 		_forumGroupCallBar->resizeToWidth(barw);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index b33dce8fd..009f6ca3a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -44,6 +44,7 @@ class PlainShadow;
 class DownloadBar;
 class GroupCallBar;
 class RequestsBar;
+class MoreChatsBar;
 class JumpDownButton;
 template <typename Widget>
 class FadeWrapScaled;
@@ -158,6 +159,7 @@ private:
 	void setupSupportMode();
 	void setupConnectingWidget();
 	void setupMainMenuToggle();
+	void setupMoreChatsBar();
 	void setupDownloadBar();
 	void setupShortcuts();
 	[[nodiscard]] bool searchForPeersRequired(const QString &query) const;
@@ -234,6 +236,8 @@ private:
 	object_ptr<Ui::CrossButton> _cancelSearch;
 	object_ptr<Ui::IconButton> _lockUnlock;
 
+	std::unique_ptr<Ui::MoreChatsBar> _moreChatsBar;
+
 	std::unique_ptr<Ui::PlainShadow> _forumTopShadow;
 	std::unique_ptr<Ui::GroupCallBar> _forumGroupCallBar;
 	std::unique_ptr<Ui::RequestsBar> _forumRequestsBar;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index b62b92ebf..a60ee8383 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1281,3 +1281,21 @@ historySendDisabled: FlatLabel(defaultFlatLabel) {
 historySendDisabledIcon: icon {{ "emoji/premium_lock", placeholderFgActive }};
 historySendDisabledIconSkip: 20px;
 historySendDisabledPosition: point(0px, 0px);
+
+moreChatsBarHeight: 48px;
+moreChatsBarTextPosition: point(12px, 4px);
+moreChatsBarStatusPosition: point(12px, 24px);
+moreChatsBarClose: IconButton(defaultIconButton) {
+	width: 48px;
+	height: 48px;
+
+	icon: boxTitleCloseIcon;
+	iconOver: boxTitleCloseIconOver;
+	iconPosition: point(12px, -1px);
+
+	rippleAreaPosition: point(0px, 4px);
+	rippleAreaSize: 40px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
diff --git a/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
new file mode 100644
index 000000000..e645801a2
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
@@ -0,0 +1,223 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/more_chats_bar.h"
+
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/shadow.h"
+#include "ui/text/text_options.h"
+#include "ui/painter.h"
+#include "lang/lang_keys.h"
+#include "styles/style_chat.h"
+#include "styles/style_window.h" // st::columnMinimalWidthLeft
+
+namespace Ui {
+
+MoreChatsBar::MoreChatsBar(
+	not_null<QWidget*> parent,
+	rpl::producer<MoreChatsBarContent> content)
+: _wrap(parent, object_ptr<RpWidget>(parent))
+, _inner(_wrap.entity())
+, _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget()))
+, _close(_inner.get(), st::moreChatsBarClose) {
+	_wrap.hide(anim::type::instant);
+	_shadow->hide();
+
+	_wrap.entity()->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
+	}, lifetime());
+	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
+
+	auto copy = std::move(
+		content
+	) | rpl::start_spawning(_wrap.lifetime());
+
+	rpl::duplicate(
+		copy
+	) | rpl::start_with_next([=](MoreChatsBarContent &&content) {
+		_content = content;
+		if (_content.count > 0) {
+			_text.setText(
+				st::defaultMessageBar.title,
+				tr::lng_filters_bar_you_can(
+					tr::now,
+					lt_count,
+					_content.count),
+				Ui::NameTextOptions());
+			_status.setText(
+				st::defaultMessageBar.text,
+				tr::lng_filters_bar_view(
+					tr::now,
+					lt_count,
+					_content.count),
+				Ui::NameTextOptions());
+		}
+		_inner->update();
+	}, lifetime());
+
+	std::move(
+		copy
+	) | rpl::map([=](const MoreChatsBarContent &content) {
+		return !content.count;
+	}) | rpl::start_with_next_done([=](bool hidden) {
+		_shouldBeShown = !hidden;
+		if (!_forceHidden) {
+			_wrap.toggle(_shouldBeShown, anim::type::normal);
+		}
+	}, [=] {
+		_forceHidden = true;
+		_wrap.toggle(false, anim::type::normal);
+	}, lifetime());
+
+	setupInner();
+}
+
+MoreChatsBar::~MoreChatsBar() = default;
+
+void MoreChatsBar::setupInner() {
+	_inner->resize(0, st::moreChatsBarHeight);
+	_inner->paintRequest(
+	) | rpl::start_with_next([=](QRect rect) {
+		auto p = Painter(_inner);
+		paint(p);
+	}, _inner->lifetime());
+
+	// Clicks.
+	_inner->setCursor(style::cur_pointer);
+	_inner->events(
+	) | rpl::filter([=](not_null<QEvent*> event) {
+		return (event->type() == QEvent::MouseButtonPress);
+	}) | rpl::map([=] {
+		return _inner->events(
+		) | rpl::filter([=](not_null<QEvent*> event) {
+			return (event->type() == QEvent::MouseButtonRelease);
+		}) | rpl::take(1) | rpl::filter([=](not_null<QEvent*> event) {
+			return _inner->rect().contains(
+				static_cast<QMouseEvent*>(event.get())->pos());
+		});
+	}) | rpl::flatten_latest(
+	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
+
+	_wrap.geometryValue(
+	) | rpl::start_with_next([=](QRect rect) {
+		updateShadowGeometry(rect);
+		updateControlsGeometry(rect);
+	}, _inner->lifetime());
+}
+
+void MoreChatsBar::paint(Painter &p) {
+	p.fillRect(_inner->rect(), st::historyComposeAreaBg);
+
+	const auto width = std::max(
+		_inner->width(),
+		st::columnMinimalWidthLeft);
+	const auto available = width
+		- st::moreChatsBarTextPosition.x()
+		- st::moreChatsBarClose.width;
+
+	p.setPen(st::defaultMessageBar.titleFg);
+	_text.drawElided(
+		p,
+		st::moreChatsBarTextPosition.x(),
+		st::moreChatsBarTextPosition.y(),
+		available);
+
+	p.setPen(st::defaultMessageBar.textFg);
+	_status.drawElided(
+		p,
+		st::moreChatsBarStatusPosition.x(),
+		st::moreChatsBarStatusPosition.y(),
+		available);
+}
+
+void MoreChatsBar::updateControlsGeometry(QRect wrapGeometry) {
+	const auto hidden = _wrap.isHidden() || !wrapGeometry.height();
+	if (_shadow->isHidden() != hidden) {
+		_shadow->setVisible(!hidden);
+	}
+	const auto width = std::max(
+		wrapGeometry.width(),
+		st::columnMinimalWidthLeft);
+	_close->move(width - _close->width(), 0);
+}
+
+void MoreChatsBar::setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess) {
+	_shadowGeometryPostprocess = std::move(postprocess);
+	updateShadowGeometry(_wrap.geometry());
+}
+
+void MoreChatsBar::updateShadowGeometry(QRect wrapGeometry) {
+	const auto regular = QRect(
+		wrapGeometry.x(),
+		wrapGeometry.y() + wrapGeometry.height(),
+		wrapGeometry.width(),
+		st::lineWidth);
+	_shadow->setGeometry(_shadowGeometryPostprocess
+		? _shadowGeometryPostprocess(regular)
+		: regular);
+}
+
+void MoreChatsBar::show() {
+	if (!_forceHidden) {
+		return;
+	}
+	_forceHidden = false;
+	if (_shouldBeShown) {
+		_wrap.show(anim::type::instant);
+		_shadow->show();
+	}
+}
+
+void MoreChatsBar::hide() {
+	if (_forceHidden) {
+		return;
+	}
+	_forceHidden = true;
+	_wrap.hide(anim::type::instant);
+	_shadow->hide();
+}
+
+void MoreChatsBar::raise() {
+	_wrap.raise();
+	_shadow->raise();
+}
+
+void MoreChatsBar::finishAnimating() {
+	_wrap.finishAnimating();
+}
+
+void MoreChatsBar::move(int x, int y) {
+	_wrap.move(x, y);
+}
+
+void MoreChatsBar::resizeToWidth(int width) {
+	_wrap.entity()->resizeToWidth(width);
+	_inner->resizeToWidth(width);
+}
+
+int MoreChatsBar::height() const {
+	return !_forceHidden
+		? _wrap.height()
+		: _shouldBeShown
+		? st::moreChatsBarHeight
+		: 0;
+}
+
+rpl::producer<int> MoreChatsBar::heightValue() const {
+	return _wrap.heightValue();
+}
+
+rpl::producer<> MoreChatsBar::barClicks() const {
+	return _barClicks.events();
+}
+
+rpl::producer<> MoreChatsBar::closeClicks() const {
+	return _close->clicks() | rpl::to_empty;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/more_chats_bar.h b/Telegram/SourceFiles/ui/chat/more_chats_bar.h
new file mode 100644
index 000000000..5536349c8
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/more_chats_bar.h
@@ -0,0 +1,73 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/wrap/slide_wrap.h"
+#include "ui/effects/animations.h"
+#include "ui/text/text.h"
+#include "base/object_ptr.h"
+#include "base/timer.h"
+
+class Painter;
+
+namespace Ui {
+
+class PlainShadow;
+class IconButton;
+
+struct MoreChatsBarContent {
+	int count = 0;
+};
+
+class MoreChatsBar final {
+public:
+	MoreChatsBar(
+		not_null<QWidget*> parent,
+		rpl::producer<MoreChatsBarContent> content);
+	~MoreChatsBar();
+
+	void show();
+	void hide();
+	void raise();
+	void finishAnimating();
+
+	void setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess);
+
+	void move(int x, int y);
+	void resizeToWidth(int width);
+	[[nodiscard]] int height() const;
+	[[nodiscard]] rpl::producer<int> heightValue() const;
+	[[nodiscard]] rpl::producer<> barClicks() const;
+	[[nodiscard]] rpl::producer<> closeClicks() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime() {
+		return _wrap.lifetime();
+	}
+
+private:
+	void updateShadowGeometry(QRect wrapGeometry);
+	void updateControlsGeometry(QRect wrapGeometry);
+	void setupInner();
+	void paint(Painter &p);
+
+	SlideWrap<> _wrap;
+	not_null<RpWidget*> _inner;
+	std::unique_ptr<PlainShadow> _shadow;
+	object_ptr<IconButton> _close;
+	rpl::event_stream<> _barClicks;
+	Fn<QRect(QRect)> _shadowGeometryPostprocess;
+	bool _shouldBeShown = false;
+	bool _forceHidden = false;
+
+	MoreChatsBarContent _content;
+	Ui::Text::String _text;
+	Ui::Text::String _status;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index cae79a558..404f72080 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -222,6 +222,8 @@ PRIVATE
     ui/chat/message_bar.h
     ui/chat/message_bubble.cpp
     ui/chat/message_bubble.h
+    ui/chat/more_chats_bar.cpp
+    ui/chat/more_chats_bar.h
     ui/chat/pinned_bar.cpp
     ui/chat/pinned_bar.h
     ui/chat/requests_bar.cpp

From 9b1c5b1050fae17e9854cc3dd450490cf07df536 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Apr 2023 17:42:01 +0400
Subject: [PATCH 014/676] Support new limit boxes for shareable folders.

---
 Telegram/SourceFiles/api/api_chat_filters.cpp | 34 +++++++--
 .../boxes/filters/edit_filter_box.cpp         |  9 ++-
 .../boxes/filters/edit_filter_links.cpp       |  3 +-
 .../SourceFiles/boxes/premium_limits_box.cpp  | 76 +++++++++++++++++++
 .../SourceFiles/boxes/premium_limits_box.h    |  6 ++
 .../SourceFiles/data/data_chat_filters.cpp    |  7 +-
 Telegram/SourceFiles/data/data_chat_filters.h |  4 +-
 .../SourceFiles/data/data_premium_limits.cpp  | 24 ++++++
 .../SourceFiles/data/data_premium_limits.h    |  8 ++
 .../SourceFiles/settings/settings_folders.cpp |  5 +-
 10 files changed, 160 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 1e1476b11..dfba82162 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "boxes/peer_list_box.h"
+#include "boxes/premium_limits_box.h"
 #include "boxes/filters/edit_filter_links.h" // FilterChatStatusText
 #include "core/application.h"
 #include "data/data_chat_filters.h"
@@ -362,6 +363,30 @@ void ToggleChatsController::setAddedTopHeight(int addedTopHeight) {
 	_addedTopWidget->resize(_addedTopWidget->width(), addedTopHeight);
 }
 
+void ShowImportError(
+		not_null<Window::SessionController*> window,
+		FilterId id,
+		int added,
+		const QString &error) {
+	const auto session = &window->session();
+	const auto &list = session->data().chatsFilters().list();
+	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
+	const auto count = added
+		+ ((i != end(list)) ? int(i->always().size()) : 0);
+	if (error == u"USER_CHANNELS_TOO_MUCH"_q) {
+		window->show(Box(ChannelsLimitBox, session));
+	} else if (error == u"FILTER_INCLUDE_TOO_MUCH"_q) {
+		window->show(Box(FilterChatsLimitBox, session, count));
+	} else if (error == u"CHATLISTS_TOO_MUCH"_q) {
+		window->show(Box(ShareableFiltersLimitBox, session));
+	} else {
+		Ui::ShowMultilineToast({
+			.parentOverride = Window::Show(window).toastParent(),
+			.text = { error },
+		});
+	}
+}
+
 void ShowImportToast(
 		base::weak_ptr<Window::SessionController> weak,
 		const QString &title,
@@ -462,20 +487,15 @@ void ProcessFilterInvite(
 			button->setClickedCallback([=] {
 				if (peers.empty()) {
 					box->closeBox();
-				//} else if (count + alreadyInFilter() >= ...) {
-					// #TODO filters
 				} else if (!state->importing) {
 					state->importing = true;
+					const auto added = int(peers.size());
 					ImportInvite(slug, filterId, peers, crl::guard(box, [=] {
 						ShowImportToast(weak, title, type, peers.size());
 						box->closeBox();
 					}), crl::guard(box, [=](QString text) {
 						if (const auto strong = weak.get()) {
-							Ui::ShowMultilineToast({
-								.parentOverride = Window::Show(
-									strong).toastParent(),
-								.text = { text },
-							});
+							ShowImportError(strong, filterId, added, text);
 						}
 						state->importing = false;
 					}));
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index ba170509b..87221ff0e 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "boxes/filters/edit_filter_chats_list.h"
 #include "boxes/filters/edit_filter_links.h"
+#include "boxes/premium_limits_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
@@ -769,8 +770,12 @@ void EditFilterBox(
 
 				window->show(ShowLinkBox(window, updated, link));
 			}, [=](QString error) {
-				if (error == "CHATLISTS_TOO_MUCH") {
-					// #TODO filters
+				if (error == u"CHATLISTS_TOO_MUCH"_q) {
+					const auto session = &window->session();
+					window->show(Box(ShareableFiltersLimitBox, session));
+				} else if (error == u"INVITES_TOO_MUCH"_q) {
+					const auto session = &window->session();
+					window->show(Box(FilterLinksLimitBox, session));
 				} else {
 					window->show(ShowLinkBox(window, updated, { .id = id }));
 				}
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 15ee8c07f..b7ff7a31d 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -1047,7 +1047,8 @@ bool GoodForExportFilterLink(
 		not_null<Window::SessionController*> window,
 		const Data::ChatFilter &filter) {
 	using Flag = Data::ChatFilter::Flag;
-	if (!filter.never().empty() || (filter.flags() & ~Flag::Chatlist)) {
+	const auto listflags = Flag::Chatlist | Flag::HasMyLinks;
+	if (!filter.never().empty() || (filter.flags() & ~listflags)) {
 		Ui::ShowMultilineToast({
 			.parentOverride = Window::Show(window).toastParent(),
 			.text = { tr::lng_filters_link_cant(tr::now) },
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index 9afb6b039..b7a3d2411 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -723,6 +723,44 @@ void FilterChatsLimitBox(
 		{ defaultLimit, current, premiumLimit, &st::premiumIconChats });
 }
 
+void FilterLinksLimitBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session) {
+	const auto premium = session->premium();
+	const auto premiumPossible = session->premiumPossible();
+
+	const auto limits = Data::PremiumLimits(session);
+	const auto defaultLimit = float64(limits.dialogFiltersLinksDefault());
+	const auto premiumLimit = float64(limits.dialogFiltersLinksPremium());
+	const auto current = (premium ? premiumLimit : defaultLimit);
+
+	auto text = rpl::combine(
+		tr::lng_filter_links_limit1(
+			lt_count,
+			rpl::single(premium ? premiumLimit : defaultLimit),
+			Ui::Text::RichLangValue),
+		((premium || !premiumPossible)
+			? rpl::single(TextWithEntities())
+			: tr::lng_filter_links_limit2(
+				lt_count,
+				rpl::single(premiumLimit),
+				Ui::Text::RichLangValue))
+	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
+		return b.text.isEmpty()
+			? a
+			: a.append(QChar(' ')).append(std::move(b));
+	});
+
+	SimpleLimitBox(
+		box,
+		session,
+		tr::lng_filter_links_limit_title(),
+		std::move(text),
+		"chatlist_invites",
+		{ defaultLimit, current, premiumLimit, &st::premiumIconChats });
+}
+
+
 void FiltersLimitBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session) {
@@ -761,6 +799,44 @@ void FiltersLimitBox(
 		{ defaultLimit, current, premiumLimit, &st::premiumIconFolders });
 }
 
+void ShareableFiltersLimitBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session) {
+	const auto premium = session->premium();
+	const auto premiumPossible = session->premiumPossible();
+
+	const auto limits = Data::PremiumLimits(session);
+	const auto defaultLimit = float64(limits.dialogShareableFiltersDefault());
+	const auto premiumLimit = float64(limits.dialogShareableFiltersPremium());
+	const auto current = float64(ranges::count_if(
+		session->data().chatsFilters().list(),
+		[](const Data::ChatFilter &f) { return f.chatlist(); }));
+
+	auto text = rpl::combine(
+		tr::lng_filter_shared_limit1(
+			lt_count,
+			rpl::single(premium ? premiumLimit : defaultLimit),
+			Ui::Text::RichLangValue),
+		((premium || !premiumPossible)
+			? rpl::single(TextWithEntities())
+			: tr::lng_filter_shared_limit2(
+				lt_count,
+				rpl::single(premiumLimit),
+				Ui::Text::RichLangValue))
+	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
+		return b.text.isEmpty()
+			? a
+			: a.append(QChar(' ')).append(std::move(b));
+	});
+	SimpleLimitBox(
+		box,
+		session,
+		tr::lng_filter_shared_limit_title(),
+		std::move(text),
+		"chatlists_joined",
+		{ defaultLimit, current, premiumLimit, &st::premiumIconFolders });
+}
+
 void FilterPinsLimitBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.h b/Telegram/SourceFiles/boxes/premium_limits_box.h
index 04a607de2..55be7e40f 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.h
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.h
@@ -32,9 +32,15 @@ void FilterChatsLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
 	int currentCount);
+void FilterLinksLimitBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session);
 void FiltersLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session);
+void ShareableFiltersLimitBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session);
 void FilterPinsLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 9d815ca18..c822cc6af 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -155,7 +155,8 @@ ChatFilter ChatFilter::FromTL(
 			data.vid().v,
 			qs(data.vtitle()),
 			qs(data.vemoticon().value_or_empty()),
-			Flag::Chatlist,
+			(Flag::Chatlist
+				| (data.is_has_my_invites() ? Flag::HasMyLinks : Flag())),
 			std::move(list),
 			std::move(pinned),
 			{});
@@ -239,6 +240,10 @@ bool ChatFilter::chatlist() const {
 	return _flags & Flag::Chatlist;
 }
 
+bool ChatFilter::hasMyLinks() const {
+	return _flags & Flag::HasMyLinks;
+}
+
 const base::flat_set<not_null<History*>> &ChatFilter::always() const {
 	return _always;
 }
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index 024240061..6dc5e6384 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -37,7 +37,8 @@ public:
 		NoRead      = (1 << 6),
 		NoArchived  = (1 << 7),
 
-		Chatlist   = (1 << 8),
+		Chatlist    = (1 << 8),
+		HasMyLinks  = (1 << 9),
 	};
 	friend constexpr inline bool is_flag_type(Flag) { return true; };
 	using Flags = base::flags<Flag>;
@@ -64,6 +65,7 @@ public:
 	[[nodiscard]] QString iconEmoji() const;
 	[[nodiscard]] Flags flags() const;
 	[[nodiscard]] bool chatlist() const;
+	[[nodiscard]] bool hasMyLinks() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &always() const;
 	[[nodiscard]] const std::vector<not_null<History*>> &pinned() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &never() const;
diff --git a/Telegram/SourceFiles/data/data_premium_limits.cpp b/Telegram/SourceFiles/data/data_premium_limits.cpp
index 0348feed8..41397c383 100644
--- a/Telegram/SourceFiles/data/data_premium_limits.cpp
+++ b/Telegram/SourceFiles/data/data_premium_limits.cpp
@@ -65,6 +65,18 @@ int PremiumLimits::dialogFiltersCurrent() const {
 		: dialogFiltersDefault();
 }
 
+int PremiumLimits::dialogShareableFiltersDefault() const {
+	return appConfigLimit("chatlists_joined_limit_default", 2);
+}
+int PremiumLimits::dialogShareableFiltersPremium() const {
+	return appConfigLimit("chatlists_joined_limit_premium", 20);
+}
+int PremiumLimits::dialogShareableFiltersCurrent() const {
+	return isPremium()
+		? dialogShareableFiltersPremium()
+		: dialogShareableFiltersDefault();
+}
+
 int PremiumLimits::dialogFiltersChatsDefault() const {
 	return appConfigLimit("dialog_filters_chats_limit_default", 100);
 }
@@ -77,6 +89,18 @@ int PremiumLimits::dialogFiltersChatsCurrent() const {
 		: dialogFiltersChatsDefault();
 }
 
+int PremiumLimits::dialogFiltersLinksDefault() const {
+	return appConfigLimit("chatlist_invites_limit_default", 3);
+}
+int PremiumLimits::dialogFiltersLinksPremium() const {
+	return appConfigLimit("chatlist_invites_limit_premium", 20);
+}
+int PremiumLimits::dialogFiltersLinksCurrent() const {
+	return isPremium()
+		? dialogFiltersLinksPremium()
+		: dialogFiltersLinksDefault();
+}
+
 int PremiumLimits::dialogsPinnedDefault() const {
 	return appConfigLimit("dialogs_pinned_limit_default", 5);
 }
diff --git a/Telegram/SourceFiles/data/data_premium_limits.h b/Telegram/SourceFiles/data/data_premium_limits.h
index e25ab880f..17ffa1247 100644
--- a/Telegram/SourceFiles/data/data_premium_limits.h
+++ b/Telegram/SourceFiles/data/data_premium_limits.h
@@ -33,10 +33,18 @@ public:
 	[[nodiscard]] int dialogFiltersPremium() const;
 	[[nodiscard]] int dialogFiltersCurrent() const;
 
+	[[nodiscard]] int dialogShareableFiltersDefault() const;
+	[[nodiscard]] int dialogShareableFiltersPremium() const;
+	[[nodiscard]] int dialogShareableFiltersCurrent() const;
+
 	[[nodiscard]] int dialogFiltersChatsDefault() const;
 	[[nodiscard]] int dialogFiltersChatsPremium() const;
 	[[nodiscard]] int dialogFiltersChatsCurrent() const;
 
+	[[nodiscard]] int dialogFiltersLinksDefault() const;
+	[[nodiscard]] int dialogFiltersLinksPremium() const;
+	[[nodiscard]] int dialogFiltersLinksCurrent() const;
+
 	[[nodiscard]] int dialogsPinnedDefault() const;
 	[[nodiscard]] int dialogsPinnedPremium() const;
 	[[nodiscard]] int dialogsPinnedCurrent() const;
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 6b2c3aea0..dd3d35784 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -104,7 +104,6 @@ struct FilterRow {
 	not_null<FilterRowButton*> button;
 	Data::ChatFilter filter;
 	bool removed = false;
-	bool removeHasLinks = false;
 	mtpRequestId removePeersRequestId = 0;
 	std::vector<not_null<PeerData*>> suggestRemovePeers;
 	std::vector<not_null<PeerData*>> removePeers;
@@ -399,7 +398,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto row = find(button);
 		if (row->removed || row->removePeersRequestId > 0) {
 			return;
-		} else if (row->filter.chatlist() && row->removeHasLinks) {
+		} else if (row->filter.hasMyLinks()) {
 			controller->show(Ui::MakeConfirmBox({
 				.text = { tr::lng_filters_delete_sure(tr::now) },
 				.confirmed = crl::guard(button, [=](Fn<void()> close) {
@@ -430,12 +429,10 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				) | ranges::views::transform([=](const MTPPeer &peer) {
 					return session->data().peer(peerFromMTP(peer));
 				}) | ranges::to_vector;
-				row->removeHasLinks = true; // #TODO filters
 				markForRemoval(button);
 			})).fail(crl::guard(button, [=] {
 				const auto row = find(button);
 				row->removePeersRequestId = -1;
-				row->removeHasLinks = false;
 				markForRemoval(button);
 			})).send();
 		} else {

From 7ff0659e91a676d05809d316fb90032b53df2e7f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Apr 2023 17:17:07 +0400
Subject: [PATCH 015/676] Improve scrolling limits in chat select boxes.

---
 Telegram/SourceFiles/api/api_chat_filters.cpp | 122 +++++++++++++++---
 .../SourceFiles/boxes/edit_privacy_box.cpp    |  16 ++-
 .../boxes/filters/edit_filter_links.cpp       |   1 +
 .../ui/controls/filter_link_header.cpp        |  23 +++-
 .../ui/controls/filter_link_header.h          |   1 +
 5 files changed, 128 insertions(+), 35 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index dfba82162..1159b3c34 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -55,14 +55,18 @@ public:
 	[[nodiscard]] auto selectedValue() const
 		-> rpl::producer<base::flat_set<not_null<PeerData*>>>;
 
-	void setAddedTopHeight(int addedTopHeight);
+	void adjust(int minHeight, int maxHeight, int addedTopHeight);
+	void setRealContentHeight(rpl::producer<int> value);
+	rpl::producer<int> boxHeightValue() const override;
 
 private:
 	void setupAboveWidget();
 	void setupBelowWidget();
+	void initDesiredHeightValue();
 
 	const not_null<Window::SessionController*> _window;
 	Ui::RpWidget *_addedTopWidget = nullptr;
+	Ui::RpWidget *_addedBottomWidget = nullptr;
 
 	ToggleAction _action = ToggleAction::Adding;
 	QString _filterTitle;
@@ -70,6 +74,12 @@ private:
 	std::vector<not_null<PeerData*>> _additional;
 	rpl::variable<base::flat_set<not_null<PeerData*>>> _selected;
 
+	int _minTopHeight = 0;
+	rpl::variable<int> _maxTopHeight;
+	rpl::variable<int> _aboveHeight;
+	rpl::variable<int> _belowHeight;
+	rpl::variable<int> _desiredHeight;
+
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
 	rpl::lifetime _lifetime;
@@ -126,7 +136,7 @@ private:
 
 void InitFilterLinkHeader(
 		not_null<PeerListBox*> box,
-		Fn<void(int)> setAddedTopHeight,
+		Fn<void(int minHeight, int maxHeight, int addedTopHeight)> adjust,
 		Ui::FilterLinkHeaderType type,
 		const QString &title,
 		const QString &iconEmoji,
@@ -159,6 +169,12 @@ void InitFilterLinkHeader(
 		box->sendScrollViewportEvent(e);
 	}, widget->lifetime());
 
+	std::move(
+		header.closeRequests
+	) | rpl::start_with_next([=] {
+		box->closeBox();
+	}, widget->lifetime());
+
 	struct State {
 		bool processing = false;
 		int addedTopHeight = 0;
@@ -178,17 +194,18 @@ void InitFilterLinkHeader(
 		const auto addedTopHeight = max - headerHeight;
 		widget->resize(widget->width(), headerHeight);
 		if (state->addedTopHeight < addedTopHeight) {
-			setAddedTopHeight(addedTopHeight);
+			adjust(min, max, addedTopHeight);
 			box->setAddedTopScrollSkip(headerHeight);
 		} else {
 			box->setAddedTopScrollSkip(headerHeight);
-			setAddedTopHeight(addedTopHeight);
+			adjust(min, max, addedTopHeight);
 		}
 		state->addedTopHeight = addedTopHeight;
 		box->peerListRefreshRows();
 	}, widget->lifetime());
 
 	box->setNoContentMargin(true);
+	adjust(min, max, 0);
 }
 
 void ImportInvite(
@@ -260,6 +277,7 @@ void ToggleChatsController::prepare() {
 		}
 		if (!additional) {
 			delegate()->peerListSetRowChecked(raw, true);
+			raw->finishCheckedAnimation();
 			selected.emplace(peer);
 		} else if (_action == ToggleAction::Adding) {
 			raw->setDisabledState(PeerListRow::State::DisabledChecked);
@@ -274,6 +292,7 @@ void ToggleChatsController::prepare() {
 	for (const auto &peer : _additional) {
 		add(peer, true);
 	}
+	initDesiredHeightValue();
 	delegate()->peerListRefreshRows();
 	_selected = std::move(selected);
 }
@@ -298,7 +317,9 @@ void ToggleChatsController::setupAboveWidget() {
 	const auto container = wrap.data();
 
 	_addedTopWidget = container->add(object_ptr<Ui::RpWidget>(container));
-	AddDivider(container);
+	const auto realAbove = container->add(
+		object_ptr<Ui::VerticalLayout>(container));
+	AddDivider(realAbove);
 	const auto totalCount = [&] {
 		if (_chats.empty()) {
 			return _additional.size();
@@ -319,7 +340,7 @@ void ToggleChatsController::setupAboveWidget() {
 		? _additional.size()
 		: _chats.size();
 	AddSubsectionTitle(
-		container,
+		realAbove,
 		(_action == ToggleAction::Removing
 			? tr::lng_filters_by_link_quit
 			: _chats.empty()
@@ -329,23 +350,34 @@ void ToggleChatsController::setupAboveWidget() {
 				rpl::single(float64(count))),
 		st::filterLinkSubsectionTitlePadding);
 
+	_aboveHeight = realAbove->heightValue();
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
 
 void ToggleChatsController::setupBelowWidget() {
 	if (_chats.empty()) {
+		auto widget = object_ptr<Ui::RpWidget>((QWidget*)nullptr);
+		_addedBottomWidget = widget.data();
+		delegate()->peerListSetBelowWidget(std::move(widget));
 		return;
 	}
-	delegate()->peerListSetBelowWidget(
-		object_ptr<Ui::DividerLabel>(
-			(QWidget*)nullptr,
-			object_ptr<Ui::FlatLabel>(
-				(QWidget*)nullptr,
-				(_action == ToggleAction::Removing
-					? tr::lng_filters_by_link_about_quit
-					: tr::lng_filters_by_link_about)(tr::now),
-				st::boxDividerLabel),
-			st::settingsDividerLabelPadding));
+	auto layout = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto raw = layout.data();
+	auto widget = object_ptr<Ui::DividerLabel>(
+		(QWidget*)nullptr,
+		std::move(layout),
+		st::settingsDividerLabelPadding);
+	raw->add(object_ptr<Ui::FlatLabel>(
+		raw,
+		(_action == ToggleAction::Removing
+			? tr::lng_filters_by_link_about_quit
+			: tr::lng_filters_by_link_about)(tr::now),
+		st::boxDividerLabel));
+	_addedBottomWidget = raw->add(object_ptr<Ui::RpWidget>(raw));
+	_belowHeight = widget->heightValue() | rpl::map([=](int value) {
+		return value - _addedBottomWidget->height();
+	});
+	delegate()->peerListSetBelowWidget(std::move(widget));
 }
 
 Main::Session &ToggleChatsController::session() const {
@@ -357,10 +389,56 @@ auto ToggleChatsController::selectedValue() const
 	return _selected.value();
 }
 
-void ToggleChatsController::setAddedTopHeight(int addedTopHeight) {
+void ToggleChatsController::adjust(
+		int minHeight,
+		int maxHeight,
+		int addedTopHeight) {
 	Expects(addedTopHeight >= 0);
 
 	_addedTopWidget->resize(_addedTopWidget->width(), addedTopHeight);
+	_minTopHeight = minHeight;
+	_maxTopHeight = maxHeight;
+}
+
+void ToggleChatsController::setRealContentHeight(rpl::producer<int> value) {
+	std::move(
+		value
+	) | rpl::start_with_next([=](int height) {
+		const auto desired = _desiredHeight.current();
+		if (height <= computeListSt().item.height) {
+			return;
+		} else if (height >= desired) {
+			_addedBottomWidget->resize(_addedBottomWidget->width(), 0);
+		} else {
+			const auto available = desired - height;
+			const auto required = _maxTopHeight.current() - _minTopHeight;
+			const auto added = required - available;
+			_addedBottomWidget->resize(
+				_addedBottomWidget->width(),
+				std::max(added, 0));
+		}
+	}, _lifetime);
+}
+
+void ToggleChatsController::initDesiredHeightValue() {
+	using namespace rpl::mappers;
+
+	const auto &st = computeListSt();
+	const auto count = int(delegate()->peerListFullRowsCount());
+	const auto middle = st.padding.top()
+		+ (count * st.item.height)
+		+ st.padding.bottom();
+	_desiredHeight = rpl::combine(
+		_maxTopHeight.value(),
+		_aboveHeight.value(),
+		_belowHeight.value(),
+		_1 + _2 + middle + _3);
+}
+
+rpl::producer<int> ToggleChatsController::boxHeightValue() const {
+	return _desiredHeight.value() | rpl::map([=](int value) {
+		return std::min(value, st::boxMaxListHeight);
+	});
 }
 
 void ShowImportError(
@@ -454,10 +532,12 @@ void ProcessFilterInvite(
 		) | rpl::map([=](const base::flat_set<not_null<PeerData*>> &peers) {
 			return int(peers.size());
 		});
-		InitFilterLinkHeader(box, [=](int addedTopHeight) {
-			raw->setAddedTopHeight(addedTopHeight);
+		InitFilterLinkHeader(box, [=](int min, int max, int addedTop) {
+			raw->adjust(min, max, addedTop);
 		}, type, title, iconEmoji, rpl::duplicate(badge));
 
+		raw->setRealContentHeight(box->heightValue());
+
 		auto owned = Ui::FilterLinkProcessButton(
 			box,
 			type,
@@ -677,8 +757,8 @@ void ProcessFilterRemove(
 		) | rpl::map([=](const base::flat_set<not_null<PeerData*>> &peers) {
 			return int(peers.size());
 		});
-		InitFilterLinkHeader(box, [=](int addedTopHeight) {
-			raw->setAddedTopHeight(addedTopHeight);
+		InitFilterLinkHeader(box, [=](int min, int max, int addedTop) {
+			raw->adjust(min, max, addedTop);
 		}, type, title, iconEmoji, rpl::single(0));
 
 		auto owned = Ui::FilterLinkProcessButton(
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 69aa79d16..86e531c61 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -217,16 +217,18 @@ Ui::FlatLabel *EditPrivacyBox::addLabel(
 	if (!text) {
 		return nullptr;
 	}
-	return container->add(
+	auto label = object_ptr<Ui::FlatLabel>(
+		container,
+		rpl::duplicate(text),
+		st::boxDividerLabel);
+	const auto result = label.data();
+	container->add(
 		object_ptr<Ui::DividerLabel>(
 			container,
-			object_ptr<Ui::FlatLabel>(
-				container,
-				rpl::duplicate(text),
-				st::boxDividerLabel),
+			std::move(label),
 			st::settingsDividerLabelPadding),
-		{ 0, topSkip, 0, 0 }
-	)->entity();
+		{ 0, topSkip, 0, 0 });
+	return result;
 }
 
 Ui::FlatLabel *EditPrivacyBox::addLabelOrDivider(
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index b7ff7a31d..c1bea9990 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -695,6 +695,7 @@ void LinkController::prepare() {
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
 		delegate()->peerListSetRowChecked(raw, true);
+		raw->finishCheckedAnimation();
 		_initial.emplace(peer);
 	}
 	for (const auto &history : _filterChats) {
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
index f35ad1a61..8c60e671c 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
@@ -31,9 +31,9 @@ public:
 		FilterLinkHeaderDescriptor &&descriptor);
 
 	void setTitlePosition(int x, int y);
-	void updateDimensions(int newWidth);
 
 	[[nodiscard]] rpl::producer<not_null<QWheelEvent*>> wheelEvents() const;
+	[[nodiscard]] rpl::producer<> closeRequests() const;
 
 private:
 	void resizeEvent(QResizeEvent *e) override;
@@ -46,6 +46,7 @@ private:
 	void refreshTitleText();
 
 	const not_null<FlatLabel*> _about;
+	const not_null<IconButton*> _close;
 	QMargins _aboutPadding;
 
 	struct {
@@ -176,10 +177,11 @@ Widget::Widget(
 	not_null<QWidget*> parent,
 	FilterLinkHeaderDescriptor &&descriptor)
 : RpWidget(parent)
-, _about(CreateChild<Ui::FlatLabel>(
+, _about(CreateChild<FlatLabel>(
 	this,
 	rpl::single(descriptor.about.value()),
 	st::filterLinkAbout))
+, _close(CreateChild<IconButton>(this, st::boxTitleClose))
 , _aboutPadding(st::boxRowPadding)
 , _badge(std::move(descriptor.badge))
 , _titleText(descriptor.title)
@@ -216,6 +218,10 @@ rpl::producer<not_null<QWheelEvent*>> Widget::wheelEvents() const {
 	return _wheelEvents.events();
 }
 
+rpl::producer<> Widget::closeRequests() const {
+	return _close->clicks() | rpl::to_empty;
+}
+
 void Widget::resizeEvent(QResizeEvent *e) {
 	const auto &padding = _aboutPadding;
 	const auto availableWidth = width() - padding.left() - padding.right();
@@ -258,13 +264,15 @@ void Widget::resizeEvent(QResizeEvent *e) {
 	_about->moveToLeft(_aboutPadding.left(), aboutTop);
 	_about->setOpacity(_progress.body);
 
+	_close->moveToRight(0, 0);
+
 	update();
 }
 
 QRectF Widget::previewRect(
 		float64 topProgress,
 		float64 sizeProgress) const {
-	const auto size = st::filterLinkPreview;
+	const auto size = st::filterLinkPreview * sizeProgress;
 	return QRectF(
 		(width() - size) / 2.,
 		st::filterLinkPreviewTop * topProgress,
@@ -276,9 +284,6 @@ void Widget::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
 	p.setOpacity(_progress.body);
-	p.translate(_previewRect.center());
-	p.scale(_progress.body, _progress.body);
-	p.translate(-_previewRect.center());
 	if (_progress.top) {
 		auto hq = PainterHighQualityEnabler(p);
 		if (_preview.isNull()) {
@@ -327,7 +332,11 @@ void Widget::wheelEvent(QWheelEvent *e) {
 	const auto result = CreateChild<Widget>(
 		parent.get(),
 		std::move(descriptor));
-	return { .widget = result, .wheelEvents = result->wheelEvents() };
+	return {
+		.widget = result,
+		.wheelEvents = result->wheelEvents(),
+		.closeRequests = result->closeRequests(),
+	};
 }
 
 object_ptr<RoundButton> FilterLinkProcessButton(
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.h b/Telegram/SourceFiles/ui/controls/filter_link_header.h
index 7e40ce7ca..8769bf069 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.h
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.h
@@ -34,6 +34,7 @@ struct FilterLinkHeaderDescriptor {
 struct FilterLinkHeader {
 	not_null<RpWidget*> widget;
 	rpl::producer<not_null<QWheelEvent*>> wheelEvents;
+	rpl::producer<> closeRequests;
 };
 
 [[nodiscard]] FilterLinkHeader MakeFilterLinkHeader(

From f05f1f43597fd58ebf44dad83917ff72376d7b21 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Apr 2023 18:37:22 +0400
Subject: [PATCH 016/676] Change the format for shared filters link.

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

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index cf6673c44..4c09794a8 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -843,7 +843,7 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			JoinGroupByHash
 		},
 		{
-			u"^list/?\\?slug=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"_q,
+			u"^addlist/?\\?slug=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"_q,
 			JoinFilterBySlug
 		},
 		{
@@ -970,8 +970,8 @@ QString TryConvertUrlToLocal(QString url) {
 			return u"tg://resolve?phone="_q + phoneMatch->captured(1) + (params.isEmpty() ? QString() : '&' + params);
 		} else if (const auto joinChatMatch = regex_match(u"^(joinchat/|\\+|\\%20)([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
 			return u"tg://join?invite="_q + url_encode(joinChatMatch->captured(2));
-		} else if (const auto joinFilterMatch = regex_match(u"^(list/)([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
-			return u"tg://list?slug="_q + url_encode(joinFilterMatch->captured(2));
+		} else if (const auto joinFilterMatch = regex_match(u"^(addlist/)([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
+			return u"tg://addlist?slug="_q + url_encode(joinFilterMatch->captured(2));
 		} else if (const auto stickerSetMatch = regex_match(u"^(addstickers|addemoji)/([a-zA-Z0-9\\.\\_]+)(\\?|$)"_q, query, matchOptions)) {
 			return u"tg://"_q + stickerSetMatch->captured(1) + "?set=" + url_encode(stickerSetMatch->captured(2));
 		} else if (const auto themeMatch = regex_match(u"^addtheme/([a-zA-Z0-9\\.\\_]+)(\\?|$)"_q, query, matchOptions)) {

From 1ffbc122e1172b9436655bb7af169491065fe586 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Apr 2023 18:37:45 +0400
Subject: [PATCH 017/676] Allow select/deselect all in filter link boxes.

---
 Telegram/Resources/langs/lang.strings         |  2 +-
 Telegram/SourceFiles/api/api_chat_filters.cpp | 44 ++++++++-
 .../boxes/filters/edit_filter_links.cpp       | 94 ++++++++++++++++++-
 .../boxes/filters/edit_filter_links.h         |  7 ++
 4 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 4e8314d3e..750f0c087 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3598,7 +3598,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_by_link_add_button" = "Add {folder}";
 "lng_filters_by_link_add_no" = "Do not add this folder";
 "lng_filters_by_link_more" = "Add Chats to Folder";
-"lng_filters_by_link_more_sure" = "Do you want to join chats and add them to your folder {folder}?";
+"lng_filters_by_link_more_sure" = "Do you want to join chats and add them to the folder {folder}?";
 "lng_filters_by_link_about" = "You can deselect the chats you don't want to join.";
 "lng_filters_by_link_join_button" = "Join Chats";
 "lng_filters_by_link_join_no" = "Do not join any chats";
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 1159b3c34..8e1f44329 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -63,6 +63,7 @@ private:
 	void setupAboveWidget();
 	void setupBelowWidget();
 	void initDesiredHeightValue();
+	void toggleAllSelected(bool select);
 
 	const not_null<Window::SessionController*> _window;
 	Ui::RpWidget *_addedTopWidget = nullptr;
@@ -259,8 +260,6 @@ ToggleChatsController::ToggleChatsController(
 }
 
 void ToggleChatsController::prepare() {
-	setupAboveWidget();
-	setupBelowWidget();
 	auto selected = base::flat_set<not_null<PeerData*>>();
 	const auto add = [&](not_null<PeerData*> peer, bool additional = false) {
 		auto row = std::make_unique<PeerListRow>(peer);
@@ -292,6 +291,8 @@ void ToggleChatsController::prepare() {
 	for (const auto &peer : _additional) {
 		add(peer, true);
 	}
+	setupAboveWidget();
+	setupBelowWidget();
 	initDesiredHeightValue();
 	delegate()->peerListRefreshRows();
 	_selected = std::move(selected);
@@ -339,7 +340,13 @@ void ToggleChatsController::setupAboveWidget() {
 		: _chats.empty()
 		? _additional.size()
 		: _chats.size();
-	AddSubsectionTitle(
+	const auto selectableCount = delegate()->peerListFullRowsCount()
+		- (_action == ToggleAction::Adding ? int(_additional.size()) : 0);
+	auto selectedCount = _selected.value(
+	) | rpl::map([](const base::flat_set<not_null<PeerData*>> &selected) {
+		return int(selected.size());
+	});
+	AddFilterSubtitleWithToggles(
 		realAbove,
 		(_action == ToggleAction::Removing
 			? tr::lng_filters_by_link_quit
@@ -348,12 +355,41 @@ void ToggleChatsController::setupAboveWidget() {
 			: tr::lng_filters_by_link_join)(
 				lt_count,
 				rpl::single(float64(count))),
-		st::filterLinkSubsectionTitlePadding);
+		selectableCount,
+		std::move(selectedCount),
+		[=](bool select) { toggleAllSelected(select); });
 
 	_aboveHeight = realAbove->heightValue();
 	delegate()->peerListSetAboveWidget(std::move(wrap));
 }
 
+void ToggleChatsController::toggleAllSelected(bool select) {
+	auto selected = _selected.current();
+	if (!select) {
+		if (selected.empty()) {
+			return;
+		}
+		for (const auto &peer : selected) {
+			const auto row = delegate()->peerListFindRow(peer->id.value);
+			Assert(row != nullptr);
+			delegate()->peerListSetRowChecked(row, false);
+		}
+		selected = {};
+	} else {
+		const auto count = delegate()->peerListFullRowsCount();
+		for (auto i = 0; i != count; ++i) {
+			const auto row = delegate()->peerListRowAt(i);
+			const auto peer = row->peer();
+			if (_action != ToggleAction::Adding ||
+				!ranges::contains(_additional, peer)) {
+				delegate()->peerListSetRowChecked(row, true);
+				selected.emplace(peer);
+			}
+		}
+	}
+	_selected = std::move(selected);
+}
+
 void ToggleChatsController::setupBelowWidget() {
 	if (_chats.empty()) {
 		auto widget = object_ptr<Ui::RpWidget>((QWidget*)nullptr);
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index c1bea9990..5a788cb45 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/invite_link_label.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toasts/common_toasts.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/vertical_layout.h"
@@ -507,6 +508,7 @@ private:
 	void setupBelowWidget();
 	void addHeader(not_null<Ui::VerticalLayout*> container);
 	void addLinkBlock(not_null<Ui::VerticalLayout*> container);
+	void toggleAllSelected(bool select);
 
 	const not_null<Window::SessionController*> _window;
 	InviteLinkData _data;
@@ -684,8 +686,6 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 void LinkController::prepare() {
 	Expects(!_data.url.isEmpty() || _data.chats.empty());
 
-	setupAboveWidget();
-	setupBelowWidget();
 	for (const auto &history : _data.chats) {
 		const auto peer = history->peer;
 		auto row = std::make_unique<ChatRow>(
@@ -716,6 +716,8 @@ void LinkController::prepare() {
 			_denied.emplace(peer);
 		}
 	}
+	setupAboveWidget();
+	setupBelowWidget();
 	delegate()->peerListRefreshRows();
 	_selected = _initial;
 }
@@ -744,6 +746,34 @@ void LinkController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
+void LinkController::toggleAllSelected(bool select) {
+	auto selected = _selected.current();
+	if (!select) {
+		if (selected.empty()) {
+			return;
+		}
+		for (const auto &peer : selected) {
+			const auto row = delegate()->peerListFindRow(peer->id.value);
+			Assert(row != nullptr);
+			delegate()->peerListSetRowChecked(row, false);
+		}
+		selected = {};
+	} else {
+		const auto count = delegate()->peerListFullRowsCount();
+		for (auto i = 0; i != count; ++i) {
+			const auto row = delegate()->peerListRowAt(i);
+			const auto peer = row->peer();
+			if (!_denied.contains(peer)) {
+				delegate()->peerListSetRowChecked(row, true);
+				selected.emplace(peer);
+			}
+		}
+	}
+	const auto has = (_initial != selected);
+	_selected = std::move(selected);
+	_hasChanges = has;
+}
+
 void LinkController::showFinished() {
 	_showFinished.fire({});
 }
@@ -770,10 +800,18 @@ void LinkController::setupAboveWidget() {
 				lt_count,
 				float64(selected.size()));
 	});
-	Settings::AddSubsectionTitle(
+	const auto mayBeSelected = delegate()->peerListFullRowsCount()
+		- int(_denied.size());
+	auto selectedCount = _selected.value(
+	) | rpl::map([](const base::flat_set<not_null<PeerData*>> &selected) {
+		return int(selected.size());
+	});
+	AddFilterSubtitleWithToggles(
 		container,
 		std::move(subtitle),
-		st::filterLinkSubsectionTitlePadding);
+		mayBeSelected,
+		std::move(selectedCount),
+		[=](bool select) { toggleAllSelected(select); });
 
 	// Fix label cutting on text change from smaller to longer.
 	_selected.changes() | rpl::start_with_next([=] {
@@ -1206,3 +1244,51 @@ void SetupFilterLinks(
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 }
+
+void AddFilterSubtitleWithToggles(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<QString> text,
+		int selectableCount,
+		rpl::producer<int> selectedCount,
+		Fn<void(bool select)> toggle) {
+	using namespace rpl::mappers;
+
+	const auto selectable = (selectableCount > 0);
+	auto padding = st::filterLinkSubsectionTitlePadding;
+	if (selectable) {
+		const auto font = st::boxLinkButton.font;
+		padding.setRight(padding.right() + font->spacew + std::max(
+			font->width(tr::lng_filters_by_link_select(tr::now)),
+			font->width(tr::lng_filters_by_link_deselect(tr::now))));
+	}
+	const auto title = Settings::AddSubsectionTitle(
+		container,
+		std::move(text),
+		padding);
+	if (!selectable) {
+		return;
+	}
+	const auto link = Ui::CreateChild<Ui::LinkButton>(
+		container.get(),
+		tr::lng_filters_by_link_select(tr::now),
+		st::boxLinkButton);
+	const auto canSelect = link->lifetime().make_state<rpl::variable<bool>>(
+		std::move(selectedCount) | rpl::map(_1 < selectableCount));
+	canSelect->value(
+	) | rpl::start_with_next([=](bool can) {
+		link->setText(can
+			? tr::lng_filters_by_link_select(tr::now)
+			: tr::lng_filters_by_link_deselect(tr::now));
+	}, link->lifetime());
+	link->setClickedCallback([=] {
+		toggle(canSelect->current());
+	});
+
+	rpl::combine(
+		container->widthValue(),
+		title->topValue(),
+		link->widthValue()
+	) | rpl::start_with_next([=](int outer, int y, int width) {
+		link->move(outer - st::boxRowPadding.right() - width, y);
+	}, link->lifetime());
+}
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
index dca57121a..802e15bea 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
@@ -47,3 +47,10 @@ void SetupFilterLinks(
 	not_null<Window::SessionController*> window,
 	rpl::producer<std::vector<Data::ChatFilterLink>> value,
 	Fn<Data::ChatFilter()> currentFilter);
+
+void AddFilterSubtitleWithToggles(
+	not_null<Ui::VerticalLayout*> container,
+	rpl::producer<QString> text,
+	int selectableCount,
+	rpl::producer<int> selectedCount,
+	Fn<void(bool select)> toggle);

From 09de8810361cd4b0d0cf11c61e01db32aeb8d289 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Apr 2023 18:51:09 +0400
Subject: [PATCH 018/676] Improve peer list decorate widgets.

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

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index db5076952..b59145ec0 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1221,18 +1221,14 @@ void PeerListContent::setSearchNoResults(object_ptr<Ui::FlatLabel> noResults) {
 	}
 }
 
-void PeerListContent::setAboveWidget(object_ptr<TWidget> widget) {
+void PeerListContent::setAboveWidget(object_ptr<Ui::RpWidget> widget) {
 	_aboveWidget = std::move(widget);
-	if (_aboveWidget) {
-		_aboveWidget->setParent(this);
-	}
+	initDecorateWidget(_aboveWidget.data());
 }
 
-void PeerListContent::setAboveSearchWidget(object_ptr<TWidget> widget) {
+void PeerListContent::setAboveSearchWidget(object_ptr<Ui::RpWidget> widget) {
 	_aboveSearchWidget = std::move(widget);
-	if (_aboveSearchWidget) {
-		_aboveSearchWidget->setParent(this);
-	}
+	initDecorateWidget(_aboveSearchWidget.data());
 }
 
 void PeerListContent::setHideEmpty(bool hide) {
@@ -1240,10 +1236,20 @@ void PeerListContent::setHideEmpty(bool hide) {
 	resizeToWidth(width());
 }
 
-void PeerListContent::setBelowWidget(object_ptr<TWidget> widget) {
+void PeerListContent::setBelowWidget(object_ptr<Ui::RpWidget> widget) {
 	_belowWidget = std::move(widget);
-	if (_belowWidget) {
-		_belowWidget->setParent(this);
+	initDecorateWidget(_belowWidget.data());
+}
+
+void PeerListContent::initDecorateWidget(Ui::RpWidget *widget) {
+	if (widget) {
+		widget->setParent(this);
+		widget->events(
+		) | rpl::filter([=](not_null<QEvent*> e) {
+			return (e->type() == QEvent::Enter) && widget->isVisible();
+		}) | rpl::start_with_next([=] {
+			mouseLeftGeometry();
+		}, widget->lifetime());
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 1f1c0e10a..c641fc33c 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -298,9 +298,9 @@ public:
 	virtual void peerListSetHideEmpty(bool hide) = 0;
 	virtual void peerListSetDescription(object_ptr<Ui::FlatLabel> description) = 0;
 	virtual void peerListSetSearchNoResults(object_ptr<Ui::FlatLabel> noResults) = 0;
-	virtual void peerListSetAboveWidget(object_ptr<TWidget> aboveWidget) = 0;
-	virtual void peerListSetAboveSearchWidget(object_ptr<TWidget> aboveWidget) = 0;
-	virtual void peerListSetBelowWidget(object_ptr<TWidget> belowWidget) = 0;
+	virtual void peerListSetAboveWidget(object_ptr<Ui::RpWidget> aboveWidget) = 0;
+	virtual void peerListSetAboveSearchWidget(object_ptr<Ui::RpWidget> aboveWidget) = 0;
+	virtual void peerListSetBelowWidget(object_ptr<Ui::RpWidget> belowWidget) = 0;
 	virtual void peerListMouseLeftGeometry() = 0;
 	virtual void peerListSetSearchMode(PeerListSearchMode mode) = 0;
 	virtual void peerListAppendRow(std::unique_ptr<PeerListRow> row) = 0;
@@ -618,9 +618,9 @@ public:
 	void setDescription(object_ptr<Ui::FlatLabel> description);
 	void setSearchLoading(object_ptr<Ui::FlatLabel> loading);
 	void setSearchNoResults(object_ptr<Ui::FlatLabel> noResults);
-	void setAboveWidget(object_ptr<TWidget> widget);
-	void setAboveSearchWidget(object_ptr<TWidget> widget);
-	void setBelowWidget(object_ptr<TWidget> width);
+	void setAboveWidget(object_ptr<Ui::RpWidget> widget);
+	void setAboveSearchWidget(object_ptr<Ui::RpWidget> widget);
+	void setBelowWidget(object_ptr<Ui::RpWidget> width);
 	void setHideEmpty(bool hide);
 	void refreshRows();
 
@@ -781,6 +781,7 @@ private:
 	void clearAllContent();
 	void handleMouseMove(QPoint globalPosition);
 	void mousePressReleased(Qt::MouseButton button);
+	void initDecorateWidget(Ui::RpWidget *widget);
 
 	const style::PeerList &_st;
 	not_null<PeerListController*> _controller;
@@ -815,9 +816,9 @@ private:
 	int _aboveHeight = 0;
 	int _belowHeight = 0;
 	bool _hideEmpty = false;
-	object_ptr<TWidget> _aboveWidget = { nullptr };
-	object_ptr<TWidget> _aboveSearchWidget = { nullptr };
-	object_ptr<TWidget> _belowWidget = { nullptr };
+	object_ptr<Ui::RpWidget> _aboveWidget = { nullptr };
+	object_ptr<Ui::RpWidget> _aboveSearchWidget = { nullptr };
+	object_ptr<Ui::RpWidget> _belowWidget = { nullptr };
 	object_ptr<Ui::FlatLabel> _description = { nullptr };
 	object_ptr<Ui::FlatLabel> _searchNoResults = { nullptr };
 	object_ptr<Ui::FlatLabel> _searchLoading = { nullptr };
@@ -901,13 +902,13 @@ public:
 	void peerListSetSearchNoResults(object_ptr<Ui::FlatLabel> noResults) override {
 		_content->setSearchNoResults(std::move(noResults));
 	}
-	void peerListSetAboveWidget(object_ptr<TWidget> aboveWidget) override {
+	void peerListSetAboveWidget(object_ptr<Ui::RpWidget> aboveWidget) override {
 		_content->setAboveWidget(std::move(aboveWidget));
 	}
-	void peerListSetAboveSearchWidget(object_ptr<TWidget> aboveWidget) override {
+	void peerListSetAboveSearchWidget(object_ptr<Ui::RpWidget> aboveWidget) override {
 		_content->setAboveSearchWidget(std::move(aboveWidget));
 	}
-	void peerListSetBelowWidget(object_ptr<TWidget> belowWidget) override {
+	void peerListSetBelowWidget(object_ptr<Ui::RpWidget> belowWidget) override {
 		_content->setBelowWidget(std::move(belowWidget));
 	}
 	void peerListSetSearchMode(PeerListSearchMode mode) override {

From 06cf2b562fab50a8933d7c8ff5c594dac9ad9014 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Apr 2023 20:03:33 +0400
Subject: [PATCH 019/676] Improve layout of shareable folder limit boxes.

---
 .../SourceFiles/boxes/premium_limits_box.cpp  |  23 ++-
 .../ui/effects/premium_graphics.cpp           | 152 +++++++++++-------
 .../SourceFiles/ui/effects/premium_graphics.h |   8 +-
 3 files changed, 120 insertions(+), 63 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index b7a3d2411..9658bad06 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -46,6 +46,7 @@ struct InfographicDescriptor {
 	float64 premiumLimit = 0;
 	const style::icon *icon;
 	std::optional<tr::phrase<lngtag_count>> phrase;
+	bool complexRatio = false;
 };
 
 [[nodiscard]] rpl::producer<> BoxShowFinishes(not_null<Ui::GenericBox*> box) {
@@ -433,7 +434,11 @@ void SimpleLimitBox(
 		Ui::Premium::AddLimitRow(
 			top,
 			descriptor.premiumLimit,
-			descriptor.phrase);
+			descriptor.phrase,
+			0,
+			(descriptor.complexRatio
+				? (float64(descriptor.current) / descriptor.premiumLimit)
+				: Ui::Premium::kLimitRowRatio));
 		Settings::AddSkip(top, st::premiumInfographicPadding.bottom());
 	}
 
@@ -757,7 +762,13 @@ void FilterLinksLimitBox(
 		tr::lng_filter_links_limit_title(),
 		std::move(text),
 		"chatlist_invites",
-		{ defaultLimit, current, premiumLimit, &st::premiumIconChats });
+		{
+			defaultLimit,
+			current,
+			premiumLimit,
+			&st::premiumIconChats,
+			std::nullopt,
+			true });
 }
 
 
@@ -834,7 +845,13 @@ void ShareableFiltersLimitBox(
 		tr::lng_filter_shared_limit_title(),
 		std::move(text),
 		"chatlists_joined",
-		{ defaultLimit, current, premiumLimit, &st::premiumIconFolders });
+		{
+			defaultLimit,
+			current,
+			premiumLimit,
+			&st::premiumIconFolders,
+			std::nullopt,
+			true });
 }
 
 void FilterPinsLimitBox(
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 077b8cec6..6c77a159b 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -559,8 +559,13 @@ public:
 		not_null<Ui::RpWidget*> parent,
 		int max,
 		TextFactory textFactory,
-		int min);
-	Line(not_null<Ui::RpWidget*> parent, QString max, QString min);
+		int min,
+		float64 ratio);
+	Line(
+		not_null<Ui::RpWidget*> parent,
+		QString max,
+		QString min,
+		float64 ratio);
 
 	void setColorOverride(QBrush brush);
 
@@ -589,14 +594,20 @@ Line::Line(
 	not_null<Ui::RpWidget*> parent,
 	int max,
 	TextFactory textFactory,
-	int min)
+	int min,
+	float64 ratio)
 : Line(
 	parent,
 	max ? textFactory(max) : QString(),
-	min ? textFactory(min) : QString()) {
+	min ? textFactory(min) : QString(),
+	ratio) {
 }
 
-Line::Line(not_null<Ui::RpWidget*> parent, QString max, QString min)
+Line::Line(
+	not_null<Ui::RpWidget*> parent,
+	QString max,
+	QString min,
+	float64 ratio)
 : Ui::RpWidget(parent)
 , _leftText(st::semiboldTextStyle, tr::lng_premium_free(tr::now))
 , _rightText(st::semiboldTextStyle, tr::lng_premium(tr::now))
@@ -609,7 +620,7 @@ Line::Line(not_null<Ui::RpWidget*> parent, QString max, QString min)
 		if (s.isEmpty()) {
 			return;
 		}
-		_leftWidth = (s.width() / 2);
+		_leftWidth = int(base::SafeRound(s.width() * ratio));
 		_rightWidth = (s.width() - _leftWidth);
 		recache(s);
 		update();
@@ -635,76 +646,95 @@ void Line::paintEvent(QPaintEvent *event) {
 	const auto textPadding = st::premiumLineTextSkip;
 	const auto textTop = (height() - _leftText.minHeight()) / 2;
 
-	p.setPen(st::windowFg);
-	_leftLabel.drawRight(
-		p,
-		textPadding,
-		textTop,
-		_leftWidth - textPadding,
-		_leftWidth,
-		style::al_right);
-	_leftText.drawLeft(
-		p,
-		textPadding,
-		textTop,
-		_leftWidth - textPadding,
-		_leftWidth);
-
-	p.setPen(st::activeButtonFg);
-	_rightLabel.drawRight(
-		p,
-		textPadding,
-		textTop,
-		_rightWidth - textPadding,
-		width(),
-		style::al_right);
-	_rightText.drawLeftElided(
-		p,
-		_leftWidth + textPadding,
-		textTop,
-		_rightWidth - _rightLabel.countWidth(_rightWidth) - textPadding * 2,
-		_rightWidth);
+	const auto leftMinWidth = _leftLabel.maxWidth()
+		+ _leftText.maxWidth()
+		+ 3 * textPadding;
+	if (_leftWidth >= leftMinWidth) {
+		p.setPen(st::windowFg);
+		_leftLabel.drawRight(
+			p,
+			textPadding,
+			textTop,
+			_leftWidth - textPadding,
+			_leftWidth,
+			style::al_right);
+		_leftText.drawLeft(
+			p,
+			textPadding,
+			textTop,
+			_leftWidth - textPadding,
+			_leftWidth);
+	}
+	const auto rightMinWidth = 2 * _rightLabel.maxWidth()
+		+ 3 * textPadding;
+	if (_rightWidth >= rightMinWidth) {
+		p.setPen(st::activeButtonFg);
+		_rightLabel.drawRight(
+			p,
+			textPadding,
+			textTop,
+			_rightWidth - textPadding,
+			width(),
+			style::al_right);
+		_rightText.drawLeftElided(
+			p,
+			_leftWidth + textPadding,
+			textTop,
+			(_rightWidth
+				- _rightLabel.countWidth(_rightWidth)
+				- textPadding * 2),
+			_rightWidth);
+	}
 }
 
 void Line::recache(const QSize &s) {
-	const auto r = QRect(0, 0, _leftWidth, s.height());
-	auto pixmap = QPixmap(r.size() * style::DevicePixelRatio());
-	pixmap.setDevicePixelRatio(style::DevicePixelRatio());
-	pixmap.fill(Qt::transparent);
-
-	auto pathRound = QPainterPath();
-	pathRound.addRoundedRect(r, st::buttonRadius, st::buttonRadius);
+	const auto r = [&](int width) {
+		return QRect(0, 0, width, s.height());
+	};
+	const auto pixmap = [&](int width) {
+		auto result = QPixmap(r(width).size() * style::DevicePixelRatio());
+		result.setDevicePixelRatio(style::DevicePixelRatio());
+		result.fill(Qt::transparent);
+		return result;
+	};
 
+	const auto pathRound = [&](int width) {
+		auto result = QPainterPath();
+		result.addRoundedRect(r(width), st::buttonRadius, st::buttonRadius);
+		return result;
+	};
 	{
-		auto leftPixmap = pixmap;
+		auto leftPixmap = pixmap(_leftWidth);
 		auto p = QPainter(&leftPixmap);
 		PainterHighQualityEnabler hq(p);
 		auto pathRect = QPainterPath();
-		auto halfRect = r;
-		halfRect.setLeft(r.center().x());
+		auto halfRect = r(_leftWidth);
+		halfRect.setLeft(halfRect.center().x());
 		pathRect.addRect(halfRect);
 
-		p.fillPath(pathRound + pathRect, st::windowBgOver);
+		p.fillPath(pathRound(_leftWidth) + pathRect, st::windowBgOver);
 
 		_leftPixmap = std::move(leftPixmap);
 	}
 	{
-		auto rightPixmap = pixmap;
+		auto rightPixmap = pixmap(_rightWidth);
 		auto p = QPainter(&rightPixmap);
 		PainterHighQualityEnabler hq(p);
 		auto pathRect = QPainterPath();
-		auto halfRect = r;
-		halfRect.setRight(r.center().x());
+		auto halfRect = r(_rightWidth);
+		halfRect.setRight(halfRect.center().x());
 		pathRect.addRect(halfRect);
 
 		if (_overrideBrush) {
-			p.fillPath(pathRound + pathRect, *_overrideBrush);
+			p.fillPath(pathRound(_rightWidth) + pathRect, *_overrideBrush);
 		} else {
 			auto gradient = ComputeGradient(
 				this,
-				(_leftPixmap.width() / style::DevicePixelRatio()) + r.x(),
-				r.width());
-			p.fillPath(pathRound + pathRect, QBrush(std::move(gradient)));
+				_leftPixmap.width() / style::DevicePixelRatio(),
+				_rightWidth);
+			p.fillPath(
+				pathRound(_rightWidth) + pathRect,
+				QBrush(std::move(gradient)));
 		}
 
 		_rightPixmap = std::move(rightPixmap);
@@ -743,20 +773,25 @@ void AddBubbleRow(
 void AddLimitRow(
 		not_null<Ui::VerticalLayout*> parent,
 		QString max,
-		QString min) {
-	parent->add(object_ptr<Line>(parent, max, min), st::boxRowPadding);
+		QString min,
+		float64 ratio) {
+	parent->add(
+		object_ptr<Line>(parent, max, min, ratio),
+		st::boxRowPadding);
 }
 
 void AddLimitRow(
 		not_null<Ui::VerticalLayout*> parent,
 		int max,
 		std::optional<tr::phrase<lngtag_count>> phrase,
-		int min) {
+		int min,
+		float64 ratio) {
 	const auto factory = ProcessTextFactory(phrase);
 	AddLimitRow(
 		parent,
 		max ? factory(max) : QString(),
-		min ? factory(min) : QString());
+		min ? factory(min) : QString(),
+		ratio);
 }
 
 void AddAccountsRow(
@@ -971,7 +1006,8 @@ void ShowListBox(
 						return text(n);
 					}
 				}),
-				entry.leftNumber),
+				entry.leftNumber,
+				kLimitRowRatio),
 			st::settingsPremiumPreviewLinePadding);
 		lines.push_back(limitRow);
 	}
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.h b/Telegram/SourceFiles/ui/effects/premium_graphics.h
index 158c0d12f..de8fb6cb1 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.h
@@ -34,6 +34,8 @@ class VerticalLayout;
 
 namespace Premium {
 
+inline constexpr auto kLimitRowRatio = 0.5;
+
 void AddBubbleRow(
 	not_null<Ui::VerticalLayout*> parent,
 	rpl::producer<> showFinishes,
@@ -47,13 +49,15 @@ void AddBubbleRow(
 void AddLimitRow(
 	not_null<Ui::VerticalLayout*> parent,
 	QString max,
-	QString min = {});
+	QString min = {},
+	float64 ratio = kLimitRowRatio);
 
 void AddLimitRow(
 	not_null<Ui::VerticalLayout*> parent,
 	int max,
 	std::optional<tr::phrase<lngtag_count>> phrase,
-	int min = 0);
+	int min = 0,
+	float64 ratio = kLimitRowRatio);
 
 struct AccountsRowArgs final {
 	std::shared_ptr<Ui::RadiobuttonGroup> group;

From 292e5bc3f7af8e54a676ed0389d104b2cdd71667 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 12:10:24 +0400
Subject: [PATCH 020/676] Improve filters save-on-demand.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../boxes/filters/edit_filter_box.cpp         | 68 ++++++++++++-------
 .../SourceFiles/data/data_chat_filters.cpp    | 46 +++++++++++--
 Telegram/SourceFiles/data/data_chat_filters.h |  6 ++
 .../SourceFiles/settings/settings_folders.cpp | 46 +++++++++++--
 5 files changed, 129 insertions(+), 38 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 750f0c087..771f951f9 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3560,6 +3560,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_menu_add" = "Add to folder";
 "lng_filters_toast_add" = "{chat} added to {folder} folder";
 "lng_filters_toast_remove" = "{chat} removed from {folder} folder";
+"lng_filters_shareable_status" = "shareable folder";
 
 "lng_filters_delete_sure" = "Are you sure you want to delete this folder? This will also deactivate all the invite links used to share this folder.";
 "lng_filters_link" = "Share Folder";
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 87221ff0e..5a63062c1 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -540,27 +540,18 @@ void EditFilterBox(
 			Fn<void(Data::ChatFilter)> next)> saveAnd) {
 	using namespace rpl::mappers;
 
-	const auto creating = filter.title().isEmpty();
-	box->setWidth(st::boxWideWidth);
-	box->setTitle(creating ? tr::lng_filters_new() : tr::lng_filters_edit());
-	box->setCloseByOutsideClick(false);
-
-	Data::AmPremiumValue(
-		&window->session()
-	) | rpl::start_with_next([=] {
-		box->closeBox();
-	}, box->lifetime());
-
 	struct State {
 		rpl::variable<Data::ChatFilter> rules;
 		rpl::variable<std::vector<Data::ChatFilterLink>> links;
 		rpl::variable<bool> hasLinks;
 		rpl::variable<bool> chatlist;
+		rpl::variable<bool> creating;
 	};
 	const auto owner = &window->session().data();
 	const auto state = box->lifetime().make_state<State>(State{
 		.rules = filter,
 		.chatlist = filter.chatlist(),
+		.creating = filter.title().isEmpty(),
 	});
 	state->links = owner->chatsFilters().chatlistLinks(filter.id()),
 	state->hasLinks = state->links.value() | rpl::map([=](const auto &v) {
@@ -573,6 +564,32 @@ void EditFilterBox(
 	}
 	const auto data = &state->rules;
 
+	owner->chatsFilters().isChatlistChanged(
+	) | rpl::filter([=](FilterId id) {
+		return (id == data->current().id());
+	}) | rpl::start_with_next([=](FilterId id) {
+		const auto filters = &owner->chatsFilters();
+		const auto &list = filters->list();
+		const auto i = ranges::find(list, id, &Data::ChatFilter::id);
+		if (i == end(list)) {
+			return;
+		}
+		*data = data->current().withChatlist(i->chatlist(), i->hasMyLinks());
+	}, box->lifetime());
+
+	box->setWidth(st::boxWideWidth);
+	box->setTitle(rpl::conditional(
+		state->creating.value(),
+		tr::lng_filters_new(),
+		tr::lng_filters_edit()));
+	box->setCloseByOutsideClick(false);
+
+	Data::AmPremiumValue(
+		&window->session()
+	) | rpl::start_with_next([=] {
+		box->closeBox();
+	}, box->lifetime());
+
 	const auto content = box->verticalLayout();
 	const auto name = content->add(
 		object_ptr<Ui::InputField>(
@@ -592,7 +609,12 @@ void EditFilterBox(
 
 	const auto nameEditing = box->lifetime().make_state<NameEditing>(
 		NameEditing{ name });
-	nameEditing->custom = !creating;
+
+	state->creating.value(
+	) | rpl::filter(!_1) | rpl::start_with_next([=] {
+		nameEditing->custom = true;
+	}, box->lifetime());
+
 	QObject::connect(name, &Ui::InputField::changed, [=] {
 		if (!nameEditing->settingDefault) {
 			nameEditing->custom = true;
@@ -683,14 +705,6 @@ void EditFilterBox(
 	const auto collect = [=]() -> std::optional<Data::ChatFilter> {
 		const auto title = name->getLastText().trimmed();
 		const auto rules = data->current();
-		const auto result = Data::ChatFilter(
-			rules.id(),
-			title,
-			rules.iconEmoji(),
-			rules.flags(),
-			rules.always(),
-			rules.pinned(),
-			rules.never());
 		if (title.isEmpty()) {
 			name->showError();
 			box->scrollToY(0);
@@ -704,7 +718,7 @@ void EditFilterBox(
 			window->window().showToast(tr::lng_filters_default(tr::now));
 			return {};
 		}
-		return result;
+		return rules.withTitle(title);
 	};
 
 	AddSubsectionTitle(
@@ -758,8 +772,7 @@ void EditFilterBox(
 			return;
 		}
 		saveAnd(*result, crl::guard(box, [=](Data::ChatFilter updated) {
-			box->setTitle(tr::lng_filters_edit());
-			nameEditing->custom = true;
+			state->creating = false;
 
 			// Comparison of ChatFilter-s don't take id into account!
 			data->force_assign(updated);
@@ -768,6 +781,7 @@ void EditFilterBox(
 			ExportFilterLink(id, shared, [=](Data::ChatFilterLink link) {
 				Expects(link.id == id);
 
+				*data = data->current().withChatlist(true, true);
 				window->show(ShowLinkBox(window, updated, link));
 			}, [=](QString error) {
 				if (error == u"CHATLISTS_TOO_MUCH"_q) {
@@ -826,9 +840,11 @@ void EditFilterBox(
 		}
 	};
 
-	box->addButton(
-		creating ? tr::lng_filters_create_button() : tr::lng_settings_save(),
-		save);
+	box->addButton(rpl::conditional(
+		state->creating.value(),
+		tr::lng_filters_create_button(),
+		tr::lng_settings_save()
+	), save);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index c822cc6af..26c6b6287 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -169,6 +169,27 @@ ChatFilter ChatFilter::withId(FilterId id) const {
 	return result;
 }
 
+ChatFilter ChatFilter::withTitle(const QString &title) const {
+	auto result = *this;
+	result._title = title;
+	return result;
+}
+
+ChatFilter ChatFilter::withChatlist(bool chatlist, bool hasMyLinks) const {
+	auto result = *this;
+	if (chatlist) {
+		result._flags |= Flag::Chatlist;
+		if (hasMyLinks) {
+			result._flags |= Flag::HasMyLinks;
+		} else {
+			result._flags &= ~Flag::HasMyLinks;
+		}
+	} else {
+		result._flags &= ~(Flag::Chatlist | Flag::HasMyLinks);
+	}
+	return result;
+}
+
 MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	auto always = _always;
 	auto pinned = QVector<MTPInputPeer>();
@@ -582,16 +603,22 @@ void ChatFilters::applyRemove(int position) {
 bool ChatFilters::applyChange(ChatFilter &filter, ChatFilter &&updated) {
 	Expects(filter.id() == updated.id());
 
+	using Flag = ChatFilter::Flag;
+
 	const auto id = filter.id();
 	const auto exceptionsChanged = filter.always() != updated.always();
+	const auto rulesMask = ~(Flag::Chatlist | Flag::HasMyLinks);
 	const auto rulesChanged = exceptionsChanged
-		|| (filter.flags() != updated.flags())
+		|| ((filter.flags() & rulesMask) != (updated.flags() & rulesMask))
 		|| (filter.never() != updated.never());
 	const auto pinnedChanged = (filter.pinned() != updated.pinned());
-	if (!rulesChanged
-		&& !pinnedChanged
-		&& filter.title() == updated.title()
-		&& filter.iconEmoji() == updated.iconEmoji()) {
+	const auto chatlistChanged = (filter.chatlist() != updated.chatlist())
+		|| (filter.hasMyLinks() != updated.hasMyLinks());
+	const auto listUpdated = rulesChanged
+		|| pinnedChanged
+		|| (filter.title() != updated.title())
+		|| (filter.iconEmoji() != updated.iconEmoji());
+	if (!listUpdated && !chatlistChanged) {
 		return false;
 	}
 	if (rulesChanged) {
@@ -630,7 +657,10 @@ bool ChatFilters::applyChange(ChatFilter &filter, ChatFilter &&updated) {
 		const auto filterList = _owner->chatsFilters().chatsList(id);
 		filterList->pinned()->applyList(filter.pinned());
 	}
-	return true;
+	if (chatlistChanged) {
+		_isChatlistChanged.fire_copy(id);
+	}
+	return listUpdated;
 }
 
 bool ChatFilters::applyOrder(const QVector<MTPint> &order) {
@@ -767,6 +797,10 @@ rpl::producer<> ChatFilters::changed() const {
 	return _listChanged.events();
 }
 
+rpl::producer<FilterId> ChatFilters::isChatlistChanged() const {
+	return _isChatlistChanged.events();
+}
+
 bool ChatFilters::loadNextExceptions(bool chatsListLoaded) {
 	if (_exceptionsLoadRequestId) {
 		return true;
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index 6dc5e6384..987d55ebe 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -54,6 +54,10 @@ public:
 		base::flat_set<not_null<History*>> never);
 
 	[[nodiscard]] ChatFilter withId(FilterId id) const;
+	[[nodiscard]] ChatFilter withTitle(const QString &title) const;
+	[[nodiscard]] ChatFilter withChatlist(
+		bool chatlist,
+		bool hasMyLinks) const;
 
 	[[nodiscard]] static ChatFilter FromTL(
 		const MTPDialogFilter &data,
@@ -126,6 +130,7 @@ public:
 	void moveAllToFront();
 	[[nodiscard]] const std::vector<ChatFilter> &list() const;
 	[[nodiscard]] rpl::producer<> changed() const;
+	[[nodiscard]] rpl::producer<FilterId> isChatlistChanged() const;
 	[[nodiscard]] bool loaded() const;
 	[[nodiscard]] bool has() const;
 
@@ -195,6 +200,7 @@ private:
 	std::vector<ChatFilter> _list;
 	base::flat_map<FilterId, std::unique_ptr<Dialogs::MainList>> _chatsLists;
 	rpl::event_stream<> _listChanged;
+	rpl::event_stream<FilterId> _isChatlistChanged;
 	mtpRequestId _loadRequestId = 0;
 	mtpRequestId _saveOrderRequestId = 0;
 	mtpRequestId _saveOrderAfterId = 0;
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index dd3d35784..6e479d58f 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -159,7 +159,9 @@ struct FilterRow {
 		? tr::lng_filters_chats_count(tr::now, lt_count_short, count)
 		: tr::lng_filters_no_chats(tr::now);
 	return filter.chatlist()
-		? result + QString::fromUtf8(" \xE2\x80\xA2 shareable folder")
+		? (result
+			+ QString::fromUtf8(" \xE2\x80\xA2 ")
+			+ tr::lng_filters_shareable_status(tr::now))
 		: result;
 }
 
@@ -468,9 +470,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			const auto saveAnd = [=](
 					const Data::ChatFilter &data,
 					Fn<void(Data::ChatFilter)> next) {
-				const auto found = find(button);
-				found->filter = data;
-				button->updateData(data);
+				doneCallback(data);
 				state->save(button, next);
 			};
 			controller->window().show(Box(
@@ -526,6 +526,21 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		}
 	}
 
+	session->data().chatsFilters().isChatlistChanged(
+	) | rpl::start_with_next([=](FilterId id) {
+		const auto filters = &session->data().chatsFilters();
+		const auto &list = filters->list();
+		const auto i = ranges::find(list, id, &Data::ChatFilter::id);
+		const auto j = ranges::find(state->rows, id, [](const auto &row) {
+			return row.filter.id();
+		});
+		if (i == end(list) || j == end(state->rows)) {
+			return;
+		}
+		j->filter = j->filter.withChatlist(i->chatlist(), i->hasMyLinks());
+		j->button->updateCount(j->filter);
+	}, container->lifetime());
+
 	AddButton(
 		container,
 		tr::lng_filters_create(),
@@ -535,13 +550,20 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		if (showLimitReached()) {
 			return;
 		}
+		const auto created = std::make_shared<FilterRowButton*>(nullptr);
 		const auto doneCallback = [=](const Data::ChatFilter &result) {
-			addFilter(result);
+			if (const auto button = *created) {
+				find(button)->filter = result;
+				button->updateData(result);
+			} else {
+				*created = addFilter(result);
+			}
 		};
 		const auto saveAnd = [=](
 				const Data::ChatFilter &data,
 				Fn<void(Data::ChatFilter)> next) {
-			state->save(addFilter(data), next);
+			doneCallback(data);
+			state->save(*created, next);
 		};
 		controller->window().show(Box(
 			EditFilterBox,
@@ -715,6 +737,18 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			}
 			order.insert(order.begin() + position, FilterId(0));
 		}
+		if (next) {
+			// We're not closing the layer yet, so delete removed rows.
+			for (auto i = state->rows.begin(); i != state->rows.end();) {
+				if (i->removed) {
+					const auto button = i->button;
+					i = state->rows.erase(i);
+					delete button;
+				} else {
+					++i;
+				}
+			}
+		}
 		crl::on_main(session, [
 			session,
 			next,

From e351ad1f3d0b27702e8dea7e1c74f92e9ac104b9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 12:52:07 +0400
Subject: [PATCH 021/676] Show only channels in suggest-leave box.

---
 Telegram/Resources/langs/lang.strings          |  2 +-
 .../SourceFiles/settings/settings_folders.cpp  | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 771f951f9..d2638a2ef 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3614,7 +3614,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_by_link_select" = "Select All";
 "lng_filters_by_link_deselect" = "Deselect All";
 "lng_filters_by_link_about_quit" = "You can deselect the chats you don't want to quit.";
-"lng_filters_by_link_remove_button" = "Remove Folder";
+"lng_filters_by_link_remove_button" = "Remove Folder and Keep Chats";
 "lng_filters_by_link_quit_button" = "Remove Folder and Chats";
 "lng_filters_added_title" = "Folder {folder} Added";
 "lng_filters_added_also#one" = "You also joined {count} chat.";
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 6e479d58f..f6c83ce78 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -165,6 +165,14 @@ struct FilterRow {
 		: result;
 }
 
+[[nodiscard]] std::vector<not_null<PeerData*>> ExtractSuggestRemoving(
+		const base::flat_set<not_null<History*>> &histories) {
+	return histories | ranges::views::filter([](
+			not_null<History*> history) {
+		return history->peer->isChannel();
+	}) | ranges::views::transform(&History::peer) | ranges::to_vector;
+}
+
 FilterRowButton::FilterRowButton(
 	not_null<QWidget*> parent,
 	not_null<Main::Session*> session,
@@ -370,10 +378,12 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	};
 	const auto markForRemovalSure = [=](not_null<FilterRowButton*> button) {
 		const auto row = find(button);
+		auto suggestRemoving = row->filter.chatlist()
+			? ExtractSuggestRemoving(row->filter.always())
+			: std::vector<not_null<PeerData*>>();
 		if (row->removed || row->removePeersRequestId > 0) {
 			return;
-		} else if (row->filter.chatlist()
-			&& !row->filter.always().empty()) {
+		} else if (!suggestRemoving.empty()) {
 			const auto chosen = crl::guard(button, [=](
 					std::vector<not_null<PeerData*>> peers) {
 				const auto row = find(button);
@@ -385,9 +395,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				controller,
 				row->filter.title(),
 				row->filter.iconEmoji(),
-				row->filter.always() | ranges::views::transform(
-					&History::peer
-				) | ranges::to_vector,
+				std::move(suggestRemoving),
 				row->suggestRemovePeers,
 				chosen);
 		} else {

From 6f4eef035d3ad6ea04aa20926647180c1b3e7eab Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 12:54:15 +0400
Subject: [PATCH 022/676] Don't jump in filters list on list change.

---
 Telegram/SourceFiles/window/window_filters_menu.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 9f4be6954..6e7f07301 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -235,11 +235,6 @@ void FiltersMenu::refresh() {
 	// After the filters are refreshed, the scroll is reset,
 	// so we have to restore it.
 	_scroll.scrollToY(oldTop);
-	const auto i = _filters.find(_activeFilterId);
-	const auto button = ((i != end(_filters)) ? i->second.get() : nullptr);
-	if (button) {
-		scrollToButton(button);
-	}
 }
 
 void FiltersMenu::setupList() {

From 1a1fa5db3e81b4dd31ddf0c768206f2829a0e3e2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 15:06:41 +0400
Subject: [PATCH 023/676] Implement complex filter delete from context menu.

---
 Telegram/SourceFiles/api/api_chat_filters.cpp |  12 +++
 Telegram/SourceFiles/api/api_chat_filters.h   |   7 ++
 .../SourceFiles/settings/settings_folders.cpp |  12 +--
 .../window/window_filters_menu.cpp            | 100 +++++++++++++++---
 .../SourceFiles/window/window_filters_menu.h  |   5 +-
 5 files changed, 112 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 8e1f44329..5729d38b6 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat_filters.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
+#include "history/history.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
@@ -828,4 +829,15 @@ void ProcessFilterRemove(
 		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
+[[nodiscard]] std::vector<not_null<PeerData*>> ExtractSuggestRemoving(
+		const Data::ChatFilter &filter) {
+	if (!filter.chatlist()) {
+		return {};
+	}
+	return filter.always() | ranges::views::filter([](
+		not_null<History*> history) {
+		return history->peer->isChannel();
+	}) | ranges::views::transform(&History::peer) | ranges::to_vector;
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_filters.h b/Telegram/SourceFiles/api/api_chat_filters.h
index c9d7e6732..9167a41db 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.h
+++ b/Telegram/SourceFiles/api/api_chat_filters.h
@@ -15,6 +15,10 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace Data {
+class ChatFilter;
+} // namespace Data
+
 namespace Api {
 
 void SaveNewFilterPinned(
@@ -38,4 +42,7 @@ void ProcessFilterRemove(
 	std::vector<not_null<PeerData*>> suggest,
 	Fn<void(std::vector<not_null<PeerData*>>)> done);
 
+[[nodiscard]] std::vector<not_null<PeerData*>> ExtractSuggestRemoving(
+	const Data::ChatFilter &filter);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index f6c83ce78..5511e62c6 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -165,14 +165,6 @@ struct FilterRow {
 		: result;
 }
 
-[[nodiscard]] std::vector<not_null<PeerData*>> ExtractSuggestRemoving(
-		const base::flat_set<not_null<History*>> &histories) {
-	return histories | ranges::views::filter([](
-			not_null<History*> history) {
-		return history->peer->isChannel();
-	}) | ranges::views::transform(&History::peer) | ranges::to_vector;
-}
-
 FilterRowButton::FilterRowButton(
 	not_null<QWidget*> parent,
 	not_null<Main::Session*> session,
@@ -378,9 +370,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	};
 	const auto markForRemovalSure = [=](not_null<FilterRowButton*> button) {
 		const auto row = find(button);
-		auto suggestRemoving = row->filter.chatlist()
-			? ExtractSuggestRemoving(row->filter.always())
-			: std::vector<not_null<PeerData*>>();
+		auto suggestRemoving = Api::ExtractSuggestRemoving(row->filter);
 		if (row->removed || row->removePeersRequestId > 0) {
 			return;
 		} else if (!suggestRemoving.empty()) {
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 6e7f07301..251742be7 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "styles/style_widgets.h"
 #include "styles/style_window.h"
+#include "styles/style_layers.h" // attentionBoxButton
 #include "styles/style_menu_icons.h"
 
 namespace Window {
@@ -406,23 +407,98 @@ void FiltersMenu::showEditBox(FilterId id) {
 }
 
 void FiltersMenu::showRemoveBox(FilterId id) {
-	_session->window().show(Ui::MakeConfirmBox({
-		.text = tr::lng_filters_remove_sure(),
-		.confirmed = [=](Fn<void()> &&close) { close(); remove(id); },
-		.confirmText = tr::lng_filters_remove_yes(),
-	}));
+	const auto session = &_session->session();
+	const auto &list = session->data().chatsFilters().list();
+	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
+	const auto filter = (i != end(list)) ? *i : Data::ChatFilter();
+	const auto has = filter.hasMyLinks();
+	const auto confirm = [=](Fn<void()> action, bool onlyWhenHas = false) {
+		if (!has && onlyWhenHas) {
+			action();
+			return;
+		}
+		_session->window().show(Ui::MakeConfirmBox({
+			.text = (has
+				? tr::lng_filters_delete_sure()
+				: tr::lng_filters_remove_sure()),
+			.confirmed = [=](Fn<void()> &&close) { close(); action(); },
+			.confirmText = (has
+				? tr::lng_box_delete()
+				: tr::lng_filters_remove_yes()),
+			.confirmStyle = &st::attentionBoxButton,
+		}));
+	};
+	const auto simple = [=] {
+		confirm([=] { remove(id); });
+	};
+	const auto suggestRemoving = Api::ExtractSuggestRemoving(filter);
+	if (suggestRemoving.empty()) {
+		simple();
+		return;
+	} else if (_removingRequestId) {
+		if (_removingId == id) {
+			return;
+		}
+		session->api().request(_removingRequestId).cancel();
+	}
+	_removingId = id;
+	_removingRequestId = session->api().request(
+		MTPchatlists_GetLeaveChatlistSuggestions(
+			MTP_inputChatlistDialogFilter(
+				MTP_int(id)))
+	).done(crl::guard(&_outer, [=](const MTPVector<MTPPeer> &result) {
+		_removingRequestId = 0;
+		const auto suggestRemovePeers = ranges::views::all(
+			result.v
+		) | ranges::views::transform([=](const MTPPeer &peer) {
+			return session->data().peer(peerFromMTP(peer));
+		}) | ranges::to_vector;
+		const auto chosen = crl::guard(&_outer, [=](
+				std::vector<not_null<PeerData*>> peers) {
+			remove(id, std::move(peers));
+		});
+		confirm(crl::guard(&_outer, [=] {
+			Api::ProcessFilterRemove(
+				_session,
+				filter.title(),
+				filter.iconEmoji(),
+				suggestRemoving,
+				suggestRemovePeers,
+				chosen);
+		}), true);
+	})).fail(crl::guard(&_outer, [=] {
+		_removingRequestId = 0;
+		simple();
+	})).send();
 }
 
-void FiltersMenu::remove(FilterId id) {
-	_session->session().data().chatsFilters().apply(MTP_updateDialogFilter(
+void FiltersMenu::remove(
+		FilterId id,
+		std::vector<not_null<PeerData*>> leave) {
+	const auto session = &_session->session();
+	const auto api = &session->api();
+	session->data().chatsFilters().apply(MTP_updateDialogFilter(
 		MTP_flags(MTPDupdateDialogFilter::Flag(0)),
 		MTP_int(id),
 		MTPDialogFilter()));
-	_session->session().api().request(MTPmessages_UpdateDialogFilter(
-		MTP_flags(MTPmessages_UpdateDialogFilter::Flag(0)),
-		MTP_int(id),
-		MTPDialogFilter()
-	)).send();
+	if (leave.empty()) {
+		api->request(MTPmessages_UpdateDialogFilter(
+			MTP_flags(MTPmessages_UpdateDialogFilter::Flag(0)),
+			MTP_int(id),
+			MTPDialogFilter()
+		)).send();
+	} else {
+		api->request(MTPchatlists_LeaveChatlist(
+			MTP_inputChatlistDialogFilter(MTP_int(id)),
+			MTP_vector<MTPInputPeer>(ranges::views::all(
+				leave
+			) | ranges::views::transform([](not_null<PeerData*> peer) {
+				return MTPInputPeer(peer->input);
+			}) | ranges::to<QVector>())
+		)).done([=](const MTPUpdates &result) {
+			api->applyUpdates(result);
+		}).send();
+	}
 }
 
 void FiltersMenu::applyReorder(
diff --git a/Telegram/SourceFiles/window/window_filters_menu.h b/Telegram/SourceFiles/window/window_filters_menu.h
index dcc1efb7b..a4084164b 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.h
+++ b/Telegram/SourceFiles/window/window_filters_menu.h
@@ -50,7 +50,7 @@ private:
 	void showMenu(QPoint position, FilterId id);
 	void showEditBox(FilterId id);
 	void showRemoveBox(FilterId id);
-	void remove(FilterId id);
+	void remove(FilterId id, std::vector<not_null<PeerData*>> leave = {});
 	void scrollToButton(not_null<Ui::RpWidget*> widget);
 
 	const not_null<SessionController*> _session;
@@ -68,6 +68,9 @@ private:
 	bool _ignoreRefresh = false;
 	bool _waitingSuggested = false;
 
+	FilterId _removingId = 0;
+	mtpRequestId _removingRequestId = 0;
+
 	base::unique_qptr<Ui::PopupMenu> _popupMenu;
 	struct {
 		base::Timer timer;

From 959348f8cdc048e9571eebfc39e6a1954da70f5b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 15:36:28 +0400
Subject: [PATCH 024/676] Improve error messages for shareable folders.

---
 Telegram/Resources/langs/lang.strings                  |  1 +
 Telegram/SourceFiles/api/api_chat_filters.cpp          |  7 +++++--
 Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp | 10 ++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d2638a2ef..1d0fa7374 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3592,6 +3592,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_link_name_it" = "Name Link";
 "lng_filters_link_delete_sure" = "Are you sure you want to delete this link?";
 "lng_filters_link_qr_about" = "Everyone on Telegram can scan this code to add this folder and join the chats included in this invite link.";
+"lng_filters_link_group_admin_error" = "One of the groups in this folder can’t be added because one of its admins has too many groups and channels.";
 "lng_filters_by_link_title" = "Add Folder";
 "lng_filters_by_link_sure" = "Do you want to add a new chat folder {folder} and join its groups and channels?";
 "lng_filters_by_link_join#one" = "{count} chat to join";
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 5729d38b6..2a8e3eaf3 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -488,16 +488,19 @@ void ShowImportError(
 	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
 	const auto count = added
 		+ ((i != end(list)) ? int(i->always().size()) : 0);
-	if (error == u"USER_CHANNELS_TOO_MUCH"_q) {
+	if (error == u"CHANNELS_TOO_MUCH"_q) {
 		window->show(Box(ChannelsLimitBox, session));
 	} else if (error == u"FILTER_INCLUDE_TOO_MUCH"_q) {
 		window->show(Box(FilterChatsLimitBox, session, count));
 	} else if (error == u"CHATLISTS_TOO_MUCH"_q) {
 		window->show(Box(ShareableFiltersLimitBox, session));
 	} else {
+		const auto text = (error == u"INVITE_SLUG_EXPIRED"_q)
+			? tr::lng_group_invite_bad_link(tr::now)
+			: error;
 		Ui::ShowMultilineToast({
 			.parentOverride = Window::Show(window).toastParent(),
-			.text = { error },
+			.text = { text },
 		});
 	}
 }
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 5a63062c1..7d43dc9b6 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_options.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/wrap/slide_wrap.h"
@@ -784,19 +783,22 @@ void EditFilterBox(
 				*data = data->current().withChatlist(true, true);
 				window->show(ShowLinkBox(window, updated, link));
 			}, [=](QString error) {
+				const auto session = &window->session();
 				if (error == u"CHATLISTS_TOO_MUCH"_q) {
-					const auto session = &window->session();
 					window->show(Box(ShareableFiltersLimitBox, session));
 				} else if (error == u"INVITES_TOO_MUCH"_q) {
-					const auto session = &window->session();
 					window->show(Box(FilterLinksLimitBox, session));
+				} else if (error == u"CHANNELS_TOO_MUCH"_q) {
+					window->show(Box(ChannelsLimitBox, session));
+				} else if (error == u"USER_CHANNELS_TOO_MUCH"_q) {
+					window->showToast(
+						{ tr::lng_filters_link_group_admin_error(tr::now) });
 				} else {
 					window->show(ShowLinkBox(window, updated, { .id = id }));
 				}
 			});
 		}));
 	}, createLink->lifetime());
-
 	AddSkip(content);
 	AddDividerText(
 		content,

From 9600cc0ed5b62561612976134eba8cd4f5202b34 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 15:44:38 +0400
Subject: [PATCH 025/676] Don't suggest joining forbidden chats by link.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/api/api_chat_filters.cpp | 40 ++++++++++++++++---
 .../boxes/filters/edit_filter_links.cpp       |  7 ++++
 .../boxes/filters/edit_filter_links.h         |  7 ++++
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1d0fa7374..98ac1a7cc 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3585,6 +3585,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_link_noadmin_channel_error" = "You don't have the admin rights to share invite links to this private channel.";
 "lng_filters_link_already_group" = "you are already a member";
 "lng_filters_link_already_channel" = "you are already subscribed";
+"lng_filters_link_inaccessible" = "chat is inaccessible";
 "lng_filters_link_chats_about" = "Select groups and channels that you want everyone who adds the folder via invite link to join.";
 "lng_filters_link_no_about" = "There are no chats in this folder that you can share with others.";
 "lng_filters_link_chats_no" = "These chats cannot be shared";
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 2a8e3eaf3..c526bc519 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/premium_limits_box.h"
 #include "boxes/filters/edit_filter_links.h" // FilterChatStatusText
 #include "core/application.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_chat_filters.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
@@ -72,6 +74,7 @@ private:
 
 	ToggleAction _action = ToggleAction::Adding;
 	QString _filterTitle;
+	base::flat_set<not_null<PeerData*>> _checkable;
 	std::vector<not_null<PeerData*>> _chats;
 	std::vector<not_null<PeerData*>> _additional;
 	rpl::variable<base::flat_set<not_null<PeerData*>>> _selected;
@@ -262,20 +265,36 @@ ToggleChatsController::ToggleChatsController(
 
 void ToggleChatsController::prepare() {
 	auto selected = base::flat_set<not_null<PeerData*>>();
+	const auto disabled = [](not_null<PeerData*> peer) {
+		return peer->isChat()
+			? peer->asChat()->isForbidden()
+			: peer->isChannel()
+			? peer->asChannel()->isForbidden()
+			: false;
+	};
 	const auto add = [&](not_null<PeerData*> peer, bool additional = false) {
-		auto row = std::make_unique<PeerListRow>(peer);
+		const auto disable = disabled(peer);
+		auto row = (additional || !disable)
+			? std::make_unique<PeerListRow>(peer)
+			: MakeFilterChatRow(
+				peer,
+				tr::lng_filters_link_inaccessible(tr::now),
+				true);
 		if (delegate()->peerListFindRow(peer->id.value)) {
 			return;
 		}
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
-		if (!additional || _action == ToggleAction::Removing) {
+		if (!disable
+			&& (!additional || _action == ToggleAction::Removing)) {
+			_checkable.emplace(peer);
 			if (const auto status = FilterChatStatusText(peer)
 				; !status.isEmpty()) {
 				raw->setCustomStatus(status);
 			}
 		}
-		if (!additional) {
+		if (disable) {
+		} else if (!additional) {
 			delegate()->peerListSetRowChecked(raw, true);
 			raw->finishCheckedAnimation();
 			selected.emplace(peer);
@@ -287,11 +306,18 @@ void ToggleChatsController::prepare() {
 		}
 	};
 	for (const auto &peer : _chats) {
-		add(peer);
+		if (!disabled(peer)) {
+			add(peer);
+		}
 	}
 	for (const auto &peer : _additional) {
 		add(peer, true);
 	}
+	for (const auto &peer : _chats) {
+		if (disabled(peer)) {
+			add(peer);
+		}
+	}
 	setupAboveWidget();
 	setupBelowWidget();
 	initDesiredHeightValue();
@@ -301,6 +327,9 @@ void ToggleChatsController::prepare() {
 
 void ToggleChatsController::rowClicked(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
+	if (!_checkable.contains(peer)) {
+		return;
+	}
 	const auto checked = row->checked();
 	auto selected = _selected.current();
 	delegate()->peerListSetRowChecked(row, !checked);
@@ -341,8 +370,7 @@ void ToggleChatsController::setupAboveWidget() {
 		: _chats.empty()
 		? _additional.size()
 		: _chats.size();
-	const auto selectableCount = delegate()->peerListFullRowsCount()
-		- (_action == ToggleAction::Adding ? int(_additional.size()) : 0);
+	const auto selectableCount = int(_checkable.size());
 	auto selectedCount = _selected.value(
 	) | rpl::map([](const base::flat_set<not_null<PeerData*>> &selected) {
 		return int(selected.size());
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 5a788cb45..bd4d5a49f 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -1292,3 +1292,10 @@ void AddFilterSubtitleWithToggles(
 		link->move(outer - st::boxRowPadding.right() - width, y);
 	}, link->lifetime());
 }
+
+std::unique_ptr<PeerListRow> MakeFilterChatRow(
+		not_null<PeerData*> peer,
+		const QString &status,
+		bool disabled) {
+	return std::make_unique<ChatRow>(peer, status, disabled);
+}
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
index 802e15bea..4cc88f95c 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.h
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/object_ptr.h"
 
+class PeerListRow;
+
 namespace Ui {
 class Show;
 class BoxContent;
@@ -54,3 +56,8 @@ void AddFilterSubtitleWithToggles(
 	int selectableCount,
 	rpl::producer<int> selectedCount,
 	Fn<void(bool select)> toggle);
+
+[[nodiscard]] std::unique_ptr<PeerListRow> MakeFilterChatRow(
+	not_null<PeerData*> peer,
+	const QString &status,
+	bool disabled);

From 7c11fd58cf55fda32d43747b2aed999d28567e13 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 17:39:01 +0400
Subject: [PATCH 026/676] Make whole same-background message clickable.

---
 Telegram/Resources/langs/lang.strings                      | 5 ++---
 Telegram/SourceFiles/history/history_item.cpp              | 7 -------
 .../history/view/history_view_service_message.cpp          | 2 ++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 98ac1a7cc..e2d353ad4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1523,9 +1523,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_attach_menu_bot_allowed" = "You allowed this bot to message you when you added it in the attachment menu.";
 "lng_action_set_wallpaper_me" = "You set a new background for this chat.";
 "lng_action_set_wallpaper" = "{user} set a new background for this chat.";
-"lng_action_set_same_wallpaper_me" = "You set {background} for this chat.";
-"lng_action_set_same_wallpaper" = "{user} set {background} for this chat.";
-"lng_action_set_same_background" = "the same background";
+"lng_action_set_same_wallpaper_me" = "You set the same background for this chat.";
+"lng_action_set_same_wallpaper" = "{user} set the same background for this chat.";
 "lng_action_topic_created_inside" = "Topic created";
 "lng_action_topic_closed_inside" = "Topic closed";
 "lng_action_topic_reopened_inside" = "Topic reopened";
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 2ab72b019..0321c99a9 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -4193,21 +4193,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		if (!isSelf) {
 			result.links.push_back(peer->createOpenLink());
 		}
-		if (const auto dependent = GetServiceDependentData()) {
-			result.links.push_back(dependent->lnk);
-		}
 		result.text = isSelf
 			? tr::lng_action_set_same_wallpaper(
 				tr::now,
 				lt_user,
 				Ui::Text::Link(name, 1), // Link 1.
-				lt_background,
-				Ui::Text::Link(tr::lng_action_set_same_background(tr::now), 2),
 				Ui::Text::WithEntities)
 			: tr::lng_action_set_same_wallpaper_me(
 				tr::now,
-				lt_background,
-				Ui::Text::Link(tr::lng_action_set_same_background(tr::now), 1),
 				Ui::Text::WithEntities);
 		return result;
 	};
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index 2697ad7c4..0c45ddaf8 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -652,6 +652,8 @@ TextState Service::textState(QPoint point, StateRequest request) const {
 				if (TTLMenu::TTLValidator(nullptr, history()->peer).can()) {
 					result.link = ttl->link;
 				}
+			} else if (const auto same = item->Get<HistoryServiceSameBackground>()) {
+				result.link = same->lnk;
 			}
 		}
 	} else if (media) {

From 90cea58d28b12616ff78dd71cdadc88bb6e298a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Apr 2023 17:39:13 +0400
Subject: [PATCH 027/676] Closed alpha version 4.7.1.1.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 5ed2e5918..c8ec143d9 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.7.1.0" />
+    Version="4.7.1.1" />
   <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 7d67f211f..151346410 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,7,1,0
- PRODUCTVERSION 4,7,1,0
+ FILEVERSION 4,7,1,1
+ PRODUCTVERSION 4,7,1,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.7.1.0"
+            VALUE "FileVersion", "4.7.1.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.0"
+            VALUE "ProductVersion", "4.7.1.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 38757ce7c..02800b8df 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,7,1,0
- PRODUCTVERSION 4,7,1,0
+ FILEVERSION 4,7,1,1
+ PRODUCTVERSION 4,7,1,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.7.1.0"
+            VALUE "FileVersion", "4.7.1.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.0"
+            VALUE "ProductVersion", "4.7.1.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index ea4c9d849..82f90a197 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4007001001ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index e352a3c85..aa8fdb769 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.7
 AppVersionStrSmall 4.7.1
 AppVersionStr      4.7.1
 BetaChannel        0
-AlphaVersion       0
-AppVersionOriginal 4.7.1
+AlphaVersion       4007001001
+AppVersionOriginal 4.7.1.1

From 127bafa25494b26c90a635be48da1312cfd0b173 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 5 Apr 2023 20:27:11 +0300
Subject: [PATCH 028/676] Fixed closing of main menu on activate account in
 separated window.

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

diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index e8970637f..3ecd1ba5a 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -676,8 +676,7 @@ void SetupAccountsWrap(
 			state->menu);
 		addAction(tr::lng_context_new_window(tr::now), [=] {
 			Ui::PreventDelayedActivation();
-			Core::App().ensureSeparateWindowForAccount(account);
-			Core::App().domain().maybeActivate(account);
+			callback(Qt::ControlModifier);
 		}, &st::menuIconNewWindow);
 		Window::AddSeparatorAndShiftUp(addAction);
 
@@ -894,16 +893,18 @@ void AccountsList::rebuild() {
 				auto activate = [=, guard = _accountSwitchGuard.make_guard()]{
 					if (guard) {
 						_reorder->finishReordering();
-						if (newWindow) {
-							Core::App().ensureSeparateWindowForAccount(
-								account);
-						}
-						Core::App().domain().maybeActivate(account);
 					}
+					if (newWindow) {
+						Core::App().ensureSeparateWindowForAccount(
+							account);
+					}
+					Core::App().domain().maybeActivate(account);
 				};
 				if (Core::App().separateWindowForAccount(account)) {
+					_currentAccountActivations.fire({});
 					activate();
 				} else {
+					_currentAccountActivations.fire({});
 					base::call_delayed(
 						st::defaultRippleAnimation.hideDuration,
 						account,

From cda4bca1905dc07ab9a1d93e6fb4ca0fc524caff Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 5 Apr 2023 22:47:59 +0300
Subject: [PATCH 029/676] Added support of left edge to corner tail of bubble
 in premium box.

---
 .../ui/effects/premium_graphics.cpp           | 53 ++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 6c77a159b..29facc90e 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -198,6 +198,7 @@ public:
 
 	void setCounter(int value);
 	void setTailEdge(EdgeProgress edge);
+	void setFlipHorizontal(bool value);
 	void paintBubble(QPainter &p, const QRect &r, const QBrush &brush);
 
 	[[nodiscard]] rpl::producer<> widthChanges() const;
@@ -219,6 +220,7 @@ private:
 
 	int _counter = -1;
 	EdgeProgress _tailEdge = 0.;
+	bool _flipHorizontal = false;
 
 	rpl::event_stream<> _widthChanges;
 
@@ -291,6 +293,10 @@ void Bubble::setTailEdge(EdgeProgress edge) {
 	_tailEdge = std::clamp(edge, 0., 1.);
 }
 
+void Bubble::setFlipHorizontal(bool value) {
+	_flipHorizontal = value;
+}
+
 void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
 	if (_counter < 0) {
 		return;
@@ -346,7 +352,17 @@ void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
 			Qt::RoundCap,
 			Qt::RoundJoin));
 		p.setBrush(brush);
-		p.drawPath(pathTail + pathBubble);
+		if (_flipHorizontal) {
+			auto m = QTransform();
+			const auto center = bubbleRect.center();
+			m.translate(center.x(), center.y());
+			m.scale(-1., 1.);
+			m.translate(-center.x(), -center.y());
+			m.translate(-bubbleRect.left() + 1., 0);
+			p.drawPath(m.map(pathTail + pathBubble));
+		} else {
+			p.drawPath(pathTail + pathBubble);
+		}
 	}
 	p.setPen(st::activeButtonFg);
 	p.setFont(_font);
@@ -455,19 +471,40 @@ BubbleWidget::BubbleWidget(
 				- st::boxRowPadding.right()
 				- _maxBubbleWidth;
 		};
-		const auto checkBubbleEdges = [&]() -> Bubble::EdgeProgress {
+		struct LeftEdge final {
+			float64 goodPointRatio = 0.;
+			float64 bubbleLeftEdge = 0.;
+		};
+		const auto leftEdge = [&]() -> LeftEdge {
+			const auto finish = computeLeft(moveEndPoint, 1.);
+			const auto &padding = st::boxRowPadding;
+			if (finish <= padding.left()) {
+				const auto halfWidth = (_maxBubbleWidth / 2);
+				const auto goodPointRatio = float64(halfWidth)
+					/ (parent->width() - padding.left() - padding.right());
+				const auto bubbleLeftEdge = (padding.left() - finish)
+					/ (_maxBubbleWidth / 2.);
+				return { goodPointRatio, bubbleLeftEdge };
+			}
+			return {};
+		}();
+		const auto checkBubbleRightEdge = [&]() -> Bubble::EdgeProgress {
 			const auto finish = computeLeft(moveEndPoint, 1.);
 			const auto edge = computeEdge();
 			return (finish >= edge)
 				? (finish - edge) / (_maxBubbleWidth / 2.)
 				: 0.;
 		};
-		const auto bubbleEdge = checkBubbleEdges();
-		_ignoreDeflection = bubbleEdge;
+		const auto bubbleRightEdge = checkBubbleRightEdge();
+		_ignoreDeflection = bubbleRightEdge || leftEdge.goodPointRatio;
 		if (_ignoreDeflection) {
 			_stepBeforeDeflection = 1.;
 			_stepAfterDeflection = 1.;
 		}
+		const auto resultMoveEndPoint = leftEdge.goodPointRatio
+			? leftEdge.goodPointRatio
+			: moveEndPoint;
+		_bubble.setFlipHorizontal(leftEdge.bubbleLeftEdge);
 
 		_appearanceAnimation.start([=](float64 value) {
 			const auto moveProgress = std::clamp(
@@ -479,8 +516,8 @@ BubbleWidget::BubbleWidget(
 				0.,
 				1.);
 			moveToLeft(
-				computeLeft(moveEndPoint, moveProgress)
-					- (_maxBubbleWidth / 2.) * bubbleEdge,
+				computeLeft(resultMoveEndPoint, moveProgress)
+					- (_maxBubbleWidth / 2.) * bubbleRightEdge,
 				0);
 
 			const auto counter = int(0 + counterProgress * _currentCounter);
@@ -488,7 +525,9 @@ BubbleWidget::BubbleWidget(
 				_bubble.setCounter(counter);
 			// }
 
-			const auto edgeProgress = value * bubbleEdge;
+			const auto edgeProgress = (leftEdge.bubbleLeftEdge
+				? leftEdge.bubbleLeftEdge
+				: bubbleRightEdge) * value;
 			_bubble.setTailEdge(edgeProgress);
 			update();
 		},

From 2f261e6f7b696f86426c56a8d9c4ac82c827d76c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Apr 2023 13:46:06 +0400
Subject: [PATCH 030/676] A bit more error handling.

---
 .../boxes/filters/edit_filter_links.cpp        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index bd4d5a49f..cbd30e0ad 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "boxes/peers/edit_peer_invite_link.h" // InviteLinkQrBox.
 #include "boxes/peer_list_box.h"
+#include "boxes/premium_limits_box.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_chat_filters.h"
@@ -106,10 +107,19 @@ struct Errors {
 void ShowSaveError(
 		not_null<Window::SessionController*> window,
 		QString error) {
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(window).toastParent(),
-		.text = { error },
-	});
+	const auto session = &window->session();
+	if (error == u"CHATLISTS_TOO_MUCH"_q) {
+		window->show(Box(ShareableFiltersLimitBox, session));
+	} else if (error == u"INVITES_TOO_MUCH"_q) {
+		window->show(Box(FilterLinksLimitBox, session));
+	} else if (error == u"CHANNELS_TOO_MUCH"_q) {
+		window->show(Box(ChannelsLimitBox, session));
+	} else if (error == u"USER_CHANNELS_TOO_MUCH"_q) {
+		window->showToast(
+			{ tr::lng_filters_link_group_admin_error(tr::now) });
+	} else {
+		window->showToast({ error });
+	}
 }
 
 void ShowEmptyLinkError(not_null<Window::SessionController*> window) {

From b4a588a676cc44c82130a18e615117aa6b465878 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Apr 2023 14:32:38 +0400
Subject: [PATCH 031/676] Update API scheme on layer 158.

---
 Telegram/Resources/langs/lang.strings                    | 2 +-
 Telegram/Resources/tl/api.tl                             | 3 ++-
 Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e2d353ad4..c2ab227c4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3580,7 +3580,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_link_private_status" = "you can't share private chats";
 "lng_filters_link_private_error" = "Private chats can't be shared.";
 "lng_filters_link_noadmin_status" = "you can't invite others here";
-"lng_filters_link_noadmin_group_error" = "You don't have the admin rights to share invite links to this private group chat.";
+"lng_filters_link_noadmin_group_error" = "You don't have the admin rights to share invite links to this private group.";
 "lng_filters_link_noadmin_channel_error" = "You don't have the admin rights to share invite links to this private channel.";
 "lng_filters_link_already_group" = "you are already a member";
 "lng_filters_link_already_channel" = "you are already subscribed";
diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 015391c6c..a0719f510 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -617,7 +617,7 @@ keyboardButtonUrl#258aff05 text:string url:string = KeyboardButton;
 keyboardButtonCallback#35bbdb6b flags:# requires_password:flags.0?true text:string data:bytes = KeyboardButton;
 keyboardButtonRequestPhone#b16a6c29 text:string = KeyboardButton;
 keyboardButtonRequestGeoLocation#fc796b3f text:string = KeyboardButton;
-keyboardButtonSwitchInline#568a748 flags:# same_peer:flags.0?true text:string query:string = KeyboardButton;
+keyboardButtonSwitchInline#93b9fbb5 flags:# same_peer:flags.0?true text:string query:string peer_types:flags.1?Vector<InlineQueryPeerType> = KeyboardButton;
 keyboardButtonGame#50f41ccf text:string = KeyboardButton;
 keyboardButtonBuy#afd93fbb text:string = KeyboardButton;
 keyboardButtonUrlAuth#10b78d29 flags:# text:string fwd_text:flags.0?string url:string button_id:int = KeyboardButton;
@@ -1301,6 +1301,7 @@ inlineQueryPeerTypePM#833c0fac = InlineQueryPeerType;
 inlineQueryPeerTypeChat#d766c50a = InlineQueryPeerType;
 inlineQueryPeerTypeMegagroup#5ec4be43 = InlineQueryPeerType;
 inlineQueryPeerTypeBroadcast#6334ee9a = InlineQueryPeerType;
+inlineQueryPeerTypeBotPM#e3b2d0c = InlineQueryPeerType;
 
 messages.historyImport#1662af0b id:long = messages.HistoryImport;
 
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index cbd30e0ad..5c10aed50 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -1051,7 +1051,6 @@ public:
 
 private:
 	const not_null<Window::SessionController*> _controller;
-	const FilterId _id = 0;
 	InviteLinkData _data;
 
 };
@@ -1061,7 +1060,6 @@ LinkChatsController::LinkChatsController(
 	FilterId id,
 	const InviteLinkData &data)
 : _controller(controller)
-, _id(id)
 , _data(data) {
 }
 

From 004a60ded550500d54cf4a63777a6dff889a714f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Apr 2023 16:51:57 +0400
Subject: [PATCH 032/676] Fix a possible crash in folder link export.

---
 Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 7d43dc9b6..6e88d3757 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -777,12 +777,13 @@ void EditFilterBox(
 			data->force_assign(updated);
 			const auto id = updated.id();
 			state->links = owner->chatsFilters().chatlistLinks(id);
-			ExportFilterLink(id, shared, [=](Data::ChatFilterLink link) {
+			ExportFilterLink(id, shared, crl::guard(box, [=](
+					Data::ChatFilterLink link) {
 				Expects(link.id == id);
 
 				*data = data->current().withChatlist(true, true);
 				window->show(ShowLinkBox(window, updated, link));
-			}, [=](QString error) {
+			}), crl::guard(box, [=](QString error) {
 				const auto session = &window->session();
 				if (error == u"CHATLISTS_TOO_MUCH"_q) {
 					window->show(Box(ShareableFiltersLimitBox, session));
@@ -796,7 +797,7 @@ void EditFilterBox(
 				} else {
 					window->show(ShowLinkBox(window, updated, { .id = id }));
 				}
-			});
+			}));
 		}));
 	}, createLink->lifetime());
 	AddSkip(content);

From 2a06182d1ad0eb894c990dd6c34cc15d2c3d51d0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Apr 2023 09:00:34 +0400
Subject: [PATCH 033/676] Closed alpha version 4007001001: Fix build.

---
 Telegram/SourceFiles/api/api_chat_filters.cpp |  9 --
 .../boxes/filters/edit_filter_links.cpp       | 88 -------------------
 2 files changed, 97 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index c526bc519..aed167392 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -106,13 +106,6 @@ private:
 		Ui::FilterLinkHeaderType type,
 		const QString &title) {
 	using Type = Ui::FilterLinkHeaderType;
-	const auto phrase = (type == Type::AddingFilter)
-		? tr::lng_filters_by_link_sure
-		: (type == Type::AddingChats)
-		? tr::lng_filters_by_link_more_sure
-		: (type == Type::AllAdded)
-		? tr::lng_filters_by_link_already_about
-		: tr::lng_filters_by_link_remove_sure;
 	auto boldTitle = Ui::Text::Bold(title);
 	return (type == Type::AddingFilter)
 		? tr::lng_filters_by_link_sure(
@@ -194,7 +187,6 @@ void InitFilterLinkHeader(
 		const auto guard = gsl::finally([&] { state->processing = false; });
 
 		const auto top = box->scrollTop();
-		const auto height = box->scrollHeight();
 		const auto headerHeight = std::max(max - top, min);
 		const auto addedTopHeight = max - headerHeight;
 		widget->resize(widget->width(), headerHeight);
@@ -739,7 +731,6 @@ void CheckFilterInvite(
 			already = parseList(data.valready_peers());
 		});
 
-		const auto &filters = owner.chatsFilters();
 		const auto notLoaded = filterId
 			&& !ranges::contains(
 				owner.chatsFilters().list(),
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 5c10aed50..dd6c86309 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -136,37 +136,6 @@ void ChatFilterLinkBox(
 	box->setTitle(tr::lng_group_invite_edit_title());
 
 	const auto container = box->verticalLayout();
-	const auto addTitle = [&](
-			not_null<Ui::VerticalLayout*> container,
-			rpl::producer<QString> text) {
-		container->add(
-			object_ptr<Ui::FlatLabel>(
-				container,
-				std::move(text),
-				st::settingsSubsectionTitle),
-			(st::settingsSubsectionTitlePadding
-				+ style::margins(0, st::settingsSectionSkip, 0, 0)));
-	};
-	const auto addDivider = [&](
-			not_null<Ui::VerticalLayout*> container,
-			rpl::producer<QString> text,
-			style::margins margins = style::margins()) {
-		container->add(
-			object_ptr<Ui::DividerLabel>(
-				container,
-				object_ptr<Ui::FlatLabel>(
-					container,
-					std::move(text),
-					st::boxDividerLabel),
-				st::settingsDividerLabelPadding),
-			margins);
-	};
-
-	struct State {
-	};
-	const auto state = box->lifetime().make_state<State>(State{
-	});
-
 	const auto labelField = container->add(
 		object_ptr<Ui::InputField>(
 			container,
@@ -477,7 +446,6 @@ public:
 
 private:
 	void appendRow(const InviteLinkData &data);
-	bool removeRow(const QString &link);
 
 	void rebuild(const std::vector<InviteLinkData> &rows);
 
@@ -718,7 +686,6 @@ void LinkController::prepare() {
 			peer,
 			error ? error->status : FilterChatStatusText(peer),
 			error.has_value());
-		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
 		if (error) {
 			_denied.emplace(peer, error->toast);
@@ -988,14 +955,6 @@ void LinksController::appendRow(const InviteLinkData &data) {
 	delegate()->peerListAppendRow(std::make_unique<LinkRow>(this, data));
 }
 
-bool LinksController::removeRow(const QString &link) {
-	if (const auto row = delegate()->peerListFindRow(ComputeRowId(link))) {
-		delegate()->peerListRemoveRow(row);
-		return true;
-	}
-	return false;
-}
-
 void LinksController::rowUpdateRow(not_null<LinkRow*> row) {
 	delegate()->peerListUpdateRow(row);
 }
@@ -1014,7 +973,6 @@ void LinksController::rowPaintIcon(
 		}
 		Unexpected("Color in LinksController::rowPaintIcon.");
 	}();
-	const auto stroke = st::inviteLinkIconStroke;
 	auto &icon = _icons[int(color)];
 	if (icon.isNull()) {
 		icon = QImage(
@@ -1035,51 +993,6 @@ void LinksController::rowPaintIcon(
 	p.drawImage(x + skip, y + skip, icon);
 }
 
-class LinkChatsController final
-	: public PeerListController
-	, public base::has_weak_ptr {
-public:
-	LinkChatsController(
-		not_null<Window::SessionController*> controller,
-		FilterId id,
-		const InviteLinkData &data);
-	~LinkChatsController();
-
-	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
-	Main::Session &session() const override;
-
-private:
-	const not_null<Window::SessionController*> _controller;
-	InviteLinkData _data;
-
-};
-
-LinkChatsController::LinkChatsController(
-	not_null<Window::SessionController*> controller,
-	FilterId id,
-	const InviteLinkData &data)
-: _controller(controller)
-, _data(data) {
-}
-
-LinkChatsController::~LinkChatsController() = default;
-
-void LinkChatsController::prepare() {
-	for (const auto &history : _data.chats) {
-		delegate()->peerListAppendRow(
-			std::make_unique<PeerListRow>(history->peer));
-	}
-	delegate()->peerListRefreshRows();
-}
-
-void LinkChatsController::rowClicked(not_null<PeerListRow*> row) {
-}
-
-Main::Session &LinkChatsController::session() const {
-	return _controller->session();
-}
-
 } // namespace
 
 std::vector<not_null<PeerData*>> CollectFilterLinkChats(
@@ -1157,7 +1070,6 @@ void EditLinkChats(
 		MTPstring(), // title
 		MTP_vector<MTPInputPeer>(std::move(mtpPeers))
 	)).done([=](const MTPExportedChatlistInvite &result) {
-		const auto &data = result.data();
 		const auto link = session->data().chatsFilters().add(id, result);
 		done(QString());
 	}).fail([=](const MTP::Error &error) {

From c3f20c59b59a27c89b06338e1aeacd357e1b9c1f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Apr 2023 15:16:25 +0400
Subject: [PATCH 034/676] Update API scheme on layer 158.

---
 Telegram/Resources/tl/api.tl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index a0719f510..6a606b743 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -197,7 +197,7 @@ messageActionTopicEdit#c0944820 flags:# title:flags.0?string icon_emoji_id:flags
 messageActionSuggestProfilePhoto#57de635e photo:Photo = MessageAction;
 messageActionRequestedPeer#fe77345d button_id:int peer:Peer = MessageAction;
 messageActionSetChatWallPaper#bc44a927 wallpaper:WallPaper = MessageAction;
-messageActionSetSameChatWallPaper#da54583a = MessageAction;
+messageActionSetSameChatWallPaper#c0787d6d wallpaper:WallPaper = MessageAction;
 
 dialog#d58a08c6 flags:# pinned:flags.2?true unread_mark:flags.3?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int ttl_period:flags.5?int = Dialog;
 dialogFolder#71bd134c flags:# pinned:flags.2?true folder:Folder peer:Peer top_message:int unread_muted_peers_count:int unread_unmuted_peers_count:int unread_muted_messages_count:int unread_unmuted_messages_count:int = Dialog;
@@ -1879,7 +1879,7 @@ messages.searchCustomEmoji#2c11c0d7 emoticon:string hash:long = EmojiList;
 messages.togglePeerTranslations#e47cb579 flags:# disabled:flags.0?true peer:InputPeer = Bool;
 messages.getBotApp#34fdc5c3 app:InputBotApp hash:long = messages.BotApp;
 messages.requestAppWebView#8c5a3b3c flags:# write_allowed:flags.0?true peer:InputPeer app:InputBotApp start_param:flags.1?string theme_params:flags.2?DataJSON platform:string = AppWebViewResult;
-messages.setChatWallPaper#dbaaba25 flags:# peer:InputPeer wallpaper:flags.0?InputWallPaper settings:flags.0?WallPaperSettings id:flags.1?int = Updates;
+messages.setChatWallPaper#8ffacae1 flags:# peer:InputPeer wallpaper:flags.0?InputWallPaper settings:flags.2?WallPaperSettings id:flags.1?int = Updates;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#25939651 flags:# pts:int pts_total_limit:flags.0?int date:int qts:int = updates.Difference;

From e3f2dcec22d9ddc60381eac21362fc1b03d288c6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Apr 2023 15:17:24 +0400
Subject: [PATCH 035/676] Fix userpic glitch in folder chats lists.

---
 Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp | 7 +++----
 Telegram/SourceFiles/ui/effects/round_checkbox.cpp       | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index dd6c86309..161093867 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -356,16 +356,15 @@ PaintRoundImageCallback ChatRow::generatePaintUserpicCallback(
 			peer->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
 		}
 	};
+	if (!_disabled) {
+		return paint;
+	}
 	return [=](
 			Painter &p,
 			int x,
 			int y,
 			int outerWidth,
 			int size) mutable {
-		if (!_disabled) {
-			paint(p, x, y, outerWidth, size);
-			return;
-		}
 		const auto wide = size + style::ConvertScale(3);
 		const auto full = QSize(wide, wide) * style::DevicePixelRatio();
 		auto repaint = false;
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index 02158cef6..74c51e144 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -429,6 +429,7 @@ void RoundImageCheckbox::setChecked(bool newChecked, anim::type animated) {
 	if (!changed) {
 		if (animated == anim::type::instant) {
 			_selection.stop();
+			_wideCache = QPixmap();
 		}
 		return;
 	}
@@ -451,6 +452,7 @@ void RoundImageCheckbox::setChecked(bool newChecked, anim::type animated) {
 			anim::bumpy(1.25));
 	} else {
 		_selection.stop();
+		_wideCache = QPixmap();
 	}
 }
 

From 42c96b4c7fd03c722068e911382a82cc6fcb4507 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Apr 2023 18:32:53 +0400
Subject: [PATCH 036/676] Edit media captions in message field.

---
 Telegram/Resources/icons/chat/input_draw.png  | Bin 0 -> 953 bytes
 .../Resources/icons/chat/input_draw@2x.png    | Bin 0 -> 1865 bytes
 .../Resources/icons/chat/input_draw@3x.png    | Bin 0 -> 2767 bytes
 .../Resources/icons/chat/input_replace.png    | Bin 0 -> 749 bytes
 .../Resources/icons/chat/input_replace@2x.png | Bin 0 -> 1390 bytes
 .../Resources/icons/chat/input_replace@3x.png | Bin 0 -> 1931 bytes
 .../SourceFiles/boxes/edit_caption_box.cpp    | 331 +++++++++++-------
 Telegram/SourceFiles/boxes/edit_caption_box.h |  24 ++
 .../SourceFiles/history/history_widget.cpp    | 114 +++++-
 Telegram/SourceFiles/history/history_widget.h |   7 +
 Telegram/SourceFiles/ui/chat/chat.style       |   9 +
 11 files changed, 355 insertions(+), 130 deletions(-)
 create mode 100644 Telegram/Resources/icons/chat/input_draw.png
 create mode 100644 Telegram/Resources/icons/chat/input_draw@2x.png
 create mode 100644 Telegram/Resources/icons/chat/input_draw@3x.png
 create mode 100644 Telegram/Resources/icons/chat/input_replace.png
 create mode 100644 Telegram/Resources/icons/chat/input_replace@2x.png
 create mode 100644 Telegram/Resources/icons/chat/input_replace@3x.png

diff --git a/Telegram/Resources/icons/chat/input_draw.png b/Telegram/Resources/icons/chat/input_draw.png
new file mode 100644
index 0000000000000000000000000000000000000000..37f5c854c2d3b9223f900399c58cc710f7f0caf3
GIT binary patch
literal 953
zcmV;q14jIbP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR917@z|H1ONa40RR917ytkO0OB=utpET6BS}O-R5%f>R7pr`Q5e3>Wf`Rs
z4WusG*dojzl<1XE5mFElB+(`asZEQ*T~rI9s8vCWre%UetqcN#hD8!IY%H`SGol$A
zq?88jvy*x6DP6t0IQRVDKTn5Y{?ixtr=66Plz(4eVPRorX6F6<{qgbf=H{l=Y7GX1
zf2z=6T3Xt`z`*tOH56`cZnn0zR##VDE>|EB0OE8yySlpK<Kt;HiY_TBfoCWzEG)?7
z^0>H2yl_xkTf4Eb0WM5aiX5`2sOakIYJY#fyu6&l;1bo<)t#N4T#QBK=jS8-!^1<N
zP{@LrnwlE;Z)$2{gX9j!{r&wzLqmCac@gf)%F5Z<SwTTT1p2xyFE1k()R@B2iRb6%
zySuyF+uMhS2dPvV5~!@Kgmg<w3+}0@sdaUAJRUE^V3?|^Dzn+F(P#)sPQ(He>+9=$
zK0hNP<Mi}&e0)5_nwgn7IXNLh^YimCy12MV$lqsncDBReI668K2n67!r>9?DUXG5A
zCW5H1uQ!=YL<e!=LQaCP&!nUz_z;OiN~O}{@gyW97>!26H8C*}67zb!eSLjI0WB{s
zE@n5LZD@9O_Vx7@jU(XX<mCJNdqYFRw+w1&x7$@JRbpZ&z-XUduSeD$9UVk~keJVi
zd}(Q^+wF$X<KyG>^fcm+@WMAtz{khO$jAr*T3cH&>%+stVSf0JSSl(iFcf~jU#HWB
z;qSjfp+K`y9g;G74>7bQS_K%jS`D{at(F)-vU78DJ3BisFE3afG7~bH3}s$hTT4z(
zru==A&CSg|pU+~kkV>HzZ*Ol02L~uHDu~3##>R4UbFlybv$C@OwgMD>c6WC%kho*&
z(Mp*3S@fQs9@xSJU0hs<#p0+|z!)4H{F$b<wl=6yZn4tH5uJ%;h2j|u2B=Zs-rnBS
z)D#6qCD91%8mufWEwP30P9oXf-d;8s>%P6cjilh5dI>PZPft&r7bBJ#hCyp!2z_a9
zZ!aq=%gM>XLLfSfUw3zRY+ag*9VT(XBKgkG&l?*XX*n((d6l_1Bauk(Y-1V_oy}&W
bxWCCyho^=&qnUhY00000NkvXXu0mjfH-MpS

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_draw@2x.png b/Telegram/Resources/icons/chat/input_draw@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0087392e5ef83c0b721627fbf98f66dc3cabfb56
GIT binary patch
literal 1865
zcmV-P2e$Z$P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NIvq?ljR9Fe^m{({POBBby#1eZV
zc-0tUj|CeDmPo`BRFvdF3@8{ula~+?eY1B#v7%xuh!Go>1WfGu;)5b8iVa1um)LIX
zF&N9eKXby#?CgH~6@9sI_hFei<v(X<PMZw`{(t;;AjY2^j2jaZ)3$BfR;^n7RsDSZ
z`t|SX=h34_@7}!&ruFCP7?Gc!f9TMmH*enj<MsUf`Sa$@o0~Up9ye}W{rdI)yakFl
zXwV?+`2PL7ml@u)SFc{JSh1pg`}PVF&LH%Wb?MS&+qP{(h72*`K7IOh{`~pJj~}yD
zJaKVxEn2kT^!oPg+pAZv*w|PVuBxh9yLRoeWy>lmDwG)IpiZ4SGiT1MtgO@>c>Ve{
z&;texs9U#gFwpq;_>7E<;^N|O-@d8hlP6CG4;~y$B`kWACQZ(qIirXVA3n^@&27-2
zL0HPwLWzlqD_5>$hXmxtjT_<X+LG-5<;#}^=*N#A8#Zic+_<qV6yCgBw{9m-o&;pg
znl<5RxTF#i67Jl&Bi6is|9;r8VJ?w~2@M-Ij95n$NH9l^91&~E%F258?(GlMwQJXP
z>(&(%6r`r6`b%0|9JEJ|9z*~EVX++31q&94HE-X(?cBMugXfwMfW(fT?C{~kT_PTY
zrcIkJUAmOL7sU@BKCE87+ItJJm%~Pm_vq21J;0o#<;#}~sJx4ciky6pSyEEcty{ND
zEg4_EdbL@zX12nyW5<Ne7uY<nIVr$|K5*cGmsBl{$h~&$ny7sK{Q2O)gNF|v)?`cK
ztrcZ7bm&kKefI2`_Xaw|e@)u8Ye(f0EyCO1jmVbjos_&zojM5~xfJ67q3kH}7fZK?
zd?TXrCZX-yw~wzMIdY^)mvM4(@}fnHI6IEp%{3|bzL@^;<Hw#odzvhKNLW<B8hZ2Q
z%_V~oS@^$7lazH!`GOH6Mkp(yL0(>-ED4(1J9qBfDcn(`M%BPhnKDI4<Un(!O`A3e
zUEX{5?lrk#j`<8NBh#i$v$V)8^3CiVWv7N)T3RYgrlqBs3gmv%AgZj%4QJfFdv}fS
zjT<*wDy>_$rYOl099%7zx(yZQA~Dud0|8uwf+`B&k_Js~$T9W*!Gi~)e&WOl(;3hu
z=&oG3B3!yCM|BbhdiwOKdySSYTe8nHX3QXkxVb(QQt-KR=X5<Q&0w5{(evle`Em!8
z1Rne3p#I)u&z?PE4V@YZ!UE&;g^TO->C?yJ21t~`Cai2;RC6ssv{M5I4zw`l&YdgE
z;q0E-BrtpSY>}W9+_Gg$W@aWe-$Dt0I$^>DK_gR)A3xqw%+AghE^ngS;?_)YC{5}j
zO*zBkX3d&KE%eq2LM2~olR1C>d`pS~%oRnJSh#SZ#dS={jqHtL=|{YL`7&e{Rv=n>
zJVtbP@7}F+8IYhg1?<?d!{T~RNljT<S=?i8-@dIjUA%bFTiQt_j<k{!Usj_-kkVNT
z=BZPse7bTcsxhPcl>CG%gw!XDX;o#t`}gnD1RF>J&Rt!CL8NX_1I4xQ%a<>#L2fkB
zb=<FCzd3W}?Ao=92-o$f|72&CVNkDLz0;>pi>+)@n>KAsZn$HT?Dgx{1!dK$RhC-+
z{{8h9ATsi1FKK73bYEClC|n%Ks`D0X&?((6+b$@yM^*}$JbALV03u_(j~+d$4n%Vz
zT!Jgg`vNgVpDQRN^^}wp)9^84#;^^-y?giWym|A8b5b9<=j_?DYT5q%`_a-S0+opq
zCz?1Bj4xffB)DAdI&|n@YBp-rh%6vn{KioZtL4Uy9jiCP#fukf*MX~<IFXIZ%gbfS
zoSYm>bL!No!oq0FQB+c8^jNoU-KyMZ2Dq@Sdi?ltOJ4)qYMU%Ex&}euO-Z-94of)n
zluxJGz#4wRSkf<EykHGJok+G==5+h^?P3s4<~~+a@^{DL?DTm4Kw9c2O`7B{>E_n{
z$Z_*53YCEeV#u~hTVr<A0tq>dz@Q~dmIxdN;g73L6+bQfC8ObTY2*&6cRV7QE4>d8
zT)B_myLZn=EK1h&>C?@Ig#6~d$5_zZj>V&C`YhJ(P6;<DuCf3%gwDhtRC`mBnN@K7
z6~pD0l$3}yyf0k1;NAaLgV9mY->EPuJKQxQlEZ=4uV1gli}h$T@NO=n{21WwLW`1~
zp3Z$z8%1Q;r-)XGSePn}hw9h+3^-!0@ewZ&g#ziHdak!6w@uVkepq$v*f9!lQ^j#{
zHW|Uj)PD*YEeDqZnjQ@0XAc)){tg6dEQ3M)H|YNYLSO67N<?}W00000NkvXXu0mjf
Dy`hOO

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_draw@3x.png b/Telegram/Resources/icons/chat/input_draw@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2fd682f6a02649003d7c0b142c3b3a595df9f31
GIT binary patch
literal 2767
zcmV;=3NZDFP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS_IY~r8RA>e5n{}vF%NNIw_3ZxH
zf!!U5-C`qlV2g!<-5sbPCU${}iHeAg-GSZR-QB<62hVffx^rgs+54Vz<p<CEhi{#k
z?~2)bX4UNH^Zohz^924iPauB$_{ozej~+ex?_6=T@G4^g<;$0^Sg~T(tXWf}NRcvS
zO8$)-H!fO!{P^+m<;!Q!o;`p5{MM~o2M!$AzkmO^bLSWjuMOdpR=INJNs}g>I&}&w
z|Lf(CrEc7~u}haO2@@s^r$HggiW4VJhYlTh>R#4j#=d>~cFvqRMT!&&(WFq>*>a;t
zkAC{}soBgBMvojh!e$QDKA$f#XRLAK#?z-y=lmGefByXW@ZrOppZoXkvvU5PJbCiz
z)2ILZ{NstFPMx}V@#1C5lu4U5tx*Dl%a$$c)2GkFhYxLlFpsB6lV;tzb;kE`{rdGW
zW5#gU{I0@{;w)LRv})CA)22<|zkd&u`R2`=UcGw7h!Mk$sE{yCn>OXF2U@Uu_wIW2
z>V@LXGiAy&cI?<kj~)dIpEz-1NJa-`?%lh0pvT+1d2`{yg@f|C1jLFJ3oX1TxxAY<
zZ@OfU3~a)L2~rs}v4~w18Ck)2ICvZ|rEbNF6~Q<nHP04bxNxCT<0n?HUY#mcsz}Lm
z%Y<uLv}n=z@#7ODNZ^*o6K=+g8QQ9b4IAc3!v7<<Wy_XwRrs#XojZFq^sm4Es#U92
zzkdA)63LP!^U5B6e4#>xK79C~7DjYx*s!5jH92$UJbU)667u-*<LcF`dljPL@i9Dc
z4#@H2#}6GkMEGgbrcL6+i8Yw{XVRoeiA%~Lh>jgQnxXblEFgQ7LZDy0dX*tV20K%b
znYL});wLqk{3H!vM+9MJdclGPl9`{uc>)mS%9WEs6y3LP-vDgz0k$+wO9?R&Q>ILD
z5|lS@-f!Q&DNf#a?AWoL7%X$`+qYLjBr$jHTnmSFI9jx5%a<>gLTvPqAw#TEHf-3S
z*f?gS1y-ozM9GpRl^jX*?Ag<i&oDW1<VYz2n$v}xu3fus-MUpy;o)-S%4HCt?H?kE
z0pxCoB#Ts7YK6vsP<px(@HeVOixyG{&zj^;N?>cqY;*DA#d7v<n!;8|A-!<$HrU4w
zF^CXD>C>ktlT-q)UAtDIL<un;oGe|sG?jspKw8(JL4!axQcZ=qefzc!$eumBnuZ{`
z))77*hnPx?H3PuKO`A52mPQ~<jj;HlMT?Suu@@*z)wmlXbLPyHJkq2A0|powNm&()
z#p_OC@ZiB}8q@XZpCXqoU8*pCV%xTDL0_HG8s|Ya%Y_RUq%M*y8w)vrLQ;(Du+yhc
ztLb_3=IPTu9|fWUNTN=iI)UI&Mq<W{$@7vb*wO?>n@s8q1;&j>fRQDrIf$xNt45gq
z`J;RH?h>PDws;^ol#$u9XDi_lSFT)fNXN)LB)C(jP7zegeMlhZnMIiX`9sSdmAJ^o
z+(7yM5&XE44DsT{iyS#}*ua%4RU+L}c+RALlI7bp?n6YUOPB85yLU>8pZNOqYrcH>
zY>K^(*REY#`tC1ZzEr4C!6pQ~I525XyLRn#@a4;w6~Zw63*NeQYgVF=xFEVNza~Td
zZ^42EIr>UCgo7oNq<8MzkzjL9^ZxyN1)?Y8U?aYD)~s2(cI}!!e}37rWgU>7rsx!D
zhB~ANG+4C^n;mC7KE971KdOaMz<RPNba1?Q@s1rkrVM~syLPQDim(7JlR9zYgtgYj
zVJNwc8Z`>tR`(KEz?wB{ly(SQHcPchAfQPwsRnP`2KLFkjwo!!MZv_lapR<+ckkYH
z=%tPrF+zgr2<FL?$H^#}Zs8J!4jt;g_30!x*qj!H@VXT5HYN&9xhfoe@P2s4j2UG>
zfFDmv_lw*)TefUAO(BkB77kt6ileVvx2{cQwQAKghuo}LGaER<xb~KnJ_s7|lmqqa
z*LTQkBFJ*_gPhx+Oe;mkwA(L<NTBsn`}gnfLdh=(w+%{-k+^s79?Sa$kNkg0kw}!J
z3a*iC;%JlbWF>g!%$YW@b(|o!Z{I#CMWZ=^k?8G6eY|$UpcK1(`*w2_^7%;fWvdG=
zYW&DwR&du!%8Ll&MFhp4gX5BGFw$DH=;FnTNs=TnA}RlN?%XLK!O^2f9U_5Ih<T6-
zA2&tE^W@2sQbCU%J<JTjMmZZ&4)K%wBqI~?O)LLy+_+)8morLmJ1A=;ZYtce2^{B>
zovaqdn|H`^WCVf*PeW}bggKFh+QbHDugeI77qKDLIG30O3KXE9mncypVhR6}G0Q}W
zD{K-2g_i`!c+j9hYJ^8XBp_2)BjF*iMoVO{*d`h<Ef=mTWq(q=B}I%HHOeNTX3d(C
zmzNxg2D?r8KjRpRFIEOYklOt-9g*Vw$m~pVNt#$p*fe@Vnm=0A=Mdi_D);h>0%867
z_0lGC1zRq{Zjs$G$z`Mu9z3Yk{PbtFJKL#Kr+Ts19hN*xiy_!Yc4y?~T0o{e{*`dF
z=n=6kckI}q1zA6UYK61s7szD@u3tU^ikDDsw~coC(5I<k-*eoJX#AD7fB3Elu=dFf
znK-*zo*$OMRS+`i_U+xfSFVaac9bOIOO`B=YF@v7&6zf?ibJTCiNqg=Mrx^2r5-$Z
zAca!_l5oqBt5>h$RE_FF9h4V;?EBogbK4}!ekI27L|Cc~>>o#(%z(B0hGvuP7(0t~
zH7k|jaJ8!dDT4E(9yT|I4)02G*_wGgP_He1DK<Dw2CdA6@SlW0HZnI^Q+djdFI~DM
zRX`I4_#7rsOE^b(@LRTQQHo_AAl2}7qQYR7!v&4x^3&Amiq}tc>((t07XA^A3eKHy
z%uS&&n4*$SqcRRJ>d6S&qly<I%0DpjWE{P6WgH*ndE({zOYsu%g1Q{{!lS!~+K?)|
z0>C&M%s4Ll?EWxlghgU73=5NCfOfJcBlvbv;px~aI&>n`g^_SHZ{A$lK}S~6ZU|Y7
zk-NEJ`5l;I#fnjtsY3#hKYxDrib(>gh!wld>$(>hDw0g6MvWS)R;|LhE3+V0u3YI!
zG$oc~$B}qq4=0!wxlA&oS!^UvsU0b=tQ*dpITKDpy~?t+<@W5^V{0?nRA>!M(kmM>
z%EvhpcysxdplO3s;Tyj%a4?9Tmz2ZT0k-JxAS9eq@;cXV8Mkj$s#I~WgTOU;@?^Ox
zDsI}>?j=MClAfM+kLWj%Vhm5<T<X%hrEx%&C07L<Maf~1swwdC(3%}Sd^k<dz$P=>
z(*M8WkXUhnK+4Y_B`{Sp{h20Bns7I-2^=_Zpu>Hv2L2sCsh0vP4((Mq|D-#he~|Gz
z40oY}SHTAv+I6_|V$>}C_b`62@4{H`5bjOz)I=d=v@=1+ib~Y^G<vtfz~T9f8D#t%
z;&z6_&;LhnkfW%qr|Wk9{CSo{yT)rWX;T+;JZuXK)P#3od6Zc6Fal@)j70JY{12si
V{1$FK)>8lg002ovPDHLkV1kIXL-7Cr

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_replace.png b/Telegram/Resources/icons/chat/input_replace.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0bc68cb34897c575afb220447364d0b2815b9f4
GIT binary patch
literal 749
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhpY6#WBP}
z@N9_h>dZiivKr$>XHGCM7qk6qn9}3na;jxz=M<yqol{Pp74&kk>sm6!ho`S|($3C9
zE`|b6U*CCtZ|mA`cVEh-7wyj8P<{Qg-S58@_qK}lf1j_{e9%CyUw``P=gDu&cKfIu
ze*QUrO@v3q(WJn&VeX4BUViB!us2S=`{=XJl?wwVoPK&YFMMUlp;8N(sI_5cvt5s=
zTLyTm2tBk&+Z?GkomoSGW75ed{r6X2etGBp_X3MEipHXxtxi$gsSJ#LZ{L=6AAc+&
z-|NQL-uz_2gVjP8<P&nXN1L2>OQ=^4u$$j*m9%k2i^Kk<L7W^njT*oGw!M<7F4*Z3
zwN}i6_4U_Xck}YM-%gqGwCLvh@8MdaUO!S3F3n)N^0#8m)vQ*|89r)e=hHSj?)X}@
z_h!z6(%pBj{C3k(;bdzT>uz1aEwEMLc8S%}kR*k$_1Bs2zy4|_#oPD2I(n{Ox{1{O
zAM89I_9@sF8?O}<uUdCC%Oc-Gt@&WXVe{E%?dJP03=sHJwbxHgn1}C={frK#zYCPM
zv@E*N^wv$J!m#nUft`Wm8TR0$%N2Ulx%XskwUXhReOB#>i_Yq+UY;*Yqyh`nG?<j9
zdOge&Zn1P<A!*FT!sHOR>hjAs-+#;XxBqMFn|4}tQXtE*q>T&a8kO^kZj^lfd1mv5
zz5coHL@nj|wWhw({Q6!YSWwkbc8^$v_5v#hj|m<s1-}iIXZpBh9${dbbK{P~`}gmI
zR*KYSnn($GC{0}8<6|Yl<rw?IY4HP2X1{Ig>k8EkGDUt=blEG~#HH`KxW4Vj^*!@F
W5?mS|7;Z`dB{ff1KbLh*2~7a}%`x%-

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_replace@2x.png b/Telegram/Resources/icons/chat/input_replace@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a634692ab1e58b9f231174d097b95cb6323e1f9
GIT binary patch
literal 1390
zcmV-!1(EuRP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG*hxe|R9Fe^SW75%Q55#LLLo$X
z<&pQRNKytultl6v7#qkCMMfqvp%4Qp149F^A}R7JB#9D|x5CJy5DEYPW&L;Gb<W-A
z+>`%aqk9MEuD$l!Ykz00v%j_Xc5!k3oDr~l1S%^l=jZ3|@9+P}ey^{u8yg!fEiLZu
z?slJA;&5PKKn6pi11xWEZ;6ZlQ@Qfth|R>r1ZmFC&k-cvOEN$tCMHsN`uh5snwq#x
zZEbB~VWF$5#qGz($HBqD^78WD-X6C!BqLK4in_WwodKDdnNLqouzY!W;fYI1N|HqK
zTlM+*+0)bG;o+g<R?<b^&Dq(Rq)(|D85yCu)6&vJkFT%q?d`1=Cg?jlI)t&7VB#GC
z0Rd=AGsVpyKRi5;hK7)guth~hrKF_rl$lJXyu7^5&Q4EH&$hO<!NI|sn;Vrk-c$hM
z9Y2%b-`{t4cU5Dzwzh(Tf`A6#a&mGeCnr?~yy?apj+1wGcF1{re7ycFzXa&(>x*!>
zx!IV}Mz{XkIHK1ffUy2gPEMAVmcqlswLoJ@j*X37Utbp#6mT1d04gpnj*X4Y&(8-R
zN-+V=+}vDsb#+)+SVcvJCZM;sH}n}P2wq-Z<OQXTyCZpYboAol0&-kjoHZswlbf3h
z1JK9N&=8H1JW-xNUm$yMv83Cq^7He%yu2h!E%YEH6d%~&cYJ(YUtdphdwcuZ+8W6q
zysWG&v)6zBmZAd%YIs*y7lh~M=kf7z!G3%UVpCdL8W|Z0<;=`Xd3ibS<uWiKJkin7
zP=dijLqj3pO`wMW=g92#_BLeA9|{u%iQYi}d3Sdg5fP#3>$`);iF=dAM(zqJ=<V%A
z)#T$<GIBaSJ#7;WO<;{lAB`eq0wY3|oSe+-l<2}&yuZIM{g#D|O5nMBe0(e_DzcF&
z)p$oVLqbCO`}>E7hZ7PK9O2*TQ$zp}Mw}6C#9SyHD#$--ni8zFu(06o?~f*!7o`9!
zVjK+?Y-(z%lsQ2{hlhvQ*BbZc0yJ2ke8Gcxv0jY003(1Gzz%%4N(QrlU!-s)Q&^)R
zcSbM)4LDOZy;c)E%#R6xB1sw0;P^o#B$!@szs=ksHf3dHaD8=kH9I>?1zYvfaE?;%
z<KqK;YinzFcel#G(&Vv06+|thmqT?#jkFmjq<}JoH$e@y__dNyzsV9ovg$M|z|P{k
z0UGQRurntRH8nNZ*>Ft3!NKNnmjCSRY_iAc!lKoX!1yp$k-lPs*3i&EnOa|8FDWU(
zv4*?C?hXqLTR|vM!*NLEy(Ei$k~C8)dx9c{P_F{e)YKFXP1tx?qaka;w6d~tdU}fQ
zOf`XBnu>Fo{w|nfvdi33CyEG3Eq+;P1Ca6al)Z4<0EA^lGi79C*lS9CKZ<Y2+H`Ys
z6KsJqd2@3!_;+=66-{A=MT@&1oacq+Hw4_F5Vc63U~tftz=7KtGQ)k1P-+Rd_kl5(
zPs>2A$1M}?noyagfS|-VRg6SoqWw5HO#du}J27&oq7O+e6W+Oyo}La?#N7|lC-m^R
zxVVU8q0m4;4R360gn)NAIyzDjF<Ax%2FAq1kX%(&rGG&~W<P(ToEbk$;g0p^GZ`O=
w#G!@*7Q!P<G`<^T3U{o=eL5|j5ilBoznj(<B$;~hg#Z8m07*qoM6N<$f{#UYo&W#<

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_replace@3x.png b/Telegram/Resources/icons/chat/input_replace@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..edcd082afde8c4bd6f52ba7911aa53c33b223fcb
GIT binary patch
literal 1931
zcmV;62Xy#}P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>^+`lQRA>e5n@vcTOBBbgj3~1Y
z#fZwF$QGd(D3xJQtCB!kL|}`k1VIpzTnIvo778s2gd%98w8^4HY4!nuVrB(NL=k;x
zfm!s0N%$33_x`%i<up7q?>zH7*?r%-udDN(Ip@s$&zYHL&Y3YKCHa^1K+*$A4<tR{
z=7HI>XCF9lpsTCv!-o%l1^s>d_U-N4w^y%T-Me@1j2ScBdWeVAh7B8DzI+)3$K3wl
z!GoNfoOp~ns83LhkB^&2?Z$oo{{4y-D}ws@h3(UH+sweHPoFMZwoGpd#kq6m4h}M^
zELyZ^>(;Gv=g!qz@!O|QpZfax?%uu2^wtF&IjOo_MMZ^*s<*fI=+UFko;{;WU067*
ztGv9ty1KfRD_45V_3PJf-@d)Qy<KEHV)5d|_wU~an~(4N`R2`=BS(%LKYsknmoL7i
zh(FmaWV+$DnKNg)8(Oen!QkMas5dn=>AL0R<suMBT)%#O-n@CbktiH>4=gJy3v1%g
zp+hoUW}~iNR8%AaF2tovm!?fKEE(Oh$}vpE%*;%YU<L~9NT@0q85z3Pty{PD@87>?
z&z`ijG`$s0c6K(?RhpR3yLRn5d-kkwA`+?>3knLtT44}kfjuCsx+h;!QZh6&BzAgw
zdcxY79#-MMk-u`~%E5yNr7w2Zuq!P=fdQ$twN-$z#?*~k_!c5@fiV@;anG4ENBtQ{
zCoZtSq1y$L!0i6{xz-4uDX&9|V*Dd^`0(M8kr7U(8#iur_s{a>%WvGcF)=Z5?%X-o
zvypr~Ab$0CjN_$r2fR(2HmTU838JvDP?|vX{P}Zf<#R7hLc}>@>R!h|gwK}`n+#M4
zP<3{8syUHrM8pgP$$~gz-MV!K2`g*&?%kr!1hdM1Z@hT%qR2z2aZ~wT#C)+r;PK<f
z>FMc#y?hrS!xxLjDBG<xG&G3%&6_vv!nDqsHH$!r3WQ)&nE=yKJ$dqE$&w|3UHmIR
z-9jw(_xF>DxN4@PFhf3m{3z-tPMmPjjfG9@KyVaR*A*N)DnmLzHAc;&$gfVFI>njY
zp3kPHrsn46R#sN3j$pxbcXvBtyKv#cwr$%)cyx4BJ^sIX^=j$TrP9hI-?C-P>({S^
z6HJf`Q;ku*6^(9dYYXm7k<jB7t6zJp6q6cBjfrYZEW0jzJgVk(S`TK13%2N}ygpei
zw{PEe!Jx|!s|cvPe(l)YQ5n{l>P(jG&Ye5gtXV@YY&pN6!V09OaPQu|GiS~?t}C@8
zl?Iz{y?L!s)|F~E5okSb?y*XQ@!Q4#Hp*{gWo(ZvEiGADSvKk4v2FVFIG_7|N2mQy
z#{37)4OTGgnAOahW@WR!|Abg_j%LqQKgXQP6Bb**2U-FGs*aA1)vH$v$0JAucI?>k
z`SWKVKh)3S;$kid)~;R4jIhsh+{$Em^yty~^XK(@oKT&97uI7nRdM6w#raFM=1z0s
zQ}gI4M&*qo+MEOxrzCeIx+Ev{h<C#FSgAclz!o`HYQJPy#=Csm8q?R6FWd9wf}z$M
z>x%lB%%9=m;gcs%K79Dlet*ddBt*VD*M0l;H8(elsQ^Nc6`47Qebrke$kZoPj(gmw
z8i*p*gix!6B%PXtsN>K8Fw$&9MJ<JjikO2yJ~B40yu=jsAL-hWQ15%GJ~?So&GLP(
zh!v<%)`7v)u~AVA>`C1=sMrO{`vj;9ieK!-m>-H&RaK$`A*hfr0)ww(<H^7eizbT8
zPU(e9P?Ly_M~Pb0A#_ngMld!uCUP%cyx6>X^T5D>aEt`o0GF%mCDN)I5oVkTYW!6C
zIZQBIZwAVMVnxgo;8uYN20ZQ=L?ssSt0QK3H843j$=smAVGMDsfx>4$;LH_4(PA@l
zlVK`)w!)&45kyuL3sXYG1U4ns<7gxa>>ua*_B!Lkn>a>E?K)h<ya!;SUs_r!bfOXA
zfbo)0efM?j*fBm|i3Z6Vk72vF545qdQJz;WT)6P^<;y%Q<dLmWi*MTL)2G!-DWjM@
zYc{Ib>+MFB045fBXUCrI{>M8$-6)Y43%mr>1?(J338K!OfnC_OmG@e_j}*Is1SfIb
zG+`7)0<K;c>cTz_XCq#SiaIYxeFFTnC7QalaJawZtXx}Lt3E80R+V`7?p=O<KGRiY
zLX+ANd0}$YuCK2r(fs=Lt1xwf`9h*uQ&Xe9)2OblW`X#GBLefRur@e7u3EKf{`~nq
zyWUUI&}-MOfz8-TH6}0#Fe<7{Hfqjsyg65yai+<dfAZcGJhGF;8H}%c=2hhTZdPW3
zqVhmeW8$3xbqg|l_3e!84L*WBkllj+P2v9od~QnqOnM;cfuskL9*E_EzXARc^e5$y
RnE(I)002ovPDHLkV1nUCub=<`

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 253d42213..92e59a8a3 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "mainwidget.h" // controller->content() -> QWidget*
 #include "mtproto/mtproto_config.h"
 #include "platform/platform_specific.h"
 #include "storage/localimageloader.h" // SendMediaType
@@ -69,7 +70,9 @@ namespace {
 
 constexpr auto kChangesDebounceTimeout = crl::time(1000);
 
-auto ListFromMimeData(not_null<const QMimeData*> data, bool premium) {
+[[nodiscard]] Ui::PreparedList ListFromMimeData(
+		not_null<const QMimeData*> data,
+		bool premium) {
 	using Error = Ui::PreparedList::Error;
 	const auto list = Core::ReadMimeUrls(data);
 	auto result = !list.isEmpty()
@@ -89,7 +92,7 @@ auto ListFromMimeData(not_null<const QMimeData*> data, bool premium) {
 	return result;
 }
 
-Ui::AlbumType ComputeAlbumType(not_null<HistoryItem*> item) {
+[[nodiscard]] Ui::AlbumType ComputeAlbumType(not_null<HistoryItem*> item) {
 	if (item->groupId().empty()) {
 		return Ui::AlbumType();
 	}
@@ -109,17 +112,130 @@ Ui::AlbumType ComputeAlbumType(not_null<HistoryItem*> item) {
 	return Ui::AlbumType();
 }
 
-bool CanBeCompressed(Ui::AlbumType type) {
+[[nodiscard]] bool CanBeCompressed(Ui::AlbumType type) {
 	return (type == Ui::AlbumType::None)
 		|| (type == Ui::AlbumType::PhotoVideo);
 }
 
+void ChooseReplacement(
+		not_null<Window::SessionController*> controller,
+		Ui::AlbumType type,
+		Fn<void(Ui::PreparedList&&)> chosen) {
+	const auto weak = base::make_weak(controller);
+	const auto callback = [=](FileDialog::OpenResult &&result) {
+		const auto strong = weak.get();
+		if (!strong) {
+			return;
+		}
+		const auto showError = [=](tr::phrase<> t) {
+			if (const auto strong = weak.get()) {
+				strong->showToast({ t(tr::now) });
+			}
+		};
+
+		const auto checkResult = [=](const Ui::PreparedList &list) {
+			if (list.files.size() != 1) {
+				return false;
+			}
+			const auto &file = list.files.front();
+			const auto mime = file.information->filemime;
+			if (Core::IsMimeSticker(mime)) {
+				showError(tr::lng_edit_media_invalid_file);
+				return false;
+			} else if (type != Ui::AlbumType::None
+				&& !file.canBeInAlbumType(type)) {
+				showError(tr::lng_edit_media_album_error);
+				return false;
+			}
+			return true;
+		};
+		const auto premium = strong->session().premium();
+		auto list = Storage::PreparedFileFromFilesDialog(
+			std::move(result),
+			checkResult,
+			showError,
+			st::sendMediaPreviewSize,
+			premium);
+
+		if (list) {
+			chosen(std::move(*list));
+		}
+	};
+
+	const auto filters = (type == Ui::AlbumType::PhotoVideo)
+		? FileDialog::PhotoVideoFilesFilter()
+		: FileDialog::AllFilesFilter();
+	FileDialog::GetOpenPath(
+		controller->content().get(),
+		tr::lng_choose_file(tr::now),
+		filters,
+		crl::guard(controller, callback));
+}
+
+void EditPhotoImage(
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<Data::PhotoMedia> media,
+		bool wasSpoiler,
+		Fn<void(Ui::PreparedList)> done) {
+	const auto large = media
+		? media->image(Data::PhotoSize::Large)
+		: nullptr;
+	const auto parent = controller->content();
+	const auto previewWidth = st::sendMediaPreviewSize;
+	auto callback = [=](const Editor::PhotoModifications &mods) {
+		if (!mods) {
+			return;
+		}
+		const auto large = media->image(Data::PhotoSize::Large);
+		if (!large) {
+			return;
+		}
+		auto copy = large->original();
+		auto list = Storage::PrepareMediaFromImage(
+			std::move(copy),
+			QByteArray(),
+			previewWidth);
+
+		using ImageInfo = Ui::PreparedFileInformation::Image;
+		auto &file = list.files.front();
+		file.spoiler = wasSpoiler;
+		const auto image = std::get_if<ImageInfo>(&file.information->media);
+
+		image->modifications = mods;
+		const auto sideLimit = PhotoSideLimit();
+		Storage::UpdateImageDetails(file, previewWidth, sideLimit);
+		done(std::move(list));
+	};
+	const auto fileImage = std::make_shared<Image>(*large);
+	auto editor = base::make_unique_q<Editor::PhotoEditor>(
+		parent,
+		&controller->window(),
+		fileImage,
+		Editor::PhotoModifications());
+	const auto raw = editor.get();
+	auto layer = std::make_unique<Editor::LayerWidget>(
+		parent,
+		std::move(editor));
+	Editor::InitEditorLayer(layer.get(), raw, std::move(callback));
+	controller->showLayer(std::move(layer), Ui::LayerOption::KeepOther);
+}
+
 } // 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,
+	not_null<HistoryItem*> item,
+	TextWithTags &&text,
+	Ui::PreparedList &&list,
+	Fn<void()> saved)
 : _controller(controller)
 , _historyItem(item)
 , _isAllowedEditMedia(item->media()
@@ -135,7 +251,10 @@ EditCaptionBox::EditCaptionBox(
 	tr::lng_photo_caption()))
 , _emojiToggle(base::make_unique_q<Ui::EmojiButton>(
 	this,
-	st::boxAttachEmoji)) {
+	st::boxAttachEmoji))
+, _initialText(std::move(text))
+, _initialList(std::move(list))
+, _saved(std::move(saved)) {
 	Expects(item->media() != nullptr);
 	Expects(item->media()->allowsEditCaption());
 
@@ -148,6 +267,57 @@ EditCaptionBox::EditCaptionBox(
 
 EditCaptionBox::~EditCaptionBox() = default;
 
+void EditCaptionBox::StartMediaReplace(
+		not_null<Window::SessionController*> controller,
+		FullMsgId itemId,
+		TextWithTags text,
+		Fn<void()> saved) {
+	const auto session = &controller->session();
+	const auto item = session->data().message(itemId);
+	if (!item) {
+		return;
+	}
+	const auto show = [=](Ui::PreparedList &&list) mutable {
+		controller->show(Box<EditCaptionBox>(
+			controller,
+			item,
+			std::move(text),
+			std::move(list),
+			std::move(saved)));
+	};
+	ChooseReplacement(
+		controller,
+		ComputeAlbumType(item),
+		crl::guard(controller, show));
+}
+
+void EditCaptionBox::StartPhotoEdit(
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<Data::PhotoMedia> media,
+		FullMsgId itemId,
+		TextWithTags text,
+		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, [=](
+			Ui::PreparedList &&list) mutable {
+		const auto item = session->data().message(itemId);
+		if (!item) {
+			return;
+		}
+		controller->show(Box<EditCaptionBox>(
+			controller,
+			item,
+			std::move(text),
+			std::move(list),
+			std::move(saved)));
+	});
+}
+
 void EditCaptionBox::prepare() {
 	addButton(tr::lng_settings_save(), [=] { save(); });
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
@@ -158,7 +328,9 @@ void EditCaptionBox::prepare() {
 	setupEmojiPanel();
 	setInitialText();
 
-	rebuildPreview();
+	if (!setPreparedList(std::move(_initialList))) {
+		rebuildPreview();
+	}
 	setupEditEventHandler();
 	SetupShadowsToScrollContent(this, _scroll, _contentHeight.events());
 
@@ -290,16 +462,15 @@ void EditCaptionBox::setupField() {
 }
 
 void EditCaptionBox::setInitialText() {
-	const auto initial = PrepareEditText(_historyItem);
 	_field->setTextWithTags(
-		initial,
+		_initialText,
 		Ui::InputField::HistoryAction::Clear);
 	auto cursor = _field->textCursor();
 	cursor.movePosition(QTextCursor::End);
 	_field->setTextCursor(cursor);
 
 	_checkChangedTimer.setCallback([=] {
-		if (_field->getTextWithAppliedMarkdown() == initial) {
+		if (_field->getTextWithAppliedMarkdown() == _initialText) {
 			setCloseByOutsideClick(true);
 		}
 	});
@@ -353,132 +524,44 @@ void EditCaptionBox::setupControls() {
 }
 
 void EditCaptionBox::setupEditEventHandler() {
-	const auto toastParent = Ui::BoxShow(this).toastParent();
-	const auto callback = [=](FileDialog::OpenResult &&result) {
-		auto showError = [toastParent](tr::phrase<> t) {
-			Ui::Toast::Show(toastParent, t(tr::now));
-		};
-
-		const auto checkResult = [=](const Ui::PreparedList &list) {
-			if (list.files.size() != 1) {
-				return false;
-			}
-			const auto &file = list.files.front();
-			const auto mime = file.information->filemime;
-			if (Core::IsMimeSticker(mime)) {
-				showError(tr::lng_edit_media_invalid_file);
-				return false;
-			} else if (_albumType != Ui::AlbumType::None
-				&& !file.canBeInAlbumType(_albumType)) {
-				showError(tr::lng_edit_media_album_error);
-				return false;
-			}
-			return true;
-		};
-		const auto premium = _controller->session().premium();
-		auto list = Storage::PreparedFileFromFilesDialog(
-			std::move(result),
-			checkResult,
-			showError,
-			st::sendMediaPreviewSize,
-			premium);
-
-		if (list) {
-			setPreparedList(std::move(*list));
-		}
-	};
-
-	const auto buttonCallback = [=] {
-		const auto filters = (_albumType == Ui::AlbumType::PhotoVideo)
-			? FileDialog::PhotoVideoFilesFilter()
-			: FileDialog::AllFilesFilter();
-		FileDialog::GetOpenPath(
-			this,
-			tr::lng_choose_file(tr::now),
-			filters,
-			crl::guard(this, callback));
-	};
-
 	_editMediaClicks.events(
-	) | rpl::start_with_next(
-		buttonCallback,
-		lifetime());
+	) | rpl::start_with_next([=] {
+		ChooseReplacement(_controller, _albumType, crl::guard(this, [=](
+				Ui::PreparedList &&list) {
+			setPreparedList(std::move(list));
+		}));
+	}, lifetime());
 }
 
 void EditCaptionBox::setupPhotoEditorEventHandler() {
 	const auto openedOnce = lifetime().make_state<bool>(false);
 	_photoEditorOpens.events(
 	) | rpl::start_with_next([=, controller = _controller] {
-		const auto increment = [=] {
-			if (*openedOnce) {
-				return;
-			}
+		if (_preparedList.files.empty()
+			&& (!_photoMedia
+				|| !_photoMedia->image(Data::PhotoSize::Large))) {
+			return;
+		} else if (!*openedOnce) {
 			*openedOnce = true;
 			controller->session().settings().incrementPhotoEditorHintShown();
 			controller->session().saveSettings();
-		};
-		const auto clearError = [=] {
+		}
+		if (!_error.isEmpty()) {
 			_error = QString();
 			update();
-		};
-		const auto previewWidth = st::sendMediaPreviewSize;
+		}
 		if (!_preparedList.files.empty()) {
-			increment();
-			clearError();
 			Editor::OpenWithPreparedFile(
 				this,
 				controller,
 				&_preparedList.files.front(),
-				previewWidth,
+				st::sendMediaPreviewSize,
 				[=] { rebuildPreview(); });
-		} else if (_photoMedia) {
-			const auto large = _photoMedia->image(Data::PhotoSize::Large);
-			if (!large) {
-				return;
-			}
-			increment();
-			clearError();
-			auto callback = [=](const Editor::PhotoModifications &mods) {
-				if (!mods || !_photoMedia) {
-					return;
-				}
-				const auto large = _photoMedia->image(Data::PhotoSize::Large);
-				if (!large) {
-					return;
-				}
-				auto copy = large->original();
-				const auto wasSpoiler = hasSpoiler();
-
-				_preparedList = Storage::PrepareMediaFromImage(
-					std::move(copy),
-					QByteArray(),
-					previewWidth);
-
-				using ImageInfo = Ui::PreparedFileInformation::Image;
-				auto &file = _preparedList.files.front();
-				file.spoiler = wasSpoiler;
-				const auto image = std::get_if<ImageInfo>(
-					&file.information->media);
-
-				image->modifications = mods;
-				const auto sideLimit = PhotoSideLimit();
-				Storage::UpdateImageDetails(file, previewWidth, sideLimit);
-				rebuildPreview();
-			};
-			const auto fileImage = std::make_shared<Image>(*large);
-			auto editor = base::make_unique_q<Editor::PhotoEditor>(
-				this,
-				&controller->window(),
-				fileImage,
-				Editor::PhotoModifications());
-			const auto raw = editor.get();
-			auto layer = std::make_unique<Editor::LayerWidget>(
-				this,
-				std::move(editor));
-			Editor::InitEditorLayer(layer.get(), raw, std::move(callback));
-			controller->showLayer(
-				std::move(layer),
-				Ui::LayerOption::KeepOther);
+		} else {
+			EditPhotoImage(_controller, _photoMedia, hasSpoiler(), [=](
+					Ui::PreparedList &&list) {
+				setPreparedList(std::move(list));
+			});
 		}
 	}, lifetime());
 }
@@ -780,13 +863,13 @@ void EditCaptionBox::save() {
 				: SendMediaType::File,
 			_field->getTextWithAppliedMarkdown(),
 			action);
-		closeBox();
+		closeAfterSave();
 		return;
 	}
 
 	const auto done = crl::guard(this, [=] {
 		_saveRequestId = 0;
-		closeBox();
+		closeAfterSave();
 	});
 
 	const auto fail = crl::guard(this, [=](const QString &error) {
@@ -795,7 +878,7 @@ void EditCaptionBox::save() {
 			_error = tr::lng_edit_error(tr::now);
 			update();
 		} else if (error == u"MESSAGE_NOT_MODIFIED"_q) {
-			closeBox();
+			closeAfterSave();
 		} else if (error == u"MESSAGE_EMPTY"_q) {
 			_field->setFocus();
 			_field->showError();
@@ -816,6 +899,16 @@ void EditCaptionBox::save() {
 	_saveRequestId = Api::EditCaption(item, sending, options, done, fail);
 }
 
+void EditCaptionBox::closeAfterSave() {
+	const auto weak = MakeWeak(this);
+	if (_saved) {
+		_saved();
+	}
+	if (weak) {
+		closeBox();
+	}
+}
+
 void EditCaptionBox::keyPressEvent(QKeyEvent *e) {
 	const auto ctrl = e->modifiers().testFlag(Qt::ControlModifier);
 	if ((e->key() == Qt::Key_E) && ctrl) {
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h
index deb756b50..ff3924b3d 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -36,8 +36,27 @@ public:
 		QWidget*,
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item);
+	EditCaptionBox(
+		QWidget*,
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		TextWithTags &&text,
+		Ui::PreparedList &&list,
+		Fn<void()> saved);
 	~EditCaptionBox();
 
+	static void StartMediaReplace(
+		not_null<Window::SessionController*> controller,
+		FullMsgId itemId,
+		TextWithTags text,
+		Fn<void()> saved);
+	static void StartPhotoEdit(
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<Data::PhotoMedia> media,
+		FullMsgId itemId,
+		TextWithTags text,
+		Fn<void()> saved);
+
 protected:
 	void prepare() override;
 	void setInnerFocus() override;
@@ -66,6 +85,7 @@ private:
 	bool validateLength(const QString &text) const;
 	void applyChanges();
 	void save();
+	void closeAfterSave();
 
 	bool fileFromClipboard(not_null<const QMimeData*> data);
 
@@ -89,6 +109,10 @@ private:
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
 
+	const TextWithTags _initialText;
+	Ui::PreparedList _initialList;
+	Fn<void()> _saved;
+
 	std::shared_ptr<Data::PhotoMedia> _photoMedia;
 
 	Ui::PreparedList _preparedList;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 71e023d04..30bd8cb0e 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -61,6 +61,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_web_page.h"
 #include "data/data_document.h"
 #include "data/data_photo.h"
+#include "data/data_photo_media.h"
 #include "data/data_media_types.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -2121,6 +2122,8 @@ void HistoryWidget::showHistory(
 	_saveEditMsgRequestId = 0;
 	_processingReplyItem = _replyEditMsg = nullptr;
 	_processingReplyId = _editMsgId = _replyToId = 0;
+	_photoEditMedia = nullptr;
+	updateReplaceMediaButton();
 	_previewData = nullptr;
 	_previewCache.clear();
 	_fieldBarCancel->hide();
@@ -2504,6 +2507,25 @@ void HistoryWidget::clearAllLoadRequests() {
 	}
 }
 
+bool HistoryWidget::updateReplaceMediaButton() {
+	if (!_canReplaceMedia) {
+		const auto result = (_replaceMedia != nullptr);
+		_replaceMedia.destroy();
+		return result;
+	} else if (_replaceMedia) {
+		return false;
+	}
+	_replaceMedia.create(this, st::historyReplaceMedia);
+	_replaceMedia->setClickedCallback([=] {
+		EditCaptionBox::StartMediaReplace(
+			controller(),
+			{ _history->peer->id, _editMsgId },
+			_field->getTextWithTags(),
+			crl::guard(_list, [=] { cancelEdit(); }));
+	});
+	return true;
+}
+
 void HistoryWidget::updateFieldSubmitSettings() {
 	const auto settings = _isInlineBot
 		? Ui::InputField::SubmitSettings::None
@@ -2731,6 +2753,9 @@ void HistoryWidget::updateControlsVisibility() {
 		_kbScroll->hide();
 		_fieldBarCancel->hide();
 		_attachToggle->hide();
+		if (_replaceMedia) {
+			_replaceMedia->hide();
+		}
 		_tabbedSelectorToggle->hide();
 		_botKeyboardShow->hide();
 		_botKeyboardHide->hide();
@@ -2795,7 +2820,12 @@ void HistoryWidget::updateControlsVisibility() {
 				_botCommandStart->setVisible(_cmdStartShown);
 			}
 		}
-		_attachToggle->show();
+		if (_replaceMedia) {
+			_replaceMedia->show();
+			_attachToggle->hide();
+		} else {
+			_attachToggle->show();
+		}
 		if (_botMenuButton) {
 			_botMenuButton->show();
 		}
@@ -3685,7 +3715,8 @@ void HistoryWidget::saveEditMsg() {
 		TextUtilities::ConvertTextTagsToEntities(textWithTags.tags) };
 	TextUtilities::PrepareForSending(left, prepareFlags);
 
-	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)) {
+	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)
+		&& (!item->media() || !item->media()->allowsEditCaption())) {
 		const auto suggestModerateActions = false;
 		controller()->show(
 			Box<DeleteMessagesBox>(item, suggestModerateActions));
@@ -4239,9 +4270,34 @@ void HistoryWidget::mouseMoveEvent(QMouseEvent *e) {
 }
 
 void HistoryWidget::updateOverStates(QPoint pos) {
-	auto inReplyEditForward = QRect(st::historyReplySkip, _field->y() - st::historySendPadding - st::historyReplyHeight, width() - st::historyReplySkip - _fieldBarCancel->width(), st::historyReplyHeight).contains(pos) && (_editMsgId || replyToId() || readyToForward());
+	const auto replyEditForwardInfoRect = QRect(
+		st::historyReplySkip,
+		_field->y() - st::historySendPadding - st::historyReplyHeight,
+		width() - st::historyReplySkip - _fieldBarCancel->width(),
+		st::historyReplyHeight);
+	auto inReplyEditForward = (_editMsgId || replyToId() || readyToForward())
+		&& replyEditForwardInfoRect.contains(pos);
+	auto inPhotoEdit = inReplyEditForward
+		&& _photoEditMedia
+		&& QRect(
+			replyEditForwardInfoRect.x(),
+			replyEditForwardInfoRect.y() + st::msgReplyPadding.top(),
+			st::msgReplyBarSize.height(),
+			st::msgReplyBarSize.height()).contains(pos);
 	auto inClickable = inReplyEditForward;
-	_inReplyEditForward = inReplyEditForward;
+	if (_inPhotoEdit != inPhotoEdit) {
+		_inPhotoEdit = inPhotoEdit;
+		if (_photoEditMedia) {
+			_inPhotoEditOver.start(
+				[=] { updateField(); },
+				_inPhotoEdit ? 0. : 1.,
+				_inPhotoEdit ? 1. : 0.,
+				st::defaultMessageBar.duration);
+		} else {
+			_inPhotoEditOver.stop();
+		}
+	}
+	_inReplyEditForward = inReplyEditForward && !inPhotoEdit;
 	if (inClickable != _inClickable) {
 		_inClickable = inClickable;
 		setCursor(_inClickable ? style::cur_pointer : style::cur_default);
@@ -4862,7 +4918,7 @@ void HistoryWidget::moveFieldControls() {
 		_kbScroll->setGeometryToLeft(0, bottom, width(), keyboardHeight);
 	}
 
-// (_botMenuButton) _attachToggle (_sendAs) ---- _inlineResults ------------------------------ _tabbedPanel ------ _fieldBarCancel
+// (_botMenuButton) (_attachToggle|_replaceMedia) (_sendAs) ---- _inlineResults ------------------------------ _tabbedPanel ------ _fieldBarCancel
 // (_attachDocument|_attachPhoto) _field (_ttlInfo) (_scheduled) (_silent|_cmdStart|_kbShow) (_kbHide|_tabbedSelectorToggle) _send
 // (_botStart|_unblock|_joinChannel|_muteUnmute|_reportMessages)
 
@@ -4872,6 +4928,9 @@ void HistoryWidget::moveFieldControls() {
 		const auto skip = st::historyBotMenuSkip;
 		_botMenuButton->moveToLeft(left + skip, buttonsBottom + skip); left += skip + _botMenuButton->width();
 	}
+	if (_replaceMedia) {
+		_replaceMedia->moveToLeft(left, buttonsBottom);
+	}
 	_attachToggle->moveToLeft(left, buttonsBottom); left += _attachToggle->width();
 	if (_sendAs) {
 		_sendAs->moveToLeft(left, buttonsBottom); left += _sendAs->width();
@@ -6038,6 +6097,13 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		st::historyReplyHeight).contains(e->pos());
 	if (_replyForwardPressed && !_fieldBarCancel->isHidden()) {
 		updateField();
+	} else if (_inPhotoEdit && _photoEditMedia) {
+		EditCaptionBox::StartPhotoEdit(
+			controller(),
+			_photoEditMedia,
+			{ _history->peer->id, _editMsgId },
+			_field->getTextWithTags(),
+			crl::guard(_list, [=] { cancelEdit(); }));
 	} else if (_inReplyEditForward) {
 		if (readyToForward()) {
 			_forwardPanel->editOptions(controller());
@@ -6957,12 +7023,7 @@ void HistoryWidget::editMessage(FullMsgId itemId) {
 }
 
 void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
-	if (const auto media = item->media()) {
-		if (media->allowsEditCaption()) {
-			controller()->show(Box<EditCaptionBox>(controller(), item));
-			return;
-		}
-	} else if (_chooseTheme) {
+	if (_chooseTheme) {
 		toggleChooseChatTheme(_peer);
 	} else if (_voiceRecordBar->isActive()) {
 		controller()->showToast({ tr::lng_edit_caption_voice(tr::now) });
@@ -7132,6 +7193,9 @@ void HistoryWidget::cancelEdit() {
 		return;
 	}
 
+	_canReplaceMedia = false;
+	_photoEditMedia = nullptr;
+	updateReplaceMediaButton();
 	_replyEditMsg = nullptr;
 	setEditMsgId(0);
 	_history->clearLocalEditDraft({});
@@ -7588,6 +7652,22 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 			_editMsgId ? _editMsgId : _replyToId);
 	}
 	if (_replyEditMsg) {
+		const auto media = _replyEditMsg->media();
+		_canReplaceMedia = media && media->allowsEditMedia();
+		_photoEditMedia = (_canReplaceMedia
+			&& media->photo()
+			&& !media->photo()->isNull())
+			? media->photo()->createMediaView()
+			: nullptr;
+		if (_photoEditMedia) {
+			_photoEditMedia->wanted(
+				Data::PhotoSize::Large,
+				_replyEditMsg->fullId());
+		}
+		if (updateReplaceMediaButton()) {
+			updateControlsVisibility();
+			updateControlsGeometry();
+		}
 		updateReplyEditText(_replyEditMsg);
 		updateBotKeyboard();
 		updateReplyToName();
@@ -7695,6 +7775,9 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 			if (drawMsgText) {
 				if (hasPreview) {
 					if (preview) {
+						const auto overEdit = _photoEditMedia
+							? _inPhotoEditOver.value(_inPhotoEdit ? 1. : 0.)
+							: 0.;
 						auto to = QRect(replyLeft, backy + st::msgReplyPadding.top(), st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
 						p.drawPixmap(to.x(), to.y(), preview->pixSingle(
 							preview->size() / style::DevicePixelRatio(),
@@ -7703,12 +7786,21 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 								.outer = to.size(),
 							}));
 						if (_replySpoiler) {
+							if (overEdit > 0.) {
+								p.setOpacity(1. - overEdit);
+							}
 							Ui::FillSpoilerRect(
 								p,
 								to,
 								Ui::DefaultImageSpoiler().frame(
 									_replySpoiler->index(now, pausedSpoiler)));
 						}
+						if (overEdit > 0.) {
+							p.setOpacity(overEdit);
+							p.fillRect(to, st::historyEditMediaBg);
+							st::historyEditMedia.paintInCenter(p, to);
+							p.setOpacity(1.);
+						}
 					}
 					replyLeft += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
 				}
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index dd19eb3bd..778422cd8 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -31,6 +31,7 @@ class Error;
 
 namespace Data {
 enum class PreviewState : char;
+class PhotoMedia;
 } // namespace Data
 
 namespace SendMenu {
@@ -145,6 +146,7 @@ public:
 	void firstLoadMessages();
 	void delayedShowAt(MsgId showAtMsgId);
 
+	bool updateReplaceMediaButton();
 	void updateFieldPlaceholder();
 	bool updateStickersByEmoji();
 
@@ -634,6 +636,8 @@ private:
 	HistoryItem *_processingReplyItem = nullptr;
 
 	MsgId _editMsgId = 0;
+	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
+	bool _canReplaceMedia = false;
 
 	HistoryItem *_replyEditMsg = nullptr;
 	Ui::Text::String _replyEditMsgText;
@@ -732,6 +736,7 @@ private:
 	object_ptr<Ui::RoundButton> _botMenuButton = { nullptr };
 	QString _botMenuButtonText;
 	object_ptr<Ui::IconButton> _attachToggle;
+	object_ptr<Ui::IconButton> _replaceMedia = { nullptr };
 	object_ptr<Ui::SendAsButton> _sendAs = { nullptr };
 	object_ptr<Ui::EmojiButton> _tabbedSelectorToggle;
 	object_ptr<Ui::IconButton> _botKeyboardShow;
@@ -746,7 +751,9 @@ private:
 	bool _cmdStartShown = false;
 	object_ptr<Ui::InputField> _field;
 	base::unique_qptr<Ui::RpWidget> _fieldDisabled;
+	Ui::Animations::Simple _inPhotoEditOver;
 	bool _inReplyEditForward = false;
+	bool _inPhotoEdit = false;
 	bool _inClickable = false;
 
 	bool _kbShown = false;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index a60ee8383..a06f0f1eb 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -482,6 +482,15 @@ historyMessagesTTL: IconButtonWithText {
 
 	font: font(10px semibold);
 }
+historyReplaceMedia: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_replace", windowBgActive }};
+	iconOver: icon {{ "chat/input_replace", windowBgActive }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgOver;
+	}
+}
+historyEditMediaBg: videoPlayIconBg;
+historyEditMedia: icon{{ "chat/input_draw", videoPlayIconFg }};
 historyMessagesTTLPickerHeight: 200px;
 historyMessagesTTLPickerItemHeight: 40px;
 historyMessagesTTLLabel: FlatLabel(defaultFlatLabel) {

From 7ed020ecc50d1ded849cc8820ba73e329e8cbb3f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Apr 2023 20:36:23 +0400
Subject: [PATCH 037/676] Use new caption edit in ComposeControls.

---
 .../history_view_compose_controls.cpp         | 56 ++++++++++++++++++-
 .../controls/history_view_compose_controls.h  |  6 ++
 .../view/history_view_replies_section.cpp     | 11 ++--
 .../view/history_view_scheduled_section.cpp   | 11 ++--
 4 files changed, 71 insertions(+), 13 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 faf3626c8..76fe0b972 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
 #include "base/unixtime.h"
+#include "boxes/edit_caption_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/message_field.h"
 #include "menu/menu_send.h"
@@ -29,8 +30,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
+#include "data/data_file_origin.h"
 #include "data/data_forum_topic.h"
 #include "data/data_peer_values.h"
+#include "data/data_photo_media.h"
 #include "data/stickers/data_stickers.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_web_page.h"
@@ -1939,6 +1942,12 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		_header->editMessage({ _history->peer->id, draft->msgId });
 		_header->replyToMessage({});
 	} else {
+		_canReplaceMedia = false;
+		_photoEditMedia = nullptr;
+		if (updateReplaceMediaButton(FullMsgId())) {
+			updateControlsVisibility();
+			updateControlsGeometry(_wrap->size());
+		}
 		_header->replyToMessage({ _history->peer->id, draft->msgId });
 		if (_header->replyingToMessage()) {
 			cancelForward();
@@ -2250,7 +2259,7 @@ void ComposeControls::finishAnimating() {
 }
 
 void ComposeControls::updateControlsGeometry(QSize size) {
-	// _attachToggle (_sendAs) -- _inlineResults ------ _tabbedPanel -- _fieldBarCancel
+	// (_attachToggle|_replaceMedia) (_sendAs) -- _inlineResults ------ _tabbedPanel -- _fieldBarCancel
 	// (_attachDocument|_attachPhoto) _field (_ttlInfo) (_silent|_botCommandStart) _tabbedSelectorToggle _send
 
 	const auto fieldWidth = size.width()
@@ -2275,6 +2284,9 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 	const auto buttonsTop = size.height() - _attachToggle->height();
 
 	auto left = st::historySendRight;
+	if (_replaceMedia) {
+		_replaceMedia->moveToLeft(left, buttonsTop);
+	}
 	_attachToggle->moveToLeft(left, buttonsTop);
 	left += _attachToggle->width();
 	if (_sendAs) {
@@ -2321,6 +2333,12 @@ void ComposeControls::updateControlsVisibility() {
 	if (_sendAs) {
 		_sendAs->show();
 	}
+	if (_replaceMedia) {
+		_replaceMedia->show();
+		_attachToggle->hide();
+	} else {
+		_attachToggle->show();
+	}
 }
 
 bool ComposeControls::updateBotCommandShown() {
@@ -2556,11 +2574,47 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 			previewState));
 	applyDraft();
 
+	const auto media = item->media();
+	_canReplaceMedia = media && media->allowsEditMedia();
+	_photoEditMedia = (_canReplaceMedia
+		&& media->photo()
+		&& !media->photo()->isNull())
+		? media->photo()->createMediaView()
+		: nullptr;
+	if (_photoEditMedia) {
+		_photoEditMedia->wanted(Data::PhotoSize::Large, item->fullId());
+	}
+	if (updateReplaceMediaButton(item->fullId())) {
+		updateControlsVisibility();
+		updateControlsGeometry(_wrap->size());
+	}
+
 	if (_autocomplete) {
 		InvokeQueued(_autocomplete.get(), [=] { checkAutocomplete(); });
 	}
 }
 
+bool ComposeControls::updateReplaceMediaButton(FullMsgId id) {
+	if (!_canReplaceMedia) {
+		const auto result = (_replaceMedia != nullptr);
+		_replaceMedia = nullptr;
+		return result;
+	} else if (_replaceMedia) {
+		return false;
+	}
+	_replaceMedia = std::make_unique<Ui::IconButton>(
+		_wrap.get(),
+		st::historyReplaceMedia);
+	_replaceMedia->setClickedCallback([=] {
+		EditCaptionBox::StartMediaReplace(
+			_window,
+			id,
+			_field->getTextWithTags(),
+			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
+	});
+	return true;
+}
+
 void ComposeControls::cancelEditMessage() {
 	Expects(_history != nullptr);
 	Expects(draftKeyCurrent() != Data::DraftKey::None());
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 25a92acfa..54596dd98 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -36,6 +36,7 @@ struct MessagePosition;
 struct Draft;
 class DraftKey;
 enum class PreviewState : char;
+class PhotoMedia;
 } // namespace Data
 
 namespace InlineBots {
@@ -227,6 +228,7 @@ private:
 	void updateWrappingVisibility();
 	void updateControlsVisibility();
 	void updateControlsGeometry(QSize size);
+	bool updateReplaceMediaButton(FullMsgId id);
 	void updateOuterGeometry(QRect rect);
 	void paintBackground(QRect clip);
 
@@ -307,6 +309,7 @@ private:
 
 	const std::shared_ptr<Ui::SendButton> _send;
 	const not_null<Ui::IconButton*> _attachToggle;
+	std::unique_ptr<Ui::IconButton> _replaceMedia;
 	const not_null<Ui::EmojiButton*> _tabbedSelectorToggle;
 	const not_null<Ui::InputField*> _field;
 	const not_null<Ui::IconButton*> _botCommandStart;
@@ -355,6 +358,9 @@ private:
 	bool _isInlineBot = false;
 	bool _botCommandShown = false;
 
+	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
+	bool _canReplaceMedia = false;
+
 	std::unique_ptr<WebpageProcessor> _preview;
 
 	rpl::lifetime _uploaderSubscriptions;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 40b891335..7bcbbd19d 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -321,11 +321,7 @@ RepliesWidget::RepliesWidget(
 	}) | rpl::start_with_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
-			if (media && !media->webpage()) {
-				if (media->allowsEditCaption()) {
-					controller->show(Box<EditCaptionBox>(controller, item));
-				}
-			} else {
+			if (!media || media->webpage() || media->allowsEditCaption()) {
 				_composeControls->editMessage(fullId);
 			}
 		}
@@ -1228,7 +1224,10 @@ void RepliesWidget::edit(
 		TextUtilities::ConvertTextTagsToEntities(textWithTags.tags) };
 	TextUtilities::PrepareForSending(left, prepareFlags);
 
-	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)) {
+	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)
+		&& (!item
+			|| !item->media()
+			|| !item->media()->allowsEditCaption())) {
 		if (item) {
 			controller()->show(Box<DeleteMessagesBox>(item, false));
 		} else {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 33710b711..bc8930e41 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -174,11 +174,7 @@ ScheduledWidget::ScheduledWidget(
 	) | rpl::start_with_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
-			if (media && !media->webpage()) {
-				if (media->allowsEditCaption()) {
-					controller->show(Box<EditCaptionBox>(controller, item));
-				}
-			} else {
+			if (!media || media->webpage() || media->allowsEditCaption()) {
 				_composeControls->editMessage(fullId);
 			}
 		}
@@ -664,7 +660,10 @@ void ScheduledWidget::edit(
 		TextUtilities::ConvertTextTagsToEntities(textWithTags.tags) };
 	TextUtilities::PrepareForSending(left, prepareFlags);
 
-	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)) {
+	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)
+		&& (!item
+			|| !item->media()
+			|| !item->media()->allowsEditCaption())) {
 		if (item) {
 			controller()->show(Box<DeleteMessagesBox>(item, false));
 		} else {

From 6eb904acb103940197145fe50e039d1b1416387b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 8 Apr 2023 08:42:31 +0400
Subject: [PATCH 038/676] Closed alpha version 4.7.1.2.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index c8ec143d9..7182eb7c6 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.7.1.1" />
+    Version="4.7.1.2" />
   <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 151346410..c36286fa5 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,7,1,1
- PRODUCTVERSION 4,7,1,1
+ FILEVERSION 4,7,1,2
+ PRODUCTVERSION 4,7,1,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.7.1.1"
+            VALUE "FileVersion", "4.7.1.2"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.1"
+            VALUE "ProductVersion", "4.7.1.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 02800b8df..138238f50 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,7,1,1
- PRODUCTVERSION 4,7,1,1
+ FILEVERSION 4,7,1,2
+ PRODUCTVERSION 4,7,1,2
  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.7.1.1"
+            VALUE "FileVersion", "4.7.1.2"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.1"
+            VALUE "ProductVersion", "4.7.1.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 82f90a197..6d2261ac9 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4007001001ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4007001002ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index aa8fdb769..3242fd3dd 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.7
 AppVersionStrSmall 4.7.1
 AppVersionStr      4.7.1
 BetaChannel        0
-AlphaVersion       4007001001
-AppVersionOriginal 4.7.1.1
+AlphaVersion       4007001002
+AppVersionOriginal 4.7.1.2

From ec2299a7e2d427c90f306978ae4d9f415591fe0a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 7 Apr 2023 12:27:34 +0300
Subject: [PATCH 039/676] Updated Qt to 5.15.9 on Windows.

---
 CMakeLists.txt                    |  2 +-
 Telegram/build/prepare/prepare.py | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af94de3c0..c45a8132a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ include(cmake/options.cmake)
 
 if (NOT DESKTOP_APP_USE_PACKAGED)
     if (WIN32)
-        set(qt_version 5.15.8)
+        set(qt_version 5.15.9)
     elseif (APPLE)
         set(qt_version 6.3.2)
     endif()
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 7107afb2f..a2bf62b85 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -404,7 +404,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout f61eb3406b
+    git checkout d0e227f7fd
 """)
 
 stage('msys64', """
@@ -1215,30 +1215,30 @@ release:
 """)
 
 if buildQt5:
-    stage('qt_5_15_8', """
-    git clone https://github.com/qt/qt5.git qt_5_15_8
-    cd qt_5_15_8
+    stage('qt_5_15_9', """
+    git clone https://github.com/qt/qt5.git qt_5_15_9
+    cd qt_5_15_9
     perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
-    git checkout v5.15.8-lts-lgpl
+    git checkout v5.15.9-lts-lgpl
     git submodule update qtbase qtimageformats qtsvg
-depends:patches/qtbase_5.15.8/*.patch
+depends:patches/qtbase_5.15.9/*.patch
     cd qtbase
 win:
-    for /r %%i in (..\\..\\patches\\qtbase_5.15.8\\*) do git apply %%i
+    for /r %%i in (..\\..\\patches\\qtbase_5.15.9\\*) do git apply %%i
     cd ..
 
     SET CONFIGURATIONS=-debug
 release:
     SET CONFIGURATIONS=-debug-and-release
 win:
-    """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.8\"") + """
+    """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.9\"") + """
     SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
     SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
     SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
     SET OPENSSL_DIR=%LIBS_DIR%\\openssl
     SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
     SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
-    configure -prefix "%LIBS_DIR%\\Qt-5.15.8" ^
+    configure -prefix "%LIBS_DIR%\\Qt-5.15.9" ^
         %CONFIGURATIONS% ^
         -force-debug-info ^
         -opensource ^
@@ -1270,14 +1270,14 @@ win:
     jom -j16
     jom -j16 install
 mac:
-    find ../../patches/qtbase_5.15.8 -type f -print0 | sort -z | xargs -0 git apply
+    find ../../patches/qtbase_5.15.9 -type f -print0 | sort -z | xargs -0 git apply
     cd ..
 
     CONFIGURATIONS=-debug
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-5.15.8" \
+    ./configure -prefix "$USED_PREFIX/Qt-5.15.9" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \

From a0ca3beef8edfb49696338968f9d03603e62f6d7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 9 Apr 2023 20:23:52 +0300
Subject: [PATCH 040/676] Added phrases for bot management.

---
 Telegram/Resources/langs/lang.strings       | 20 +++++++++++++++++++-
 Telegram/SourceFiles/boxes/username_box.cpp |  8 +++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c2ab227c4..0d33fc30c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -385,6 +385,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_dlg_filter" = "Search";
 "lng_dlg_new_group_name" = "Group name";
 "lng_dlg_new_channel_name" = "Channel name";
+"lng_dlg_new_bot_name" = "Bot name";
 "lng_no_chats" = "Your chats will be here";
 "lng_no_chats_filter" = "No chats currently belong to this folder.";
 "lng_contacts_loading" = "Loading...";
@@ -398,7 +399,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_save" = "Save";
 
 "lng_username_title" = "Username";
-"lng_username_description" = "You can choose a username on Telegram. If you do, other people will be able to find you by this username and contact you without knowing your phone number.\n\nYou can use **a-z**, **0-9** and **underscores**.\nMinimum length is **5 characters**.";
+"lng_username_description1" = "You can choose a username on Telegram. If you do, other people will be able to find you by this username and contact you without knowing your phone number.";
+"lng_username_description2" = "You can use **a-z**, **0-9** and **underscores**.\nMinimum length is **5 characters**.";
 "lng_username_choose" = "Choose your username.";
 "lng_username_invalid" = "This username is invalid.";
 "lng_username_occupied" = "This username is already occupied.";
@@ -429,6 +431,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_usernames_deactivate_description" = "Do you want to hide this link from the channel info page?";
 "lng_channel_usernames_description" = "Drag and drop links to change the order in which they will be displayed on the channel info page.";
 
+"lng_bot_username_title" = "Username";
+"lng_bot_username_description1" = "If you set a public link, other people will be able to find your bot.";
+"lng_bot_usernames_activate_description" = "Do you want to show this link on the bot info page?";
+"lng_bot_usernames_deactivate_description" = "Do you want to hide this link from the bot info page?";
+"lng_bot_usernames_description" = "Drag and drop links to change the order in which they will be displayed on the bot info page.";
+
 "lng_bio_placeholder" = "Bio";
 
 "lng_settings_section_info" = "My info";
@@ -1214,6 +1222,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_manage_group_title" = "Manage Group";
 "lng_manage_channel_title" = "Manage Channel";
+"lng_manage_bot_title" = "Manage Bot";
 "lng_manage_peer_recent_actions" = "Recent Actions";
 "lng_manage_peer_members" = "Members";
 "lng_manage_peer_subscribers" = "Subscribers";
@@ -1264,6 +1273,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_no_forwards_about" = "Members won't be able to forward messages from this group or save media files.";
 "lng_manage_peer_no_forwards_about_channel" = "Subscribers won't be able to forward messages from this channel or save media files.";
 
+"lng_manage_peer_bot_public_link" = "Public Link";
+"lng_manage_peer_bot_public_links" = "Public Links";
+"lng_manage_peer_bot_edit_intro" = "Edit Intro";
+"lng_manage_peer_bot_edit_commands" = "Edit Commands";
+"lng_manage_peer_bot_edit_settings" = "Change Bot Settings";
+"lng_manage_peer_bot_about" = "Use {bot} to manage this bot.";
+"lng_manage_peer_bot_delete" = "Delete Bot";
+
 "lng_manage_discussion_group" = "Discussion";
 "lng_manage_discussion_group_add" = "Add a group";
 "lng_manage_linked_channel" = "Linked channel";
@@ -2357,6 +2374,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_contact_phone_will_be_shared" = "You can make your phone visible to {user}.";
 "lng_edit_contact_title" = "Edit contact name";
 "lng_edit_channel_title" = "Edit channel";
+"lng_edit_bot_title" = "Edit bot";
 "lng_edit_sign_messages" = "Sign messages";
 "lng_edit_group" = "Edit group";
 "lng_edit_self_title" = "Edit your name";
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 6422de285..b1feee7f5 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -314,11 +314,17 @@ void UsernamesBox(
 
 	AddUsernameCheckLabel(container, editor->checkInfoChanged());
 
+	auto description = rpl::combine(
+		tr::lng_username_description1(Ui::Text::RichLangValue),
+		tr::lng_username_description2(Ui::Text::RichLangValue)
+	) | rpl::map([](TextWithEntities d1, TextWithEntities d2) {
+		return d1.append("\n\n").append(std::move(d2));
+	});
 	container->add(object_ptr<Ui::DividerLabel>(
 		container,
 		object_ptr<Ui::FlatLabel>(
 			container,
-			tr::lng_username_description(Ui::Text::RichLangValue),
+			std::move(description),
 			st::boxDividerLabel),
 		st::settingsDividerLabelPadding));
 

From 2276a4c9aff0e36d4bd967b78dd20829d616ea44 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 9 Apr 2023 20:36:39 +0300
Subject: [PATCH 041/676] Added menu item to bot info for bot management.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp | 5 ++++-
 Telegram/SourceFiles/data/data_session.cpp              | 1 +
 Telegram/SourceFiles/data/data_user.h                   | 1 +
 Telegram/SourceFiles/window/window_peer_menu.cpp        | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 0754484bd..0e5626642 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_message_reactions.h"
 #include "data/data_peer_values.h"
+#include "data/data_user.h"
 #include "history/admin_log/history_admin_log_section.h"
 #include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
@@ -2014,7 +2015,9 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 }
 
 bool EditPeerInfoBox::Available(not_null<PeerData*> peer) {
-	if (const auto chat = peer->asChat()) {
+	if (const auto bot = peer->asUser()) {
+		return bot->botInfo && bot->botInfo->canEditInformation;
+	} else if (const auto chat = peer->asChat()) {
 		return false
 			|| chat->canEditInformation()
 			|| chat->canEditPermissions();
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 3fc5717d8..59bf0886d 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -667,6 +667,7 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 					result->botInfo->inlinePlaceholder = QString();
 				}
 				result->botInfo->supportsAttachMenu = data.is_bot_attach_menu();
+				result->botInfo->canEditInformation = data.is_bot_can_edit();
 			} else {
 				result->setBotInfoVersion(-1);
 			}
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index e0355d8e9..cc32613f9 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -23,6 +23,7 @@ struct BotInfo {
 	bool readsAllHistory = false;
 	bool cantJoinGroups = false;
 	bool supportsAttachMenu = false;
+	bool canEditInformation = false;
 	int version = 0;
 	int descriptionVersion = 0;
 	QString description;
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index bea338031..4224fd4a3 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -982,7 +982,9 @@ void Filler::addManageChat() {
 	}
 	const auto peer = _peer;
 	const auto navigation = _controller;
-	const auto text = (peer->isChat() || peer->isMegagroup())
+	const auto text = peer->isUser()
+		? tr::lng_manage_bot_title(tr::now)
+		: (peer->isChat() || peer->isMegagroup())
 		? tr::lng_manage_group_title(tr::now)
 		: tr::lng_manage_channel_title(tr::now);
 	_addAction(text, [=] {

From bbeefaed9c09d2a852dd55c9764fed8691b5f678 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 9 Apr 2023 21:39:21 +0300
Subject: [PATCH 042/676] Added api support to upload bot photo.

---
 Telegram/SourceFiles/api/api_peer_photo.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index 5056473d6..a449b2200 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -367,14 +367,21 @@ void PeerPhoto::ready(
 			done();
 		}
 	};
-	if (peer->isSelf()) {
+	const auto botUserInput = [&] {
+		const auto user = peer->asUser();
+		return (user && user->botInfo && user->botInfo->canEditInformation)
+			? std::make_optional<MTPInputUser>(user->inputUser)
+			: std::nullopt;
+	}();
+	if (peer->isSelf() || botUserInput) {
 		using Flag = MTPphotos_UploadProfilePhoto::Flag;
 		const auto none = MTPphotos_UploadProfilePhoto::Flags(0);
 		_api.request(MTPphotos_UploadProfilePhoto(
 			MTP_flags((file ? Flag::f_file : none)
+				| (botUserInput ? Flag::f_bot : none)
 				| (videoSize ? Flag::f_video_emoji_markup : none)
 				| ((type == UploadType::Fallback) ? Flag::f_fallback : none)),
-			MTPInputUser(), // bot
+			botUserInput ? (*botUserInput) : MTPInputUser(), // bot
 			file ? (*file) : MTPInputFile(),
 			MTPInputFile(), // video
 			MTPdouble(), // video_start_ts

From 896bbb7c56e3a13ad294ee9ce6296f10bfd56740 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 9 Apr 2023 23:05:38 +0300
Subject: [PATCH 043/676] Added api support to toggle and reorder bot
 usernames.

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

diff --git a/Telegram/SourceFiles/api/api_user_names.cpp b/Telegram/SourceFiles/api/api_user_names.cpp
index 3e74dd65c..fa040f17e 100644
--- a/Telegram/SourceFiles/api/api_user_names.cpp
+++ b/Telegram/SourceFiles/api/api_user_names.cpp
@@ -24,6 +24,14 @@ namespace {
 	};
 }
 
+[[nodiscard]] std::optional<MTPInputUser> BotUserInput(
+		not_null<PeerData*> peer) {
+	const auto user = peer->asUser();
+	return (user && user->botInfo && user->botInfo->canEditInformation)
+		? std::make_optional<MTPInputUser>(user->inputUser)
+		: std::nullopt;
+}
+
 } // namespace
 
 Usernames::Usernames(not_null<ApiWrap*> api)
@@ -157,6 +165,12 @@ rpl::producer<rpl::no_value, Usernames::Error> Usernames::toggle(
 			MTP_string(username),
 			MTP_bool(active)
 		)).done(done).fail(fail).send();
+	} else if (const auto botUserInput = BotUserInput(peer)) {
+		_api.request(MTPbots_ToggleUsername(
+			*botUserInput,
+			MTP_string(username),
+			MTP_bool(active)
+		)).done(done).fail(fail).send();
 	} else {
 		return rpl::never<rpl::no_value, Error>();
 	}
@@ -204,6 +218,12 @@ rpl::producer<> Usernames::reorder(
 				MTP_vector<MTPstring>(std::move(tlUsernames))
 			)).done(finish).fail(finish).send();
 			_reorderRequests.emplace(peerId, requestId);
+		} else if (const auto botUserInput = BotUserInput(peer)) {
+			const auto requestId = _api.request(MTPbots_ReorderUsernames(
+				*botUserInput,
+				MTP_vector<MTPstring>(std::move(tlUsernames))
+			)).done(finish).fail(finish).send();
+			_reorderRequests.emplace(peerId, requestId);
 		}
 		return lifetime;
 	};

From 973dd5c50f8a6ba976c6195daed5dcb444cb59a4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 9 Apr 2023 23:41:02 +0300
Subject: [PATCH 044/676] Added support of bots to list of usernames
 management.

---
 .../boxes/peers/edit_peer_usernames_list.cpp        | 13 ++++++++++++-
 .../boxes/peers/edit_peer_usernames_list.h          |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
index 2c785024d..c3a1c0735 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "base/event_filter.h"
 #include "data/data_peer.h"
+#include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
@@ -197,6 +198,9 @@ UsernamesList::UsernamesList(
 : RpWidget(parent)
 , _show(show)
 , _peer(peer)
+, _isBot(peer->isUser()
+	&& peer->asUser()->botInfo
+	&& peer->asUser()->botInfo->canEditInformation)
 , _focusCallback(std::move(focusCallback)) {
 	{
 		auto &api = _peer->session().api();
@@ -250,7 +254,8 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 			object_ptr<Row>(content, username, _show, link));
 		_rows.push_back(row);
 		row->addClickHandler([=] {
-			if (_reordering || (!_peer->isSelf() && !_peer->isChannel())) {
+			if (_reordering
+				|| (!_peer->isSelf() && !_peer->isChannel() && !_isBot)) {
 				return;
 			}
 
@@ -263,6 +268,10 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 				? (username.active
 					? tr::lng_usernames_deactivate_description()
 					: tr::lng_usernames_activate_description())
+				: _isBot
+				? (username.active
+					? tr::lng_bot_usernames_deactivate_description()
+					: tr::lng_bot_usernames_activate_description())
 				: (username.active
 					? tr::lng_channel_usernames_deactivate_description()
 					: tr::lng_channel_usernames_activate_description());
@@ -359,6 +368,8 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 			_container,
 			_peer->isSelf()
 				? tr::lng_usernames_description()
+				: _isBot
+				? tr::lng_bot_usernames_description()
 				: tr::lng_channel_usernames_description());
 	}
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h
index c93bd232a..483ca2453 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.h
@@ -41,6 +41,7 @@ private:
 
 	const std::shared_ptr<Ui::Show> _show;
 	const not_null<PeerData*> _peer;
+	const bool _isBot = false;
 	Fn<void()> _focusCallback;
 
 	base::unique_qptr<Ui::VerticalLayout> _container;

From c53b26dec864b4661de575173869fbaed5892aee Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 10 Apr 2023 00:11:16 +0300
Subject: [PATCH 045/676] Added ability to provide empty callback to list of
 usernames management.

---
 .../boxes/peers/edit_peer_usernames_list.cpp  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
index c3a1c0735..aa0a26afb 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
@@ -65,6 +65,7 @@ public:
 		not_null<Ui::RpWidget*> parent,
 		const Data::Username &data,
 		std::shared_ptr<Ui::Show> show,
+		QString status,
 		QString link);
 
 	[[nodiscard]] const Data::Username &username() const;
@@ -91,15 +92,12 @@ UsernamesList::Row::Row(
 	not_null<Ui::RpWidget*> parent,
 	const Data::Username &data,
 	std::shared_ptr<Ui::Show> show,
+	QString status,
 	QString link)
 : Ui::SettingsButton(parent, rpl::never<QString>())
 , _st(st::inviteLinkListItem)
 , _data(data)
-, _status(data.editable
-	? tr::lng_usernames_edit(tr::now)
-	: data.active
-	? tr::lng_usernames_active(tr::now)
-	: tr::lng_usernames_non_active(tr::now))
+, _status(std::move(status))
 , _rightAction(Ui::CreateChild<RightAction>(this))
 , _iconRect(
 	_st.photoPosition.x() + st::inviteLinkIconSkip,
@@ -250,8 +248,13 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 	for (const auto &username : usernames) {
 		const auto link = _peer->session().createInternalLinkFull(
 			username.username);
+		const auto status = (username.editable && _focusCallback)
+			? tr::lng_usernames_edit(tr::now)
+			: username.active
+			? tr::lng_usernames_active(tr::now)
+			: tr::lng_usernames_non_active(tr::now);
 		const auto row = content->add(
-			object_ptr<Row>(content, username, _show, link));
+			object_ptr<Row>(content, username, _show, status, link));
 		_rows.push_back(row);
 		row->addClickHandler([=] {
 			if (_reordering
@@ -260,7 +263,9 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 			}
 
 			if (username.editable) {
-				_focusCallback();
+				if (_focusCallback) {
+					_focusCallback();
+				}
 				return;
 			}
 

From cfc8820bad66de91b63afa94ed7048f4d5195efd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 9 Apr 2023 23:25:18 +0300
Subject: [PATCH 046/676] Added support of non-self users to UsernamesBox.

---
 Telegram/SourceFiles/boxes/username_box.cpp   | 59 +++++++++++++------
 Telegram/SourceFiles/boxes/username_box.h     |  6 +-
 .../settings/settings_information.cpp         |  3 +-
 .../SourceFiles/settings/settings_main.cpp    |  2 +-
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index b1feee7f5..862a43e25 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_peer_usernames_list.h"
 #include "base/timer.h"
 #include "boxes/peers/edit_peer_common.h"
+#include "data/data_channel.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
@@ -45,7 +46,7 @@ namespace {
 
 class UsernameEditor final : public Ui::RpWidget {
 public:
-	UsernameEditor(not_null<Ui::RpWidget*>, not_null<Main::Session*> session);
+	UsernameEditor(not_null<Ui::RpWidget*>, not_null<PeerData*> peer);
 
 	void setInnerFocus();
 	[[nodiscard]] rpl::producer<> submitted() const;
@@ -66,8 +67,11 @@ private:
 
 	void checkInfoChange();
 
+	[[nodiscard]] QString editableUsername() const;
+
 	QString getName() const;
 
+	const not_null<PeerData*> _peer;
 	const not_null<Main::Session*> _session;
 	const style::margins &_padding;
 	MTP::Sender _api;
@@ -87,18 +91,19 @@ private:
 
 UsernameEditor::UsernameEditor(
 	not_null<Ui::RpWidget*>,
-	not_null<Main::Session*> session)
-: _session(session)
+	not_null<PeerData*> peer)
+: _peer(peer)
+, _session(&peer->session())
 , _padding(st::usernamePadding)
 , _api(&_session->mtp())
 , _username(
 	this,
 	st::defaultInputField,
 	rpl::single(u"@username"_q),
-	session->user()->editableUsername(),
+	editableUsername(),
 	QString())
 , _checkTimer([=] { check(); }) {
-	_goodText = _session->user()->editableUsername().isEmpty()
+	_goodText = editableUsername().isEmpty()
 		? QString()
 		: tr::lng_username_available(tr::now);
 
@@ -148,6 +153,16 @@ rpl::producer<> UsernameEditor::save() {
 	return _saved.events();
 }
 
+QString UsernameEditor::editableUsername() const {
+	if (const auto user = _peer->asUser()) {
+		return user->editableUsername();
+	} else if (const auto channel = _peer->asChannel()) {
+		return channel->editableUsername();
+	} else {
+		return QString();
+	}
+}
+
 rpl::producer<UsernameCheckInfo> UsernameEditor::checkInfoChanged() const {
 	return _checkInfoChanged.events();
 }
@@ -166,7 +181,7 @@ void UsernameEditor::check() {
 		_checkRequestId = 0;
 
 		_errorText = (mtpIsTrue(result)
-				|| _checkUsername == _session->user()->editableUsername())
+				|| (_checkUsername == editableUsername()))
 			? QString()
 			: tr::lng_username_occupied(tr::now);
 		_goodText = _errorText.isEmpty()
@@ -251,14 +266,15 @@ void UsernameEditor::checkInfoPurchaseAvailable() {
 }
 
 void UsernameEditor::updateFail(const QString &error) {
-	const auto self = _session->user();
 	if ((error == u"USERNAME_NOT_MODIFIED"_q)
-		|| (_sentUsername == self->editableUsername())) {
-		self->setName(
-			TextUtilities::SingleLine(self->firstName),
-			TextUtilities::SingleLine(self->lastName),
-			TextUtilities::SingleLine(self->nameOrPhone),
-			TextUtilities::SingleLine(_sentUsername));
+		|| (_sentUsername == editableUsername())) {
+		if (const auto user = _peer->asUser()) {
+			user->setName(
+				TextUtilities::SingleLine(user->firstName),
+				TextUtilities::SingleLine(user->lastName),
+				TextUtilities::SingleLine(user->nameOrPhone),
+				TextUtilities::SingleLine(_sentUsername));
+		}
 		_saved.fire_done();
 	} else if (error == u"USERNAME_INVALID"_q) {
 		_username->setFocus();
@@ -283,7 +299,7 @@ void UsernameEditor::checkFail(const QString &error) {
 		_errorText = tr::lng_username_invalid(tr::now);
 		checkInfoChange();
 	} else if ((error == u"USERNAME_OCCUPIED"_q)
-		&& (_checkUsername != _session->user()->editableUsername())) {
+		&& (_checkUsername != editableUsername())) {
 		_errorText = tr::lng_username_occupied(tr::now);
 		checkInfoChange();
 	} else if (error == u"USERNAME_PURCHASE_AVAILABLE"_q) {
@@ -302,20 +318,25 @@ QString UsernameEditor::getName() const {
 
 void UsernamesBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<Main::Session*> session) {
-	box->setTitle(tr::lng_username_title());
+		not_null<PeerData*> peer) {
+	const auto isBot = peer && peer->isUser() && peer->asUser()->isBot();
+	box->setTitle(isBot
+		? tr::lng_bot_username_title()
+		: tr::lng_username_title());
 
 	const auto container = box->verticalLayout();
 
 	const auto editor = box->addRow(
-		object_ptr<UsernameEditor>(box, session),
+		object_ptr<UsernameEditor>(box, peer),
 		{});
 	box->setFocusCallback([=] { editor->setInnerFocus(); });
 
 	AddUsernameCheckLabel(container, editor->checkInfoChanged());
 
 	auto description = rpl::combine(
-		tr::lng_username_description1(Ui::Text::RichLangValue),
+		(isBot
+			? tr::lng_bot_username_description1
+			: tr::lng_username_description1)(Ui::Text::RichLangValue),
 		tr::lng_username_description2(Ui::Text::RichLangValue)
 	) | rpl::map([](TextWithEntities d1, TextWithEntities d2) {
 		return d1.append("\n\n").append(std::move(d2));
@@ -331,7 +352,7 @@ void UsernamesBox(
 	const auto list = box->addRow(
 		object_ptr<UsernamesList>(
 			box,
-			session->user(),
+			peer,
 			std::make_shared<Ui::BoxShow>(box),
 			[=] {
 				box->scrollToY(0);
diff --git a/Telegram/SourceFiles/boxes/username_box.h b/Telegram/SourceFiles/boxes/username_box.h
index 46183e3ef..423631dd1 100644
--- a/Telegram/SourceFiles/boxes/username_box.h
+++ b/Telegram/SourceFiles/boxes/username_box.h
@@ -12,13 +12,11 @@ class GenericBox;
 class VerticalLayout;
 } // namespace Ui
 
-namespace Main {
-class Session;
-} // namespace Main
+class PeerData;
 
 void UsernamesBox(
 	not_null<Ui::GenericBox*> box,
-	not_null<Main::Session*> session);
+	not_null<PeerData*> peer);
 
 struct UsernameCheckInfo final {
 	enum class Type {
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 3ecd1ba5a..204cd73b8 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -419,7 +419,8 @@ void SetupRows(
 		std::move(value),
 		tr::lng_context_copy_mention(tr::now),
 		[=] {
-			const auto box = controller->show(Box(UsernamesBox, session));
+			const auto box = controller->show(
+				Box(UsernamesBox, session->user()));
 			box->boxClosing(
 			) | rpl::start_with_next([=] {
 				session->api().usernames().requestToCache(session->user());
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 48105d8ef..7b46bb111 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -209,7 +209,7 @@ void Cover::initViewers() {
 	_username->overrideLinkClickHandler([=] {
 		const auto username = _user->userName();
 		if (username.isEmpty()) {
-			_controller->show(Box(UsernamesBox, &_user->session()));
+			_controller->show(Box(UsernamesBox, _user));
 		} else {
 			QGuiApplication::clipboard()->setText(
 				_user->session().createInternalLinkFull(username));

From 30a7893afec240cd510d3e909393644385901876 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 9 Apr 2023 21:40:08 +0300
Subject: [PATCH 047/676] Added initial implementation of bot management box.

---
 .../boxes/peers/edit_peer_info_box.cpp        | 198 +++++++++++++++++-
 1 file changed, 191 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 0e5626642..6a8b39385 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_peer_requests_box.h"
 #include "boxes/peers/edit_peer_reactions.h"
 #include "boxes/stickers_box.h"
+#include "boxes/username_box.h"
 #include "ui/boxes/single_choice_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "core/application.h"
@@ -67,6 +68,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
+constexpr auto kBotManagerUsername = "BotFather"_cs;
+
 [[nodiscard]] auto ToPositiveNumberString() {
 	return rpl::map([](int count) {
 		return count ? QString::number(count) : QString();
@@ -306,6 +309,11 @@ private:
 	void fillManageSection();
 	void fillPendingRequestsButton();
 
+	void fillBotUsernamesButton();
+	void fillBotEditIntroButton();
+	void fillBotEditCommandsButton();
+	void fillBotEditSettingsButton();
+
 	void submitTitle();
 	void submitDescription();
 	void deleteWithConfirmation();
@@ -341,6 +349,8 @@ private:
 	void continueSave();
 	void cancelSave();
 
+	void toggleBotManager(const QString &command);
+
 	void togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
 		bool hidden,
@@ -363,6 +373,7 @@ private:
 	not_null<PeerData*> _peer;
 	MTP::Sender _api;
 	const bool _isGroup = false;
+	const bool _isBot = false;
 
 	base::unique_qptr<Ui::VerticalLayout> _wrap;
 	Controls _controls;
@@ -386,8 +397,11 @@ Controller::Controller(
 , _box(box)
 , _peer(peer)
 , _api(&_peer->session().mtp())
-, _isGroup(_peer->isChat() || _peer->isMegagroup()) {
-	_box->setTitle(_isGroup
+, _isGroup(_peer->isChat() || _peer->isMegagroup())
+, _isBot(_peer->isUser() && _peer->asUser()->botInfo) {
+	_box->setTitle(_isBot
+		? tr::lng_edit_bot_title()
+		: _isGroup
 		? tr::lng_edit_group()
 		: tr::lng_edit_channel_title());
 	_box->addButton(tr::lng_settings_save(), [=] {
@@ -491,7 +505,9 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		object_ptr<Ui::InputField>(
 			_wrap,
 			st::defaultInputField,
-			(_isGroup
+			(_isBot
+				? tr::lng_dlg_new_bot_name
+				: _isGroup
 				? tr::lng_dlg_new_group_name
 				: tr::lng_dlg_new_channel_name)(),
 			_peer->name()),
@@ -603,7 +619,9 @@ object_ptr<Ui::RpWidget> Controller::createStickersEdit() {
 }
 
 bool Controller::canEditInformation() const {
-	if (const auto channel = _peer->asChannel()) {
+	if (_isBot) {
+		return _peer->asUser()->botInfo->canEditInformation;
+	} else if (const auto channel = _peer->asChannel()) {
 		return channel->canEditInformation();
 	} else if (const auto chat = _peer->asChat()) {
 		return chat->canEditInformation();
@@ -985,12 +1003,41 @@ void Controller::fillHistoryVisibilityButton() {
 void Controller::fillManageSection() {
 	Expects(_controls.buttonsLayout != nullptr);
 
-	using namespace rpl::mappers;
+	if (_isBot) {
+		const auto &container = _controls.buttonsLayout;
+
+		AddSkip(
+			container,
+			st::editPeerTopButtonsLayoutSkipCustomTop);
+		fillBotUsernamesButton();
+		fillBotEditIntroButton();
+		fillBotEditCommandsButton();
+		fillBotEditSettingsButton();
+		Settings::AddSkip(
+			container,
+			st::editPeerTopButtonsLayoutSkipCustomBottom);
+		container->add(object_ptr<Ui::DividerLabel>(
+			container,
+			object_ptr<Ui::FlatLabel>(
+				container,
+				tr::lng_manage_peer_bot_about(
+					lt_bot,
+					rpl::single(Ui::Text::Link(
+						'@' + kBotManagerUsername.utf16(),
+						_peer->session().createInternalLinkFull(
+							kBotManagerUsername.utf16()))),
+					Ui::Text::RichLangValue),
+				st::boxDividerLabel),
+			st::settingsDividerLabelPadding));
+		return;
+	}
 
 	const auto chat = _peer->asChat();
 	const auto channel = _peer->asChannel();
 	const auto isChannel = (!chat);
-	if (!chat && !channel) return;
+	if (!chat && !channel) {
+		return;
+	}
 
 	const auto canEditType = [&] {
 		return isChannel
@@ -1043,7 +1090,6 @@ void Controller::fillManageSection() {
 	}();
 
 	const auto canEditStickers = [&] {
-		// return true;
 		return isChannel
 			? channel->canEditStickers()
 			: false;
@@ -1308,6 +1354,98 @@ void Controller::fillPendingRequestsButton() {
 	}, wrap->lifetime());
 }
 
+void Controller::fillBotUsernamesButton() {
+	Expects(_isBot);
+
+	const auto user = _peer->asUser();
+
+	auto localUsernames = rpl::single(
+		user->usernames()
+	) | rpl::map([](const std::vector<QString> &usernames) {
+		return ranges::views::all(
+			usernames
+		) | ranges::views::transform([](const QString &u) {
+			return Data::Username{ u };
+		}) | ranges::to_vector;
+	});
+	auto usernamesValue = std::move(
+		localUsernames
+	) | rpl::then(
+		_peer->session().api().usernames().loadUsernames(_peer)
+	);
+	auto rightLabel = rpl::duplicate(
+		usernamesValue
+	) | rpl::map([=](const Data::Usernames &usernames) {
+		if (usernames.size() <= 1) {
+			return user->session().createInternalLink(user->username());
+		} else {
+			const auto active = ranges::count_if(
+				usernames,
+				[](const Data::Username &u) { return u.active; });
+			return u"%1/%2"_q.arg(active).arg(usernames.size());
+		}
+	});
+	auto leftLabel = std::move(
+		usernamesValue
+	) | rpl::map([=](const Data::Usernames &usernames) {
+		return (usernames.size() <= 1)
+			? tr::lng_manage_peer_bot_public_link()
+			: tr::lng_manage_peer_bot_public_links();
+	}) | rpl::flatten_latest();
+
+	const auto wrap = _controls.buttonsLayout->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_controls.buttonsLayout,
+			object_ptr<Ui::VerticalLayout>(
+				_controls.buttonsLayout)));
+	AddButtonWithCount(
+		_controls.buttonsLayout,
+		std::move(leftLabel),
+		std::move(rightLabel),
+		[=] {
+			Window::Show(_navigation).showBox(
+				Box(UsernamesBox, user),
+				Ui::LayerOption::KeepOther);
+		},
+		{ &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange });
+}
+
+void Controller::fillBotEditIntroButton() {
+	Expects(_isBot);
+
+	const auto user = _peer->asUser();
+	AddButtonWithCount(
+		_controls.buttonsLayout,
+		tr::lng_manage_peer_bot_edit_intro(),
+		rpl::never<QString>(),
+		[=] { toggleBotManager(u"%1-intro"_q.arg(user->username())); },
+		{ &st::settingsIconChat, Settings::kIconLightBlue });
+}
+
+void Controller::fillBotEditCommandsButton() {
+	Expects(_isBot);
+
+	const auto user = _peer->asUser();
+	AddButtonWithCount(
+		_controls.buttonsLayout,
+		tr::lng_manage_peer_bot_edit_commands(),
+		rpl::never<QString>(),
+		[=] { toggleBotManager(u"%1-commands"_q.arg(user->username())); },
+		{ &st::settingsIconChat, Settings::kIconLightBlue });
+}
+
+void Controller::fillBotEditSettingsButton() {
+	Expects(_isBot);
+
+	const auto user = _peer->asUser();
+	AddButtonWithCount(
+		_controls.buttonsLayout,
+		tr::lng_manage_peer_bot_edit_settings(),
+		rpl::never<QString>(),
+		[=] { toggleBotManager(user->username()); },
+		{ &st::settingsIconChat, Settings::kIconLightBlue });
+}
+
 void Controller::submitTitle() {
 	Expects(_controls.title != nullptr);
 
@@ -1670,6 +1808,19 @@ void Controller::saveTitle() {
 		)).done(std::move(onDone)
 		).fail(std::move(onFail)
 		).send();
+	} else if (_isBot) {
+		using Flag = MTPbots_SetBotInfo::Flag;
+		_api.request(MTPbots_SetBotInfo(
+			MTP_flags(Flag::f_bot | Flag::f_name),
+			_peer->asUser()->inputUser,
+			MTPstring(), // Lang code.
+			MTP_string(*_savingData.title), // Name.
+			MTPstring(), // About.
+			MTPstring() // Description.
+		)).done([=] {
+			continueSave();
+		}).fail(std::move(onFail)
+		).send();
 	} else {
 		continueSave();
 	}
@@ -1684,6 +1835,23 @@ void Controller::saveDescription() {
 		_peer->setAbout(*_savingData.description);
 		continueSave();
 	};
+	if (_isBot) {
+		using Flag = MTPbots_SetBotInfo::Flag;
+		_api.request(MTPbots_SetBotInfo(
+			MTP_flags(Flag::f_bot | Flag::f_about),
+			_peer->asUser()->inputUser,
+			MTPstring(), // Lang code.
+			MTPstring(), // Name.
+			MTP_string(*_savingData.description), // About.
+			MTPstring() // Description.
+		)).done([=] {
+			successCallback();
+		}).fail([=] {
+			_controls.description->showError();
+			cancelSave();
+		}).send();
+		return;
+	}
 	_api.request(MTPmessages_EditChatAbout(
 		_peer->input,
 		MTP_string(*_savingData.description)
@@ -1726,6 +1894,22 @@ void Controller::saveHistoryVisibility() {
 		[=] { cancelSave(); });
 }
 
+void Controller::toggleBotManager(const QString &command) {
+	const auto controller = _navigation->parentController();
+	_api.request(MTPcontacts_ResolveUsername(
+		MTP_string(kBotManagerUsername.utf16())
+	)).done([=](const MTPcontacts_ResolvedPeer &result) {
+		_peer->owner().processUsers(result.data().vusers());
+		_peer->owner().processChats(result.data().vchats());
+		const auto botPeer = _peer->owner().peerLoaded(
+			peerFromMTP(result.data().vpeer()));
+		if (const auto bot = botPeer ? botPeer->asUser() : nullptr) {
+			_peer->session().api().sendBotStart(bot, bot, command);
+			controller->showPeerHistory(bot);
+		}
+	}).send();
+}
+
 void Controller::togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
 		bool hidden,

From ca2a0d41c9ee5d174f8c1c10e5e907f44f9f7697 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 10 Apr 2023 02:32:47 +0300
Subject: [PATCH 048/676] Moved some app config values to separated file.

---
 Telegram/CMakeLists.txt                       |  2 ++
 .../info/profile/info_profile_phone_menu.cpp  | 34 +++++++------------
 .../main/main_app_config_values.cpp           | 30 ++++++++++++++++
 .../SourceFiles/main/main_app_config_values.h | 18 ++++++++++
 4 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100644 Telegram/SourceFiles/main/main_app_config_values.cpp
 create mode 100644 Telegram/SourceFiles/main/main_app_config_values.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 709a7290b..008c71b15 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -924,6 +924,8 @@ PRIVATE
     main/main_account.h
     main/main_app_config.cpp
     main/main_app_config.h
+    main/main_app_config_values.cpp
+    main/main_app_config_values.h
     main/main_domain.cpp
     main/main_domain.h
     main/main_session.cpp
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
index 9318229d7..0fea4cdb6 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "main/main_app_config.h"
+#include "main/main_app_config_values.h"
 #include "main/main_session.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/labels.h"
@@ -127,28 +128,19 @@ void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user) {
 			return;
 		}
 	}
-	const auto domains = user->session().account().appConfig().get<Strings>(
-		u"whitelisted_domains"_q,
-		std::vector<QString>());
-	const auto proj = [&, domain = u"fragment"_q](const QString &p) {
-		return p.contains(domain);
-	};
-	const auto it = ranges::find_if(domains, proj);
-	if (it == end(domains)) {
-		return;
+	if (const auto url = AppConfig::FragmentLink(&user->session())) {
+		menu->addSeparator(&st::expandedMenuSeparator);
+		const auto link = Ui::Text::Link(
+			tr::lng_info_mobile_context_menu_fragment_about_link(tr::now),
+			*url);
+		menu->addAction(base::make_unique_q<TextItem>(
+			menu->menu(),
+			st::reactionMenu.menu,
+			tr::lng_info_mobile_context_menu_fragment_about(
+				lt_link,
+				rpl::single(link),
+				Ui::Text::RichLangValue)));
 	}
-
-	menu->addSeparator(&st::expandedMenuSeparator);
-	const auto link = Ui::Text::Link(
-		tr::lng_info_mobile_context_menu_fragment_about_link(tr::now),
-		*it);
-	menu->addAction(base::make_unique_q<TextItem>(
-		menu->menu(),
-		st::reactionMenu.menu,
-		tr::lng_info_mobile_context_menu_fragment_about(
-			lt_link,
-			rpl::single(link),
-			Ui::Text::RichLangValue)));
 }
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/main/main_app_config_values.cpp b/Telegram/SourceFiles/main/main_app_config_values.cpp
new file mode 100644
index 000000000..92faf0b1e
--- /dev/null
+++ b/Telegram/SourceFiles/main/main_app_config_values.cpp
@@ -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
+*/
+#include "main/main_app_config_values.h"
+
+#include "main/main_account.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+
+namespace AppConfig {
+
+std::optional<QString> FragmentLink(not_null<Main::Session*> session) {
+	using Strings = std::vector<QString>;
+	const auto domains = session->account().appConfig().get<Strings>(
+		u"whitelisted_domains"_q,
+		std::vector<QString>());
+	const auto proj = [&, domain = u"fragment"_q](const QString &p) {
+		return p.contains(domain);
+	};
+	const auto it = ranges::find_if(domains, proj);
+	return (it == end(domains))
+		? std::nullopt
+		: std::make_optional<QString>(*it);
+}
+
+} // namespace AppConfig
diff --git a/Telegram/SourceFiles/main/main_app_config_values.h b/Telegram/SourceFiles/main/main_app_config_values.h
new file mode 100644
index 000000000..fc1f8e76a
--- /dev/null
+++ b/Telegram/SourceFiles/main/main_app_config_values.h
@@ -0,0 +1,18 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace AppConfig {
+
+[[nodiscard]] std::optional<QString> FragmentLink(not_null<Main::Session*>);
+
+} // namespace AppConfig

From a02ded6fd8c60a1894df129c888a57ba286b196e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 10 Apr 2023 02:32:53 +0300
Subject: [PATCH 049/676] Disabled editor in UsernamesBox for bots.

---
 Telegram/Resources/langs/lang.strings       |  3 +-
 Telegram/SourceFiles/boxes/username_box.cpp | 42 +++++++++++++++------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0d33fc30c..5d5bb784e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -432,7 +432,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_usernames_description" = "Drag and drop links to change the order in which they will be displayed on the channel info page.";
 
 "lng_bot_username_title" = "Username";
-"lng_bot_username_description1" = "If you set a public link, other people will be able to find your bot.";
+"lng_bot_username_description1" = "This link cannot be edited. You can acquire additional usernames on {link}.";
+"lng_bot_username_description1_link" = "Fragment";
 "lng_bot_usernames_activate_description" = "Do you want to show this link on the bot info page?";
 "lng_bot_usernames_deactivate_description" = "Do you want to hide this link from the bot info page?";
 "lng_bot_usernames_description" = "Drag and drop links to change the order in which they will be displayed on the bot info page.";
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 862a43e25..3e0245486 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config_values.h"
 #include "main/main_session.h"
 #include "mtproto/sender.h"
 #include "settings/settings_common.h"
@@ -49,6 +50,7 @@ public:
 	UsernameEditor(not_null<Ui::RpWidget*>, not_null<PeerData*> peer);
 
 	void setInnerFocus();
+	void setEnabled(bool value);
 	[[nodiscard]] rpl::producer<> submitted() const;
 	[[nodiscard]] rpl::producer<> save();
 	[[nodiscard]] rpl::producer<UsernameCheckInfo> checkInfoChanged() const;
@@ -127,6 +129,10 @@ void UsernameEditor::setInnerFocus() {
 	_username->setFocusFast();
 }
 
+void UsernameEditor::setEnabled(bool value) {
+	_username->setEnabled(value);
+}
+
 void UsernameEditor::resizeEvent(QResizeEvent *e) {
 	_username->resize(
 		width() - _padding.left() - _padding.right(),
@@ -329,18 +335,31 @@ void UsernamesBox(
 	const auto editor = box->addRow(
 		object_ptr<UsernameEditor>(box, peer),
 		{});
+	editor->setEnabled(!isBot);
 	box->setFocusCallback([=] { editor->setInnerFocus(); });
 
 	AddUsernameCheckLabel(container, editor->checkInfoChanged());
 
-	auto description = rpl::combine(
-		(isBot
-			? tr::lng_bot_username_description1
-			: tr::lng_username_description1)(Ui::Text::RichLangValue),
-		tr::lng_username_description2(Ui::Text::RichLangValue)
-	) | rpl::map([](TextWithEntities d1, TextWithEntities d2) {
-		return d1.append("\n\n").append(std::move(d2));
-	});
+	auto description = [&]() -> rpl::producer<TextWithEntities> {
+		if (!isBot) {
+			return rpl::combine(
+				tr::lng_username_description1(Ui::Text::RichLangValue),
+				tr::lng_username_description2(Ui::Text::RichLangValue)
+			) | rpl::map([](TextWithEntities d1, TextWithEntities d2) {
+				return d1.append("\n\n").append(std::move(d2));
+			});
+		}
+		if (const auto url = AppConfig::FragmentLink(&peer->session())) {
+			const auto link = Ui::Text::Link(
+				tr::lng_bot_username_description1_link(tr::now),
+				*url);
+			return tr::lng_bot_username_description1(
+				lt_link,
+				rpl::single(link),
+				Ui::Text::RichLangValue);
+		}
+		return rpl::single<TextWithEntities>({});
+	}();
 	container->add(object_ptr<Ui::DividerLabel>(
 		container,
 		object_ptr<Ui::FlatLabel>(
@@ -354,10 +373,9 @@ void UsernamesBox(
 			box,
 			peer,
 			std::make_shared<Ui::BoxShow>(box),
-			[=] {
-				box->scrollToY(0);
-				editor->setInnerFocus();
-			}),
+			!isBot
+				? [=] { box->scrollToY(0); editor->setInnerFocus(); }
+				: Fn<void()>(nullptr)),
 		{});
 
 	const auto finish = [=] {

From 22ca4e25d9c631b84d48a94b8b436da38de60cf0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Apr 2023 19:18:54 +0400
Subject: [PATCH 050/676] Fix replace media button non-disappearance.

---
 .../history_view_compose_controls.cpp         | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 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 76fe0b972..c37ff8827 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1910,22 +1910,29 @@ void ComposeControls::applyCloudDraft() {
 void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	Expects(_history != nullptr);
 
-	InvokeQueued(_autocomplete.get(), [=] { updateStickersByEmoji(); });
-	const auto guard = gsl::finally([&] {
-		updateSendButtonType();
-		updateControlsVisibility();
-		updateControlsGeometry(_wrap->size());
-	});
-
 	const auto editDraft = _history->draft(draftKey(DraftType::Edit));
 	const auto draft = editDraft
 		? editDraft
 		: _history->draft(draftKey(DraftType::Normal));
+	const auto editingId = (draft == editDraft)
+		? FullMsgId{ _history->peer->id, draft ? draft->msgId : 0 }
+		: FullMsgId();
+
+	InvokeQueued(_autocomplete.get(), [=] { updateStickersByEmoji(); });
+	const auto guard = gsl::finally([&] {
+		updateSendButtonType();
+		updateReplaceMediaButton(editingId);
+		updateControlsVisibility();
+		updateControlsGeometry(_wrap->size());
+	});
+
 	if (!draft) {
 		clearFieldText(0, fieldHistoryAction);
 		_field->setFocus();
 		_header->editMessage({});
 		_header->replyToMessage({});
+		_canReplaceMedia = false;
+		_photoEditMedia = nullptr;
 		return;
 	}
 
@@ -1939,15 +1946,11 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	}
 
 	if (draft == editDraft) {
-		_header->editMessage({ _history->peer->id, draft->msgId });
+		_header->editMessage(editingId);
 		_header->replyToMessage({});
 	} else {
 		_canReplaceMedia = false;
 		_photoEditMedia = nullptr;
-		if (updateReplaceMediaButton(FullMsgId())) {
-			updateControlsVisibility();
-			updateControlsGeometry(_wrap->size());
-		}
 		_header->replyToMessage({ _history->peer->id, draft->msgId });
 		if (_header->replyingToMessage()) {
 			cancelForward();

From ad3ec244e94b60834e3cd48ca6727d4f45bc4dc3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Apr 2023 20:06:38 +0400
Subject: [PATCH 051/676] Fix pasting file for media replacement.

---
 .../SourceFiles/boxes/edit_caption_box.cpp    | 43 +++++++++++++++++++
 Telegram/SourceFiles/boxes/edit_caption_box.h |  6 +++
 .../SourceFiles/history/history_widget.cpp    |  9 ++++
 3 files changed, 58 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 92e59a8a3..1642a3d8a 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -291,6 +291,49 @@ void EditCaptionBox::StartMediaReplace(
 		crl::guard(controller, show));
 }
 
+void EditCaptionBox::StartMediaReplace(
+		not_null<Window::SessionController*> controller,
+		FullMsgId itemId,
+		Ui::PreparedList &&list,
+		TextWithTags text,
+		Fn<void()> saved) {
+	const auto session = &controller->session();
+	const auto item = session->data().message(itemId);
+	if (!item) {
+		return;
+	}
+	const auto type = ComputeAlbumType(item);
+	const auto showError = [=](tr::phrase<> t) {
+		controller->showToast({ t(tr::now) });
+	};
+	const auto checkResult = [=](const Ui::PreparedList &list) {
+		if (list.files.size() != 1) {
+			return false;
+		}
+		const auto &file = list.files.front();
+		const auto mime = file.information->filemime;
+		if (Core::IsMimeSticker(mime)) {
+			showError(tr::lng_edit_media_invalid_file);
+			return false;
+		} else if (type != Ui::AlbumType::None
+			&& !file.canBeInAlbumType(type)) {
+			showError(tr::lng_edit_media_album_error);
+			return false;
+		}
+		return true;
+	};
+	if (list.error != Ui::PreparedList::Error::None) {
+		showError(tr::lng_send_media_invalid_files);
+	} else if (checkResult(list)) {
+		controller->show(Box<EditCaptionBox>(
+			controller,
+			item,
+			std::move(text),
+			std::move(list),
+			std::move(saved)));
+	}
+}
+
 void EditCaptionBox::StartPhotoEdit(
 		not_null<Window::SessionController*> controller,
 		std::shared_ptr<Data::PhotoMedia> media,
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h
index ff3924b3d..80a7b0a82 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -50,6 +50,12 @@ public:
 		FullMsgId itemId,
 		TextWithTags text,
 		Fn<void()> saved);
+	static void StartMediaReplace(
+		not_null<Window::SessionController*> controller,
+		FullMsgId itemId,
+		Ui::PreparedList &&list,
+		TextWithTags text,
+		Fn<void()> saved);
 	static void StartPhotoEdit(
 		not_null<Window::SessionController*> controller,
 		std::shared_ptr<Data::PhotoMedia> media,
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 30bd8cb0e..422818169 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5182,6 +5182,15 @@ bool HistoryWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel) {
 	if (_editMsgId) {
+		if (_canReplaceMedia) {
+			EditCaptionBox::StartMediaReplace(
+				controller(),
+				{ _history->peer->id, _editMsgId },
+				std::move(list),
+				_field->getTextWithTags(),
+				crl::guard(_list, [=] { cancelEdit(); }));
+			return true;
+		}
 		controller()->showToast({ tr::lng_edit_caption_attach(tr::now) });
 		return false;
 	} else if (showSendingFilesError(list)) {

From d0e8802b9dfb1fc34227d960636a4ddf6e0f1121 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Apr 2023 20:54:56 +0400
Subject: [PATCH 052/676] Allow who viewed lists in topic groups.

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

diff --git a/Telegram/SourceFiles/api/api_who_reacted.cpp b/Telegram/SourceFiles/api/api_who_reacted.cpp
index 86e0a5881..6fc8800b9 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.cpp
+++ b/Telegram/SourceFiles/api/api_who_reacted.cpp
@@ -619,8 +619,11 @@ bool WhoReadExists(not_null<HistoryItem*> item) {
 		return false;
 	}
 	const auto type = DetectSeenType(item);
+	const auto thread = item->topic()
+		? (Data::Thread*)item->topic()
+		: item->history();
 	const auto unseen = (type == Ui::WhoReadType::Seen)
-		? item->unread(item->history())
+		? item->unread(thread)
 		: item->isUnreadMedia();
 	if (unseen) {
 		return false;
@@ -630,7 +633,6 @@ bool WhoReadExists(not_null<HistoryItem*> item) {
 	const auto chat = peer->asChat();
 	const auto megagroup = peer->asMegagroup();
 	if ((!chat && !megagroup)
-		|| peer->isForum()
 		|| (megagroup
 			&& (megagroup->flags() & ChannelDataFlag::ParticipantsHidden))) {
 		return false;

From 5cbf9a2dc4edfda0516023fb62cbe5b385341aae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Apr 2023 13:52:49 +0400
Subject: [PATCH 053/676] Show background preview in service messages.

---
 Telegram/Resources/langs/lang.strings         |  13 +-
 .../SourceFiles/data/data_media_types.cpp     |  64 ++++++++--
 Telegram/SourceFiles/data/data_media_types.h  |  36 +++++-
 Telegram/SourceFiles/history/history_item.cpp |  23 ++--
 .../view/history_view_service_message.cpp     |   8 +-
 .../history/view/media/history_view_media.h   |   3 +
 .../view/media/history_view_premium_gift.h    |   4 +
 .../view/media/history_view_service_box.h     |   6 +
 .../media/history_view_theme_document.cpp     | 115 ++++++++++++++++--
 .../view/media/history_view_theme_document.h  |  41 ++++++-
 .../media/history_view_userpic_suggestion.h   |   4 +
 11 files changed, 271 insertions(+), 46 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5d5bb784e..aab6d6862 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -749,6 +749,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_background_link_copied" = "Link copied to clipboard";
 "lng_background_blur" = "Blurred";
 "lng_background_sure_delete" = "Are you sure you want to delete this background?";
+"lng_background_other_info" = "{user} will be able to apply this wallpaper";
+"lng_background_apply1" = "Apply the wallpaper in this chat.";
+"lng_background_apply2" = "Enjoy the view.";
+"lng_background_apply_button" = "Apply For This Chat";
 
 "lng_download_path_ask" = "Ask download path for each file";
 "lng_download_path" = "Download path";
@@ -1539,10 +1543,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_suggested_video" = "{user} suggests you to use this profile video.";
 "lng_action_suggested_video_button" = "View Video";
 "lng_action_attach_menu_bot_allowed" = "You allowed this bot to message you when you added it in the attachment menu.";
-"lng_action_set_wallpaper_me" = "You set a new background for this chat.";
-"lng_action_set_wallpaper" = "{user} set a new background for this chat.";
-"lng_action_set_same_wallpaper_me" = "You set the same background for this chat.";
-"lng_action_set_same_wallpaper" = "{user} set the same background for this chat.";
+"lng_action_set_wallpaper_me" = "You set a new wallpaper for this chat";
+"lng_action_set_wallpaper" = "{user} set a new wallpaper for this chat";
+"lng_action_set_wallpaper_button" = "View Wallpaper";
+"lng_action_set_same_wallpaper_me" = "You set the same wallpaper for this chat";
+"lng_action_set_same_wallpaper" = "{user} set the same wallpaper for this chat";
 "lng_action_topic_created_inside" = "Topic created";
 "lng_action_topic_closed_inside" = "Topic closed";
 "lng_action_topic_reopened_inside" = "Topic reopened";
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 151bb3f89..d202d083c 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -392,7 +392,7 @@ const Invoice *Media::invoice() const {
 	return nullptr;
 }
 
-Data::CloudImage *Media::location() const {
+CloudImage *Media::location() const {
 	return nullptr;
 }
 
@@ -400,6 +400,10 @@ PollData *Media::poll() const {
 	return nullptr;
 }
 
+const WallPaper *Media::paper() const {
+	return nullptr;
+}
+
 bool Media::uploading() const {
 	return false;
 }
@@ -1238,7 +1242,7 @@ std::unique_ptr<Media> MediaLocation::clone(not_null<HistoryItem*> parent) {
 		_description);
 }
 
-Data::CloudImage *MediaLocation::location() const {
+CloudImage *MediaLocation::location() const {
 	return _location;
 }
 
@@ -1827,7 +1831,7 @@ ClickHandlerPtr MediaDice::MakeHandler(
 			.durationMs = Ui::Toast::kDefaultDuration * 2,
 			.multiline = true,
 		};
-		if (Data::CanSend(history->peer, ChatRestriction::SendOther)) {
+		if (CanSend(history->peer, ChatRestriction::SendOther)) {
 			auto link = Ui::Text::Link(
 				tr::lng_about_random_send(tr::now).toUpper());
 			link.entities.push_back(
@@ -1883,10 +1887,6 @@ int MediaGiftBox::months() const {
 	return _months;
 }
 
-bool MediaGiftBox::allowsRevoke(TimeId now) const {
-	return false;
-}
-
 TextWithEntities MediaGiftBox::notificationText() const {
 	return {};
 }
@@ -1899,10 +1899,6 @@ TextForMimeData MediaGiftBox::clipboardText() const {
 	return {};
 }
 
-bool MediaGiftBox::forceForwardedInfo() const {
-	return false;
-}
-
 bool MediaGiftBox::updateInlineResultMedia(const MTPMessageMedia &media) {
 	return false;
 }
@@ -1928,4 +1924,50 @@ void MediaGiftBox::setActivated(bool activated) {
 	_activated = activated;
 }
 
+MediaWallPaper::MediaWallPaper(
+	not_null<HistoryItem*> parent,
+	const WallPaper &paper)
+: Media(parent)
+, _paper(paper) {
+}
+
+MediaWallPaper::~MediaWallPaper() = default;
+
+std::unique_ptr<Media> MediaWallPaper::clone(not_null<HistoryItem*> parent) {
+	return std::make_unique<MediaWallPaper>(parent, _paper);
+}
+
+const WallPaper *MediaWallPaper::paper() const {
+	return &_paper;
+}
+
+TextWithEntities MediaWallPaper::notificationText() const {
+	return {};
+}
+
+QString MediaWallPaper::pinnedTextSubstring() const {
+	return {};
+}
+
+TextForMimeData MediaWallPaper::clipboardText() const {
+	return {};
+}
+
+bool MediaWallPaper::updateInlineResultMedia(const MTPMessageMedia &media) {
+	return false;
+}
+
+bool MediaWallPaper::updateSentMedia(const MTPMessageMedia &media) {
+	return false;
+}
+
+std::unique_ptr<HistoryView::Media> MediaWallPaper::createView(
+		not_null<HistoryView::Element*> message,
+		not_null<HistoryItem*> realParent,
+		HistoryView::Element *replacing) {
+	return std::make_unique<HistoryView::ServiceBox>(
+		message,
+		std::make_unique<HistoryView::ThemeDocumentBox>(message, _paper));
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index a21df7354..985e2c8aa 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_location.h"
+#include "data/data_wall_paper.h"
 
 class Image;
 class History;
@@ -35,6 +36,7 @@ struct ToPreviewOptions;
 namespace Data {
 
 class CloudImage;
+class WallPaper;
 
 enum class CallFinishReason : char {
 	Missed,
@@ -105,8 +107,9 @@ public:
 	virtual const Call *call() const;
 	virtual GameData *game() const;
 	virtual const Invoice *invoice() const;
-	virtual Data::CloudImage *location() const;
+	virtual CloudImage *location() const;
 	virtual PollData *poll() const;
+	virtual const WallPaper *paper() const;
 
 	virtual bool uploading() const;
 	virtual Storage::SharedMediaTypesMask sharedMediaTypes() const;
@@ -291,7 +294,7 @@ public:
 
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
-	Data::CloudImage *location() const override;
+	CloudImage *location() const override;
 	ItemPreview toPreview(ToPreviewOptions options) const override;
 	TextWithEntities notificationText() const override;
 	QString pinnedTextSubstring() const override;
@@ -306,7 +309,7 @@ public:
 
 private:
 	LocationPoint _point;
-	not_null<Data::CloudImage*> _location;
+	not_null<CloudImage*> _location;
 	QString _title;
 	QString _description;
 
@@ -517,11 +520,9 @@ public:
 	[[nodiscard]] bool activated() const;
 	void setActivated(bool activated);
 
-	bool allowsRevoke(TimeId now) const override;
 	TextWithEntities notificationText() const override;
 	QString pinnedTextSubstring() const override;
 	TextForMimeData clipboardText() const override;
-	bool forceForwardedInfo() const override;
 
 	bool updateInlineResultMedia(const MTPMessageMedia &media) override;
 	bool updateSentMedia(const MTPMessageMedia &media) override;
@@ -537,6 +538,31 @@ private:
 
 };
 
+class MediaWallPaper final : public Media {
+public:
+	MediaWallPaper(not_null<HistoryItem*> parent, const WallPaper &paper);
+	~MediaWallPaper();
+
+	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
+
+	const WallPaper *paper() const override;
+
+	TextWithEntities notificationText() const override;
+	QString pinnedTextSubstring() const override;
+	TextForMimeData clipboardText() const override;
+
+	bool updateInlineResultMedia(const MTPMessageMedia &media) override;
+	bool updateSentMedia(const MTPMessageMedia &media) override;
+	std::unique_ptr<HistoryView::Media> createView(
+		not_null<HistoryView::Element*> message,
+		not_null<HistoryItem*> realParent,
+		HistoryView::Element *replacing = nullptr) override;
+
+private:
+	const WallPaper _paper;
+
+};
+
 [[nodiscard]] TextForMimeData WithCaptionClipboardText(
 	const QString &attachType,
 	TextForMimeData &&caption);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 0321c99a9..d66e22e98 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -66,6 +66,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "data/data_poll.h" // PollData::publicVotes.
 #include "data/data_sponsored_messages.h"
+#include "data/data_wall_paper.h"
 #include "data/data_web_page.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
 #include "payments/payments_checkout_process.h" // CheckoutProcess::Start.
@@ -4172,12 +4173,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		auto result = PreparedServiceText{};
 		result.links.push_back(peer->createOpenLink());
 		result.text = isSelf
-			? tr::lng_action_set_wallpaper(
+			? tr::lng_action_set_wallpaper_me(
+				tr::now,
+				Ui::Text::WithEntities)
+			: tr::lng_action_set_wallpaper(
 				tr::now,
 				lt_user,
 				Ui::Text::Link(name, 1), // Link 1.
-				Ui::Text::WithEntities)
-			: tr::lng_action_set_wallpaper_me(tr::now, Ui::Text::WithEntities);
+				Ui::Text::WithEntities);
 		return result;
 	};
 
@@ -4194,13 +4197,13 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			result.links.push_back(peer->createOpenLink());
 		}
 		result.text = isSelf
-			? tr::lng_action_set_same_wallpaper(
+			? tr::lng_action_set_same_wallpaper_me(
+				tr::now,
+				Ui::Text::WithEntities)
+			: tr::lng_action_set_same_wallpaper(
 				tr::now,
 				lt_user,
 				Ui::Text::Link(name, 1), // Link 1.
-				Ui::Text::WithEntities)
-			: tr::lng_action_set_same_wallpaper_me(
-				tr::now,
 				Ui::Text::WithEntities);
 		return result;
 	};
@@ -4349,7 +4352,11 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 		}, [](const MTPDphotoEmpty &) {
 		});
 	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
-		//_media = std::make_unique.. #TODO wallpapers
+		const auto session = &history()->session();
+		const auto &attached = data.vwallpaper();
+		if (const auto paper = Data::WallPaper::Create(session, attached)) {
+			_media = std::make_unique<Data::MediaWallPaper>(this, *paper);
+		}
 	}, [](const auto &) {
 	});
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index 0c45ddaf8..d1d7953a6 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -429,7 +429,7 @@ QSize Service::performCountCurrentSize(int newWidth) {
 		return { newWidth, newHeight };
 	}
 	const auto media = this->media();
-	if (media && data()->isUserpicSuggestion()) {
+	if (media && media->hideServiceText()) {
 		newHeight += st::msgServiceMargin.top()
 			+ media->resizeGetHeight(newWidth)
 			+ st::msgServiceMargin.bottom();
@@ -461,7 +461,7 @@ QSize Service::performCountOptimalSize() {
 
 	if (const auto media = this->media()) {
 		media->initDimensions();
-		if (data()->isUserpicSuggestion()) {
+		if (media->hideServiceText()) {
 			return { media->maxWidth(), media->minHeight() };
 		}
 	}
@@ -527,7 +527,7 @@ void Service::draw(Painter &p, const PaintContext &context) const {
 	p.setTextPalette(st->serviceTextPalette());
 
 	const auto media = this->media();
-	const auto onlyMedia = (media && data()->isUserpicSuggestion());
+	const auto onlyMedia = (media && media->hideServiceText());
 
 	if (!onlyMedia) {
 		if (media) {
@@ -602,7 +602,7 @@ PointState Service::pointState(QPoint point) const {
 TextState Service::textState(QPoint point, StateRequest request) const {
 	const auto item = data();
 	const auto media = this->media();
-	const auto onlyMedia = (media && data()->isUserpicSuggestion());
+	const auto onlyMedia = (media && media->hideServiceText());
 
 	auto result = TextState(item);
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index 346d1e685..108dffc83 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -98,6 +98,9 @@ public:
 	[[nodiscard]] virtual bool hideMessageText() const {
 		return true;
 	}
+	[[nodiscard]] virtual bool hideServiceText() const {
+		return false;
+	}
 	[[nodiscard]] virtual bool allowsFastShare() const {
 		return false;
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
index a548abe84..53431ad2b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
@@ -34,6 +34,10 @@ public:
 		const QRect &geometry) override;
 	ClickHandlerPtr createViewLink() override;
 
+	bool hideServiceText() override {
+		return false;
+	}
+
 	void stickerClearLoopPlayed() override;
 	std::unique_ptr<StickerPlayer> stickerTakePlayer(
 		not_null<DocumentData*> data,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.h b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
index 79178994a..2362304c5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
@@ -30,6 +30,8 @@ public:
 		const QRect &geometry) = 0;
 	[[nodiscard]] virtual ClickHandlerPtr createViewLink() = 0;
 
+	[[nodiscard]] virtual bool hideServiceText() = 0;
+
 	virtual void stickerClearLoopPlayed() = 0;
 	[[nodiscard]] virtual std::unique_ptr<StickerPlayer> stickerTakePlayer(
 		not_null<DocumentData*> data,
@@ -69,6 +71,10 @@ public:
 	[[nodiscard]] bool needsBubble() const override;
 	[[nodiscard]] bool customInfoLayout() const override;
 
+	[[nodiscard]] bool hideServiceText() const override {
+		return _content->hideServiceText();
+	}
+
 	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index bc000ea1e..ec645442b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
+#include "history/view/media/history_view_sticker_player_abstract.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_document_media.h"
@@ -19,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_wall_paper.h"
 #include "base/qthelp_url.h"
 #include "core/local_url_handlers.h"
+#include "lang/lang_keys.h"
 #include "ui/text/format_values.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
@@ -32,15 +34,17 @@ namespace HistoryView {
 ThemeDocument::ThemeDocument(
 	not_null<Element*> parent,
 	DocumentData *document)
-: ThemeDocument(parent, document, std::nullopt) {
+: ThemeDocument(parent, document, std::nullopt, 0) {
 }
 
 ThemeDocument::ThemeDocument(
 	not_null<Element*> parent,
 	DocumentData *document,
-	const std::optional<Data::WallPaper> &params)
+	const std::optional<Data::WallPaper> &params,
+	int serviceWidth)
 : File(parent, parent->data())
-, _data(document) {
+, _data(document)
+, _serviceWidth(serviceWidth) {
 	Expects(params.has_value() || _data->hasThumbnail() || _data->isTheme());
 
 	if (params) {
@@ -100,6 +104,10 @@ std::optional<Data::WallPaper> ThemeDocument::ParamsFromUrl(
 }
 
 QSize ThemeDocument::countOptimalSize() {
+	if (_serviceWidth > 0) {
+		return { _serviceWidth, _serviceWidth };
+	}
+
 	if (!_data) {
 		return { st::maxWallPaperWidth, st::maxWallPaperHeight };
 	} else if (_data->isTheme()) {
@@ -123,6 +131,10 @@ QSize ThemeDocument::countOptimalSize() {
 }
 
 QSize ThemeDocument::countCurrentSize(int newWidth) {
+	if (_serviceWidth) {
+		_pixw = _pixh = _serviceWidth;
+		return { _serviceWidth, _serviceWidth };
+	}
 	if (!_data) {
 		_pixw = st::maxWallPaperWidth;
 		_pixh = st::maxWallPaperHeight;
@@ -187,14 +199,16 @@ void ThemeDocument::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	if (_data) {
-		auto statusX = paintx + st::msgDateImgDelta + st::msgDateImgPadding.x();
-		auto statusY = painty + st::msgDateImgDelta + st::msgDateImgPadding.y();
-		auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
-		auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
-		Ui::FillRoundRect(p, style::rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, width()), sti->msgDateImgBg, sti->msgDateImgBgCorners);
-		p.setFont(st::normalFont);
-		p.setPen(st->msgDateImgFg());
-		p.drawTextLeft(statusX, statusY, width(), _statusText, statusW - 2 * st::msgDateImgPadding.x());
+		if (!_serviceWidth) {
+			auto statusX = paintx + st::msgDateImgDelta + st::msgDateImgPadding.x();
+			auto statusY = painty + st::msgDateImgDelta + st::msgDateImgPadding.y();
+			auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
+			auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
+			Ui::FillRoundRect(p, style::rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, width()), sti->msgDateImgBg, sti->msgDateImgBgCorners);
+			p.setFont(st::normalFont);
+			p.setPen(st->msgDateImgFg());
+			p.drawTextLeft(statusX, statusY, width(), _statusText, statusW - 2 * st::msgDateImgPadding.x());
+		}
 		if (radial || (!loaded && !_data->loading())) {
 			const auto radialOpacity = (radial && loaded && !_data->uploading())
 				? _animation->radial.opacity() :
@@ -278,11 +292,15 @@ void ThemeDocument::validateThumbnail() const {
 }
 
 void ThemeDocument::generateThumbnail() const {
-	_thumbnail = Ui::PixmapFromImage(Ui::GenerateBackgroundImage(
+	auto image = Ui::GenerateBackgroundImage(
 		QSize(_pixw, _pixh) * cIntRetinaFactor(),
 		_background,
 		_gradientRotation,
-		_patternOpacity));
+		_patternOpacity);
+	if (_serviceWidth) {
+		image = Images::Circle(std::move(image));
+	}
+	_thumbnail = Ui::PixmapFromImage(std::move(image));
 	_thumbnail.setDevicePixelRatio(cRetinaFactor());
 	_thumbnailGood = 1;
 }
@@ -296,6 +314,7 @@ void ThemeDocument::prepareThumbnailFrom(
 	const auto isTheme = _data->isTheme();
 	const auto isPattern = _data->isPatternWallPaper();
 	auto options = (good >= 0 ? Images::Option(0) : Images::Option::Blur)
+		| (_serviceWidth ? Images::Option::RoundCircle : Images::Option(0))
 		| (isPattern
 			? Images::Option::TransparentBackground
 			: Images::Option(0));
@@ -382,4 +401,74 @@ void ThemeDocument::unloadHeavyPart() {
 	_dataMedia = nullptr;
 }
 
+ThemeDocumentBox::ThemeDocumentBox(
+	not_null<Element*> parent,
+	const Data::WallPaper &paper)
+: _parent(parent)
+, _preview(
+		parent,
+		paper.document(),
+		paper,
+		st::msgServicePhotoWidth) {
+	_preview.initDimensions();
+	_preview.resizeGetHeight(_preview.maxWidth());
+}
+
+ThemeDocumentBox::~ThemeDocumentBox() = default;
+
+int ThemeDocumentBox::top() {
+	return st::msgServiceGiftBoxButtonMargins.top();
+}
+
+QSize ThemeDocumentBox::size() {
+	return { _preview.maxWidth(), _preview.minHeight() };
+}
+
+QString ThemeDocumentBox::title() {
+	return QString();
+}
+
+QString ThemeDocumentBox::subtitle() {
+	return _parent->data()->notificationText().text;
+}
+
+QString ThemeDocumentBox::button() {
+	return tr::lng_sticker_premium_view(tr::now);
+}
+
+ClickHandlerPtr ThemeDocumentBox::createViewLink() {
+	const auto to = _parent->history()->peer;
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		//const auto my = context.other.value<ClickHandlerContext>();
+		//if (const auto controller = my.sessionWindow.get()) {
+		//}
+	});
+}
+
+void ThemeDocumentBox::draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) {
+	p.translate(geometry.topLeft());
+	_preview.draw(p, context);
+	p.translate(-geometry.topLeft());
+}
+
+void ThemeDocumentBox::stickerClearLoopPlayed() {
+}
+
+std::unique_ptr<StickerPlayer> ThemeDocumentBox::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return nullptr;
+}
+
+bool ThemeDocumentBox::hasHeavyPart() {
+	return _preview.hasHeavyPart();
+}
+
+void ThemeDocumentBox::unloadHeavyPart() {
+	_preview.unloadHeavyPart();
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
index 66dc68ad5..99bbd7a47 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "history/view/media/history_view_file.h"
+#include "history/view/media/history_view_service_box.h"
 
 class Image;
 
@@ -24,7 +25,8 @@ public:
 	ThemeDocument(
 		not_null<Element*> parent,
 		DocumentData *document,
-		const std::optional<Data::WallPaper> &params);
+		const std::optional<Data::WallPaper> &params,
+		int serviceWidth = 0);
 	~ThemeDocument();
 
 	void draw(Painter &p, const PaintContext &context) const override;
@@ -71,6 +73,7 @@ private:
 	DocumentData *_data = nullptr;
 	int _pixw = 1;
 	int _pixh = 1;
+	const int _serviceWidth = 0;
 	mutable QPixmap _thumbnail;
 	mutable int _thumbnailGood = -1; // -1 inline, 0 thumbnail, 1 good
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
@@ -82,4 +85,40 @@ private:
 
 };
 
+class ThemeDocumentBox final : public ServiceBoxContent {
+public:
+	ThemeDocumentBox(
+		not_null<Element*> parent,
+		const Data::WallPaper &paper);
+	~ThemeDocumentBox();
+
+	int top() override;
+	QSize size() override;
+	QString title() override;
+	QString subtitle() override;
+	QString button() override;
+	void draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) override;
+	ClickHandlerPtr createViewLink() override;
+
+	bool hideServiceText() override {
+		return true;
+	}
+
+	void stickerClearLoopPlayed() override;
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+private:
+	const not_null<Element*> _parent;
+	ThemeDocument _preview;
+
+};
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
index 083a19c83..bed87c324 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
@@ -38,6 +38,10 @@ public:
 		const QRect &geometry) override;
 	ClickHandlerPtr createViewLink() override;
 
+	bool hideServiceText() override {
+		return true;
+	}
+
 	void stickerClearLoopPlayed() override;
 	std::unique_ptr<StickerPlayer> stickerTakePlayer(
 		not_null<DocumentData*> data,

From bf27185feb8b755b287756a6f43a2c4ea3e07219 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Apr 2023 13:43:08 +0400
Subject: [PATCH 054/676] Show custom chat wallpapers in chats.

---
 .../SourceFiles/core/local_url_handlers.cpp   |   5 +-
 Telegram/SourceFiles/data/data_changes.h      |  63 +++++-----
 Telegram/SourceFiles/data/data_document.cpp   |   2 +-
 Telegram/SourceFiles/data/data_peer.cpp       |  16 +++
 Telegram/SourceFiles/data/data_peer.h         |   5 +
 Telegram/SourceFiles/data/data_user.cpp       |   8 ++
 Telegram/SourceFiles/data/data_wall_paper.cpp |  56 +++++++--
 Telegram/SourceFiles/data/data_wall_paper.h   |   6 +
 Telegram/SourceFiles/history/history.cpp      |   3 +
 Telegram/SourceFiles/history/history_item.cpp |   7 ++
 Telegram/SourceFiles/history/history_item.h   |   1 +
 .../view/media/history_view_service_box.cpp   |  30 +++--
 .../view/media/history_view_service_box.h     |   1 +
 .../media/history_view_theme_document.cpp     |  16 ++-
 Telegram/SourceFiles/ui/chat/chat_theme.cpp   |  26 +++-
 Telegram/SourceFiles/ui/chat/chat_theme.h     |  26 ++--
 .../ui/chat/choose_theme_controller.cpp       |  11 +-
 .../SourceFiles/window/section_widget.cpp     |  75 +++++++++--
 .../window/window_session_controller.cpp      | 118 ++++++++++++++----
 .../window/window_session_controller.h        |  15 ++-
 20 files changed, 369 insertions(+), 121 deletions(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 4c09794a8..fe9b26210 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -764,7 +764,10 @@ bool ResolveTestChatTheme(
 			}
 			const auto recache = [&](Data::CloudThemeType type) {
 				[[maybe_unused]] auto value = theme->settings.contains(type)
-					? controller->cachedChatThemeValue(*theme, type)
+					? controller->cachedChatThemeValue(
+						*theme,
+						Data::WallPaper(0),
+						type)
 					: nullptr;
 			};
 			recache(Data::CloudThemeType::Dark);
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index 7b75478e9..e5bbc48e4 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -64,45 +64,46 @@ struct PeerUpdate {
 		Migration           = (1ULL << 5),
 		UnavailableReason   = (1ULL << 6),
 		ChatThemeEmoji      = (1ULL << 7),
-		IsBlocked           = (1ULL << 8),
-		MessagesTTL         = (1ULL << 9),
-		FullInfo            = (1ULL << 10),
-		Usernames           = (1ULL << 11),
-		TranslationDisabled = (1ULL << 12),
+		ChatWallPaper       = (1ULL << 8),
+		IsBlocked           = (1ULL << 9),
+		MessagesTTL         = (1ULL << 10),
+		FullInfo            = (1ULL << 11),
+		Usernames           = (1ULL << 12),
+		TranslationDisabled = (1ULL << 13),
 
 		// For users
-		CanShareContact     = (1ULL << 13),
-		IsContact           = (1ULL << 14),
-		PhoneNumber         = (1ULL << 15),
-		OnlineStatus        = (1ULL << 16),
-		BotCommands         = (1ULL << 17),
-		BotCanBeInvited     = (1ULL << 18),
-		BotStartToken       = (1ULL << 19),
-		CommonChats         = (1ULL << 20),
-		HasCalls            = (1ULL << 21),
-		SupportInfo         = (1ULL << 22),
-		IsBot               = (1ULL << 23),
-		EmojiStatus         = (1ULL << 24),
+		CanShareContact     = (1ULL << 14),
+		IsContact           = (1ULL << 15),
+		PhoneNumber         = (1ULL << 16),
+		OnlineStatus        = (1ULL << 17),
+		BotCommands         = (1ULL << 18),
+		BotCanBeInvited     = (1ULL << 19),
+		BotStartToken       = (1ULL << 20),
+		CommonChats         = (1ULL << 21),
+		HasCalls            = (1ULL << 22),
+		SupportInfo         = (1ULL << 23),
+		IsBot               = (1ULL << 24),
+		EmojiStatus         = (1ULL << 25),
 
 		// For chats and channels
-		InviteLinks         = (1ULL << 25),
-		Members             = (1ULL << 26),
-		Admins              = (1ULL << 27),
-		BannedUsers         = (1ULL << 28),
-		Rights              = (1ULL << 29),
-		PendingRequests     = (1ULL << 30),
-		Reactions           = (1ULL << 31),
+		InviteLinks         = (1ULL << 26),
+		Members             = (1ULL << 27),
+		Admins              = (1ULL << 28),
+		BannedUsers         = (1ULL << 29),
+		Rights              = (1ULL << 30),
+		PendingRequests     = (1ULL << 31),
+		Reactions           = (1ULL << 32),
 
 		// For channels
-		ChannelAmIn         = (1ULL << 32),
-		StickersSet         = (1ULL << 33),
-		ChannelLinkedChat   = (1ULL << 34),
-		ChannelLocation     = (1ULL << 35),
-		Slowmode            = (1ULL << 36),
-		GroupCall           = (1ULL << 37),
+		ChannelAmIn         = (1ULL << 33),
+		StickersSet         = (1ULL << 34),
+		ChannelLinkedChat   = (1ULL << 35),
+		ChannelLocation     = (1ULL << 36),
+		Slowmode            = (1ULL << 37),
+		GroupCall           = (1ULL << 38),
 
 		// For iteration
-		LastUsedBit         = (1ULL << 37),
+		LastUsedBit         = (1ULL << 38),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index a1d8539e6..2adfe69e4 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -794,7 +794,7 @@ QString DocumentData::loadingFilePath() const {
 
 bool DocumentData::displayLoading() const {
 	return loading()
-		? (!_loader->loadingLocal() || !_loader->autoLoading())
+		? !_loader->loadingLocal()
 		: (uploading() && !waitingForAlbum());
 }
 
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 560736b46..42c548438 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -1093,6 +1093,22 @@ const QString &PeerData::themeEmoji() const {
 	return _themeEmoticon;
 }
 
+void PeerData::setWallPaper(std::optional<Data::WallPaper> paper) {
+	if (!paper && !_wallPaper) {
+		return;
+	} else if (paper && _wallPaper && _wallPaper->equals(*paper)) {
+		return;
+	}
+	_wallPaper = paper
+		? std::make_unique<Data::WallPaper>(std::move(*paper))
+		: nullptr;
+	session().changes().peerUpdated(this, UpdateFlag::ChatWallPaper);
+}
+
+const Data::WallPaper *PeerData::wallPaper() const {
+	return _wallPaper.get();
+}
+
 void PeerData::setIsBlocked(bool is) {
 	const auto status = is
 		? BlockStatus::Blocked
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 1940e573b..17b19bf63 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -37,6 +37,7 @@ class ForumTopic;
 class Session;
 class GroupCall;
 struct ReactionId;
+class WallPaper;
 
 [[nodiscard]] int PeerColorIndex(PeerId peerId);
 
@@ -403,6 +404,9 @@ public:
 	void setThemeEmoji(const QString &emoticon);
 	[[nodiscard]] const QString &themeEmoji() const;
 
+	void setWallPaper(std::optional<Data::WallPaper> paper);
+	[[nodiscard]] const Data::WallPaper *wallPaper() const;
+
 	const PeerId id;
 	MTPinputPeer input = MTP_inputPeerEmpty();
 
@@ -457,6 +461,7 @@ private:
 
 	QString _about;
 	QString _themeEmoticon;
+	std::unique_ptr<Data::WallPaper> _wallPaper;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index f474f701e..a5c6de084 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo.h"
 #include "data/data_emoji_statuses.h"
 #include "data/data_user_names.h"
+#include "data/data_wall_paper.h"
 #include "data/notify/data_notify_settings.h"
 #include "api/api_peer_photo.h"
 #include "apiwrap.h"
@@ -462,6 +463,13 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 		}
 	}
 
+	if (const auto paper = update.vwallpaper()) {
+		user->setWallPaper(
+			Data::WallPaper::Create(&user->session(), *paper));
+	} else {
+		user->setWallPaper({});
+	}
+
 	user->fullUpdated();
 }
 
diff --git a/Telegram/SourceFiles/data/data_wall_paper.cpp b/Telegram/SourceFiles/data/data_wall_paper.cpp
index b2313f169..468c05f87 100644
--- a/Telegram/SourceFiles/data/data_wall_paper.cpp
+++ b/Telegram/SourceFiles/data/data_wall_paper.cpp
@@ -198,6 +198,16 @@ WallPaperId WallPaper::id() const {
 	return _id;
 }
 
+bool WallPaper::equals(const WallPaper &paper) const {
+	return (_flags == paper._flags)
+		&& (_slug == paper._slug)
+		&& (_backgroundColors == paper._backgroundColors)
+		&& (_rotation == paper._rotation)
+		&& (_intensity == paper._intensity)
+		&& (_blurred == paper._blurred)
+		&& (_document == paper._document);
+}
+
 const std::vector<QColor> WallPaper::backgroundColors() const {
 	return _backgroundColors;
 }
@@ -251,34 +261,54 @@ bool WallPaper::hasShareUrl() const {
 	return !_slug.isEmpty();
 }
 
-QString WallPaper::shareUrl(not_null<Main::Session*> session) const {
-	if (!hasShareUrl()) {
-		return QString();
-	}
-	const auto base = session->createInternalLinkFull("bg/" + _slug);
-	auto params = QStringList();
+QStringList WallPaper::collectShareParams() const {
+	auto result = QStringList();
 	if (isPattern()) {
 		if (!backgroundColors().empty()) {
-			params.push_back(
+			result.push_back(
 				"bg_color=" + StringFromColors(backgroundColors()));
 		}
 		if (_intensity) {
-			params.push_back("intensity=" + QString::number(_intensity));
+			result.push_back("intensity=" + QString::number(_intensity));
 		}
 	}
 	if (_rotation && backgroundColors().size() == 2) {
-		params.push_back("rotation=" + QString::number(_rotation));
+		result.push_back("rotation=" + QString::number(_rotation));
 	}
 	auto mode = QStringList();
 	if (_blurred) {
 		mode.push_back("blur");
 	}
 	if (!mode.isEmpty()) {
-		params.push_back("mode=" + mode.join('+'));
+		result.push_back("mode=" + mode.join('+'));
 	}
-	return params.isEmpty()
-		? base
-		: base + '?' + params.join('&');
+	return result;
+}
+
+bool WallPaper::isNull() const {
+	return !_id && _slug.isEmpty() && _backgroundColors.empty();
+}
+
+QString WallPaper::key() const {
+	if (isNull()) {
+		return QString();
+	}
+	const auto base = _slug.isEmpty()
+		? (_id
+			? QString::number(_id)
+			: StringFromColors(backgroundColors()))
+		: ("bg/" + _slug);
+	const auto params = collectShareParams();
+	return params.isEmpty() ? base : (base + '?' + params.join('&'));
+}
+
+QString WallPaper::shareUrl(not_null<Main::Session*> session) const {
+	if (!hasShareUrl()) {
+		return QString();
+	}
+	const auto base = session->createInternalLinkFull("bg/" + _slug);
+	const auto params = collectShareParams();
+	return params.isEmpty() ? base : (base + '?' + params.join('&'));
 }
 
 void WallPaper::loadDocumentThumbnail() const {
diff --git a/Telegram/SourceFiles/data/data_wall_paper.h b/Telegram/SourceFiles/data/data_wall_paper.h
index df38478ee..fb98eb9de 100644
--- a/Telegram/SourceFiles/data/data_wall_paper.h
+++ b/Telegram/SourceFiles/data/data_wall_paper.h
@@ -42,7 +42,11 @@ public:
 
 	void setLocalImageAsThumbnail(std::shared_ptr<Image> image);
 
+	[[nodiscard]] bool equals(const WallPaper &paper) const;
+
 	[[nodiscard]] WallPaperId id() const;
+	[[nodiscard]] bool isNull() const;
+	[[nodiscard]] QString key() const;
 	[[nodiscard]] const std::vector<QColor> backgroundColors() const;
 	[[nodiscard]] DocumentData *document() const;
 	[[nodiscard]] Image *localThumbnail() const;
@@ -103,6 +107,8 @@ public:
 private:
 	static constexpr auto kDefaultIntensity = 50;
 
+	[[nodiscard]] QStringList collectShareParams() const;
+
 	WallPaperId _id = WallPaperId();
 	uint64 _accessHash = 0;
 	UserId _ownerId = 0;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 5b965667b..a3f2cc87d 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1264,6 +1264,9 @@ void History::newItemAdded(not_null<HistoryItem*> item) {
 		if (!item->unread(this)) {
 			outboxRead(item);
 		}
+		if (item->changesWallPaper()) {
+			peer->updateFullForced();
+		}
 	} else {
 		if (item->unread(this)) {
 			if (unreadCountKnown()) {
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index d66e22e98..8779cd41f 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -2213,6 +2213,13 @@ bool HistoryItem::hasDirectLink() const {
 	return isRegular() && _history->peer->isChannel();
 }
 
+bool HistoryItem::changesWallPaper() const {
+	if (const auto media = _media.get()) {
+		return media->paper() != nullptr;
+	}
+	return Has<HistoryServiceSameBackground>();
+}
+
 FullMsgId HistoryItem::fullId() const {
 	return FullMsgId(_history->peer->id, id);
 }
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 629cc7267..e6dcac508 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -433,6 +433,7 @@ public:
 	[[nodiscard]] crl::time lastReactionsRefreshTime() const;
 
 	[[nodiscard]] bool hasDirectLink() const;
+	[[nodiscard]] bool changesWallPaper() const;
 
 	[[nodiscard]] FullMsgId fullId() const;
 	[[nodiscard]] GlobalMsgId globalId() const;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
index 149998353..e129d28f5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
@@ -27,6 +27,12 @@ ServiceBox::ServiceBox(
 , _content(std::move(content))
 , _button([&] {
 	auto result = Button();
+	result.link = _content->createViewLink();
+
+	const auto text = _content->button();
+	if (text.isEmpty()) {
+		return result;
+	}
 	result.repaint = [=] { repaint(); };
 	result.text.setText(st::semiboldTextStyle, _content->button());
 
@@ -39,8 +45,6 @@ ServiceBox::ServiceBox(
 			+ padding.right(),
 		height);
 
-	result.link = _content->createViewLink();
-
 	return result;
 }())
 , _maxWidth(st::msgServiceGiftBoxSize.width()
@@ -67,8 +71,10 @@ ServiceBox::ServiceBox(
 			: (_title.countHeight(_maxWidth)
 				+ st::msgServiceGiftBoxTitlePadding.bottom()))
 		+ _subtitle.countHeight(_maxWidth)
-		+ st::msgServiceGiftBoxButtonMargins.top()
-		+ _button.size.height()
+		+ (_button.empty()
+			? 0
+			: (st::msgServiceGiftBoxButtonMargins.top()
+				+ _button.size.height()))
 		+ st::msgServiceGiftBoxButtonMargins.bottom()))
 , _innerSize(_size - QSize(0, st::msgServiceGiftBoxTopSkip)) {
 }
@@ -106,7 +112,7 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 		top += _subtitle.countHeight(_maxWidth) + padding.bottom();
 	}
 
-	{
+	if (!_button.empty()) {
 		const auto position = buttonRect().topLeft();
 		p.translate(position);
 
@@ -142,7 +148,11 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 
 TextState ServiceBox::textState(QPoint point, StateRequest request) const {
 	auto result = TextState(_parent);
-	{
+	if (_button.empty()) {
+		if (QRect(QPoint(), _innerSize).contains(point)) {
+			result.link = _button.link;
+		}
+	} else {
 		const auto rect = buttonRect();
 		if (rect.contains(point)) {
 			result.link = _button.link;
@@ -214,7 +224,9 @@ QRect ServiceBox::contentRect() const {
 }
 
 void ServiceBox::Button::toggleRipple(bool pressed) {
-	if (pressed) {
+	if (empty()) {
+		return;
+	} else if (pressed) {
 		const auto linkWidth = size.width();
 		const auto linkHeight = size.height();
 		if (!ripple) {
@@ -234,6 +246,10 @@ void ServiceBox::Button::toggleRipple(bool pressed) {
 	}
 }
 
+bool ServiceBox::Button::empty() const {
+	return text.isEmpty();
+}
+
 void ServiceBox::Button::drawBg(QPainter &p) const {
 	const auto radius = size.height() / 2.;
 	p.drawRoundedRect(0, 0, size.width(), size.height(), radius, radius);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.h b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
index 2362304c5..a986b01a8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
@@ -88,6 +88,7 @@ private:
 	struct Button {
 		void drawBg(QPainter &p) const;
 		void toggleRipple(bool pressed);
+		[[nodiscard]] bool empty() const;
 
 		Fn<void()> repaint;
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index ec645442b..76024cea8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_origin.h"
 #include "data/data_wall_paper.h"
 #include "base/qthelp_url.h"
+#include "core/click_handler_types.h"
 #include "core/local_url_handlers.h"
 #include "lang/lang_keys.h"
 #include "ui/text/format_values.h"
@@ -27,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/cached_round_corners.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -433,15 +435,21 @@ QString ThemeDocumentBox::subtitle() {
 }
 
 QString ThemeDocumentBox::button() {
-	return tr::lng_sticker_premium_view(tr::now);
+	return _parent->data()->out()
+		? QString()
+		: tr::lng_action_set_wallpaper_button(tr::now);
 }
 
 ClickHandlerPtr ThemeDocumentBox::createViewLink() {
+	const auto out = _parent->data()->out();
 	const auto to = _parent->history()->peer;
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
-		//const auto my = context.other.value<ClickHandlerContext>();
-		//if (const auto controller = my.sessionWindow.get()) {
-		//}
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			if (out) {
+				controller->toggleChooseChatTheme(to);
+			}
+		}
 	});
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index a8a724b7f..856b75b4a 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -163,7 +163,8 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 } // namespace
 
 bool operator==(const ChatThemeBackground &a, const ChatThemeBackground &b) {
-	return (a.prepared.cacheKey() == b.prepared.cacheKey())
+	return (a.key == b.key)
+		&& (a.prepared.cacheKey() == b.prepared.cacheKey())
 		&& (a.gradientForFill.cacheKey() == b.gradientForFill.cacheKey())
 		&& (a.tile == b.tile)
 		&& (a.patternOpacity == b.patternOpacity);
@@ -222,9 +223,14 @@ void ChatTheme::adjustPalette(const ChatThemeDescriptor &descriptor) {
 	if (overrideOutBg) {
 		set(p.msgOutBg(), descriptor.bubblesData.colors.front());
 	}
-	const auto &background = descriptor.backgroundData.colors;
-	if (!background.empty()) {
-		const auto average = CountAverageColor(background);
+	const auto &data = descriptor.backgroundData;
+	const auto &background = data.colors;
+	const auto useImage = !data.isPattern
+		&& (!data.path.isEmpty() || !data.bytes.isEmpty());
+	if (useImage || !background.empty()) {
+		const auto average = useImage
+			? Ui::CountAverageColor(_mutableBackground.prepared)
+			: CountAverageColor(background);
 		adjust(p.msgServiceBg(), average);
 		adjust(p.msgServiceBgSelected(), average);
 		adjust(p.historyScrollBg(), average);
@@ -407,6 +413,7 @@ void ChatTheme::setBackground(ChatThemeBackground &&background) {
 }
 
 void ChatTheme::updateBackgroundImageFrom(ChatThemeBackground &&background) {
+	_mutableBackground.key = background.key;
 	_mutableBackground.prepared = std::move(background.prepared);
 	_mutableBackground.preparedForTiled = std::move(
 		background.preparedForTiled);
@@ -1028,6 +1035,16 @@ ChatThemeBackground PrepareBackgroundImage(
 	} else if (data.colors.empty()) {
 		prepared.setDevicePixelRatio(style::DevicePixelRatio());
 	}
+	if (!prepared.isNull()
+		&& !data.isPattern
+		&& data.forDarkMode
+		&& data.darkModeDimming > 0) {
+		const auto ratio = int(prepared.devicePixelRatio());
+		auto p = QPainter(&prepared);
+		p.fillRect(
+			QRect(0, 0, prepared.width() / ratio, prepared.height() / ratio),
+			QColor(0, 0, 0, 255 * data.darkModeDimming / 100));
+	}
 	const auto imageMonoColor = (data.colors.size() < 2)
 		? CalculateImageMonoColor(prepared)
 		: std::nullopt;
@@ -1038,6 +1055,7 @@ ChatThemeBackground PrepareBackgroundImage(
 		? Ui::GenerateDitheredGradient(data.colors, data.gradientRotation)
 		: QImage();
 	return ChatThemeBackground{
+		.key = data.key,
 		.prepared = prepared,
 		.preparedForTiled = PrepareImageForTiled(prepared),
 		.gradientForFill = std::move(gradientForFill),
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h
index a48102cd5..91c2599e7 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.h
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.h
@@ -23,6 +23,7 @@ struct ChatPaintContext;
 struct BubblePattern;
 
 struct ChatThemeBackground {
+	QString key;
 	QImage prepared;
 	QImage preparedForTiled;
 	QImage gradientForFill;
@@ -42,13 +43,16 @@ bool operator==(const ChatThemeBackground &a, const ChatThemeBackground &b);
 bool operator!=(const ChatThemeBackground &a, const ChatThemeBackground &b);
 
 struct ChatThemeBackgroundData {
+	QString key;
 	QString path;
 	QByteArray bytes;
 	bool gzipSvg = false;
 	std::vector<QColor> colors;
 	bool isPattern = false;
 	float64 patternOpacity = 0.;
+	int darkModeDimming = 0;
 	bool isBlurred = false;
+	bool forDarkMode = false;
 	bool generateGradient = false;
 	int gradientRotation = 0;
 };
@@ -113,26 +117,10 @@ struct ChatThemeKey {
 	explicit operator bool() const {
 		return (id != 0);
 	}
-};
 
-inline bool operator<(ChatThemeKey a, ChatThemeKey b) {
-	return (a.id < b.id) || ((a.id == b.id) && (a.dark < b.dark));
-}
-inline bool operator>(ChatThemeKey a, ChatThemeKey b) {
-	return (b < a);
-}
-inline bool operator<=(ChatThemeKey a, ChatThemeKey b) {
-	return !(b < a);
-}
-inline bool operator>=(ChatThemeKey a, ChatThemeKey b) {
-	return !(a < b);
-}
-inline bool operator==(ChatThemeKey a, ChatThemeKey b) {
-	return (a.id == b.id) && (a.dark == b.dark);
-}
-inline bool operator!=(ChatThemeKey a, ChatThemeKey b) {
-	return !(a == b);
-}
+	friend inline auto operator<=>(ChatThemeKey, ChatThemeKey) = default;
+	friend inline bool operator==(ChatThemeKey, ChatThemeKey) = default;
+};
 
 struct ChatThemeDescriptor {
 	ChatThemeKey key;
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 2f62f969f..9f64c4963 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -383,7 +383,10 @@ void ChooseThemeController::initList() {
 				_chosen = chosen;
 				entry->chosen = true;
 				if (entry->theme || !entry->key) {
-					_controller->overridePeerTheme(_peer, entry->theme);
+					_controller->overridePeerTheme(
+						_peer,
+						entry->theme,
+						entry->emoji);
 				}
 				_inner->update();
 			}
@@ -534,6 +537,7 @@ void ChooseThemeController::fill(
 			});
 			_controller->cachedChatThemeValue(
 				theme,
+				Data::WallPaper(0),
 				type
 			) | rpl::filter([=](const std::shared_ptr<ChatTheme> &data) {
 				return data && (data->key() == key);
@@ -549,7 +553,10 @@ void ChooseThemeController::fill(
 				i->theme = std::move(data);
 				i->preview = GeneratePreview(theme);
 				if (_chosen == i->emoji->text()) {
-					_controller->overridePeerTheme(_peer, i->theme);
+					_controller->overridePeerTheme(
+						_peer,
+						i->theme,
+						i->emoji);
 				}
 				_inner->update();
 
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index a120be093..570dd7aaf 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer.h"
 #include "data/data_user.h"
 #include "data/data_document.h"
+#include "data/data_document_media.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "data/data_cloud_themes.h"
@@ -45,6 +46,44 @@ namespace {
 	});
 }
 
+struct ResolvedPaper {
+	Data::WallPaper paper;
+	std::shared_ptr<Data::DocumentMedia> media;
+};
+
+[[nodiscard]] rpl::producer<std::optional<ResolvedPaper>> PeerWallPaperValue(
+		not_null<PeerData*> peer) {
+	return peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::ChatWallPaper
+	) | rpl::map([=]() -> rpl::producer<std::optional<ResolvedPaper>> {
+		const auto paper = peer->wallPaper();
+		const auto single = [](std::optional<ResolvedPaper> value) {
+			return rpl::single(std::move(value));
+		};
+		if (!paper) {
+			return single({});
+		}
+		const auto document = paper->document();
+		auto value = ResolvedPaper{
+			*paper,
+			document ? document->createMediaView() : nullptr,
+		};
+		if (!value.media || value.media->loaded(true)) {
+			return single(std::move(value));
+		}
+		paper->loadDocument();
+		return single(
+			value
+		) | rpl::then(document->session().downloaderTaskFinished(
+		) | rpl::filter([=] {
+			return value.media->loaded(true);
+		}) | rpl::take(1) | rpl::map_to(
+			std::optional<ResolvedPaper>(value)
+		));
+	}) | rpl::flatten_latest();
+}
+
 [[nodiscard]] auto MaybeChatThemeDataValueFromPeer(
 	not_null<PeerData*> peer)
 -> rpl::producer<std::optional<Data::CloudTheme>> {
@@ -58,6 +97,7 @@ namespace {
 
 struct ResolvedTheme {
 	std::optional<Data::CloudTheme> theme;
+	std::optional<ResolvedPaper> paper;
 	bool dark = false;
 };
 
@@ -66,9 +106,13 @@ struct ResolvedTheme {
 -> rpl::producer<ResolvedTheme> {
 	return rpl::combine(
 		MaybeChatThemeDataValueFromPeer(peer),
+		PeerWallPaperValue(peer),
 		Theme::IsThemeDarkValue() | rpl::distinct_until_changed()
-	) | rpl::map([](std::optional<Data::CloudTheme> theme, bool night) {
-		return ResolvedTheme{ std::move(theme), night };
+	) | rpl::map([](
+			std::optional<Data::CloudTheme> theme,
+			std::optional<ResolvedPaper> paper,
+			bool night) {
+		return ResolvedTheme{ std::move(theme), std::move(paper), night };
 	});
 }
 
@@ -338,13 +382,23 @@ auto ChatThemeValueFromPeer(
 		peer
 	) | rpl::map([=](ResolvedTheme resolved)
 	-> rpl::producer<std::shared_ptr<Ui::ChatTheme>> {
-		return resolved.theme
-			? controller->cachedChatThemeValue(
-				*resolved.theme,
-				(resolved.dark
-					? Data::CloudThemeType::Dark
-					: Data::CloudThemeType::Light))
-			: rpl::single(controller->defaultChatTheme());
+		if (!resolved.theme && !resolved.paper) {
+			return rpl::single(controller->defaultChatTheme());
+		}
+		const auto theme = resolved.theme.value_or(Data::CloudTheme());
+		const auto paper = resolved.paper
+			? resolved.paper->paper
+			: Data::WallPaper(0);
+		const auto type = resolved.dark
+			? Data::CloudThemeType::Dark
+			: Data::CloudThemeType::Light;
+		if (paper.document()
+			&& resolved.paper->media
+			&& !resolved.paper->media->loaded()
+			&& !controller->chatThemeAlreadyCached(theme, paper, type)) {
+			return rpl::single(controller->defaultChatTheme());
+		}
+		return controller->cachedChatThemeValue(theme, paper, type);
 	}) | rpl::flatten_latest(
 	) | rpl::distinct_until_changed();
 
@@ -354,7 +408,8 @@ auto ChatThemeValueFromPeer(
 	) | rpl::map([=](
 			std::shared_ptr<Ui::ChatTheme> &&cloud,
 			PeerThemeOverride &&overriden) {
-		return (overriden.peer == peer.get())
+		return (overriden.peer == peer.get()
+			&& Ui::Emoji::Find(peer->themeEmoji()) != overriden.emoji)
 			? std::move(overriden.theme)
 			: std::move(cloud);
 	});
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 3d8a1eeeb..a5645879a 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -97,9 +97,15 @@ constexpr auto kMaxChatEntryHistorySize = 50;
 constexpr auto kDayBaseFile = ":/gui/day-custom-base.tdesktop-theme"_cs;
 constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs;
 
+[[nodiscard]] Fn<void(style::palette&)> PrepareDefaultPaletteCallback() {
+	return [=](style::palette &palette) {
+		palette.reset();
+	};
+}
+
 [[nodiscard]] Fn<void(style::palette&)> PreparePaletteCallback(
-	bool dark,
-	std::optional<QColor> accent) {
+		bool dark,
+		std::optional<QColor> accent) {
 	return [=](style::palette &palette) {
 		using namespace Theme;
 		const auto &embedded = EmbeddedThemes();
@@ -727,10 +733,23 @@ void SessionNavigation::showPollResults(
 	showSection(std::make_shared<Info::Memento>(poll, contextId), params);
 }
 
+struct SessionController::CachedThemeKey {
+	Ui::ChatThemeKey theme;
+	QString paper;
+
+	friend inline auto operator<=>(
+		const CachedThemeKey&,
+		const CachedThemeKey&) = default;
+	[[nodiscard]] explicit operator bool() const {
+		return theme || !paper.isEmpty();
+	}
+};
+
 struct SessionController::CachedTheme {
 	std::weak_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
 	Data::WallPaper paper;
+	bool basedOnDark = false;
 	bool caching = false;
 	rpl::lifetime lifetime;
 };
@@ -2052,19 +2071,29 @@ void SessionController::openDocument(
 
 auto SessionController::cachedChatThemeValue(
 	const Data::CloudTheme &data,
+	const Data::WallPaper &paper,
 	Data::CloudThemeType type)
 -> rpl::producer<std::shared_ptr<Ui::ChatTheme>> {
-	const auto key = Ui::ChatThemeKey{
+	const auto themeKey = Ui::ChatThemeKey{
 		data.id,
 		(type == Data::CloudThemeType::Dark),
 	};
-	const auto settings = data.settings.find(type);
-	if (!key
-		|| (settings == end(data.settings))
-		|| !settings->second.paper
-		|| settings->second.paper->backgroundColors().empty()) {
+	if (!themeKey && paper.isNull()) {
 		return rpl::single(_defaultChatTheme);
 	}
+	const auto settings = data.settings.find(type);
+	if (!data.id && settings == end(data.settings)) {
+		return rpl::single(_defaultChatTheme);
+	}
+	if (paper.isNull()
+		&& (!settings->second.paper
+			|| settings->second.paper->backgroundColors().empty())) {
+		return rpl::single(_defaultChatTheme);
+	}
+	const auto key = CachedThemeKey{
+		themeKey,
+		!paper.isNull() ? paper.key() : settings->second.paper->key(),
+	};
 	const auto i = _customChatThemes.find(key);
 	if (i != end(_customChatThemes)) {
 		if (auto strong = i->second.theme.lock()) {
@@ -2073,7 +2102,7 @@ auto SessionController::cachedChatThemeValue(
 		}
 	}
 	if (i == end(_customChatThemes) || !i->second.caching) {
-		cacheChatTheme(data, type);
+		cacheChatTheme(key, data, paper, type);
 	}
 	const auto limit = Data::CloudThemes::TestingColors() ? (1 << 20) : 1;
 	using namespace rpl::mappers;
@@ -2081,7 +2110,8 @@ auto SessionController::cachedChatThemeValue(
 		_defaultChatTheme
 	) | rpl::then(_cachedThemesStream.events(
 	) | rpl::filter([=](const std::shared_ptr<Ui::ChatTheme> &theme) {
-		if (theme->key() != key) {
+		if (theme->key() != key.theme
+			|| theme->background().key != key.paper) {
 			return false;
 		}
 		pushLastUsedChatTheme(theme);
@@ -2089,6 +2119,24 @@ auto SessionController::cachedChatThemeValue(
 	}) | rpl::take(limit));
 }
 
+bool SessionController::chatThemeAlreadyCached(
+		const Data::CloudTheme &data,
+		const Data::WallPaper &paper,
+		Data::CloudThemeType type) {
+	Expects(paper.document() != nullptr);
+
+	const auto key = CachedThemeKey{
+		Ui::ChatThemeKey{
+			data.id,
+			(type == Data::CloudThemeType::Dark),
+		},
+		paper.key(),
+	};
+	const auto i = _customChatThemes.find(key);
+	return (i != end(_customChatThemes))
+		&& (i->second.theme.lock() != nullptr);
+}
+
 void SessionController::pushLastUsedChatTheme(
 		const std::shared_ptr<Ui::ChatTheme> &theme) {
 	const auto i = ranges::find(_lastUsedCustomChatThemes, theme);
@@ -2124,10 +2172,12 @@ void SessionController::clearCachedChatThemes() {
 
 void SessionController::overridePeerTheme(
 		not_null<PeerData*> peer,
-		std::shared_ptr<Ui::ChatTheme> theme) {
+		std::shared_ptr<Ui::ChatTheme> theme,
+		EmojiPtr emoji) {
 	_peerThemeOverride = PeerThemeOverride{
 		peer,
 		theme ? theme : _defaultChatTheme,
+		emoji,
 	};
 }
 
@@ -2154,25 +2204,28 @@ void SessionController::pushDefaultChatBackground() {
 }
 
 void SessionController::cacheChatTheme(
+		CachedThemeKey key,
 		const Data::CloudTheme &data,
+		const Data::WallPaper &paper,
 		Data::CloudThemeType type) {
-	Expects(data.id != 0);
+	Expects(data.id != 0 || !paper.isNull());
 
 	const auto dark = (type == Data::CloudThemeType::Dark);
-	const auto key = Ui::ChatThemeKey{ data.id, dark };
 	const auto i = data.settings.find(type);
-	Assert(i != end(data.settings));
-	const auto &paper = i->second.paper;
-	Assert(paper.has_value());
-	Assert(!paper->backgroundColors().empty());
-	const auto document = paper->document();
+	Assert((!data.id || (i != end(data.settings)))
+		&& (!paper.isNull()
+			|| (i->second.paper.has_value()
+				&& !i->second.paper->backgroundColors().empty())));
+	const auto &use = !paper.isNull() ? paper : *i->second.paper;
+	const auto document = use.document();
 	const auto media = document ? document->createMediaView() : nullptr;
-	paper->loadDocument();
+	use.loadDocument();
 	auto &theme = [&]() -> CachedTheme& {
 		const auto i = _customChatThemes.find(key);
 		if (i != end(_customChatThemes)) {
 			i->second.media = media;
-			i->second.paper = *paper;
+			i->second.paper = use;
+			i->second.basedOnDark = dark;
 			i->second.caching = true;
 			return i->second;
 		}
@@ -2180,15 +2233,16 @@ void SessionController::cacheChatTheme(
 			key,
 			CachedTheme{
 				.media = media,
-				.paper = *paper,
+				.paper = use,
+				.basedOnDark = dark,
 				.caching = true,
 			}).first->second;
 	}();
 	auto descriptor = Ui::ChatThemeDescriptor{
-		.key = key,
-		.preparePalette = PreparePaletteCallback(
-			dark,
-			i->second.accentColor),
+		.key = key.theme,
+		.preparePalette = (data.id
+			? PreparePaletteCallback(dark, i->second.accentColor)
+			: PrepareDefaultPaletteCallback()),
 		.backgroundData = backgroundData(theme),
 		.bubblesData = PrepareBubblesData(data, type),
 		.basedOnDark = dark,
@@ -2215,7 +2269,10 @@ void SessionController::cacheChatThemeDone(
 		std::shared_ptr<Ui::ChatTheme> result) {
 	Expects(result != nullptr);
 
-	const auto key = result->key();
+	const auto key = CachedThemeKey{
+		result->key(),
+		result->background().key,
+	};
 	const auto i = _customChatThemes.find(key);
 	if (i == end(_customChatThemes)) {
 		return;
@@ -2257,7 +2314,8 @@ void SessionController::updateCustomThemeBackground(CachedTheme &theme) {
 			=,
 			result = Ui::PrepareBackgroundImage(data)
 		]() mutable {
-			const auto i = _customChatThemes.find(key);
+			const auto cacheKey = CachedThemeKey{ key, result.key };
+			const auto i = _customChatThemes.find(cacheKey);
 			if (i != end(_customChatThemes)) {
 				if (const auto strong = i->second.theme.lock()) {
 					strong->updateBackgroundImageFrom(std::move(result));
@@ -2280,14 +2338,20 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 	const auto patternOpacity = paper.patternOpacity();
 	const auto isBlurred = paper.isBlurred();
 	const auto gradientRotation = paper.gradientRotation();
+	const auto darkModeDimming = isPattern
+		? 100
+		: std::clamp(paper.patternIntensity(), 0, 100);
 	return {
+		.key = paper.key(),
 		.path = paperPath,
 		.bytes = paperBytes,
 		.gzipSvg = gzipSvg,
 		.colors = colors,
 		.isPattern = isPattern,
 		.patternOpacity = patternOpacity,
+		.darkModeDimming = darkModeDimming,
 		.isBlurred = isBlurred,
+		.forDarkMode = theme.basedOnDark,
 		.generateGradient = generateGradient,
 		.gradientRotation = gradientRotation,
 	};
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 5500fddf0..01b9a8761 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -71,6 +71,7 @@ enum class CloudThemeType;
 class Thread;
 class Forum;
 class ForumTopic;
+class WallPaper;
 } // namespace Data
 
 namespace HistoryView::Reactions {
@@ -108,6 +109,7 @@ enum class ResolveType {
 struct PeerThemeOverride {
 	PeerData *peer = nullptr;
 	std::shared_ptr<Ui::ChatTheme> theme;
+	EmojiPtr emoji = nullptr;
 };
 bool operator==(const PeerThemeOverride &a, const PeerThemeOverride &b);
 bool operator!=(const PeerThemeOverride &a, const PeerThemeOverride &b);
@@ -538,8 +540,13 @@ public:
 	}
 	[[nodiscard]] auto cachedChatThemeValue(
 		const Data::CloudTheme &data,
+		const Data::WallPaper &paper,
 		Data::CloudThemeType type)
 	-> rpl::producer<std::shared_ptr<Ui::ChatTheme>>;
+	[[nodiscard]] bool chatThemeAlreadyCached(
+		const Data::CloudTheme &data,
+		const Data::WallPaper &paper,
+		Data::CloudThemeType type);
 	void setChatStyleTheme(const std::shared_ptr<Ui::ChatTheme> &theme);
 	void clearCachedChatThemes();
 	void pushLastUsedChatTheme(const std::shared_ptr<Ui::ChatTheme> &theme);
@@ -547,7 +554,8 @@ public:
 
 	void overridePeerTheme(
 		not_null<PeerData*> peer,
-		std::shared_ptr<Ui::ChatTheme> theme);
+		std::shared_ptr<Ui::ChatTheme> theme,
+		EmojiPtr emoji);
 	void clearPeerThemeOverride(not_null<PeerData*> peer);
 	[[nodiscard]] auto peerThemeOverrideValue() const
 		-> rpl::producer<PeerThemeOverride> {
@@ -586,6 +594,7 @@ public:
 	}
 
 private:
+	struct CachedThemeKey;
 	struct CachedTheme;
 
 	void init();
@@ -616,7 +625,9 @@ private:
 
 	void pushDefaultChatBackground();
 	void cacheChatTheme(
+		CachedThemeKey key,
 		const Data::CloudTheme &data,
+		const Data::WallPaper &paper,
 		Data::CloudThemeType type);
 	void cacheChatThemeDone(std::shared_ptr<Ui::ChatTheme> result);
 	void updateCustomThemeBackground(CachedTheme &theme);
@@ -668,7 +679,7 @@ private:
 	rpl::event_stream<> _filtersMenuChanged;
 
 	std::shared_ptr<Ui::ChatTheme> _defaultChatTheme;
-	base::flat_map<Ui::ChatThemeKey, CachedTheme> _customChatThemes;
+	base::flat_map<CachedThemeKey, CachedTheme> _customChatThemes;
 	rpl::event_stream<std::shared_ptr<Ui::ChatTheme>> _cachedThemesStream;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
 	std::weak_ptr<Ui::ChatTheme> _chatStyleTheme;

From 9b25973b491a110c4ee6cb0e5503278648fc9659 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Apr 2023 16:36:13 +0400
Subject: [PATCH 055/676] Update chat wallpaper from service message.

---
 .../boxes/background_preview_box.cpp          | 92 +++++++++++++++++--
 .../boxes/background_preview_box.h            | 14 ++-
 Telegram/SourceFiles/data/data_wall_paper.cpp |  8 +-
 .../media/history_view_theme_document.cpp     | 12 +++
 4 files changed, 114 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 1a2d3fe24..5040f870f 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/ui_utility.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_helpers.h"
 #include "history/view/history_view_message.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
@@ -59,6 +60,24 @@ constexpr auto kMaxWallPaperSlugLength = 255;
 	});
 }
 
+[[nodiscard]] AdminLog::OwnedItem GenerateServiceItem(
+		not_null<HistoryView::ElementDelegate*> delegate,
+		not_null<History*> history,
+		const QString &text,
+		bool out) {
+	Expects(history->peer->isUser());
+
+	const auto flags = MessageFlag::FakeHistoryItem
+		| MessageFlag::HasFromId
+		| (out ? MessageFlag::Outgoing : MessageFlag(0));
+	const auto item = history->makeMessage(
+		history->owner().nextLocalMessageId(),
+		flags,
+		base::unixtime::now(),
+		PreparedServiceText{ { text } });
+	return AdminLog::OwnedItem(delegate, item);
+}
+
 [[nodiscard]] AdminLog::OwnedItem GenerateTextItem(
 		not_null<HistoryView::ElementDelegate*> delegate,
 		not_null<History*> history,
@@ -136,19 +155,35 @@ constexpr auto kMaxWallPaperSlugLength = 255;
 BackgroundPreviewBox::BackgroundPreviewBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
-	const Data::WallPaper &paper)
+	const Data::WallPaper &paper,
+	BackgroundPreviewArgs args)
 : SimpleElementDelegate(controller, [=] { update(); })
 , _controller(controller)
+, _forPeer(args.forPeer)
+, _fromMessageId(args.fromMessageId)
 , _chatStyle(std::make_unique<Ui::ChatStyle>())
+, _serviceHistory(_controller->session().data().history(
+	PeerData::kServiceNotificationsId))
+, _service((_forPeer && !_fromMessageId)
+	? GenerateServiceItem(
+		delegate(),
+		_serviceHistory,
+		tr::lng_background_other_info(tr::now, lt_user, _forPeer->shortName()),
+		false)
+	: nullptr)
 , _text1(GenerateTextItem(
 	delegate(),
 	_controller->session().data().history(PeerData::kServiceNotificationsId),
-	tr::lng_background_text1(tr::now),
+	(_forPeer
+		? tr::lng_background_apply1(tr::now)
+		: tr::lng_background_text1(tr::now)),
 	false))
 , _text2(GenerateTextItem(
 	delegate(),
 	_controller->session().data().history(PeerData::kServiceNotificationsId),
-	tr::lng_background_text2(tr::now),
+	(_forPeer
+		? tr::lng_background_apply2(tr::now)
+		: tr::lng_background_text2(tr::now)),
 	true))
 , _paper(paper)
 , _media(_paper.document() ? _paper.document()->createMediaView() : nullptr)
@@ -187,9 +222,11 @@ not_null<HistoryView::ElementDelegate*> BackgroundPreviewBox::delegate() {
 void BackgroundPreviewBox::prepare() {
 	setTitle(tr::lng_background_header());
 
-	addButton(tr::lng_background_apply(), [=] { apply(); });
+	addButton(_forPeer
+		? tr::lng_background_apply_button()
+		: tr::lng_background_apply(), [=] { apply(); });
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
-	if (_paper.hasShareUrl()) {
+	if (!_forPeer && _paper.hasShareUrl()) {
 		addLeftButton(tr::lng_background_share(), [=] { share(); });
 	}
 	updateServiceBg(_paper.backgroundColors());
@@ -207,7 +244,11 @@ void BackgroundPreviewBox::prepare() {
 	setScaledFromThumb();
 	checkLoadedDocument();
 
-	_text1->setDisplayDate(true);
+	if (_service) {
+		_service->initDimensions();
+		_service->resizeGetHeight(st::boxWideWidth);
+	}
+	_text1->setDisplayDate(!_service);
 	_text1->initDimensions();
 	_text1->resizeGetHeight(st::boxWideWidth);
 	_text2->initDimensions();
@@ -244,6 +285,35 @@ void BackgroundPreviewBox::createBlurCheckbox() {
 }
 
 void BackgroundPreviewBox::apply() {
+	if (_forPeer) {
+		applyForPeer();
+	} else {
+		applyForEveryone();
+	}
+	closeBox();
+}
+
+void BackgroundPreviewBox::applyForPeer() {
+	Expects(_forPeer != nullptr);
+
+	const auto api = &_controller->session().api();
+	using Flag = MTPmessages_SetChatWallPaper::Flag;
+	api->request(MTPmessages_SetChatWallPaper(
+		MTP_flags((_fromMessageId ? Flag::f_id : Flag())
+			| (_fromMessageId ? Flag() : Flag::f_wallpaper)
+			| Flag::f_settings),
+		_forPeer->input,
+		_paper.mtpInput(&_controller->session()),
+		_paper.mtpSettings(),
+		MTP_int(_fromMessageId.msg)
+	)).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+	}).send();
+
+	_forPeer->setWallPaper(_paper);
+}
+
+void BackgroundPreviewBox::applyForEveryone() {
 	const auto install = (_paper.id() != Window::Theme::Background()->id())
 		&& Data::IsCloudWallPaper(_paper);
 	_controller->content()->setChatBackground(_paper, std::move(_full));
@@ -253,7 +323,6 @@ void BackgroundPreviewBox::apply() {
 			_paper.mtpSettings()
 		)).send();
 	}
-	closeBox();
 }
 
 void BackgroundPreviewBox::share() {
@@ -339,6 +408,7 @@ int BackgroundPreviewBox::textsTop() const {
 	const auto bottom = _blur ? _blur->y() : height();
 	return bottom
 		- st::historyPaddingBottom
+		- (_service ? _service->height() : 0)
 		- _text1->height()
 		- _text2->height();
 }
@@ -353,6 +423,7 @@ QRect BackgroundPreviewBox::radialRect() const {
 }
 
 void BackgroundPreviewBox::paintTexts(Painter &p, crl::time ms) {
+	const auto heights = _service ? _service->height() : 0;
 	const auto height1 = _text1->height();
 	const auto height2 = _text2->height();
 	auto context = _controller->defaultChatTheme()->preparePaintContext(
@@ -361,7 +432,12 @@ void BackgroundPreviewBox::paintTexts(Painter &p, crl::time ms) {
 		rect(),
 		_controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer));
 	p.translate(0, textsTop());
-	paintDate(p);
+	if (_service) {
+		_service->draw(p, context);
+		p.translate(0, heights);
+	} else {
+		paintDate(p);
+	}
 
 	context.outbg = _text1->hasOutLayout();
 	_text1->draw(p, context);
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.h b/Telegram/SourceFiles/boxes/background_preview_box.h
index 24554cd84..f758a77af 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.h
+++ b/Telegram/SourceFiles/boxes/background_preview_box.h
@@ -28,6 +28,11 @@ class Checkbox;
 class ChatStyle;
 } // namespace Ui
 
+struct BackgroundPreviewArgs {
+	PeerData *forPeer = nullptr;
+	FullMsgId fromMessageId;
+};
+
 class BackgroundPreviewBox
 	: public Ui::BoxContent
 	, private HistoryView::SimpleElementDelegate {
@@ -35,7 +40,8 @@ public:
 	BackgroundPreviewBox(
 		QWidget*,
 		not_null<Window::SessionController*> controller,
-		const Data::WallPaper &paper);
+		const Data::WallPaper &paper,
+		BackgroundPreviewArgs args = {});
 
 	static bool Start(
 		not_null<Window::SessionController*> controller,
@@ -53,6 +59,8 @@ private:
 	HistoryView::Context elementContext() override;
 
 	void apply();
+	void applyForPeer();
+	void applyForEveryone();
 	void share();
 	void radialAnimationCallback(crl::time now);
 	QRect radialRect() const;
@@ -72,7 +80,11 @@ private:
 	void checkBlurAnimationStart();
 
 	const not_null<Window::SessionController*> _controller;
+	PeerData * const _forPeer = nullptr;
+	FullMsgId _fromMessageId;
 	std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const not_null<History*> _serviceHistory;
+	AdminLog::OwnedItem _service;
 	AdminLog::OwnedItem _text1;
 	AdminLog::OwnedItem _text2;
 	Data::WallPaper _paper;
diff --git a/Telegram/SourceFiles/data/data_wall_paper.cpp b/Telegram/SourceFiles/data/data_wall_paper.cpp
index 468c05f87..d1babb244 100644
--- a/Telegram/SourceFiles/data/data_wall_paper.cpp
+++ b/Telegram/SourceFiles/data/data_wall_paper.cpp
@@ -357,6 +357,8 @@ MTPWallPaperSettings WallPaper::mtpSettings() const {
 	};
 	return MTP_wallPaperSettings(
 		MTP_flags((_blurred ? Flag::f_blur : Flag(0))
+			| Flag::f_intensity
+			| Flag::f_rotation
 			| flagForIndex(0)
 			| flagForIndex(1)
 			| flagForIndex(2)
@@ -487,11 +489,11 @@ std::optional<WallPaper> WallPaper::Create(
 	if (const auto settings = data.vsettings()) {
 		settings->match([&](const MTPDwallPaperSettings &data) {
 			result._blurred = data.is_blur();
+			if (const auto intensity = data.vintensity()) {
+				result._intensity = intensity->v;
+			}
 			if (result.isPattern()) {
 				result._backgroundColors = ColorsFromMTP(data);
-				if (const auto intensity = data.vintensity()) {
-					result._intensity = intensity->v;
-				}
 				if (const auto rotation = data.vrotation()) {
 					result._rotation = rotation->v;
 				}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 76024cea8..0a5d63cf2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/media/history_view_theme_document.h"
 
+#include "boxes/background_preview_box.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/history_view_element.h"
@@ -443,11 +444,22 @@ QString ThemeDocumentBox::button() {
 ClickHandlerPtr ThemeDocumentBox::createViewLink() {
 	const auto out = _parent->data()->out();
 	const auto to = _parent->history()->peer;
+	const auto media = _parent->data()->media();
+	const auto paper = media ? media->paper() : nullptr;
+	const auto maybe = paper ? *paper : std::optional<Data::WallPaper>();
+	const auto itemId = _parent->data()->fullId();
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto controller = my.sessionWindow.get()) {
 			if (out) {
 				controller->toggleChooseChatTheme(to);
+			} else if (maybe) {
+				controller->show(
+					Box<BackgroundPreviewBox>(
+						controller,
+						*maybe,
+						BackgroundPreviewArgs{ to, itemId }),
+					Ui::LayerOption::KeepOther);
 			}
 		}
 	});

From 352ae5100ae9d8040cf25b117d03391a240d2571 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Apr 2023 16:47:31 +0400
Subject: [PATCH 056/676] Support chat wallpaper set from gallery.

---
 Telegram/Resources/langs/lang.strings         |   2 +-
 Telegram/SourceFiles/boxes/background_box.cpp | 176 +++++++++++++++---
 Telegram/SourceFiles/boxes/background_box.h   |  13 +-
 .../boxes/background_preview_box.cpp          |  73 ++++----
 .../boxes/background_preview_box.h            |   1 -
 .../SourceFiles/history/history_widget.cpp    |   8 +-
 Telegram/SourceFiles/history/history_widget.h |   4 +-
 .../media/history_view_theme_document.cpp     |   3 +
 Telegram/SourceFiles/mainwidget.cpp           |   6 +-
 Telegram/SourceFiles/mainwidget.h             |   4 +-
 Telegram/SourceFiles/ui/chat/chat_style.cpp   |   6 +
 Telegram/SourceFiles/ui/chat/chat_style.h     |   1 +
 .../ui/chat/choose_theme_controller.cpp       |  61 ++++--
 .../ui/chat/choose_theme_controller.h         |   3 +-
 .../SourceFiles/window/section_widget.cpp     |  46 ++++-
 .../window/window_session_controller.cpp      |  37 +++-
 .../window/window_session_controller.h        |   5 +-
 17 files changed, 347 insertions(+), 102 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index aab6d6862..6fbf8a573 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -729,7 +729,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_manage_enabled_dictionary" = "Dictionary is enabled";
 "lng_settings_manage_remove_dictionary" = "Remove Dictionary";
 
-"lng_backgrounds_header" = "Choose your new chat background";
+"lng_backgrounds_header" = "Choose Wallpaper";
 "lng_theme_sure_keep" = "Keep this theme?";
 "lng_theme_reverting#one" = "Reverting to the old theme in {count} second.";
 "lng_theme_reverting#other" = "Reverting to the old theme in {count} seconds.";
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index a90f5a6ac..c5d15e377 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "apiwrap.h"
 #include "mtproto/sender.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_file_origin.h"
 #include "data/data_document.h"
@@ -61,11 +62,15 @@ class BackgroundBox::Inner final : public Ui::RpWidget {
 public:
 	Inner(
 		QWidget *parent,
-		not_null<Main::Session*> session);
+		not_null<Main::Session*> session,
+		PeerData *forPeer);
 	~Inner();
 
-	rpl::producer<Data::WallPaper> chooseEvents() const;
-	rpl::producer<Data::WallPaper> removeRequests() const;
+	[[nodiscard]] rpl::producer<Data::WallPaper> chooseEvents() const;
+	[[nodiscard]] rpl::producer<Data::WallPaper> removeRequests() const;
+
+	[[nodiscard]] auto resolveResetCustomPaper() const
+		->std::optional<Data::WallPaper>;
 
 	void removePaper(const Data::WallPaper &data);
 
@@ -109,6 +114,7 @@ private:
 	void resizeToContentAndPreload();
 	void updatePapers();
 	void requestPapers();
+	void pushResetCustomPaper();
 	void sortPapers();
 	void paintPaper(
 		QPainter &p,
@@ -118,9 +124,13 @@ private:
 	void validatePaperThumbnail(const Paper &paper) const;
 
 	const not_null<Main::Session*> _session;
+	PeerData * const _forPeer = nullptr;
+
 	MTP::Sender _api;
 
 	std::vector<Paper> _papers;
+	uint64 _currentId = 0;
+	uint64 _insertedResetId = 0;
 
 	Selection _over;
 	Selection _overDown;
@@ -133,8 +143,10 @@ private:
 
 BackgroundBox::BackgroundBox(
 	QWidget*,
-	not_null<Window::SessionController*> controller)
-: _controller(controller) {
+	not_null<Window::SessionController*> controller,
+	PeerData *forPeer)
+: _controller(controller)
+, _forPeer(forPeer) {
 }
 
 void BackgroundBox::prepare() {
@@ -145,14 +157,12 @@ void BackgroundBox::prepare() {
 	setDimensions(st::boxWideWidth, st::boxMaxListHeight);
 
 	_inner = setInnerWidget(
-		object_ptr<Inner>(this, &_controller->session()),
+		object_ptr<Inner>(this, &_controller->session(), _forPeer),
 		st::backgroundScroll);
 
 	_inner->chooseEvents(
 	) | rpl::start_with_next([=](const Data::WallPaper &paper) {
-		_controller->show(
-			Box<BackgroundPreviewBox>(_controller, paper),
-			Ui::LayerOption::KeepOther);
+		chosen(paper);
 	}, _inner->lifetime());
 
 	_inner->removeRequests(
@@ -161,6 +171,74 @@ void BackgroundBox::prepare() {
 	}, _inner->lifetime());
 }
 
+bool BackgroundBox::hasDefaultForPeer() const {
+	Expects(_forPeer != nullptr);
+
+	const auto paper = _forPeer->wallPaper();
+	if (!paper) {
+		return true;
+	}
+	const auto reset = _inner->resolveResetCustomPaper();
+	Assert(reset.has_value());
+	return (paper->id() == reset->id());
+}
+
+bool BackgroundBox::chosenDefaultForPeer(
+		const Data::WallPaper &paper) const {
+	if (!_forPeer) {
+		return false;
+	}
+
+	const auto reset = _inner->resolveResetCustomPaper();
+	Assert(reset.has_value());
+	return (paper.id() == reset->id());
+}
+
+void BackgroundBox::chosen(const Data::WallPaper &paper) {
+	if (chosenDefaultForPeer(paper)) {
+		if (!hasDefaultForPeer()) {
+			const auto reset = crl::guard(this, [=](Fn<void()> close) {
+				resetForPeer();
+				close();
+			});
+			_controller->show(Ui::MakeConfirmBox({
+				.text = u"Are you sure you want to reset the wallpaper?"_q,
+				.confirmed = reset,
+				.confirmText = u"Reset"_q,
+			}));
+		} else {
+			closeBox();
+		}
+		return;
+	}
+	_controller->show(
+		Box<BackgroundPreviewBox>(
+			_controller,
+			paper,
+			BackgroundPreviewArgs{ _forPeer }),
+		Ui::LayerOption::KeepOther);
+}
+
+void BackgroundBox::resetForPeer() {
+	const auto api = &_controller->session().api();
+	using Flag = MTPmessages_SetChatWallPaper::Flag;
+	api->request(MTPmessages_SetChatWallPaper(
+		MTP_flags(0),
+		_forPeer->input,
+		MTPInputWallPaper(),
+		MTPWallPaperSettings(),
+		MTPint()
+	)).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+	}).send();
+
+	const auto weak = Ui::MakeWeak(this);
+	_forPeer->setWallPaper(std::nullopt);
+	if (weak) {
+		_controller->finishChatThemeEdit(_forPeer);
+	}
+}
+
 void BackgroundBox::removePaper(const Data::WallPaper &paper) {
 	const auto session = &_controller->session();
 	const auto remove = [=, weak = Ui::MakeWeak(this)](Fn<void()> &&close) {
@@ -186,17 +264,19 @@ void BackgroundBox::removePaper(const Data::WallPaper &paper) {
 
 BackgroundBox::Inner::Inner(
 	QWidget *parent,
-	not_null<Main::Session*> session)
+	not_null<Main::Session*> session,
+	PeerData *forPeer)
 : RpWidget(parent)
 , _session(session)
+, _forPeer(forPeer)
 , _api(&_session->mtp())
 , _check(std::make_unique<Ui::RoundCheckbox>(st::overviewCheck, [=] { update(); })) {
 	_check->setChecked(true, anim::type::instant);
-	if (_session->data().wallpapers().empty()) {
-		resize(st::boxWideWidth, 2 * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
-	} else {
+	resize(st::boxWideWidth, 2 * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
+	Window::Theme::IsNightModeValue(
+	) | rpl::start_with_next([=] {
 		updatePapers();
-	}
+	}, lifetime());
 	requestPapers();
 
 	_session->downloaderTaskFinished(
@@ -219,6 +299,7 @@ BackgroundBox::Inner::Inner(
 		}
 	}, lifetime());
 
+
 	setMouseTracking(true);
 }
 
@@ -232,27 +313,78 @@ void BackgroundBox::Inner::requestPapers() {
 	}).send();
 }
 
+auto BackgroundBox::Inner::resolveResetCustomPaper() const
+-> std::optional<Data::WallPaper> {
+	if (!_forPeer) {
+		return {};
+	}
+	const auto nonCustom = Window::Theme::Background()->paper();
+	const auto themeEmoji = _forPeer->themeEmoji();
+	if (themeEmoji.isEmpty()) {
+		return nonCustom;
+	}
+	const auto &themes = _forPeer->owner().cloudThemes();
+	const auto theme = themes.themeForEmoji(themeEmoji);
+	if (!theme) {
+		return nonCustom;
+	}
+	using Type = Data::CloudTheme::Type;
+	const auto dark = Window::Theme::IsNightMode();
+	const auto i = theme->settings.find(dark ? Type::Dark : Type::Light);
+	if (i != end(theme->settings) && i->second.paper) {
+		return *i->second.paper;
+	}
+	return nonCustom;
+}
+
+void BackgroundBox::Inner::pushResetCustomPaper() {
+	if (const auto reset = resolveResetCustomPaper()) {
+		_insertedResetId = reset->id();
+		const auto j = ranges::find(
+			_papers,
+			_insertedResetId,
+			[](const Paper &paper) { return paper.data.id(); });
+		if (j != end(_papers)) {
+			j->data = j->data.withParamsFrom(*reset);
+		} else {
+			_papers.insert(begin(_papers), Paper{ *reset });
+		}
+	}
+}
+
 void BackgroundBox::Inner::sortPapers() {
-	const auto current = Window::Theme::Background()->id();
-	const auto night = Window::Theme::IsNightMode();
+	const auto currentCustom = _forPeer ? _forPeer->wallPaper() : nullptr;
+	_currentId = currentCustom
+		? currentCustom->id()
+		: _insertedResetId
+		? _insertedResetId
+		: Window::Theme::Background()->id();
+	const auto dark = Window::Theme::IsNightMode();
 	ranges::stable_sort(_papers, std::greater<>(), [&](const Paper &paper) {
 		const auto &data = paper.data;
 		return std::make_tuple(
-			data.id() == current,
-			night ? data.isDark() : !data.isDark(),
+			_insertedResetId && (_insertedResetId == data.id()),
+			data.id() == _currentId,
+			dark ? data.isDark() : !data.isDark(),
 			Data::IsDefaultWallPaper(data),
 			!data.isDefault() && !Data::IsLegacy1DefaultWallPaper(data),
 			Data::IsLegacy3DefaultWallPaper(data),
 			Data::IsLegacy2DefaultWallPaper(data),
 			Data::IsLegacy1DefaultWallPaper(data));
 	});
-	if (!_papers.empty() && _papers.front().data.id() == current) {
+	if (!_papers.empty()
+		&& _papers.front().data.id() == _currentId
+		&& !currentCustom
+		&& !_insertedResetId) {
 		_papers.front().data = _papers.front().data.withParamsFrom(
 			Window::Theme::Background()->paper());
 	}
 }
 
 void BackgroundBox::Inner::updatePapers() {
+	if (_session->data().wallpapers().empty()) {
+		return;
+	}
 	_over = _overDown = Selection();
 
 	_papers = _session->data().wallpapers(
@@ -261,6 +393,7 @@ void BackgroundBox::Inner::updatePapers() {
 	}) | ranges::views::transform([](const Data::WallPaper &paper) {
 		return Paper{ paper };
 	}) | ranges::to_vector;
+	pushResetCustomPaper();
 	sortPapers();
 	resizeToContentAndPreload();
 }
@@ -373,7 +506,7 @@ void BackgroundBox::Inner::paintPaper(
 	}
 
 	const auto over = !v::is_null(_overDown) ? _overDown : _over;
-	if (paper.data.id() == Window::Theme::Background()->id()) {
+	if (paper.data.id() == _currentId) {
 		const auto checkLeft = x + st::backgroundSize.width() - st::overviewCheckSkip - st::overviewCheck.size;
 		const auto checkTop = y + st::backgroundSize.height() - st::overviewCheckSkip - st::overviewCheck.size;
 		_check->paint(p, checkLeft, checkTop, width());
@@ -415,14 +548,13 @@ void BackgroundBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 			- st::stickerPanDeleteIconBg.width();
 		const auto deleteBottom = row * (height + skip) + skip
 			+ st::stickerPanDeleteIconBg.height();
-		const auto currentId = Window::Theme::Background()->id();
 		const auto inDelete = (x >= deleteLeft)
 			&& (y < deleteBottom)
 			&& Data::IsCloudWallPaper(data)
 			&& !Data::IsDefaultWallPaper(data)
 			&& !Data::IsLegacy2DefaultWallPaper(data)
 			&& !Data::IsLegacy3DefaultWallPaper(data)
-			&& (currentId != data.id());
+			&& (_currentId != data.id());
 		return (result >= _papers.size())
 			? Selection()
 			: inDelete
diff --git a/Telegram/SourceFiles/boxes/background_box.h b/Telegram/SourceFiles/boxes/background_box.h
index e3d5994ae..0fc28c44f 100644
--- a/Telegram/SourceFiles/boxes/background_box.h
+++ b/Telegram/SourceFiles/boxes/background_box.h
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "boxes/abstract_box.h"
 
+class PeerData;
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -19,7 +21,10 @@ class WallPaper;
 
 class BackgroundBox : public Ui::BoxContent {
 public:
-	BackgroundBox(QWidget*, not_null<Window::SessionController*> controller);
+	BackgroundBox(
+		QWidget*,
+		not_null<Window::SessionController*> controller,
+		PeerData *forPeer = nullptr);
 
 protected:
 	void prepare() override;
@@ -27,10 +32,16 @@ protected:
 private:
 	class Inner;
 
+	void chosen(const Data::WallPaper &paper);
+	[[nodiscard]] bool hasDefaultForPeer() const;
+	[[nodiscard]] bool chosenDefaultForPeer(
+		const Data::WallPaper &paper) const;
 	void removePaper(const Data::WallPaper &paper);
+	void resetForPeer();
 
 	const not_null<Window::SessionController*> _controller;
 
 	QPointer<Inner> _inner;
+	PeerData *_forPeer = nullptr;
 
 };
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 5040f870f..d35d1844b 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -164,23 +164,17 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 , _chatStyle(std::make_unique<Ui::ChatStyle>())
 , _serviceHistory(_controller->session().data().history(
 	PeerData::kServiceNotificationsId))
-, _service((_forPeer && !_fromMessageId)
-	? GenerateServiceItem(
-		delegate(),
-		_serviceHistory,
-		tr::lng_background_other_info(tr::now, lt_user, _forPeer->shortName()),
-		false)
-	: nullptr)
+, _service(nullptr)
 , _text1(GenerateTextItem(
 	delegate(),
-	_controller->session().data().history(PeerData::kServiceNotificationsId),
+	_serviceHistory,
 	(_forPeer
 		? tr::lng_background_apply1(tr::now)
 		: tr::lng_background_text1(tr::now)),
 	false))
 , _text2(GenerateTextItem(
 	delegate(),
-	_controller->session().data().history(PeerData::kServiceNotificationsId),
+	_serviceHistory,
 	(_forPeer
 		? tr::lng_background_apply2(tr::now)
 		: tr::lng_background_text2(tr::now)),
@@ -244,11 +238,7 @@ void BackgroundPreviewBox::prepare() {
 	setScaledFromThumb();
 	checkLoadedDocument();
 
-	if (_service) {
-		_service->initDimensions();
-		_service->resizeGetHeight(st::boxWideWidth);
-	}
-	_text1->setDisplayDate(!_service);
+	_text1->setDisplayDate(false);
 	_text1->initDimensions();
 	_text1->resizeGetHeight(st::boxWideWidth);
 	_text2->initDimensions();
@@ -285,12 +275,15 @@ void BackgroundPreviewBox::createBlurCheckbox() {
 }
 
 void BackgroundPreviewBox::apply() {
+	const auto weak = Ui::MakeWeak(this);
 	if (_forPeer) {
 		applyForPeer();
 	} else {
 		applyForEveryone();
 	}
-	closeBox();
+	if (weak) {
+		closeBox();
+	}
 }
 
 void BackgroundPreviewBox::applyForPeer() {
@@ -311,6 +304,7 @@ void BackgroundPreviewBox::applyForPeer() {
 	}).send();
 
 	_forPeer->setWallPaper(_paper);
+	_controller->finishChatThemeEdit(_forPeer);
 }
 
 void BackgroundPreviewBox::applyForEveryone() {
@@ -435,8 +429,6 @@ void BackgroundPreviewBox::paintTexts(Painter &p, crl::time ms) {
 	if (_service) {
 		_service->draw(p, context);
 		p.translate(0, heights);
-	} else {
-		paintDate(p);
 	}
 
 	context.outbg = _text1->hasOutLayout();
@@ -448,27 +440,6 @@ void BackgroundPreviewBox::paintTexts(Painter &p, crl::time ms) {
 	p.translate(0, height2);
 }
 
-void BackgroundPreviewBox::paintDate(Painter &p) {
-	const auto date = _text1->Get<HistoryView::DateBadge>();
-	if (!date || !_serviceBg) {
-		return;
-	}
-	auto hq = PainterHighQualityEnabler(p);
-	const auto text = date->text;
-	const auto bubbleHeight = st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
-	const auto bubbleTop = st::msgServiceMargin.top();
-	const auto textWidth = st::msgServiceFont->width(text);
-	const auto bubbleWidth = st::msgServicePadding.left() + textWidth + st::msgServicePadding.right();
-	const auto bubbleLeft = (width() - bubbleWidth) / 2;
-	const auto radius = bubbleHeight / 2;
-	p.setPen(Qt::NoPen);
-	p.setBrush(*_serviceBg);
-	p.drawRoundedRect(bubbleLeft, bubbleTop, bubbleWidth, bubbleHeight, radius, radius);
-	p.setPen(st::msgServiceFg);
-	p.setFont(st::msgServiceFont);
-	p.drawText(bubbleLeft + st::msgServicePadding.left(), bubbleTop + st::msgServicePadding.top() + st::msgServiceFont->ascent, text);
-}
-
 void BackgroundPreviewBox::radialAnimationCallback(crl::time now) {
 	Expects(_paper.document() != nullptr);
 
@@ -556,9 +527,29 @@ void BackgroundPreviewBox::updateServiceBg(const std::vector<QColor> &bg) {
 		green += color.green();
 		blue += color.blue();
 	}
-	_serviceBg = Ui::ThemeAdjustedColor(
-		st::msgServiceBg->c,
-		QColor(red / count, green / count, blue / count));
+	rpl::single(
+		rpl::empty
+	) | rpl::then(
+		style::PaletteChanged()
+	) | rpl::start_with_next([=] {
+		_serviceBg = Ui::ThemeAdjustedColor(
+			st::msgServiceBg->c,
+			QColor(red / count, green / count, blue / count));
+		_chatStyle->applyAdjustedServiceBg(*_serviceBg);
+	}, lifetime());
+
+	_service = GenerateServiceItem(
+		delegate(),
+		_serviceHistory,
+		((_forPeer && !_fromMessageId)
+			? tr::lng_background_other_info(
+				tr::now,
+				lt_user,
+				_forPeer->shortName())
+			: ItemDateText(_text1->data(), false)),
+		false);
+	_service->initDimensions();
+	_service->resizeGetHeight(st::boxWideWidth);
 }
 
 void BackgroundPreviewBox::checkLoadedDocument() {
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.h b/Telegram/SourceFiles/boxes/background_preview_box.h
index f758a77af..708361d7a 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.h
+++ b/Telegram/SourceFiles/boxes/background_preview_box.h
@@ -73,7 +73,6 @@ private:
 	void paintImage(Painter &p);
 	void paintRadial(Painter &p);
 	void paintTexts(Painter &p, crl::time ms);
-	void paintDate(Painter &p);
 	void createBlurCheckbox();
 	int textsTop() const;
 	void startFadeInFrom(QPixmap previous);
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 422818169..0b155f476 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1558,7 +1558,9 @@ bool HistoryWidget::updateStickersByEmoji() {
 	return (emoji != nullptr);
 }
 
-void HistoryWidget::toggleChooseChatTheme(not_null<PeerData*> peer) {
+void HistoryWidget::toggleChooseChatTheme(
+		not_null<PeerData*> peer,
+		std::optional<bool> show) {
 	const auto update = [=] {
 		updateInlineBotQuery();
 		updateControlsGeometry();
@@ -1567,7 +1569,7 @@ void HistoryWidget::toggleChooseChatTheme(not_null<PeerData*> peer) {
 	if (peer.get() != _peer) {
 		return;
 	} else if (_chooseTheme) {
-		if (isChoosingTheme()) {
+		if (isChoosingTheme() && !show.value_or(false)) {
 			const auto was = base::take(_chooseTheme);
 			if (Ui::InFocusChain(this)) {
 				setInnerFocus();
@@ -1575,6 +1577,8 @@ void HistoryWidget::toggleChooseChatTheme(not_null<PeerData*> peer) {
 			update();
 		}
 		return;
+	} else if (!show.value_or(true)) {
+		return;
 	} else if (_voiceRecordBar->isActive()) {
 		controller()->showToast({ tr::lng_chat_theme_cant_voice(tr::now) });
 		return;
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 778422cd8..12ff41f8e 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -226,7 +226,9 @@ public:
 	void clearDelayedShowAtRequest();
 	void clearDelayedShowAt();
 
-	void toggleChooseChatTheme(not_null<PeerData*> peer);
+	void toggleChooseChatTheme(
+		not_null<PeerData*> peer,
+		std::optional<bool> show = std::nullopt);
 	[[nodiscard]] Ui::ChatTheme *customChatTheme() const;
 
 	void applyCloudDraft(History *history);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 0a5d63cf2..fd59d20ae 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -341,6 +341,9 @@ void ThemeDocument::prepareThumbnailFrom(
 			_patternOpacity);
 		original.setDevicePixelRatio(ratio);
 	}
+	if (_serviceWidth) {
+		original = Images::Circle(std::move(original));
+	}
 	_thumbnail = Ui::PixmapFromImage(std::move(original));
 	_thumbnailGood = good;
 }
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 0ca07a17e..e43864568 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1231,8 +1231,10 @@ void MainWidget::clearChooseReportMessages() {
 	_history->setChooseReportMessagesDetails({}, nullptr);
 }
 
-void MainWidget::toggleChooseChatTheme(not_null<PeerData*> peer) {
-	_history->toggleChooseChatTheme(peer);
+void MainWidget::toggleChooseChatTheme(
+		not_null<PeerData*> peer,
+		std::optional<bool> show) {
+	_history->toggleChooseChatTheme(peer, show);
 }
 
 bool MainWidget::showHistoryInDifferentWindow(
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 5fc904207..fa33b5d83 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -215,7 +215,9 @@ public:
 		Fn<void(MessageIdsList)> done);
 	void clearChooseReportMessages();
 
-	void toggleChooseChatTheme(not_null<PeerData*> peer);
+	void toggleChooseChatTheme(
+		not_null<PeerData*> peer,
+		std::optional<bool> show);
 
 	void showHistory(
 		PeerId peer,
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index 9b4eec4de..38afef763 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -439,6 +439,12 @@ void ChatStyle::apply(not_null<ChatTheme*> theme) {
 	}
 }
 
+void ChatStyle::applyAdjustedServiceBg(QColor serviceBg) {
+	auto r = 0, g = 0, b = 0, a = 0;
+	serviceBg.getRgb(&r, &g, &b, &a);
+	msgServiceBg().set(uchar(r), uchar(g), uchar(b), uchar(a));
+}
+
 void ChatStyle::assignPalette(not_null<const style::palette*> palette) {
 	*static_cast<style::palette*>(this) = *palette;
 	style::internal::resetIcons();
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index 234928f07..7e459847d 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -165,6 +165,7 @@ public:
 	explicit ChatStyle(not_null<const style::palette*> isolated);
 
 	void apply(not_null<ChatTheme*> theme);
+	void applyAdjustedServiceBg(QColor serviceBg);
 
 	[[nodiscard]] rpl::producer<> paletteChanged() const {
 		return _paletteChanged.events();
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 9f64c4963..7626038d6 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/chat/choose_theme_controller.h"
 
+#include "boxes/background_box.h"
 #include "ui/rp_widget.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/labels.h"
@@ -35,7 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 namespace {
 
-constexpr auto kDisableElement = "disable"_cs;
+const auto kDisableElement = [] { return u"disable"_q; };
 
 [[nodiscard]] QImage GeneratePreview(not_null<Ui::ChatTheme*> theme) {
 	const auto &background = theme->background();
@@ -164,6 +165,7 @@ ChooseThemeController::ChooseThemeController(
 , _topShadow(std::make_unique<PlainShadow>(parent))
 , _content(_wrap->add(object_ptr<RpWidget>(_wrap.get())))
 , _inner(CreateChild<RpWidget>(_content.get()))
+, _disabledEmoji(Ui::Emoji::Find(QString::fromUtf8("\xe2\x9d\x8c")))
 , _dark(Window::Theme::IsThemeDarkValue()) {
 	init(parent->sizeValue());
 }
@@ -239,29 +241,45 @@ void ChooseThemeController::initButtons() {
 		controls,
 		tr::lng_chat_theme_apply(),
 		st::defaultActiveButton);
+	const auto choose = CreateChild<RoundButton>(
+		controls,
+		rpl::single(u"Change Wallpaper"_q),
+		st::defaultActiveButton);
 	const auto skip = st::normalFont->spacew * 2;
 	controls->resize(
-		skip + cancel->width() + skip + apply->width() + skip,
+		skip + cancel->width() + skip + choose->width() + skip,
 		apply->height() + skip * 2);
 	rpl::combine(
 		controls->widthValue(),
 		cancel->widthValue(),
-		apply->widthValue()
+		apply->widthValue(),
+		choose->widthValue(),
+		_chosen.value()
 	) | rpl::start_with_next([=](
 			int outer,
 			int cancelWidth,
-			int applyWidth) {
-		const auto inner = skip + cancelWidth + skip + applyWidth + skip;
+			int applyWidth,
+			int chooseWidth,
+			QString chosen) {
+		const auto was = _peer->themeEmoji();
+		const auto now = (chosen == kDisableElement()) ? QString() : chosen;
+		const auto changed = (now != was);
+		apply->setVisible(changed);
+		choose->setVisible(!changed);
+		const auto shown = changed ? apply : choose;
+		const auto shownWidth = changed ? applyWidth : chooseWidth;
+		const auto inner = skip + cancelWidth + skip + shownWidth + skip;
 		const auto left = (outer - inner) / 2;
 		cancel->moveToLeft(left, 0);
-		apply->moveToRight(left, 0);
+		shown->moveToRight(left, 0);
 	}, controls->lifetime());
 
 	cancel->setClickedCallback([=] { close(); });
 	apply->setClickedCallback([=] {
 		if (const auto chosen = findChosen()) {
-			if (Ui::Emoji::Find(_peer->themeEmoji()) != chosen->emoji) {
-				const auto now = chosen->key ? _chosen : QString();
+			const auto was = _peer->themeEmoji();
+			const auto now = chosen->key ? _chosen.current() : QString();
+			if (was != now) {
 				_peer->setThemeEmoji(now);
 				if (chosen->theme) {
 					// Remember while changes propagate through event loop.
@@ -278,6 +296,9 @@ void ChooseThemeController::initButtons() {
 		}
 		_controller->toggleChooseChatTheme(_peer);
 	});
+	choose->setClickedCallback([=] {
+		_controller->show(Box<BackgroundBox>(_controller, _peer));
+	});
 }
 
 void ChooseThemeController::paintEntry(QPainter &p, const Entry &entry) {
@@ -338,7 +359,7 @@ void ChooseThemeController::initList() {
 		} else if (entry->key) {
 			return entry->emoji->text();
 		} else {
-			return kDisableElement.utf16();
+			return kDisableElement();
 		}
 	};
 	_inner->events(
@@ -375,7 +396,7 @@ void ChooseThemeController::initList() {
 			const auto mouse = static_cast<QMouseEvent*>(event.get());
 			const auto entry = byPoint(mouse->pos());
 			const auto chosen = chosenText(entry);
-			if (entry && chosen == _pressed && chosen != _chosen) {
+			if (entry && chosen == _pressed && chosen != _chosen.current()) {
 				clearCurrentBackgroundState();
 				if (const auto was = findChosen()) {
 					was->chosen = false;
@@ -465,13 +486,14 @@ void ChooseThemeController::clearCurrentBackgroundState() {
 }
 
 auto ChooseThemeController::findChosen() -> Entry* {
-	if (_chosen.isEmpty()) {
+	const auto chosen = _chosen.current();
+	if (chosen.isEmpty()) {
 		return nullptr;
 	}
 	for (auto &entry : _entries) {
-		if (!entry.key && _chosen == kDisableElement.utf16()) {
+		if (!entry.key && chosen == kDisableElement()) {
 			return &entry;
-		} else if (_chosen == entry.emoji->text()) {
+		} else if (chosen == entry.emoji->text()) {
 			return &entry;
 		}
 	}
@@ -494,11 +516,14 @@ void ChooseThemeController::fill(
 	_inner->resize(full, skip + single.height() + skip);
 
 	const auto initial = Ui::Emoji::Find(_peer->themeEmoji());
+	if (!initial) {
+		_chosen = kDisableElement();
+	}
 
 	_dark.value(
 	) | rpl::start_with_next([=](bool dark) {
 		clearCurrentBackgroundState();
-		if (_chosen.isEmpty() && initial) {
+		if (_chosen.current().isEmpty() && initial) {
 			_chosen = initial->text();
 		}
 
@@ -507,9 +532,9 @@ void ChooseThemeController::fill(
 		auto x = skip * 2;
 		_entries.push_back({
 			.preview = GenerateEmptyPreview(),
-			.emoji = Ui::Emoji::Find(QString::fromUtf8("\xe2\x9d\x8c")),
+			.emoji = _disabledEmoji,
 			.geometry = QRect(QPoint(x, skip), single),
-			.chosen = (_chosen == kDisableElement.utf16()),
+			.chosen = (_chosen.current() == kDisableElement()),
 		});
 		Assert(_entries.front().emoji != nullptr);
 		style::PaletteChanged(
@@ -528,7 +553,7 @@ void ChooseThemeController::fill(
 				continue;
 			}
 			const auto key = ChatThemeKey{ theme.id, dark };
-			const auto isChosen = (_chosen == emoji->text());
+			const auto isChosen = (_chosen.current() == emoji->text());
 			_entries.push_back({
 				.key = key,
 				.emoji = emoji,
@@ -552,7 +577,7 @@ void ChooseThemeController::fill(
 				const auto theme = data.get();
 				i->theme = std::move(data);
 				i->preview = GeneratePreview(theme);
-				if (_chosen == i->emoji->text()) {
+				if (_chosen.current() == i->emoji->text()) {
 					_controller->overridePeerTheme(
 						_peer,
 						i->theme,
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
index ce97efe36..603c57839 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
@@ -66,9 +66,10 @@ private:
 
 	const not_null<RpWidget*> _content;
 	const not_null<RpWidget*> _inner;
+	const EmojiPtr _disabledEmoji = nullptr;
 	std::vector<Entry> _entries;
 	QString _pressed;
-	QString _chosen;
+	rpl::variable<QString> _chosen;
 	std::optional<QPoint> _pressPosition;
 	std::optional<QPoint> _dragStartPosition;
 	int _dragStartInnerLeft = 0;
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 570dd7aaf..1ad731fc4 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -95,6 +95,33 @@ struct ResolvedPaper {
 	}) | rpl::flatten_latest();
 }
 
+[[nodiscard]] rpl::producer<> DebouncedPaletteValue() {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct State {
+			base::has_weak_ptr guard;
+			bool scheduled = false;
+		};
+		const auto state = lifetime.make_state<State>();
+
+		consumer.put_next_copy(rpl::empty);
+		style::PaletteChanged(
+		) | rpl::start_with_next([=] {
+			if (state->scheduled) {
+				return;
+			}
+			state->scheduled = true;
+			Ui::PostponeCall(&state->guard, [=] {
+				state->scheduled = false;
+				consumer.put_next_copy(rpl::empty);
+			});
+		}, lifetime);
+
+		return lifetime;
+	};
+}
+
 struct ResolvedTheme {
 	std::optional<Data::CloudTheme> theme;
 	std::optional<ResolvedPaper> paper;
@@ -111,9 +138,22 @@ struct ResolvedTheme {
 	) | rpl::map([](
 			std::optional<Data::CloudTheme> theme,
 			std::optional<ResolvedPaper> paper,
-			bool night) {
-		return ResolvedTheme{ std::move(theme), std::move(paper), night };
-	});
+			bool night) -> rpl::producer<ResolvedTheme> {
+		if (theme || !paper) {
+			return rpl::single<ResolvedTheme>({
+				std::move(theme),
+				std::move(paper),
+				night,
+			});
+		}
+		return DebouncedPaletteValue(
+		) | rpl::map([=] {
+			return ResolvedTheme{
+				.paper = paper,
+				.dark = night,
+			};
+		});
+	}) | rpl::flatten_latest();
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index a5645879a..df7a665c1 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -97,9 +97,10 @@ constexpr auto kMaxChatEntryHistorySize = 50;
 constexpr auto kDayBaseFile = ":/gui/day-custom-base.tdesktop-theme"_cs;
 constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs;
 
-[[nodiscard]] Fn<void(style::palette&)> PrepareDefaultPaletteCallback() {
-	return [=](style::palette &palette) {
-		palette.reset();
+[[nodiscard]] Fn<void(style::palette&)> PrepareCurrentCallback() {
+	const auto copy = std::make_shared<style::palette>();
+	return [=, data = style::main_palette::save()](style::palette &palette) {
+		palette.load(data);
 	};
 }
 
@@ -788,6 +789,14 @@ SessionController::SessionController(
 			pushDefaultChatBackground();
 		}
 	}, _lifetime);
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		for (auto &[key, value] : _customChatThemes) {
+			if (!key.theme.id) {
+				value.theme.reset();
+			}
+		}
+	}, _lifetime);
 
 	_authedName = session->user()->name();
 	session->changes().peerUpdates(
@@ -1831,8 +1840,22 @@ void SessionController::showInNewWindow(
 	}
 }
 
-void SessionController::toggleChooseChatTheme(not_null<PeerData*> peer) {
-	content()->toggleChooseChatTheme(peer);
+void SessionController::toggleChooseChatTheme(
+		not_null<PeerData*> peer,
+		std::optional<bool> show) {
+	content()->toggleChooseChatTheme(peer, show);
+}
+
+void SessionController::finishChatThemeEdit(not_null<PeerData*> peer) {
+	toggleChooseChatTheme(peer, false);
+	const auto weak = base::make_weak(this);
+	const auto history = activeChatCurrent().history();
+	if (!history || history->peer != peer) {
+		showPeerHistory(peer);
+	}
+	if (weak) {
+		hideLayer();
+	}
 }
 
 void SessionController::updateColumnLayout() {
@@ -2082,7 +2105,7 @@ auto SessionController::cachedChatThemeValue(
 		return rpl::single(_defaultChatTheme);
 	}
 	const auto settings = data.settings.find(type);
-	if (!data.id && settings == end(data.settings)) {
+	if (data.id && settings == end(data.settings)) {
 		return rpl::single(_defaultChatTheme);
 	}
 	if (paper.isNull()
@@ -2242,7 +2265,7 @@ void SessionController::cacheChatTheme(
 		.key = key.theme,
 		.preparePalette = (data.id
 			? PreparePaletteCallback(dark, i->second.accentColor)
-			: PrepareDefaultPaletteCallback()),
+			: PrepareCurrentCallback()),
 		.backgroundData = backgroundData(theme),
 		.bubblesData = PrepareBubblesData(data, type),
 		.basedOnDark = dark,
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 01b9a8761..b06dd32c7 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -498,7 +498,10 @@ public:
 		not_null<PeerData*> peer,
 		MsgId msgId = ShowAtUnreadMsgId);
 
-	void toggleChooseChatTheme(not_null<PeerData*> peer);
+	void toggleChooseChatTheme(
+		not_null<PeerData*> peer,
+		std::optional<bool> show = std::nullopt);
+	void finishChatThemeEdit(not_null<PeerData*> peer);
 
 	[[nodiscard]] bool dialogsListFocused() const {
 		return _dialogsListFocused.current();

From da7d4687ca22547730a72dc4873c95482b0b02f9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Apr 2023 22:06:53 +0400
Subject: [PATCH 057/676] Drop custom wallpaper on theme change.

---
 .../ui/chat/choose_theme_controller.cpp            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 7626038d6..25930adc9 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -281,11 +281,25 @@ void ChooseThemeController::initButtons() {
 			const auto now = chosen->key ? _chosen.current() : QString();
 			if (was != now) {
 				_peer->setThemeEmoji(now);
+				const auto dropWallPaper = (_peer->wallPaper() != nullptr);
+				if (dropWallPaper) {
+					_peer->setWallPaper({});
+				}
+
 				if (chosen->theme) {
 					// Remember while changes propagate through event loop.
 					_controller->pushLastUsedChatTheme(chosen->theme);
 				}
 				const auto api = &_peer->session().api();
+				api->request(MTPmessages_SetChatWallPaper(
+					MTP_flags(0),
+					_peer->input,
+					MTPInputWallPaper(),
+					MTPWallPaperSettings(),
+					MTPint()
+				)).afterDelay(10).done([=](const MTPUpdates &result) {
+					api->applyUpdates(result);
+				}).send();
 				api->request(MTPmessages_SetChatTheme(
 					_peer->input,
 					MTP_string(now)

From 9130735ed67ab814a4bf6e22d628986a2fbff25c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Apr 2023 22:07:12 +0400
Subject: [PATCH 058/676] Add a 'Choose from file' button in wallpapers
 gallery.

---
 Telegram/SourceFiles/boxes/background_box.cpp | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index c5d15e377..0aefa881f 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -21,13 +21,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "boxes/background_preview_box.h"
+#include "info/profile/info_profile_icon.h"
+#include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/widgets/buttons.h"
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme.h"
 #include "styles/style_overview.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
 
 namespace {
 
@@ -156,9 +160,30 @@ void BackgroundBox::prepare() {
 
 	setDimensions(st::boxWideWidth, st::boxMaxListHeight);
 
-	_inner = setInnerWidget(
-		object_ptr<Inner>(this, &_controller->session(), _forPeer),
-		st::backgroundScroll);
+	auto wrap = object_ptr<Ui::VerticalLayout>(this);
+	const auto container = wrap.data();
+
+	Settings::AddSkip(container);
+
+	const auto button = container->add(Settings::CreateButton(
+		container,
+		tr::lng_settings_bg_from_file(),
+		st::infoProfileButton));
+	object_ptr<Info::Profile::FloatingIcon>(
+		button,
+		st::infoIconMediaPhoto,
+		st::infoSharedMediaButtonIconPosition);
+
+	Settings::AddSkip(container);
+	Settings::AddDivider(container);
+
+	_inner = container->add(
+		object_ptr<Inner>(this, &_controller->session(), _forPeer));
+
+	container->resizeToWidth(st::boxWideWidth);
+
+	setInnerWidget(std::move(wrap), st::backgroundScroll);
+	setInnerTopSkip(st::lineWidth);
 
 	_inner->chooseEvents(
 	) | rpl::start_with_next([=](const Data::WallPaper &paper) {

From 0b25d19e3bf3ac1c8a08a4ce6093195eb32b4722 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Apr 2023 10:42:01 +0400
Subject: [PATCH 059/676] Allow uploading chat wallpapers from file.

---
 Telegram/SourceFiles/boxes/background_box.cpp |  55 ++++++++
 Telegram/SourceFiles/boxes/background_box.h   |   2 +
 .../boxes/background_preview_box.cpp          | 102 ++++++++++++--
 .../boxes/background_preview_box.h            |   6 +
 .../media/history_view_theme_document.cpp     |   5 +-
 .../window/themes/window_theme.cpp            | 128 +++++++++---------
 .../SourceFiles/window/themes/window_theme.h  |   5 +
 7 files changed, 224 insertions(+), 79 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 0aefa881f..40407334a 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -10,11 +10,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "ui/effects/round_checkbox.h"
 #include "ui/image/image.h"
+#include "ui/chat/attach/attach_extensions.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/ui_utility.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
 #include "mtproto/sender.h"
+#include "core/file_utilities.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_file_origin.h"
@@ -174,6 +176,10 @@ void BackgroundBox::prepare() {
 		st::infoIconMediaPhoto,
 		st::infoSharedMediaButtonIconPosition);
 
+	button->setClickedCallback([=] {
+		chooseFromFile();
+	});
+
 	Settings::AddSkip(container);
 	Settings::AddDivider(container);
 
@@ -196,6 +202,55 @@ void BackgroundBox::prepare() {
 	}, _inner->lifetime());
 }
 
+void BackgroundBox::chooseFromFile() {
+	const auto filterStart = _forPeer
+		? u"Image files (*"_q
+		: u"Theme files (*.tdesktop-theme *.tdesktop-palette *"_q;
+	auto filters = QStringList(
+		filterStart
+		+ Ui::ImageExtensions().join(u" *"_q)
+		+ u")"_q);
+	filters.push_back(FileDialog::AllFilesFilter());
+	const auto callback = [=](const FileDialog::OpenResult &result) {
+		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+			return;
+		}
+
+		if (!_forPeer && !result.paths.isEmpty()) {
+			const auto filePath = result.paths.front();
+			const auto hasExtension = [&](QLatin1String extension) {
+				return filePath.endsWith(extension, Qt::CaseInsensitive);
+			};
+			if (hasExtension(qstr(".tdesktop-theme"))
+				|| hasExtension(qstr(".tdesktop-palette"))) {
+				Window::Theme::Apply(filePath);
+				return;
+			}
+		}
+
+		auto image = Images::Read({
+			.path = result.paths.isEmpty() ? QString() : result.paths.front(),
+			.content = result.remoteContent,
+			.forceOpaque = true,
+		}).image;
+		if (image.isNull() || image.width() <= 0 || image.height() <= 0) {
+			return;
+		}
+		auto local = Data::CustomWallPaper();
+		local.setLocalImageAsThumbnail(std::make_shared<Image>(
+			std::move(image)));
+		_controller->show(Box<BackgroundPreviewBox>(
+			_controller,
+			local,
+			BackgroundPreviewArgs{ _forPeer }));
+	};
+	FileDialog::GetOpenPath(
+		this,
+		tr::lng_choose_image(tr::now),
+		filters.join(u";;"_q),
+		crl::guard(this, callback));
+}
+
 bool BackgroundBox::hasDefaultForPeer() const {
 	Expects(_forPeer != nullptr);
 
diff --git a/Telegram/SourceFiles/boxes/background_box.h b/Telegram/SourceFiles/boxes/background_box.h
index 0fc28c44f..4e0bc3727 100644
--- a/Telegram/SourceFiles/boxes/background_box.h
+++ b/Telegram/SourceFiles/boxes/background_box.h
@@ -39,6 +39,8 @@ private:
 	void removePaper(const Data::WallPaper &paper);
 	void resetForPeer();
 
+	void chooseFromFile();
+
 	const not_null<Window::SessionController*> _controller;
 
 	QPointer<Inner> _inner;
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index d35d1844b..de9e75dd5 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -35,6 +35,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/background_preview_box.h"
 #include "window/window_session_controller.h"
 #include "settings/settings_common.h"
+#include "storage/file_upload.h"
+#include "storage/localimageloader.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -275,18 +277,82 @@ void BackgroundPreviewBox::createBlurCheckbox() {
 }
 
 void BackgroundPreviewBox::apply() {
-	const auto weak = Ui::MakeWeak(this);
 	if (_forPeer) {
 		applyForPeer();
 	} else {
 		applyForEveryone();
 	}
-	if (weak) {
-		closeBox();
-	}
 }
 
-void BackgroundPreviewBox::applyForPeer() {
+void BackgroundPreviewBox::uploadForPeer() {
+	Expects(_forPeer != nullptr);
+
+	if (_uploadId) {
+		return;
+	}
+
+	const auto session = &_controller->session();
+	const auto ready = Window::Theme::PrepareWallPaper(
+		session->mainDcId(),
+		_paper.localThumbnail()->original());
+	const auto documentId = ready.id;
+	_uploadId = FullMsgId(
+		session->userPeerId(),
+		session->data().nextLocalMessageId());
+	session->uploader().uploadMedia(_uploadId, ready);
+	if (_uploadLifetime) {
+		return;
+	}
+
+	const auto document = session->data().document(documentId);
+	document->uploadingData = std::make_unique<Data::UploadState>(
+		document->size);
+
+	session->uploader().documentProgress(
+	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+		if (fullId != _uploadId) {
+			return;
+		}
+		_uploadProgress = document->uploading()
+			? ((document->uploadingData->offset * 100)
+				/ document->uploadingData->size)
+			: 0.;
+		update(radialRect());
+	}, _uploadLifetime);
+
+	session->uploader().documentReady(
+	) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+		if (data.fullId != _uploadId) {
+			return;
+		}
+		_uploadProgress = 1.;
+		_uploadLifetime.destroy();
+		update(radialRect());
+		session->api().request(MTPaccount_UploadWallPaper(
+			MTP_flags(MTPaccount_UploadWallPaper::Flag::f_for_chat),
+			data.info.file,
+			MTP_string("image/jpeg"),
+			_paper.mtpSettings()
+		)).done([=](const MTPWallPaper &result) {
+			result.match([&](const MTPDwallPaper &data) {
+				session->data().documentConvert(
+					session->data().document(documentId),
+					data.vdocument());
+			}, [&](const MTPDwallPaperNoFile &data) {
+				LOG(("API Error: "
+					"Got wallPaperNoFile after account.UploadWallPaper."));
+			});
+			if (const auto paper = Data::WallPaper::Create(session, result)) {
+				setExistingForPeer(*paper);
+			}
+		}).send();
+	}, _uploadLifetime);
+
+	_uploadProgress = 0.;
+	_radial.start(_uploadProgress);
+}
+
+void BackgroundPreviewBox::setExistingForPeer(const Data::WallPaper &paper) {
 	Expects(_forPeer != nullptr);
 
 	const auto api = &_controller->session().api();
@@ -296,17 +362,27 @@ void BackgroundPreviewBox::applyForPeer() {
 			| (_fromMessageId ? Flag() : Flag::f_wallpaper)
 			| Flag::f_settings),
 		_forPeer->input,
-		_paper.mtpInput(&_controller->session()),
-		_paper.mtpSettings(),
+		paper.mtpInput(&_controller->session()),
+		paper.mtpSettings(),
 		MTP_int(_fromMessageId.msg)
 	)).done([=](const MTPUpdates &result) {
 		api->applyUpdates(result);
 	}).send();
 
-	_forPeer->setWallPaper(_paper);
+	_forPeer->setWallPaper(paper);
 	_controller->finishChatThemeEdit(_forPeer);
 }
 
+void BackgroundPreviewBox::applyForPeer() {
+	Expects(_forPeer != nullptr);
+
+	if (Data::IsCustomWallPaper(_paper)) {
+		uploadForPeer();
+	} else {
+		setExistingForPeer(_paper);
+	}
+}
+
 void BackgroundPreviewBox::applyForEveryone() {
 	const auto install = (_paper.id() != Window::Theme::Background()->id())
 		&& Data::IsCloudWallPaper(_paper);
@@ -317,6 +393,7 @@ void BackgroundPreviewBox::applyForEveryone() {
 			_paper.mtpSettings()
 		)).send();
 	}
+	closeBox();
 }
 
 void BackgroundPreviewBox::share() {
@@ -441,14 +518,11 @@ void BackgroundPreviewBox::paintTexts(Painter &p, crl::time ms) {
 }
 
 void BackgroundPreviewBox::radialAnimationCallback(crl::time now) {
-	Expects(_paper.document() != nullptr);
-
 	const auto document = _paper.document();
 	const auto wasAnimating = _radial.animating();
-	const auto updated = _radial.update(
-		_media->progress(),
-		!document->loading(),
-		now);
+	const auto updated = _uploadId
+		? _radial.update(_uploadProgress, !_uploadLifetime, now)
+		: _radial.update(_media->progress(), !document->loading(), now);
 	if ((wasAnimating || _radial.animating())
 		&& (!anim::Disabled() || updated)) {
 		update(radialRect());
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.h b/Telegram/SourceFiles/boxes/background_preview_box.h
index 708361d7a..ebd1b6269 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.h
+++ b/Telegram/SourceFiles/boxes/background_preview_box.h
@@ -61,6 +61,8 @@ private:
 	void apply();
 	void applyForPeer();
 	void applyForEveryone();
+	void uploadForPeer();
+	void setExistingForPeer(const Data::WallPaper &paper);
 	void share();
 	void radialAnimationCallback(crl::time now);
 	QRect radialRect() const;
@@ -96,4 +98,8 @@ private:
 	std::optional<QColor> _serviceBg;
 	object_ptr<Ui::Checkbox> _blur = { nullptr };
 
+	FullMsgId _uploadId;
+	float64 _uploadProgress = 0.;
+	rpl::lifetime _uploadLifetime;
+
 };
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index fd59d20ae..5e4a48623 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -329,9 +329,12 @@ void ThemeDocument::prepareThumbnailFrom(
 		tw = th = 1;
 	}
 	const auto ratio = style::DevicePixelRatio();
+	const auto resizeTo = _serviceWidth
+		? QSize(tw, th).scaled(_pixw, _pixh, Qt::KeepAspectRatioByExpanding)
+		: QSize(_pixw, (_pixw * th) / tw);
 	original = Images::Prepare(
 		std::move(original),
-		QSize(_pixw, (_pixw * th) / tw) * ratio,
+		resizeTo * ratio,
 		{ .options = options, .outer = { _pixw, _pixh } });
 	if (isPattern) {
 		original = Ui::PreparePatternImage(
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 286781b8c..1aae8805b 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -457,70 +457,6 @@ void ClearApplying() {
 	GlobalApplying = Applying();
 }
 
-SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
-	PreparedPhotoThumbs thumbnails;
-	QVector<MTPPhotoSize> sizes;
-
-	QByteArray jpeg;
-	QBuffer jpegBuffer(&jpeg);
-	image.save(&jpegBuffer, "JPG", 87);
-
-	const auto scaled = [&](int size) {
-		return image.scaled(
-			size,
-			size,
-			Qt::KeepAspectRatio,
-			Qt::SmoothTransformation);
-	};
-	const auto push = [&](const char *type, QImage &&image) {
-		sizes.push_back(MTP_photoSize(
-			MTP_string(type),
-			MTP_int(image.width()),
-			MTP_int(image.height()), MTP_int(0)));
-		thumbnails.emplace(
-			type[0],
-			PreparedPhotoThumb{ .image = std::move(image) });
-	};
-	push("s", scaled(320));
-
-	const auto filename = u"wallpaper.jpg"_q;
-	auto attributes = QVector<MTPDocumentAttribute>(
-		1,
-		MTP_documentAttributeFilename(MTP_string(filename)));
-	attributes.push_back(MTP_documentAttributeImageSize(
-		MTP_int(image.width()),
-		MTP_int(image.height())));
-	const auto id = base::RandomValue<DocumentId>();
-	const auto document = MTP_document(
-		MTP_flags(0),
-		MTP_long(id),
-		MTP_long(0),
-		MTP_bytes(),
-		MTP_int(base::unixtime::now()),
-		MTP_string("image/jpeg"),
-		MTP_long(jpeg.size()),
-		MTP_vector<MTPPhotoSize>(sizes),
-		MTPVector<MTPVideoSize>(),
-		MTP_int(dcId),
-		MTP_vector<MTPDocumentAttribute>(attributes));
-
-	return SendMediaReady(
-		SendMediaType::ThemeFile,
-		QString(), // filepath
-		filename,
-		jpeg.size(),
-		jpeg,
-		id,
-		0,
-		QString(),
-		PeerId(),
-		MTP_photoEmpty(MTP_long(0)),
-		thumbnails,
-		document,
-		QByteArray(),
-		0);
-}
-
 void ClearEditingPalette() {
 	QFile(EditingPalettePath()).remove();
 }
@@ -1565,5 +1501,69 @@ bool ReadPaletteValues(const QByteArray &content, Fn<bool(QLatin1String name, QL
 	};
 }
 
+SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
+	PreparedPhotoThumbs thumbnails;
+	QVector<MTPPhotoSize> sizes;
+
+	QByteArray jpeg;
+	QBuffer jpegBuffer(&jpeg);
+	image.save(&jpegBuffer, "JPG", 87);
+
+	const auto scaled = [&](int size) {
+		return image.scaled(
+			size,
+			size,
+			Qt::KeepAspectRatio,
+			Qt::SmoothTransformation);
+	};
+	const auto push = [&](const char *type, QImage &&image) {
+		sizes.push_back(MTP_photoSize(
+			MTP_string(type),
+			MTP_int(image.width()),
+			MTP_int(image.height()), MTP_int(0)));
+		thumbnails.emplace(
+			type[0],
+			PreparedPhotoThumb{ .image = std::move(image) });
+	};
+	push("s", scaled(320));
+
+	const auto filename = u"wallpaper.jpg"_q;
+	auto attributes = QVector<MTPDocumentAttribute>(
+		1,
+		MTP_documentAttributeFilename(MTP_string(filename)));
+	attributes.push_back(MTP_documentAttributeImageSize(
+		MTP_int(image.width()),
+		MTP_int(image.height())));
+	const auto id = base::RandomValue<DocumentId>();
+	const auto document = MTP_document(
+		MTP_flags(0),
+		MTP_long(id),
+		MTP_long(0),
+		MTP_bytes(),
+		MTP_int(base::unixtime::now()),
+		MTP_string("image/jpeg"),
+		MTP_long(jpeg.size()),
+		MTP_vector<MTPPhotoSize>(sizes),
+		MTPVector<MTPVideoSize>(),
+		MTP_int(dcId),
+		MTP_vector<MTPDocumentAttribute>(attributes));
+
+	return SendMediaReady(
+		SendMediaType::ThemeFile,
+		QString(), // filepath
+		filename,
+		jpeg.size(),
+		jpeg,
+		id,
+		0,
+		QString(),
+		PeerId(),
+		MTP_photoEmpty(MTP_long(0)),
+		thumbnails,
+		document,
+		QByteArray(),
+		0);
+}
+
 } // namespace Theme
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index f8458c2ac..32f43977c 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/style/style_core_palette.h"
 
 class QFileSystemWatcher;
+struct SendMediaReady;
 
 namespace style {
 struct colorizer;
@@ -296,6 +297,10 @@ private:
 
 };
 
+[[nodiscard]] SendMediaReady PrepareWallPaper(
+	MTP::DcId dcId,
+	const QImage &image);
+
 [[nodiscard]] ChatBackground *Background();
 
 bool ReadPaletteValues(

From ae6d703a449d3acaa03662c4391a6c4742c8ee22 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Apr 2023 11:08:44 +0400
Subject: [PATCH 060/676] Always show current custom wallpaper.

---
 Telegram/SourceFiles/boxes/background_box.cpp | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 40407334a..4adde4e1e 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -120,7 +120,7 @@ private:
 	void resizeToContentAndPreload();
 	void updatePapers();
 	void requestPapers();
-	void pushResetCustomPaper();
+	void pushCustomPapers();
 	void sortPapers();
 	void paintPaper(
 		QPainter &p,
@@ -417,7 +417,20 @@ auto BackgroundBox::Inner::resolveResetCustomPaper() const
 	return nonCustom;
 }
 
-void BackgroundBox::Inner::pushResetCustomPaper() {
+void BackgroundBox::Inner::pushCustomPapers() {
+	auto customId = uint64();
+	if (const auto custom = _forPeer ? _forPeer->wallPaper() : nullptr) {
+		customId = custom->id();
+		const auto j = ranges::find(
+			_papers,
+			custom->id(),
+			[](const Paper &paper) { return paper.data.id(); });
+		if (j != end(_papers)) {
+			j->data = j->data.withParamsFrom(*custom);
+		} else {
+			_papers.insert(begin(_papers), Paper{ *custom });
+		}
+	}
 	if (const auto reset = resolveResetCustomPaper()) {
 		_insertedResetId = reset->id();
 		const auto j = ranges::find(
@@ -425,7 +438,9 @@ void BackgroundBox::Inner::pushResetCustomPaper() {
 			_insertedResetId,
 			[](const Paper &paper) { return paper.data.id(); });
 		if (j != end(_papers)) {
-			j->data = j->data.withParamsFrom(*reset);
+			if (_insertedResetId != customId) {
+				j->data = j->data.withParamsFrom(*reset);
+			}
 		} else {
 			_papers.insert(begin(_papers), Paper{ *reset });
 		}
@@ -468,12 +483,16 @@ void BackgroundBox::Inner::updatePapers() {
 	_over = _overDown = Selection();
 
 	_papers = _session->data().wallpapers(
-	) | ranges::views::filter([](const Data::WallPaper &paper) {
-		return !paper.isPattern() || !paper.backgroundColors().empty();
+	) | ranges::views::filter([&](const Data::WallPaper &paper) {
+		return (!paper.isPattern() || !paper.backgroundColors().empty())
+			&& (!_forPeer
+				|| (!Data::IsDefaultWallPaper(paper)
+					&& (Data::IsCloudWallPaper(paper)
+						|| Data::IsCustomWallPaper(paper))));
 	}) | ranges::views::transform([](const Data::WallPaper &paper) {
 		return Paper{ paper };
 	}) | ranges::to_vector;
-	pushResetCustomPaper();
+	pushCustomPapers();
 	sortPapers();
 	resizeToContentAndPreload();
 }

From 1b6b0c1732f96fbce428a2332dfafcef021fa5ca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Apr 2023 12:14:39 +0400
Subject: [PATCH 061/676] Show blur / dimming in wallpaper preview.

---
 .../media/history_view_theme_document.cpp     | 39 ++++++++++++++-----
 .../view/media/history_view_theme_document.h  |  6 ++-
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 5e4a48623..1ed00b91b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
+#include "window/themes/window_theme.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -54,6 +55,10 @@ ThemeDocument::ThemeDocument(
 		_background = params->backgroundColors();
 		_patternOpacity = params->patternOpacity();
 		_gradientRotation = params->gradientRotation();
+		_blurredWallPaper = params->isBlurred();
+		_dimmingIntensity = (params->isPattern() || !_serviceWidth)
+			? 0
+			: std::max(params->patternIntensity(), 0);
 	}
 	const auto fullId = _parent->data()->fullId();
 	if (_data) {
@@ -267,6 +272,11 @@ bool ThemeDocument::checkGoodThumbnail() const {
 }
 
 void ThemeDocument::validateThumbnail() const {
+	const auto isDark = Window::Theme::IsNightMode();
+	if (_isDark != isDark) {
+		_isDark = isDark;
+		_thumbnailGood = -1;
+	}
 	if (checkGoodThumbnail()) {
 		if (_thumbnailGood > 0) {
 			return;
@@ -294,16 +304,30 @@ void ThemeDocument::validateThumbnail() const {
 	}
 }
 
+QImage ThemeDocument::finishServiceThumbnail(QImage image) const {
+	if (!_serviceWidth) {
+		return image;
+	} else if (_isDark && _dimmingIntensity > 0) {
+		image.setDevicePixelRatio(cIntRetinaFactor());
+		auto p = QPainter(&image);
+		const auto alpha = 255 * _dimmingIntensity / 100;
+		p.fillRect(0, 0, _pixw, _pixh, QColor(0, 0, 0, alpha));
+	}
+	if (_blurredWallPaper) {
+		constexpr auto kRadius = 16;
+		image = Images::BlurLargeImage(std::move(image), kRadius);
+	}
+	return Images::Circle(std::move(image));
+}
+
 void ThemeDocument::generateThumbnail() const {
 	auto image = Ui::GenerateBackgroundImage(
 		QSize(_pixw, _pixh) * cIntRetinaFactor(),
 		_background,
 		_gradientRotation,
 		_patternOpacity);
-	if (_serviceWidth) {
-		image = Images::Circle(std::move(image));
-	}
-	_thumbnail = Ui::PixmapFromImage(std::move(image));
+	_thumbnail = Ui::PixmapFromImage(
+		finishServiceThumbnail(std::move(image)));
 	_thumbnail.setDevicePixelRatio(cRetinaFactor());
 	_thumbnailGood = 1;
 }
@@ -317,7 +341,6 @@ void ThemeDocument::prepareThumbnailFrom(
 	const auto isTheme = _data->isTheme();
 	const auto isPattern = _data->isPatternWallPaper();
 	auto options = (good >= 0 ? Images::Option(0) : Images::Option::Blur)
-		| (_serviceWidth ? Images::Option::RoundCircle : Images::Option(0))
 		| (isPattern
 			? Images::Option::TransparentBackground
 			: Images::Option(0));
@@ -344,10 +367,8 @@ void ThemeDocument::prepareThumbnailFrom(
 			_patternOpacity);
 		original.setDevicePixelRatio(ratio);
 	}
-	if (_serviceWidth) {
-		original = Images::Circle(std::move(original));
-	}
-	_thumbnail = Ui::PixmapFromImage(std::move(original));
+	_thumbnail = Ui::PixmapFromImage(
+		finishServiceThumbnail(std::move(original)));
 	_thumbnailGood = good;
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
index 99bbd7a47..f923ca253 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
@@ -63,12 +63,12 @@ private:
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
 
-	void fillPatternFieldsFrom(const QString &url);
 	[[nodiscard]] bool checkGoodThumbnail() const;
 	void validateThumbnail() const;
 	void prepareThumbnailFrom(not_null<Image*> image, int good) const;
 	void generateThumbnail() const;
 	void ensureDataMediaCreated() const;
+	[[nodiscard]] QImage finishServiceThumbnail(QImage image) const;
 
 	DocumentData *_data = nullptr;
 	int _pixw = 1;
@@ -83,6 +83,10 @@ private:
 	float64 _patternOpacity = 0.;
 	int _gradientRotation = 0;
 
+	mutable bool _isDark = false;
+	int _dimmingIntensity = 0;
+	bool _blurredWallPaper = false;
+
 };
 
 class ThemeDocumentBox final : public ServiceBoxContent {

From a27ef55ff85275dfe847cfd17b441d22dfd05bf8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Apr 2023 13:33:07 +0400
Subject: [PATCH 062/676] Improve chat theme selector design.

---
 Telegram/Resources/langs/lang.strings         |  3 +-
 Telegram/SourceFiles/settings/settings.style  | 12 +++
 .../ui/chat/choose_theme_controller.cpp       | 89 +++++++++++--------
 .../SourceFiles/window/window_peer_menu.cpp   |  2 +-
 4 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6fbf8a573..fb2bd7567 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3653,9 +3653,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_bar_view#other" = "Click here to view them";
 
 "lng_chat_theme_change" = "Change colors";
+"lng_chat_theme_wallpaper" = "Set Wallpaper";
 "lng_chat_theme_none" = "No\nTheme";
 "lng_chat_theme_apply" = "Apply Theme";
-"lng_chat_theme_title" = "Select theme";
+"lng_chat_theme_title" = "Choose theme";
 "lng_chat_theme_cant_voice" = "Sorry, you can't change the chat theme while you're having an unsent voice message.";
 
 "lng_photo_editor_menu_delete" = "Delete";
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index e5da33b9b..17aa1c405 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -269,6 +269,18 @@ settingsThemeMinSkip: 4px;
 settingsThemeNotSupportedBg: windowBgOver;
 settingsThemeNotSupportedIcon: icon {{ "theme_preview", menuIconFg }};
 
+chatThemeTitlePadding: margins(22px, 13px, 22px, 9px);
+chatThemePreviewSize: size(80px, 108px);
+chatThemeBubbleSize: size(48px, 22px);
+chatThemeBubbleRadius: 10px;
+chatThemeBubblePosition: point(6px, 12px);
+chatThemeBubbleSkip: 6px;
+chatThemeEntrySkip: 10px;
+chatThemeEntryMargin: margins(16px, 10px, 16px, 8px);
+chatThemeEmptyPreviewTop: 16px;
+chatThemeEmojiBottom: 12px;
+chatThemeButtonMargin: margins(10px, 0px, 10px, 8px);
+
 autoDownloadLimitButton: SettingsButton(settingsButtonNoIcon) {
 	padding: margins(22px, 10px, 22px, 0px);
 }
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 25930adc9..47d3233b9 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -41,7 +41,7 @@ const auto kDisableElement = [] { return u"disable"_q; };
 [[nodiscard]] QImage GeneratePreview(not_null<Ui::ChatTheme*> theme) {
 	const auto &background = theme->background();
 	const auto &colors = background.colors;
-	const auto size = st::settingsThemePreviewSize;
+	const auto size = st::chatThemePreviewSize;
 	auto prepared = background.prepared;
 	const auto paintPattern = [&](QPainter &p, bool inverted) {
 		if (prepared.isNull()) {
@@ -91,16 +91,16 @@ const auto kDisableElement = [] { return u"disable"_q; };
 		const auto sent = QRect(
 			QPoint(
 				(size.width()
-					- st::settingsThemeBubbleSize.width()
-					- st::settingsThemeBubblePosition.x()),
-				st::settingsThemeBubblePosition.y()),
-			st::settingsThemeBubbleSize);
+					- st::chatThemeBubbleSize.width()
+					- st::chatThemeBubblePosition.x()),
+				st::chatThemeBubblePosition.y()),
+			st::chatThemeBubbleSize);
 		const auto received = QRect(
-			st::settingsThemeBubblePosition.x(),
-			sent.y() + sent.height() + st::settingsThemeBubbleSkip,
+			st::chatThemeBubblePosition.x(),
+			sent.y() + sent.height() + st::chatThemeBubbleSkip,
 			sent.width(),
 			sent.height());
-		const auto radius = st::settingsThemeBubbleRadius;
+		const auto radius = st::chatThemeBubbleRadius;
 
 		PainterHighQualityEnabler hq(p);
 		p.setPen(Qt::NoPen);
@@ -124,7 +124,7 @@ const auto kDisableElement = [] { return u"disable"_q; };
 
 [[nodiscard]] QImage GenerateEmptyPreview() {
 	auto result = QImage(
-		st::settingsThemePreviewSize * style::DevicePixelRatio(),
+		st::chatThemePreviewSize * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
 	result.fill(st::settingsThemeNotSupportedBg->c);
 	result.setDevicePixelRatio(style::DevicePixelRatio());
@@ -132,9 +132,9 @@ const auto kDisableElement = [] { return u"disable"_q; };
 		auto p = QPainter(&result);
 		p.setPen(st::menuIconFg);
 		p.setFont(st::semiboldFont);
-		const auto top = st::normalFont->height / 2;
-		const auto width = st::settingsThemePreviewSize.width();
-		const auto height = st::settingsThemePreviewSize.height() - top;
+		const auto top = st::chatThemeEmptyPreviewTop;
+		const auto width = st::chatThemePreviewSize.width();
+		const auto height = st::chatThemePreviewSize.height() - top;
 		p.drawText(
 			QRect(0, top, width, height),
 			tr::lng_chat_theme_none(tr::now),
@@ -194,7 +194,8 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		0,
 		object_ptr<FixedHeightWidget>(
 			_wrap.get(),
-			skip + st::boxTitle.style.font->height + skip));
+			st::boxTitle.style.font->height),
+		st::chatThemeTitlePadding);
 	auto title = CreateChild<FlatLabel>(
 		titleWrap,
 		tr::lng_chat_theme_title(),
@@ -204,12 +205,23 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		QPainter(_wrap.get()).fillRect(clip, st::windowBg);
 	}, lifetime());
 
+	const auto close = Ui::CreateChild<Ui::IconButton>(
+		_wrap.get(),
+		st::boxTitleClose);
+	close->setClickedCallback([=] { this->close(); });
+	rpl::combine(
+		_wrap->widthValue(),
+		titleWrap->positionValue()
+	) | rpl::start_with_next([=](int width, QPoint position) {
+		close->moveToRight(0, 0, width);
+	}, close->lifetime());
+
 	initButtons();
 	initList();
 
 	_inner->positionValue(
 	) | rpl::start_with_next([=](QPoint position) {
-		title->move(std::max(position.x(), skip) + skip, skip);
+		title->move(std::max(position.x(), 0), 0);
 	}, title->lifetime());
 
 	std::move(
@@ -233,31 +245,28 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 
 void ChooseThemeController::initButtons() {
 	const auto controls = _wrap->add(object_ptr<RpWidget>(_wrap.get()));
-	const auto cancel = CreateChild<RoundButton>(
-		controls,
-		tr::lng_cancel(),
-		st::defaultLightButton);
 	const auto apply = CreateChild<RoundButton>(
 		controls,
 		tr::lng_chat_theme_apply(),
-		st::defaultActiveButton);
+		st::defaultLightButton);
+	apply->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	const auto choose = CreateChild<RoundButton>(
 		controls,
 		rpl::single(u"Change Wallpaper"_q),
-		st::defaultActiveButton);
-	const auto skip = st::normalFont->spacew * 2;
+		st::defaultLightButton);
+	choose->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+
+	const auto &margin = st::chatThemeButtonMargin;
 	controls->resize(
-		skip + cancel->width() + skip + choose->width() + skip,
-		apply->height() + skip * 2);
+		margin.left() + choose->width() + margin.right(),
+		margin.top() + choose->height() + margin.bottom());
 	rpl::combine(
 		controls->widthValue(),
-		cancel->widthValue(),
 		apply->widthValue(),
 		choose->widthValue(),
 		_chosen.value()
 	) | rpl::start_with_next([=](
 			int outer,
-			int cancelWidth,
 			int applyWidth,
 			int chooseWidth,
 			QString chosen) {
@@ -268,13 +277,11 @@ void ChooseThemeController::initButtons() {
 		choose->setVisible(!changed);
 		const auto shown = changed ? apply : choose;
 		const auto shownWidth = changed ? applyWidth : chooseWidth;
-		const auto inner = skip + cancelWidth + skip + shownWidth + skip;
+		const auto inner = margin.left() + shownWidth + margin.right();
 		const auto left = (outer - inner) / 2;
-		cancel->moveToLeft(left, 0);
-		shown->moveToRight(left, 0);
+		shown->moveToLeft(left, margin.top());
 	}, controls->lifetime());
 
-	cancel->setClickedCallback([=] { close(); });
 	apply->setClickedCallback([=] {
 		if (const auto chosen = findChosen()) {
 			const auto was = _peer->themeEmoji();
@@ -326,7 +333,7 @@ void ChooseThemeController::paintEntry(QPainter &p, const Entry &entry) {
 	const auto emojiTop = geometry.y()
 		+ geometry.height()
 		- (size / factor)
-		- (st::normalFont->spacew * 2);
+		- st::chatThemeEmojiBottom;
 	Ui::Emoji::Draw(p, entry.emoji, size, emojiLeft, emojiTop);
 
 	if (entry.chosen) {
@@ -346,7 +353,9 @@ void ChooseThemeController::paintEntry(QPainter &p, const Entry &entry) {
 void ChooseThemeController::initList() {
 	_content->resize(
 		_content->width(),
-		8 * st::normalFont->spacew + st::settingsThemePreviewSize.height());
+		(st::chatThemeEntryMargin.top()
+			+ st::chatThemePreviewSize.height()
+			+ st::chatThemeEntryMargin.bottom()));
 	_inner->setMouseTracking(true);
 
 	_inner->paintRequest(
@@ -524,10 +533,16 @@ void ChooseThemeController::fill(
 		return;
 	}
 	const auto count = int(themes.size()) + 1;
-	const auto single = st::settingsThemePreviewSize;
-	const auto skip = st::normalFont->spacew * 2;
-	const auto full = single.width() * count + skip * (count + 3);
-	_inner->resize(full, skip + single.height() + skip);
+	const auto single = st::chatThemePreviewSize;
+	const auto skip = st::chatThemeEntrySkip;
+	const auto &margin = st::chatThemeEntryMargin;
+	const auto full = margin.left()
+		+ single.width() * count
+		+ skip * (count - 1)
+		+ margin.right();
+	_inner->resize(
+		full,
+		margin.top() + single.height() + margin.bottom());
 
 	const auto initial = Ui::Emoji::Find(_peer->themeEmoji());
 	if (!initial) {
@@ -543,11 +558,11 @@ void ChooseThemeController::fill(
 
 		_cachingLifetime.destroy();
 		const auto old = base::take(_entries);
-		auto x = skip * 2;
+		auto x = margin.left();
 		_entries.push_back({
 			.preview = GenerateEmptyPreview(),
 			.emoji = _disabledEmoji,
-			.geometry = QRect(QPoint(x, skip), single),
+			.geometry = QRect(QPoint(x, margin.top()), single),
 			.chosen = (_chosen.current() == kDisableElement()),
 		});
 		Assert(_entries.front().emoji != nullptr);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 4224fd4a3..ba06bf54d 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1038,7 +1038,7 @@ void Filler::addThemeEdit() {
 	}
 	const auto controller = _controller;
 	_addAction(
-		tr::lng_chat_theme_change(tr::now),
+		tr::lng_chat_theme_wallpaper(tr::now),
 		[=] { controller->toggleChooseChatTheme(user); },
 		&st::menuIconChangeColors);
 }

From 32c7964e8c8a3b1bc4cae4c10c445110cfab48eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 12:49:44 +0400
Subject: [PATCH 063/676] Fix video thumbnail in PiP raster renderer.

---
 .../media/view/media_view_pip_raster.cpp         | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp b/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp
index 0db759ae8..4698309b8 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp
@@ -167,16 +167,12 @@ QImage Pip::RendererSW::staticContentByRequest(
 	}
 	_preparedStaticKey = image.cacheKey();
 	_preparedStaticRequest = request;
-	//_preparedCoverStorage = Streaming::PrepareByRequest(
-	//	_instance.info().video.cover,
-	//	false,
-	//	_instance.info().video.rotation,
-	//	request,
-	//	std::move(_preparedCoverStorage));
-	_preparedStaticContent = Images::Round(Images::Prepare(
-		image,
-		request.resize,
-		{ .outer = request.outer }), request.rounding);
+	_preparedStaticContent = Images::Round(
+		Images::Prepare(
+			image,
+			request.resize,
+			{ .outer = request.outer / style::DevicePixelRatio() }),
+		request.rounding);
 
 	return _preparedStaticContent;
 }

From 0d6e5eda0c5f76553df7033bbbda50f16145d9d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 12:55:01 +0400
Subject: [PATCH 064/676] Allow larger PiP window size.

---
 .../SourceFiles/media/view/media_view_pip.cpp | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 2df6538e4..3a0a50397 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -64,6 +64,13 @@ constexpr auto kMsInSecond = 1000;
 		: QRect(0, 0, st::windowDefaultWidth, st::windowDefaultHeight);
 }
 
+[[nodiscard]] QSize MaxAllowedSizeForScreen(QSize screenSize) {
+	// Each side should be less than screen side - 3 * st::pipBorderSkip,
+	// That way it won't try to snap to both opposite sides of the screen.
+	const auto skip = 3 * st::pipBorderSkip;
+	return { screenSize.width() - skip, screenSize.height() - skip };
+}
+
 [[nodiscard]] QPoint ClampToEdges(QRect screen, QRect inner) {
 	const auto skip = st::pipBorderSkip;
 	const auto area = st::pipBorderSnapArea;
@@ -535,10 +542,10 @@ void PipPanel::setPositionOnScreen(Position position, QRect available) {
 		? QSize(max, max * _ratio.height() / _ratio.width())
 		: QSize(max * _ratio.width() / _ratio.height(), max);
 
-	// At least one side should not be greater than half of screen size.
-	const auto byWidth = (scaled.width() * screen.height())
-		> (scaled.height() * screen.width());
-	const auto fit = QSize(screen.width() / 2, screen.height() / 2);
+	// Apply maximum size.
+	const auto fit = MaxAllowedSizeForScreen(screen.size());
+	const auto byWidth = (scaled.width() * fit.height())
+		> (scaled.height() * fit.width());
 	const auto normalized = (byWidth && scaled.width() > fit.width())
 		? QSize(fit.width(), fit.width() * scaled.height() / scaled.width())
 		: (!byWidth && scaled.height() > fit.height())
@@ -642,8 +649,7 @@ void PipPanel::handleScreenChanged(QScreen *screen) {
 		st::pipMinimalSize,
 		Qt::KeepAspectRatioByExpanding);
 	const auto maximalSize = _ratio.scaled(
-		screenGeometry.width() / 2,
-		screenGeometry.height() / 2,
+		MaxAllowedSizeForScreen(screenGeometry.size()),
 		Qt::KeepAspectRatio);
 	widget()->setMinimumSize(minimalSize);
 	widget()->setMaximumSize(
@@ -781,8 +787,7 @@ void PipPanel::processDrag(QPoint point) {
 		st::pipMinimalSize,
 		Qt::KeepAspectRatioByExpanding);
 	const auto maximalSize = _ratio.scaled(
-		screen.width() / 2,
-		screen.height() / 2,
+		MaxAllowedSizeForScreen(screen.size()),
 		Qt::KeepAspectRatio);
 	const auto geometry = Transformed(
 		_dragStartGeometry,
@@ -1368,7 +1373,7 @@ void Pip::paint(not_null<Renderer*> renderer) const {
 		if (_preparedCoverState == ThumbState::Cover) {
 			geometry.rotation += base::take(geometry.videoRotation);
 		}
-		renderer->paintTransformedStaticContent(staticContent(), geometry);
+		renderer->paintTransformedStaticContent(content, geometry);
 	}
 	if (_instance.waitingShown()) {
 		renderer->paintRadialLoading(countRadialRect(), controlsShown);

From ac57d46f3065b747446bcbd713769f7aa13214b5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 13:36:48 +0400
Subject: [PATCH 065/676] Try allowing correct &nbsp; handling.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index aa5cc61b6..56945859e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit aa5cc61b6b65ec1fb8f1c1be8b2c9c559aadd958
+Subproject commit 56945859e3e7166ec26abf62b0bca0209ad5b498

From 65f54d937f2831bd7335b16902be8c03a1c2c373 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 14:39:39 +0400
Subject: [PATCH 066/676] Toggle wallpaper dark mode / edit dimming.

---
 .../boxes/background_preview_box.cpp          | 312 ++++++++++++++++--
 .../boxes/background_preview_box.h            |  34 +-
 .../media/history_view_theme_document.cpp     |   4 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  15 +
 Telegram/SourceFiles/ui/chat/chat_style.cpp   |  11 +-
 Telegram/SourceFiles/ui/chat/chat_style.h     |   1 +
 .../window/themes/window_themes_embedded.cpp  |  36 ++
 .../window/themes/window_themes_embedded.h    |   5 +
 .../window/window_session_controller.cpp      |  45 +--
 9 files changed, 384 insertions(+), 79 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index de9e75dd5..041739825 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/image/image.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "history/history.h"
@@ -34,12 +36,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/background_preview_box.h"
 #include "window/window_session_controller.h"
+#include "window/themes/window_themes_embedded.h"
 #include "settings/settings_common.h"
 #include "storage/file_upload.h"
 #include "storage/localimageloader.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
+#include "styles/style_settings.h"
 
 #include <QtGui/QClipboard>
 #include <QtGui/QGuiApplication>
@@ -47,6 +51,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace {
 
 constexpr auto kMaxWallPaperSlugLength = 255;
+constexpr auto kDefaultDimming = 50;
 
 [[nodiscard]] bool IsValidWallPaperSlug(const QString &slug) {
 	if (slug.isEmpty() || slug.size() > kMaxWallPaperSlugLength) {
@@ -154,6 +159,13 @@ constexpr auto kMaxWallPaperSlugLength = 255;
 
 } // namespace
 
+struct BackgroundPreviewBox::OverridenStyle {
+	style::Box box;
+	style::IconButton toggle;
+	style::MediaSlider slider;
+	style::FlatLabel subtitle;
+};
+
 BackgroundPreviewBox::BackgroundPreviewBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
@@ -183,9 +195,11 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 	true))
 , _paper(paper)
 , _media(_paper.document() ? _paper.document()->createMediaView() : nullptr)
-, _radial([=](crl::time now) { radialAnimationCallback(now); }) {
-	_chatStyle->apply(controller->defaultChatTheme().get());
-
+, _radial([=](crl::time now) { radialAnimationCallback(now); })
+, _appNightMode(Window::Theme::IsNightModeValue())
+, _boxDarkMode(_appNightMode.current())
+, _dimmingIntensity(std::clamp(paper.patternIntensity(), 0, 100))
+, _dimmed(_forPeer && paper.document() && !paper.isPattern()) {
 	if (_media) {
 		_media->thumbnailWanted(_paper.fileOrigin());
 	}
@@ -194,6 +208,201 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 	) | rpl::start_with_next([=] {
 		update();
 	}, lifetime());
+
+	_appNightMode.changes(
+	) | rpl::start_with_next([=](bool night) {
+		_boxDarkMode = night;
+		update();
+	}, lifetime());
+
+	_boxDarkMode.changes(
+	) | rpl::start_with_next([=](bool dark) {
+		applyDarkMode(dark);
+	}, lifetime());
+
+	const auto prepare = [=](bool dark, auto pointer) {
+		const auto weak = Ui::MakeWeak(this);
+		crl::async([=] {
+			auto result = std::make_unique<style::palette>();
+			Window::Theme::PreparePaletteCallback(dark, {})(*result);
+			crl::on_main([=, result = std::move(result)]() mutable {
+				if (const auto strong = weak.data()) {
+					strong->*pointer = std::move(result);
+					strong->paletteReady();
+				}
+			});
+		});
+	};
+	prepare(false, &BackgroundPreviewBox::_lightPalette);
+	prepare(true, &BackgroundPreviewBox::_darkPalette);
+}
+
+BackgroundPreviewBox::~BackgroundPreviewBox() = default;
+
+void BackgroundPreviewBox::applyDarkMode(bool dark) {
+	const auto equals = (dark == Window::Theme::IsNightMode());
+	const auto &palette = (dark ? _darkPalette : _lightPalette);
+	if (!equals && !palette) {
+		_waitingForPalette = true;
+		return;
+	}
+	_waitingForPalette = false;
+	if (equals) {
+		setStyle(st::defaultBox);
+		_chatStyle->applyCustomPalette(nullptr);
+		_paletteServiceBg = rpl::single(
+			rpl::empty
+		) | rpl::then(
+			style::PaletteChanged()
+		) | rpl::map([=] {
+			return st::msgServiceBg->c;
+		});
+	} else {
+		setStyle(overridenStyle(dark));
+		_chatStyle->applyCustomPalette(palette.get());
+		_paletteServiceBg = palette->msgServiceBg()->c;
+	}
+	resetTitle();
+	rebuildButtons(dark);
+	update();
+	if (const auto parent = parentWidget()) {
+		parent->update();
+	}
+
+	if (_dimmed) {
+		createDimmingSlider(dark);
+	}
+}
+
+void BackgroundPreviewBox::createDimmingSlider(bool dark) {
+	const auto created = !_dimmingWrap;
+	if (created) {
+		_dimmingWrap.create(this, object_ptr<Ui::RpWidget>(this));
+		_dimmingContent = _dimmingWrap->entity();
+	}
+	_dimmingSlider = nullptr;
+	for (const auto &child : _dimmingContent->children()) {
+		if (child->isWidgetType()) {
+			static_cast<QWidget*>(child)->hide();
+			child->deleteLater();
+		}
+	}
+	const auto equals = (dark == Window::Theme::IsNightMode());
+	const auto inner = Ui::CreateChild<Ui::VerticalLayout>(_dimmingContent);
+	inner->show();
+	Settings::AddSubsectionTitle(
+		inner,
+		rpl::single(u"Background dimming"_q),
+		style::margins(0, st::settingsSectionSkip, 0, 0),
+		equals ? nullptr : dark ? &_dark->subtitle : &_light->subtitle);
+	_dimmingSlider = inner->add(
+		object_ptr<Ui::MediaSlider>(
+			inner,
+			(equals
+				? st::defaultContinuousSlider
+				: dark
+				? _dark->slider
+				: _light->slider)),
+		st::localStorageLimitMargin);
+	_dimmingSlider->setValue(_dimmingIntensity / 100.);
+	_dimmingSlider->setAlwaysDisplayMarker(true);
+	_dimmingSlider->resize(st::defaultContinuousSlider.seekSize);
+	const auto handle = [=](float64 value) {
+		const auto intensity = std::clamp(
+			int(base::SafeRound(value * 100)),
+			0,
+			100);
+		_paper = _paper.withPatternIntensity(intensity);
+		_dimmingIntensity = intensity;
+		update();
+	};
+	_dimmingSlider->setChangeProgressCallback(handle);
+	_dimmingSlider->setChangeFinishedCallback(handle);
+	inner->resizeToWidth(st::boxWideWidth);
+	Ui::SendPendingMoveResizeEvents(inner);
+	inner->move(0, 0);
+	_dimmingContent->resize(inner->size());
+
+	_dimmingContent->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		auto p = QPainter(_dimmingContent);
+		const auto palette = (dark ? _darkPalette : _lightPalette).get();
+		p.fillRect(clip, equals ? st::boxBg : palette->boxBg());
+	}, _dimmingContent->lifetime());
+
+	_dimmingToggleScheduled = true;
+
+	if (created) {
+		rpl::combine(
+			heightValue(),
+			_dimmingWrap->heightValue(),
+			rpl::mappers::_1 - rpl::mappers::_2
+		) | rpl::start_with_next([=](int top) {
+			_dimmingWrap->move(0, top);
+		}, _dimmingWrap->lifetime());
+
+		_dimmingWrap->toggle(!dark, anim::type::instant);
+		_dimmingHeight = _dimmingWrap->heightValue();
+		_dimmingHeight.changes() | rpl::start_with_next([=] {
+			update();
+		}, _dimmingWrap->lifetime());
+	}
+}
+
+void BackgroundPreviewBox::paletteReady() {
+	if (_waitingForPalette) {
+		applyDarkMode(_boxDarkMode.current());
+	}
+}
+
+const style::Box &BackgroundPreviewBox::overridenStyle(bool dark) {
+	auto &st = dark ? _dark : _light;
+	if (!st) {
+		st = std::make_unique<OverridenStyle>(prepareOverridenStyle(dark));
+	}
+	return st->box;
+}
+
+auto BackgroundPreviewBox::prepareOverridenStyle(bool dark)
+-> OverridenStyle {
+	const auto p = (dark ? _darkPalette : _lightPalette).get();
+	Assert(p != nullptr);
+
+	const auto &toggle = dark
+		? st::backgroundSwitchToLight
+		: st::backgroundSwitchToDark;
+	auto result = OverridenStyle{
+		.box = st::defaultBox,
+		.toggle = toggle,
+		.slider = st::defaultContinuousSlider,
+		.subtitle = st::settingsSubsectionTitle,
+	};
+	result.box.button.textFg = p->lightButtonFg();
+	result.box.button.textFgOver = p->lightButtonFgOver();
+	result.box.button.numbersTextFg = p->lightButtonFg();
+	result.box.button.numbersTextFgOver = p->lightButtonFgOver();
+	result.box.button.textBg = p->lightButtonBg();
+	result.box.button.textBgOver = p->lightButtonBgOver();
+	result.box.button.ripple.color = p->lightButtonBgRipple();
+	result.box.title.textFg = p->boxTitleFg();
+	result.box.bg = p->boxBg();
+	result.box.titleAdditionalFg = p->boxTitleAdditionalFg();
+
+	result.toggle.ripple.color = p->windowBgOver();
+	result.toggle.icon = toggle.icon.withPalette(*p);
+	result.toggle.iconOver = toggle.iconOver.withPalette(*p);
+
+	result.slider.activeFg = p->mediaPlayerActiveFg();
+	result.slider.inactiveFg = p->mediaPlayerInactiveFg();
+	result.slider.activeFgOver = p->mediaPlayerActiveFg();
+	result.slider.inactiveFgOver = p->mediaPlayerInactiveFg();
+	result.slider.activeFgDisabled = p->mediaPlayerInactiveFg();
+	result.slider.inactiveFgDisabled = p->windowBg();
+	result.slider.receivedTillFg = p->mediaPlayerInactiveFg();
+
+	result.subtitle.textFg = p->windowActiveTextFg();
+
+	return result;
 }
 
 void BackgroundPreviewBox::generateBackground() {
@@ -215,9 +424,12 @@ not_null<HistoryView::ElementDelegate*> BackgroundPreviewBox::delegate() {
 	return static_cast<HistoryView::ElementDelegate*>(this);
 }
 
-void BackgroundPreviewBox::prepare() {
+void BackgroundPreviewBox::resetTitle() {
 	setTitle(tr::lng_background_header());
+}
 
+void BackgroundPreviewBox::rebuildButtons(bool dark) {
+	clearButtons();
 	addButton(_forPeer
 		? tr::lng_background_apply_button()
 		: tr::lng_background_apply(), [=] { apply(); });
@@ -225,18 +437,28 @@ void BackgroundPreviewBox::prepare() {
 	if (!_forPeer && _paper.hasShareUrl()) {
 		addLeftButton(tr::lng_background_share(), [=] { share(); });
 	}
-	updateServiceBg(_paper.backgroundColors());
+	const auto equals = (dark == Window::Theme::IsNightMode());
+	auto toggle = object_ptr<Ui::IconButton>(this, equals
+		? (dark ? st::backgroundSwitchToLight : st::backgroundSwitchToDark)
+		: dark ? _dark->toggle : _light->toggle);
+	toggle->setClickedCallback([=] {
+		_boxDarkMode = !_boxDarkMode.current();
+	});
+	addTopButton(std::move(toggle));
+}
+
+void BackgroundPreviewBox::prepare() {
+	applyDarkMode(Window::Theme::IsNightMode());
 
 	_paper.loadDocument();
-	const auto document = _paper.document();
-	if (document && document->loading()) {
-		_radial.start(_media->progress());
-	}
-	if (!_paper.isPattern()
-		&& (_paper.localThumbnail()
-			|| (document && document->hasThumbnail()))) {
-		createBlurCheckbox();
+	if (const auto document = _paper.document()) {
+		if (document->loading()) {
+			_radial.start(_media->progress());
+		}
 	}
+
+	updateServiceBg(_paper.backgroundColors());
+
 	setScaledFromThumb();
 	checkLoadedDocument();
 
@@ -249,31 +471,42 @@ void BackgroundPreviewBox::prepare() {
 	setDimensions(st::boxWideWidth, st::boxWideWidth);
 }
 
-void BackgroundPreviewBox::createBlurCheckbox() {
+void BackgroundPreviewBox::recreateBlurCheckbox() {
+	const auto document = _paper.document();
+	if (_paper.isPattern()
+		|| (!_paper.localThumbnail()
+			&& (!document || !document->hasThumbnail()))) {
+		return;
+	}
+
+	const auto blurred = _blur ? _blur->checked() : _paper.isBlurred();
 	_blur = Ui::MakeChatServiceCheckbox(
 		this,
 		tr::lng_background_blur(tr::now),
 		st::backgroundCheckbox,
 		st::backgroundCheck,
-		_paper.isBlurred(),
+		blurred,
 		[=] { return _serviceBg.value_or(QColor(255, 255, 255, 0)); });
+	_blur->show();
 
 	rpl::combine(
 		sizeValue(),
-		_blur->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+		_blur->sizeValue(),
+		_dimmingHeight.value()
+	) | rpl::start_with_next([=](QSize outer, QSize inner, int dimming) {
+		const auto bottom = st::historyPaddingBottom;
 		_blur->move(
 			(outer.width() - inner.width()) / 2,
-			outer.height() - st::historyPaddingBottom - inner.height());
+			outer.height() - dimming - bottom - inner.height());
 	}, _blur->lifetime());
 
 	_blur->checkedChanges(
 	) | rpl::start_with_next([=](bool checked) {
 		checkBlurAnimationStart();
 		update();
-	}, lifetime());
+	}, _blur->lifetime());
 
-	_blur->setDisabled(true);
+	_blur->setDisabled(_paper.document() && _full.isNull());
 }
 
 void BackgroundPreviewBox::apply() {
@@ -418,6 +651,13 @@ void BackgroundPreviewBox::paintEvent(QPaintEvent *e) {
 	}
 	if (!_scaled.isNull()) {
 		paintImage(p);
+		const auto dimming = (_dimmed && _boxDarkMode.current())
+			? _dimmingIntensity
+			: 0;
+		if (dimming > 0) {
+			const auto alpha = 255 * dimming / 100;
+			p.fillRect(e->rect(), QColor(0, 0, 0, alpha));
+		}
 		paintRadial(p);
 	} else if (_generated.isNull()) {
 		p.fillRect(e->rect(), st::boxBg);
@@ -427,6 +667,15 @@ void BackgroundPreviewBox::paintEvent(QPaintEvent *e) {
 		paintRadial(p);
 	}
 	paintTexts(p, ms);
+	if (_dimmingToggleScheduled) {
+		crl::on_main(this, [=] {
+			if (!_dimmingToggleScheduled) {
+				return;
+			}
+			_dimmingToggleScheduled = false;
+			_dimmingWrap->toggle(_boxDarkMode.current(), anim::type::normal);
+		});
+	}
 }
 
 void BackgroundPreviewBox::paintImage(Painter &p) {
@@ -476,7 +725,9 @@ void BackgroundPreviewBox::paintRadial(Painter &p) {
 }
 
 int BackgroundPreviewBox::textsTop() const {
-	const auto bottom = _blur ? _blur->y() : height();
+	const auto bottom = _blur
+		? _blur->y()
+		: (height() - _dimmingHeight.current());
 	return bottom
 		- st::historyPaddingBottom
 		- (_service ? _service->height() : 0)
@@ -569,8 +820,8 @@ void BackgroundPreviewBox::setScaledFromImage(
 	}
 	_scaled = Ui::PixmapFromImage(std::move(image));
 	_blurred = Ui::PixmapFromImage(std::move(blurred));
-	if (_blur && (!_paper.document() || !_full.isNull())) {
-		_blur->setDisabled(false);
+	if (_blur) {
+		_blur->setDisabled(_paper.document() && _full.isNull());
 	}
 }
 
@@ -595,22 +846,21 @@ void BackgroundPreviewBox::updateServiceBg(const std::vector<QColor> &bg) {
 	if (!count) {
 		return;
 	}
-	auto red = 0, green = 0, blue = 0;
+	auto red = 0LL, green = 0LL, blue = 0LL;
 	for (const auto &color : bg) {
 		red += color.red();
 		green += color.green();
 		blue += color.blue();
 	}
-	rpl::single(
-		rpl::empty
-	) | rpl::then(
-		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+
+	_serviceBgLifetime = _paletteServiceBg.value(
+	) | rpl::start_with_next([=](QColor color) {
 		_serviceBg = Ui::ThemeAdjustedColor(
-			st::msgServiceBg->c,
+			color,
 			QColor(red / count, green / count, blue / count));
 		_chatStyle->applyAdjustedServiceBg(*_serviceBg);
-	}, lifetime());
+		recreateBlurCheckbox();
+	});
 
 	_service = GenerateServiceItem(
 		delegate(),
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.h b/Telegram/SourceFiles/boxes/background_preview_box.h
index ebd1b6269..dc44f9509 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.h
+++ b/Telegram/SourceFiles/boxes/background_preview_box.h
@@ -26,6 +26,9 @@ class SessionController;
 namespace Ui {
 class Checkbox;
 class ChatStyle;
+class MediaSlider;
+template <typename Widget>
+class SlideWrap;
 } // namespace Ui
 
 struct BackgroundPreviewArgs {
@@ -42,6 +45,7 @@ public:
 		not_null<Window::SessionController*> controller,
 		const Data::WallPaper &paper,
 		BackgroundPreviewArgs args = {});
+	~BackgroundPreviewBox();
 
 	static bool Start(
 		not_null<Window::SessionController*> controller,
@@ -54,6 +58,8 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
+	struct OverridenStyle;
+
 	using Element = HistoryView::Element;
 	not_null<HistoryView::ElementDelegate*> delegate();
 	HistoryView::Context elementContext() override;
@@ -75,11 +81,20 @@ private:
 	void paintImage(Painter &p);
 	void paintRadial(Painter &p);
 	void paintTexts(Painter &p, crl::time ms);
-	void createBlurCheckbox();
+	void recreateBlurCheckbox();
 	int textsTop() const;
 	void startFadeInFrom(QPixmap previous);
 	void checkBlurAnimationStart();
 
+	[[nodiscard]] const style::Box &overridenStyle(bool dark);
+	void paletteReady();
+	void applyDarkMode(bool dark);
+	[[nodiscard]] OverridenStyle prepareOverridenStyle(bool dark);
+
+	void resetTitle();
+	void rebuildButtons(bool dark);
+	void createDimmingSlider(bool dark);
+
 	const not_null<Window::SessionController*> _controller;
 	PeerData * const _forPeer = nullptr;
 	FullMsgId _fromMessageId;
@@ -98,8 +113,25 @@ private:
 	std::optional<QColor> _serviceBg;
 	object_ptr<Ui::Checkbox> _blur = { nullptr };
 
+	rpl::variable<bool> _appNightMode;
+	rpl::variable<bool> _boxDarkMode;
+	std::unique_ptr<OverridenStyle> _light, _dark;
+	std::unique_ptr<style::palette> _lightPalette, _darkPalette;
+	bool _waitingForPalette = false;
+
+	object_ptr<Ui::SlideWrap<Ui::RpWidget>> _dimmingWrap = { nullptr };
+	Ui::RpWidget *_dimmingContent = nullptr;
+	Ui::MediaSlider *_dimmingSlider = nullptr;
+	int _dimmingIntensity = 0;
+	rpl::variable<int> _dimmingHeight = 0;
+	bool _dimmed = false;
+	bool _dimmingToggleScheduled = false;
+
 	FullMsgId _uploadId;
 	float64 _uploadProgress = 0.;
 	rpl::lifetime _uploadLifetime;
 
+	rpl::variable<QColor> _paletteServiceBg;
+	rpl::lifetime _serviceBgLifetime;
+
 };
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 1ed00b91b..ac730600d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -56,7 +56,9 @@ ThemeDocument::ThemeDocument(
 		_patternOpacity = params->patternOpacity();
 		_gradientRotation = params->gradientRotation();
 		_blurredWallPaper = params->isBlurred();
-		_dimmingIntensity = (params->isPattern() || !_serviceWidth)
+		_dimmingIntensity = (!params->document()
+			|| params->isPattern()
+			|| !_serviceWidth)
 			? 0
 			: std::max(params->patternIntensity(), 0);
 	}
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index a06f0f1eb..fb379562e 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1308,3 +1308,18 @@ moreChatsBarClose: IconButton(defaultIconButton) {
 		color: windowBgOver;
 	}
 }
+
+backgroundSwitchToDark: IconButton(defaultIconButton) {
+	width: 48px;
+	height: 48px;
+
+	icon: boxTitleCloseIcon;
+	iconOver: boxTitleCloseIconOver;
+
+	rippleAreaPosition: point(4px, 4px);
+	rippleAreaSize: 40px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
+backgroundSwitchToLight: backgroundSwitchToDark;
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index 38afef763..97529516f 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -425,11 +425,12 @@ ChatStyle::ChatStyle(not_null<const style::palette*> isolated)
 }
 
 void ChatStyle::apply(not_null<ChatTheme*> theme) {
-	const auto themePalette = theme->palette();
-	assignPalette(themePalette
-		? themePalette
-		: style::main_palette::get().get());
-	if (themePalette) {
+	applyCustomPalette(theme->palette());
+}
+
+void ChatStyle::applyCustomPalette(const style::palette *palette) {
+	assignPalette(palette ? palette : style::main_palette::get().get());
+	if (palette) {
 		_defaultPaletteChangeLifetime.destroy();
 	} else {
 		style::PaletteChanged(
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index 7e459847d..f1fd0b807 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -165,6 +165,7 @@ public:
 	explicit ChatStyle(not_null<const style::palette*> isolated);
 
 	void apply(not_null<ChatTheme*> theme);
+	void applyCustomPalette(const style::palette *palette);
 	void applyAdjustedServiceBg(QColor serviceBg);
 
 	[[nodiscard]] rpl::producer<> paletteChanged() const {
diff --git a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
index 48785c955..0269c7ccd 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
@@ -18,6 +18,8 @@ namespace Theme {
 namespace {
 
 constexpr auto kMaxAccentColors = 3;
+constexpr auto kDayBaseFile = ":/gui/day-custom-base.tdesktop-theme"_cs;
+constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs;
 
 const auto kColorizeIgnoredKeys = base::flat_set<QLatin1String>{ {
 	qstr("boxTextFgGood"),
@@ -311,6 +313,40 @@ std::vector<QColor> DefaultAccentColors(EmbeddedType type) {
 	Unexpected("Type in Window::Theme::AccentColors.");
 }
 
+Fn<void(style::palette&)> PreparePaletteCallback(
+		bool dark,
+		std::optional<QColor> accent) {
+	return [=](style::palette &palette) {
+		using namespace Theme;
+		const auto &embedded = EmbeddedThemes();
+		const auto i = ranges::find(
+			embedded,
+			dark ? EmbeddedType::Night : EmbeddedType::Default,
+			&EmbeddedScheme::type);
+		Assert(i != end(embedded));
+		const auto colorizer = accent
+			? ColorizerFrom(*i, *accent)
+			: style::colorizer();
+
+		auto instance = Instance();
+		const auto loaded = LoadFromFile(
+			(dark ? kNightBaseFile : kDayBaseFile).utf16(),
+			&instance,
+			nullptr,
+			nullptr,
+			colorizer);
+		Assert(loaded);
+		palette.finalize();
+		palette = instance.palette;
+	};
+}
+
+Fn<void(style::palette&)> PrepareCurrentPaletteCallback() {
+	return [=, data = style::main_palette::save()](style::palette &palette) {
+		palette.load(data);
+	};
+}
+
 QByteArray AccentColors::serialize() const {
 	auto result = QByteArray();
 	if (_data.empty()) {
diff --git a/Telegram/SourceFiles/window/themes/window_themes_embedded.h b/Telegram/SourceFiles/window/themes/window_themes_embedded.h
index 71e9222c2..dd2e234dd 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_embedded.h
+++ b/Telegram/SourceFiles/window/themes/window_themes_embedded.h
@@ -63,5 +63,10 @@ void Colorize(
 [[nodiscard]] std::vector<EmbeddedScheme> EmbeddedThemes();
 [[nodiscard]] std::vector<QColor> DefaultAccentColors(EmbeddedType type);
 
+[[nodiscard]] Fn<void(style::palette&)> PreparePaletteCallback(
+	bool dark,
+	std::optional<QColor> accent);
+[[nodiscard]] Fn<void(style::palette&)> PrepareCurrentPaletteCallback();
+
 } // namespace Theme
 } // 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 df7a665c1..489e69635 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -94,47 +94,10 @@ namespace {
 
 constexpr auto kCustomThemesInMemory = 5;
 constexpr auto kMaxChatEntryHistorySize = 50;
-constexpr auto kDayBaseFile = ":/gui/day-custom-base.tdesktop-theme"_cs;
-constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs;
-
-[[nodiscard]] Fn<void(style::palette&)> PrepareCurrentCallback() {
-	const auto copy = std::make_shared<style::palette>();
-	return [=, data = style::main_palette::save()](style::palette &palette) {
-		palette.load(data);
-	};
-}
-
-[[nodiscard]] Fn<void(style::palette&)> PreparePaletteCallback(
-		bool dark,
-		std::optional<QColor> accent) {
-	return [=](style::palette &palette) {
-		using namespace Theme;
-		const auto &embedded = EmbeddedThemes();
-		const auto i = ranges::find(
-			embedded,
-			dark ? EmbeddedType::Night : EmbeddedType::Default,
-			&EmbeddedScheme::type);
-		Assert(i != end(embedded));
-		const auto colorizer = accent
-			? ColorizerFrom(*i, *accent)
-			: style::colorizer();
-
-		auto instance = Instance();
-		const auto loaded = LoadFromFile(
-			(dark ? kNightBaseFile : kDayBaseFile).utf16(),
-			&instance,
-			nullptr,
-			nullptr,
-			colorizer);
-		Assert(loaded);
-		palette.finalize();
-		palette = instance.palette;
-	};
-}
 
 [[nodiscard]] Ui::ChatThemeBubblesData PrepareBubblesData(
-	const Data::CloudTheme &theme,
-	Data::CloudThemeType type) {
+		const Data::CloudTheme &theme,
+		Data::CloudThemeType type) {
 	const auto i = theme.settings.find(type);
 	return {
 		.colors = (i != end(theme.settings)
@@ -2264,8 +2227,8 @@ void SessionController::cacheChatTheme(
 	auto descriptor = Ui::ChatThemeDescriptor{
 		.key = key.theme,
 		.preparePalette = (data.id
-			? PreparePaletteCallback(dark, i->second.accentColor)
-			: PrepareCurrentCallback()),
+			? Theme::PreparePaletteCallback(dark, i->second.accentColor)
+			: Theme::PrepareCurrentPaletteCallback()),
 		.backgroundData = backgroundData(theme),
 		.bubblesData = PrepareBubblesData(data, type),
 		.basedOnDark = dark,

From 4617ba5fb9c6bb281a5243918229eada7884152b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 23:02:33 +0400
Subject: [PATCH 067/676] Add couple of phrases to the langpack.

---
 Telegram/Resources/langs/lang.strings                    | 2 ++
 Telegram/SourceFiles/boxes/background_preview_box.cpp    | 2 +-
 Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index fb2bd7567..e80949b7f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -753,6 +753,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_background_apply1" = "Apply the wallpaper in this chat.";
 "lng_background_apply2" = "Enjoy the view.";
 "lng_background_apply_button" = "Apply For This Chat";
+"lng_background_dimming" = "Background dimming";
 
 "lng_download_path_ask" = "Ask download path for each file";
 "lng_download_path" = "Download path";
@@ -3656,6 +3657,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chat_theme_wallpaper" = "Set Wallpaper";
 "lng_chat_theme_none" = "No\nTheme";
 "lng_chat_theme_apply" = "Apply Theme";
+"lng_chat_theme_change_wallpaper" = "Change Wallpaper";
 "lng_chat_theme_title" = "Choose theme";
 "lng_chat_theme_cant_voice" = "Sorry, you can't change the chat theme while you're having an unsent voice message.";
 
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 041739825..c0f53e255 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -292,7 +292,7 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 	inner->show();
 	Settings::AddSubsectionTitle(
 		inner,
-		rpl::single(u"Background dimming"_q),
+		tr::lng_background_dimming(),
 		style::margins(0, st::settingsSectionSkip, 0, 0),
 		equals ? nullptr : dark ? &_dark->subtitle : &_light->subtitle);
 	_dimmingSlider = inner->add(
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 47d3233b9..52c228f77 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -252,7 +252,7 @@ void ChooseThemeController::initButtons() {
 	apply->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	const auto choose = CreateChild<RoundButton>(
 		controls,
-		rpl::single(u"Change Wallpaper"_q),
+		tr::lng_chat_theme_change_wallpaper(),
 		st::defaultLightButton);
 	choose->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 

From 2b2d190d2bdb0887c186eb14579d76612552027d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 23:03:34 +0400
Subject: [PATCH 068/676] Closed alpha version 4.7.1.3.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 7182eb7c6..c4dca9d0b 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.7.1.2" />
+    Version="4.7.1.3" />
   <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 c36286fa5..ea1c8a86f 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,7,1,2
- PRODUCTVERSION 4,7,1,2
+ FILEVERSION 4,7,1,3
+ PRODUCTVERSION 4,7,1,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.7.1.2"
+            VALUE "FileVersion", "4.7.1.3"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.2"
+            VALUE "ProductVersion", "4.7.1.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 138238f50..28c5bd17a 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,7,1,2
- PRODUCTVERSION 4,7,1,2
+ FILEVERSION 4,7,1,3
+ PRODUCTVERSION 4,7,1,3
  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.7.1.2"
+            VALUE "FileVersion", "4.7.1.3"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.2"
+            VALUE "ProductVersion", "4.7.1.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 6d2261ac9..7c2c20dab 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4007001002ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4007001003ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index 3242fd3dd..eabec1c07 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.7
 AppVersionStrSmall 4.7.1
 AppVersionStr      4.7.1
 BetaChannel        0
-AlphaVersion       4007001002
-AppVersionOriginal 4.7.1.2
+AlphaVersion       4007001003
+AppVersionOriginal 4.7.1.3

From 66e7f1d490a33bd7280afb58e6b1cc4b2e584be6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 23:05:54 +0400
Subject: [PATCH 069/676] Fix dimming edition for new wallpapers.

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

diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index c0f53e255..3573a261e 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -199,7 +199,9 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 , _appNightMode(Window::Theme::IsNightModeValue())
 , _boxDarkMode(_appNightMode.current())
 , _dimmingIntensity(std::clamp(paper.patternIntensity(), 0, 100))
-, _dimmed(_forPeer && paper.document() && !paper.isPattern()) {
+, _dimmed(_forPeer
+	&& (paper.document() || paper.localThumbnail())
+	&& !paper.isPattern()) {
 	if (_media) {
 		_media->thumbnailWanted(_paper.fileOrigin());
 	}

From efa19d578283d3637f5eace14d2dc6ed5013944b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 21 Apr 2023 00:13:11 +0300
Subject: [PATCH 070/676] Added check of bot info with correct lang code to bot
 management box.

---
 .../boxes/peers/edit_peer_info_box.cpp        | 65 +++++++++++++------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 6a8b39385..541af224e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1809,16 +1809,28 @@ void Controller::saveTitle() {
 		).fail(std::move(onFail)
 		).send();
 	} else if (_isBot) {
-		using Flag = MTPbots_SetBotInfo::Flag;
-		_api.request(MTPbots_SetBotInfo(
-			MTP_flags(Flag::f_bot | Flag::f_name),
+		_api.request(MTPbots_GetBotInfo(
+			MTP_flags(MTPbots_GetBotInfo::Flag::f_bot),
 			_peer->asUser()->inputUser,
-			MTPstring(), // Lang code.
-			MTP_string(*_savingData.title), // Name.
-			MTPstring(), // About.
-			MTPstring() // Description.
-		)).done([=] {
-			continueSave();
+			MTPstring() // Lang code.
+		)).done([=](const MTPbots_BotInfo &result) {
+			const auto was = qs(result.data().vname());
+			const auto now = *_savingData.title;
+			if (was == now) {
+				return continueSave();
+			}
+			using Flag = MTPbots_SetBotInfo::Flag;
+			_api.request(MTPbots_SetBotInfo(
+				MTP_flags(Flag::f_bot | Flag::f_name),
+				_peer->asUser()->inputUser,
+				MTPstring(), // Lang code.
+				MTP_string(now), // Name.
+				MTPstring(), // About.
+				MTPstring() // Description.
+			)).done([=] {
+				continueSave();
+			}).fail(std::move(onFail)
+			).send();
 		}).fail(std::move(onFail)
 		).send();
 	} else {
@@ -1836,19 +1848,32 @@ void Controller::saveDescription() {
 		continueSave();
 	};
 	if (_isBot) {
-		using Flag = MTPbots_SetBotInfo::Flag;
-		_api.request(MTPbots_SetBotInfo(
-			MTP_flags(Flag::f_bot | Flag::f_about),
+		_api.request(MTPbots_GetBotInfo(
+			MTP_flags(MTPbots_GetBotInfo::Flag::f_bot),
 			_peer->asUser()->inputUser,
-			MTPstring(), // Lang code.
-			MTPstring(), // Name.
-			MTP_string(*_savingData.description), // About.
-			MTPstring() // Description.
-		)).done([=] {
-			successCallback();
+			MTPstring() // Lang code.
+		)).done([=](const MTPbots_BotInfo &result) {
+			const auto was = qs(result.data().vabout());
+			const auto now = *_savingData.description;
+			if (was == now) {
+				return continueSave();
+			}
+			using Flag = MTPbots_SetBotInfo::Flag;
+			_api.request(MTPbots_SetBotInfo(
+				MTP_flags(Flag::f_bot | Flag::f_about),
+				_peer->asUser()->inputUser,
+				MTPstring(), // Lang code.
+				MTPstring(), // Name.
+				MTP_string(now), // About.
+				MTPstring() // Description.
+			)).done([=] {
+				successCallback();
+			}).fail([=] {
+				_controls.description->showError();
+				cancelSave();
+			}).send();
 		}).fail([=] {
-			_controls.description->showError();
-			cancelSave();
+			continueSave();
 		}).send();
 		return;
 	}

From 47756fb8c3f9d2efffcdb7ffdcab637e39a6bb41 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 21 Apr 2023 00:23:49 +0300
Subject: [PATCH 071/676] Removed focus from disabled editor in UsernamesBox
 for bots.

---
 Telegram/SourceFiles/boxes/background_box.cpp | 1 -
 Telegram/SourceFiles/boxes/username_box.cpp   | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 4adde4e1e..2c7efa6cf 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -301,7 +301,6 @@ void BackgroundBox::chosen(const Data::WallPaper &paper) {
 
 void BackgroundBox::resetForPeer() {
 	const auto api = &_controller->session().api();
-	using Flag = MTPmessages_SetChatWallPaper::Flag;
 	api->request(MTPmessages_SetChatWallPaper(
 		MTP_flags(0),
 		_forPeer->input,
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 3e0245486..6e4e10a9d 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -126,11 +126,14 @@ rpl::producer<> UsernameEditor::submitted() const {
 }
 
 void UsernameEditor::setInnerFocus() {
-	_username->setFocusFast();
+	if (_username->isEnabled()) {
+		_username->setFocusFast();
+	}
 }
 
 void UsernameEditor::setEnabled(bool value) {
 	_username->setEnabled(value);
+	_username->setDisplayFocused(value);
 }
 
 void UsernameEditor::resizeEvent(QResizeEvent *e) {

From f4a02b126df80719eec8f3c2a0c511b7c5a237c7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 21 Apr 2023 01:21:08 +0300
Subject: [PATCH 072/676] Improved format of ttl phrases.

---
 .../SourceFiles/ui/text/format_values.cpp     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index 818e3e40f..c5dd7763b 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -392,15 +392,24 @@ QString FormatPhone(const QString &phone) {
 }
 
 QString FormatTTL(float64 ttl) {
-	return (ttl <= 3600 * 23)
-		? tr::lng_hours(tr::now, lt_count, int(ttl / 3600))
-		: (ttl <= (86400) * 6)
-		? tr::lng_days(tr::now, lt_count, int(ttl / (86400)))
-		: (ttl <= (86400 * 7) * 3)
-		? tr::lng_weeks(tr::now, lt_count, int(ttl / (86400 * 7)))
-		: (ttl <= (86400 * 31) * 11)
-		? tr::lng_months({}, lt_count, int(ttl / (86400 * 31)))
-		: tr::lng_years({}, lt_count, std::round(ttl / (86400 * 365)));
+	if (ttl < 86400) {
+		return tr::lng_hours(tr::now, lt_count, int(ttl / 3600));
+	} else if (ttl < 86400 * 7) {
+		return tr::lng_days(tr::now, lt_count, int(ttl / (86400)));
+	} else if (ttl < 86400 * 31) {
+		const auto days = int(ttl / 86400);
+		if ((int(ttl) % 7) == 0) {
+			return tr::lng_weeks(tr::now, lt_count, int(days / 7));
+		} else {
+			return tr::lng_weeks(tr::now, lt_count, int(days / 7))
+				+ ' '
+				+ tr::lng_days(tr::now, lt_count, int(days % 7));
+		}
+	} else if (ttl < (86400 * 31) * 12) {
+		return tr::lng_months(tr::now, lt_count, int(ttl / (86400 * 31)));
+	} else {
+		return tr::lng_years({}, lt_count, std::round(ttl / (86400 * 365)));
+	}
 }
 
 QString FormatTTLAfter(float64 ttl) {

From 383b100fc7ac860c463e774d99958898e9b20919 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 21 Apr 2023 01:34:05 +0300
Subject: [PATCH 073/676] Fixed changing speed of video in windowed media
 viewer.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index db617353d..896a66ec7 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -407,7 +407,8 @@ bool PlaybackControls::dragging() const {
 		|| _volumeToggle->isOver()
 		|| (_speedToggle && _speedToggle->isOver())
 		|| _fullScreenToggle->isOver()
-		|| _pictureInPicture->isOver();
+		|| _pictureInPicture->isOver()
+		|| hasMenu();
 }
 
 PlaybackControls::~PlaybackControls() = default;

From 458082c7382f461ce59a93c4e3eb0e92b3450cc0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 13:42:06 +0400
Subject: [PATCH 074/676] Add correct icons for dark/light mode switch.

---
 .../Resources/icons/menu/header_mode_day.png     | Bin 0 -> 420 bytes
 .../Resources/icons/menu/header_mode_day@2x.png  | Bin 0 -> 891 bytes
 .../Resources/icons/menu/header_mode_day@3x.png  | Bin 0 -> 1358 bytes
 .../Resources/icons/menu/header_mode_night.png   | Bin 0 -> 636 bytes
 .../icons/menu/header_mode_night@2x.png          | Bin 0 -> 1309 bytes
 .../icons/menu/header_mode_night@3x.png          | Bin 0 -> 1933 bytes
 Telegram/SourceFiles/ui/chat/chat.style          |   9 ++++++---
 7 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/header_mode_day.png
 create mode 100644 Telegram/Resources/icons/menu/header_mode_day@2x.png
 create mode 100644 Telegram/Resources/icons/menu/header_mode_day@3x.png
 create mode 100644 Telegram/Resources/icons/menu/header_mode_night.png
 create mode 100644 Telegram/Resources/icons/menu/header_mode_night@2x.png
 create mode 100644 Telegram/Resources/icons/menu/header_mode_night@3x.png

diff --git a/Telegram/Resources/icons/menu/header_mode_day.png b/Telegram/Resources/icons/menu/header_mode_day.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ad57435ef838f8bc1ec7ab856f4416d447bbf95
GIT binary patch
literal 420
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfjL*}>F~maf
z>SSBKW&<8K#!}ZL7h87i^oIg>6JB~o+?;tMLb9swoQJI7h2;%SuR^+7Ha$4`@6Ve*
z7MxA5Z#vIxuiZbzQrfl2W0H%8e5%uyjq(j&OnggY-7juD5Iggk2V;X}73131Q6jDD
zMEEor3>KcA!0LF}M0Mix%G=xWQ!QFLmN1;rJuRlBce*HYTB5|fQw7f|-9%<6rxc!g
zA<*`)?U8^|-tVF-uT9t!xp#HHYxVF-Ubfl4-Tip+%ir?^C!X81=CzgHRToY{PsJw2
zV5f)2WRlIY_xx1v`&OTuKi&8Ds#P;C{`^>7J)v%2$9ezk|C#r=)!LGh%^iClYfQ1|
nYjw&<-ZU}xvPrLQoa0X>(-ns*V?GBR0ELjJtDnm{r-UW|4e6G#

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/header_mode_day@2x.png b/Telegram/Resources/icons/menu/header_mode_day@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..13dd35f3024caf25121bf2b190d879f2ea71235c
GIT binary patch
literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|DpDgn(|mmy
zw18|51{Ovs23C*~Ahu(ahO^xmH5iz|;y`oSGZ|Q*YW#pS2uuKCkRAxlynqp^8Ys4a
z39i~;0W*RP(#E;#%32Ur;1OBOz#ygy!i=6lDjyganC5u8IEF-UzMbK?PSa7O?e{5R
zpCe2&BsMTyOUO%LZBtA8mXMN@$F0IvmcZ!3!^5MxX9CB`+WWiJEw|@gzUx|;zhB&T
zLh$l`|JMhXuG;1IdC&FFQH<L~D~cEYPhB3gvTS$n#n)f^jxXN5V71fo%a#8t3}Uw0
z=s(m8)Dd%a;T1p2&ho_QkLve$ZjISz!?dQJuADLNX_2O{>6y68Zd{I+i)ZszZoau8
zzWs2b)m%QM;!`)y*+@7_yy#G9eel=NP|?!vPv7y!6J|6$60mo9p(VQWNn)0f?!{N%
ze<xmeVAmnV+jP*OTdufh_0>~Ng{(}0Ohu8;{9}`nx;o5epY>n=Ty^qEx5b7MJZYP6
zzVBymR`c8CqvG<S<IdcY;J3SC*IyU!ZdE&!eu4FY)#r!zT$C=pEj!Ec?YC|A;bIFJ
zAA5rX{QL*>Gu(`4`ebdLrN#l&&&$1G{{I_hof8h8dtSWyDwoi5?goYVGpxlNzWaKZ
z2&pn~a&+k>USN6mrMM=AXHt^#!kx_-&HE(}Pn_0pL&Gd3p{YHiS^UiOuD~pN-RvDY
zXO$)thiFZ;@Y)&kuEff<&vDtd+qr6!XP$rlv?%h!L+2l+I~7v>es#M$?)mdUcv_Vb
z?|}dXEu$Kag!A?O89HUh^o8A;GJXXuYxr8_d+O6qo1GhcA{PcU@CCXaY7dw(^`q_V
zTUsKFN8jBz{_f}rtD~=9O*nG&b&=|_37?v+T;dZX?uXQ!u$pMSH{-0rk-EG_vGqb`
zWv>4+OfL2O`I8>7HR@_c%)W#(scs+s@gKcW>s7p<L$k;!DsaZuE*ZD``au)rzs2WO
z%g=w7w|%zX^67P#7hi3ZN?V`l?#0*_Yx~8XZOQ-Om5Iw<hFK@^-#p<d$PvUVeU1Bb
eRAc(u1M)5Jo_no&aWET{h&^5XT-G@yGywoO`ClIZ

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/header_mode_day@3x.png b/Telegram/Resources/icons/menu/header_mode_day@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f6ad557ffd47cca2723cf9b99fac20a0ff63172
GIT binary patch
literal 1358
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aiBTvnG7sYHGV)E1a1H^NDqW&Ucd-d4HR3z
z1Xt~`fEmFCX_MVsWdo!*3p^r=85k5TK$y{WnqdM1153WAi(^Oz>)ToT^>rOZj^CaA
z-2KIh6|N7%l@~4$=yg$1;R;-!y6~&~iXZka?kgP^S5Fk+>g;OK2wCLt@!s>h6AO)Y
zm)}40=G?v6XYV<kJ2U6At^KnzH}4upMV*S5Y&2p@WjV$1$7R7M=e8wL(b4JY=@$!%
ziave)DjF2pccY@Tu<+yZZ_Noa7Jr(s>e=(>Q^Q~BAD(b)-^SIJFJ8QUJvpjpVa%xs
z=MHb=IlHx8OLlXAXmP=_jmh%z@|Pl$HKt3sm6w<2=jE+iyLRjL?YE^b-oO9<=g*a1
zN-WORks=HEmaf<~z34H^ua6%CZ<be9-n@J{S%3eI9Y1z|Yu+&3iM4BrTS)t--VK_v
zuijt1I(2gXw|^Rb2LcsMlNxM04og<o*H7QEc=6)p%a=FSFpCw0c=Wb07HNw5?s|RX
zLSxFZwQF@n^IRkjM7a8~TQ|+J5cK7@iHVK%6)B2a67}MM<{{;`vO$8(@$vELX=&@$
zuV1<`Ha50s#=LiL-b_(g;jFppX^OzC+RH0HefSWtJ|cAW)s-t({{8!R^XARFckkYQ
zi@!;6vd%$)Z25)*tM)ntE=ZPHy{k3Z;ZROa&XKCC7cXwyy!rE|Pf00L3|kn@W-PX9
zV4b6K{tttD>CJOGy1Fkbq~{&sOLRLTwpX!cs#j`xx%stU|NWFYD%#T0+gc;p+1XE@
zKHXNhef##~$B&zvo1Z^_Ugzt#Z+!gx`Z_v1yu6Zg+S}W;wY6Ig%*g*>uq*ue^XHEr
zKmK}V){Geq2XA;fy!vRKHqTkfcS-E#ty@!*xpEA=Z>m}4Pce<uH7Lo;J9kX`DD&no
zyen>4W%AFER9B5|yHm7&NtKHVQ$x{KLlgeUpL-tN_;FM5ymZ6Yd3Wm`*ahuzIFX<p
z(w$P0)p>-`Y^MDWEq(V}3RzWBwH?_S36~ude`|-ul`ctTp5Vsnd*}D>>gM{K9G~+a
z_FUS+-ngS~hi3$@tAAoqQBd6;8(Uk;FK1HSquK?U%3Qx3o;N+}?BU0u(hnV1EZ^+J
ze9ggOYu=oUUI9Ma;>F6kff>;fzbaC%^IX1s`Piz<0)@P+YZSY)_GSrewEg^ppPkv{
zzv8m=^;;xXN(9?f@GEHVIJZetPUe1NBco{Sy}ZjUl_@DM-OQ^qU1eltdHML3Y00rA
zeKH8xdH?op?`zUETQ~5(IJ7TlqR`9uCSZ7{vgUV9Pms}mlg_<Q^s{rYsK)hc4EGs7
z1-mXyYFpd5Y3AZ@svq-%x84`h{TlUT&q=Wko$`$(#il+lZ7$dAMRi-Zdvm_GPF%0D
zn$vati5uqiJ1jgIQZH4-^fkWvX4@8Sd1rxC_$J5qE&o}~wy(Zb)s?bcId6IGbEBP(
zTSMf0D<%mu>l{ri_HcddW%hzM%dY&;{lrJpF7A#n{c6AAf&4zv5Al6(KHq*26CXeQ
z>Fk9E1(IGA9NTkM`sx{ps>5pB&mKl>Vr>lbKF-8yCXpj&omOJsn`m(T5cBDII}bng
zusUp%&8sqdq28Sbg*(o9x#@(T=9nU=p&a0LK$WSU@$xg(3GbI`{REXup00i_>zopr
E0FBQ~&;S4c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/header_mode_night.png b/Telegram/Resources/icons/menu/header_mode_night.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cf44547e0b60eb8540bd6790665e2a361464f7
GIT binary patch
literal 636
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?3t&FV~B;|
z(-7~~j)5X}-*<gtc1e>HUOr>y371nR<PZ2fQ{y=&KcO*Ym4;8R#EBz|c|=_oPMOsB
zY1(#`ch^H_pSv0U{m#R^>09LP|NC|;yY{ug8T;QVLY=3do_hXy_0?6EU%vSI>%NJ@
z+A#CkXK%k{o0ej<Ge%Fivn4~R`>4@OpJ$(UUVb^{WJ=M_KLr*n&5ngGZi_!w*lfF<
zJJ+w={$$~uuT`m$VKRYx<Kov}*P7ZTqdnDYYgF$J{T}{F#TGJZlQji6dX6Ux9l6|g
zSh27^Wy$52FH5whdd<JMGQ`UyaR2@DDMsgYHYhUnoPYiG)1&ow{?^I!wYPRSE!=SX
z?Yx}}`U5mtqIubx1<o%xdod$qMu67T2TrjS$$HaQhpm48`DclhV`{Hk^Mm`Hrc%9I
zqI3&88;>RO<!#>`v~t0;(@%vuT^97`n618;!SN>XNYci$Y0QFlPWPi57An0FU`^T@
z6}bQW^TkhC6ko_COwl}1!`gN9QPM_*P0N}k*cjdftiF0E@3P^Gi#cYmzgFq*SWx|k
ze?$KZ@wrdsOlO}3xkGt<{DoEb-ybj7*ncBe?zHsz_U>JeKJK`icRz3Y)1pcPiG-jX
z_tQ3Oig5MZdHgY9V=Mbh!7p;fZ_0LSFh;e$+vt3OQTFfh#q*zE_@JyJdm;)H^PaAL
JF6*2UngEUl6&nBm

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/header_mode_night@2x.png b/Telegram/Resources/icons/menu/header_mode_night@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d397e35df16e6eadb7f375df59ccc018ef52916
GIT binary patch
literal 1309
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|DpDgn(|mmy
zw18|51{Ovs23C*~Ahu(ahO^xmH5iz|;y`oSGZ|Q*YW#pS2uuKCkRAxlynqp^8Ys4a
z39i~;0W*RP(#E;#%32Ur;1OBOz#ygy!i=6lDjygaSnNDq977^F-$r<AtPK<?v-#|&
z68ouxky%yqj7Q~}79JHfIp!cX4L6>SDV)q_I(SkVCb*}xoZw;34~(m9`E+8h{OeoK
z&)@ui@3%eQcfND>7U|osZNK*G+^yg7*>4{|NT`1!xgq_*|I-btS7*DqxkX3czIE%?
z*RNmCo%4&0ojZB*W&4Czj~@p|M^_gWeY*YV<;#~pGo4aXQ%|(BPTt>i{rdG2Cr-#e
z5|NOwFf&`Ww5X!u#=U#<rcQnO{JFWUt?#NshYrnG5RsGHw}1cn8#%eTqN1WZckBqr
zNl$-%_ipT^w6wH3>xCU19nH<mUG2V(VR!D_*%CNW^io_*OifT`;<m`g9FKVyRq*rk
z-(k_w)fHT@bLUO7K-RclzkX@l`1`juD{Gaik(Jdf27iD5g9i^zV~F<p^!c-<gk5oQ
z@y>OtSFh$Ywy`<Gdc&tfYx~~4z6YzStH1u?<KYolwq;8Qf3kF?qa&lMmA(D<PoFLo
zTbY`=8i?fC_5|)!zP@1DvbHC(va;pn<uN=h)2B~g^6C5c>xU(#7IU<=wH-Tp^q}Cq
zHS5;tH6DNbIQi1CW5>7>+CpTUfC2O*sjlwdvuAD(@)8ppx7@sWlj%lysI#+kiP5T6
ztB&jo;LOj@=bSTrx;k6*`q;R*WfGm8ok995+F9(Zthl(iCOulqxZzx@p4!&$U%%Q~
zTPynky^-YiqT$A!Q>RWnd6Kd+-IyVLCex1HyJs)`r7iOD`SbK?>hJDVR#YtL%3@!6
z@SvkfTJ3r%Ug@e2uT7IKZrZV9Mj_MYvuDpvn<ge=d`A6*dwIF}X{C?L&UbZjO$=Uk
z`^F80<{2|2)TZc7P|pj|WnN=w-P6}MNuY5_-hBpOK&DKXHf>qT2Sz8i!eck9zjt!6
zwNIKPB(u1ofgxxiZ_SKZ`z?2OIQ#xuvP5NqadN7*$Xa0Z96RRrXVR1@B46r{?Ax`A
zN%Th~FiI;c8~a;YSU$Cg2S581d;Zs-Q>VHnH986`vpFU3PS<PMy?gii`};Q>?2r%=
zT9mSw=g_o7Idvzts83IxsN5_mE7Lk2#FQkbeqMu-%`I+=vC&}-2~p9dB3_IvY%4gP
zNPf3w<>pOEOKa1asO#?T$A2v$bo!ew3$7$4gqteI)YRCV6DZ8e%{5Is<NUbqfXuY%
z(?2U1MFs~83m$qd-X1c=_u9mQ=Tls-U7YQ+Y~n=0W1N+n^4=E}6&2(w+G`Z;V1LaL
zB2ZmbwW!_L&%(d$oW--kJAyMTf3fAw<4SB5D7f^D^Sx|V;}*Mxy$iCkcT2z8%6mf~
z^o{H}Ve3ghjz%o*GdD3=;Jtud*(Oc&jQ@<62I+nM{hMtUefjeJyL8>!mdvW)M|+dE
zHoR>rX*{w(+;eU;zr)!%GiEHfr<AsN-@d+yCtlcRtG!;a@czPe4>-BGe}Db=px$oI
zjLVlV@7=ri=FP}InJx2D=N9jtYRmkMrzV^2AA^qimadwHCGwzR#?#f$Wt~$(695n+
BHEaL?

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/header_mode_night@3x.png b/Telegram/Resources/icons/menu/header_mode_night@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..65ba723e2417ba6f779e5fd46a89b9f144ceb09f
GIT binary patch
literal 1933
zcmY*ado<hG7XC$0v?VlFsjBg4J%^ZvcvaeXB{V2XOG^w>B`P7N9_>^vS`zO;#HC9r
z9zi_PYOpG(v{MtKWe_PQm<shQ+M-J5#@tymYtCBV`M$H)x6dDEpS3r|+tcl^(lI3f
z01ji&&OTB`??XXGx{v1>K%@jB`M9BgrkBSTq=&@sE@7@=v4DwGD*&>fV}RVgMG8ld
z*5BF{WCVc!j7#syhy-N+@_0&le~F~n&-p)t8KA%1(ilVLZ#S9&{zvbpY4egDq@+kh
zUnT*7uFXC`E;LIV0LV9CoX`1Pms<%8LaXDUo|abnR`7nkA-_(BvD~N1P&LI$6_d;&
zw4;$is$<bxCudZ(|Fyu>qp(a_bshJE@DS)nU8spMn*p~d4TnS-2ir}B;vUmW_g*b$
z1)Yi5<X;;=E`13RN-C~C$*!0I@xk{F98%FZ0drXUW36Y1>1Gk!x&3yCSyxv#Iyzcf
zT56xLy8Y?Xir*5C$7{a&WOIg}fsE>&>P|5<Fj$67?C$O1@%R!NZNzNHp4-v_QB~!f
zj-F^Egg7~Yg%cqk??Unu$e|n#rvjN`{as&kNOy2&;ssyd(+Gr{4Kn3Rd|cdk7k5R>
z`}|Xm*3!~al_dyyXP3ohJCNqGv$C?n&qhWX^W<6*-idES(Hk1@2?>a?i>ZdEPEo1U
zqGaT)&FuUDfB*9P_uH7EE%mjv8PH;~L?Y=gv1n-GuvkX9ldoTQXg7{OicsMm4uGyL
zjWz4*>tpLC#>WNgzP`TL&=|?~aIIGdjT|dbqzNB5WeA1B%-NNRHf3eyph$B4a%!rK
z&jp#)scsAZ*7kOKVR%GDL!4OfbZw1TrF^CT*4ApI3Ea-k-N5E+4$=y<OeH_xTpTs^
zQ3Y=1*2s5tb(PBwH(<Ucq<fT@$EwG&ZzU&3nZ$nCP4X<J(^;5r17x4QmOjjnR0Tn;
zSA~%IbhIIW5)~H49~i)@6gLu&TWLyWXQzq!tp`+2eAwC=W&+cG(h|7cJ9(D7W%_K=
ztHQD1O#$M#ZJcwhT3gI-dcDt|yWIEVqK4_5qM{-)8Bp6?o8d1kL?%PQEDJ?Y679(o
z`!nO9L717bF{P+ywVuUdxM9g!^0O^1Fs#~V-D#jo0*AqHG+er4r5tf@=le%}2vu7+
zya<0&B2XvY{b6^zz$QB<hcXN$m1eEGc&tx$kjgcxl~P8)$fS+*K@<vQex?0vUXUW(
z%BrBd0Ag!L?PSznkB^7zX;^CN=mhxV>(k5ZGsh|M$22uL=P!A99JB-t4h@CAlB;Wa
zFRdV^cK%gGgMMU=Uf@?dsye`1%RpRNNlAdWcYa=89__65yH5q8$w_t^O1rwMDqTxn
z<9$sE_NNyw!kXQ4U}no=v6xQR_#R{DmUQ1IIJl|MU43Q!&5Lg)2E_t_K+Q{=%X-)<
zr(;B;(P~W4V_zZ8dwo2Kqq;{EiQd<=PN;$*Q!wybFZWrP`h3KlJC40IY89@7<%bU)
zf})|k-}idBTx-?(+=LdaEuqQ?m@PEY|F9Ljw73|bdC_TRW^}UEDQBuXOhkD2D1G7-
zIpf~Fjg5^&(B0+9B4|#m*rByN3)RO7djSC_-aaBq3wS5y_4oDVi~KHLRQ={AHMOk^
z6kkg@XqUlVxipPy|KYQB2-LtsX7CV!K#=}?vjAEf+|bbQlc}az6qBj$Bw{gjnGFqD
zu58&s=cg*z1G9n`c{<43+puH<8&nG?A|hg4=>oLT-dxUZnoD-w+1XLBR#8w^o(qnS
zj)v!ng`#$q=^aLE+m+rDi;&E*Ho}w{`smjsjSOciv;gSg)ycSQ0li1(s~_bs%XpfZ
zeSUNE^O(}DcT;8O*v@B?HVoEf$nma}u!@4-UQ`q2^5xRUaRp<f+@N1iID1hHo31Bn
z+YoyK`Q9;cd}1)=hyz|yH`H&(wZ@zDH|55WNTXE*p~fl;;_`DxUk9;-pcQK9Sw2mX
zL3KU8n-;?(-XMQQJX9j*Fmu@uS3EXl-mgvFB(pu`jsF7?CpJZ`+H|T5V(sA2`FbVs
zwta6SD(tkmx##m_(~SJzes;X@pBrTeg0!_wn)DzD;?`ef3uhM=7H&T}ry;Bw*wR{M
zg(Jow=|12o9DU@Mouj*P=nbQnYUPDoDhM4Djz8g(KQh7Pdar{Ik#9UqN{fDmFbzZa
zTPdBCxLGP#ZwH=pDIU=1{cq6<B62gI^i(o8ConoA?Q0iJ@o>^|MDeU~`ALD5erbjs
zFm%e+_HxS|+-{w3Em4PD1O6i%^*cF*O}t%;TW8x`I<MH9c0fhUyM;J?dU!;hZ!jJI
zKu1j>{qSUbDkNuQ@AFpKkGYI&(`dNdd0kQ1@g$1byk2t<z_^;$Tq3LUT*Nmp2X{PV
zE5pW2K4cAgLfOIQFU7D$#7Ir&st~TCrLLuR|LQ2=7c=Xg`ZK5UsRw0Sjq>Tt#w@2-
ze7@7-$I5^-rppd5>AgHiX#fY(c~ktaff2INgEX`_f*zQ+t=u1L7#C0HCKN99e_Z})
AssI20

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index fb379562e..7e6b3dfcd 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1313,8 +1313,8 @@ backgroundSwitchToDark: IconButton(defaultIconButton) {
 	width: 48px;
 	height: 48px;
 
-	icon: boxTitleCloseIcon;
-	iconOver: boxTitleCloseIconOver;
+	icon: icon {{ "menu/header_mode_night", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/header_mode_night", boxTitleCloseFgOver }};
 
 	rippleAreaPosition: point(4px, 4px);
 	rippleAreaSize: 40px;
@@ -1322,4 +1322,7 @@ backgroundSwitchToDark: IconButton(defaultIconButton) {
 		color: windowBgOver;
 	}
 }
-backgroundSwitchToLight: backgroundSwitchToDark;
+backgroundSwitchToLight: IconButton(backgroundSwitchToDark) {
+	icon: icon {{ "menu/header_mode_day", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/header_mode_day", boxTitleCloseFgOver }};
+}

From d37666e91aa1353937a753b89e90adc312c4ff20 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 13:42:12 +0400
Subject: [PATCH 075/676] Fix sharing system audio in video chat on Windows.

Fixes #26107.
---
 Telegram/ThirdParty/tgcalls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 012f7a75b..d339f0a58 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 012f7a75ba7e20e1790203d02aedf573e3551d2f
+Subproject commit d339f0a58af2c1850452476fb2ed18ec1e9bd7b2

From 0b5038aaa2f66c688f8157cd00a549dc8bb30e37 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 14:10:19 +0400
Subject: [PATCH 076/676] Fix t.me channel comment links opening.

Regression was introduced in af51307aa6.
---
 Telegram/SourceFiles/core/local_url_handlers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index fe9b26210..5ef839888 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -1034,7 +1034,7 @@ QString TryConvertUrlToLocal(QString url) {
 			"("
 				"/?\\?|"
 				"/?$|"
-				"/[a-zA-Z0-9\\.\\_]+|"
+				"/[a-zA-Z0-9\\.\\_]+/?(\\?|$)|"
 				"/\\d+/?(\\?|$)|"
 				"/\\d+/\\d+/?(\\?|$)"
 			")"_q, query, matchOptions)) {

From 8a64a9b2ad1b401990d634d61b8b96ebafd6b22e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 14:15:19 +0400
Subject: [PATCH 077/676] Close forward options box by Enter.

---
 Telegram/SourceFiles/ui/chat/forward_options_box.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Telegram/SourceFiles/ui/chat/forward_options_box.cpp b/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
index c619ee719..760ab5dad 100644
--- a/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
+++ b/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
@@ -82,6 +82,17 @@ void ForwardOptionsBox(
 	box->addButton(tr::lng_box_done(), [=] {
 		box->closeBox();
 	});
+
+	box->events(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress) {
+			const auto k = static_cast<QKeyEvent*>(e.get());
+			if (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return) {
+				box->closeBox();
+			}
+		}
+	}, box->lifetime());
+
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box.get(),

From 64125f0cc89fa3b7494d760c35dd810bee649cf5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 14:16:19 +0400
Subject: [PATCH 078/676] Update patches revision in docker.

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 0c19dda69..2c0aea8e8 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -57,7 +57,7 @@ ENV CXXFLAGS $CFLAGS
 FROM builder AS patches
 RUN git clone {{ GIT }}/desktop-app/patches.git \
 	&& cd patches \
-	&& git checkout 24afddb3bf \
+	&& git checkout bf05b2a1cc \
 	&& rm -rf .git
 
 FROM builder AS nasm

From 7dfed2a0120b6ca0104ccef973a2f84897367f38 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 14:23:54 +0400
Subject: [PATCH 079/676] Disable some bot editing items while there is no
 design.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 541af224e..4984db088 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -310,9 +310,11 @@ private:
 	void fillPendingRequestsButton();
 
 	void fillBotUsernamesButton();
+#if 0 // Enable after design improvements.
 	void fillBotEditIntroButton();
 	void fillBotEditCommandsButton();
 	void fillBotEditSettingsButton();
+#endif
 
 	void submitTitle();
 	void submitDescription();
@@ -1010,9 +1012,11 @@ void Controller::fillManageSection() {
 			container,
 			st::editPeerTopButtonsLayoutSkipCustomTop);
 		fillBotUsernamesButton();
+#if 0 // Enable after design improvements.
 		fillBotEditIntroButton();
 		fillBotEditCommandsButton();
 		fillBotEditSettingsButton();
+#endif
 		Settings::AddSkip(
 			container,
 			st::editPeerTopButtonsLayoutSkipCustomBottom);
@@ -1410,6 +1414,7 @@ void Controller::fillBotUsernamesButton() {
 		{ &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange });
 }
 
+#if 0 // Enable after design improvements.
 void Controller::fillBotEditIntroButton() {
 	Expects(_isBot);
 
@@ -1445,6 +1450,7 @@ void Controller::fillBotEditSettingsButton() {
 		[=] { toggleBotManager(user->username()); },
 		{ &st::settingsIconChat, Settings::kIconLightBlue });
 }
+#endif
 
 void Controller::submitTitle() {
 	Expects(_controls.title != nullptr);

From b782569faf498d75af5d282027dd64fb0c7f7874 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 14:28:18 +0400
Subject: [PATCH 080/676] Handle escape before messages are loaded.

Fixes #4111.
---
 .../SourceFiles/history/history_widget.cpp    | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 0b155f476..63fe849e7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1747,9 +1747,7 @@ void HistoryWidget::activate() {
 }
 
 void HistoryWidget::setInnerFocus() {
-	if (_scroll->isHidden()) {
-		setFocus();
-	} else if (_list) {
+	if (_list) {
 		if (isSearching()) {
 			_composeSearch->setInnerFocus();
 		} else if (_chooseTheme && _chooseTheme->shouldBeShown()) {
@@ -1760,10 +1758,16 @@ void HistoryWidget::setInnerFocus() {
 			|| isBotStart()
 			|| isBlocked()
 			|| !_canSendTexts) {
-			_list->setFocus();
+			if (_scroll->isHidden()) {
+				setFocus();
+			} else {
+				_list->setFocus();
+			}
 		} else {
 			_field->setFocus();
 		}
+	} else if (_scroll->isHidden()) {
+		setFocus();
 	}
 }
 
@@ -2679,6 +2683,10 @@ void HistoryWidget::updateControlsVisibility() {
 	}
 
 	if (_firstLoadRequest && !_scroll->isHidden()) {
+		if (Ui::InFocusChain(_scroll.data())) {
+			// Don't loose focus back to chats list.
+			setFocus();
+		}
 		_scroll->hide();
 	} else if (!_firstLoadRequest && _scroll->isHidden()) {
 		_scroll->show();
@@ -6134,7 +6142,11 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
 
 	const auto commonModifiers = e->modifiers() & kCommonModifiers;
 	if (e->key() == Qt::Key_Escape) {
-		e->ignore();
+		if (hasFocus()) {
+			escape();
+		} else {
+			e->ignore();
+		}
 	} else if (e->key() == Qt::Key_Back) {
 		_cancelRequests.fire({});
 	} else if (e->key() == Qt::Key_PageDown) {

From 05b8b9f22eeb49a62ea2184900b42d6a9f201717 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 15:09:06 +0400
Subject: [PATCH 081/676] Show pin confirmation correctly in topics.

---
 Telegram/SourceFiles/boxes/pin_messages_box.cpp  | 10 +++++++---
 Telegram/SourceFiles/boxes/pin_messages_box.h    |  3 +--
 Telegram/SourceFiles/window/window_peer_menu.cpp |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/pin_messages_box.cpp b/Telegram/SourceFiles/boxes/pin_messages_box.cpp
index 3471ef226..163e9dedc 100644
--- a/Telegram/SourceFiles/boxes/pin_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/pin_messages_box.cpp
@@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
+#include "history/history.h"
+#include "history/history_item.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/checkbox.h"
@@ -41,15 +43,17 @@ namespace {
 
 void PinMessageBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<PeerData*> peer,
-		MsgId msgId) {
+		not_null<HistoryItem*> item) {
 	struct State {
 		QPointer<Ui::Checkbox> pinForPeer;
 		QPointer<Ui::Checkbox> notify;
 		mtpRequestId requestId = 0;
 	};
 
-	const auto pinningOld = IsOldForPin(msgId, peer, MsgId(0));
+	const auto peer = item->history()->peer;
+	const auto msgId = item->id;
+	const auto topicRootId = item->topic() ? item->topicRootId() : MsgId();
+	const auto pinningOld = IsOldForPin(msgId, peer, topicRootId);
 	const auto state = box->lifetime().make_state<State>();
 	const auto api = box->lifetime().make_state<MTP::Sender>(
 		&peer->session().mtp());
diff --git a/Telegram/SourceFiles/boxes/pin_messages_box.h b/Telegram/SourceFiles/boxes/pin_messages_box.h
index c3ff2e92e..e19d9a1f1 100644
--- a/Telegram/SourceFiles/boxes/pin_messages_box.h
+++ b/Telegram/SourceFiles/boxes/pin_messages_box.h
@@ -13,5 +13,4 @@ class GenericBox;
 
 void PinMessageBox(
 	not_null<Ui::GenericBox*> box,
-	not_null<PeerData*> peer,
-	MsgId msgId);
+	not_null<HistoryItem*> item);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index ba06bf54d..1b73d6e65 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2154,7 +2154,7 @@ void ToggleMessagePinned(
 	}
 	if (pin) {
 		navigation->parentController()->show(
-			Box(PinMessageBox, item->history()->peer, item->id),
+			Box(PinMessageBox, item),
 			Ui::LayerOption::CloseOther);
 	} else {
 		const auto peer = item->history()->peer;

From 3e8b1d9663e85c1954baa2c08c05fb4917134b29 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 15:14:50 +0400
Subject: [PATCH 082/676] Fix focus loosing in RepliesWidget with JoinGroup
 button.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7bcbbd19d..cf9db15b4 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -2326,6 +2326,9 @@ void RepliesWidget::showAnimatedHook(
 void RepliesWidget::showFinishedHook() {
 	_topBar->setAnimatingMode(false);
 	if (_joinGroup) {
+		if (Ui::InFocusChain(this)) {
+			_inner->setFocus();
+		}
 		_composeControls->hide();
 	} else {
 		_composeControls->showFinished();

From 2e85f7e5fcf59fbdd509e5dbb232904cab0a84ec Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 21 Apr 2023 14:39:39 +0300
Subject: [PATCH 083/676] Fixed bottom padding below description field in bot
 management box.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 4984db088..fed0e6069 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1008,9 +1008,7 @@ void Controller::fillManageSection() {
 	if (_isBot) {
 		const auto &container = _controls.buttonsLayout;
 
-		AddSkip(
-			container,
-			st::editPeerTopButtonsLayoutSkipCustomTop);
+		AddSkip(container, 0);
 		fillBotUsernamesButton();
 #if 0 // Enable after design improvements.
 		fillBotEditIntroButton();

From 976c32e5af942fc901929490d212ff5933eed316 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 15:49:37 +0400
Subject: [PATCH 084/676] Fill isTcp field in calls reflector descriptors.

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

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index da0d591db..5fe9ac677 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -128,6 +128,7 @@ void AppendServer(
 				.login = username,
 				.password = password,
 				.isTurn = true,
+				.isTcp = data.is_tcp(),
 			});
 		};
 		pushTurn(host);

From f4f5139eb8a2b8fa1c449b2e7708b532bef155cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 16:39:01 +0400
Subject: [PATCH 085/676] Version 4.8.

- Share folders that include dozens of chats with friends or colleagues.
- Anyone you invite can add the folder and join all its chats in one tap.
- You can create multiple invite links to give different people access
to different chats in the folder.
- Set a custom wallpaper for any 1-on-1 chat.
- Your chat partner can apply the same wallpaper - or choose their own.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 12 ++++++------
 changelog.txt                                |  8 ++++++++
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index c4dca9d0b..1e5b0ee85 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.7.1.3" />
+    Version="4.8.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index ea1c8a86f..590eb4294 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,7,1,3
- PRODUCTVERSION 4,7,1,3
+ FILEVERSION 4,8,0,0
+ PRODUCTVERSION 4,8,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.7.1.3"
+            VALUE "FileVersion", "4.8.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.3"
+            VALUE "ProductVersion", "4.8.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 28c5bd17a..d0bf19f77 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,7,1,3
- PRODUCTVERSION 4,7,1,3
+ FILEVERSION 4,8,0,0
+ PRODUCTVERSION 4,8,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.7.1.3"
+            VALUE "FileVersion", "4.8.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.7.1.3"
+            VALUE "ProductVersion", "4.8.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 7c2c20dab..53120761e 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4007001003ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 4007001;
-constexpr auto AppVersionStr = "4.7.1";
+constexpr auto AppVersion = 4008000;
+constexpr auto AppVersionStr = "4.8";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index eabec1c07..312a36746 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4007001
-AppVersionStrMajor 4.7
-AppVersionStrSmall 4.7.1
-AppVersionStr      4.7.1
+AppVersion         4008000
+AppVersionStrMajor 4.8
+AppVersionStrSmall 4.8
+AppVersionStr      4.8.0
 BetaChannel        0
-AlphaVersion       4007001003
-AppVersionOriginal 4.7.1.3
+AlphaVersion       0
+AppVersionOriginal 4.8
diff --git a/changelog.txt b/changelog.txt
index e436212e5..538319e39 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+4.8 (21.04.23)
+
+- Share folders that include dozens of chats with friends or colleagues.
+- Anyone you invite can add the folder and join all its chats in one tap.
+- You can create multiple invite links to give different people access to different chats in the folder.
+- Set a custom wallpaper for any 1-on-1 chat.
+- Your chat partner can apply the same wallpaper - or choose their own.
+
 4.7.1 (21.03.23)
 
 - Fix media viewer with some system scale settings on Windows.

From f361dd0df278c2ddf3064fbf5c116b3a95ac6482 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Apr 2023 16:50:09 +0400
Subject: [PATCH 086/676] Fix initial device selection in calls.

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

diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index d339f0a58..2e2797648 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit d339f0a58af2c1850452476fb2ed18ec1e9bd7b2
+Subproject commit 2e2797648aac2588e7fe479c2e8b4455ec65c5e6

From 27aa678f6a2a874a5d00162e4942bc5916060eb3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 16:09:52 +0400
Subject: [PATCH 087/676] Version 4.8: Fix build with GCC.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp  | 6 +++++-
 Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index fed0e6069..41b37a17e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -351,7 +351,9 @@ private:
 	void continueSave();
 	void cancelSave();
 
+#if 0 // Enable after design improvements.
 	void toggleBotManager(const QString &command);
+#endif
 
 	void togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
@@ -1395,7 +1397,7 @@ void Controller::fillBotUsernamesButton() {
 			: tr::lng_manage_peer_bot_public_links();
 	}) | rpl::flatten_latest();
 
-	const auto wrap = _controls.buttonsLayout->add(
+	_controls.buttonsLayout->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			_controls.buttonsLayout,
 			object_ptr<Ui::VerticalLayout>(
@@ -1923,6 +1925,7 @@ void Controller::saveHistoryVisibility() {
 		[=] { cancelSave(); });
 }
 
+#if 0 // Enable after design improvements.
 void Controller::toggleBotManager(const QString &command) {
 	const auto controller = _navigation->parentController();
 	_api.request(MTPcontacts_ResolveUsername(
@@ -1938,6 +1941,7 @@ void Controller::toggleBotManager(const QString &command) {
 		}
 	}).send();
 }
+#endif
 
 void Controller::togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 52c228f77..4314f48f2 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -189,7 +189,6 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		}, lifetime());
 	}
 
-	const auto skip = st::normalFont->spacew * 4;
 	const auto titleWrap = _wrap->insert(
 		0,
 		object_ptr<FixedHeightWidget>(

From 454c8db00d85f6c74dfeaea33fc3f24087d9f994 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 21:09:46 +0400
Subject: [PATCH 088/676] Fix crash in empty topics message sending.

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

diff --git a/Telegram/SourceFiles/data/data_forum_topic.cpp b/Telegram/SourceFiles/data/data_forum_topic.cpp
index 5925f303d..7b5391a19 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.cpp
+++ b/Telegram/SourceFiles/data/data_forum_topic.cpp
@@ -767,6 +767,7 @@ void ForumTopic::maybeSetLastMessage(not_null<HistoryItem*> item) {
 	Expects(item->topicRootId() == _rootId);
 
 	if (!_lastMessage
+		|| !(*_lastMessage)
 		|| ((*_lastMessage)->date() < item->date())
 		|| ((*_lastMessage)->date() == item->date()
 			&& (*_lastMessage)->id < item->id)) {

From dffe79fea81b4fde61ba64795fa51878eeeb04bb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 21:20:10 +0400
Subject: [PATCH 089/676] Fix possible crash in nested section show.

---
 Telegram/SourceFiles/info/info_wrap_widget.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 2d53f0316..0c5ba45ed 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -759,9 +759,9 @@ bool WrapWidget::returnToFirstStackFrame(
 void WrapWidget::showNewContent(
 		not_null<ContentMemento*> memento,
 		const Window::SectionShow &params) {
-	auto saveToStack = (_content != nullptr)
+	const auto saveToStack = (_content != nullptr)
 		&& (params.way == Window::SectionShow::Way::Forward);
-	auto needAnimation = (_content != nullptr)
+	const auto needAnimation = (_content != nullptr)
 		&& (params.animated != anim::type::instant);
 	auto animationParams = SectionSlideParams();
 	auto newController = createController(
@@ -771,8 +771,12 @@ void WrapWidget::showNewContent(
 		newController->takeStepData(_controller.get());
 	}
 	auto newContent = object_ptr<ContentWidget>(nullptr);
-	if (needAnimation) {
+	const auto enableBackButton = hasBackButton();
+	const auto createInAdvance = needAnimation || enableBackButton;
+	if (createInAdvance) {
 		newContent = createContent(memento, newController.get());
+	}
+	if (needAnimation) {
 		animationParams.withTopBarShadow = hasTopBarShadow()
 			&& newContent->hasTopBarShadow();
 		animationParams.oldContentCache = grabForShowAnimation(
@@ -783,7 +787,6 @@ void WrapWidget::showNewContent(
 
 		if (HasCustomTopBar(_controller.get())
 			|| HasCustomTopBar(newController.get())) {
-
 			const auto s = QSize(
 				newContent->width(),
 				animationParams.topSkip);
@@ -803,11 +806,10 @@ void WrapWidget::showNewContent(
 		_historyStack.clear();
 	}
 
-	{
-		if (hasBackButton()) {
-			newContent->enableBackButton();
-		}
+	if (enableBackButton) {
+		newContent->enableBackButton();
 	}
+
 	{
 		// Let old controller outlive old content widget.
 		const auto oldController = std::exchange(

From 4201a0193c54071ea7efbc8ba817e813327b0e59 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 21:35:06 +0400
Subject: [PATCH 090/676] Add additional assertion for OOM detection.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 576df55fb..1af0ea39b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -850,6 +850,7 @@ void OverlayWidget::RendererGL::paintUsingRaster(
 	const auto size = rect.size() * _factor;
 	if (raster.width() < size.width() || raster.height() < size.height()) {
 		raster = QImage(size, QImage::Format_ARGB32_Premultiplied);
+		Assert(!raster.isNull());
 		raster.setDevicePixelRatio(_factor);
 		if (!transparent
 			&& (raster.width() > size.width()

From e285b22398f21cc3773bb82d03020774bbf0011c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 22:26:09 +0400
Subject: [PATCH 091/676] Add "Send when online" to the send button context
 menu.

---
 Telegram/SourceFiles/api/api_common.cpp       |  8 ++++++++
 Telegram/SourceFiles/api/api_common.h         |  3 +++
 .../SourceFiles/boxes/create_poll_box.cpp     |  6 +++++-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 10 ++++++++--
 Telegram/SourceFiles/boxes/send_files_box.h   |  1 +
 Telegram/SourceFiles/boxes/share_box.cpp      |  7 ++++++-
 Telegram/SourceFiles/boxes/share_box.h        |  1 +
 .../SourceFiles/boxes/sticker_set_box.cpp     |  3 ++-
 .../chat_helpers/field_autocomplete.cpp       |  3 ++-
 .../chat_helpers/gifs_list_widget.cpp         |  3 ++-
 .../chat_helpers/stickers_list_widget.cpp     |  3 ++-
 .../data/data_scheduled_messages.cpp          |  2 +-
 .../data/data_scheduled_messages.h            |  2 --
 Telegram/SourceFiles/history/history_item.cpp |  2 +-
 .../history/history_item_helpers.cpp          |  4 +---
 .../SourceFiles/history/history_widget.cpp    |  7 ++++++-
 Telegram/SourceFiles/history/history_widget.h |  1 +
 .../history_view_compose_controls.cpp         |  3 ++-
 .../view/history_view_context_menu.cpp        |  4 +---
 .../view/history_view_schedule_box.cpp        |  5 ++---
 .../inline_bots/inline_results_inner.cpp      |  3 ++-
 Telegram/SourceFiles/menu/menu_send.cpp       | 20 +++++++++++++++----
 Telegram/SourceFiles/menu/menu_send.h         |  7 +++++--
 .../SourceFiles/window/window_peer_menu.cpp   |  3 ++-
 24 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_common.cpp b/Telegram/SourceFiles/api/api_common.cpp
index 2fe4fa802..f4afa97f6 100644
--- a/Telegram/SourceFiles/api/api_common.cpp
+++ b/Telegram/SourceFiles/api/api_common.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "api/api_common.h"
 
+#include "base/qt/qt_key_modifiers.h"
 #include "data/data_thread.h"
 
 namespace Api {
@@ -20,4 +21,11 @@ SendAction::SendAction(
 , topicRootId(replyTo) {
 }
 
+SendOptions DefaultSendWhenOnlineOptions() {
+	return {
+		.scheduled = kScheduledUntilOnlineTimestamp,
+		.silent = base::IsCtrlPressed(),
+	};
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_common.h b/Telegram/SourceFiles/api/api_common.h
index 34631c8a8..1bdb97ee5 100644
--- a/Telegram/SourceFiles/api/api_common.h
+++ b/Telegram/SourceFiles/api/api_common.h
@@ -15,6 +15,8 @@ class Thread;
 
 namespace Api {
 
+inline constexpr auto kScheduledUntilOnlineTimestamp = TimeId(0x7FFFFFFE);
+
 struct SendOptions {
 	PeerData *sendAs = nullptr;
 	TimeId scheduled = 0;
@@ -23,6 +25,7 @@ struct SendOptions {
 	bool removeWebPageId = false;
 	bool hideViaBot = false;
 };
+[[nodiscard]] SendOptions DefaultSendWhenOnlineOptions();
 
 enum class SendType {
 	Normal,
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 8c4cd47a5..775e5b7f5 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -1102,6 +1102,9 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 				send),
 			Ui::LayerOption::KeepOther);
 	};
+	const auto sendWhenOnline = [=] {
+		send(Api::DefaultSendWhenOnlineOptions());
+	};
 
 	options->scrollToWidget(
 	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
@@ -1130,7 +1133,8 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		submit.data(),
 		sendMenuType,
 		sendSilent,
-		sendScheduled);
+		sendScheduled,
+		sendWhenOnline);
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
 	return result;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 205d0ba9a..c49ec87ed 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -508,7 +508,8 @@ void SendFilesBox::refreshButtons() {
 			_send,
 			[=] { return _sendMenuType; },
 			[=] { sendSilent(); },
-			[=] { sendScheduled(); });
+			[=] { sendScheduled(); },
+			[=] { sendWhenOnline(); });
 	}
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 	_addFile = addLeftButton(
@@ -584,7 +585,8 @@ void SendFilesBox::addMenuButton() {
 				_menu.get(),
 				_sendMenuType,
 				[=] { sendSilent(); },
-				[=] { sendScheduled(); });
+				[=] { sendScheduled(); },
+				[=] { sendWhenOnline(); });
 		}
 		_menu->popup(QCursor::pos());
 		return true;
@@ -1390,4 +1392,8 @@ void SendFilesBox::sendScheduled() {
 		Ui::LayerOption::KeepOther);
 }
 
+void SendFilesBox::sendWhenOnline() {
+	send(Api::DefaultSendWhenOnlineOptions());
+}
+
 SendFilesBox::~SendFilesBox() = default;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 22510b9f3..8e93673f0 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -179,6 +179,7 @@ private:
 	void send(Api::SendOptions options, bool ctrlShiftEnter = false);
 	void sendSilent();
 	void sendScheduled();
+	void sendWhenOnline();
 	void captionResized();
 	void saveSendWaySettings();
 
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 124f43e36..c46b76354 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -502,7 +502,8 @@ void ShareBox::showMenu(not_null<Ui::RpWidget*> parent) {
 		_menu.get(),
 		sendMenuType(),
 		[=] { submitSilent(); },
-		[=] { submitScheduled(); });
+		[=] { submitScheduled(); },
+		[=] { submitWhenOnline(); });
 	const auto success = (result == SendMenu::FillMenuResult::Success);
 	if (_descriptor.forwardOptions.show || success) {
 		_menu->setForcedVerticalOrigin(Ui::PopupMenu::VerticalOrigin::Bottom);
@@ -599,6 +600,10 @@ void ShareBox::submitScheduled() {
 		Ui::LayerOption::KeepOther);
 }
 
+void ShareBox::submitWhenOnline() {
+	submit(Api::DefaultSendWhenOnlineOptions());
+}
+
 void ShareBox::copyLink() {
 	if (const auto onstack = _descriptor.copyCallback) {
 		onstack();
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index f61669efc..adaa634c4 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -118,6 +118,7 @@ private:
 	void submit(Api::SendOptions options);
 	void submitSilent();
 	void submitScheduled();
+	void submitWhenOnline();
 	void copyLink();
 	bool searchByUsername(bool useCache = false);
 
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index d5b7e717d..0b2748191 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -1023,7 +1023,8 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 			_menu.get(),
 			type,
 			SendMenu::DefaultSilentCallback(sendSelected),
-			SendMenu::DefaultScheduleCallback(this, type, sendSelected));
+			SendMenu::DefaultScheduleCallback(this, type, sendSelected),
+			SendMenu::DefaultWhenOnlineCallback(sendSelected));
 
 		const auto controller = _controller;
 		const auto toggleFavedSticker = [=] {
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 2156fa805..724b34794 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -1283,7 +1283,8 @@ void FieldAutocomplete::Inner::contextMenuEvent(QContextMenuEvent *e) {
 		_menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send));
+		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultWhenOnlineCallback(send));
 
 	if (!_menu->empty()) {
 		_menu->popup(QCursor::pos());
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index fae4dd8f6..668dc0231 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -381,7 +381,8 @@ base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
 		menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send));
+		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultWhenOnlineCallback(send));
 
 	if (const auto item = _mosaic.maybeItemAt(_selected)) {
 		const auto document = item->getDocument()
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index d4d299709..55a356ba5 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -1608,7 +1608,8 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 		menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send));
+		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultWhenOnlineCallback(send));
 
 	const auto window = _controller;
 	const auto toggleFavedSticker = [=] {
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
index b8438d123..547648799 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
@@ -40,7 +40,7 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 }
 
 [[nodiscard]] bool HasScheduledDate(not_null<HistoryItem*> item) {
-	return (item->date() != ScheduledMessages::kScheduledUntilOnlineTimestamp)
+	return (item->date() != Api::kScheduledUntilOnlineTimestamp)
 		&& (item->date() > base::unixtime::now());
 }
 
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.h b/Telegram/SourceFiles/data/data_scheduled_messages.h
index 7d546ad1b..e4abea70a 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.h
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.h
@@ -53,8 +53,6 @@ public:
 	[[nodiscard]] rpl::producer<> updates(not_null<History*> history);
 	[[nodiscard]] Data::MessagesSlice list(not_null<History*> history);
 
-	static constexpr auto kScheduledUntilOnlineTimestamp = TimeId(0x7FFFFFFE);
-
 private:
 	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
 	struct List {
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 8779cd41f..489a06a66 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -50,7 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_message_view.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_bot_app.h"
-#include "data/data_scheduled_messages.h" // kScheduledUntilOnlineTimestamp
+#include "data/data_scheduled_messages.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "data/data_message_reactions.h"
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index cac95deeb..7042cb557 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -18,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum_topic.h"
 #include "data/data_media_types.h"
 #include "data/data_message_reactions.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/history.h"
@@ -230,8 +229,7 @@ QString ItemDateText(not_null<const HistoryItem*> item, bool isUntilOnline) {
 
 bool IsItemScheduledUntilOnline(not_null<const HistoryItem*> item) {
 	return item->isScheduled()
-		&& (item->date() ==
-			Data::ScheduledMessages::kScheduledUntilOnlineTimestamp);
+		&& (item->date() == Api::kScheduledUntilOnlineTimestamp);
 }
 
 ClickHandlerPtr JumpToMessageClickHandler(
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 63fe849e7..12e07fc76 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -305,7 +305,8 @@ HistoryWidget::HistoryWidget(
 		_send.get(),
 		[=] { return sendButtonMenuType(); },
 		[=] { sendSilent(); },
-		[=] { sendScheduled(); });
+		[=] { sendScheduled(); },
+		[=] { sendWhenOnline(); });
 
 	_unblock->addClickHandler([=] { unblockUser(); });
 	_botStart->addClickHandler([=] { sendBotStartCommand(); });
@@ -3934,6 +3935,10 @@ void HistoryWidget::sendScheduled() {
 		Ui::LayerOption::KeepOther);
 }
 
+void HistoryWidget::sendWhenOnline() {
+	send(Api::DefaultSendWhenOnlineOptions());
+}
+
 SendMenu::Type HistoryWidget::sendMenuType() const {
 	return !_peer
 		? SendMenu::Type::Disabled
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 12ff41f8e..46d8287b9 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -379,6 +379,7 @@ private:
 	void sendWithModifiers(Qt::KeyboardModifiers modifiers);
 	void sendSilent();
 	void sendScheduled();
+	void sendWhenOnline();
 	[[nodiscard]] SendMenu::Type sendButtonMenuType() const;
 	void handlePendingHistoryUpdate();
 	void fullInfoUpdated();
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 c37ff8827..03cbc93f8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2075,7 +2075,8 @@ void ComposeControls::initSendButton() {
 		_send.get(),
 		[=] { return sendButtonMenuType(); },
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(_wrap.get(), sendMenuType(), send));
+		SendMenu::DefaultScheduleCallback(_wrap.get(), sendMenuType(), send),
+		SendMenu::DefaultWhenOnlineCallback(send));
 }
 
 void ComposeControls::initSendAsButton(not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 58a0722bb..cc3d8586b 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -52,7 +52,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_file_origin.h"
-#include "data/data_scheduled_messages.h"
 #include "data/data_message_reactions.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "core/file_utilities.h"
@@ -555,9 +554,8 @@ bool AddRescheduleAction(
 			? SendMenu::Type::ScheduledToUser
 			: SendMenu::Type::Scheduled;
 
-		using S = Data::ScheduledMessages;
 		const auto itemDate = firstItem->date();
-		const auto date = (itemDate == S::kScheduledUntilOnlineTimestamp)
+		const auto date = (itemDate == Api::kScheduledUntilOnlineTimestamp)
 			? HistoryView::DefaultScheduleTime()
 			: itemDate + 600;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 39a9a8738..95c7c6270 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_common.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
-#include "data/data_scheduled_messages.h" // kScheduledUntilOnlineTimestamp
 #include "lang/lang_keys.h"
 #include "base/event_filter.h"
 #include "base/qt/qt_key_modifiers.h"
@@ -98,12 +97,12 @@ void ScheduleBox(
 		descriptor.submit.data(),
 		[=] { return SendMenu::Type::SilentOnly; },
 		[=] { save(true, descriptor.collect()); },
+		nullptr,
 		nullptr);
 
 	if (type == SendMenu::Type::ScheduledToUser) {
 		const auto sendUntilOnline = box->addTopButton(*style.topButtonStyle);
-		const auto timestamp
-			= Data::ScheduledMessages::kScheduledUntilOnlineTimestamp;
+		const auto timestamp = Api::kScheduledUntilOnlineTimestamp;
 		FillSendUntilOnlineMenu(
 			sendUntilOnline.data(),
 			[=] { save(false, timestamp); },
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 9085fe619..b0dd9d710 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -344,7 +344,8 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
 		_menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send));
+		SendMenu::DefaultScheduleCallback(this, type, send),
+		SendMenu::DefaultWhenOnlineCallback(send));
 
 	const auto item = _mosaic.itemAt(_selected);
 	if (const auto previewDocument = item->getPreviewDocument()) {
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 370dd8ff9..2d5ca3194 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -47,11 +47,16 @@ Fn<void()> DefaultScheduleCallback(
 	};
 }
 
+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()> schedule,
+		Fn<void()> whenOnline) {
 	if (!silent && !schedule) {
 		return FillMenuResult::None;
 	}
@@ -75,6 +80,12 @@ FillMenuResult FillSendMenu(
 			schedule,
 			&st::menuIconSchedule);
 	}
+	if (whenOnline && now == Type::ScheduledToUser) {
+		menu->addAction(
+			tr::lng_scheduled_send_until_online(tr::now),
+			whenOnline,
+			&st::menuIconWhenOnline);
+	}
 	return FillMenuResult::Success;
 }
 
@@ -82,8 +93,9 @@ void SetupMenuAndShortcuts(
 		not_null<Ui::RpWidget*> button,
 		Fn<Type()> type,
 		Fn<void()> silent,
-		Fn<void()> schedule) {
-	if (!silent && !schedule) {
+		Fn<void()> schedule,
+		Fn<void()> whenOnline) {
+	if (!silent && !schedule && !whenOnline) {
 		return;
 	}
 	const auto menu = std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
@@ -91,7 +103,7 @@ void SetupMenuAndShortcuts(
 		*menu = base::make_unique_q<Ui::PopupMenu>(
 			button,
 			st::popupMenuWithIcons);
-		const auto result = FillSendMenu(*menu, type(), silent, schedule);
+		const auto result = FillSendMenu(*menu, type(), silent, schedule, whenOnline);
 		const auto success = (result == FillMenuResult::Success);
 		if (success) {
 			(*menu)->popup(QCursor::pos());
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index 2e401e768..0676de49e 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -40,18 +40,21 @@ Fn<void()> DefaultScheduleCallback(
 	not_null<Ui::RpWidget*> parent,
 	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()> schedule,
+	Fn<void()> whenOnline);
 
 void SetupMenuAndShortcuts(
 	not_null<Ui::RpWidget*> button,
 	Fn<Type()> type,
 	Fn<void()> silent,
-	Fn<void()> schedule);
+	Fn<void()> schedule,
+	Fn<void()> whenOnline);
 
 void SetupUnreadMentionsMenu(
 	not_null<Ui::RpWidget*> button,
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 1b73d6e65..6b3f84e81 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1885,7 +1885,8 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			state->menu.get(),
 			type,
 			SendMenu::DefaultSilentCallback(submit),
-			SendMenu::DefaultScheduleCallback(state->box, type, submit));
+			SendMenu::DefaultScheduleCallback(state->box, type, submit),
+			SendMenu::DefaultWhenOnlineCallback(submit));
 		const auto success = (result == SendMenu::FillMenuResult::Success);
 		if (showForwardOptions || success) {
 			state->menu->setForcedVerticalOrigin(

From a25005483aab6d2fe78c08427066625a03634e16 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 22:33:51 +0400
Subject: [PATCH 092/676] Fix sending-when-online for already-online user.

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

diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
index 547648799..21e0c48b3 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
@@ -194,7 +194,8 @@ void ScheduledMessages::sendNowSimpleMessage(
 	auto action = Api::SendAction(history);
 	action.replyTo = local->replyToId();
 	const auto replyHeader = NewMessageReplyHeader(action);
-	const auto localFlags = NewMessageFlags(history->peer);
+	const auto localFlags = NewMessageFlags(history->peer)
+		& ~MessageFlag::BeingSent;
 	const auto flags = MTPDmessage::Flag::f_entities
 		| MTPDmessage::Flag::f_from_id
 		| (local->replyToId()

From 67fa4372aad3356ab05483e2afc92a39ca4d257a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 22:38:43 +0400
Subject: [PATCH 093/676] Don't suggest userpic photos to bots.

---
 Telegram/SourceFiles/ui/controls/userpic_button.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index 4aab8ac81..c4439d25e 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -234,6 +234,7 @@ void UserpicButton::requestSuggestAvailability() {
 bool UserpicButton::canSuggestPhoto(not_null<UserData*> user) const {
 	// Server allows suggesting photos only in non-empty chats.
 	return !user->isSelf()
+		&& !user->isBot()
 		&& (user->owner().history(user)->lastServerMessage() != nullptr);
 }
 

From cb1041a289a3c1bf028cd48e31852b33265df0e0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 22 Apr 2023 23:04:47 +0400
Subject: [PATCH 094/676] Fix item view refresh in comments / discussions.

---
 Telegram/SourceFiles/history/view/history_view_list_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 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 639c35ce5..d1d792ddc 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -3763,7 +3763,7 @@ void ListWidget::refreshItem(not_null<const Element*> view) {
 		}();
 		const auto [i, ok] = _views.emplace(
 			item,
-			item->createView(this));
+			item->createView(this, was.get()));
 		const auto now = i->second.get();
 		_items[index] = now;
 

From c1a63164c028c7046baf372b13a1c0c936fa4be8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 18:00:18 +0400
Subject: [PATCH 095/676] Make count-depended button texts in filter links.

---
 Telegram/Resources/langs/lang.strings                   | 6 ++++--
 Telegram/SourceFiles/ui/controls/filter_link_header.cpp | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e80949b7f..bb61f52c1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3627,7 +3627,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_by_link_more" = "Add Chats to Folder";
 "lng_filters_by_link_more_sure" = "Do you want to join chats and add them to the folder {folder}?";
 "lng_filters_by_link_about" = "You can deselect the chats you don't want to join.";
-"lng_filters_by_link_join_button" = "Join Chats";
+"lng_filters_by_link_and_join_button#one" = "Join Chat";
+"lng_filters_by_link_and_join_button#other" = "Join Chats";
 "lng_filters_by_link_join_no" = "Do not join any chats";
 "lng_filters_by_link_already" = "Folder already added";
 "lng_filters_by_link_already_about" = "You have already added the folder {folder} and all its chats.";
@@ -3641,7 +3642,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_by_link_deselect" = "Deselect All";
 "lng_filters_by_link_about_quit" = "You can deselect the chats you don't want to quit.";
 "lng_filters_by_link_remove_button" = "Remove Folder and Keep Chats";
-"lng_filters_by_link_quit_button" = "Remove Folder and Chats";
+"lng_filters_by_link_and_quit_button#one" = "Remove Folder and Chat";
+"lng_filters_by_link_and_quit_button#other" = "Remove Folder and Chats";
 "lng_filters_added_title" = "Folder {folder} Added";
 "lng_filters_added_also#one" = "You also joined {count} chat.";
 "lng_filters_added_also#other" = "You also joined {count} chats.";
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
index 8c60e671c..475d04ca5 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
@@ -372,13 +372,17 @@ object_ptr<RoundButton> FilterLinkProcessButton(
 		case FilterLinkHeaderType::AddingChats:
 			return badge.isEmpty()
 				? tr::lng_filters_by_link_join_no() | with(QString())
-				: tr::lng_filters_by_link_join_button() | with(badge);
+				: tr::lng_filters_by_link_and_join_button(
+					lt_count,
+					rpl::single(float64(count))) | with(badge);
 		case FilterLinkHeaderType::AllAdded:
 			return tr::lng_box_ok() | with(QString());
 		case FilterLinkHeaderType::Removing:
 			return badge.isEmpty()
 				? tr::lng_filters_by_link_remove_button() | with(QString())
-				: tr::lng_filters_by_link_quit_button() | with(badge);
+				: tr::lng_filters_by_link_and_quit_button(
+					lt_count,
+					rpl::single(float64(count))) | with(badge);
 		}
 		Unexpected("Type in FilterLinkProcessButton.");
 	}) | rpl::flatten_latest();

From 8fe2ec63b727fad2d04ac17ae658f200b2e6d7bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 18:00:32 +0400
Subject: [PATCH 096/676] Show t.me/+ invite link prefix in Recent Actions.

---
 .../SourceFiles/history/admin_log/history_admin_log_item.cpp   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index 3379417d5..b70d43d21 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -356,9 +356,6 @@ QString GenerateInviteLinkText(const MTPExportedChatInvite &data) {
 	return label.isEmpty() ? ExtractInviteLink(data).replace(
 		u"https://"_q,
 		QString()
-	).replace(
-		u"t.me/+"_q,
-		QString()
 	).replace(
 		u"t.me/joinchat/"_q,
 		QString()

From 1697e9e79198363bb6f507e6d261a8b1e8f8c055 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 18:21:31 +0400
Subject: [PATCH 097/676] Fix a regression in accounts switching.

---
 .../settings/settings_information.cpp         | 30 +++++++++----------
 .../settings/settings_information.h           |  2 +-
 .../SourceFiles/window/window_main_menu.cpp   |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 204cd73b8..7a001d74d 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -188,7 +188,7 @@ public:
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller);
 
-	[[nodiscard]] rpl::producer<> currentAccountActivations() const;
+	[[nodiscard]] rpl::producer<> closeRequests() const;
 
 private:
 	void setup();
@@ -209,7 +209,7 @@ private:
 	std::unique_ptr<Ui::VerticalLayoutReorder> _reorder;
 	int _reordering = 0;
 
-	rpl::event_stream<> _currentAccountActivations;
+	rpl::event_stream<> _closeRequests;
 
 	base::binary_guard _accountSwitchGuard;
 
@@ -728,8 +728,8 @@ AccountsList::AccountsList(
 	setup();
 }
 
-rpl::producer<> AccountsList::currentAccountActivations() const {
-	return _currentAccountActivations.events();
+rpl::producer<> AccountsList::closeRequests() const {
+	return _closeRequests.events();
 }
 
 void AccountsList::setup() {
@@ -887,25 +887,25 @@ void AccountsList::rebuild() {
 					return;
 				}
 				if (account == &_controller->session().account()) {
-					_currentAccountActivations.fire({});
+					_closeRequests.fire({});
 					return;
 				}
 				const auto newWindow = (modifiers & Qt::ControlModifier);
 				auto activate = [=, guard = _accountSwitchGuard.make_guard()]{
 					if (guard) {
 						_reorder->finishReordering();
+						if (newWindow) {
+							_closeRequests.fire({});
+							Core::App().ensureSeparateWindowForAccount(
+								account);
+						}
+						Core::App().domain().maybeActivate(account);
 					}
-					if (newWindow) {
-						Core::App().ensureSeparateWindowForAccount(
-							account);
-					}
-					Core::App().domain().maybeActivate(account);
 				};
-				if (Core::App().separateWindowForAccount(account)) {
-					_currentAccountActivations.fire({});
-					activate();
+				if (const auto window = Core::App().separateWindowForAccount(account)) {
+					_closeRequests.fire({});
+					window->activate();
 				} else {
-					_currentAccountActivations.fire({});
 					base::call_delayed(
 						st::defaultRippleAnimation.hideDuration,
 						account,
@@ -968,7 +968,7 @@ AccountsEvents SetupAccounts(
 		container,
 		controller);
 	return {
-		.currentAccountActivations = list->currentAccountActivations(),
+		.closeRequests = list->closeRequests(),
 	};
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_information.h b/Telegram/SourceFiles/settings/settings_information.h
index 7ac2a9aaa..fa261df22 100644
--- a/Telegram/SourceFiles/settings/settings_information.h
+++ b/Telegram/SourceFiles/settings/settings_information.h
@@ -33,7 +33,7 @@ private:
 };
 
 struct AccountsEvents {
-	rpl::producer<> currentAccountActivations;
+	rpl::producer<> closeRequests;
 };
 AccountsEvents SetupAccounts(
 	not_null<Ui::VerticalLayout*> container,
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index f85868c40..2feff047b 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -680,7 +680,7 @@ void MainMenu::setupAccounts() {
 	inner->add(object_ptr<Ui::FixedHeightWidget>(inner, st::mainMenuSkip));
 
 	std::move(
-		events.currentAccountActivations
+		events.closeRequests
 	) | rpl::start_with_next([=] {
 		closeLayer();
 	}, inner->lifetime());

From 4eefebc96c0654df0b05bb037e43d78c8013a288 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 18:41:14 +0400
Subject: [PATCH 098/676] Fix possible assertion violation in non-self
 reaction.

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

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index a918aa08c..d13d7a9bf 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -966,13 +966,16 @@ void MessageReactions::add(const ReactionId &id, bool addToRecent) {
 		const auto removed = !--one.count;
 		const auto j = _recent.find(one.id);
 		if (j != end(_recent)) {
-			j->second.erase(
-				ranges::remove(j->second, self, &RecentReaction::peer),
-				end(j->second));
-			if (j->second.empty()) {
+			if (removed) {
+				j->second.clear();
 				_recent.erase(j);
 			} else {
-				Assert(!removed);
+				j->second.erase(
+					ranges::remove(j->second, self, &RecentReaction::peer),
+					end(j->second));
+				if (j->second.empty()) {
+					_recent.erase(j);
+				}
 			}
 		}
 		return removed;

From 480c109b09fc5191ac2e4e8b6a338f0e1a1173cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 18:41:33 +0400
Subject: [PATCH 099/676] Request WhoRead/Reacted only for group leader.

---
 .../history/history_inner_widget.cpp          | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index ca9d06436..153e001eb 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2128,21 +2128,30 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		isUponSelected = hasSelected;
 	}
 
-	const auto hasWhoReactedItem = _dragStateItem
-		&& Api::WhoReactedExists(_dragStateItem, Api::WhoReactedList::All);
+	const auto groupLeaderOrSelf = [](HistoryItem *item) -> HistoryItem* {
+		if (!item) {
+			return nullptr;
+		} else if (const auto group = item->history()->owner().groups().find(item)) {
+			return group->items.front();
+		}
+		return item;
+	};
+	const auto whoReactedItem = groupLeaderOrSelf(_dragStateItem);
+	const auto hasWhoReactedItem = whoReactedItem
+		&& Api::WhoReactedExists(whoReactedItem, Api::WhoReactedList::All);
 	const auto clickedReaction = link
 		? link->property(
 			kReactionsCountEmojiProperty).value<Data::ReactionId>()
 		: Data::ReactionId();
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
-		&& _dragStateItem
-		&& Api::WhoReactedExists(_dragStateItem, Api::WhoReactedList::One)) {
+		&& whoReactedItem
+		&& Api::WhoReactedExists(whoReactedItem, Api::WhoReactedList::One)) {
 		HistoryView::ShowWhoReactedMenu(
 			&_menu,
 			e->globalPos(),
 			this,
-			_dragStateItem,
+			whoReactedItem,
 			clickedReaction,
 			_controller,
 			_whoReactedMenuLifetime);
@@ -2152,14 +2161,6 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
 	const auto session = &this->session();
 	const auto controller = _controller;
-	const auto groupLeaderOrSelf = [](HistoryItem *item) -> HistoryItem* {
-		if (!item) {
-			return nullptr;
-		} else if (const auto group = item->history()->owner().groups().find(item)) {
-			return group->items.front();
-		}
-		return item;
-	};
 	const auto addItemActions = [&](
 			HistoryItem *item,
 			HistoryItem *albumPartItem) {
@@ -2630,7 +2631,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		HistoryView::AddWhoReactedAction(
 			_menu,
 			this,
-			_dragStateItem,
+			whoReactedItem,
 			_controller);
 	}
 

From 33e66d21bdb1d7393c405e1cc2b16ed1575301c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 18:44:52 +0400
Subject: [PATCH 100/676] Force dst path creation on Save Selected.

---
 Telegram/SourceFiles/menu/menu_item_download_files.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/menu/menu_item_download_files.cpp b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
index ea37cae96..032471a96 100644
--- a/Telegram/SourceFiles/menu/menu_item_download_files.cpp
+++ b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
@@ -97,6 +97,7 @@ void AddAction(
 			return;
 		}
 
+		QDir().mkpath(path);
 		const auto fullPath = [&](int i) {
 			return filedialogDefaultName(
 				u"photo_"_q + QString::number(i),

From b569078e9623ca196065c47fe1dac8c8fe8efe2d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 18:51:47 +0400
Subject: [PATCH 101/676] Make dimming intensity part of the cache key.

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

diff --git a/Telegram/SourceFiles/data/data_wall_paper.cpp b/Telegram/SourceFiles/data/data_wall_paper.cpp
index d1babb244..f8532a158 100644
--- a/Telegram/SourceFiles/data/data_wall_paper.cpp
+++ b/Telegram/SourceFiles/data/data_wall_paper.cpp
@@ -298,7 +298,10 @@ QString WallPaper::key() const {
 			? QString::number(_id)
 			: StringFromColors(backgroundColors()))
 		: ("bg/" + _slug);
-	const auto params = collectShareParams();
+	auto params = collectShareParams();
+	if (_document && !isPattern()) {
+		params += u"&intensity="_q + QString::number(_intensity);
+	}
 	return params.isEmpty() ? base : (base + '?' + params.join('&'));
 }
 

From 95174a5f3686603756d17f5136a18ebc334c312a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 19:23:16 +0400
Subject: [PATCH 102/676] Quick reply only by left mouse button.

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

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 153e001eb..c1e0d510a 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2042,7 +2042,8 @@ void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
 		&& (_mouseCursorState == CursorState::None
 			|| _mouseCursorState == CursorState::Date)
 		&& !inSelectionMode()
-		&& !_emptyPainter) {
+		&& !_emptyPainter
+		&& e->button() == Qt::LeftButton) {
 		if (const auto view = Element::Moused()) {
 			mouseActionCancel();
 			switch (HistoryView::CurrentQuickAction()) {

From 3a8237f03a25681fb1137d7686bb74801ec2323b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 19:23:41 +0400
Subject: [PATCH 103/676] Fix staying _replaceMedia button after media edit.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 12e07fc76..cd07b0767 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2131,6 +2131,7 @@ void HistoryWidget::showHistory(
 	_saveEditMsgRequestId = 0;
 	_processingReplyItem = _replyEditMsg = nullptr;
 	_processingReplyId = _editMsgId = _replyToId = 0;
+	_canReplaceMedia = false;
 	_photoEditMedia = nullptr;
 	updateReplaceMediaButton();
 	_previewData = nullptr;
@@ -2466,6 +2467,9 @@ void HistoryWidget::registerDraftSource() {
 void HistoryWidget::setEditMsgId(MsgId msgId) {
 	unregisterDraftSources();
 	_editMsgId = msgId;
+	if (!msgId) {
+		_canReplaceMedia = false;
+	}
 	if (_history) {
 		refreshSendAsToggle();
 		orderWidgets();

From 58f735e19beb71974e5a7c1d449fbcd4ef6833ce Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 19:24:03 +0400
Subject: [PATCH 104/676] Allow replace media by paste in replies/scheduled.

---
 .../history_view_compose_controls.cpp         | 50 +++++++++++--------
 .../controls/history_view_compose_controls.h  |  7 +--
 .../view/history_view_replies_section.cpp     |  4 +-
 .../view/history_view_scheduled_section.cpp   |  4 +-
 4 files changed, 40 insertions(+), 25 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 03cbc93f8..402caddbd 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1157,6 +1157,22 @@ void ComposeControls::setMimeDataHook(MimeDataHook hook) {
 	_field->setMimeDataHook(std::move(hook));
 }
 
+bool ComposeControls::confirmMediaEdit(Ui::PreparedList &list) {
+	if (!isEditingMessage()) {
+		return false;
+	} else if (_canReplaceMedia) {
+		EditCaptionBox::StartMediaReplace(
+			_window,
+			_editingId,
+			std::move(list),
+			_field->getTextWithTags(),
+			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
+	} else {
+		_window->showToast({ tr::lng_edit_caption_attach(tr::now) });
+	}
+	return true;
+}
+
 rpl::producer<FileChosen> ComposeControls::fileChosen() const {
 	return _fileChosen.events();
 }
@@ -1431,23 +1447,17 @@ void ComposeControls::init() {
 		_voiceRecordBar->requestToSendWithOptions(options);
 	}, _wrap->lifetime());
 
-	{
-		const auto lastMsgId = _wrap->lifetime().make_state<FullMsgId>();
+	_header->editMsgId(
+	) | rpl::start_with_next([=](const auto &id) {
+		_editingId = id;
+	}, _wrap->lifetime());
 
-		_header->editMsgId(
-		) | rpl::filter([=](const auto &id) {
-			return !!id;
-		}) | rpl::start_with_next([=](const auto &id) {
-			*lastMsgId = id;
-		}, _wrap->lifetime());
-
-		session().data().itemRemoved(
-		) | rpl::filter([=](not_null<const HistoryItem*> item) {
-			return item->id && ((*lastMsgId) == item->fullId());
-		}) | rpl::start_with_next([=] {
-			cancelEditMessage();
-		}, _wrap->lifetime());
-	}
+	session().data().itemRemoved(
+	) | rpl::filter([=](not_null<const HistoryItem*> item) {
+		return (_editingId == item->fullId());
+	}) | rpl::start_with_next([=] {
+		cancelEditMessage();
+	}, _wrap->lifetime());
 
 	_window->materializeLocalDraftsRequests(
 	) | rpl::start_with_next([=] {
@@ -1921,7 +1931,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	InvokeQueued(_autocomplete.get(), [=] { updateStickersByEmoji(); });
 	const auto guard = gsl::finally([&] {
 		updateSendButtonType();
-		updateReplaceMediaButton(editingId);
+		updateReplaceMediaButton();
 		updateControlsVisibility();
 		updateControlsGeometry(_wrap->size());
 	});
@@ -2588,7 +2598,7 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 	if (_photoEditMedia) {
 		_photoEditMedia->wanted(Data::PhotoSize::Large, item->fullId());
 	}
-	if (updateReplaceMediaButton(item->fullId())) {
+	if (updateReplaceMediaButton()) {
 		updateControlsVisibility();
 		updateControlsGeometry(_wrap->size());
 	}
@@ -2598,7 +2608,7 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 	}
 }
 
-bool ComposeControls::updateReplaceMediaButton(FullMsgId id) {
+bool ComposeControls::updateReplaceMediaButton() {
 	if (!_canReplaceMedia) {
 		const auto result = (_replaceMedia != nullptr);
 		_replaceMedia = nullptr;
@@ -2612,7 +2622,7 @@ bool ComposeControls::updateReplaceMediaButton(FullMsgId id) {
 	_replaceMedia->setClickedCallback([=] {
 		EditCaptionBox::StartMediaReplace(
 			_window,
-			id,
+			_editingId,
 			_field->getTextWithTags(),
 			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
 	});
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 54596dd98..20be24131 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -55,6 +55,7 @@ class EmojiButton;
 class SendAsButton;
 class SilentToggle;
 class DropdownMenu;
+struct PreparedList;
 } // namespace Ui
 
 namespace Main {
@@ -143,6 +144,7 @@ public:
 		not_null<const QMimeData*> data,
 		Ui::InputField::MimeAction action)>;
 	void setMimeDataHook(MimeDataHook hook);
+	bool confirmMediaEdit(Ui::PreparedList &list);
 
 	bool pushTabbedSelectorToThirdSection(
 		not_null<Data::Thread*> thread,
@@ -228,7 +230,7 @@ private:
 	void updateWrappingVisibility();
 	void updateControlsVisibility();
 	void updateControlsGeometry(QSize size);
-	bool updateReplaceMediaButton(FullMsgId id);
+	bool updateReplaceMediaButton();
 	void updateOuterGeometry(QRect rect);
 	void paintBackground(QRect clip);
 
@@ -236,8 +238,6 @@ private:
 	[[nodiscard]] SendMenu::Type sendMenuType() const;
 	[[nodiscard]] SendMenu::Type sendButtonMenuType() const;
 
-	void sendSilent();
-	void sendScheduled();
 	[[nodiscard]] auto sendContentRequests(
 		SendRequestType requestType = SendRequestType::Text) const;
 
@@ -358,6 +358,7 @@ private:
 	bool _isInlineBot = false;
 	bool _botCommandShown = false;
 
+	FullMsgId _editingId;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index cf9db15b4..ea7d8b491 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -937,7 +937,9 @@ bool RepliesWidget::confirmSendingFiles(
 bool RepliesWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel) {
-	if (showSendingFilesError(list)) {
+	if (_composeControls->confirmMediaEdit(list)) {
+		return true;
+	} else if (showSendingFilesError(list)) {
 		return false;
 	}
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index bc8930e41..293e5798b 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -402,7 +402,9 @@ bool ScheduledWidget::confirmSendingFiles(
 bool ScheduledWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel) {
-	if (showSendingFilesError(list)) {
+	if (_composeControls->confirmMediaEdit(list)) {
+		return true;
+	} else if (showSendingFilesError(list)) {
 		return false;
 	}
 

From 3394094dd34a2ddd794d1bc27050f826913fe083 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 20:08:53 +0400
Subject: [PATCH 105/676] Close archive / forum on repeated click on current
 filter.

---
 Telegram/SourceFiles/window/window_session_controller.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 489e69635..add465f59 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1948,11 +1948,12 @@ FilterId SessionController::activeChatsFilterCurrent() const {
 void SessionController::setActiveChatsFilter(
 		FilterId id,
 		const SectionShow &params) {
-	if (activeChatsFilterCurrent() != id) {
+	const auto changed = (activeChatsFilterCurrent() != id);
+	if (changed) {
 		resetFakeUnreadWhileOpened();
 	}
 	_activeChatsFilter.force_assign(id);
-	if (id) {
+	if (id || !changed) {
 		closeForum();
 		closeFolder();
 	}

From 9c7fee0bfe196b37726635c8e401e4826142ab0b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 20:32:00 +0400
Subject: [PATCH 106/676] Add .m4v as a video file format.

---
 Telegram/SourceFiles/core/file_utilities.cpp      | 2 +-
 Telegram/SourceFiles/storage/localimageloader.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 68ccc8768..6e3003893 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -334,7 +334,7 @@ QString ImagesOrAllFilter() {
 }
 
 QString PhotoVideoFilesFilter() {
-	return u"Image and Video Files (*.png *.jpg *.jpeg *.mp4 *.mov);;"_q
+	return u"Image and Video Files (*.png *.jpg *.jpeg *.mp4 *.mov *.m4v);;"_q
 		+ AllFilesFilter();
 }
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index c9ff2e5d7..3f39944fa 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -682,6 +682,7 @@ bool FileLoadTask::CheckForVideo(
 	static const auto extensions = {
 		u".mp4"_q,
 		u".mov"_q,
+		u".m4v"_q,
 		u".webm"_q,
 	};
 	if (!CheckMimeOrExtensions(filepath, result->filemime, mimes, extensions)) {

From 2dea8941a534bdea2b2b2c13723615ec14596842 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 23 Apr 2023 20:40:59 +0400
Subject: [PATCH 107/676] Return focus to input field on ListWidget selection
 clear.

---
 .../SourceFiles/history/view/history_view_replies_section.cpp  | 3 +++
 .../history/view/history_view_scheduled_section.cpp            | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index ea7d8b491..0056d6a29 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -2439,6 +2439,9 @@ void RepliesWidget::listSelectionChanged(SelectedItems &&items) {
 		}
 	}
 	_topBar->showSelected(state);
+	if (items.empty()) {
+		doSetInnerFocus();
+	}
 }
 
 void RepliesWidget::listMarkReadTill(not_null<HistoryItem*> item) {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 293e5798b..ce01b68c2 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1174,6 +1174,9 @@ void ScheduledWidget::listSelectionChanged(SelectedItems &&items) {
 		}
 	}
 	_topBar->showSelected(state);
+	if (items.empty()) {
+		doSetInnerFocus();
+	}
 }
 
 void ScheduledWidget::listMarkReadTill(not_null<HistoryItem*> item) {

From 4cfa486d9189e6718e3ac815f62ac172dddbd631 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 14:56:10 +0400
Subject: [PATCH 108/676] Support colorized emoji in reactions fly animation.

---
 .../history/view/reactions/history_view_reactions.cpp        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
index ef4679764..9160e2703 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
@@ -324,6 +324,7 @@ void InlineList::paint(
 		const QRect &clip) const {
 	struct SingleAnimation {
 		not_null<Ui::ReactionFlyAnimation*> animation;
+		QColor textColor;
 		QRect target;
 	};
 	std::vector<SingleAnimation> animations;
@@ -396,6 +397,7 @@ void InlineList::paint(
 				button.id,
 				::Data::Reactions::ImageSize::InlineList);
 		}
+
 		const auto textFg = !inbubble
 			? (chosen
 				? QPen(AdaptChosenServiceFg(st->msgServiceBg()->c))
@@ -427,6 +429,7 @@ void InlineList::paint(
 		if (animating) {
 			animations.push_back({
 				.animation = button.animation.get(),
+				.textColor = textFg.color(),
 				.target = image,
 			});
 		}
@@ -465,7 +468,7 @@ void InlineList::paint(
 					p,
 					QPoint(),
 					single.target,
-					QColor(255, 255, 255, 0), // Colored, for emoji status.
+					single.textColor,
 					QRect(), // Clip, for emoji status.
 					now);
 				result = result.isEmpty() ? area : result.united(area);

From faf6352a114f6f5ab0461d4e9fd2227f2ef8da94 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 20:59:19 +0400
Subject: [PATCH 109/676] Support colorized emoji in reactions inline dropdown.

---
 .../boxes/reactions_settings_box.cpp          |  3 +-
 .../data/data_message_reactions.cpp           |  4 ++-
 .../history_view_reactions_strip.cpp          | 31 ++++++++++++++++---
 .../reactions/history_view_reactions_strip.h  |  3 ++
 .../ui/effects/reaction_fly_animation.cpp     |  6 ++--
 Telegram/lib_ui                               |  2 +-
 6 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
index e58a1de8e..baf0f157e 100644
--- a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
@@ -384,7 +384,7 @@ void AddReactionAnimatedIcon(
 
 	const auto paintCallback = [=](not_null<QWidget*> widget, QPainter &p) {
 		const auto paintFrame = [&](not_null<Ui::AnimatedIcon*> animation) {
-			const auto frame = animation->frame();
+			const auto frame = animation->frame(st::windowFg->c);
 			p.drawImage(
 				QRect(
 					(widget->width() - iconSize) / 2,
@@ -404,7 +404,6 @@ void AddReactionAnimatedIcon(
 		} else if (const auto select = state->select.icon.get()) {
 			paintFrame(select);
 		}
-
 	};
 	const auto widget = AddReactionIconWrap(
 		parent,
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index d13d7a9bf..a0834888d 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -399,7 +399,8 @@ QImage Reactions::resolveImageFor(
 		const auto frameSize = set.fromSelectAnimation
 			? (size / 2)
 			: size;
-		image = set.icon->frame().scaled(
+		// Must not be colored to text.
+		image = set.icon->frame(QColor()).scaled(
 			frameSize * factor,
 			frameSize * factor,
 			Qt::IgnoreAspectRatio,
@@ -480,6 +481,7 @@ void Reactions::setAnimatedIcon(ImageSet &set) {
 	set.icon = Ui::MakeAnimatedIcon({
 		.generator = DocumentIconFrameGenerator(set.media),
 		.sizeOverride = QSize(size, size),
+		.colorized = set.media->owner()->emojiUsesTextColor(),
 	});
 	set.media = nullptr;
 }
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 865f9293c..25d7fa4dd 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
@@ -37,6 +37,7 @@ constexpr auto kHoverScale = 1.24;
 	return std::make_shared<Ui::AnimatedIcon>(Ui::AnimatedIconDescriptor{
 		.generator = DocumentIconFrameGenerator(media),
 		.sizeOverride = QSize(size, size),
+		.colorized = media->owner()->emojiUsesTextColor(),
 	});
 }
 
@@ -51,6 +52,21 @@ Strip::Strip(
 , _inner(inner)
 , _finalSize(size)
 , _update(std::move(update)) {
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		invalidateMainReactionImage();
+	}, _lifetime);
+}
+
+void Strip::invalidateMainReactionImage() {
+	if (_mainReactionImage.isNull()
+		&& !ranges::contains(_validEmoji, true)) {
+		return;
+	}
+	const auto was = base::take(_mainReactionMedia);
+	_mainReactionImage = QImage();
+	ranges::fill(_validEmoji, false);
+	resolveMainReactionIcon();
 }
 
 void Strip::applyList(
@@ -157,7 +173,11 @@ void Strip::paintOne(
 	} else {
 		const auto paintFrame = [&](not_null<Ui::AnimatedIcon*> animation) {
 			const auto size = int(std::floor(target.width() + 0.01));
-			const auto frame = animation->frame({ size, size }, _update);
+			const auto &textColor = st::windowFg->c;
+			const auto frame = animation->frame(
+				textColor,
+				{ size, size },
+				_update);
 			p.drawImage(target, frame.image);
 		};
 
@@ -218,9 +238,9 @@ int Strip::fillChosenIconGetIndex(ChosenReaction &chosen) const {
 	}
 	const auto &icon = *i;
 	if (const auto &appear = icon.appear; appear && appear->animating()) {
-		chosen.icon = appear->frame();
+		chosen.icon = appear->frame(st::windowFg->c);
 	} else if (const auto &select = icon.select; select && select->valid()) {
-		chosen.icon = select->frame();
+		chosen.icon = select->frame(st::windowFg->c);
 	}
 	return (i - begin(_icons));
 }
@@ -475,7 +495,7 @@ void Strip::setMainReactionIcon() {
 	if (i != end(_loadCache) && i->second.icon) {
 		const auto &icon = i->second.icon;
 		if (!icon->frameIndex() && icon->width() == MainReactionSize()) {
-			_mainReactionImage = i->second.icon->frame();
+			_mainReactionImage = i->second.icon->frame(st::windowFg->c);
 			return;
 		}
 	}
@@ -522,7 +542,8 @@ Ui::ImageSubrect Strip::validateEmoji(int frameIndex, float64 scale) {
 	p.fillRect(QRect(position, result.rect.size() / ratio), Qt::transparent);
 	if (_mainReactionImage.isNull()
 		&& _mainReactionIcon) {
-		_mainReactionImage = base::take(_mainReactionIcon)->frame();
+		_mainReactionImage = base::take(_mainReactionIcon)->frame(
+			st::windowFg->c);
 	}
 	if (!_mainReactionImage.isNull()) {
 		const auto target = QRect(
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 56726ae88..9447b0d77 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h
@@ -117,6 +117,7 @@ private:
 	[[nodiscard]] Fn<QRectF(const ReactionIcons&)> resolveCountTargetMethod(
 		float64 scale) const;
 
+	void invalidateMainReactionImage();
 	void resolveMainReactionIcon();
 	void setMainReactionIcon();
 
@@ -141,6 +142,8 @@ private:
 	QImage _emojiParts;
 	std::array<bool, kFramesCount> _validEmoji = { { false } };
 
+	rpl::lifetime _lifetime;
+
 };
 
 class CachedIconFactory final {
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
index 5d8c6b0a6..44c7686c6 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
@@ -106,6 +106,7 @@ ReactionFlyAnimation::ReactionFlyAnimation(
 		icon = MakeAnimatedIcon({
 			.generator = DocumentIconFrameGenerator(media),
 			.sizeOverride = QSize(size, size),
+			.colorized = media->owner()->emojiUsesTextColor(),
 		});
 		return true;
 	};
@@ -146,7 +147,8 @@ QRect ReactionFlyAnimation::paintGetArea(
 		if (clip.isEmpty() || area.intersects(clip)) {
 			paintCenterFrame(p, target, colored, now);
 			if (const auto effect = _effect.get()) {
-				p.drawImage(wide, effect->frame());
+				// Must not be colored to text.
+				p.drawImage(wide, effect->frame(QColor()));
 			}
 			paintMiniCopies(p, target.center(), colored, now);
 		}
@@ -199,7 +201,7 @@ void ReactionFlyAnimation::paintCenterFrame(
 			target.y() + (target.height() - size.height()) / 2,
 			size.width(),
 			size.height());
-		p.drawImage(rect, _center->frame());
+		p.drawImage(rect, _center->frame(st::windowFg->c));
 	} else {
 		const auto scaled = (size.width() != _customSize);
 		_custom->paint(p, {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 56945859e..efb7dc927 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 56945859e3e7166ec26abf62b0bca0209ad5b498
+Subproject commit efb7dc927a259bbf2ee35ab7e2d302a1c7c2e803

From b6fbdd25a017f6c331cc541ac7c49fc6e57b56a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 21:12:52 +0400
Subject: [PATCH 110/676] Show video radial above the spoiler.

---
 .../history/view/media/history_view_gif.cpp            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index a4e8a372d..a395f8f09 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -536,6 +536,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	if (radial
 		|| (!streamingMode
 			&& ((!loaded && !_data->loading()) || !autoplay))) {
+		const auto radialRevealed = 1.;
 		const auto opacity = (item->isSending() || _data->uploading())
 			? 1.
 			: streamedForWaiting
@@ -543,7 +544,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 			: (radial && loaded)
 			? _animation->radial.opacity()
 			: 1.;
-		const auto radialOpacity = opacity * revealed;
+		const auto radialOpacity = opacity * radialRevealed;
 		const auto innerSize = st::msgFileLayout.thumbSize;
 		auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
 		p.setPen(Qt::NoPen);
@@ -581,7 +582,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 		if (icon) {
 			icon->paintInCenter(p, inner);
 		}
-		p.setOpacity(revealed);
+		p.setOpacity(radialRevealed);
 		if (radial) {
 			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
 			if (streamedForWaiting && !_data->uploading()) {
@@ -1295,6 +1296,7 @@ void Gif::drawGrouped(
 	if (radial
 		|| (!streamingMode
 			&& ((!loaded && !_data->loading()) || !autoplay))) {
+		const auto radialRevealed = 1.;
 		const auto opacity = (item->isSending() || _data->uploading())
 			? 1.
 			: streamedForWaiting
@@ -1302,7 +1304,7 @@ void Gif::drawGrouped(
 			: (radial && loaded)
 			? _animation->radial.opacity()
 			: 1.;
-		const auto radialOpacity = opacity * revealed;
+		const auto radialOpacity = opacity * radialRevealed;
 		const auto radialSize = st::historyGroupRadialSize;
 		const auto inner = QRect(
 			geometry.x() + (geometry.width() - radialSize) / 2,
@@ -1353,7 +1355,7 @@ void Gif::drawGrouped(
 				icon->paintInCenter(p, inner);
 			}
 		}
-		p.setOpacity(revealed);
+		p.setOpacity(radialRevealed);
 		if (radial) {
 			const auto line = st::historyGroupRadialLine;
 			const auto rinner = inner.marginsRemoved({ line, line, line, line });

From 0b6098596656bfca6bf2a60b14fe223dddc47c89 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 21:15:40 +0400
Subject: [PATCH 111/676] Clear search field on archive opening.

---
 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 9f4522e47..a33208ce6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -870,6 +870,7 @@ void Widget::changeOpenedFolder(Data::Folder *folder, anim::type animated) {
 		return;
 	}
 	changeOpenedSubsection([&] {
+		cancelSearch();
 		closeChildList(anim::type::instant);
 		controller()->closeForum();
 		_openedFolder = folder;

From d938d913662dfca63a5a89f12a2b12fabd3f2577 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 21:25:27 +0400
Subject: [PATCH 112/676] Drop all formatting by default in InputField.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index efb7dc927..37531086e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit efb7dc927a259bbf2ee35ab7e2d302a1c7c2e803
+Subproject commit 37531086ec21a8569deddedb11b402f8a3157b90

From f0acc9526e26ee9963a933049975e0cab5333663 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 21:32:44 +0400
Subject: [PATCH 113/676] Fix compose controls focus checks.

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

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 402caddbd..1da520824 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1069,7 +1069,7 @@ const HistoryItemsList &ComposeControls::forwardItems() const {
 }
 
 bool ComposeControls::focus() {
-	if (isRecording()) {
+	if (_wrap->isHidden() || _field->isHidden() || isRecording()) {
 		return false;
 	}
 	_field->setFocus();

From 5ad4719c08b8e8eacfa55121f95a76f57e19de98 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 21:39:21 +0400
Subject: [PATCH 114/676] Correctly handle shareable->non-shareable conversion.

---
 .../SourceFiles/boxes/filters/edit_filter_box.cpp  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 6e88d3757..9e0e67514 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -556,11 +556,12 @@ void EditFilterBox(
 	state->hasLinks = state->links.value() | rpl::map([=](const auto &v) {
 		return !v.empty();
 	});
-	if (!state->chatlist.current()) {
-		state->chatlist = state->hasLinks.value() | rpl::filter(
-			_1
-		) | rpl::take(1);
-	}
+	state->hasLinks.value() | rpl::filter(
+		_1
+	) | rpl::start_with_next([=] {
+		state->chatlist = true;
+	}, box->lifetime());
+
 	const auto data = &state->rules;
 
 	owner->chatsFilters().isChatlistChanged(
@@ -574,6 +575,9 @@ void EditFilterBox(
 			return;
 		}
 		*data = data->current().withChatlist(i->chatlist(), i->hasMyLinks());
+		if (!i->chatlist() && !state->hasLinks.current()) {
+			state->chatlist = false;
+		}
 	}, box->lifetime());
 
 	box->setWidth(st::boxWideWidth);

From 2d50e893b5a9cad3351e9470d0936434dc751ec1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 21:48:24 +0400
Subject: [PATCH 115/676] Update lib_base with wl_display_roundtrip.

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 906963244..fd9adb30e 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 9069632441d7f54b826424bbf09303fe31cc5233
+Subproject commit fd9adb30ee906ea02c125eaa58fcfae773fdc677

From 40deda1e9bb2a968c3a1d5c5405597338368c3fe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 22:31:38 +0400
Subject: [PATCH 116/676] Divide groupId of scheduled / normal messages.

---
 Telegram/SourceFiles/data/data_groups.h       |  1 -
 Telegram/SourceFiles/data/data_types.h        | 10 +++++++---
 Telegram/SourceFiles/history/history_item.cpp | 10 ++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_groups.h b/Telegram/SourceFiles/data/data_groups.h
index b58c1a551..f8cf259ae 100644
--- a/Telegram/SourceFiles/data/data_groups.h
+++ b/Telegram/SourceFiles/data/data_groups.h
@@ -41,7 +41,6 @@ private:
 
 	not_null<Session*> _data;
 	std::map<MessageGroupId, Group> _groups;
-	std::map<MessageGroupId, MessageGroupId> _alias;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index aa3ade241..e07df91e3 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -63,13 +63,17 @@ struct FileOrigin;
 } // namespace Data
 
 struct MessageGroupId {
-	PeerId peer = 0;
+	uint64 peerAndScheduledFlag = 0;
 	uint64 value = 0;
 
 	MessageGroupId() = default;
-	static MessageGroupId FromRaw(PeerId peer, uint64 value) {
+	static MessageGroupId FromRaw(
+			PeerId peer,
+			uint64 value,
+			bool scheduled) {
 		auto result = MessageGroupId();
-		result.peer = peer;
+		result.peerAndScheduledFlag = peer.value
+			| (scheduled ? (1ULL << 55) : 0);
 		result.value = value;
 		return result;
 	}
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 489a06a66..c72d2454f 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -317,7 +317,10 @@ HistoryItem::HistoryItem(
 		setText(_media ? textWithEntities : EnsureNonEmpty(textWithEntities));
 		if (const auto groupedId = data.vgrouped_id()) {
 			setGroupId(
-				MessageGroupId::FromRaw(history->peer->id, groupedId->v));
+				MessageGroupId::FromRaw(
+					history->peer->id,
+					groupedId->v,
+					_flags & MessageFlag::IsOrWasScheduled));
 		}
 		setReactions(data.vreactions());
 		applyTTL(data);
@@ -507,7 +510,10 @@ HistoryItem::HistoryItem(
 	setMedia(media);
 	setText(textWithEntities);
 	if (groupedId) {
-		setGroupId(MessageGroupId::FromRaw(history->peer->id, groupedId));
+		setGroupId(MessageGroupId::FromRaw(
+			history->peer->id,
+			groupedId,
+			flags & MessageFlag::IsOrWasScheduled));
 	}
 }
 

From 81f40586a3bd1a4b72d120b79b469de8524805b0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 22:47:31 +0400
Subject: [PATCH 117/676] Don't re-apply exactly the same custom chat
 wallpaper.

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

diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 3573a261e..2c3167e13 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -590,6 +590,12 @@ void BackgroundPreviewBox::uploadForPeer() {
 void BackgroundPreviewBox::setExistingForPeer(const Data::WallPaper &paper) {
 	Expects(_forPeer != nullptr);
 
+	if (const auto already = _forPeer->wallPaper()) {
+		if (already->equals(paper)) {
+			_controller->finishChatThemeEdit(_forPeer);
+			return;
+		}
+	}
 	const auto api = &_controller->session().api();
 	using Flag = MTPmessages_SetChatWallPaper::Flag;
 	api->request(MTPmessages_SetChatWallPaper(

From ad238108bdc83e990045de8a77e0beaa00931e7a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 22:50:36 +0400
Subject: [PATCH 118/676] Fix background dimming slider initial visibility.

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

diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 2c3167e13..6f0ac7db2 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -343,7 +343,7 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 			_dimmingWrap->move(0, top);
 		}, _dimmingWrap->lifetime());
 
-		_dimmingWrap->toggle(!dark, anim::type::instant);
+		_dimmingWrap->toggle(dark, anim::type::instant);
 		_dimmingHeight = _dimmingWrap->heightValue();
 		_dimmingHeight.changes() | rpl::start_with_next([=] {
 			update();

From 3da787791f6d227f69b32bf4003bc6071d05e2ac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 22:52:26 +0400
Subject: [PATCH 119/676] Version 4.8.1.

- Fix sending an album of ten scheduled messages.
- Convert folder back to non-shareable on last link deletion.
- Several fixes of focus control in discussions / channel comments.
- Drop all formatting on paste in non-message input fields.
- Clear search field on archive opening.
- Show video upload / download progress over the spoiler.
- Better support for text-colored emoji in reactions.
- Close archive / topics group when clicking on currently active folder.
- Allow replace media by paste in discussions / comments / scheduled messages.
- Fix stuck Replace Media button after editing media in some chats.
- Quick reply by double click only with the left mouse button.
- Fix applying the same custom chat background with different dimming value.
- Fix "who reacted" list display for media album parts.
- Show full t.me/+ invite link prefix in Recent Actions.
- Don't try to suggest userpic photos to bots.
- Add "Send when online" to the send button context menu.
- Fix crash in empty topics message sending.
---
 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                                | 22 +++++++++++++++++++-
 6 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 1e5b0ee85..8bd060316 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.8.0.0" />
+    Version="4.8.1.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 590eb4294..1c61220e5 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,8,0,0
- PRODUCTVERSION 4,8,0,0
+ FILEVERSION 4,8,1,0
+ PRODUCTVERSION 4,8,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.0.0"
+            VALUE "FileVersion", "4.8.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.0.0"
+            VALUE "ProductVersion", "4.8.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index d0bf19f77..e8302a2cb 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,8,0,0
- PRODUCTVERSION 4,8,0,0
+ FILEVERSION 4,8,1,0
+ PRODUCTVERSION 4,8,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.0.0"
+            VALUE "FileVersion", "4.8.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.0.0"
+            VALUE "ProductVersion", "4.8.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 53120761e..b96e0183e 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 = 4008000;
-constexpr auto AppVersionStr = "4.8";
+constexpr auto AppVersion = 4008001;
+constexpr auto AppVersionStr = "4.8.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 312a36746..d5aaf3055 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008000
+AppVersion         4008001
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8
-AppVersionStr      4.8.0
+AppVersionStrSmall 4.8.1
+AppVersionStr      4.8.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8
+AppVersionOriginal 4.8.1
diff --git a/changelog.txt b/changelog.txt
index 538319e39..dc4a30397 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,23 @@
+4.8.1 (24.04.23)
+
+- Fix sending an album of ten scheduled messages.
+- Convert folder back to non-shareable on last link deletion.
+- Several fixes of focus control in discussions / channel comments.
+- Drop all formatting on paste in non-message input fields.
+- Clear search field on archive opening.
+- Show video upload / download progress over the spoiler.
+- Better support for text-colored emoji in reactions.
+- Close archive / topics group when clicking on currently active folder.
+- Allow replace media by paste in discussions / comments / scheduled messages.
+- Fix stuck Replace Media button after editing media in some chats.
+- Quick reply by double click only with the left mouse button.
+- Fix applying the same custom chat background with different dimming value.
+- Fix "who reacted" list display for media album parts.
+- Show full t.me/+ invite link prefix in Recent Actions.
+- Don't try to suggest userpic photos to bots.
+- Add "Send when online" to the send button context menu.
+- Fix crash in empty topics message sending.
+
 4.8 (21.04.23)
 
 - Share folders that include dozens of chats with friends or colleagues.
@@ -22,7 +42,7 @@
 - When inviting people to groups, you can quickly send invite links to anyone who doesn't allow adding them directly.
 - Invite links now show previews in chats.
 - Fully translatable bots. Bot descriptions and ”What can this bot do?" sections can now be translated.
-- Starting a call now shows a confirmation window. 
+- Starting a call now shows a confirmation window.
 - Fixed pasting images from Firefox on Windows.
 - Global Fn+F shortcut to switch active window to full screen mode on macOS.
 - Silent notification sound in Focus Mode on macOS.

From cc6f63edf41f6bf5c1b5721e4b47eb603c31d333 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 25 Apr 2023 08:13:18 +0400
Subject: [PATCH 120/676] Downgrade wl_seat version in snap

To avoid high-resolution scrolling events
---
 snap/snapcraft.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 03be1bd10..a5b68c798 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -488,6 +488,8 @@ parts:
 
       cd qtbase
       find $CRAFT_STAGE/patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
+      cd ../qtwayland
+      sed -i 's/qMin(version, 8)/qMin(version, 7)/' src/client/qwaylandinputdevice.cpp
       cd ..
     override-build: |
       ./configure \

From 3825586715a2dc305f2558eb1e1ed237923247b8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 25 Apr 2023 08:14:30 +0400
Subject: [PATCH 121/676] Update lib_base

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index fd9adb30e..a3c94a0c8 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit fd9adb30ee906ea02c125eaa58fcfae773fdc677
+Subproject commit a3c94a0c8cdf3e143b3807044b1177c3d4684cf2

From 11906297d82b6ff57b277da5251d2e6eb3d8b6d0 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Mon, 24 Apr 2023 23:34:44 +0100
Subject: [PATCH 122/676] Explicitly specify QVector element type to fix build
 with clang13+range-v3+qt6

Same story as 2b383a4 for #24014.
Fixes 4.8.0 build on OpenBSD/amd64 7.3 with clang 13.0.0, range-v3 0.12.0 and Qt 6.5.0.
---
 Telegram/SourceFiles/api/api_chat_filters.cpp            | 2 +-
 Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp | 4 ++--
 Telegram/SourceFiles/settings/settings_folders.cpp       | 2 +-
 Telegram/SourceFiles/window/window_filters_menu.cpp      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index aed167392..5bd4144c4 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -227,7 +227,7 @@ void ImportInvite(
 	};
 	auto inputs = peers | ranges::views::transform([](auto peer) {
 		return MTPInputPeer(peer->input);
-	}) | ranges::to<QVector>();
+	}) | ranges::to<QVector<MTPInputPeer>>();
 	if (!slug.isEmpty()) {
 		api->request(MTPchatlists_JoinChatlistInvite(
 			MTP_string(slug),
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 161093867..c9ad2bcbe 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -1028,7 +1028,7 @@ void ExportFilterLink(
 	const auto session = &front->session();
 	auto mtpPeers = peers | ranges::views::transform(
 		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
-	) | ranges::to<QVector>();
+	) | ranges::to<QVector<MTPInputPeer>>();
 	session->api().request(MTPchatlists_ExportChatlistInvite(
 		MTP_inputChatlistDialogFilter(MTP_int(id)),
 		MTP_string(), // title
@@ -1061,7 +1061,7 @@ void EditLinkChats(
 	const auto session = &front->session();
 	auto mtpPeers = peers | ranges::views::transform(
 		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
-	) | ranges::to<QVector>();
+	) | ranges::to<QVector<MTPInputPeer>>();
 	session->api().request(MTPchatlists_EditExportedInvite(
 		MTP_flags(MTPchatlists_EditExportedInvite::Flag::f_peers),
 		MTP_inputChatlistDialogFilter(MTP_int(link.id)),
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 5511e62c6..9b1087ac3 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -696,7 +696,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 					row.removePeers
 				) | ranges::views::transform([](not_null<PeerData*> peer) {
 					return MTPInputPeer(peer->input);
-				}) | ranges::to<QVector>();
+				}) | ranges::to<QVector<MTPInputPeer>>();
 				removeChatlistRequests.push_back(
 					MTPchatlists_LeaveChatlist(
 						MTP_inputChatlistDialogFilter(MTP_int(newId)),
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 251742be7..657e0165d 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -494,7 +494,7 @@ void FiltersMenu::remove(
 				leave
 			) | ranges::views::transform([](not_null<PeerData*> peer) {
 				return MTPInputPeer(peer->input);
-			}) | ranges::to<QVector>())
+			}) | ranges::to<QVector<MTPInputPeer>>())
 		)).done([=](const MTPUpdates &result) {
 			api->applyUpdates(result);
 		}).send();

From 864959aee0381362c715aaff8e490e60e6d2e1b3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Apr 2023 11:45:31 +0400
Subject: [PATCH 123/676] Hide login code with a spoiler in chats list.

---
 Telegram/SourceFiles/calls/calls_instance.cpp |  5 +++
 Telegram/SourceFiles/calls/calls_instance.h   |  1 +
 Telegram/SourceFiles/core/application.cpp     |  4 +++
 Telegram/SourceFiles/core/application.h       |  1 +
 .../dialogs/ui/dialogs_message_view.cpp       |  1 +
 Telegram/SourceFiles/history/history_item.cpp | 35 +++++++++++++++++--
 Telegram/SourceFiles/history/history_item.h   |  7 +++-
 .../history/view/history_view_item_preview.h  |  1 +
 .../window/notifications_manager.cpp          |  8 ++++-
 .../window/notifications_manager.h            |  1 +
 .../window/notifications_manager_default.cpp  |  1 +
 11 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 4ea1264c4..456b6d767 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -556,6 +556,11 @@ FnMut<void()> Instance::addAsyncWaiter() {
 	};
 }
 
+bool Instance::isSharingScreen() const {
+	return (_currentCall && _currentCall->isSharingScreen())
+		|| (_currentGroupCall && _currentGroupCall->isSharingScreen());
+}
+
 bool Instance::isQuitPrevent() {
 	if (!_currentCall || _currentCall->isIncomingWaiting()) {
 		return false;
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 679419711..4113a600e 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -105,6 +105,7 @@ public:
 
 	[[nodiscard]] FnMut<void()> addAsyncWaiter();
 
+	[[nodiscard]] bool isSharingScreen() const;
 	[[nodiscard]] bool isQuitPrevent();
 
 private:
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 4c1bc7233..21a54c785 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -1573,6 +1573,10 @@ QPoint Application::getPointForCallPanelCenter() const {
 	return QGuiApplication::primaryScreen()->geometry().center();
 }
 
+bool Application::isSharingScreen() const {
+	return _calls->isSharingScreen();
+}
+
 // macOS Qt bug workaround, sometimes no leaveEvent() gets to the nested widgets.
 void Application::registerLeaveSubscription(not_null<QWidget*> widget) {
 #ifdef Q_OS_MAC
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 0488dec3c..3ad642c6b 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -195,6 +195,7 @@ public:
 	bool hideMediaView();
 
 	[[nodiscard]] QPoint getPointForCallPanelCenter() const;
+	[[nodiscard]] bool isSharingScreen() const;
 
 	void startSettingsAndBackground();
 	[[nodiscard]] Settings &settings();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
index cb9fb4ee9..b1f59fb43 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
@@ -157,6 +157,7 @@ void MessageView::prepare(
 	}
 	options.existing = &_imagesCache;
 	options.ignoreTopic = true;
+	options.spoilerLoginCode = true;
 	auto preview = item->toPreview(options);
 	const auto hasImages = !preview.images.empty();
 	const auto history = item->history();
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index c72d2454f..e4ccb977f 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -80,6 +80,26 @@ constexpr auto kPinnedMessageTextLimit = 16;
 
 using ItemPreview = HistoryView::ItemPreview;
 
+[[nodiscard]] TextWithEntities SpoilerLoginCode(TextWithEntities text) {
+	const auto r = QRegularExpression(u"([\\d\\-]{5,7})"_q);
+	const auto m = r.match(text.text);
+	if (!m.hasMatch()) {
+		return text;
+	}
+	const auto codeStart = m.capturedStart(1);
+	const auto codeLength = m.capturedLength(1);
+	auto i = text.entities.begin();
+	const auto e = text.entities.end();
+	while (i != e && i->offset() < codeStart) {
+		if (i->offset() + i->length() > codeStart) {
+			return text; // Entities should not intersect code.
+		}
+		++i;
+	}
+	text.entities.insert(i, { EntityType::Spoiler, codeStart, codeLength });
+	return text;
+}
+
 [[nodiscard]] bool HasNotEmojiAndSpaces(const QString &text) {
 	if (text.isEmpty()) {
 		return false;
@@ -2770,8 +2790,9 @@ bool HistoryItem::isEmpty() const {
 		&& !Has<HistoryMessageLogEntryOriginal>();
 }
 
-TextWithEntities HistoryItem::notificationText() const {
-	const auto result = [&] {
+TextWithEntities HistoryItem::notificationText(
+		NotificationTextOptions options) const {
+	auto result = [&] {
 		if (_media && !isService()) {
 			return _media->notificationText();
 		} else if (!emptyText()) {
@@ -2779,6 +2800,11 @@ TextWithEntities HistoryItem::notificationText() const {
 		}
 		return TextWithEntities();
 	}();
+	if (options.spoilerLoginCode
+		&& !out()
+		&& history()->peer->isNotificationsUser()) {
+		result = SpoilerLoginCode(std::move(result));
+	}
 	if (result.text.size() <= kNotificationTextLimit) {
 		return result;
 	}
@@ -2808,6 +2834,11 @@ ItemPreview HistoryItem::toPreview(ToPreviewOptions options) const {
 		}
 		return {};
 	}();
+	if (options.spoilerLoginCode
+		&& !out()
+		&& history()->peer->isNotificationsUser()) {
+		result.text = SpoilerLoginCode(std::move(result.text));
+	}
 	const auto fromSender = [](not_null<PeerData*> sender) {
 		return sender->isSelf()
 			? tr::lng_from_you(tr::now)
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index e6dcac508..3ce4cdcc5 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -82,6 +82,7 @@ class Element;
 class Message;
 class Service;
 class ServiceMessagePainter;
+struct NotificationTextOptions;
 } // namespace HistoryView
 
 class HistoryItem final : public RuntimeComposer<HistoryItem> {
@@ -355,8 +356,12 @@ public:
 	void indexAsNewItem();
 	void removeFromSharedMediaIndex();
 
+	struct NotificationTextOptions {
+		bool spoilerLoginCode = false;
+	};
 	[[nodiscard]] QString notificationHeader() const;
-	[[nodiscard]] TextWithEntities notificationText() const;
+	[[nodiscard]] TextWithEntities notificationText(
+		NotificationTextOptions options = {}) const;
 
 	using ToPreviewOptions = HistoryView::ToPreviewOptions;
 	using ItemPreview = HistoryView::ItemPreview;
diff --git a/Telegram/SourceFiles/history/view/history_view_item_preview.h b/Telegram/SourceFiles/history/view/history_view_item_preview.h
index 4348743b3..7ac0a2b18 100644
--- a/Telegram/SourceFiles/history/view/history_view_item_preview.h
+++ b/Telegram/SourceFiles/history/view/history_view_item_preview.h
@@ -37,6 +37,7 @@ struct ToPreviewOptions {
 	bool generateImages = true;
 	bool ignoreGroup = false;
 	bool ignoreTopic = true;
+	bool spoilerLoginCode = false;
 	bool translated = false;
 };
 
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 8344723df..1d69be114 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -856,6 +856,10 @@ Manager::DisplayOptions Manager::getNotificationOptions(
 			&& (!topic || !Data::CanSendTexts(topic)))
 		|| peer->isBroadcast()
 		|| (peer->slowmodeSecondsLeft() > 0);
+	result.spoilerLoginCode = item
+		&& !item->out()
+		&& peer->isNotificationsUser()
+		&& Core::App().isSharingScreen();
 	return result;
 }
 
@@ -1167,7 +1171,9 @@ void NativeManager::doShowNotification(NotificationFields &&fields) {
 		? tr::lng_forward_messages(tr::now, lt_count, fields.forwardedCount)
 		: item->groupId()
 		? tr::lng_in_dlg_album(tr::now)
-		: TextWithPermanentSpoiler(item->notificationText());
+		: TextWithPermanentSpoiler(item->notificationText({
+			.spoilerLoginCode = options.spoilerLoginCode,
+		}));
 
 	// #TODO optimize
 	auto userpicView = item->history()->peer->createUserpicView();
diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h
index fb0a010d4..9d7224c74 100644
--- a/Telegram/SourceFiles/window/notifications_manager.h
+++ b/Telegram/SourceFiles/window/notifications_manager.h
@@ -316,6 +316,7 @@ public:
 		bool hideMessageText = false;
 		bool hideMarkAsRead = false;
 		bool hideReplyButton = false;
+		bool spoilerLoginCode = false;
 	};
 	[[nodiscard]] DisplayOptions getNotificationOptions(
 		HistoryItem *item,
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 80cca195e..f68524d1c 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -932,6 +932,7 @@ void Notification::updateNotifyDisplay() {
 				? _item->toPreview({
 					.hideSender = reminder,
 					.generateImages = false,
+					.spoilerLoginCode = options.spoilerLoginCode,
 				}).text
 				: ((!_author.isEmpty()
 						? Ui::Text::PlainLink(_author)

From 961534763426a8c5c2a7b91932fe3ec0e297155b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 27 Apr 2023 15:23:06 +0400
Subject: [PATCH 124/676] This should allow calling another authed account.

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

diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 456b6d767..d205ab4b0 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -589,6 +589,15 @@ void Instance::handleCallUpdate(
 			// May be a repeated phoneCallRequested update from getDifference.
 			return;
 		}
+		if (inCall()
+			&& _currentCall->type() == Call::Type::Outgoing
+			&& _currentCall->user()->id == session->userPeerId()
+			&& (peerFromUser(phoneCall.vparticipant_id())
+				== _currentCall->user()->session().userPeerId())) {
+			// Ignore call from the same running app, other account.
+			return;
+		}
+
 		const auto &config = session->serverConfig();
 		if (inCall() || inGroupCall() || !user || user->isSelf()) {
 			const auto flags = phoneCall.is_video()

From c890281258938e65ea781edaa775e1a40890c806 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 27 Apr 2023 15:23:19 +0400
Subject: [PATCH 125/676] Fix emoji in macOS title bar text.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 37531086e..79b6cd347 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 37531086ec21a8569deddedb11b402f8a3157b90
+Subproject commit 79b6cd347c9c4d1a04013f0328bde533010d1e70

From 60fe961c21077a7dbffc4828a31b958d9eebebb1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 27 Apr 2023 18:33:35 +0400
Subject: [PATCH 126/676] Implement new client hello generation.

---
 Telegram/Resources/tl/mtproto.tl              |   1 +
 .../mtproto/details/mtproto_tls_socket.cpp    | 352 ++++++++++++------
 2 files changed, 248 insertions(+), 105 deletions(-)

diff --git a/Telegram/Resources/tl/mtproto.tl b/Telegram/Resources/tl/mtproto.tl
index 4b92c3e6e..57d571fcd 100644
--- a/Telegram/Resources/tl/mtproto.tl
+++ b/Telegram/Resources/tl/mtproto.tl
@@ -111,6 +111,7 @@ tlsBlockDomain = TlsBlock;
 tlsBlockGrease seed:int = TlsBlock;
 tlsBlockPublicKey = TlsBlock;
 tlsBlockScope entries:Vector<TlsBlock> = TlsBlock;
+tlsBlockPermutation entries:Vector<Vector<TlsBlock>> = TlsBlock;
 
 ---functions---
 
diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
index f382828be..36aa87598 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
@@ -35,14 +35,22 @@ using BigNum = openssl::BigNum;
 using BigNumContext = openssl::Context;
 
 [[nodiscard]] MTPTlsClientHello PrepareClientHelloRules() {
-	auto stack = std::vector<QVector<MTPTlsBlock>>();
+	using Scope = QVector<MTPTlsBlock>;
+	using Permutation = std::vector<Scope>;
+	using StackElement = std::variant<Scope, Permutation>;
+	auto stack = std::vector<StackElement>();
 	const auto pushToBack = [&](MTPTlsBlock &&block) {
 		Expects(!stack.empty());
 
-		stack.back().push_back(std::move(block));
+		if (const auto scope = std::get_if<Scope>(&stack.back())) {
+			scope->push_back(std::move(block));
+		} else {
+			auto &permutation = v::get<Permutation>(stack.back());
+			Assert(!permutation.empty());
+			permutation.back().push_back(std::move(block));
+		}
 	};
-	const auto S = [&](QLatin1String s) {
-		const auto data = QByteArray(s.data(), s.size());
+	const auto S = [&](QByteArray data) {
 		pushToBack(MTP_tlsBlockString(MTP_bytes(data)));
 	};
 	const auto Z = [&](int length) {
@@ -60,60 +68,130 @@ using BigNumContext = openssl::Context;
 	const auto K = [&] {
 		pushToBack(MTP_tlsBlockPublicKey());
 	};
-	const auto Open = [&] {
-		stack.emplace_back();
+	const auto OpenScope = [&] {
+		stack.emplace_back(Scope());
 	};
-	const auto Close = [&] {
+	const auto CloseScope = [&] {
 		Expects(stack.size() > 1);
+		Expects(v::is<Scope>(stack.back()));
 
-		const auto blocks = std::move(stack.back());
+		const auto blocks = std::move(v::get<Scope>(stack.back()));
 		stack.pop_back();
 		pushToBack(MTP_tlsBlockScope(MTP_vector<MTPTlsBlock>(blocks)));
 	};
+	const auto OpenPermutation = [&] {
+		stack.emplace_back(Permutation());
+	};
+	const auto ClosePermutation = [&] {
+		Expects(stack.size() > 1);
+		Expects(v::is<Permutation>(stack.back()));
+
+		const auto list = std::move(v::get<Permutation>(stack.back()));
+		stack.pop_back();
+
+		const auto wrapped = list | ranges::views::transform([](
+				const QVector<MTPTlsBlock> &elements) {
+			return MTP_vector<MTPTlsBlock>(elements);
+		}) | ranges::to<QVector<MTPVector<MTPTlsBlock>>>();
+
+		pushToBack(MTP_tlsBlockPermutation(
+			MTP_vector<MTPVector<MTPTlsBlock>>(wrapped)));
+	};
+	const auto StartPermutationElement = [&] {
+		Expects(stack.size() > 1);
+		Expects(v::is<Permutation>(stack.back()));
+
+		v::get<Permutation>(stack.back()).emplace_back();
+	};
 	const auto Finish = [&] {
 		Expects(stack.size() == 1);
+		Expects(v::is<Scope>(stack.back()));
 
-		return stack.back();
+		return v::get<Scope>(stack.back());
 	};
 
-	stack.emplace_back();
+	stack.emplace_back(Scope());
 
-	S(qstr("\x16\x03\x01\x02\x00\x01\x00\x01\xfc\x03\x03"));
+	S("\x16\x03\x01\x02\x00\x01\x00\x01\xfc\x03\x03"_q);
 	Z(32);
-	S(qstr("\x20"));
+	S("\x20"_q);
 	R(32);
-	S(qstr("\x00\x20"));
+	S("\x00\x20"_q);
 	G(0);
-	S(qstr(""
+	S(""
 		"\x13\x01\x13\x02\x13\x03\xc0\x2b\xc0\x2f\xc0\x2c\xc0\x30\xcc\xa9"
 		"\xcc\xa8\xc0\x13\xc0\x14\x00\x9c\x00\x9d\x00\x2f\x00\x35\x01\x00"
-		"\x01\x93"));
+		"\x01\x93"_q);
 	G(2);
-	S(qstr("\x00\x00\x00\x00"));
-	Open();
-	Open();
-	S(qstr("\x00"));
-	Open();
-	D();
-	Close();
-	Close();
-	Close();
-	S(qstr("\x00\x17\x00\x00\xff\x01\x00\x01\x00\x00\x0a\x00\x0a\x00\x08"));
-	G(4);
-	S(qstr(""
-		"\x00\x1d\x00\x17\x00\x18\x00\x0b\x00\x02\x01\x00\x00\x23\x00\x00"
-		"\x00\x10\x00\x0e\x00\x0c\x02\x68\x32\x08\x68\x74\x74\x70\x2f\x31"
-		"\x2e\x31\x00\x05\x00\x05\x01\x00\x00\x00\x00\x00\x0d\x00\x12\x00"
-		"\x10\x04\x03\x08\x04\x04\x01\x05\x03\x08\x05\x05\x01\x08\x06\x06"
-		"\x01\x00\x12\x00\x00\x00\x33\x00\x2b\x00\x29"));
-	G(4);
-	S(qstr("\x00\x01\x00\x00\x1d\x00\x20"));
-	K();
-	S(qstr("\x00\x2d\x00\x02\x01\x01\x00\x2b\x00\x0b\x0a"));
-	G(6);
-	S(qstr("\x03\x04\x03\x03\x03\x02\x03\x01\x00\x1b\x00\x03\x02\x00\x02"));
+	S("\x00\x00"_q);
+	OpenPermutation(); {
+		StartPermutationElement(); {
+			S("\x00\x00"_q);
+			OpenScope();
+			OpenScope();
+			S("\x00"_q);
+			OpenScope();
+			D();
+			CloseScope();
+			CloseScope();
+			CloseScope();
+		}
+		StartPermutationElement(); {
+			S("\x00\x05\x00\x05\x01\x00\x00\x00\x00"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x0a\x00\x0a\x00\x08"_q);
+			G(4);
+			S("\x00\x1d\x00\x17\x00\x18"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x0b\x00\x02\x01\x00"_q);
+		}
+		StartPermutationElement(); {
+			S(""
+				"\x00\x0d\x00\x12\x00\x10\x04\x03\x08\x04\x04\x01\x05\x03"
+				"\x08\x05\x05\x01\x08\x06\x06\x01"_q);
+		}
+		StartPermutationElement(); {
+			S(""
+				"\x00\x10\x00\x0e\x00\x0c\x02\x68\x32\x08\x68\x74\x74\x70"
+				"\x2f\x31\x2e\x31"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x12\x00\x00"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x17\x00\x00"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x1b\x00\x03\x02\x00\x02"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x23\x00\x00"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x2b\x00\x07\x06"_q);
+			G(6);
+			S("\x03\x04\x03\x03"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x2d\x00\x02\x01\x01"_q);
+		}
+		StartPermutationElement(); {
+			S("\x00\x33\x00\x2b\x00\x29"_q);
+			G(4);
+			S("\x00\x01\x00\x00\x1d\x00\x20"_q);
+			K();
+		}
+		StartPermutationElement(); {
+			S("\x44\x69\x00\x05\x00\x03\x02\x68\x32"_q);
+		}
+		StartPermutationElement(); {
+			S("\xff\x01\x00\x01\x00"_q);
+		}
+	} ClosePermutation();
 	G(3);
-	S(qstr("\x00\x01\x00\x00\x15"));
+	S("\x00\x01\x00\x00\x15"_q);
 
 	return MTP_tlsClientHello(MTP_vector<MTPTlsBlock>(Finish()));
 }
@@ -228,63 +306,78 @@ struct ClientHello {
 	QByteArray digest;
 };
 
-class ClientHelloGenerator {
+class Generator {
 public:
-	ClientHelloGenerator(
+	Generator(
 		const MTPTlsClientHello &rules,
 		bytes::const_span domain,
 		bytes::const_span key);
-	[[nodiscard]] ClientHello result();
+	[[nodiscard]] ClientHello take();
 
 private:
-	[[nodiscard]] bytes::span grow(int size);
-	void writeBlocks(const QVector<MTPTlsBlock> &blocks);
-	void writeBlock(const MTPTlsBlock &data);
-	void writeBlock(const MTPDtlsBlockString &data);
-	void writeBlock(const MTPDtlsBlockZero &data);
-	void writeBlock(const MTPDtlsBlockGrease &data);
-	void writeBlock(const MTPDtlsBlockRandom &data);
-	void writeBlock(const MTPDtlsBlockDomain &data);
-	void writeBlock(const MTPDtlsBlockPublicKey &data);
-	void writeBlock(const MTPDtlsBlockScope &data);
-	void writePadding();
-	void writeDigest();
-	void writeTimestamp();
+	class Part final {
+	public:
+		explicit Part(
+			bytes::const_span domain,
+			const bytes::vector &greases);
+
+		[[nodiscard]] bytes::span grow(int size);
+		void writeBlocks(const QVector<MTPTlsBlock> &blocks);
+		void writeBlock(const MTPTlsBlock &data);
+		void writeBlock(const MTPDtlsBlockString &data);
+		void writeBlock(const MTPDtlsBlockZero &data);
+		void writeBlock(const MTPDtlsBlockGrease &data);
+		void writeBlock(const MTPDtlsBlockRandom &data);
+		void writeBlock(const MTPDtlsBlockDomain &data);
+		void writeBlock(const MTPDtlsBlockPublicKey &data);
+		void writeBlock(const MTPDtlsBlockScope &data);
+		void writeBlock(const MTPDtlsBlockPermutation &data);
+		void finalize(bytes::const_span key);
+		[[nodiscard]] QByteArray extractDigest() const;
+
+		[[nodiscard]] bool error() const;
+		[[nodiscard]] QByteArray take();
+
+	private:
+		void writePadding();
+		void writeDigest(bytes::const_span key);
+		void injectTimestamp();
+
+		bytes::const_span _domain;
+		const bytes::vector &_greases;
+		QByteArray _result;
+		const char *_data = nullptr;
+		int _digestPosition = -1;
+		bool _error = false;
+
+	};
 
-	bytes::const_span _domain;
-	bytes::const_span _key;
 	bytes::vector _greases;
-	std::vector<int> _scopeStack;
-	QByteArray _result;
+	Part _result;
 	QByteArray _digest;
-	int _digestPosition = -1;
-	bool _error = false;
 
 };
 
-ClientHelloGenerator::ClientHelloGenerator(
-	const MTPTlsClientHello &rules,
+Generator::Part::Part(
 	bytes::const_span domain,
-	bytes::const_span key)
+	const bytes::vector &greases)
 : _domain(domain)
-, _key(key)
-, _greases(PrepareGreases()) {
+, _greases(greases) {
 	_result.reserve(kClientHelloLength);
-	writeBlocks(rules.match([&](const MTPDtlsClientHello &data) {
-		return data.vblocks().v;
-	}));
-	writePadding();
-	writeDigest();
-	writeTimestamp();
+	_data = _result.constData();
 }
 
-ClientHello ClientHelloGenerator::result() {
-	return {
-		_error ? QByteArray() : std::move(_result),
-		_error ? QByteArray() : std::move(_digest) };
+bool Generator::Part::error() const {
+	return _error;
 }
 
-bytes::span ClientHelloGenerator::grow(int size) {
+QByteArray Generator::Part::take() {
+	Expects(_error || _result.constData() == _data);
+
+	return _error ? QByteArray() : std::move(_result);
+}
+
+bytes::span Generator::Part::grow(int size) {
 	if (_error
 		|| size <= 0
 		|| _result.size() + size > kClientHelloLength) {
@@ -297,19 +390,19 @@ bytes::span ClientHelloGenerator::grow(int size) {
 	return bytes::make_detached_span(_result).subspan(offset);
 }
 
-void ClientHelloGenerator::writeBlocks(const QVector<MTPTlsBlock> &blocks) {
+void Generator::Part::writeBlocks(const QVector<MTPTlsBlock> &blocks) {
 	for (const auto &block : blocks) {
 		writeBlock(block);
 	}
 }
 
-void ClientHelloGenerator::writeBlock(const MTPTlsBlock &data) {
+void Generator::Part::writeBlock(const MTPTlsBlock &data) {
 	data.match([&](const auto &data) {
 		writeBlock(data);
 	});
 }
 
-void ClientHelloGenerator::writeBlock(const MTPDtlsBlockString &data) {
+void Generator::Part::writeBlock(const MTPDtlsBlockString &data) {
 	const auto &bytes = data.vdata().v;
 	const auto storage = grow(bytes.size());
 	if (storage.empty()) {
@@ -318,7 +411,7 @@ void ClientHelloGenerator::writeBlock(const MTPDtlsBlockString &data) {
 	bytes::copy(storage, bytes::make_span(bytes));
 }
 
-void ClientHelloGenerator::writeBlock(const MTPDtlsBlockZero &data) {
+void Generator::Part::writeBlock(const MTPDtlsBlockZero &data) {
 	const auto length = data.vlength().v;
 	const auto already = _result.size();
 	const auto storage = grow(length);
@@ -331,7 +424,7 @@ void ClientHelloGenerator::writeBlock(const MTPDtlsBlockZero &data) {
 	bytes::set_with_const(storage, bytes::type(0));
 }
 
-void ClientHelloGenerator::writeBlock(const MTPDtlsBlockGrease &data) {
+void Generator::Part::writeBlock(const MTPDtlsBlockGrease &data) {
 	const auto seed = data.vseed().v;
 	if (seed < 0 || seed >= _greases.size()) {
 		_error = true;
@@ -344,7 +437,7 @@ void ClientHelloGenerator::writeBlock(const MTPDtlsBlockGrease &data) {
 	bytes::set_with_const(storage, _greases[seed]);
 }
 
-void ClientHelloGenerator::writeBlock(const MTPDtlsBlockRandom &data) {
+void Generator::Part::writeBlock(const MTPDtlsBlockRandom &data) {
 	const auto length = data.vlength().v;
 	const auto storage = grow(length);
 	if (storage.empty()) {
@@ -353,7 +446,7 @@ void ClientHelloGenerator::writeBlock(const MTPDtlsBlockRandom &data) {
 	bytes::set_random(storage);
 }
 
-void ClientHelloGenerator::writeBlock(const MTPDtlsBlockDomain &data) {
+void Generator::Part::writeBlock(const MTPDtlsBlockDomain &data) {
 	const auto storage = grow(_domain.size());
 	if (storage.empty()) {
 		return;
@@ -361,7 +454,7 @@ void ClientHelloGenerator::writeBlock(const MTPDtlsBlockDomain &data) {
 	bytes::copy(storage, _domain);
 }
 
-void ClientHelloGenerator::writeBlock(const MTPDtlsBlockPublicKey &data) {
+void Generator::Part::writeBlock(const MTPDtlsBlockPublicKey &data) {
 	const auto key = GeneratePublicKey();
 	const auto storage = grow(key.size());
 	if (storage.empty()) {
@@ -370,7 +463,7 @@ void ClientHelloGenerator::writeBlock(const MTPDtlsBlockPublicKey &data) {
 	bytes::copy(storage, key);
 }
 
-void ClientHelloGenerator::writeBlock(const MTPDtlsBlockScope &data) {
+void Generator::Part::writeBlock(const MTPDtlsBlockScope &data) {
 	const auto storage = grow(kLengthSize);
 	if (storage.empty()) {
 		return;
@@ -381,27 +474,66 @@ void ClientHelloGenerator::writeBlock(const MTPDtlsBlockScope &data) {
 	bytes::copy(storage, bytes::object_as_span(&length));
 }
 
-void ClientHelloGenerator::writePadding() {
+void Generator::Part::writeBlock(const MTPDtlsBlockPermutation &data) {
+	auto list = std::vector<QByteArray>();
+	list.reserve(data.ventries().v.size());
+	for (const auto &inner : data.ventries().v) {
+		auto part = Part(_domain, _greases);
+		part.writeBlocks(inner.v);
+		if (part.error()) {
+			_error = true;
+			return;
+		}
+		list.push_back(part.take());
+	}
+	ranges::shuffle(list);
+	for (const auto &element : list) {
+		const auto storage = grow(element.size());
+		if (storage.empty()) {
+			return;
+		}
+		bytes::copy(storage, bytes::make_span(element));
+	}
+}
+
+void Generator::Part::finalize(bytes::const_span key) {
+	if (_error) {
+		return;
+	} else if (_digestPosition < 0) {
+		_error = true;
+		return;
+	}
+	writePadding();
+	writeDigest(key);
+	injectTimestamp();
+}
+
+QByteArray Generator::Part::extractDigest() const {
+	if (_digestPosition < 0) {
+		return {};
+	}
+	return _result.mid(_digestPosition, kHelloDigestLength);
+}
+
+void Generator::Part::writePadding() {
+	Expects(_result.size() <= kClientHelloLength - kLengthSize);
+
 	const auto padding = kClientHelloLength - kLengthSize - _result.size();
 	writeBlock(MTP_tlsBlockScope(
 		MTP_vector<MTPTlsBlock>(1, MTP_tlsBlockZero(MTP_int(padding)))));
 }
 
-void ClientHelloGenerator::writeDigest() {
-	if (_digestPosition < 0) {
-		_error = true;
-		return;
-	}
+void Generator::Part::writeDigest(bytes::const_span key) {
+	Expects(_digestPosition >= 0);
+
 	bytes::copy(
 		bytes::make_detached_span(_result).subspan(_digestPosition),
-		openssl::HmacSha256(_key, bytes::make_span(_result)));
+		openssl::HmacSha256(key, bytes::make_span(_result)));
 }
 
-void ClientHelloGenerator::writeTimestamp() {
-	if (_digestPosition < 0) {
-		_error = true;
-		return;
-	}
+void Generator::Part::injectTimestamp() {
+	Expects(_digestPosition >= 0);
+
 	const auto storage = bytes::make_detached_span(_result).subspan(
 		_digestPosition + kHelloDigestLength - sizeof(int32),
 		sizeof(int32));
@@ -409,20 +541,30 @@ void ClientHelloGenerator::writeTimestamp() {
 	bytes::copy(bytes::object_as_span(&already), storage);
 	already ^= qToLittleEndian(int32(base::unixtime::http_now()));
 	bytes::copy(storage, bytes::object_as_span(&already));
+}
 
-	_digest = QByteArray(kHelloDigestLength, Qt::Uninitialized);
-	bytes::copy(
-		bytes::make_detached_span(_digest),
-		bytes::make_detached_span(_result).subspan(
-			_digestPosition,
-			kHelloDigestLength));
+Generator::Generator(
+	const MTPTlsClientHello &rules,
+	bytes::const_span domain,
+	bytes::const_span key)
+: _greases(PrepareGreases())
+, _result(domain, _greases) {
+	_result.writeBlocks(rules.match([&](const MTPDtlsClientHello &data) {
+		return data.vblocks().v;
+	}));
+	_result.finalize(key);
+}
+
+ClientHello Generator::take() {
+	auto digest = _result.extractDigest();
+	return { _result.take(), std::move(digest) };
 }
 
 [[nodiscard]] ClientHello PrepareClientHello(
 		const MTPTlsClientHello &rules,
 		bytes::const_span domain,
 		bytes::const_span key) {
-	return ClientHelloGenerator(rules, domain, key).result();
+	return Generator(rules, domain, key).take();
 }
 
 [[nodiscard]] bool CheckPart(bytes::const_span data, QLatin1String check) {

From 9b576a13bcf8f65a8e0411acc0bfe10148d1a874 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Apr 2023 14:33:51 +0400
Subject: [PATCH 127/676] Fix calls with OpenSSL 3.

For that libsrtp was updated to v2.5.0 in tg_owt.
---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/build/prepare/prepare.py           | 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 2c0aea8e8..354fc3640 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -775,7 +775,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 5098730b9eb6173f0b52068fe2555b7c1015123a \
+	&& git fetch --depth=1 origin 9d120195334db4f232c925529aa7601656dc59d7 \
 	&& git reset --hard FETCH_HEAD \
 	&& git submodule update --init --recursive --depth=1 \
 	&& rm -rf .git \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index a2bf62b85..d283e4490 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1335,9 +1335,9 @@ mac:
 stage('tg_owt', """
     git clone https://github.com/desktop-app/tg_owt.git
     cd tg_owt
-    git checkout 9b70d7679e
+    git checkout 9d12019533
     git submodule init
-    git submodule update src/third_party/libyuv src/third_party/crc32c/src src/third_party/abseil-cpp
+    git submodule update
 win:
     SET MOZJPEG_PATH=$LIBS_DIR/mozjpeg
     SET OPUS_PATH=$USED_PREFIX/include/opus

From 61a61669b6b26fc67c48a7e6b04ed1fac63e8ef9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Apr 2023 22:03:27 +0400
Subject: [PATCH 128/676] Fix build with Xcode.

---
 Telegram/SourceFiles/history/history_item.cpp | 4 ++--
 Telegram/SourceFiles/history/history_item.h   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index e4ccb977f..a63048d06 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -86,8 +86,8 @@ using ItemPreview = HistoryView::ItemPreview;
 	if (!m.hasMatch()) {
 		return text;
 	}
-	const auto codeStart = m.capturedStart(1);
-	const auto codeLength = m.capturedLength(1);
+	const auto codeStart = int(m.capturedStart(1));
+	const auto codeLength = int(m.capturedLength(1));
 	auto i = text.entities.begin();
 	const auto e = text.entities.end();
 	while (i != e && i->offset() < codeStart) {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 3ce4cdcc5..b26793963 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -82,7 +82,6 @@ class Element;
 class Message;
 class Service;
 class ServiceMessagePainter;
-struct NotificationTextOptions;
 } // namespace HistoryView
 
 class HistoryItem final : public RuntimeComposer<HistoryItem> {
@@ -361,7 +360,10 @@ public:
 	};
 	[[nodiscard]] QString notificationHeader() const;
 	[[nodiscard]] TextWithEntities notificationText(
-		NotificationTextOptions options = {}) const;
+		NotificationTextOptions options) const;
+	[[nodiscard]] TextWithEntities notificationText() const {
+		return notificationText({});
+	}
 
 	using ToPreviewOptions = HistoryView::ToPreviewOptions;
 	using ItemPreview = HistoryView::ItemPreview;

From 1ac0c4142d31cacd9219865825e0d3321d9e2132 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 29 Apr 2023 09:07:23 +0400
Subject: [PATCH 129/676] Update tg_owt in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a5b68c798..f5a722081 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -553,7 +553,7 @@ parts:
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
-    source-commit: 5098730b9eb6173f0b52068fe2555b7c1015123a
+    source-commit: 9d120195334db4f232c925529aa7601656dc59d7
     plugin: cmake
     build-environment:
       - LDFLAGS: -s

From 68e229640bfcb4b33ecd890b3dbdcfb95db5138c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 29 Apr 2023 09:09:31 +0400
Subject: [PATCH 130/676] Revert "Build OpenSSL 1.1.1 in snap"

This reverts commit 0e97ef992e8ac97dd6ff50f7b35422c57ebddd21.
---
 snap/snapcraft.yaml | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f5a722081..668a220d1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -108,6 +108,7 @@ parts:
       - libheif-dev
       - libopus-dev
       - libpulse-dev
+      - libssl-dev
       - libwayland-dev
       - libxcb1-dev
       - libxcb-keysyms1-dev
@@ -120,6 +121,7 @@ parts:
       - libheif1
       - libopus0
       - libpulse0
+      - libssl3
       - libwayland-client0
       - libwebkit2gtk-4.1-0
       - libxcb1
@@ -165,7 +167,6 @@ parts:
       - glibmm
       - mozjpeg
       - openal
-      - openssl
       - protobuf
       - qt
       - rnnoise
@@ -352,29 +353,6 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
 
-  openssl:
-    source: https://github.com/openssl/openssl.git
-    source-depth: 1
-    source-branch: OpenSSL_1_1_1-stable
-    plugin: make
-    build-environment:
-      - LDFLAGS: -s
-    override-build: |
-      ./config \
-        shared \
-        --prefix=/usr \
-        --openssldir=/usr/lib/ssl \
-        --libdir=lib/$CRAFT_ARCH_TRIPLET \
-        no-tests
-      craftctl default
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.a
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
-      - -./usr/share
-
   protobuf:
     source: https://github.com/protocolbuffers/protobuf.git
     source-depth: 1
@@ -418,6 +396,7 @@ parts:
       - libpcre2-dev
       - libpng-dev
       - libsm-dev
+      - libssl-dev
       - libvulkan-dev
       - libwayland-dev
       - libx11-dev
@@ -455,6 +434,7 @@ parts:
       - libpcre2-16-0
       - libpng16-16
       - libsm6
+      - libssl3
       - libvulkan1
       - libwayland-client0
       - libwayland-cursor0
@@ -527,7 +507,6 @@ parts:
     after:
       - glibmm
       - mozjpeg
-      - openssl
       - patches
 
   rnnoise:
@@ -566,6 +545,7 @@ parts:
       - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
+      - libssl-dev
       - libvpx-dev
       - libx11-dev
       - libxcomposite-dev
@@ -582,6 +562,7 @@ parts:
       - libgl1
       - libopenh264-6
       - libopus0
+      - libssl3
       - libvpx7
       - libx11-6
       - libxcomposite1
@@ -604,4 +585,3 @@ parts:
       - ffmpeg
       - glibmm
       - mozjpeg
-      - openssl

From 4628d4fece0774300d2089a7be9d6a3f354292e6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 29 Apr 2023 13:38:54 +0400
Subject: [PATCH 131/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index a3c94a0c8..02462671e 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit a3c94a0c8cdf3e143b3807044b1177c3d4684cf2
+Subproject commit 02462671e56bcf5498f1ae00806a680791be3b0a
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 79b6cd347..7c9aa9453 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 79b6cd347c9c4d1a04013f0328bde533010d1e70
+Subproject commit 7c9aa94533276d693942ed0ffb39d3d66a49e124
diff --git a/cmake b/cmake
index 6ab5543b3..c03178c09 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 6ab5543b3dd1e40979d258e46d03376931b6c37b
+Subproject commit c03178c09be027627321704d3a9b81b032159dbd

From b881d24a5a42b68ebc3821c370bceeee3eae95b5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 May 2023 11:07:07 +0400
Subject: [PATCH 132/676] Update libyuv in tg_owt.

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/build/prepare/prepare.py           | 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 354fc3640..2e57cf3a1 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -775,7 +775,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 9d120195334db4f232c925529aa7601656dc59d7 \
+	&& git fetch --depth=1 origin dcb5069ff76bd293e86928804208737e6cee2ccc \
 	&& git reset --hard FETCH_HEAD \
 	&& git submodule update --init --recursive --depth=1 \
 	&& rm -rf .git \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index d283e4490..183eaabd0 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1335,7 +1335,7 @@ mac:
 stage('tg_owt', """
     git clone https://github.com/desktop-app/tg_owt.git
     cd tg_owt
-    git checkout 9d12019533
+    git checkout dcb5069ff7
     git submodule init
     git submodule update
 win:
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 668a220d1..bf5658bef 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -532,7 +532,7 @@ parts:
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
-    source-commit: 9d120195334db4f232c925529aa7601656dc59d7
+    source-commit: dcb5069ff76bd293e86928804208737e6cee2ccc
     plugin: cmake
     build-environment:
       - LDFLAGS: -s

From 37f5576c389a4257917f5621680aac1f46b74ad4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 3 May 2023 18:02:39 +0400
Subject: [PATCH 133/676] Get rid of -Ofast on Linux

This seem to make some miscompilation that lead to hangs
---
 Telegram/build/docker/centos_env/Dockerfile | 9 +++------
 cmake                                       | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 2e57cf3a1..973148b48 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -51,7 +51,7 @@ FROM builder-base AS builder
 ENV AR gcc-ar
 ENV RANLIB gcc-ranlib
 ENV NM gcc-nm
-ENV CFLAGS {% if DEBUG %}-g{% endif %} -Ofast {% if LTO %}{{ CFLAGS_LTO }}{% endif %} -pipe -fPIC -fstack-protector-all -fstack-clash-protection -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS
+ENV CFLAGS {% if DEBUG %}-g{% endif %} -O3 {% if LTO %}{{ CFLAGS_LTO }}{% endif %} -pipe -fPIC -fstack-protector-all -fstack-clash-protection -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS
 ENV CXXFLAGS $CFLAGS
 
 FROM builder AS patches
@@ -187,7 +187,7 @@ FROM builder AS opus
 RUN git clone -b v1.3.1 --depth=1 {{ GIT }}/xiph/opus.git \
 	&& cd opus \
 	&& ./autogen.sh \
-	&& ./configure --enable-float-approx \
+	&& ./configure \
 	&& make -j$(nproc) \
 	&& make DESTDIR="{{ LibrariesPath }}/opus-cache" install \
 	&& cd .. \
@@ -304,10 +304,7 @@ RUN git clone -b v0.8.1 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 FROM builder AS rnnoise
 RUN git clone -b master --depth=1 {{ GIT }}/desktop-app/rnnoise \
 	&& cd rnnoise \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_C_FLAGS="$CFLAGS -DFLOAT_APPROX" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS -DFLOAT_APPROX" \
+	&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=None \
 	&& cmake --build build --parallel \
 	&& mkdir -p "{{ LibrariesPath }}/rnnoise-cache/usr/local/include" \
 	&& cp "include/rnnoise.h" "{{ LibrariesPath }}/rnnoise-cache/usr/local/include/" \
diff --git a/cmake b/cmake
index c03178c09..d625b4d1b 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit c03178c09be027627321704d3a9b81b032159dbd
+Subproject commit d625b4d1ba9dbcbb2f7a8f6555e1658569aaa093

From 0a011db483eaaf4f9eec33c6af77d3bdf049c816 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 6 May 2023 02:34:14 +0400
Subject: [PATCH 134/676] Get rid of DESKTOP_APP_DISABLE_DBUS_INTEGRATION

Desktop App Toolkit uses GLib as the D-Bus library for quite long time, but GLib is not only a D-Bus library, it's more a basic library providing native Linux APIs implementing various specs. The situation right now is that DESKTOP_APP_DISABLE_DBUS_INTEGRATION disables not only D-Bus code but all the native API integration such as MIME handling or .desktop file parsing. In other words, the option disables native Linux APIs on Linux what is absurd and doesn't have any sense.
---
 .github/workflows/linux.yml                   |  1 -
 Telegram/CMakeLists.txt                       | 23 ++------
 .../platform/linux/file_utilities_linux.cpp   | 10 ----
 .../platform/linux/main_window_linux.cpp      | 11 +---
 .../notifications_manager_linux_dummy.cpp     | 56 -------------------
 .../platform/linux/specific_linux.cpp         | 27 +--------
 .../window/notifications_manager.cpp          | 10 ++--
 Telegram/lib_base                             |  2 +-
 Telegram/lib_ui                               |  2 +-
 Telegram/lib_webview                          |  2 +-
 cmake                                         |  2 +-
 11 files changed, 17 insertions(+), 129 deletions(-)
 delete mode 100644 Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6f2ec36ec..162b6224d 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -57,7 +57,6 @@ jobs:
       matrix:
         defines:
           - ""
-          - "DESKTOP_APP_DISABLE_DBUS_INTEGRATION"
           - "DESKTOP_APP_DISABLE_X11_INTEGRATION"
           - "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"
 
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 008c71b15..02b9b8cdb 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1082,7 +1082,6 @@ PRIVATE
     platform/linux/integration_linux.h
     platform/linux/main_window_linux.cpp
     platform/linux/main_window_linux.h
-    platform/linux/notifications_manager_linux_dummy.cpp
     platform/linux/notifications_manager_linux.cpp
     platform/linux/notifications_manager_linux.h
     platform/linux/overlay_widget_linux.h
@@ -1401,18 +1400,6 @@ if (NOT build_winstore)
     )
 endif()
 
-if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-    remove_target_sources(Telegram ${src_loc}
-        platform/linux/linux_xdp_open_with_dialog.cpp
-        platform/linux/linux_xdp_open_with_dialog.h
-        platform/linux/notifications_manager_linux.cpp
-    )
-else()
-    remove_target_sources(Telegram ${src_loc}
-        platform/linux/notifications_manager_linux_dummy.cpp
-    )
-endif()
-
 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
     remove_target_sources(Telegram ${src_loc}
         platform/linux/linux_wayland_integration.cpp
@@ -1522,12 +1509,10 @@ elseif (APPLE)
         endif()
     endif()
 else()
-    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_glibmm
-        )
-    endif()
+    target_link_libraries(Telegram
+    PRIVATE
+        desktop-app::external_glibmm
+    )
 
     if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
         target_link_libraries(Telegram
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index b90b70a45..aad9fe167 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -7,23 +7,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "platform/linux/file_utilities_linux.h"
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include "base/platform/linux/base_linux_app_launch_context.h"
 #include "platform/linux/linux_xdp_open_with_dialog.h"
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 #include <QtGui/QDesktopServices>
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <glibmm.h>
 #include <giomm.h>
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 namespace Platform {
 namespace File {
 
 void UnsafeOpenUrl(const QString &url) {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	try {
 		if (Gio::AppInfo::launch_default_for_uri(
 			url.toStdString(),
@@ -33,7 +28,6 @@ void UnsafeOpenUrl(const QString &url) {
 	} catch (const std::exception &e) {
 		LOG(("App Error: %1").arg(QString::fromStdString(e.what())));
 	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 	QDesktopServices::openUrl(url);
 }
@@ -43,17 +37,14 @@ void UnsafeOpenEmailLink(const QString &email) {
 }
 
 bool UnsafeShowOpenWith(const QString &filepath) {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	if (internal::ShowXDPOpenWithDialog(filepath)) {
 		return true;
 	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 	return false;
 }
 
 void UnsafeLaunch(const QString &filepath) {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	try {
 		if (Gio::AppInfo::launch_default_for_uri(
 			Glib::filename_to_uri(filepath.toStdString()),
@@ -67,7 +58,6 @@ void UnsafeLaunch(const QString &filepath) {
 	if (UnsafeShowOpenWith(filepath)) {
 		return;
 	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 	QDesktopServices::openUrl(QUrl::fromLocalFile(filepath));
 }
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index ada8cd6ed..ac9b09201 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -26,15 +26,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "base/platform/base_platform_info.h"
+#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/event_filter.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/ui_utility.h"
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-#include "base/platform/linux/base_linux_glibmm_helper.h"
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xcb_utilities.h"
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -44,10 +41,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QWindow>
 #include <QtWidgets/QMenuBar>
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <glibmm.h>
 #include <giomm.h>
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 namespace Platform {
 namespace {
@@ -177,7 +172,6 @@ void ForceDisabled(QAction *action, bool disabled) {
 	}
 }
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 uint djbStringHash(const std::string &string) {
 	uint hash = 5381;
 	for (const auto &curChar : string) {
@@ -185,7 +179,6 @@ uint djbStringHash(const std::string &string) {
 	}
 	return hash;
 }
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 } // namespace
 
@@ -245,7 +238,6 @@ void MainWindow::updateWindowIcon() {
 }
 
 void MainWindow::updateUnityCounter() {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	const auto launcherUrl = Glib::ustring(
 		"application://"
 			+ QGuiApplication::desktopFileName().toStdString());
@@ -281,7 +273,6 @@ void MainWindow::updateUnityCounter() {
 			}));
 	} catch (...) {
 	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 }
 
 void MainWindow::createGlobalMenu() {
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
deleted file mode 100644
index e5ac40868..000000000
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "platform/linux/notifications_manager_linux.h"
-
-#include "base/platform/base_platform_info.h"
-
-namespace Platform {
-namespace Notifications {
-
-bool SkipToastForCustom() {
-	return false;
-}
-
-void MaybePlaySoundForCustom(Fn<void()> playSound) {
-	playSound();
-}
-
-void MaybeFlashBounceForCustom(Fn<void()> flashBounce) {
-	flashBounce();
-}
-
-bool WaitForInputForCustom() {
-	return true;
-}
-
-bool Supported() {
-	return false;
-}
-
-bool Enforced() {
-	// Wayland doesn't support positioning
-	// and custom notifications don't work here
-	return IsWayland();
-}
-
-bool ByDefault() {
-	return false;
-}
-
-void Create(Window::Notifications::System *system) {
-	if (Enforced()) {
-		using DummyManager = Window::Notifications::DummyManager;
-		system->setManager(std::make_unique<DummyManager>(system));
-	} else {
-		system->setManager(nullptr);
-	}
-}
-
-} // namespace Notifications
-} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index a8b2c6a3e..2c29f1dd2 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -10,6 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/random.h"
 #include "base/options.h"
 #include "base/platform/base_platform_info.h"
+#include "base/platform/linux/base_linux_glibmm_helper.h"
+#include "base/platform/linux/base_linux_dbus_utilities.h"
+#include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/linux_wayland_integration.h"
 #include "platform/platform_launcher.h"
@@ -24,12 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_controller.h"
 #include "webview/platform/linux/webview_linux_webkitgtk.h"
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-#include "base/platform/linux/base_linux_glibmm_helper.h"
-#include "base/platform/linux/base_linux_dbus_utilities.h"
-#include "base/platform/linux/base_linux_xdp_utilities.h"
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xcb_utilities.h"
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -42,10 +39,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <kshell.h>
 #include <ksandbox.h>
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <glibmm.h>
 #include <giomm.h>
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -68,7 +63,6 @@ typedef int (*XErrorHandler)(Display*, XErrorEvent*);
 typedef XErrorHandler (*LPXSETERRORHANDLER)(XErrorHandler);
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 typedef GApplication TDesktopApplication;
 typedef GApplicationClass TDesktopApplicationClass;
 
@@ -119,14 +113,12 @@ static void t_desktop_application_class_init(
 
 static void t_desktop_application_init(TDesktopApplication *application) {
 }
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 namespace Platform {
 namespace {
 
 constexpr auto kDesktopFile = ":/misc/org.telegram.desktop.desktop"_cs;
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 bool PortalAutostart(bool start, bool silent) {
 	if (cExeName().isEmpty()) {
 		return false;
@@ -564,7 +556,6 @@ void InstallLauncher() {
 		applicationsPath
 	});
 }
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 } // namespace
 
@@ -584,7 +575,6 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 }
 
 std::optional<bool> IsDarkMode() {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	[[maybe_unused]] static const auto Inited = [] {
 		using XDPSettingWatcher = base::Platform::XDP::SettingWatcher;
 		static const XDPSettingWatcher Watcher(
@@ -619,21 +609,15 @@ std::optional<bool> IsDarkMode() {
 		}
 	} catch (...) {
 	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 	return std::nullopt;
 }
 
 bool AutostartSupported() {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	return true;
-#else // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-	return false;
-#endif // DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 }
 
 void AutostartToggle(bool enabled, Fn<void(bool)> done) {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	const auto success = [&] {
 		const auto silent = !done;
 
@@ -660,7 +644,6 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
 	if (done) {
 		done(enabled && success);
 	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 }
 
 bool AutostartSkip() {
@@ -775,7 +758,6 @@ void start() {
 	qputenv("PULSE_PROP_application.name", AppName.utf8());
 	qputenv("PULSE_PROP_application.icon_name", base::IconName().toLatin1());
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	Glib::set_prgname(cExeName().toStdString());
 	Glib::set_application_name(AppName.data());
 
@@ -793,7 +775,6 @@ void start() {
 		"Application was built without embedded fonts, "
 		"this may lead to font issues.");
 #endif // DESKTOP_APP_USE_PACKAGED_FONTS
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 	Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-%4"_q.arg(
 		QDir::tempPath(),
@@ -887,10 +868,8 @@ void start() {
 	}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	InstallLauncher();
 	LaunchGApplication();
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 }
 
 void finish() {
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 1d69be114..da8bc9a1f 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -40,9 +40,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QWindow>
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#if __has_include(<giomm.h>)
 #include <giomm.h>
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#endif // __has_include(<giomm.h>)
 
 namespace Window {
 namespace Notifications {
@@ -90,11 +90,11 @@ base::options::toggle OptionGNotification({
 	.description = "Force enable GLib's GNotification."
 		" When disabled, autodetect is used.",
 	.scope = [] {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#if __has_include(<giomm.h>)
 		return bool(Gio::Application::get_default());
-#else // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#else // __has_include(<giomm.h>)
 		return false;
-#endif // DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#endif // __has_include(<giomm.h>)
 	},
 	.restartRequired = true,
 });
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 02462671e..05f50c86b 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 02462671e56bcf5498f1ae00806a680791be3b0a
+Subproject commit 05f50c86bc721d67df2378d27d5a48c4890a8f07
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 7c9aa9453..e8857f579 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7c9aa94533276d693942ed0ffb39d3d66a49e124
+Subproject commit e8857f5792c8c8bc721be0607e07ccd5616b939b
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index f632fc84c..2e313690d 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit f632fc84cbc62ae8abbbd05f81d472757a337c11
+Subproject commit 2e313690d9765f28fc98c6c79473296de3a3d85c
diff --git a/cmake b/cmake
index d625b4d1b..9abd685bf 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit d625b4d1ba9dbcbb2f7a8f6555e1658569aaa093
+Subproject commit 9abd685bf498f2410dfbc42f77c99e35ddedca94

From 0b4ebcbae4d74415acf0e3e86ba5cf7a23f85f02 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 6 May 2023 02:35:46 +0400
Subject: [PATCH 135/676] Warn if incompatible event loop is detected

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

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 2c29f1dd2..d176b9b45 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QSystemTrayIcon>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QProcess>
+#include <QtCore/QAbstractEventDispatcher>
 
 #include <kshell.h>
 #include <ksandbox.h>
@@ -854,6 +855,12 @@ void start() {
 	LOG(("Icon theme: %1").arg(QIcon::themeName()));
 	LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
 
+	if (!QCoreApplication::eventDispatcher()->inherits(
+		"QEventDispatcherGlib")) {
+		g_warning("Qt is running without GLib event loop integration, "
+			"except various functionality to not to work.");
+	}
+
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 	// tdesktop doesn't use xlib by itself,
 	// but some libraries it depends on may do

From 0ca983ed718b4f157864bc13408abaa36417cc81 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 23 Apr 2023 00:43:50 +0400
Subject: [PATCH 136/676] Add cppgir dependencies to Dockerfile

---
 Telegram/build/docker/centos_env/Dockerfile | 22 ++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 973148b48..f22f5deea 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -22,11 +22,12 @@ ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/loc
 RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
 	&& yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm \
 	&& yum -y install centos-release-scl \
-	&& yum -y install git rh-python38-python-pip autoconf automake libtool patch gperf \
+	&& yum -y install git rh-python38-python-pip rh-python38-python-devel \
+		autoconf automake libtool patch gperf flex \
 		fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
 		pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel \
-		libdrm-devel vulkan-devel gtk3-devel \
-		perl-XML-Parser pkgconfig bison yasm file which xorg-x11-util-macros \
+		libdrm-devel vulkan-devel boost169-devel fmt-devel \
+		gtk3-devel perl-XML-Parser pkgconfig bison yasm file which xorg-x11-util-macros \
 		devtoolset-10-make devtoolset-10-gcc devtoolset-10-gcc-c++ \
 		devtoolset-10-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \
 		llvm-toolset-7.0-llvm-devel \
@@ -693,6 +694,18 @@ RUN git clone -b 2.76.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
 	&& cd .. \
 	&& rm -rf glibmm
 
+FROM patches AS gobject-introspection
+COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
+COPY --link --from=glibmm {{ LibrariesPath }}/glibmm-cache /
+
+RUN git clone -b 1.76.1 --depth=1 {{ GIT }}/GNOME/gobject-introspection.git \
+	&& cd gobject-introspection \
+	&& meson build --buildtype=plain \
+	&& meson compile -C build \
+	&& DESTDIR="{{ LibrariesPath }}/gobject-introspection-cache" meson install -C build \
+	&& cd .. \
+	&& rm -rf gobject-introspection
+
 FROM patches AS qt
 COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
 COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
@@ -839,6 +852,7 @@ COPY --link --from=openal {{ LibrariesPath }}/openal-cache /
 COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
 COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
 COPY --link --from=glibmm {{ LibrariesPath }}/glibmm-cache /
+COPY --link --from=gobject-introspection {{ LibrariesPath }}/gobject-introspection-cache /
 COPY --link --from=qt {{ LibrariesPath }}/qt-cache /
 COPY --link --from=breakpad {{ LibrariesPath }}/breakpad-cache /
 COPY --link --from=webrtc {{ LibrariesPath }}/tg_owt tg_owt
@@ -851,6 +865,8 @@ COPY --link --from=webrtc_debug {{ LibrariesPath }}/tg_owt/out/Debug tg_owt/out/
 WORKDIR ../tdesktop
 ENV QT {{ QT }}
 ENV OPENSSL_ROOT_DIR {{ OPENSSL_PREFIX }}
+ENV BOOST_INCLUDEDIR /usr/include/boost169
+ENV BOOST_LIBRARYDIR /usr/lib64/boost169
 
 VOLUME [ "/usr/src/tdesktop" ]
 ENTRYPOINT [ "scl", "enable", "rh-python38", "--", "scl", "enable", "llvm-toolset-7.0", "--", "scl", "enable", "devtoolset-10", "--" ]

From 0ca9bbafad81836a9738c66d00a16468a9d3fac8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 23 Apr 2023 00:44:04 +0400
Subject: [PATCH 137/676] Update cmake on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f22f5deea..a118f3ed3 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -5,7 +5,7 @@
 {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
 {%- set OPENSSL_VER = "1_1_1" -%}
 {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
-{%- set CMAKE_VER = "3.24.3" -%}
+{%- set CMAKE_VER = "3.26.3" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
 {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -D_GLIBCXX_ASSERTIONS" -%}
 {%- set CFLAGS_LTO = "-flto=auto -ffat-lto-objects" -%}

From bb008911b0d75b03eb2dca224cc8148c7572ed35 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 23 Apr 2023 00:44:46 +0400
Subject: [PATCH 138/676] Get rid of SystemMediaControls::setServiceName usage

---
 .../SourceFiles/media/system_media_controls_manager.cpp    | 6 ------
 snap/snapcraft.yaml                                        | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/media/system_media_controls_manager.cpp b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
index fc6105ab3..4fb87dc90 100644
--- a/Telegram/SourceFiles/media/system_media_controls_manager.cpp
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
@@ -21,8 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/streaming/media_streaming_player.h"
 #include "ui/text/format_song_document_name.h"
 
-#include <ksandbox.h>
-
 namespace Media {
 namespace {
 
@@ -50,10 +48,6 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 		base::Platform::SystemMediaControls::PlaybackStatus;
 	using Command = base::Platform::SystemMediaControls::Command;
 
-	// Flatpak provides default permission to MPRIS, but not snap
-	if (!KSandbox::isFlatpak()) {
-		_controls->setServiceName(u"tdesktop"_q);
-	}
 	_controls->setApplicationName(AppName.utf16());
 	const auto inited = _controls->init();
 	if (!inited) {
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index bf5658bef..c0cb0a3a4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -38,7 +38,7 @@ apps:
       - wayland
       - x11
     slots:
-      - tdesktop-mpris
+      - mpris
 
 hooks:
   configure:
@@ -66,11 +66,6 @@ plugs:
     target: $SNAP/data-dir/sounds
     default-provider: gtk-common-themes
 
-slots:
-  tdesktop-mpris:
-    interface: mpris
-    name: tdesktop
-
 layout:
   /usr/share/alsa:
     bind: $SNAP/usr/share/alsa

From 2ff341b7d350009b0c5cabe92b3e2465960b86a7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 15 May 2023 09:48:57 +0400
Subject: [PATCH 139/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 05f50c86b..17a19f39d 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 05f50c86bc721d67df2378d27d5a48c4890a8f07
+Subproject commit 17a19f39d2a1204a90d74516c28fd27c522ded17
diff --git a/cmake b/cmake
index 9abd685bf..dee3777ff 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9abd685bf498f2410dfbc42f77c99e35ddedca94
+Subproject commit dee3777ffd54a40e966914a2942f7cdd92b93c86

From db60bee7dcdd3ec42219023e656899a813023743 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 8 May 2023 10:31:01 +0400
Subject: [PATCH 140/676] Implement screen locker monitor on Linux

---
 Telegram/CMakeLists.txt                       |   3 +
 .../platform/linux/integration_linux.cpp      |  83 ++++++++
 .../linux/org.freedesktop.portal.Inhibit.xml  | 186 ++++++++++++++++++
 3 files changed, 272 insertions(+)
 create mode 100644 Telegram/SourceFiles/platform/linux/org.freedesktop.portal.Inhibit.xml

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 02b9b8cdb..2d39276ac 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1514,6 +1514,9 @@ else()
         desktop-app::external_glibmm
     )
 
+    include(${cmake_helpers_loc}/external/glib/generate_dbus.cmake)
+    generate_dbus(Telegram org.freedesktop.portal. XdpInhibit ${src_loc}/platform/linux/org.freedesktop.portal.Inhibit.xml)
+
     if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
         target_link_libraries(Telegram
         PRIVATE
diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 0af71d7c1..54176c3e0 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -8,13 +8,96 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/integration_linux.h"
 
 #include "platform/platform_integration.h"
+#include "base/platform/linux/base_linux_xdp_utilities.h"
+#include "core/application.h"
+#include "base/random.h"
+
+#include <xdpinhibit/xdpinhibit.hpp>
+
+using namespace gi::repository;
 
 namespace Platform {
 namespace {
 
 class LinuxIntegration final : public Integration {
+public:
+	LinuxIntegration();
+
+	void init() override;
+
+private:
+	[[nodiscard]] XdpInhibit::Inhibit inhibit() {
+		return *_inhibitProxy;
+	}
+
+	gi::result<XdpInhibit::InhibitProxy> _inhibitProxy;
 };
 
+LinuxIntegration::LinuxIntegration()
+: _inhibitProxy(
+	XdpInhibit::InhibitProxy::new_for_bus_sync(
+		Gio::BusType::SESSION_,
+		Gio::DBusProxyFlags::DO_NOT_AUTO_START_AT_CONSTRUCTION_,
+		std::string(base::Platform::XDP::kService),
+		std::string(base::Platform::XDP::kObjectPath))) {
+}
+
+void LinuxIntegration::init() {
+	if (!_inhibitProxy) {
+		return;
+	}
+
+	auto uniqueName = _inhibitProxy->get_connection().get_unique_name();
+	uniqueName.erase(0, 1);
+	uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
+
+	const auto handleToken = "tdesktop"
+		+ std::to_string(base::RandomValue<uint>());
+
+	const auto sessionHandleToken = "tdesktop"
+		+ std::to_string(base::RandomValue<uint>());
+
+	const auto sessionHandle = "/org/freedesktop/portal/desktop/session/"
+		+ uniqueName
+		+ '/'
+		+ sessionHandleToken;
+
+	inhibit().signal_state_changed().connect([
+		mySessionHandle = sessionHandle
+	](
+			XdpInhibit::Inhibit,
+			const std::string &sessionHandle,
+			GLib::Variant state) {
+		if (sessionHandle != mySessionHandle) {
+			return;
+		}
+
+		Core::App().setScreenIsLocked(
+			GLib::VariantDict::new_(
+				state
+			).lookup_value(
+				"screensaver-active"
+			).get_boolean()
+		);
+	});
+
+	auto options = std::array{
+		GLib::Variant::new_dict_entry(
+			GLib::Variant::new_string("handle_token"),
+			GLib::Variant::new_variant(
+				GLib::Variant::new_string(handleToken))),
+		GLib::Variant::new_dict_entry(
+			GLib::Variant::new_string("session_handle_token"),
+			GLib::Variant::new_variant(
+				GLib::Variant::new_string(sessionHandleToken))),
+	};
+
+	inhibit().call_create_monitor(
+		{},
+		GLib::Variant::new_array(options.data(), options.size()),
+		nullptr);
+}
+
 } // namespace
 
 std::unique_ptr<Integration> CreateIntegration() {
diff --git a/Telegram/SourceFiles/platform/linux/org.freedesktop.portal.Inhibit.xml b/Telegram/SourceFiles/platform/linux/org.freedesktop.portal.Inhibit.xml
new file mode 100644
index 000000000..e91bd22d3
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/org.freedesktop.portal.Inhibit.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (C) 2016 Red Hat, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+ Author: Matthias Clasen <mclasen@redhat.com>
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.portal.Inhibit:
+      @short_description: Portal for inhibiting session transitions
+
+      This simple interface lets sandboxed applications inhibit the user
+      session from ending, suspending, idling or getting switched away.
+
+      This documentation describes version 3 of this interface.
+  -->
+  <interface name="org.freedesktop.portal.Inhibit">
+    <!--
+        Inhibit:
+        @window: Identifier for the window
+        @flags: Flags identifying what is inhibited
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Inhibits a session status changes. To remove the inhibition,
+        call org.freedesktop.portal.Request.Close() on the returned
+        handle.
+
+        The flags determine what changes are inhibited:
+        <simplelist>
+          <member>1: Logout</member>
+          <member>2: User Switch</member>
+          <member>4: Suspend</member>
+          <member>8: Idle</member>
+        </simplelist>
+
+        Supported keys in the @options vardict include:
+        <variablelist>
+          <varlistentry>
+            <term>handle_token s</term>
+            <listitem><para>
+              A string that will be used as the last element of the @handle. Must be a valid
+              object path element. See the #org.freedesktop.portal.Request documentation for
+              more information about the @handle.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>reason s</term>
+            <listitem><para>User-visible reason for the inhibition.</para></listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="Inhibit">
+      <arg type="s" name="window" direction="in"/>
+      <arg type="u" name="flags" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+
+    <!--
+        CreateMonitor:
+        @window: the parent window
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Request object representing this call
+
+        Creates a monitoring session. While this session is
+        active, the caller will receive StateChanged signals
+        with updates on the session state.
+
+        A successfully created session can at any time be closed using
+        org.freedesktop.portal.Session::Close, or may at any time be closed
+        by the portal implementation, which will be signalled via
+        #org.freedesktop.portal.Session::Closed.
+
+        Supported keys in the @options vardict include:
+        <variablelist>
+          <varlistentry>
+            <term>handle_token s</term>
+            <listitem><para>
+              A string that will be used as the last element of the @handle. Must be a valid
+              object path element. See the #org.freedesktop.portal.Request documentation for
+              more information about the @handle.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>session_handle_token s</term>
+            <listitem><para>
+              A string that will be used as the last element of the session handle. Must be a valid
+              object path element. See the #org.freedesktop.portal.Session documentation for
+              more information about the session handle.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        The following results get returned via the #org.freedesktop.portal.Request::Response signal:
+        <variablelist>
+          <varlistentry>
+            <term>session_handle o</term>
+            <listitem><para>
+              The session handle. An object path for the
+              #org.freedesktop.portal.Session object representing the created
+              session.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+
+        This method was added in version 2 of this interface.
+    -->
+    <method name="CreateMonitor">
+      <arg type="s" name="window" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+
+    <!--
+        StateChanged:
+        @session_handle: Object path for the #org.freedesktop.portal.Session object
+        @state: Vardict with information about the session state
+
+        The StateChanged signal is sent to active monitoring sessions when
+        the session state changes.
+
+        When the session state changes to 'Query End', clients with active monitoring
+        sessions are expected to respond by calling
+        org.freedesktop.portal.Inhibit.QueryEndResponse() within a second
+        of receiving the StateChanged signal. They may call org.freedesktop.portal.Inhibit.Inhibit()
+        first to inhibit logout, to prevent the session from proceeding to the Ending state.
+
+        The following information may get returned in the @state vardict:
+        <variablelist>
+          <varlistentry>
+            <term>screensaver-active b</term>
+            <listitem><para>
+              Whether the screensaver is active.
+            </para></listitem>
+          </varlistentry>
+           <varlistentry>
+            <term>session-state u</term>
+            <listitem><para>
+              The state of the session. This member is new in version 3.
+            </para>
+            <simplelist>
+              <member>1: Running</member>
+              <member>2: Query End</member>
+              <member>3: Ending</member>
+            </simplelist>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <signal name="StateChanged">
+      <arg type="o" name="session_handle" direction="out"/>
+      <arg type="a{sv}" name="state" direction="out"/>
+    </signal>
+
+    <!--
+      QueryEndResponse:
+      @session_handle: Object path for the #org.freedesktop.portal.Session object
+
+      Acknowledges that the caller received the #org.freedesktop.portal.Inhibit::StateChanged
+      signal. This method should be called within one second or receiving a StateChanged
+      signal with the 'Query End' state.
+
+      Since version 3.
+    -->
+    <method name="QueryEndResponse">
+      <arg type="o" name="session_handle" direction="in"/>
+    </method>
+
+    <property name="version" type="u" access="read"/>
+  </interface>
+</node>

From 627c870dd5e6cecffa7153e8c0a103ac13951861 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 11 May 2023 06:11:07 +0400
Subject: [PATCH 141/676] Get rid of qt5compat dependency

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index a118f3ed3..4068f53ef 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -727,7 +727,7 @@ ENV OPENSSL_ROOT_DIR {{ OPENSSL_PREFIX }}
 
 RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }} \
 	&& cd qt_{{ QT }} \
-	&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools \
+	&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
 	&& cd qtbase \
 	&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
 	&& cd ../qtdeclarative \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 183eaabd0..f01db1f26 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1302,7 +1302,7 @@ if buildQt6:
 mac:
     git clone -b v6.3.2 https://code.qt.io/qt/qt5.git qt_6_3_2
     cd qt_6_3_2
-    perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
+    perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
 depends:patches/qtbase_6.3.2/*.patch
     cd qtbase
 
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index ae89fefd2..2fd3a249a 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit ae89fefd239ecc47d4dab7ba29f9e230376a57d3
+Subproject commit 2fd3a249a984019c79d8cbfac33ac92ed58fbf30
diff --git a/cmake b/cmake
index dee3777ff..a7d000be7 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit dee3777ffd54a40e966914a2942f7cdd92b93c86
+Subproject commit a7d000be71db475f034c42687e7905fc8116050f
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c0cb0a3a4..b170f1b5e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -459,7 +459,7 @@ parts:
       QT=6.5.0
 
       git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git .
-      git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools
+      git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
 
       cd qtbase
       find $CRAFT_STAGE/patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply

From 2675b5df3b995ca0f2a79566ee0a6c8a6fd99c74 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 14 May 2023 09:21:40 +0400
Subject: [PATCH 142/676] Use QGuiApplication::setBadgeNumber API since Qt 6.6
 on Linux

---
 .../platform/linux/main_window_linux.cpp      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index ac9b09201..0598d9fbd 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -172,14 +172,6 @@ void ForceDisabled(QAction *action, bool disabled) {
 	}
 }
 
-uint djbStringHash(const std::string &string) {
-	uint hash = 5381;
-	for (const auto &curChar : string) {
-		hash = (hash << 5) + hash + curChar;
-	}
-	return hash;
-}
-
 } // namespace
 
 MainWindow::MainWindow(not_null<Window::Controller*> controller)
@@ -238,6 +230,17 @@ void MainWindow::updateWindowIcon() {
 }
 
 void MainWindow::updateUnityCounter() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+	qApp->setBadgeNumber(Core::App().unreadBadge());
+#else // Qt >= 6.6.0
+	static const auto djbStringHash = [](const std::string &string) {
+		uint hash = 5381;
+		for (const auto &curChar : string) {
+			hash = (hash << 5) + hash + curChar;
+		}
+		return hash;
+	};
+
 	const auto launcherUrl = Glib::ustring(
 		"application://"
 			+ QGuiApplication::desktopFileName().toStdString());
@@ -273,6 +276,7 @@ void MainWindow::updateUnityCounter() {
 			}));
 	} catch (...) {
 	}
+#endif // Qt < 6.6.0
 }
 
 void MainWindow::createGlobalMenu() {

From 0ffaff2d8b5d8b41b6a463ce98978ffd376a22b8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 13 May 2023 21:01:06 +0400
Subject: [PATCH 143/676] Support Qt 6.5 dark mode API

---
 .../platform/linux/integration_linux.cpp      | 22 +++++++++-
 .../platform/linux/specific_linux.cpp         | 25 +----------
 .../platform/mac/main_window_mac.mm           | 20 +++++++++
 .../SourceFiles/platform/mac/specific_mac.h   |  9 ----
 .../SourceFiles/platform/mac/specific_mac.mm  | 41 +++++--------------
 .../platform/mac/specific_mac_p.mm            |  5 +++
 .../SourceFiles/platform/platform_specific.h  |  5 +--
 .../platform/win/integration_win.cpp          |  2 +
 .../platform/win/main_window_win.cpp          |  2 +-
 .../SourceFiles/platform/win/specific_win.cpp |  2 +
 .../SourceFiles/settings/settings_chat.cpp    |  2 +-
 .../window/themes/window_theme.cpp            | 20 +++++++++
 12 files changed, 87 insertions(+), 68 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 54176c3e0..fd8553f6f 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -8,11 +8,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/integration_linux.h"
 
 #include "platform/platform_integration.h"
+#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "core/application.h"
+#include "core/core_settings.h"
 #include "base/random.h"
 
 #include <xdpinhibit/xdpinhibit.hpp>
+#include <glibmm.h>
 
 using namespace gi::repository;
 
@@ -31,6 +34,7 @@ private:
 	}
 
 	gi::result<XdpInhibit::InhibitProxy> _inhibitProxy;
+	base::Platform::XDP::SettingWatcher _darkModeWatcher;
 };
 
 LinuxIntegration::LinuxIntegration()
@@ -39,7 +43,23 @@ LinuxIntegration::LinuxIntegration()
 		Gio::BusType::SESSION_,
 		Gio::DBusProxyFlags::DO_NOT_AUTO_START_AT_CONSTRUCTION_,
 		std::string(base::Platform::XDP::kService),
-		std::string(base::Platform::XDP::kObjectPath))) {
+		std::string(base::Platform::XDP::kObjectPath)))
+, _darkModeWatcher([](
+	const Glib::ustring &group,
+	const Glib::ustring &key,
+	const Glib::VariantBase &value) {
+	if (group == "org.freedesktop.appearance"
+		&& key == "color-scheme") {
+		try {
+			const auto ivalue = base::Platform::GlibVariantCast<uint>(value);
+
+			crl::on_main([=] {
+				Core::App().settings().setSystemDarkMode(ivalue == 1);
+			});
+		} catch (...) {
+		}
+	}
+}) {
 }
 
 void LinuxIntegration::init() {
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index d176b9b45..1ea753fd3 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -575,30 +575,8 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 #endif // !Q_OS_LINUX || Qt < 6.2.0
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 std::optional<bool> IsDarkMode() {
-	[[maybe_unused]] static const auto Inited = [] {
-		using XDPSettingWatcher = base::Platform::XDP::SettingWatcher;
-		static const XDPSettingWatcher Watcher(
-			[=](
-				const Glib::ustring &group,
-				const Glib::ustring &key,
-				const Glib::VariantBase &value) {
-				if (group == "org.freedesktop.appearance"
-					&& key == "color-scheme") {
-					try {
-						const auto ivalue = base::Platform::GlibVariantCast<uint>(value);
-
-						crl::on_main([=] {
-							Core::App().settings().setSystemDarkMode(ivalue == 1);
-						});
-					} catch (...) {
-					}
-				}
-			});
-
-		return true;
-	}();
-
 	try {
 		const auto result = base::Platform::XDP::ReadSetting(
 			"org.freedesktop.appearance",
@@ -613,6 +591,7 @@ std::optional<bool> IsDarkMode() {
 
 	return std::nullopt;
 }
+#endif // Qt < 6.5.0
 
 bool AutostartSupported() {
 	return true;
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 950fadaa8..71096fac0 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QClipboard>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CFURL.h>
@@ -112,7 +113,11 @@ private:
 
 - (void) darkModeChanged:(NSNotification *)aNotification {
 	Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+		QWindowSystemInterface::handleThemeChange();
+#else // Qt >= 6.5.0
 		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
+#endif // Qt < 6.5.0
 	});
 }
 
@@ -149,6 +154,21 @@ void ForceDisabled(QAction *action, bool disabled) {
 	}
 }
 
+QString strNotificationAboutThemeChange() {
+	const uint32 letters[] = { 0x75E86256, 0xD03E11B1, 0x4D92201D, 0xA2144987, 0x99D5B34F, 0x037589C3, 0x38ED2A7C, 0xD2371ABC, 0xDC98BB02, 0x27964E1B, 0x01748AED, 0xE06679F8, 0x761C9580, 0x4F2595BF, 0x6B5FCBF4, 0xE4D9C24E, 0xBA2F6AB5, 0xE6E3FA71, 0xF2CFC255, 0x56A50C19, 0x43AE1239, 0x77CA4254, 0x7D189A89, 0xEA7663EE, 0x84CEB554, 0xA0ADF236, 0x886512D4, 0x7D3FBDAF, 0x85C4BE4F, 0x12C8255E, 0x9AD8BD41, 0xAC154683, 0xB117598B, 0xDFD9F947, 0x63F06C7B, 0x6340DCD6, 0x3AAE6B3E, 0x26CB125A };
+	return Platform::MakeFromLetters(letters);
+}
+
+QString strNotificationAboutScreenLocked() {
+	const uint32 letters[] = { 0x34B47F28, 0x47E95179, 0x73D05C42, 0xB4E2A933, 0x924F22D1, 0x4265D8EA, 0x9E4D2CC2, 0x02E8157B, 0x35BF7525, 0x75901A41, 0xB0400FCC, 0xE801169D, 0x4E04B589, 0xC1CEF054, 0xAB2A7EB0, 0x5C67C4F6, 0xA4E2B954, 0xB35E12D2, 0xD598B22B, 0x4E3B8AAB, 0xBEA5E439, 0xFDA8AA3C, 0x1632DBA8, 0x88FE8965 };
+	return Platform::MakeFromLetters(letters);
+}
+
+QString strNotificationAboutScreenUnlocked() {
+	const uint32 letters[] = { 0xF897900B, 0x19A04630, 0x144DA6DF, 0x643CA7ED, 0x81DDA343, 0x88C6B149, 0x5F9A3A15, 0x31804E13, 0xDF2202B8, 0x9BD1B500, 0x61B92735, 0x7DDF5D43, 0xB74E06C3, 0x16FF1665, 0x9098F702, 0x4461DAF0, 0xA3134FA5, 0x52B01D3C, 0x6BC35769, 0xA7CC945D, 0x8B5327C0, 0x7630B9A0, 0x4E52E3CE, 0xED7765E3, 0xCEB7862D, 0xA06B34F0 };
+	return Platform::MakeFromLetters(letters);
+}
+
 } // namespace
 
 MainWindow::Private::Private(not_null<MainWindow*> window)
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 142f4fa57..fb63752c1 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -16,8 +16,6 @@ class LocationPoint;
 
 namespace Platform {
 
-[[nodiscard]] bool IsDarkMenuBar();
-
 inline bool AutostartSupported() {
 	return false;
 }
@@ -70,11 +68,4 @@ void psDownloadPathEnableAccess();
 QByteArray psDownloadPathBookmark(const QString &path);
 QByteArray psPathBookmark(const QString &path);
 
-QString strNotificationAboutThemeChange();
-QString strNotificationAboutScreenLocked();
-QString strNotificationAboutScreenUnlocked();
-QString strStyleOfInterface();
-QString strTitleWrapClass();
-QString strTitleClass();
-
 bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index 3d633d4d1..d795a1c24 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -124,6 +124,14 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 #endif // OS_MAC_STORE
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+namespace {
+
+QString strStyleOfInterface() {
+	const uint32 letters[] = { 0x3BBB7F05, 0xED4C5EC3, 0xC62C15A3, 0x5D10B283, 0x1BB35729, 0x63FB674D, 0xDBE5C174, 0x401EA195, 0x87B0C82A, 0x311BD596, 0x7063ECFA, 0x4AB90C27, 0xDA587DC4, 0x0B6296F8, 0xAA5603FA, 0xE1140A9F, 0x3D12D094, 0x339B5708, 0x712BA5B1 };
+	return Platform::MakeFromLetters(letters);
+}
+
 bool IsDarkMenuBar() {
 	bool result = false;
 	@autoreleasepool {
@@ -137,11 +145,14 @@ bool IsDarkMenuBar() {
 	return result;
 }
 
+} // namespace
+
 std::optional<bool> IsDarkMode() {
 	return IsMac10_14OrGreater()
 		? std::make_optional(IsDarkMenuBar())
 		: std::nullopt;
 }
+#endif // Qt < 6.5.0
 
 void WriteCrashDumpDetails() {
 #ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
@@ -272,33 +283,3 @@ QByteArray psDownloadPathBookmark(const QString &path) {
 bool psLaunchMaps(const Data::LocationPoint &point) {
 	return QDesktopServices::openUrl(u"https://maps.apple.com/?q=Point&z=16&ll=%1,%2"_q.arg(point.latAsString()).arg(point.lonAsString()));
 }
-
-QString strNotificationAboutThemeChange() {
-	const uint32 letters[] = { 0x75E86256, 0xD03E11B1, 0x4D92201D, 0xA2144987, 0x99D5B34F, 0x037589C3, 0x38ED2A7C, 0xD2371ABC, 0xDC98BB02, 0x27964E1B, 0x01748AED, 0xE06679F8, 0x761C9580, 0x4F2595BF, 0x6B5FCBF4, 0xE4D9C24E, 0xBA2F6AB5, 0xE6E3FA71, 0xF2CFC255, 0x56A50C19, 0x43AE1239, 0x77CA4254, 0x7D189A89, 0xEA7663EE, 0x84CEB554, 0xA0ADF236, 0x886512D4, 0x7D3FBDAF, 0x85C4BE4F, 0x12C8255E, 0x9AD8BD41, 0xAC154683, 0xB117598B, 0xDFD9F947, 0x63F06C7B, 0x6340DCD6, 0x3AAE6B3E, 0x26CB125A };
-	return Platform::MakeFromLetters(letters);
-}
-
-QString strNotificationAboutScreenLocked() {
-	const uint32 letters[] = { 0x34B47F28, 0x47E95179, 0x73D05C42, 0xB4E2A933, 0x924F22D1, 0x4265D8EA, 0x9E4D2CC2, 0x02E8157B, 0x35BF7525, 0x75901A41, 0xB0400FCC, 0xE801169D, 0x4E04B589, 0xC1CEF054, 0xAB2A7EB0, 0x5C67C4F6, 0xA4E2B954, 0xB35E12D2, 0xD598B22B, 0x4E3B8AAB, 0xBEA5E439, 0xFDA8AA3C, 0x1632DBA8, 0x88FE8965 };
-	return Platform::MakeFromLetters(letters);
-}
-
-QString strNotificationAboutScreenUnlocked() {
-	const uint32 letters[] = { 0xF897900B, 0x19A04630, 0x144DA6DF, 0x643CA7ED, 0x81DDA343, 0x88C6B149, 0x5F9A3A15, 0x31804E13, 0xDF2202B8, 0x9BD1B500, 0x61B92735, 0x7DDF5D43, 0xB74E06C3, 0x16FF1665, 0x9098F702, 0x4461DAF0, 0xA3134FA5, 0x52B01D3C, 0x6BC35769, 0xA7CC945D, 0x8B5327C0, 0x7630B9A0, 0x4E52E3CE, 0xED7765E3, 0xCEB7862D, 0xA06B34F0 };
-	return Platform::MakeFromLetters(letters);
-}
-
-QString strStyleOfInterface() {
-	const uint32 letters[] = { 0x3BBB7F05, 0xED4C5EC3, 0xC62C15A3, 0x5D10B283, 0x1BB35729, 0x63FB674D, 0xDBE5C174, 0x401EA195, 0x87B0C82A, 0x311BD596, 0x7063ECFA, 0x4AB90C27, 0xDA587DC4, 0x0B6296F8, 0xAA5603FA, 0xE1140A9F, 0x3D12D094, 0x339B5708, 0x712BA5B1 };
-	return Platform::MakeFromLetters(letters);
-}
-
-QString strTitleWrapClass() {
-	const uint32 letters[] = { 0x066C95DD, 0xA289D425, 0x000EF1A5, 0xB53C76AA, 0x5096391D, 0x212BF5B8, 0xE6BCA526, 0x2A5B8EC6, 0xC1457BDB, 0xA1BEE033, 0xA8ADFA11, 0xFF151585, 0x36EC257D, 0x4D96241D, 0xD0341BAA, 0xDE2908BF, 0xFE7978E8, 0x26875E1D, 0x70DA5557, 0x14C02B69, 0x7EFF7E69, 0x008D7217, 0x5EB01138 };
-	return Platform::MakeFromLetters(letters);
-}
-
-QString strTitleClass() {
-	const uint32 letters[] = { 0x1054BBE5, 0xA39FC333, 0x54B51E1E, 0x24895213, 0x50B71830, 0xBF07478C, 0x10BA5503, 0x5C70D3E6, 0x65079D9D, 0xACAAF939, 0x6A56C3CD };
-	return Platform::MakeFromLetters(letters);
-}
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index a3231e3e7..e02930c1a 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #if __has_include(<QtCore/QOperatingSystemVersion>)
 #include <QtCore/QOperatingSystemVersion>
 #endif // __has_include(<QtCore/QOperatingSystemVersion>)
+#include <qpa/qwindowsysteminterface.h>
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CFURL.h>
 #include <IOKit/IOKitLib.h>
@@ -195,7 +196,11 @@ ApplicationDelegate *_sharedDelegate = nil;
 			"-receiveWakeNote: received, scheduling detach from audio device"));
 		Media::Audio::ScheduleDetachFromDeviceSafe();
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+		QWindowSystemInterface::handleThemeChange();
+#else // Qt >= 6.5.0
 		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
+#endif // Qt < 6.5.0
 	});
 }
 
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index 794f4428b..2056b8c87 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -51,10 +51,9 @@ void NewVersionLaunched(int oldVersion);
 
 [[nodiscard]] bool PreventsQuit(Core::QuitReason reason);
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 [[nodiscard]] std::optional<bool> IsDarkMode();
-[[nodiscard]] inline bool IsDarkModeSupported() {
-	return IsDarkMode().has_value();
-}
+#endif // Qt < 6.5.0
 
 namespace ThirdParty {
 
diff --git a/Telegram/SourceFiles/platform/win/integration_win.cpp b/Telegram/SourceFiles/platform/win/integration_win.cpp
index c0ec35cc4..72c1783b3 100644
--- a/Telegram/SourceFiles/platform/win/integration_win.cpp
+++ b/Telegram/SourceFiles/platform/win/integration_win.cpp
@@ -78,9 +78,11 @@ bool WindowsIntegration::processEvent(
 		}
 		break;
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 	case WM_SETTINGCHANGE:
 		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
 		break;
+#endif // Qt < 6.5.0
 	}
 	return false;
 }
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 4cdb5021c..39a3c8f9a 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -587,7 +587,7 @@ void MainWindow::validateWindowTheme(bool native, bool night) {
 		SetWindowTheme(_hWnd, empty, empty);
 		QApplication::setStyle(QStyleFactory::create(u"Windows"_q));
 #if 0
-	} else if (!Platform::IsDarkModeSupported()/*
+	} else if (!Core::App().settings().systemDarkMode().has_value()/*
 		|| (!Dlls::AllowDarkModeForApp && !Dlls::SetPreferredAppMode)
 		|| !Dlls::AllowDarkModeForWindow
 		|| !Dlls::RefreshImmersiveColorPolicyState
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index 6dc19d35b..f8c3e8074 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -383,6 +383,7 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 	return u"Global\\"_q + hash + '-' + cGUIDStr();
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 std::optional<bool> IsDarkMode() {
 	static const auto kSystemVersion = QOperatingSystemVersion::current();
 	static const auto kDarkModeAddedVersion = QOperatingSystemVersion(
@@ -413,6 +414,7 @@ std::optional<bool> IsDarkMode() {
 
 	return (value == 0);
 }
+#endif // Qt < 6.5.0
 
 bool AutostartSupported() {
 	return true;
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 545d7da52..1156bdb50 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -1533,7 +1533,7 @@ void SetupCloudThemes(
 void SetupAutoNightMode(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container) {
-	if (!Platform::IsDarkModeSupported()) {
+	if (!Core::App().settings().systemDarkMode().has_value()) {
 		return;
 	}
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 1aae8805b..64850eaef 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "base/crc32hash.h"
 #include "base/never_freed_pointer.h"
+#include "base/qt_signal_producer.h"
 #include "data/data_session.h"
 #include "data/data_document_resolver.h"
 #include "main/main_account.h" // Account::local.
@@ -43,6 +44,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QFileSystemWatcher>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QStyleHints>
 
 namespace Window {
 namespace Theme {
@@ -522,7 +525,24 @@ void ChatBackground::start() {
 		checkUploadWallPaper();
 	}, _lifetime);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+	rpl::single(
+		QGuiApplication::styleHints()->colorScheme()
+	) | rpl::then(
+		base::qt_signal_producer(
+			QGuiApplication::styleHints(),
+			&QStyleHints::colorSchemeChanged
+		)
+	) | rpl::map([](Qt::ColorScheme colorScheme) {
+		return colorScheme == Qt::ColorScheme::Unknown
+			? std::nullopt
+			: std::make_optional(colorScheme == Qt::ColorScheme::Dark);
+	}) | rpl::start_with_next([](std::optional<bool> dark) {
+		Core::App().settings().setSystemDarkMode(dark);
+	}, _lifetime);
+#else // Qt >= 6.5.0
 	Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
+#endif // Qt < 6.5.0
 }
 
 void ChatBackground::refreshThemeWatcher() {

From d1455f5117b56ead63661090ac621870bd6d9fde Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 13 May 2023 23:31:20 +0400
Subject: [PATCH 144/676] Switch Wayland integration to the new type safe Qt
 API

This also makes object lifetime tracking better thanks to the new API
---
 .../linux/linux_wayland_integration.cpp       | 23 +++++++++----------
 Telegram/lib_base                             |  2 +-
 cmake                                         |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index 55ebd4dca..dab8fa498 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -14,9 +14,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
-#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatformwindow_p.h>
 #include <wayland-client.h>
 
+using namespace QNativeInterface;
+using namespace QNativeInterface::Private;
+
 namespace Platform {
 namespace internal {
 namespace {
@@ -101,14 +104,12 @@ org_kde_plasma_surface *WaylandIntegration::Private::plasmaSurface(
 		return nullptr;
 	}
 
-	const auto native = QGuiApplication::platformNativeInterface();
+	const auto native = window->nativeInterface<QWaylandWindow>();
 	if (!native) {
 		return nullptr;
 	}
 
-	const auto surface = reinterpret_cast<wl_surface*>(
-		native->nativeResourceForWindow(QByteArray("surface"), window));
-
+	const auto surface = native->surface();
 	if (!surface) {
 		return nullptr;
 	}
@@ -126,8 +127,8 @@ org_kde_plasma_surface *WaylandIntegration::Private::plasmaSurface(
 	plasmaSurfaces.emplace(surface, result);
 
 	base::qt_signal_producer(
-		window,
-		&QObject::destroyed
+		native,
+		&QWaylandWindow::surfaceDestroyed
 	) | rpl::start_with_next([=] {
 		auto it = plasmaSurfaces.find(surface);
 		if (it != plasmaSurfaces.cend()) {
@@ -140,14 +141,12 @@ org_kde_plasma_surface *WaylandIntegration::Private::plasmaSurface(
 
 WaylandIntegration::WaylandIntegration()
 : _private(std::make_unique<Private>()) {
-	const auto native = QGuiApplication::platformNativeInterface();
+	const auto native = qApp->nativeInterface<QWaylandApplication>();
 	if (!native) {
 		return;
 	}
 
-	const auto display = reinterpret_cast<wl_display*>(
-		native->nativeResourceForIntegration(QByteArray("wl_display")));
-
+	const auto display = native->display();
 	if (!display) {
 		return;
 	}
@@ -159,7 +158,7 @@ WaylandIntegration::WaylandIntegration()
 		_private.get());
 
 	base::qt_signal_producer(
-		native,
+		qApp,
 		&QObject::destroyed
 	) | rpl::start_with_next([=] {
 		// too late for standard destructors, just free
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 17a19f39d..b032f9442 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 17a19f39d2a1204a90d74516c28fd27c522ded17
+Subproject commit b032f944298bfa464c9378a5c56826cf13956eae
diff --git a/cmake b/cmake
index a7d000be7..42f842848 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a7d000be71db475f034c42687e7905fc8116050f
+Subproject commit 42f8428489692f0a4a05bf833478bad7ee8d5989

From b98b44e638a1e4937bde8407f5d020c34f3bcc23 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 15 May 2023 12:31:04 +0400
Subject: [PATCH 145/676] Downgrade to the working revision

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e8857f579..7c9aa9453 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e8857f5792c8c8bc721be0607e07ccd5616b939b
+Subproject commit 7c9aa94533276d693942ed0ffb39d3d66a49e124

From 787cab7417b67d92b7615030a0d10e8360bd96ca Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 15 May 2023 22:04:53 +0400
Subject: [PATCH 146/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index b032f9442..92a2915b4 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit b032f944298bfa464c9378a5c56826cf13956eae
+Subproject commit 92a2915b4bc831d9d3e725a462c9736bcabb9632
diff --git a/cmake b/cmake
index 42f842848..ff81e9562 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 42f8428489692f0a4a05bf833478bad7ee8d5989
+Subproject commit ff81e9562db1b573036d3e5c9dbd7b6f9d1b8b8f

From 665467b02dea4ee9d2dd13c23fed3d4e5f172d06 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 15 May 2023 22:35:52 +0400
Subject: [PATCH 147/676] Add new dependencies to snap build

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b170f1b5e..a6f548b1b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -97,9 +97,12 @@ parts:
       - LDFLAGS: -s
     build-packages:
       - clang
+      - gobject-introspection
       - python3
       - libasound2-dev
       - libavif-dev
+      - libboost-program-options-dev
+      - libfmt-dev
       - libheif-dev
       - libopus-dev
       - libpulse-dev

From 65afa2c4022a42a07d2c6bf9b9d3ea098f7d835d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 May 2023 13:33:19 +0400
Subject: [PATCH 148/676] Detach ComposeControls from SessionController.

---
 Telegram/CMakeLists.txt                       |   4 +
 .../SourceFiles/api/api_attached_stickers.cpp |  20 +-
 Telegram/SourceFiles/api/api_bot.cpp          |   6 +-
 Telegram/SourceFiles/api/api_chat_filters.cpp |  24 +-
 Telegram/SourceFiles/api/api_chat_invite.cpp  |  27 +-
 Telegram/SourceFiles/api/api_report.cpp       |  11 +-
 Telegram/SourceFiles/api/api_report.h         |   3 +-
 .../SourceFiles/api/api_toggling_media.cpp    |  14 +-
 Telegram/SourceFiles/api/api_toggling_media.h |  12 +-
 Telegram/SourceFiles/apiwrap.cpp              |  51 ++--
 .../SourceFiles/boxes/add_contact_box.cpp     |  33 +--
 Telegram/SourceFiles/boxes/background_box.cpp |  22 +-
 .../boxes/background_preview_box.cpp          |   4 +-
 .../SourceFiles/boxes/change_phone_box.cpp    |  28 +-
 .../SourceFiles/boxes/choose_filter_box.cpp   |   9 +-
 Telegram/SourceFiles/boxes/connection_box.cpp |   6 +-
 .../SourceFiles/boxes/create_poll_box.cpp     |  25 +-
 .../SourceFiles/boxes/delete_messages_box.cpp |   2 +-
 .../SourceFiles/boxes/edit_caption_box.cpp    |  10 +-
 .../SourceFiles/boxes/edit_privacy_box.cpp    |   3 +-
 .../boxes/filters/edit_filter_box.cpp         |   7 +-
 .../boxes/filters/edit_filter_links.cpp       |  48 +--
 Telegram/SourceFiles/boxes/language_box.cpp   |   2 +-
 Telegram/SourceFiles/boxes/max_invite_box.cpp |   4 +-
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  22 +-
 Telegram/SourceFiles/boxes/peer_list_box.h    |  19 +-
 Telegram/SourceFiles/boxes/peer_lists_box.cpp |  12 +-
 Telegram/SourceFiles/boxes/peer_lists_box.h   |   4 +-
 .../boxes/peers/add_bot_to_chat_box.cpp       |  15 +-
 .../boxes/peers/add_participants_box.cpp      |  25 +-
 .../boxes/peers/choose_peer_box.cpp           |   2 +-
 .../boxes/peers/edit_contact_box.cpp          |   3 +-
 .../boxes/peers/edit_forum_topic_box.cpp      |   7 +-
 .../boxes/peers/edit_linked_chat_box.cpp      |  45 ++-
 .../boxes/peers/edit_participant_box.cpp      |  13 +-
 .../boxes/peers/edit_participant_box.h        |   2 -
 .../boxes/peers/edit_participants_box.cpp     |   2 +-
 .../boxes/peers/edit_peer_info_box.cpp        |  66 ++---
 .../boxes/peers/edit_peer_invite_link.cpp     |  82 ++----
 .../boxes/peers/edit_peer_invite_link.h       |   2 +-
 .../boxes/peers/edit_peer_invite_links.cpp    |  42 ++-
 .../boxes/peers/edit_peer_permissions_box.cpp |  38 +--
 .../boxes/peers/edit_peer_requests_box.cpp    |  18 +-
 .../boxes/peers/edit_peer_type_box.cpp        |  12 +-
 .../boxes/peers/edit_peer_usernames_list.cpp  |  10 +-
 .../SourceFiles/boxes/premium_limits_box.cpp  |  15 +-
 .../boxes/reactions_settings_box.cpp          |   1 -
 .../SourceFiles/boxes/report_messages_box.cpp |  11 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  25 +-
 Telegram/SourceFiles/boxes/sessions_box.cpp   |   4 +-
 Telegram/SourceFiles/boxes/share_box.cpp      |  46 ++-
 Telegram/SourceFiles/boxes/share_box.h        |   2 -
 .../SourceFiles/boxes/sticker_set_box.cpp     | 175 ++++++-----
 Telegram/SourceFiles/boxes/sticker_set_box.h  |  18 +-
 Telegram/SourceFiles/boxes/stickers_box.cpp   |  84 +++---
 Telegram/SourceFiles/boxes/stickers_box.h     |  17 +-
 Telegram/SourceFiles/boxes/translate_box.cpp  |  11 +-
 Telegram/SourceFiles/boxes/username_box.cpp   |   2 +-
 .../calls/calls_box_controller.cpp            |   3 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp  |   3 +-
 .../calls/group/calls_choose_join_as.cpp      |   4 +-
 .../calls/group/calls_group_call.cpp          |  10 +-
 .../group/calls_group_invite_controller.cpp   |   4 +-
 .../calls/group/calls_group_members.cpp       |   4 +-
 .../calls/group/calls_group_members.h         |   2 +-
 .../calls/group/calls_group_panel.cpp         | 138 +++++----
 .../calls/group/calls_group_panel.h           |  50 ++--
 .../calls/group/calls_group_rtmp.cpp          |   6 +-
 .../calls/group/calls_group_settings.cpp      |  30 +-
 .../calls/group/calls_group_settings.h        |   3 +-
 .../calls/group/calls_group_toasts.cpp        |  15 +-
 .../chat_helpers/compose/compose_show.cpp     |  46 +++
 .../chat_helpers/compose/compose_show.h       |  68 +++++
 .../chat_helpers/emoji_list_widget.cpp        |  34 +--
 .../chat_helpers/emoji_list_widget.h          |   9 +-
 .../chat_helpers/field_autocomplete.cpp       |  76 +++--
 .../chat_helpers/field_autocomplete.h         |  19 +-
 .../chat_helpers/gifs_list_widget.cpp         |  39 ++-
 .../chat_helpers/gifs_list_widget.h           |  15 +-
 .../chat_helpers/message_field.cpp            |  62 ++--
 .../SourceFiles/chat_helpers/message_field.h  |  22 +-
 .../chat_helpers/stickers_list_widget.cpp     |  80 +++--
 .../chat_helpers/stickers_list_widget.h       |  15 +-
 .../SourceFiles/chat_helpers/tabbed_panel.cpp |  44 ++-
 .../SourceFiles/chat_helpers/tabbed_panel.h   |  17 +-
 .../chat_helpers/tabbed_selector.cpp          |  81 ++++--
 .../chat_helpers/tabbed_selector.h            |  51 ++--
 Telegram/SourceFiles/core/application.cpp     |   8 +
 Telegram/SourceFiles/core/application.h       |   5 +
 .../SourceFiles/core/click_handler_types.cpp  |  13 +-
 .../SourceFiles/core/local_url_handlers.cpp   |  28 +-
 .../SourceFiles/data/data_media_types.cpp     |   8 +-
 Telegram/SourceFiles/data/data_peer.cpp       |   1 -
 .../data/stickers/data_stickers.cpp           |  48 ++-
 .../SourceFiles/data/stickers/data_stickers.h |  16 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   2 +-
 .../controllers/stickers_panel_controller.cpp |   2 +-
 Telegram/SourceFiles/editor/photo_editor.cpp  |   2 +-
 .../admin_log/history_admin_log_inner.cpp     |   2 +-
 .../admin_log/history_admin_log_item.cpp      |   2 +-
 Telegram/SourceFiles/history/history.cpp      |   4 +-
 .../history/history_inner_widget.cpp          |  32 +-
 Telegram/SourceFiles/history/history_item.cpp |   2 +-
 .../history/history_item_components.cpp       |   4 +-
 .../history/history_view_top_toast.cpp        |   2 +-
 .../SourceFiles/history/history_widget.cpp    |  67 +++--
 .../history_view_compose_controls.cpp         | 178 ++++++++----
 .../controls/history_view_compose_controls.h  |  41 ++-
 .../controls/history_view_compose_search.cpp  |   4 +-
 .../controls/history_view_forward_panel.cpp   |   7 +-
 .../controls/history_view_forward_panel.h     |   6 +-
 .../history_view_voice_record_bar.cpp         |  40 +--
 .../controls/history_view_voice_record_bar.h  |  10 +-
 .../history_view_voice_record_button.cpp      |   9 +-
 .../history_view_voice_record_button.h        |   5 +-
 .../view/history_view_contact_status.cpp      |  23 +-
 .../view/history_view_context_menu.cpp        |  41 +--
 .../history/view/history_view_element.cpp     |   6 +-
 .../history/view/history_view_list_widget.cpp |  19 +-
 .../history/view/history_view_message.cpp     |   8 +-
 .../view/history_view_pinned_section.cpp      |   1 -
 .../view/history_view_replies_section.cpp     |  23 +-
 .../view/history_view_scheduled_section.cpp   |  49 ++--
 .../view/history_view_sticker_toast.cpp       |   4 +-
 .../view/history_view_top_bar_widget.cpp      |   1 -
 .../view/history_view_translate_bar.cpp       |   2 +-
 .../view/media/history_view_sticker.cpp       |   2 +-
 .../media/history_view_theme_document.cpp     |  10 +-
 .../media/history_view_userpic_suggestion.cpp |   5 +-
 .../history_view_reactions_selector.cpp       |   3 +-
 .../info_common_groups_inner_widget.cpp       |   6 +-
 .../info_common_groups_inner_widget.h         |   8 +-
 .../polls/info_polls_results_inner_widget.cpp |   6 +-
 .../info/profile/info_profile_actions.cpp     |  16 +-
 .../info_profile_emoji_status_panel.cpp       |   2 +-
 .../info/profile/info_profile_members.cpp     |   6 +-
 .../info/profile/info_profile_members.h       |   4 +-
 .../info_userpic_emoji_builder_widget.cpp     |   6 +-
 .../inline_bots/bot_attach_web_view.cpp       |  12 +-
 .../inline_bots/inline_results_inner.cpp      |   2 +-
 Telegram/SourceFiles/intro/intro_phone.cpp    |   3 +-
 .../SourceFiles/main/session/session_show.cpp |  77 +++++
 .../SourceFiles/main/session/session_show.h   |  25 ++
 Telegram/SourceFiles/mainwidget.cpp           |   8 +-
 Telegram/SourceFiles/mainwindow.cpp           |   3 +-
 .../media/view/media_view_overlay_widget.cpp  |  10 +-
 .../menu/menu_antispam_validator.cpp          |  18 +-
 .../menu/menu_item_download_files.cpp         |   5 +-
 .../SourceFiles/menu/menu_ttl_validator.cpp   |  18 +-
 .../payments/payments_checkout_process.cpp    |   4 +-
 .../payments/ui/payments_panel.cpp            |   4 +-
 .../SourceFiles/payments/ui/payments_panel.h  |   2 +-
 .../SourceFiles/settings/settings_calls.cpp   |   5 +-
 .../SourceFiles/settings/settings_chat.cpp    |   9 +-
 .../settings/settings_global_ttl.cpp          |  58 ++--
 .../SourceFiles/settings/settings_main.cpp    |   4 +-
 .../settings/settings_power_saving.cpp        |  13 +-
 .../SourceFiles/settings/settings_premium.cpp |  10 +-
 .../settings/settings_privacy_controllers.cpp |   3 +-
 .../settings/settings_privacy_security.cpp    |  23 +-
 .../SourceFiles/support/support_helper.cpp    |   9 +-
 .../ui/chat/attach/attach_bot_webview.cpp     |   4 +-
 .../ui/chat/attach/attach_bot_webview.h       |   2 +-
 .../SourceFiles/ui/chat/choose_send_as.cpp    |   9 +-
 .../ui/controls/userpic_button.cpp            |   2 +-
 Telegram/SourceFiles/ui/countryinput.cpp      |   2 +-
 Telegram/SourceFiles/ui/countryinput.h        |   9 +-
 .../SourceFiles/window/section_widget.cpp     |   1 -
 .../window/themes/window_theme_editor_box.cpp |   5 +-
 .../SourceFiles/window/window_controller.cpp  |  97 ++++--
 .../SourceFiles/window/window_controller.h    |  16 +-
 .../window/window_lock_widgets.cpp            |   5 +-
 .../SourceFiles/window/window_main_menu.cpp   |   2 +-
 .../SourceFiles/window/window_peer_menu.cpp   | 156 +++++-----
 .../SourceFiles/window/window_peer_menu.h     |   8 +
 .../window/window_session_controller.cpp      | 275 +++++++++++-------
 .../window/window_session_controller.h        |  53 +---
 Telegram/lib_ui                               |   2 +-
 178 files changed, 2080 insertions(+), 1869 deletions(-)
 create mode 100644 Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
 create mode 100644 Telegram/SourceFiles/chat_helpers/compose/compose_show.h
 create mode 100644 Telegram/SourceFiles/main/session/session_show.cpp
 create mode 100644 Telegram/SourceFiles/main/session/session_show.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2d39276ac..78a649937 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -350,6 +350,8 @@ PRIVATE
     calls/calls_video_bubble.h
     calls/calls_video_incoming.cpp
     calls/calls_video_incoming.h
+    chat_helpers/compose/compose_show.cpp
+    chat_helpers/compose/compose_show.h
     chat_helpers/bot_command.cpp
     chat_helpers/bot_command.h
     chat_helpers/bot_keyboard.cpp
@@ -934,6 +936,8 @@ PRIVATE
     main/main_session_settings.h
     main/session/send_as_peers.cpp
     main/session/send_as_peers.h
+    main/session/session_show.cpp
+    main/session/session_show.h
     media/system_media_controls_manager.h
     media/system_media_controls_manager.cpp
     media/audio/media_audio.cpp
diff --git a/Telegram/SourceFiles/api/api_attached_stickers.cpp b/Telegram/SourceFiles/api/api_attached_stickers.cpp
index be87544be..0f18e7648 100644
--- a/Telegram/SourceFiles/api/api_attached_stickers.cpp
+++ b/Telegram/SourceFiles/api/api_attached_stickers.cpp
@@ -41,7 +41,7 @@ void AttachedStickers::request(
 			return;
 		} else if (result.v.size() > 1) {
 			strongController->show(
-				Box<StickersBox>(strongController, result.v));
+				Box<StickersBox>(strongController->uiShow(), result.v));
 			return;
 		}
 		// Single attached sticker pack.
@@ -54,16 +54,14 @@ void AttachedStickers::request(
 				.id = data->vid().v,
 				.accessHash = data->vaccess_hash().v }
 			: StickerSetIdentifier{ .shortName = qs(data->vshort_name()) };
-		strongController->show(
-			Box<StickerSetBox>(
-				strongController,
-				setId,
-				(data->is_emojis()
-					? Data::StickersType::Emoji
-					: data->is_masks()
-					? Data::StickersType::Masks
-					: Data::StickersType::Stickers)),
-			Ui::LayerOption::KeepOther);
+		strongController->show(Box<StickerSetBox>(
+			strongController->uiShow(),
+			setId,
+			(data->is_emojis()
+				? Data::StickersType::Emoji
+				: data->is_masks()
+				? Data::StickersType::Masks
+				: Data::StickersType::Stickers)));
 	}).fail([=] {
 		_requestId = 0;
 		if (const auto strongController = weak.get()) {
diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 4c19b4c85..8fa7f884c 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -82,7 +82,7 @@ void SendBotCallbackData(
 		flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_password;
 	}
 	const auto weak = base::make_weak(controller);
-	const auto show = std::make_shared<Window::Show>(controller);
+	const auto show = controller->uiShow();
 	button->requestId = api->request(MTPmessages_GetBotCallbackAnswer(
 		MTP_flags(flags),
 		history->peer->input,
@@ -119,7 +119,7 @@ void SendBotCallbackData(
 				if (withPassword) {
 					show->hideLayer();
 				}
-				Ui::Toast::Show(show->toastParent(), message);
+				show->showToast(message);
 			}
 		} else if (!link.isEmpty()) {
 			if (!isGame) {
@@ -210,7 +210,7 @@ void SendBotCallbackDataWithPassword(
 	}
 	api->cloudPassword().reload();
 	const auto weak = base::make_weak(controller);
-	const auto show = std::make_shared<Window::Show>(controller);
+	const auto show = controller->uiShow();
 	SendBotCallbackData(controller, item, row, column, {}, {}, [=](
 			const QString &error) {
 		auto box = PrePasswordErrorBox(
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 5bd4144c4..2b19deac3 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/filter_link_header.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "ui/filter_icons.h"
 #include "window/window_session_controller.h"
@@ -515,13 +514,9 @@ void ShowImportError(
 	} else if (error == u"CHATLISTS_TOO_MUCH"_q) {
 		window->show(Box(ShareableFiltersLimitBox, session));
 	} else {
-		const auto text = (error == u"INVITE_SLUG_EXPIRED"_q)
+		window->showToast((error == u"INVITE_SLUG_EXPIRED"_q)
 			? tr::lng_group_invite_bad_link(tr::now)
-			: error;
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(window).toastParent(),
-			.text = { text },
-		});
+			: error);
 	}
 }
 
@@ -545,10 +540,7 @@ void ShowImportToast(
 			: tr::lng_filters_updated_also;
 		text.append('\n').append(phrase(tr::now, lt_count, added));
 	}
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(strong).toastParent(),
-		.text = { std::move(text) },
-	});
+	strong->showToast(std::move(text));
 }
 
 void ProcessFilterInvite(
@@ -565,10 +557,7 @@ void ProcessFilterInvite(
 	}
 	Core::App().hideMediaView();
 	if (peers.empty() && !filterId) {
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(strong).toastParent(),
-			.text = { tr::lng_group_invite_bad_link(tr::now) },
-		});
+		strong->showToast(tr::lng_group_invite_bad_link(tr::now));
 		return;
 	}
 	const auto fullyAdded = (peers.empty() && filterId);
@@ -661,10 +650,7 @@ void ProcessFilterInvite(
 	const auto &list = strong->session().data().chatsFilters().list();
 	const auto it = ranges::find(list, filterId, &Data::ChatFilter::id);
 	if (it == end(list)) {
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(strong).toastParent(),
-			.text = { u"Filter not found :shrug:"_q },
-		});
+		strong->showToast(u"Filter not found :shrug:"_q);
 		return;
 	}
 	ProcessFilterInvite(
diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp
index 674061653..8b395d9a9 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_file_origin.h"
 #include "ui/boxes/confirm_box.h"
-#include "ui/toasts/common_toasts.h"
+#include "ui/toast/toast.h"
 #include "boxes/premium_limits_box.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
@@ -85,20 +85,17 @@ void SubmitChatInvite(
 		}
 
 		strongController->hideLayer();
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(strongController).toastParent(),
-			.text = { [&] {
-				if (type == u"INVITE_REQUEST_SENT"_q) {
-					return isGroup
-						? tr::lng_group_request_sent(tr::now)
-						: tr::lng_group_request_sent_channel(tr::now);
-				} else if (type == u"USERS_TOO_MUCH"_q) {
-					return tr::lng_group_invite_no_room(tr::now);
-				} else {
-					return tr::lng_group_invite_bad_link(tr::now);
-				}
-			}() },
-			.duration = ApiWrap::kJoinErrorDuration });
+		strongController->showToast([&] {
+			if (type == u"INVITE_REQUEST_SENT"_q) {
+				return isGroup
+					? tr::lng_group_request_sent(tr::now)
+					: tr::lng_group_request_sent_channel(tr::now);
+			} else if (type == u"USERS_TOO_MUCH"_q) {
+				return tr::lng_group_invite_no_room(tr::now);
+			} else {
+				return tr::lng_group_invite_bad_link(tr::now);
+			}
+		}(), ApiWrap::kJoinErrorDuration);
 	}).send();
 }
 
diff --git a/Telegram/SourceFiles/api/api_report.cpp b/Telegram/SourceFiles/api/api_report.cpp
index 663daf767..7185b76f5 100644
--- a/Telegram/SourceFiles/api/api_report.cpp
+++ b/Telegram/SourceFiles/api/api_report.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/boxes/report_box.h"
-#include "ui/toast/toast.h"
+#include "ui/layers/show.h"
 
 namespace Api {
 
@@ -39,15 +39,14 @@ MTPreportReason ReasonToTL(const Ui::ReportReason &reason) {
 } // namespace
 
 void SendReport(
-		not_null<QWidget*> toastParent,
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		Ui::ReportReason reason,
 		const QString &comment,
 		std::variant<v::null_t, MessageIdsList, not_null<PhotoData*>> data) {
-	auto weak = Ui::MakeWeak(toastParent.get());
-	auto done = crl::guard(toastParent, [=] {
-		Ui::Toast::Show(toastParent, tr::lng_report_thanks(tr::now));
-	});
+	auto done = [=] {
+		show->showToast(tr::lng_report_thanks(tr::now));
+	};
 	v::match(data, [&](v::null_t) {
 		peer->session().api().request(MTPaccount_ReportPeer(
 			peer->input,
diff --git a/Telegram/SourceFiles/api/api_report.h b/Telegram/SourceFiles/api/api_report.h
index 9472221e3..08535c00b 100644
--- a/Telegram/SourceFiles/api/api_report.h
+++ b/Telegram/SourceFiles/api/api_report.h
@@ -11,13 +11,14 @@ class PeerData;
 class PhotoData;
 
 namespace Ui {
+class Show;
 enum class ReportReason;
 } // namespace Ui
 
 namespace Api {
 
 void SendReport(
-	not_null<QWidget*> toastParent,
+	std::shared_ptr<Ui::Show> show,
 	not_null<PeerData*> peer,
 	Ui::ReportReason reason,
 	const QString &comment,
diff --git a/Telegram/SourceFiles/api/api_toggling_media.cpp b/Telegram/SourceFiles/api/api_toggling_media.cpp
index 9293043a8..65d2ce317 100644
--- a/Telegram/SourceFiles/api/api_toggling_media.cpp
+++ b/Telegram/SourceFiles/api/api_toggling_media.cpp
@@ -48,27 +48,26 @@ void ToggleExistingMedia(
 } // namespace
 
 void ToggleFavedSticker(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin) {
 	ToggleFavedSticker(
-		controller,
+		std::move(show),
 		document,
 		std::move(origin),
 		!document->owner().stickers().isFaved(document));
 }
 
 void ToggleFavedSticker(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin,
 		bool faved) {
 	if (faved && !document->sticker()) {
 		return;
 	}
-	const auto weak = base::make_weak(controller);
 	auto done = [=] {
-		document->owner().stickers().setFaved(weak.get(), document, faved);
+		document->owner().stickers().setFaved(show, document, faved);
 	};
 	ToggleExistingMedia(
 		document,
@@ -104,17 +103,16 @@ void ToggleRecentSticker(
 }
 
 void ToggleSavedGif(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin,
 		bool saved) {
 	if (saved && !document->isGifv()) {
 		return;
 	}
-	const auto weak = base::make_weak(controller);
 	auto done = [=] {
 		if (saved) {
-			document->owner().stickers().addSavedGif(weak.get(), document);
+			document->owner().stickers().addSavedGif(show, document);
 		}
 	};
 	ToggleExistingMedia(
diff --git a/Telegram/SourceFiles/api/api_toggling_media.h b/Telegram/SourceFiles/api/api_toggling_media.h
index a028824d5..10f0090af 100644
--- a/Telegram/SourceFiles/api/api_toggling_media.h
+++ b/Telegram/SourceFiles/api/api_toggling_media.h
@@ -7,19 +7,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-namespace Window {
-class SessionController;
-} // namespace Window
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
 
 namespace Api {
 
 void ToggleFavedSticker(
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<DocumentData*> document,
 	Data::FileOrigin origin);
 
 void ToggleFavedSticker(
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<DocumentData*> document,
 	Data::FileOrigin origin,
 	bool faved);
@@ -30,7 +30,7 @@ void ToggleRecentSticker(
 	bool saved);
 
 void ToggleSavedGif(
-	Window::SessionController *controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<DocumentData*> document,
 	Data::FileOrigin origin,
 	bool saved);
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index a589be492..c60f96862 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -87,7 +87,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/emoji_config.h"
 #include "ui/chat/attach/attach_prepare.h"
-#include "ui/toasts/common_toasts.h"
+#include "ui/toast/toast.h"
 #include "support/support_helper.h"
 #include "settings/settings_premium.h"
 #include "storage/localimageloader.h"
@@ -121,9 +121,16 @@ using UpdatedFileReferences = Data::UpdatedFileReferences;
 	return TimeId(msgId >> 32);
 }
 
-[[nodiscard]] std::shared_ptr<Window::Show> ShowForPeer(
+[[nodiscard]] std::shared_ptr<ChatHelpers::Show> ShowForPeer(
 		not_null<PeerData*> peer) {
-	return std::make_shared<Window::Show>(Core::App().windowFor(peer));
+	if (const auto window = Core::App().windowFor(peer)) {
+		if (const auto controller = window->sessionController()) {
+			if (&controller->session() == &peer->session()) {
+				return controller->uiShow();
+			}
+		}
+	}
+	return nullptr;
 }
 
 void ShowChannelsLimitBox(not_null<PeerData*> peer) {
@@ -484,13 +491,12 @@ void ApiWrap::sendMessageFail(
 		uint64 randomId,
 		FullMsgId itemId) {
 	const auto show = ShowForPeer(peer);
-
-	if (error == u"PEER_FLOOD"_q) {
+	if (show && error == u"PEER_FLOOD"_q) {
 		show->showBox(
 			Ui::MakeInformBox(
 				PeerFloodErrorText(&session(), PeerFloodType::Send)),
 			Ui::LayerOption::CloseOther);
-	} else if (error == u"USER_BANNED_IN_CHANNEL"_q) {
+	} else if (show && error == u"USER_BANNED_IN_CHANNEL"_q) {
 		const auto link = Ui::Text::Link(
 			tr::lng_cant_more_info(tr::now),
 			session().createInternalLinkFull(u"spambot"_q));
@@ -519,21 +525,16 @@ void ApiWrap::sendMessageFail(
 		Assert(peer->isUser());
 		if (const auto item = scheduled.lookupItem(peer->id, itemId.msg)) {
 			scheduled.removeSending(item);
-			show->showBox(
-				Ui::MakeInformBox(tr::lng_cant_do_this()),
-				Ui::LayerOption::CloseOther);
-		}
-	} else if (error == u"CHAT_FORWARDS_RESTRICTED"_q) {
-		if (show->valid()) {
-			Ui::ShowMultilineToast({
-				.parentOverride = show->toastParent(),
-				.text = { peer->isBroadcast()
-					? tr::lng_error_noforwards_channel(tr::now)
-					: tr::lng_error_noforwards_group(tr::now)
-				},
-				.duration = kJoinErrorDuration
-			});
+			if (show) {
+				show->showBox(
+					Ui::MakeInformBox(tr::lng_cant_do_this()),
+					Ui::LayerOption::CloseOther);
+			}
 		}
+	} else if (show && error == u"CHAT_FORWARDS_RESTRICTED"_q) {
+		show->showToast(peer->isBroadcast()
+			? tr::lng_error_noforwards_channel(tr::now)
+			: tr::lng_error_noforwards_group(tr::now), kJoinErrorDuration);
 	} else if (error == u"PREMIUM_ACCOUNT_REQUIRED"_q) {
 		Settings::ShowPremium(&session(), "premium_stickers");
 	}
@@ -1702,12 +1703,8 @@ void ApiWrap::joinChannel(not_null<ChannelData*> channel) {
 					}
 					return QString();
 				}();
-				if (!text.isEmpty() && show->valid()) {
-					Ui::ShowMultilineToast({
-						.parentOverride = show->toastParent(),
-						.text = { text },
-						.duration = kJoinErrorDuration,
-					});
+				if (!text.isEmpty()) {
+					show->showToast(text, kJoinErrorDuration);
 				}
 			}
 			_channelAmInRequests.remove(channel);
@@ -2068,8 +2065,8 @@ void ApiWrap::applyAffectedMessages(
 }
 
 void ApiWrap::saveCurrentDraftToCloud() {
+	Core::App().materializeLocalDrafts();
 	for (const auto &controller : _session->windows()) {
-		controller->materializeLocalDrafts();
 		if (const auto thread = controller->activeChatCurrent().thread()) {
 			const auto topic = thread->asTopic();
 			if (topic && topic->creating()) {
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 52908506c..ccea61d70 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -112,7 +112,7 @@ void ChatCreateDone(
 			if (done) {
 				done(chat);
 			} else {
-				const auto show = std::make_shared<Window::Show>(navigation);
+				const auto show = navigation->uiShow();
 				navigation->showPeerHistory(chat);
 				ChatInviteForbidden(
 					show,
@@ -141,7 +141,7 @@ void MustBePublicFailed(
 	const auto text = channel->isMegagroup()
 		? "Can't create a public group :("
 		: "Can't create a public channel :(";
-	Ui::Toast::Show(Window::Show(navigation).toastParent(), text);
+	navigation->showToast(text);
 	MustBePublicDestroy(channel);
 }
 
@@ -607,7 +607,7 @@ void GroupInfoBox::prepare() {
 					: QString());
 			(*menu)->addAction(
 				text,
-				[=, show = std::make_shared<Ui::BoxShow>(this)] {
+				[=, show = uiShow()] {
 					show->showBox(Box(TTLMenu::TTLBox, TTLMenu::Args{
 						.show = show,
 						.startTtl = _ttlPeriod,
@@ -727,19 +727,14 @@ void GroupInfoBox::createGroup(
 			}
 		} else if (type == u"USERS_TOO_FEW"_q) {
 			controller->show(
-				Ui::MakeInformBox(tr::lng_cant_invite_privacy()),
-				Ui::LayerOption::KeepOther);
+				Ui::MakeInformBox(tr::lng_cant_invite_privacy()));
 		} else if (type == u"PEER_FLOOD"_q) {
-			controller->show(
-				Ui::MakeInformBox(
-					PeerFloodErrorText(
-						&_navigation->session(),
-						PeerFloodType::InviteGroup)),
-				Ui::LayerOption::KeepOther);
+			controller->show(Ui::MakeInformBox(
+				PeerFloodErrorText(
+					&_navigation->session(),
+					PeerFloodType::InviteGroup)));
 		} else if (type == u"USER_RESTRICTED"_q) {
-			controller->show(
-				Ui::MakeInformBox(tr::lng_cant_do_this()),
-				Ui::LayerOption::KeepOther);
+			controller->show(Ui::MakeInformBox(tr::lng_cant_do_this()));
 		}
 	}).send();
 }
@@ -1220,9 +1215,7 @@ void SetupChannelBox::mousePressEvent(QMouseEvent *e) {
 		return;
 	} else if (!_channel->inviteLink().isEmpty()) {
 		QGuiApplication::clipboard()->setText(_channel->inviteLink());
-		Ui::Toast::Show(
-			Ui::BoxShow(this).toastParent(),
-			tr::lng_create_channel_link_copied(tr::now));
+		showToast(tr::lng_create_channel_link_copied(tr::now));
 	} else if (_channel->isFullLoaded() && !_creatingInviteLink) {
 		_creatingInviteLink = true;
 		_channel->session().api().inviteLinks().create(_channel);
@@ -1456,12 +1449,10 @@ void SetupChannelBox::showRevokePublicLinkBoxForEdit() {
 	const auto callback = [=] {
 		*revoked = true;
 		navigation->parentController()->show(
-			Box<SetupChannelBox>(navigation, channel, mustBePublic, done),
-			Ui::LayerOption::KeepOther);
+			Box<SetupChannelBox>(navigation, channel, mustBePublic, done));
 	};
 	const auto revoker = navigation->parentController()->show(
-		Box(PublicLinksLimitBox, navigation, callback),
-		Ui::LayerOption::KeepOther);
+		Box(PublicLinksLimitBox, navigation, callback));
 	const auto session = &navigation->session();
 	revoker->boxClosing(
 	) | rpl::start_with_next(crl::guard(session, [=] {
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 2c7efa6cf..e1262b4c9 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -291,12 +291,10 @@ void BackgroundBox::chosen(const Data::WallPaper &paper) {
 		}
 		return;
 	}
-	_controller->show(
-		Box<BackgroundPreviewBox>(
-			_controller,
-			paper,
-			BackgroundPreviewArgs{ _forPeer }),
-		Ui::LayerOption::KeepOther);
+	_controller->show(Box<BackgroundPreviewBox>(
+		_controller,
+		paper,
+		BackgroundPreviewArgs{ _forPeer }));
 }
 
 void BackgroundBox::resetForPeer() {
@@ -332,13 +330,11 @@ void BackgroundBox::removePaper(const Data::WallPaper &paper) {
 			paper.mtpSettings()
 		)).send();
 	};
-	_controller->show(
-		Ui::MakeConfirmBox({
-			.text = tr::lng_background_sure_delete(),
-			.confirmed = remove,
-			.confirmText = tr::lng_selected_delete(),
-		}),
-		Ui::LayerOption::KeepOther);
+	_controller->show(Ui::MakeConfirmBox({
+		.text = tr::lng_background_sure_delete(),
+		.confirmed = remove,
+		.confirmText = tr::lng_selected_delete(),
+	}));
 }
 
 BackgroundBox::Inner::Inner(
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 6f0ac7db2..738a88165 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -640,9 +640,7 @@ void BackgroundPreviewBox::applyForEveryone() {
 void BackgroundPreviewBox::share() {
 	QGuiApplication::clipboard()->setText(
 		_paper.shareUrl(&_controller->session()));
-	Ui::Toast::Show(
-		Ui::BoxShow(this).toastParent(),
-		tr::lng_background_link_copied(tr::now));
+	showToast(tr::lng_background_link_copied(tr::now));
 }
 
 void BackgroundPreviewBox::paintEvent(QPaintEvent *e) {
diff --git a/Telegram/SourceFiles/boxes/change_phone_box.cpp b/Telegram/SourceFiles/boxes/change_phone_box.cpp
index bddf57c71..d9032c5a4 100644
--- a/Telegram/SourceFiles/boxes/change_phone_box.cpp
+++ b/Telegram/SourceFiles/boxes/change_phone_box.cpp
@@ -280,15 +280,13 @@ void ChangePhone::EnterPhone::sendPhoneDone(
 		}
 		return 0;
 	}();
-	_controller->show(
-		Box<EnterCode>(
-			_controller,
-			phoneNumber,
-			phoneCodeHash,
-			codeByFragmentUrl,
-			codeLength,
-			callTimeout),
-		Ui::LayerOption::KeepOther);
+	_controller->show(Box<EnterCode>(
+		_controller,
+		phoneNumber,
+		phoneCodeHash,
+		codeByFragmentUrl,
+		codeLength,
+		callTimeout));
 }
 
 void ChangePhone::EnterPhone::sendPhoneFail(
@@ -426,17 +424,13 @@ void ChangePhone::EnterCode::submit(const QString &code) {
 		MTP_string(_phone),
 		MTP_string(_hash),
 		MTP_string(code)
-	)).done([=, show = Window::Show(_controller)](const MTPUser &result) {
+	)).done([=, show = _controller->uiShow()](const MTPUser &result) {
 		_requestId = 0;
 		session->data().processUser(result);
-		if (show.valid()) {
-			if (weak) {
-				show.hideLayer();
-			}
-			Ui::Toast::Show(
-				show.toastParent(),
-				tr::lng_change_phone_success(tr::now));
+		if (weak) {
+			show->hideLayer();
 		}
+		show->showToast(tr::lng_change_phone_success(tr::now));
 	}).fail(crl::guard(this, [=](const MTP::Error &error) {
 		_requestId = 0;
 		sendCodeFail(error);
diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.cpp b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
index 6ea39d2e2..ef6b8ecb2 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
@@ -17,9 +17,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "ui/filter_icons.h"
 #include "ui/text/text_utilities.h" // Ui::Text::Bold
-#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
+#include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "styles/style_settings.h"
 #include "styles/style_payments.h" // paymentsSectionButton
@@ -74,7 +74,7 @@ void ChangeFilterById(
 			// We can safely show toast there.
 			const auto account = &history->session().account();
 			if (const auto controller = Core::App().windowFor(account)) {
-				auto text = (add
+				controller->showToast((add
 					? tr::lng_filters_toast_add
 					: tr::lng_filters_toast_remove)(
 						tr::now,
@@ -82,10 +82,7 @@ void ChangeFilterById(
 						Ui::Text::Bold(chat),
 						lt_folder,
 						Ui::Text::Bold(name),
-						Ui::Text::WithEntities);
-				Ui::Toast::Show(
-					Window::Show(controller).toastParent(),
-					{ .text = std::move(text), .st = &st::defaultToast });
+						Ui::Text::WithEntities));
 			}
 		}).fail([=](const MTP::Error &error) {
 			// Revert filter on fail.
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index 7c27f59ed..626671cb4 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -1265,7 +1265,7 @@ object_ptr<Ui::BoxContent> ProxiesBoxController::CreateOwningBox(
 
 object_ptr<Ui::BoxContent> ProxiesBoxController::create() {
 	auto result = Box<ProxiesBox>(this, _settings);
-	_show = std::make_shared<Ui::BoxShow>(result.data());
+	_show = result->uiShow();
 	for (const auto &item : _list) {
 		updateView(item);
 	}
@@ -1548,9 +1548,7 @@ void ProxiesBoxController::share(const ProxyData &proxy) {
 		+ ((proxy.type == Type::Mtproto && !proxy.password.isEmpty())
 			? "&secret=" + proxy.password : "");
 	QGuiApplication::clipboard()->setText(link);
-	Ui::Toast::Show(
-		_show->toastParent(),
-		tr::lng_username_copied(tr::now));
+	_show->showToast(tr::lng_username_copied(tr::now));
 }
 
 ProxiesBoxController::~ProxiesBoxController() {
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 775e5b7f5..ca1eb70f3 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -775,7 +775,7 @@ void CreatePollBox::setInnerFocus() {
 }
 
 void CreatePollBox::submitFailed(const QString &error) {
-	Ui::Toast::Show(Ui::BoxShow(this).toastParent(), error);
+	showToast(error);
 }
 
 not_null<Ui::InputField*> CreatePollBox::setupQuestion(
@@ -850,10 +850,7 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 		Core::App().settings().replaceEmojiValue());
 	solution->setMarkdownReplacesEnabled(rpl::single(true));
 	solution->setEditLinkCallback(
-		DefaultEditLinkCallback(
-			std::make_shared<Window::Show>(_controller),
-			session,
-			solution));
+		DefaultEditLinkCallback(_controller->uiShow(), solution));
 	solution->customTab(true);
 
 	const auto warning = CreateWarningLabel(
@@ -988,12 +985,10 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			|| (_chosen & PollData::Flag::Quiz));
 		multiple->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
-			return (e->type() == QEvent::MouseButtonPress) && quiz->checked();
-		}) | rpl::start_with_next([
-				toastParent = Ui::BoxShow(this).toastParent()] {
-			Ui::Toast::Show(
-				toastParent,
-				tr::lng_polls_create_one_answer(tr::now));
+			return (e->type() == QEvent::MouseButtonPress)
+				&& quiz->checked();
+		}) | rpl::start_with_next([show = uiShow()] {
+			show->showToast(tr::lng_polls_create_one_answer(tr::now));
 		}, multiple->lifetime());
 	}
 
@@ -1070,10 +1065,9 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			*error &= ~Error::Solution;
 		}
 	};
-	const auto showError = [
-		toastParent = Ui::BoxShow(this).toastParent()](
+	const auto showError = [show = uiShow()](
 			tr::phrase<> text) {
-		Ui::Toast::Show(toastParent, text(tr::now));
+		show->showToast(text(tr::now));
 	};
 	const auto send = [=](Api::SendOptions sendOptions) {
 		collectError();
@@ -1099,8 +1093,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			HistoryView::PrepareScheduleBox(
 				this,
 				SendMenu::Type::Scheduled,
-				send),
-			Ui::LayerOption::KeepOther);
+				send));
 	};
 	const auto sendWhenOnline = [=] {
 		send(Api::DefaultSendWhenOnlineOptions());
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 28a4ad97b..99fe6b883 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -285,7 +285,7 @@ void DeleteMessagesBox::prepare() {
 
 	if (_wipeHistoryJustClear && _wipeHistoryPeer) {
 		const auto validator = TTLMenu::TTLValidator(
-			std::make_shared<Ui::BoxShow>(this),
+			uiShow(),
 			_wipeHistoryPeer);
 		if (validator.can()) {
 			_wipeHistoryPeer->updateFull();
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 1642a3d8a..41f19a0b8 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -129,7 +129,7 @@ void ChooseReplacement(
 		}
 		const auto showError = [=](tr::phrase<> t) {
 			if (const auto strong = weak.get()) {
-				strong->showToast({ t(tr::now) });
+				strong->showToast(t(tr::now));
 			}
 		};
 
@@ -304,7 +304,7 @@ void EditCaptionBox::StartMediaReplace(
 	}
 	const auto type = ComputeAlbumType(item);
 	const auto showError = [=](tr::phrase<> t) {
-		controller->showToast({ t(tr::now) });
+		controller->showToast(t(tr::now));
 	};
 	const auto checkResult = [=](const Ui::PreparedList &list) {
 		if (list.files.size() != 1) {
@@ -647,7 +647,7 @@ void EditCaptionBox::setupEmojiPanel() {
 		_controller,
 		object_ptr<Selector>(
 			nullptr,
-			_controller,
+			_controller->uiShow(),
 			Window::GifPauseReason::Layer,
 			Selector::Mode::EmojiOnly));
 	_emojiPanel->setDesiredHeightValues(
@@ -728,9 +728,7 @@ bool EditCaptionBox::setPreparedList(Ui::PreparedList &&list) {
 		}
 	}
 	if (invalidForAlbum) {
-		Ui::Toast::Show(
-			Ui::BoxShow(this).toastParent(),
-			tr::lng_edit_media_album_error(tr::now));
+		showToast(tr::lng_edit_media_album_error(tr::now));
 		return false;
 	}
 	const auto wasSpoiler = hasSpoiler();
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 86e531c61..dfa6b3707 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -167,8 +167,7 @@ void EditPrivacyBox::editExceptions(
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 	};
 	_window->show(
-		Box<PeerListBox>(std::move(controller), std::move(initBox)),
-		Ui::LayerOption::KeepOther);
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
 std::vector<not_null<PeerData*>> &EditPrivacyBox::exceptions(Exception exception) {
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 9e0e67514..e135fd691 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -386,10 +386,7 @@ void EditExceptions(
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 	};
 	window->window().show(
-		Box<PeerListBox>(
-			std::move(controller),
-			std::move(initBox)),
-		Ui::LayerOption::KeepOther);
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
 void CreateIconSelector(
@@ -812,7 +809,7 @@ void EditFilterBox(
 			tr::lng_filters_link_about_many(),
 			tr::lng_filters_link_about()));
 
-	const auto show = std::make_shared<Ui::BoxShow>(box);
+	const auto show = box->uiShow();
 	const auto refreshPreviews = [=] {
 		include->updateData(
 			data->current().flags() & kTypes,
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index c9ad2bcbe..d7e2c0920 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -25,7 +25,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/invite_link_buttons.h"
 #include "ui/controls/invite_link_label.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/popup_menu.h"
@@ -118,7 +117,7 @@ void ShowSaveError(
 		window->showToast(
 			{ tr::lng_filters_link_group_admin_error(tr::now) });
 	} else {
-		window->showToast({ error });
+		window->showToast(error);
 	}
 }
 
@@ -583,27 +582,22 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 	const auto link = _data.url;
 	const auto weak = Ui::MakeWeak(container);
 	const auto copyLink = crl::guard(weak, [=] {
-		CopyInviteLink(delegate()->peerListToastParent(), link);
+		CopyInviteLink(delegate()->peerListUiShow(), link);
 	});
 	const auto shareLink = crl::guard(weak, [=] {
 		delegate()->peerListShowBox(
-			ShareInviteLinkBox(&_window->session(), link),
-			Ui::LayerOption::KeepOther);
+			ShareInviteLinkBox(&_window->session(), link));
 	});
 	const auto getLinkQr = crl::guard(weak, [=] {
 		delegate()->peerListShowBox(
-			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()),
-			Ui::LayerOption::KeepOther);
+			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()));
 	});
 	const auto editLink = crl::guard(weak, [=] {
 		delegate()->peerListShowBox(
-			Box(ChatFilterLinkBox, &_window->session(), _data),
-			Ui::LayerOption::KeepOther);
+			Box(ChatFilterLinkBox, &_window->session(), _data));
 	});
 	const auto deleteLink = crl::guard(weak, [=] {
-		delegate()->peerListShowBox(
-			DeleteLinkBox(_window, _data),
-			Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(DeleteLinkBox(_window, _data));
 	});
 
 	const auto createMenu = [=] {
@@ -702,10 +696,7 @@ void LinkController::rowClicked(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
 	if (const auto i = _denied.find(peer); i != end(_denied)) {
 		if (!i->second.isEmpty()) {
-			Ui::ShowMultilineToast({
-				.parentOverride = delegate()->peerListToastParent(),
-				.text = { i->second },
-			});
+			delegate()->peerListUiShow()->showToast(i->second);
 		}
 	} else {
 		const auto checked = row->checked();
@@ -866,8 +857,7 @@ void LinksController::rebuild(const std::vector<InviteLinkData> &rows) {
 void LinksController::rowClicked(not_null<PeerListRow*> row) {
 	const auto link = static_cast<LinkRow*>(row.get())->data();
 	delegate()->peerListShowBox(
-		ShowLinkBox(_window, _currentFilter(), link),
-		Ui::LayerOption::KeepOther);
+		ShowLinkBox(_window, _currentFilter(), link));
 }
 
 void LinksController::rowRightActionClicked(not_null<PeerListRow*> row) {
@@ -898,27 +888,22 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 	const auto data = real->data();
 	const auto link = data.url;
 	const auto copyLink = [=] {
-		CopyInviteLink(delegate()->peerListToastParent(), link);
+		CopyInviteLink(delegate()->peerListUiShow(), link);
 	};
 	const auto shareLink = [=] {
 		delegate()->peerListShowBox(
-			ShareInviteLinkBox(&_window->session(), link),
-			Ui::LayerOption::KeepOther);
+			ShareInviteLinkBox(&_window->session(), link));
 	};
 	const auto getLinkQr = [=] {
 		delegate()->peerListShowBox(
-			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()),
-			Ui::LayerOption::KeepOther);
+			InviteLinkQrBox(link, tr::lng_filters_link_qr_about()));
 	};
 	const auto editLink = [=] {
 		delegate()->peerListShowBox(
-			Box(ChatFilterLinkBox, &_window->session(), data),
-			Ui::LayerOption::KeepOther);
+			Box(ChatFilterLinkBox, &_window->session(), data));
 	};
 	const auto deleteLink = [=] {
-		delegate()->peerListShowBox(
-			DeleteLinkBox(_window, data),
-			Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(DeleteLinkBox(_window, data));
 	};
 	auto result = base::make_unique_q<Ui::PopupMenu>(
 		parent,
@@ -1008,10 +993,7 @@ bool GoodForExportFilterLink(
 	using Flag = Data::ChatFilter::Flag;
 	const auto listflags = Flag::Chatlist | Flag::HasMyLinks;
 	if (!filter.never().empty() || (filter.flags() & ~listflags)) {
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(window).toastParent(),
-			.text = { tr::lng_filters_link_cant(tr::now) },
-		});
+		window->showToast(tr::lng_filters_link_cant(tr::now));
 		return false;
 	}
 	return true;
@@ -1151,7 +1133,7 @@ void SetupFilterLinks(
 		Fn<Data::ChatFilter()> currentFilter) {
 	auto &lifetime = container->lifetime();
 	const auto delegate = lifetime.make_state<PeerListContentDelegateShow>(
-		std::make_shared<Window::Show>(window));
+		window->uiShow());
 	const auto controller = lifetime.make_state<LinksController>(
 		window,
 		std::move(value),
diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index 7ce2731d1..dca50a08c 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -1248,7 +1248,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButtonNoIcon);
 
 	translateSkip->setClickedCallback([=] {
-		Ui::BoxShow(this).showBox(Ui::EditSkipTranslationLanguages());
+		uiShow()->showBox(Ui::EditSkipTranslationLanguages());
 	});
 	Settings::AddSkip(container);
 	Settings::AddDividerText(
diff --git a/Telegram/SourceFiles/boxes/max_invite_box.cpp b/Telegram/SourceFiles/boxes/max_invite_box.cpp
index 7c8f29092..b6230b673 100644
--- a/Telegram/SourceFiles/boxes/max_invite_box.cpp
+++ b/Telegram/SourceFiles/boxes/max_invite_box.cpp
@@ -91,9 +91,7 @@ void MaxInviteBox::mousePressEvent(QMouseEvent *e) {
 	if (_linkOver) {
 		if (!_channel->inviteLink().isEmpty()) {
 			QGuiApplication::clipboard()->setText(_channel->inviteLink());
-			Ui::Toast::Show(
-				Ui::BoxShow(this).toastParent(),
-				tr::lng_create_channel_link_copied(tr::now));
+			showToast(tr::lng_create_channel_link_copied(tr::now));
 		} else if (_channel->isFullLoaded() && !_creatingInviteLink) {
 			_creatingInviteLink = true;
 			_channel->session().api().inviteLinks().create(_channel);
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index b59145ec0..66f10501a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/peer_list_box.h"
 
+#include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
 #include "ui/widgets/multi_select.h"
@@ -74,7 +75,7 @@ PaintRoundImageCallback ForceRoundUserpicCallback(not_null<PeerData*> peer) {
 }
 
 PeerListContentDelegateShow::PeerListContentDelegateShow(
-	std::shared_ptr<Ui::Show> show)
+	std::shared_ptr<Main::SessionShow> show)
 : _show(show) {
 }
 
@@ -88,15 +89,16 @@ void PeerListContentDelegateShow::peerListHideLayer() {
 	_show->hideLayer();
 }
 
-not_null<QWidget*> PeerListContentDelegateShow::peerListToastParent() {
-	return _show->toastParent();
+auto PeerListContentDelegateShow::peerListUiShow()
+-> std::shared_ptr<Main::SessionShow>{
+	return _show;
 }
 
 PeerListBox::PeerListBox(
 	QWidget*,
 	std::unique_ptr<PeerListController> controller,
 	Fn<void(not_null<PeerListBox*>)> init)
-: _show(this)
+: _show(Main::MakeSessionShow(uiShow(), &controller->session()))
 , _controller(std::move(controller))
 , _init(std::move(init)) {
 	Expects(_controller != nullptr);
@@ -311,18 +313,20 @@ void PeerListBox::peerListSetSearchMode(PeerListSearchMode mode) {
 void PeerListBox::peerListShowBox(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options) {
-	_show.showBox(std::move(content), options);
+	_show->showBox(std::move(content), options);
 }
 
 void PeerListBox::peerListHideLayer() {
-	_show.hideLayer();
+	_show->hideLayer();
 }
 
-not_null<QWidget*> PeerListBox::peerListToastParent() {
-	return _show.toastParent();
+std::shared_ptr<Main::SessionShow> PeerListBox::peerListUiShow() {
+	return _show;
 }
 
-PeerListController::PeerListController(std::unique_ptr<PeerListSearchController> searchController) : _searchController(std::move(searchController)) {
+PeerListController::PeerListController(
+	std::unique_ptr<PeerListSearchController> searchController)
+: _searchController(std::move(searchController)) {
 	if (_searchController) {
 		_searchController->setDelegate(this);
 	}
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index c641fc33c..28cb69534 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -24,6 +24,7 @@ struct MultiSelect;
 
 namespace Main {
 class Session;
+class SessionShow;
 } // namespace Main
 
 namespace Ui {
@@ -329,7 +330,7 @@ public:
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) = 0;
 	virtual void peerListHideLayer() = 0;
-	virtual not_null<QWidget*> peerListToastParent() = 0;
+	virtual std::shared_ptr<Main::SessionShow> peerListUiShow() = 0;
 
 	template <typename PeerDataRange>
 	void peerListAddSelectedPeers(PeerDataRange &&range) {
@@ -999,22 +1000,24 @@ public:
 	void peerListHideLayer() override {
 		Unexpected("...DelegateSimple::peerListHideLayer");
 	}
-	not_null<QWidget*> peerListToastParent() override {
-		Unexpected("...DelegateSimple::peerListToastParent");
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override {
+		Unexpected("...DelegateSimple::peerListUiShow");
 	}
 
 };
 
 class PeerListContentDelegateShow : public PeerListContentDelegateSimple {
 public:
-	PeerListContentDelegateShow(std::shared_ptr<Ui::Show> show);
+	explicit PeerListContentDelegateShow(
+		std::shared_ptr<Main::SessionShow> show);
 	void peerListShowBox(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 	void peerListHideLayer() override;
-	not_null<QWidget*> peerListToastParent() override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+
 private:
-	std::shared_ptr<Ui::Show> _show;
+	std::shared_ptr<Main::SessionShow> _show;
 
 };
 
@@ -1050,7 +1053,7 @@ public:
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 	void peerListHideLayer() override;
-	not_null<QWidget*> peerListToastParent() override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 
 	void setAddedTopScrollSkip(int skip);
 
@@ -1092,7 +1095,7 @@ private:
 
 	object_ptr<Ui::SlideWrap<Ui::MultiSelect>> _select = { nullptr };
 
-	const Ui::BoxShow _show;
+	const std::shared_ptr<Main::SessionShow> _show;
 	std::unique_ptr<PeerListController> _controller;
 	Fn<void(PeerListBox*)> _init;
 	bool _scrollBottomFixed = false;
diff --git a/Telegram/SourceFiles/boxes/peer_lists_box.cpp b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
index 9c65f294b..e445a21e2 100644
--- a/Telegram/SourceFiles/boxes/peer_lists_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/vertical_layout.h"
 #include "ui/widgets/multi_select.h"
 #include "ui/widgets/scroll_area.h"
+#include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_peer.h"
@@ -301,7 +302,7 @@ PeerListsBox::Delegate::Delegate(
 	not_null<PeerListController*> controller)
 : _box(box)
 , _controller(controller)
-, _show(_box) {
+, _show(Main::MakeSessionShow(_box->uiShow(), &_controller->session())) {
 }
 
 void PeerListsBox::Delegate::peerListSetTitle(rpl::producer<QString> title) {
@@ -374,15 +375,16 @@ void PeerListsBox::Delegate::peerListFinishSelectedRowsBunch() {
 void PeerListsBox::Delegate::peerListShowBox(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options) {
-	_show.showBox(std::move(content), options);
+	_show->showBox(std::move(content), options);
 }
 
 void PeerListsBox::Delegate::peerListHideLayer() {
-	_show.hideLayer();
+	_show->hideLayer();
 }
 
-not_null<QWidget*> PeerListsBox::Delegate::peerListToastParent() {
-	return _show.toastParent();
+auto PeerListsBox::Delegate::peerListUiShow()
+-> std::shared_ptr<Main::SessionShow> {
+	return _show;
 }
 
 bool PeerListsBox::Delegate::peerListIsRowChecked(
diff --git a/Telegram/SourceFiles/boxes/peer_lists_box.h b/Telegram/SourceFiles/boxes/peer_lists_box.h
index fcbbd984e..94732b3e2 100644
--- a/Telegram/SourceFiles/boxes/peer_lists_box.h
+++ b/Telegram/SourceFiles/boxes/peer_lists_box.h
@@ -58,12 +58,12 @@ private:
 			object_ptr<Ui::BoxContent> content,
 			Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 		void peerListHideLayer() override;
-		not_null<QWidget*> peerListToastParent() override;
+		std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 
 	private:
 		const not_null<PeerListsBox*> _box;
 		const not_null<PeerListController*> _controller;
-		const Ui::BoxShow _show;
+		const std::shared_ptr<Main::SessionShow> _show;
 
 	};
 	struct List {
diff --git a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
index 6f11e0593..1bffcb2ee 100644
--- a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
@@ -182,8 +182,7 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 	if (const auto megagroup = chat->asMegagroup()) {
 		if (!megagroup->canAddMembers()) {
 			_controller->show(
-				Ui::MakeInformBox(tr::lng_error_cant_add_member()),
-				Ui::LayerOption::KeepOther);
+				Ui::MakeInformBox(tr::lng_error_cant_add_member()));
 			return;
 		}
 	}
@@ -243,18 +242,16 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 				_token,
 				_existingRights.value_or(ChatAdminRights()) });
 		box->setSaveCallback(saveCallback);
-		controller->show(std::move(box), Ui::LayerOption::KeepOther);
+		controller->show(std::move(box));
 	} else {
 		auto callback = crl::guard(this, [=] {
 			AddBotToGroup(bot, chat, _token);
 			controller->hideLayer();
 		});
-		controller->show(
-			Ui::MakeConfirmBox({
-				tr::lng_bot_sure_invite(tr::now, lt_group, chat->name()),
-				std::move(callback),
-			}),
-			Ui::LayerOption::KeepOther);
+		controller->show(Ui::MakeConfirmBox({
+			tr::lng_bot_sure_invite(tr::now, lt_group, chat->name()),
+			std::move(callback),
+		}));
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index a7b3a6a2f..b40e1a0d2 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -202,9 +202,7 @@ void InviteForbiddenController::send(
 				int(list.size()),
 				Ui::Text::RichLangValue);
 		close();
-		Ui::Toast::Show(
-			show->toastParent(),
-			{ .text = std::move(text), .st = &st::defaultToast });
+		show->showToast(std::move(text));
 		return true;
 	};
 	const auto sendForFull = [=] {
@@ -368,7 +366,7 @@ bool AddParticipantsBoxController::needsInviteLinkButton() {
 QPointer<Ui::BoxContent> AddParticipantsBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
 	const auto weak = Ui::MakeWeak(box.data());
-	delegate()->peerListShowBox(std::move(box), Ui::LayerOption::KeepOther);
+	delegate()->peerListShowBox(std::move(box));
 	return weak;
 }
 
@@ -425,7 +423,7 @@ void AddParticipantsBoxController::inviteSelectedUsers(
 	if (users.empty()) {
 		return;
 	}
-	const auto show = std::make_shared<Ui::BoxShow>(box);
+	const auto show = box->uiShow();
 	const auto request = [=](bool checked) {
 		_peer->session().api().chatParticipants().add(
 			_peer,
@@ -493,9 +491,8 @@ void AddParticipantsBoxController::Start(
 		});
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 	};
-	Window::Show(navigation).showBox(
-		Box<PeerListBox>(std::move(controller), std::move(initBox)),
-		Ui::LayerOption::KeepOther);
+	parent->show(
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
 void AddParticipantsBoxController::Start(
@@ -538,9 +535,8 @@ void AddParticipantsBoxController::Start(
 			}, box->lifetime());
 		}
 	};
-	Window::Show(navigation).showBox(
-		Box<PeerListBox>(std::move(controller), std::move(initBox)),
-		Ui::LayerOption::KeepOther);
+	parent->show(
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
 void AddParticipantsBoxController::Start(
@@ -616,7 +612,7 @@ bool ChatInviteForbidden(
 				box->addButton(tr::lng_via_link_send(), [=] {
 					weak->send(
 						box->collectSelectedRows(),
-						std::make_shared<Ui::BoxShow>(box),
+						box->uiShow(),
 						crl::guard(box, [=] { box->closeBox(); }));
 				});
 			}
@@ -626,8 +622,7 @@ bool ChatInviteForbidden(
 		}, box->lifetime());
 	};
 	show->showBox(
-		Box<PeerListBox>(std::move(controller), std::move(initBox)),
-		Ui::LayerOption::KeepOther);
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 	return true;
 }
 
@@ -673,7 +668,7 @@ void AddSpecialBoxController::migrate(
 QPointer<Ui::BoxContent> AddSpecialBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
 	const auto weak = Ui::MakeWeak(box.data());
-	delegate()->peerListShowBox(std::move(box), Ui::LayerOption::KeepOther);
+	delegate()->peerListShowBox(std::move(box));
 	return weak;
 }
 
diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
index 91ce22ef8..60031e0ce 100644
--- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
@@ -505,5 +505,5 @@ void ShowChoosePeerBox(
 			bot,
 			query,
 			std::move(callback)),
-		std::move(initBox)), Ui::LayerOption::KeepOther);
+		std::move(initBox)));
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
index 89115f0bf..0aa24c79e 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
@@ -69,8 +69,7 @@ void SendRequest(
 		}
 		if (box) {
 			if (!wasContact) {
-				Ui::Toast::Show(
-					Ui::BoxShow(box.data()).toastParent(),
+				box->showToast(
 					tr::lng_new_contact_add_done(tr::now, lt_user, first));
 			}
 			box->closeBox();
diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index 400fcb95a..9727f6c61 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -274,12 +274,9 @@ struct IconSelector {
 	};
 	const auto selector = body->add(
 		object_ptr<EmojiListWidget>(body, EmojiListDescriptor{
-			.session = &controller->session(),
+			.show = controller->uiShow(),
 			.mode = EmojiListWidget::Mode::TopicIcon,
-			.controller = controller,
-			.paused = Window::PausedIn(
-				controller,
-				Window::GifPauseReason::Layer),
+			.paused = Window::PausedIn(controller, PauseReason::Layer),
 			.customRecentList = recent(),
 			.customRecentFactory = std::move(factory),
 			.st = &st::reactPanelEmojiPan,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
index cdba89701..9e0bfa2d9 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
@@ -18,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "boxes/peer_list_box.h"
 #include "ui/boxes/confirm_box.h"
-#include "ui/toasts/common_toasts.h"
 #include "boxes/add_contact_box.h"
 #include "apiwrap.h"
 #include "main/main_session.h"
@@ -168,13 +167,11 @@ void Controller::choose(not_null<ChannelData*> chat) {
 		const auto onstack = _callback;
 		onstack(chat);
 	};
-	delegate()->peerListShowBox(
-		Ui::MakeConfirmBox({
-			.text = text,
-			.confirmed = sure,
-			.confirmText = tr::lng_manage_discussion_group_link(tr::now),
-		}),
-		Ui::LayerOption::KeepOther);
+	delegate()->peerListShowBox(Ui::MakeConfirmBox({
+		.text = text,
+		.confirmed = sure,
+		.confirmText = tr::lng_manage_discussion_group_link(tr::now),
+	}));
 }
 
 void Controller::choose(not_null<ChatData*> chat) {
@@ -201,13 +198,11 @@ void Controller::choose(not_null<ChatData*> chat) {
 		};
 		chat->session().api().migrateChat(chat, crl::guard(this, done));
 	};
-	delegate()->peerListShowBox(
-		Ui::MakeConfirmBox({
-			.text = text,
-			.confirmed = sure,
-			.confirmText = tr::lng_manage_discussion_group_link(tr::now),
-		}),
-		Ui::LayerOption::KeepOther);
+	delegate()->peerListShowBox(Ui::MakeConfirmBox({
+		.text = text,
+		.confirmed = sure,
+		.confirmText = tr::lng_manage_discussion_group_link(tr::now),
+	}));
 }
 
 [[nodiscard]] rpl::producer<TextWithEntities> About(
@@ -279,13 +274,11 @@ void Controller::choose(not_null<ChatData*> chat) {
 				{ &st::settingsIconChat, Settings::kIconLightBlue }
 			)->addClickHandler([=, parent = above.data()] {
 				const auto guarded = crl::guard(parent, callback);
-				Window::Show(navigation).showBox(
-					Box<GroupInfoBox>(
-						navigation,
-						GroupInfoBox::Type::Megagroup,
-						channel->name() + " Chat",
-						guarded),
-					Ui::LayerOption::KeepOther);
+				navigation->uiShow()->showBox(Box<GroupInfoBox>(
+					navigation,
+					GroupInfoBox::Type::Megagroup,
+					channel->name() + " Chat",
+					guarded));
 			});
 		}
 		box->peerListSetAboveWidget(std::move(above));
@@ -363,10 +356,8 @@ object_ptr<Ui::BoxContent> EditLinkedChatBox(
 
 void ShowForumForDiscussionError(
 		not_null<Window::SessionNavigation*> navigation) {
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(navigation).toastParent(),
-		.text = tr::lng_forum_topics_no_discussion(
+	navigation->showToast(
+		tr::lng_forum_topics_no_discussion(
 			tr::now,
-			Ui::Text::RichLangValue),
-	});
+			Ui::Text::RichLangValue));
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index 7006606ce..f47beae75 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -203,7 +203,6 @@ EditAdminBox::EditAdminBox(
 	peer,
 	user,
 	(rights.flags != 0))
-, _show(this)
 , _oldRights(rights)
 , _oldRank(rank)
 , _addingBot(std::move(addingBot)) {
@@ -399,7 +398,7 @@ void EditAdminBox::prepare() {
 						Ui::Text::Bold(peer()->name()),
 						Ui::Text::WithEntities),
 					crl::guard(this, [=] { finishAddAdmin(); })
-				}), Ui::LayerOption::KeepOther);
+				}));
 			} else {
 				_finishSave();
 			}
@@ -623,16 +622,15 @@ void EditAdminBox::sendTransferRequestFrom(
 		if (!box && !weak) {
 			return;
 		}
-
-		Ui::Toast::Show(
-			(box ? Ui::BoxShow(box) : weak->_show).toastParent(),
+		const auto show = box ? box->uiShow() : weak->uiShow();
+		show->showToast(
 			(channel->isBroadcast()
 				? tr::lng_rights_transfer_done_channel
 				: tr::lng_rights_transfer_done_group)(
 					tr::now,
 					lt_user,
 					user->shortName()));
-		(box ? Ui::BoxShow(box) : weak->_show).hideLayer();
+		show->hideLayer();
 	}).fail(crl::guard(this, [=](const MTP::Error &error) {
 		if (weak) {
 			_transferRequestId = 0;
@@ -694,7 +692,6 @@ EditRestrictedBox::EditRestrictedBox(
 	bool hasAdminRights,
 	ChatRestrictionsInfo rights)
 : EditParticipantBox(nullptr, peer, user, hasAdminRights)
-, _show(this)
 , _oldRights(rights) {
 }
 
@@ -788,7 +785,7 @@ ChatRestrictionsInfo EditRestrictedBox::defaultRights() const {
 }
 
 void EditRestrictedBox::showRestrictUntil() {
-	_show.showBox(Box([=](not_null<Ui::GenericBox*> box) {
+	uiShow()->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 		const auto save = [=](TimeId result) {
 			if (!result) {
 				return;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
index 4deda7ac9..b770730d5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
@@ -114,7 +114,6 @@ private:
 		not_null<Ui::VerticalLayout*> container,
 		bool isGroup);
 
-	const Ui::BoxShow _show;
 	const ChatAdminRightsInfo _oldRights;
 	const QString _oldRank;
 	Fn<void(
@@ -168,7 +167,6 @@ private:
 	void createUntilVariants();
 	TimeId getRealUntilValue() const;
 
-	const Ui::BoxShow _show;
 	const ChatRestrictionsInfo _oldRights;
 	TimeId _until = 0;
 	Fn<void(ChatRestrictionsInfo, ChatRestrictionsInfo)> _saveCallback;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index c9d759cdd..94caec150 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1254,7 +1254,7 @@ void ParticipantsBoxController::rebuild() {
 QPointer<Ui::BoxContent> ParticipantsBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
 	const auto weak = Ui::MakeWeak(box.data());
-	delegate()->peerListShowBox(std::move(box), Ui::LayerOption::KeepOther);
+	delegate()->peerListShowBox(std::move(box));
 	return weak;
 }
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 41b37a17e..febf08ed6 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -48,7 +48,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/userpic_button.h"
 #include "ui/rp_widget.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
@@ -241,9 +240,7 @@ void ShowEditPermissions(
 		};
 		ShowEditPeerPermissionsBox(box, navigation, peer, std::move(done));
 	};
-	navigation->parentController()->show(
-		Box(std::move(createBox)),
-		Ui::LayerOption::KeepOther);
+	navigation->parentController()->show(Box(std::move(createBox)));
 }
 
 } // namespace
@@ -606,8 +603,7 @@ object_ptr<Ui::RpWidget> Controller::createStickersEdit() {
 		rpl::single(QString()), //Empty count.
 		[=, controller = _navigation->parentController()] {
 			controller->show(
-				Box<StickersBox>(controller, channel),
-				Ui::LayerOption::KeepOther);
+				Box<StickersBox>(controller->uiShow(), channel));
 		},
 		{ &st::settingsIconStickers, Settings::kIconLightOrange });
 
@@ -674,8 +670,7 @@ void Controller::showEditPeerTypeBox(
 			_channelHasLocationOriginalValue,
 			boxCallback,
 			_typeDataSavedValue,
-			error),
-		Ui::LayerOption::KeepOther);
+			error));
 	box->boxClosing(
 	) | rpl::start_with_next([peer = _peer] {
 		peer->session().api().usernames().requestToCache(peer);
@@ -709,14 +704,12 @@ void Controller::showEditLinkedChatBox() {
 				|| channel->canEditPreHistoryHidden()));
 
 	if (const auto chat = *_linkedChatSavedValue) {
-		*box = _navigation->parentController()->show(
-			EditLinkedChatBox(
-				_navigation,
-				channel,
-				chat,
-				canEdit,
-				callback),
-			Ui::LayerOption::KeepOther);
+		*box = _navigation->parentController()->show(EditLinkedChatBox(
+			_navigation,
+			channel,
+			chat,
+			canEdit,
+			callback));
 		return;
 	} else if (!canEdit || _linkedChatsRequestId) {
 		return;
@@ -743,13 +736,11 @@ void Controller::showEditLinkedChatBox() {
 		for (const auto &item : list) {
 			chats.emplace_back(_peer->owner().processChat(item));
 		}
-		*box = _navigation->parentController()->show(
-			EditLinkedChatBox(
-				_navigation,
-				channel,
-				std::move(chats),
-				callback),
-			Ui::LayerOption::KeepOther);
+		*box = _navigation->parentController()->show(EditLinkedChatBox(
+			_navigation,
+			channel,
+			std::move(chats),
+			callback));
 	}).fail([=] {
 		_linkedChatsRequestId = 0;
 	}).send();
@@ -887,14 +878,12 @@ void Controller::fillForumButton() {
 			if (_linkedChatSavedValue && *_linkedChatSavedValue) {
 				ShowForumForDiscussionError(_navigation);
 			} else {
-				Ui::ShowMultilineToast({
-					.parentOverride = Window::Show(_navigation).toastParent(),
-					.text = tr::lng_forum_topics_not_enough(
+				_navigation->showToast(
+					tr::lng_forum_topics_not_enough(
 						tr::now,
 						lt_count,
 						EnableForumMinMembers(_peer),
-						Ui::Text::RichLangValue),
-				});
+						Ui::Text::RichLangValue));
 			}
 		} else {
 			_forumSavedValue = toggled;
@@ -1231,14 +1220,12 @@ void Controller::fillManageSection() {
 			tr::lng_manage_peer_invite_links(),
 			rpl::duplicate(count) | ToPositiveNumberString(),
 			[=] {
-				_navigation->parentController()->show(
-					Box(
-						ManageInviteLinksBox,
-						_peer,
-						_peer->session().user(),
-						0,
-						0),
-					Ui::LayerOption::KeepOther);
+				_navigation->parentController()->show(Box(
+					ManageInviteLinksBox,
+					_peer,
+					_peer->session().user(),
+					0,
+					0));
 			},
 			{ &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange });
 		wrap->toggle(true, anim::type::instant);
@@ -1407,9 +1394,7 @@ void Controller::fillBotUsernamesButton() {
 		std::move(leftLabel),
 		std::move(rightLabel),
 		[=] {
-			Window::Show(_navigation).showBox(
-				Box(UsernamesBox, user),
-				Ui::LayerOption::KeepOther);
+			_navigation->uiShow()->showBox(Box(UsernamesBox, user));
 		},
 		{ &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange });
 }
@@ -2120,8 +2105,7 @@ void Controller::deleteWithConfirmation() {
 			.confirmed = deleteCallback,
 			.confirmText = tr::lng_box_delete(),
 			.confirmStyle = &st::attentionBoxButton,
-		}),
-		Ui::LayerOption::KeepOther);
+		}));
 }
 
 void Controller::deleteChannel() {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 0d3844362..00f9eac3f 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/abstract_button.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/text/text_utilities.h"
 #include "ui/boxes/edit_invite_link.h"
 #include "ui/painter.h"
@@ -275,12 +274,12 @@ void QrBox(
 		not_null<Ui::GenericBox*> box,
 		const QString &link,
 		rpl::producer<QString> about,
-		Fn<void(QImage, std::shared_ptr<Ui::BoxShow>)> share) {
+		Fn<void(QImage, std::shared_ptr<Ui::Show>)> share) {
 	box->setTitle(tr::lng_group_invite_qr_title());
 
 	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
 
-	const auto copyCallback = [=, show = std::make_shared<Ui::BoxShow>(box)] {
+	const auto copyCallback = [=, show = box->uiShow()] {
 		share(QrForShare(link), show);
 	};
 
@@ -346,32 +345,23 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 	const auto admin = current.admin;
 	const auto weak = Ui::MakeWeak(container);
 	const auto copyLink = crl::guard(weak, [=] {
-		CopyInviteLink(delegate()->peerListToastParent(), link);
+		CopyInviteLink(delegate()->peerListUiShow(), link);
 	});
 	const auto shareLink = crl::guard(weak, [=] {
-		delegate()->peerListShowBox(
-			ShareInviteLinkBox(_peer, link),
-			Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(ShareInviteLinkBox(_peer, link));
 	});
 	const auto getLinkQr = crl::guard(weak, [=] {
 		delegate()->peerListShowBox(
-			InviteLinkQrBox(link, tr::lng_group_invite_qr_about()),
-			Ui::LayerOption::KeepOther);
+			InviteLinkQrBox(link, tr::lng_group_invite_qr_about()));
 	});
 	const auto revokeLink = crl::guard(weak, [=] {
-		delegate()->peerListShowBox(
-			RevokeLinkBox(_peer, admin, link),
-			Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(RevokeLinkBox(_peer, admin, link));
 	});
 	const auto editLink = crl::guard(weak, [=] {
-		delegate()->peerListShowBox(
-			EditLinkBox(_peer, _data.current()),
-			Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(EditLinkBox(_peer, _data.current()));
 	});
 	const auto deleteLink = crl::guard(weak, [=] {
-		delegate()->peerListShowBox(
-			DeleteLinkBox(_peer, admin, link),
-			Ui::LayerOption::KeepOther);
+		delegate()->peerListShowBox(DeleteLinkBox(_peer, admin, link));
 	});
 
 	const auto createMenu = [=] {
@@ -809,16 +799,13 @@ void Controller::processRequest(
 			delegate()->peerListRefreshRows();
 		}
 		if (approved) {
-			Ui::ShowMultilineToast({
-				.parentOverride = delegate()->peerListToastParent(),
-				.text = (_peer->isBroadcast()
-					? tr::lng_group_requests_was_added_channel
-					: tr::lng_group_requests_was_added)(
-						tr::now,
-						lt_user,
-						Ui::Text::Bold(user->name()),
-						Ui::Text::WithEntities)
-			});
+			delegate()->peerListUiShow()->showToast((_peer->isBroadcast()
+				? tr::lng_group_requests_was_added_channel
+				: tr::lng_group_requests_was_added)(
+					tr::now,
+					lt_user,
+					Ui::Text::Bold(user->name()),
+					Ui::Text::WithEntities));
 		}
 	});
 	const auto fail = crl::guard(this, [=] {
@@ -961,30 +948,24 @@ void AddPermanentLinkBlock(
 	const auto weak = Ui::MakeWeak(container);
 	const auto copyLink = crl::guard(weak, [=] {
 		if (const auto current = value->current(); !current.link.isEmpty()) {
-			CopyInviteLink(show->toastParent(), current.link);
+			CopyInviteLink(show, current.link);
 		}
 	});
 	const auto shareLink = crl::guard(weak, [=] {
 		if (const auto current = value->current(); !current.link.isEmpty()) {
-			show->showBox(
-				ShareInviteLinkBox(peer, current.link),
-				Ui::LayerOption::KeepOther);
+			show->showBox(ShareInviteLinkBox(peer, current.link));
 		}
 	});
 	const auto getLinkQr = crl::guard(weak, [=] {
 		if (const auto current = value->current(); !current.link.isEmpty()) {
-			show->showBox(
-				InviteLinkQrBox(
-					current.link,
-					tr::lng_group_invite_qr_about()),
-				Ui::LayerOption::KeepOther);
+			show->showBox(InviteLinkQrBox(
+				current.link,
+				tr::lng_group_invite_qr_about()));
 		}
 	});
 	const auto revokeLink = crl::guard(weak, [=] {
 		if (const auto current = value->current(); !current.link.isEmpty()) {
-			show->showBox(
-				RevokeLinkBox(peer, admin, current.link, true),
-				Ui::LayerOption::KeepOther);
+			show->showBox(RevokeLinkBox(peer, admin, current.link, true));
 		}
 	});
 
@@ -1111,9 +1092,7 @@ void AddPermanentLinkBlock(
 		st::inviteLinkJoinedRowPadding
 	)->setClickedCallback([=] {
 		if (!currentLinkFields->link.isEmpty()) {
-			show->showBox(
-				ShowInviteLinkBox(peer, *currentLinkFields),
-				Ui::LayerOption::KeepOther);
+			show->showBox(ShowInviteLinkBox(peer, *currentLinkFields));
 		}
 	});
 
@@ -1128,9 +1107,9 @@ void AddPermanentLinkBlock(
 	}));
 }
 
-void CopyInviteLink(not_null<QWidget*> toastParent, const QString &link) {
+void CopyInviteLink(std::shared_ptr<Ui::Show> show, const QString &link) {
 	QGuiApplication::clipboard()->setText(link);
-	Ui::Toast::Show(toastParent, tr::lng_group_invite_copied(tr::now));
+	show->showToast(tr::lng_group_invite_copied(tr::now));
 }
 
 object_ptr<Ui::BoxContent> ShareInviteLinkBox(
@@ -1147,7 +1126,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 
 	const auto showToast = [=](const QString &text) {
 		if (*box) {
-			Ui::Toast::Show(Ui::BoxShow(*box).toastParent(), text);
+			(*box)->showToast(text);
 		}
 	};
 
@@ -1184,9 +1163,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 			}
 			text.append(error.first);
 			if (*box) {
-				Ui::BoxShow(*box).showBox(
-					Ui::MakeInformBox(text),
-					Ui::LayerOption::KeepOther);
+				(*box)->uiShow()->showBox(Ui::MakeInformBox(text));
 			}
 			return;
 		}
@@ -1232,14 +1209,11 @@ object_ptr<Ui::BoxContent> InviteLinkQrBox(
 		rpl::producer<QString> about) {
 	return Box(QrBox, link, std::move(about), [=](
 			const QImage &image,
-			std::shared_ptr<Ui::BoxShow> show) {
+			std::shared_ptr<Ui::Show> show) {
 		auto mime = std::make_unique<QMimeData>();
 		mime->setImageData(image);
 		QGuiApplication::clipboard()->setMimeData(mime.release());
-
-		Ui::Toast::Show(
-			show->toastParent(),
-			tr::lng_group_invite_qr_copied(tr::now));
+		show->showToast(tr::lng_group_invite_qr_copied(tr::now));
 	});
 }
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
index 40654776e..b4f54ef70 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
@@ -38,7 +38,7 @@ void AddPermanentLinkBlock(
 	not_null<UserData*> admin,
 	rpl::producer<Api::InviteLink> fromList);
 
-void CopyInviteLink(not_null<QWidget*> toastParent, const QString &link);
+void CopyInviteLink(std::shared_ptr<Ui::Show> show, const QString &link);
 [[nodiscard]] object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	not_null<PeerData*> peer,
 	const QString &link);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
index 82a46aff6..45a4c0ea0 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
+#include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "api/api_invite_links.h"
 #include "ui/wrap/slide_wrap.h"
@@ -543,8 +544,7 @@ void LinksController::appendSlice(const InviteLinksSlice &slice) {
 
 void LinksController::rowClicked(not_null<PeerListRow*> row) {
 	delegate()->peerListShowBox(
-		ShowInviteLinkBox(_peer, static_cast<Row*>(row.get())->data()),
-		Ui::LayerOption::KeepOther);
+		ShowInviteLinkBox(_peer, static_cast<Row*>(row.get())->data()));
 }
 
 void LinksController::rowRightActionClicked(not_null<PeerListRow*> row) {
@@ -579,33 +579,25 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 		st::popupMenuWithIcons);
 	if (data.revoked) {
 		result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] {
-			delegate()->peerListShowBox(
-				DeleteLinkBox(_peer, _admin, link),
-				Ui::LayerOption::KeepOther);
+			delegate()->peerListShowBox(DeleteLinkBox(_peer, _admin, link));
 		}, &st::menuIconDelete);
 	} else {
 		result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {
-			CopyInviteLink(delegate()->peerListToastParent(), link);
+			CopyInviteLink(delegate()->peerListUiShow(), link);
 		}, &st::menuIconCopy);
 		result->addAction(tr::lng_group_invite_context_share(tr::now), [=] {
 			delegate()->peerListShowBox(
-				ShareInviteLinkBox(_peer, link),
-				Ui::LayerOption::KeepOther);
+				ShareInviteLinkBox(_peer, link));
 		}, &st::menuIconShare);
 		result->addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
 			delegate()->peerListShowBox(
-				InviteLinkQrBox(link, tr::lng_group_invite_qr_about()),
-				Ui::LayerOption::KeepOther);
+				InviteLinkQrBox(link, tr::lng_group_invite_qr_about()));
 		}, &st::menuIconQrCode);
 		result->addAction(tr::lng_group_invite_context_edit(tr::now), [=] {
-			delegate()->peerListShowBox(
-				EditLinkBox(_peer, data),
-				Ui::LayerOption::KeepOther);
+			delegate()->peerListShowBox(EditLinkBox(_peer, data));
 		}, &st::menuIconEdit);
 		result->addAction(tr::lng_group_invite_context_revoke(tr::now), [=] {
-			delegate()->peerListShowBox(
-				RevokeLinkBox(_peer, _admin, link),
-				Ui::LayerOption::KeepOther);
+			delegate()->peerListShowBox(RevokeLinkBox(_peer, _admin, link));
 		}, &st::menuIconRemove);
 	}
 	return result;
@@ -813,8 +805,7 @@ void AdminsController::loadMoreRows() {
 
 void AdminsController::rowClicked(not_null<PeerListRow*> row) {
 	delegate()->peerListShowBox(
-		Box(ManageInviteLinksBox, _peer, row->peer()->asUser(), 0, 0),
-		Ui::LayerOption::KeepOther);
+		Box(ManageInviteLinksBox, _peer, row->peer()->asUser(), 0, 0));
 }
 
 Main::Session &AdminsController::session() const {
@@ -836,7 +827,7 @@ struct LinksList {
 };
 
 LinksList AddLinksList(
-		std::shared_ptr<Ui::BoxShow> show,
+		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::VerticalLayout*> container,
 		not_null<PeerData*> peer,
 		not_null<UserData*> admin,
@@ -861,7 +852,7 @@ LinksList AddLinksList(
 }
 
 not_null<Ui::RpWidget*> AddAdminsList(
-		std::shared_ptr<Ui::BoxShow> show,
+		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::VerticalLayout*> container,
 		not_null<PeerData*> peer,
 		not_null<UserData*> admin) {
@@ -889,7 +880,9 @@ void ManageInviteLinksBox(
 		int revokedCount) {
 	using namespace Settings;
 
-	const auto show = std::make_shared<Ui::BoxShow>(box);
+	const auto show = Main::MakeSessionShow(
+		box->uiShow(),
+		&peer->session());
 
 	box->setTitle(tr::lng_group_invite_title());
 	box->setWidth(st::boxWideWidth);
@@ -925,8 +918,7 @@ void ManageInviteLinksBox(
 		const auto add = AddCreateLinkButton(container);
 		add->setClickedCallback([=] {
 			show->showBox(
-				EditLinkBox(peer, InviteLinkData{ .admin = admin }),
-				Ui::LayerOption::KeepOther);
+				EditLinkBox(peer, InviteLinkData{ .admin = admin }));
 		});
 	} else {
 		otherHeader = container->add(object_ptr<Ui::SlideWrap<>>(
@@ -1006,8 +998,8 @@ void ManageInviteLinksBox(
 			top + st::inviteLinkRevokedTitlePadding.top(),
 			outerWidth);
 	}, deleteAll->lifetime());
-	deleteAll->setClickedCallback([=, show = Ui::BoxShow(box)] {
-		show.showBox(DeleteAllRevokedBox(peer, admin));
+	deleteAll->setClickedCallback([=, show = box->uiShow()] {
+		show->showBox(DeleteAllRevokedBox(peer, admin));
 	});
 
 	rpl::combine(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index ed7ba6df5..420d5dc52 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/box_content_divider.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
+#include "ui/toast/toast.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_values.h"
 #include "boxes/peers/edit_participants_box.h"
@@ -417,10 +417,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 
 	const auto handleLocked = [=] {
 		if (locked.has_value()) {
-			Ui::ShowMultilineToast({
-				.parentOverride = container,
-				.text = { *locked },
-			});
+			Ui::Toast::Show(container, *locked);
 			return true;
 		}
 		return false;
@@ -597,8 +594,7 @@ template <typename Flags>
 		) | rpl::start_with_next([=](bool checked) {
 			if (checked && state->forceDisabled.current()) {
 				if (!state->toast) {
-					state->toast = Ui::ShowMultilineToast({
-						.parentOverride = container,
+					state->toast = Ui::Toast::Show(container, {
 						.text = { state->forceDisabledMessage.current() },
 						.duration = kForceDisableTooltipDuration,
 					});
@@ -607,8 +603,7 @@ template <typename Flags>
 			} else if (locked.has_value()) {
 				if (checked != toggled) {
 					if (!state->toast) {
-						state->toast = Ui::ShowMultilineToast({
-							.parentOverride = container,
+						state->toast = Ui::Toast::Show(container, {
 							.text = { *locked },
 							.duration = kForceDisableTooltipDuration,
 						});
@@ -970,23 +965,20 @@ Fn<void()> AboutGigagroupCallback(
 			channel->inputChannel
 		)).done([=](const MTPUpdates &result) {
 			channel->session().api().applyUpdates(result);
-			if (const auto strongController = weak.get()) {
-				strongController->window().hideSettingsAndLayer();
-				Ui::ShowMultilineToast({
-					.parentOverride = strongController->widget(),
-					.text = { tr::lng_gigagroup_done(tr::now) },
-				});
+			if (const auto strong = weak.get()) {
+				strong->window().hideSettingsAndLayer();
+				strong->showToast(tr::lng_gigagroup_done(tr::now));
 			}
 		}).fail([=] {
 			*converting = false;
 		}).send();
 	};
 	const auto convertWarn = [=] {
-		const auto strongController = weak.get();
-		if (*converting || !strongController) {
+		const auto strong = weak.get();
+		if (*converting || !strong) {
 			return;
 		}
-		strongController->show(Box([=](not_null<Ui::GenericBox*> box) {
+		strong->show(Box([=](not_null<Ui::GenericBox*> box) {
 			box->setTitle(tr::lng_gigagroup_warning_title());
 			box->addRow(
 				object_ptr<Ui::FlatLabel>(
@@ -996,14 +988,14 @@ Fn<void()> AboutGigagroupCallback(
 					st::infoAboutGigagroup));
 			box->addButton(tr::lng_gigagroup_convert_sure(), convertSure);
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-		}), Ui::LayerOption::KeepOther);
+		}));
 	};
 	return [=] {
-		const auto strongController = weak.get();
-		if (*converting || !strongController) {
+		const auto strong = weak.get();
+		if (*converting || !strong) {
 			return;
 		}
-		strongController->show(Box([=](not_null<Ui::GenericBox*> box) {
+		strong->show(Box([=](not_null<Ui::GenericBox*> box) {
 			box->setTitle(tr::lng_gigagroup_convert_title());
 			const auto addFeature = [&](rpl::producer<QString> text) {
 				using namespace rpl::mappers;
@@ -1024,7 +1016,7 @@ Fn<void()> AboutGigagroupCallback(
 			addFeature(tr::lng_gigagroup_convert_feature3());
 			box->addButton(tr::lng_gigagroup_convert_sure(), convertWarn);
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-		}), Ui::LayerOption::KeepOther);
+		}));
 	};
 }
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
index 928032923..0f21d164b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
@@ -22,7 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "mtproto/sender.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/painter.h"
 #include "lang/lang_keys.h"
 #include "window/window_session_controller.h"
@@ -382,16 +381,13 @@ void RequestsBoxController::processRequest(
 	const auto done = crl::guard(this, [=] {
 		remove();
 		if (approved) {
-			Ui::ShowMultilineToast({
-				.parentOverride = delegate()->peerListToastParent(),
-				.text = (_peer->isBroadcast()
-					? tr::lng_group_requests_was_added_channel
-					: tr::lng_group_requests_was_added)(
-						tr::now,
-						lt_user,
-						Ui::Text::Bold(user->name()),
-						Ui::Text::WithEntities)
-			});
+			delegate()->peerListUiShow()->showToast((_peer->isBroadcast()
+				? tr::lng_group_requests_was_added_channel
+				: tr::lng_group_requests_was_added)(
+					tr::now,
+					lt_user,
+					Ui::Text::Bold(user->name()),
+					Ui::Text::WithEntities));
 		}
 	});
 	const auto fail = crl::guard(this, remove);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
index de5a5c0e7..2739eb125 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
@@ -52,7 +52,7 @@ class Controller : public base::has_weak_ptr {
 public:
 	Controller(
 		Window::SessionNavigation *navigation,
-		std::shared_ptr<Ui::BoxShow> show,
+		std::shared_ptr<Ui::Show> show,
 		not_null<Ui::VerticalLayout*> container,
 		not_null<PeerData*> peer,
 		bool useLocationPhrases,
@@ -140,7 +140,7 @@ private:
 		rpl::producer<QString> about);
 
 	Window::SessionNavigation *_navigation = nullptr;
-	std::shared_ptr<Ui::BoxShow> _show;
+	std::shared_ptr<Ui::Show> _show;
 
 	not_null<PeerData*> _peer;
 	bool _linkOnly = false;
@@ -168,7 +168,7 @@ private:
 
 Controller::Controller(
 	Window::SessionNavigation *navigation,
-	std::shared_ptr<Ui::BoxShow> show,
+	std::shared_ptr<Ui::Show> show,
 	not_null<Ui::VerticalLayout*> container,
 	not_null<PeerData*> peer,
 	bool useLocationPhrases,
@@ -601,9 +601,7 @@ void Controller::askUsernameRevoke() {
 		_controls.privacy->setValue(Privacy::HasUsername);
 		checkUsernameAvailability();
 	});
-	_show->showBox(
-		Box(PublicLinksLimitBox, _navigation, revokeCallback),
-		Ui::LayerOption::KeepOther);
+	_show->showBox(Box(PublicLinksLimitBox, _navigation, revokeCallback));
 }
 
 void Controller::usernameChanged() {
@@ -735,7 +733,7 @@ void EditPeerTypeBox::prepare() {
 	const auto controller = Ui::CreateChild<Controller>(
 		this,
 		_navigation,
-		std::make_shared<Ui::BoxShow>(this),
+		uiShow(),
 		content.data(),
 		_peer,
 		_useLocationPhrases,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
index aa0a26afb..c5da08715 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
@@ -117,8 +117,7 @@ UsernamesList::Row::Row(
 			tr::lng_group_invite_context_copy(tr::now),
 			[=] {
 				QGuiApplication::clipboard()->setText(link);
-				Ui::Toast::Show(
-					show->toastParent(),
+				show->showToast(
 					tr::lng_create_channel_link_copied(tr::now));
 			},
 			&st::menuIconCopy);
@@ -307,8 +306,7 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 										tr::lng_usernames_activate_error(
 											lt_count,
 											rpl::single(kMaxUsernames),
-											Ui::Text::RichLangValue)),
-									Ui::LayerOption::KeepOther);
+											Ui::Text::RichLangValue)));
 							}
 							load();
 							_toggleLifetime.destroy();
@@ -321,9 +319,7 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 				}),
 				.confirmText = std::move(confirmText),
 			};
-			_show->showBox(
-				Ui::MakeConfirmBox(std::move(args)),
-				Ui::LayerOption::KeepOther);
+			_show->showBox(Ui::MakeConfirmBox(std::move(args)));
 		});
 	}
 
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index 9658bad06..55fbe0a35 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "main/main_domain.h"
@@ -133,7 +132,7 @@ public:
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 	void peerListHideLayer() override;
-	not_null<QWidget*> peerListToastParent() override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 	void peerListSetRowChecked(
 		not_null<PeerListRow*> row,
 		bool checked) override;
@@ -205,8 +204,8 @@ void InactiveDelegate::peerListShowBox(
 void InactiveDelegate::peerListHideLayer() {
 }
 
-not_null<QWidget*> InactiveDelegate::peerListToastParent() {
-	Unexpected("...InactiveDelegate::peerListToastParent");
+std::shared_ptr<Main::SessionShow> InactiveDelegate::peerListUiShow() {
+	Unexpected("...InactiveDelegate::peerListUiShow");
 }
 
 rpl::producer<int> InactiveDelegate::selectedCountChanges() const {
@@ -385,8 +384,7 @@ void PublicsController::rowRightActionClicked(not_null<PeerListRow*> row) {
 			.text = text,
 			.confirmed = std::move(callback),
 			.confirmText = confirmText,
-		}),
-		Ui::LayerOption::KeepOther);
+		}));
 }
 
 void PublicsController::appendRow(not_null<PeerData*> participant) {
@@ -602,10 +600,7 @@ void ChannelsLimitBox(
 					session->api().leaveChannel(channel);
 				}
 			}
-			Ui::ShowMultilineToast({
-				.parentOverride = Ui::BoxShow(box).toastParent(),
-				.text = { tr::lng_channels_leave_done(tr::now) },
-			});
+			box->showToast(tr::lng_channels_leave_done(tr::now));
 			box->closeBox();
 		};
 		box->clearButtons();
diff --git a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
index baf0f157e..8c3845efe 100644
--- a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
@@ -27,7 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/chat_theme.h"
 #include "ui/effects/scroll_content_shadow.h"
 #include "ui/layers/generic_box.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/scroll_area.h"
diff --git a/Telegram/SourceFiles/boxes/report_messages_box.cpp b/Telegram/SourceFiles/boxes/report_messages_box.cpp
index 73223c1fd..291e0617b 100644
--- a/Telegram/SourceFiles/boxes/report_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_messages_box.cpp
@@ -39,13 +39,12 @@ namespace {
 		return Ui::ReportSource::Bot;
 	});
 	return Box([=](not_null<Ui::GenericBox*> box) {
+		const auto show = box->uiShow();
 		Ui::ReportReasonBox(box, source, [=](Ui::ReportReason reason) {
-			Ui::BoxShow(box).showBox(Box([=](not_null<Ui::GenericBox*> box) {
-				const auto show = Ui::BoxShow(box);
+			show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 				Ui::ReportDetailsBox(box, [=](const QString &text) {
-					const auto toastParent = show.toastParent();
-					Api::SendReport(toastParent, peer, reason, text, data);
-					show.hideLayer();
+					Api::SendReport(show, peer, reason, text, data);
+					show->hideLayer();
 				});
 			}));
 		});
@@ -79,7 +78,7 @@ void ShowReportPeerBox(
 		const auto send = [=](const QString &text) {
 			window->clearChooseReportMessages();
 			Api::SendReport(
-				Window::Show(window).toastParent(),
+				window->uiShow(),
 				peer,
 				reason,
 				text,
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index c49ec87ed..baceecfe5 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -83,9 +83,9 @@ void FileDialogCallback(
 		Fn<bool(const Ui::PreparedList&)> checkResult,
 		Fn<void(Ui::PreparedList)> callback,
 		bool premium,
-		not_null<QWidget*> toastParent) {
+		std::shared_ptr<Ui::Show> show) {
 	auto showError = [=](tr::phrase<> text) {
-		Ui::Toast::Show(toastParent, text(tr::now));
+		show->showToast(text(tr::now));
 	};
 
 	auto list = Storage::PreparedFileFromFilesDialog(
@@ -143,7 +143,7 @@ SendFilesCheck DefaultCheckForPeer(
 			bool silent) {
 		const auto error = Data::FileRestrictionError(peer, file, compress);
 		if (error && !silent) {
-			controller->showToast({ *error });
+			controller->showToast(*error);
 		}
 		return !error.has_value();
 	};
@@ -468,12 +468,12 @@ void SendFilesBox::refreshAllAfterChanges(int fromItem, Fn<void()> perform) {
 }
 
 void SendFilesBox::openDialogToAddFileToAlbum() {
-	const auto toastParent = Ui::BoxShow(this).toastParent();
+	const auto show = uiShow();
 	const auto checkResult = [=](const Ui::PreparedList &list) {
 		if (!(_limits & SendFilesAllow::OnlyOne)) {
 			return true;
 		} else if (!_list.canBeSentInSlowmodeWith(list)) {
-			Ui::Toast::Show(toastParent, tr::lng_slowmode_no_many(tr::now));
+			showToast(tr::lng_slowmode_no_many(tr::now));
 			return false;
 		}
 		return true;
@@ -485,7 +485,7 @@ void SendFilesBox::openDialogToAddFileToAlbum() {
 			checkResult,
 			[=](Ui::PreparedList list) { addFiles(std::move(list)); },
 			premium,
-			toastParent);
+			show);
 	};
 
 	FileDialog::GetOpenPaths(
@@ -748,7 +748,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 		});
 	}, widget->lifetime());
 
-	const auto toastParent = Ui::BoxShow(this).toastParent();
+	const auto show = uiShow();
 	block.itemReplaceRequest(
 	) | rpl::start_with_next([=](int index) {
 		const auto replace = [=](Ui::PreparedList list) {
@@ -770,9 +770,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 			_list.files.push_back(std::move(removing));
 			std::swap(_list.files[index], _list.files.back());
 			if (!result) {
-				Ui::Toast::Show(
-					toastParent,
-					tr::lng_slowmode_no_many(tr::now));
+				show->showToast(tr::lng_slowmode_no_many(tr::now));
 				return false;
 			}
 			return true;
@@ -815,7 +813,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 				checkResult,
 				replace,
 				premium,
-				toastParent);
+				show);
 		};
 
 		FileDialog::GetOpenPath(
@@ -1024,7 +1022,7 @@ void SendFilesBox::setupEmojiPanel() {
 		_controller,
 		object_ptr<Selector>(
 			nullptr,
-			_controller,
+			_controller->uiShow(),
 			Window::GifPauseReason::Layer,
 			Selector::Mode::EmojiOnly));
 	_emojiPanel->setDesiredHeightValues(
@@ -1388,8 +1386,7 @@ void SendFilesBox::sendScheduled() {
 		: _sendMenuType;
 	const auto callback = [=](Api::SendOptions options) { send(options); };
 	_controller->show(
-		HistoryView::PrepareScheduleBox(this, type, callback),
-		Ui::LayerOption::KeepOther);
+		HistoryView::PrepareScheduleBox(this, type, callback));
 }
 
 void SendFilesBox::sendWhenOnline() {
diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
index a60927da4..55b5f499c 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@@ -846,7 +846,7 @@ void SessionsContent::terminate(Fn<void()> terminateRequest, QString message) {
 		.confirmStyle = &st::attentionBoxButton,
 	});
 	_terminateBox = Ui::MakeWeak(box.data());
-	_controller->show(std::move(box), Ui::LayerOption::KeepOther);
+	_controller->show(std::move(box));
 }
 
 void SessionsContent::terminateOne(uint64 hash) {
@@ -928,7 +928,7 @@ void SessionsContent::Inner::setupContent() {
 		rename->moveToRight(x, y, outer.width());
 	}, rename->lifetime());
 	rename->setClickedCallback([=] {
-		_controller->show(Box(RenameBox), Ui::LayerOption::KeepOther);
+		_controller->show(Box(RenameBox));
 	});
 
 	const auto session = &_controller->session();
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index c46b76354..d23e6142c 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -63,7 +63,7 @@ public:
 	Inner(
 		QWidget *parent,
 		const Descriptor &descriptor,
-		std::shared_ptr<Ui::BoxShow> show);
+		std::shared_ptr<Ui::Show> show);
 
 	void setPeerSelectedChangedCallback(
 		Fn<void(not_null<Data::Thread*> thread, bool selected)> callback);
@@ -146,7 +146,7 @@ private:
 	void refresh();
 
 	const Descriptor &_descriptor;
-	const std::shared_ptr<Ui::BoxShow> _show;
+	const std::shared_ptr<Ui::Show> _show;
 	const style::PeerList &_st;
 
 	float64 _columnSkip = 0.;
@@ -181,7 +181,6 @@ private:
 ShareBox::ShareBox(QWidget*, Descriptor &&descriptor)
 : _descriptor(std::move(descriptor))
 , _api(&_descriptor.session->mtp())
-, _show(std::make_shared<Ui::BoxShow>(this))
 , _select(
 	this,
 	(_descriptor.stMultiSelect
@@ -231,10 +230,10 @@ void ShareBox::prepareCommentField() {
 	connect(field, &Ui::InputField::submitted, [=] {
 		submit({});
 	});
-	if (_show->valid()) {
+	if (const auto show = uiShow(); show->valid()) {
 		InitMessageFieldHandlers(
 			_descriptor.session,
-			_show,
+			Main::MakeSessionShow(show, _descriptor.session),
 			field,
 			nullptr,
 			nullptr,
@@ -257,7 +256,7 @@ void ShareBox::prepare() {
 	setTitle(tr::lng_share_title());
 
 	_inner = setInnerWidget(
-		object_ptr<Inner>(this, _descriptor, _show),
+		object_ptr<Inner>(this, _descriptor, uiShow()),
 		getTopScrollSkip(),
 		getBottomScrollSkip());
 
@@ -590,14 +589,13 @@ void ShareBox::submitSilent() {
 
 void ShareBox::submitScheduled() {
 	const auto callback = [=](Api::SendOptions options) { submit(options); };
-	_show->showBox(
+	uiShow()->showBox(
 		HistoryView::PrepareScheduleBox(
 			this,
 			sendMenuType(),
 			callback,
 			HistoryView::DefaultScheduleTime(),
-			_descriptor.scheduleBoxStyle),
-		Ui::LayerOption::KeepOther);
+			_descriptor.scheduleBoxStyle));
 }
 
 void ShareBox::submitWhenOnline() {
@@ -643,7 +641,7 @@ void ShareBox::scrollAnimationCallback() {
 ShareBox::Inner::Inner(
 	QWidget *parent,
 	const Descriptor &descriptor,
-	std::shared_ptr<Ui::BoxShow> show)
+	std::shared_ptr<Ui::Show> show)
 : RpWidget(parent)
 , _descriptor(descriptor)
 , _show(std::move(show))
@@ -1373,9 +1371,7 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 				).append("\n\n");
 			}
 			text.append(error.first);
-			show->showBox(
-				Ui::MakeInformBox(text),
-				Ui::LayerOption::KeepOther);
+			show->showBox(Ui::MakeInformBox(text));
 			return;
 		}
 
@@ -1441,23 +1437,18 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 					state->requests.remove(reqId);
 					if (state->requests.empty()) {
 						if (show->valid()) {
-							Ui::Toast::Show(
-								show->toastParent(),
-								tr::lng_share_done(tr::now));
+							show->showToast(tr::lng_share_done(tr::now));
 							show->hideLayer();
 						}
 					}
 					finish();
 				}).fail([=](const MTP::Error &error) {
 					if (error.type() == u"VOICE_MESSAGES_FORBIDDEN"_q) {
-						if (show->valid()) {
-							Ui::Toast::Show(
-								show->toastParent(),
-								tr::lng_restricted_send_voice_messages(
-									tr::now,
-									lt_user,
-									peer->name()));
-						}
+						show->showToast(
+							tr::lng_restricted_send_voice_messages(
+								tr::now,
+								lt_user,
+								peer->name()));
 					}
 					finish();
 				}).afterRequest(history->sendRequestId).send();
@@ -1471,7 +1462,7 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 void FastShareMessage(
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item) {
-	const auto show = std::make_shared<Window::Show>(controller);
+	const auto show = controller->uiShow();
 	const auto history = item->history();
 	const auto owner = &history->owner();
 	const auto session = &history->session();
@@ -1493,7 +1484,7 @@ void FastShareMessage(
 			return item->media() && item->media()->forceForwardedInfo();
 		});
 
-	auto copyCallback = [=, toastParent = show->toastParent()] {
+	auto copyCallback = [=] {
 		const auto item = owner->message(msgIds[0]);
 		if (!item) {
 			return;
@@ -1509,8 +1500,7 @@ void FastShareMessage(
 
 					QGuiApplication::clipboard()->setText(link);
 
-					Ui::Toast::Show(
-						toastParent,
+					show->showToast(
 						tr::lng_share_game_link_copied(tr::now));
 				}
 			}
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index adaa634c4..b13638577 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -147,8 +147,6 @@ private:
 	Descriptor _descriptor;
 	MTP::Sender _api;
 
-	std::shared_ptr<Ui::BoxShow> _show;
-
 	object_ptr<Ui::MultiSelect> _select;
 	object_ptr<Ui::SlideWrap<Ui::InputField>> _comment;
 	object_ptr<Ui::RpWidget> _bottomWidget;
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 0b2748191..0f661181a 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -38,10 +38,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/cached_round_corners.h"
 #include "lottie/lottie_multi_player.h"
 #include "lottie/lottie_animation.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "chat_helpers/stickers_list_widget.h"
 #include "media/clip/media_clip_reader.h"
-#include "window/window_session_controller.h"
 #include "window/window_controller.h"
 #include "settings/settings_premium.h"
 #include "base/unixtime.h"
@@ -230,7 +230,7 @@ class StickerSetBox::Inner final : public Ui::RpWidget {
 public:
 	Inner(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const StickerSetIdentifier &set,
 		Data::StickersType type);
 
@@ -322,11 +322,14 @@ private:
 	not_null<Lottie::MultiPlayer*> getLottiePlayer();
 
 	void showPreview();
+	void showPreviewAt(QPoint globalPos);
 
 	void updateItems();
 	void repaintItems(crl::time now = 0);
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Main::Session*> _session;
+
 	MTP::Sender _api;
 	std::vector<Element> _elements;
 	std::unique_ptr<Lottie::MultiPlayer> _lottiePlayer;
@@ -381,33 +384,35 @@ private:
 };
 
 StickerSetBox::StickerSetBox(
-	QWidget*,
-	not_null<Window::SessionController*> controller,
+	QWidget *parent,
+	std::shared_ptr<ChatHelpers::Show> show,
 	const StickerSetIdentifier &set,
 	Data::StickersType type)
-: _controller(controller)
+: _show(std::move(show))
+, _session(&_show->session())
 , _set(set)
 , _type(type) {
 }
 
 StickerSetBox::StickerSetBox(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Data::StickersSet*> set)
-: StickerSetBox(parent, controller, set->identifier(), set->type()) {
+: StickerSetBox(parent, std::move(show), set->identifier(), set->type()) {
 }
 
 QPointer<Ui::BoxContent> StickerSetBox::Show(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document) {
 	if (const auto sticker = document->sticker()) {
 		if (sticker->set) {
-			return controller->show(
-				Box<StickerSetBox>(
-					controller,
-					sticker->set,
-					sticker->setType),
-				Ui::LayerOption::KeepOther).data();
+			auto box = Box<StickerSetBox>(
+				show,
+				sticker->set,
+				sticker->setType);
+			const auto result = QPointer<Ui::BoxContent>(box.data());
+			show->showBox(std::move(box));
+			return result;
 		}
 	}
 	return nullptr;
@@ -417,9 +422,9 @@ void StickerSetBox::prepare() {
 	setTitle(tr::lng_contacts_loading());
 
 	_inner = setInnerWidget(
-		object_ptr<Inner>(this, _controller, _set, _type),
+		object_ptr<Inner>(this, _show, _set, _type),
 		st::stickersScroll);
-	_controller->session().data().stickers().updated(
+	_session->data().stickers().updated(
 		_type
 	) | rpl::start_with_next([=] {
 		updateButtons();
@@ -441,14 +446,12 @@ void StickerSetBox::prepare() {
 	_inner->setInstalled(
 	) | rpl::start_with_next([=](uint64 setId) {
 		if (_inner->setType() == Data::StickersType::Masks) {
-			Ui::Toast::Show(
-				Ui::BoxShow(this).toastParent(),
-				tr::lng_masks_installed(tr::now));
+			showToast(tr::lng_masks_installed(tr::now));
 		} else if (_inner->setType() == Data::StickersType::Emoji) {
-			auto &stickers = _controller->session().data().stickers();
+			auto &stickers = _session->data().stickers();
 			stickers.notifyEmojiSetInstalled(setId);
 		} else if (_inner->setType() == Data::StickersType::Stickers) {
-			auto &stickers = _controller->session().data().stickers();
+			auto &stickers = _session->data().stickers();
 			stickers.notifyStickerSetInstalled(setId);
 		}
 		closeBox();
@@ -466,20 +469,18 @@ void StickerSetBox::prepare() {
 			return;
 		}
 
-		Ui::Toast::Show(
-			Ui::BoxShow(this).toastParent(),
-			(type == Data::StickersType::Masks)
+		showToast((type == Data::StickersType::Masks)
 				? tr::lng_masks_has_been_archived(tr::now)
 				: tr::lng_stickers_has_been_archived(tr::now));
 
 		auto &order = (type == Data::StickersType::Masks)
-			? _controller->session().data().stickers().maskSetsOrderRef()
-			: _controller->session().data().stickers().setsOrderRef();
+			? _session->data().stickers().maskSetsOrderRef()
+			: _session->data().stickers().setsOrderRef();
 		const auto index = order.indexOf(setId);
 		if (index != -1) {
 			order.removeAt(index);
 
-			auto &local = _controller->session().local();
+			auto &local = _session->local();
 			if (type == Data::StickersType::Masks) {
 				local.writeInstalledMasks();
 				local.writeArchivedMasks();
@@ -489,7 +490,7 @@ void StickerSetBox::prepare() {
 			}
 		}
 
-		_controller->session().data().stickers().notifyUpdated(type);
+		_session->data().stickers().notifyUpdated(type);
 
 		closeBox();
 	}, lifetime());
@@ -501,7 +502,7 @@ void StickerSetBox::addStickers() {
 
 void StickerSetBox::copyStickersLink() {
 	const auto part = _inner->isEmojiSet() ? u"addemoji"_q : "addstickers";
-	const auto url = _controller->session().createInternalLinkFull(
+	const auto url = _session->createInternalLinkFull(
 		part + '/' + _inner->shortName());
 	QGuiApplication::clipboard()->setText(url);
 }
@@ -513,7 +514,7 @@ void StickerSetBox::handleError(Error error) {
 
 	switch (error) {
 	case Error::NotFound:
-		_controller->show(
+		_show->showBox(
 			Ui::MakeInformBox(tr::lng_stickers_not_found(tr::now)));
 		break;
 	default: Unexpected("Error in StickerSetBox::handleError.");
@@ -531,15 +532,13 @@ void StickerSetBox::updateButtons() {
 		const auto type = _inner->setType();
 		const auto share = [=] {
 			copyStickersLink();
-			Ui::Toast::Show(
-				Ui::BoxShow(this).toastParent(),
-				(type == Data::StickersType::Emoji
+			showToast(type == Data::StickersType::Emoji
 					? tr::lng_stickers_copied_emoji(tr::now)
-					: tr::lng_stickers_copied(tr::now)));
+					: tr::lng_stickers_copied(tr::now));
 		};
 		if (_inner->notInstalled()) {
-			if (!_controller->session().premium()
-				&& _controller->session().premiumPossible()
+			if (!_session->premium()
+				&& _session->premiumPossible()
 				&& _inner->premiumEmojiSet()) {
 				const auto &st = st::premiumPreviewDoubledLimitsBox;
 				setStyle(st);
@@ -550,7 +549,11 @@ void StickerSetBox::updateButtons() {
 					- st.buttonPadding.left()
 					- st.buttonPadding.left());
 				button->setClickedCallback([=] {
-					Settings::ShowPremium(_controller, u"animated_emoji"_q);
+					using namespace ChatHelpers;
+					const auto usage = WindowUsage::PremiumPromo;
+					if (const auto window = _show->resolveWindow(usage)) {
+						Settings::ShowPremium(window, u"animated_emoji"_q);
+					}
 				});
 				addButton(std::move(button));
 			} else {
@@ -600,14 +603,12 @@ void StickerSetBox::updateButtons() {
 					_inner->archiveStickers();
 				};
 				const auto remove = [=] {
-					const auto session = &_controller->session();
+					const auto session = &_show->session();
 					auto box = ChatHelpers::MakeConfirmRemoveSetBox(
 						session,
 						_inner->setId());
 					if (box) {
-						_controller->show(
-							std::move(box),
-							Ui::LayerOption::KeepOther);
+						_show->showBox(std::move(box));
 					}
 				};
 				const auto menu =
@@ -647,12 +648,13 @@ void StickerSetBox::resizeEvent(QResizeEvent *e) {
 
 StickerSetBox::Inner::Inner(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	const StickerSetIdentifier &set,
 	Data::StickersType type)
 : RpWidget(parent)
-, _controller(controller)
-, _api(&_controller->session().mtp())
+, _show(std::move(show))
+, _session(&_show->session())
+, _api(&_session->mtp())
 , _setId(set.id)
 , _setAccessHash(set.accessHash)
 , _setShortName(set.shortName)
@@ -660,7 +662,7 @@ StickerSetBox::Inner::Inner(
 	st::windowBgRipple,
 	st::windowBgOver,
 	[=] { repaintItems(); }))
-, _premiumMark(&controller->session())
+, _premiumMark(_session)
 , _updateItemsTimer([=] { updateItems(); })
 , _input(set)
 , _padding((type == Data::StickersType::Emoji)
@@ -679,9 +681,9 @@ StickerSetBox::Inner::Inner(
 		_errors.fire(Error::NotFound);
 	}).send();
 
-	_controller->session().api().updateStickers();
+	_session->api().updateStickers();
 
-	_controller->session().downloaderTaskFinished(
+	_session->downloaderTaskFinished(
 	) | rpl::start_with_next([=] {
 		updateItems();
 	}, lifetime());
@@ -695,8 +697,8 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 	_elements.clear();
 	_selected = -1;
 	setCursor(style::cur_default);
-	const auto owner = &_controller->session().data();
-	const auto premiumPossible = _controller->session().premiumPossible();
+	const auto owner = &_session->data();
+	const auto premiumPossible = _session->premiumPossible();
 	set.match([&](const MTPDmessages_stickerSet &data) {
 		const auto &v = data.vdocuments().v;
 		_pack.reserve(v.size());
@@ -724,7 +726,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 					auto p = StickersPack();
 					p.reserve(stickers.size());
 					for (auto j = 0, c = int(stickers.size()); j != c; ++j) {
-						auto doc = _controller->session().data().document(stickers[j].v);
+						auto doc = _session->data().document(stickers[j].v);
 						if (!doc || !doc->sticker()) continue;
 
 						p.push_back(doc);
@@ -734,7 +736,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 			});
 		}
 		data.vset().match([&](const MTPDstickerSet &set) {
-			_setTitle = _controller->session().data().stickers().getSetTitle(
+			_setTitle = _session->data().stickers().getSetTitle(
 				set);
 			_setShortName = qs(set.vshort_name());
 			_setId = set.vid().v;
@@ -748,7 +750,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 				if (const auto thumbs = set.vthumbs()) {
 					for (const auto &thumb : thumbs->v) {
 						const auto result = Images::FromPhotoSize(
-							&_controller->session(),
+							_session,
 							set,
 							thumb);
 						if (result.location.valid()) {
@@ -758,7 +760,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 				}
 				return ImageWithLocation();
 			}();
-			const auto &sets = _controller->session().data().stickers().sets();
+			const auto &sets = _session->data().stickers().sets();
 			const auto it = sets.find(_setId);
 			if (it != sets.cend()) {
 				const auto set = it->second.get();
@@ -814,7 +816,7 @@ rpl::producer<StickerSetBox::Error> StickerSetBox::Inner::errors() const {
 
 void StickerSetBox::Inner::installDone(
 		const MTPmessages_StickerSetInstallResult &result) {
-	auto &stickers = _controller->session().data().stickers();
+	auto &stickers = _session->data().stickers();
 	auto &sets = stickers.setsRef();
 	const auto type = setType();
 
@@ -837,7 +839,7 @@ void StickerSetBox::Inner::installDone(
 		it = sets.emplace(
 			_setId,
 			std::make_unique<StickersSet>(
-				&_controller->session().data(),
+				&_session->data(),
 				_setId,
 				_setAccessHash,
 				_setHash,
@@ -887,7 +889,7 @@ void StickerSetBox::Inner::installDone(
 		stickers.applyArchivedResult(
 			result.c_messages_stickerSetInstallResultArchive());
 	} else {
-		auto &storage = _controller->session().local();
+		auto &storage = _session->local();
 		if (wasArchived && type != Data::StickersType::Emoji) {
 			if (type == Data::StickersType::Masks) {
 				storage.writeArchivedMasks();
@@ -921,13 +923,19 @@ void StickerSetBox::Inner::mousePressEvent(QMouseEvent *e) {
 void StickerSetBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 	updateSelected();
 	if (_previewShown >= 0) {
-		int index = stickerFromGlobalPos(e->globalPos());
-		if (index >= 0 && index < _pack.size() && index != _previewShown) {
-			_previewShown = index;
-			_controller->widget()->showMediaPreview(
-				Data::FileOriginStickerSet(_setId, _setAccessHash),
-				_pack[_previewShown]);
-		}
+		showPreviewAt(e->globalPos());
+	}
+}
+
+void StickerSetBox::Inner::showPreviewAt(QPoint globalPos) {
+	const auto index = stickerFromGlobalPos(globalPos);
+	if (index >= 0
+		&& index < _pack.size()
+		&& index != _previewShown) {
+		_previewShown = index;
+		_show->showMediaPreview(
+			Data::FileOriginStickerSet(_setId, _setAccessHash),
+			_pack[_previewShown]);
 	}
 }
 
@@ -955,16 +963,13 @@ void StickerSetBox::Inner::chosen(
 		int index,
 		not_null<DocumentData*> sticker,
 		Api::SendOptions options) {
-	const auto controller = _controller;
 	const auto animation = options.scheduled
 		? Ui::MessageSendingAnimationFrom()
 		: messageSentAnimationInfo(index, sticker);
-	Ui::PostponeCall(controller, [=] {
-		controller->stickerOrEmojiChosen({
-			.document = sticker,
-			.options = options,
-			.messageSendingFrom = animation,
-		});
+	_show->processChosenSticker({
+		.document = sticker,
+		.options = options,
+		.messageSendingFrom = animation,
 	});
 }
 
@@ -988,7 +993,7 @@ auto StickerSetBox::Inner::messageSentAnimationInfo(
 		(rect.height() - size.height()) / 2);
 	return {
 		.type = Ui::MessageSendingAnimationFrom::Type::Sticker,
-		.localId = _controller->session().data().nextLocalMessageId(),
+		.localId = _session->data().nextLocalMessageId(),
 		.globalStartGeometry = mapToGlobal(
 			QRect(rect.topLeft() + innerPos, size)),
 	};
@@ -1005,7 +1010,7 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
 		st::popupMenuWithIcons);
-	const auto type = _controller->content()->sendMenuType();
+	const auto type = _show->sendMenuType();
 	if (setType() == Data::StickersType::Emoji) {
 		if (const auto t = PrepareTextFromEmoji(_pack[index]); !t.empty()) {
 			_menu->addAction(tr::lng_mediaview_copy(tr::now), [=] {
@@ -1026,10 +1031,10 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 			SendMenu::DefaultScheduleCallback(this, type, sendSelected),
 			SendMenu::DefaultWhenOnlineCallback(sendSelected));
 
-		const auto controller = _controller;
+		const auto show = _show;
 		const auto toggleFavedSticker = [=] {
 			Api::ToggleFavedSticker(
-				controller,
+				show,
 				document,
 				Data::FileOriginStickerSet(Data::Stickers::FavedSetId, 0));
 		};
@@ -1078,13 +1083,8 @@ void StickerSetBox::Inner::startOverAnimation(int index, float64 from, float64 t
 }
 
 void StickerSetBox::Inner::showPreview() {
-	int index = stickerFromGlobalPos(QCursor::pos());
-	if (index >= 0 && index < _pack.size()) {
-		_previewShown = index;
-		_controller->widget()->showMediaPreview(
-			Data::FileOriginStickerSet(_setId, _setAccessHash),
-			_pack[_previewShown]);
-	}
+	_previewShown = -1;
+	showPreviewAt(QCursor::pos());
 }
 
 not_null<Lottie::MultiPlayer*> StickerSetBox::Inner::getLottiePlayer() {
@@ -1128,7 +1128,7 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 
 	const auto now = crl::now();
 	const auto paused = On(PowerSaving::kStickersPanel)
-		|| _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
+		|| _show->paused(ChatHelpers::PauseReason::Layer);
 	for (int32 i = from; i < to; ++i) {
 		for (int32 j = 0; j < _perRow; ++j) {
 			int32 index = i * _perRow + j;
@@ -1392,7 +1392,7 @@ bool StickerSetBox::Inner::notInstalled() const {
 	if (!_loaded) {
 		return false;
 	}
-	const auto &sets = _controller->session().data().stickers().sets();
+	const auto &sets = _session->data().stickers().sets();
 	const auto it = sets.find(_setId);
 	if ((it == sets.cend())
 		|| !(it->second->flags & SetFlag::Installed)
@@ -1436,7 +1436,6 @@ void StickerSetBox::Inner::install() {
 }
 
 void StickerSetBox::Inner::archiveStickers() {
-	const auto toastParent = Window::Show(_controller).toastParent();
 	_api.request(MTPmessages_InstallStickerSet(
 		Data::InputStickerSet(_input),
 		MTP_boolTrue()
@@ -1444,9 +1443,9 @@ void StickerSetBox::Inner::archiveStickers() {
 		if (result.type() == mtpc_messages_stickerSetInstallResultSuccess) {
 			_setArchived.fire_copy(_setId);
 		}
-	}).fail(crl::guard(toastParent, [=] {
-		Ui::Toast::Show(toastParent, Lang::Hard::ServerError());
-	})).send();
+	}).fail([=] {
+		_show->showToast(Lang::Hard::ServerError());
+	}).send();
 }
 
 void StickerSetBox::Inner::updateItems() {
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h
index 73d99dc7d..f1992fa66 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.h
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.h
@@ -23,6 +23,15 @@ namespace Data {
 class StickersSet;
 } // namespace Data
 
+namespace SendMenu {
+enum class Type;
+} // namespace SendMenu
+
+namespace ChatHelpers {
+struct FileChosen;
+class Show;
+} // namespace ChatHelpers
+
 class StickerPremiumMark final {
 public:
 	explicit StickerPremiumMark(not_null<Main::Session*> session);
@@ -51,16 +60,16 @@ class StickerSetBox final : public Ui::BoxContent {
 public:
 	StickerSetBox(
 		QWidget*,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const StickerSetIdentifier &set,
 		Data::StickersType type);
 	StickerSetBox(
 		QWidget*,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Data::StickersSet*> set);
 
 	static QPointer<Ui::BoxContent> Show(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document);
 
 protected:
@@ -79,7 +88,8 @@ private:
 	void copyStickersLink();
 	void handleError(Error error);
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Main::Session*> _session;
 	const StickerSetIdentifier _set;
 	const Data::StickersType _type;
 
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index cb38b11df..29a16c78e 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "storage/storage_account.h"
 #include "lottie/lottie_single_player.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
@@ -35,7 +36,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/cached_round_corners.h"
 #include "ui/painter.h"
 #include "ui/unread_badge_paint.h"
-#include "window/window_session_controller.h"
 #include "media/clip/media_clip_reader.h"
 #include "main/main_session.h"
 #include "styles/style_layers.h"
@@ -77,11 +77,11 @@ public:
 
 	Inner(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		Section section);
 	Inner(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<ChannelData*> megagroup);
 
 	[[nodiscard]] Main::Session &session() const;
@@ -250,7 +250,8 @@ private:
 	int countMaxNameWidth() const;
 	[[nodiscard]] bool skipPremium() const;
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
 
 	const Section _section;
@@ -380,35 +381,37 @@ void StickersBox::Tab::saveScrollTop() {
 
 StickersBox::StickersBox(
 	QWidget*,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	Section section,
 	bool masks)
-: _controller(controller)
-, _api(&controller->session().mtp())
+: _show(std::move(show))
+, _session(&_show->session())
+, _api(&_session->mtp())
 , _tabs(this, st::stickersTabs)
 , _unreadBadge(
 	this,
-	controller->session().data().stickers().featuredSetsUnreadCountValue())
+	_session->data().stickers().featuredSetsUnreadCountValue())
 , _section(section)
 , _isMasks(masks)
 , _isEmoji(false)
-, _installed(_isMasks ? Tab() : Tab(0, this, controller, Section::Installed))
-, _masks(_isMasks ? Tab(0, this, controller, Section::Masks) : Tab())
-, _featured(_isMasks ? Tab() : Tab(1, this, controller, Section::Featured))
-, _archived((_isMasks ? 1 : 2), this, controller, Section::Archived) {
+, _installed(_isMasks ? Tab() : Tab(0, this, _show, Section::Installed))
+, _masks(_isMasks ? Tab(0, this, _show, Section::Masks) : Tab())
+, _featured(_isMasks ? Tab() : Tab(1, this, _show, Section::Featured))
+, _archived((_isMasks ? 1 : 2), this, _show, Section::Archived) {
 	_tabs->setRippleTopRoundRadius(st::boxRadius);
 }
 
 StickersBox::StickersBox(
 	QWidget*,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<ChannelData*> megagroup)
-: _controller(controller)
-, _api(&controller->session().mtp())
+: _show(std::move(show))
+, _session(&_show->session())
+, _api(&_session->mtp())
 , _section(Section::Installed)
 , _isMasks(false)
 , _isEmoji(false)
-, _installed(0, this, controller, megagroup)
+, _installed(0, this, _show, megagroup)
 , _megagroupSet(megagroup) {
 	_installed.widget()->scrollsToY(
 	) | rpl::start_with_next([=](int y) {
@@ -418,34 +421,36 @@ StickersBox::StickersBox(
 
 StickersBox::StickersBox(
 	QWidget*,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	const QVector<MTPStickerSetCovered> &attachedSets)
-: _controller(controller)
-, _api(&controller->session().mtp())
+: _show(std::move(show))
+, _session(&_show->session())
+, _api(&_session->mtp())
 , _section(Section::Attached)
 , _isMasks(false)
 , _isEmoji(false)
-, _attached(0, this, controller, Section::Attached)
+, _attached(0, this, _show, Section::Attached)
 , _attachedType(Data::StickersType::Stickers)
 , _attachedSets(attachedSets) {
 }
 
 StickersBox::StickersBox(
 	QWidget*,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	const std::vector<StickerSetIdentifier> &emojiSets)
-: _controller(controller)
-, _api(&controller->session().mtp())
+: _show(std::move(show))
+, _session(&_show->session())
+, _api(&_session->mtp())
 , _section(Section::Attached)
 , _isMasks(false)
 , _isEmoji(true)
-, _attached(0, this, controller, Section::Attached)
+, _attached(0, this, _show, Section::Attached)
 , _attachedType(Data::StickersType::Emoji)
 , _emojiSets(emojiSets) {
 }
 
 Main::Session &StickersBox::session() const {
-	return _controller->session();
+	return *_session;
 }
 
 void StickersBox::showAttachedStickers() {
@@ -1121,11 +1126,12 @@ bool StickersBox::Inner::Row::isArchived() const {
 
 StickersBox::Inner::Inner(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	StickersBox::Section section)
 : RpWidget(parent)
-, _controller(controller)
-, _api(&_controller->session().mtp())
+, _show(std::move(show))
+, _session(&_show->session())
+, _api(&_session->mtp())
 , _section(section)
 , _isInstalled(_section == Section::Installed || _section == Section::Masks)
 , _buttonBgOver(
@@ -1152,11 +1158,12 @@ StickersBox::Inner::Inner(
 
 StickersBox::Inner::Inner(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<ChannelData*> megagroup)
 : RpWidget(parent)
-, _controller(controller)
-, _api(&_controller->session().mtp())
+, _show(std::move(show))
+, _session(&_show->session())
+, _api(&_session->mtp())
 , _section(StickersBox::Section::Installed)
 , _isInstalled(_section == Section::Installed || _section == Section::Masks)
 , _buttonBgOver(
@@ -1181,11 +1188,11 @@ StickersBox::Inner::Inner(
 	st::groupStickersField,
 	rpl::single(u"stickerset"_q),
 	QString(),
-	_controller->session().createInternalLink(QString()))
+	_session->createInternalLink(QString()))
 , _megagroupDivider(this)
 , _megagroupSubTitle(this, tr::lng_stickers_group_from_your(tr::now), st::boxTitle) {
 	_megagroupSetField->setLinkPlaceholder(
-		_controller->session().createInternalLink(u"addstickers/"_q));
+		_session->createInternalLink(u"addstickers/"_q));
 	_megagroupSetField->setPlaceholderHidden(false);
 	_megagroupSetAddressChangedTimer.setCallback([this] { handleMegagroupSetAddressChange(); });
 	connect(
@@ -1207,7 +1214,7 @@ StickersBox::Inner::Inner(
 }
 
 Main::Session &StickersBox::Inner::session() const {
-	return _controller->session();
+	return *_session;
 }
 
 void StickersBox::Inner::setup() {
@@ -1429,8 +1436,7 @@ void StickersBox::Inner::paintRowThumbnail(
 		: row->stickerMedia
 		? row->stickerMedia->thumbnail()
 		: nullptr;
-	const auto paused = _controller->isGifPausedAtLeastFor(
-		Window::GifPauseReason::Layer);
+	const auto paused = _show->paused(ChatHelpers::PauseReason::Layer);
 	const auto x = left + (st::contactsPhotoSize - row->pixw) / 2;
 	const auto y = st::contactsPadding.top() + (st::contactsPhotoSize - row->pixh) / 2;
 	if (row->lottie && row->lottie->ready()) {
@@ -1858,9 +1864,7 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 		}();
 		const auto showSetByRow = [&](const Row &row) {
 			setSelected(SelectedRow());
-			_controller->show(
-				Box<StickerSetBox>(_controller, row.set),
-				Ui::LayerOption::KeepOther);
+			_show->showBox(Box<StickerSetBox>(_show, row.set));
 		};
 		if (selectedIndex >= 0 && !_inDragArea) {
 			const auto row = _rows[selectedIndex].get();
@@ -2252,7 +2256,7 @@ bool StickersBox::Inner::appendSet(not_null<StickersSet*> set) {
 }
 
 bool StickersBox::Inner::skipPremium() const {
-	return !_controller->session().premiumPossible();
+	return !_session->premiumPossible();
 }
 
 int StickersBox::Inner::countMaxNameWidth() const {
diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h
index c9709b07b..fa3647691 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.h
+++ b/Telegram/SourceFiles/boxes/stickers_box.h
@@ -27,9 +27,9 @@ class CrossButton;
 class BoxContentDivider;
 } // namespace Ui
 
-namespace Window {
-class SessionController;
-} // namespace Window
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
 
 namespace Main {
 class Session;
@@ -60,20 +60,20 @@ public:
 
 	StickersBox(
 		QWidget*,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		Section section,
 		bool masks = false);
 	StickersBox(
 		QWidget*,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<ChannelData*> megagroup);
 	StickersBox(
 		QWidget*,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const QVector<MTPStickerSetCovered> &attachedSets);
 	StickersBox(
 		QWidget*,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const std::vector<StickerSetIdentifier> &emojiSets);
 	~StickersBox();
 
@@ -142,7 +142,8 @@ private:
 
 	std::array<Inner*, 5> widgets() const;
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
 
 	object_ptr<Ui::SettingsSlider> _tabs = { nullptr };
diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index de64a704e..662cf51e5 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/loading_element.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/painter.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
@@ -263,7 +262,7 @@ void TranslateBox(
 		if (loading->toggled()) {
 			return;
 		}
-		Ui::BoxShow(box).showBox(ChooseTranslateToBox(
+		box->uiShow()->showBox(ChooseTranslateToBox(
 			state->to.current(),
 			crl::guard(box, [=](LanguageId id) { state->to = id; })));
 	});
@@ -314,11 +313,9 @@ object_ptr<BoxContent> EditSkipTranslationLanguages() {
 		}
 		if (already && selected->empty()) {
 			if (const auto strong = weak->data()) {
-				Ui::ShowMultilineToast({
-					.parentOverride = BoxShow(strong).toastParent(),
-					.text = { tr::lng_translate_settings_one(tr::now) },
-					.duration = kSkipAtLeastOneDuration,
-				});
+				strong->showToast(
+					tr::lng_translate_settings_one(tr::now),
+					kSkipAtLeastOneDuration);
 			}
 			return false;
 		}
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 6e4e10a9d..8e7ccd244 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -375,7 +375,7 @@ void UsernamesBox(
 		object_ptr<UsernamesList>(
 			box,
 			peer,
-			std::make_shared<Ui::BoxShow>(box),
+			box->uiShow(),
 			!isBot
 				? [=] { box->scrollToY(0); editor->setInnerFocus(); }
 				: Fn<void()>(nullptr)),
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index ad9eff91a..66a4e01f5 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -568,8 +568,7 @@ base::unique_qptr<Ui::PopupMenu> BoxController::rowContextMenu(
 		st::popupMenuWithIcons);
 	result->addAction(tr::lng_context_delete_selected(tr::now), [=] {
 		_window->show(
-			Box<DeleteMessagesBox>(session, base::duplicate(ids)),
-			Ui::LayerOption::KeepOther);
+			Box<DeleteMessagesBox>(session, base::duplicate(ids)));
 	}, &st::menuIconDelete);
 	return result;
 }
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index c66805f43..e43af9373 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -292,8 +292,7 @@ void TopBar::initControls() {
 			call->setMuted(!call->muted());
 		} else if (const auto group = _groupCall.get()) {
 			if (group->mutedByAdmin()) {
-				Ui::Toast::Show(
-					_show->toastParent(),
+				_show->showToast(
 					tr::lng_group_call_force_muted_sub(tr::now));
 			} else {
 				group->setMuted((group->muted() == MuteState::Muted)
diff --git a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
index 2ac790288..a3f57de10 100644
--- a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
@@ -406,9 +406,7 @@ void ChooseJoinAsProcess::processList(
 	auto info = JoinInfo{ .peer = peer, .joinAs = self };
 	const auto selectedId = peer->groupCallDefaultJoinAs();
 	if (list.empty()) {
-		Ui::Toast::Show(
-			_request->show->toastParent(),
-			Lang::Hard::ServerError());
+		_request->show->showToast(Lang::Hard::ServerError());
 		return;
 	}
 	info.joinAs = [&]() -> not_null<PeerData*> {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index f62573c90..49dd3db91 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "lang/lang_hardcoded.h"
 #include "boxes/peers/edit_participants_box.h" // SubscribeToMigration.
-#include "ui/toasts/common_toasts.h"
+#include "ui/toast/toast.h"
 #include "base/unixtime.h"
 #include "core/application.h"
 #include "core/core_settings.h"
@@ -1413,11 +1413,9 @@ void GroupCall::rejoin(not_null<PeerData*> as) {
 				}
 
 				hangup();
-				Ui::ShowMultilineToast({
-					.text = { type == u"GROUPCALL_FORBIDDEN"_q
-						? tr::lng_group_not_accessible(tr::now)
-						: Lang::Hard::ServerError() },
-				});
+				Ui::Toast::Show((type == u"GROUPCALL_FORBIDDEN"_q)
+					? tr::lng_group_not_accessible(tr::now)
+					: Lang::Hard::ServerError());
 			}).send();
 		});
 	});
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
index fd0225634..ffb685968 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
@@ -259,9 +259,7 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 			finish();
 		};
 		const auto done = [=] {
-			const auto show = (*shared)
-				? std::make_shared<Ui::BoxShow>(*shared)
-				: nullptr;
+			const auto show = (*shared) ? (*shared)->uiShow() : nullptr;
 			inviteWithAdd(show, users, nonMembers, finishWithConfirm);
 		};
 		auto box = ConfirmBox({
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.cpp b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
index 10e1123cd..cc3c33ddb 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
@@ -1983,8 +1983,8 @@ void Members::peerListShowBox(
 void Members::peerListHideLayer() {
 }
 
-not_null<QWidget*> Members::peerListToastParent() {
-	Unexpected("...Members::peerListToastParent");
+std::shared_ptr<Main::SessionShow> Members::peerListUiShow() {
+	Unexpected("...Members::peerListUiShow");
 }
 
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.h b/Telegram/SourceFiles/calls/group/calls_group_members.h
index 312161b3a..f8b4c8c52 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.h
@@ -92,7 +92,7 @@ private:
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 	void peerListHideLayer() override;
-	not_null<QWidget*> peerListToastParent() override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 
 	void setupAddMember(not_null<GroupCall*> call);
 	void resizeToList();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 7214a344c..31758718d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -32,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/image/image_prepare.h"
 #include "ui/painter.h"
 #include "ui/round_rect.h"
@@ -46,6 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_group_call.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
+#include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "base/event_filter.h"
 #include "base/unixtime.h"
@@ -75,6 +75,67 @@ constexpr auto kControlsBackgroundOpacity = 0.8;
 constexpr auto kOverrideActiveColorBgAlpha = 172;
 constexpr auto kHideControlsTimeout = 5 * crl::time(1000);
 
+class Show final : public Main::SessionShow {
+public:
+	explicit Show(not_null<Panel*> panel);
+	~Show();
+
+	void showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options
+			= Ui::LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+
+	[[nodiscard]] Main::Session &session() const override;
+
+private:
+	const base::weak_ptr<Panel> _panel;
+
+};
+
+Show::Show(not_null<Panel*> panel)
+: _panel(base::make_weak(panel)) {
+}
+
+Show::~Show() = default;
+
+void Show::showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options) const {
+	if (const auto panel = _panel.get()) {
+		panel->showBox(std::move(content), options);
+	}
+}
+
+void Show::hideLayer() const {
+	if (const auto panel = _panel.get()) {
+		panel->hideLayer();
+	}
+}
+
+not_null<QWidget*> Show::toastParent() const {
+	const auto panel = _panel.get();
+	Assert(panel != nullptr);
+	return panel->widget();
+}
+
+bool Show::valid() const {
+	return !_panel.empty();
+}
+
+Show::operator bool() const {
+	return valid();
+}
+
+Main::Session &Show::session() const {
+	const auto panel = _panel.get();
+	Assert(panel != nullptr);
+	return panel->call()->peer()->session();
+}
+
 } // namespace
 
 struct Panel::ControlsBackgroundNarrow {
@@ -176,15 +237,25 @@ bool Panel::isActive() const {
 		&& !(window()->windowState() & Qt::WindowMinimized);
 }
 
-void Panel::showToast(TextWithEntities &&text, crl::time duration) {
-	if (const auto strong = _lastToast.get()) {
-		strong->hideAnimated();
-	}
-	_lastToast = Ui::ShowMultilineToast({
-		.parentOverride = widget(),
-		.text = std::move(text),
-		.duration = duration,
-	});
+base::weak_ptr<Ui::Toast::Instance> Panel::showToast(
+		const QString &text,
+		crl::time duration) {
+	return Show(this).showToast(text, duration);
+}
+
+base::weak_ptr<Ui::Toast::Instance> Panel::showToast(
+		TextWithEntities &&text,
+		crl::time duration) {
+	return Show(this).showToast(std::move(text), duration);
+}
+
+base::weak_ptr<Ui::Toast::Instance> Panel::showToast(
+		Ui::Toast::Config &&config) {
+	return Show(this).showToast(std::move(config));
+}
+
+std::shared_ptr<Main::SessionShow> Panel::uiShow() {
+	return std::make_shared<Show>(this);
 }
 
 void Panel::minimize() {
@@ -634,16 +705,9 @@ void Panel::hideNiceTooltip() {
 }
 
 void Panel::initShareAction() {
-	const auto showBoxCallback = [=](object_ptr<Ui::BoxContent> next) {
-		showBox(std::move(next));
-	};
-	const auto showToastCallback = [=](QString text) {
-		showToast({ text });
-	};
 	auto [shareLinkCallback, shareLinkLifetime] = ShareInviteLinkAction(
 		_peer,
-		showBoxCallback,
-		showToastCallback);
+		uiShow());
 	_callShareLinkCallback = [=, callback = std::move(shareLinkCallback)] {
 		if (_call->lookupReal()) {
 			callback();
@@ -1467,6 +1531,10 @@ void Panel::hideLayer(anim::type animated) {
 	_layerBg->hideAll(animated);
 }
 
+bool Panel::isLayerShown() const {
+	return _layerBg->topShownLayer() != nullptr;
+}
+
 void Panel::kickParticipantSure(not_null<PeerData*> participantPeer) {
 	if (const auto chat = _peer->asChat()) {
 		chat->session().api().chatParticipants().kick(chat, participantPeer);
@@ -2550,38 +2618,4 @@ not_null<Ui::RpWidget*> Panel::widget() const {
 	return _window.widget();
 }
 
-Show::Show(not_null<Panel*> panel)
-: _panel(base::make_weak(panel)) {
-}
-
-Show::~Show() = default;
-
-void Show::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
-	if (const auto panel = _panel.get()) {
-		panel->showBox(std::move(content), options);
-	}
-}
-
-void Show::hideLayer() const {
-	if (const auto panel = _panel.get()) {
-		panel->hideLayer();
-	}
-}
-
-not_null<QWidget*> Show::toastParent() const {
-	const auto panel = _panel.get();
-	Assert(panel != nullptr);
-	return panel->widget();
-}
-
-bool Show::valid() const {
-	return !_panel.empty();
-}
-
-Show::operator bool() const {
-	return valid();
-}
-
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.h b/Telegram/SourceFiles/calls/group/calls_group_panel.h
index e607d0c95..2a05232c5 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.h
@@ -52,14 +52,21 @@ class ScrollArea;
 class GenericBox;
 class LayerManager;
 class GroupCallScheduledLeft;
-namespace Toast {
-class Instance;
-} // namespace Toast
-namespace Platform {
-struct SeparateTitleControls;
-} // namespace Platform
 } // namespace Ui
 
+namespace Ui::Toast {
+class Instance;
+struct Config;
+} // namespace Ui::Toast
+
+namespace Ui::Platform {
+struct SeparateTitleControls;
+} // namespace Ui::Platform
+
+namespace Main {
+class SessionShow;
+} // namespace Main
+
 namespace style {
 struct CallSignalBars;
 struct CallBodyLayout;
@@ -85,13 +92,22 @@ public:
 	[[nodiscard]] not_null<GroupCall*> call() const;
 	[[nodiscard]] bool isActive() const;
 
-	void showToast(TextWithEntities &&text, crl::time duration = 0);
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		const QString &text,
+		crl::time duration = 0);
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		TextWithEntities &&text,
+		crl::time duration = 0);
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		Ui::Toast::Config &&config);
+
 	void showBox(object_ptr<Ui::BoxContent> box);
 	void showBox(
 		object_ptr<Ui::BoxContent> box,
 		Ui::LayerOptions options,
 		anim::type animated = anim::type::normal);
 	void hideLayer(anim::type animated = anim::type::normal);
+	[[nodiscard]] bool isLayerShown() const;
 
 	void minimize();
 	void toggleFullScreen();
@@ -99,6 +115,8 @@ public:
 	void showAndActivate();
 	void closeBeforeDestroy();
 
+	[[nodiscard]] std::shared_ptr<Main::SessionShow> uiShow();
+
 	rpl::lifetime &lifetime();
 
 private:
@@ -260,7 +278,6 @@ private:
 	Fn<void()> _callShareLinkCallback;
 
 	const std::unique_ptr<Toasts> _toasts;
-	base::weak_ptr<Ui::Toast::Instance> _lastToast;
 
 	std::unique_ptr<MicLevelTester> _micLevelTester;
 
@@ -272,21 +289,4 @@ private:
 
 };
 
-class Show : public Ui::Show {
-public:
-	explicit Show(not_null<Panel*> panel);
-	~Show();
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options = Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
-	[[nodiscard]] not_null<QWidget*> toastParent() const override;
-	[[nodiscard]] bool valid() const override;
-	operator bool() const override;
-
-private:
-	const base::weak_ptr<Panel> _panel;
-
-};
-
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
index 1891a2ca0..69cd78107 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
@@ -151,9 +151,7 @@ void StartRtmpProcess::requestUrl(bool revoke) {
 		});
 		processUrl(std::move(data));
 	}).fail([=] {
-		Ui::Toast::Show(
-			_request->show->toastParent(),
-			Lang::Hard::ServerError());
+		_request->show->showToast(Lang::Hard::ServerError());
 	}).send();
 }
 
@@ -229,7 +227,7 @@ void StartRtmpProcess::FillRtmpRows(
 	) | rpl::map([=](const auto &d) { return d.url; });
 
 	const auto showToast = [=](const QString &text) {
-		Ui::Toast::Show(show->toastParent(), text);
+		show->showToast(text);
 	};
 	const auto addButton = [&](
 			bool key,
diff --git a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
index 831fcd3c2..59ed26a62 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
 #include "lang/lang_keys.h"
 #include "boxes/share_box.h"
 #include "history/view/history_view_schedule_box.h"
@@ -108,7 +107,7 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 		not_null<PeerData*> peer,
 		const QString &linkSpeaker,
 		const QString &linkListener,
-		Fn<void(QString)> showToast) {
+		std::shared_ptr<Ui::Show> show) {
 	const auto sending = std::make_shared<bool>();
 	const auto box = std::make_shared<QPointer<ShareBox>>();
 
@@ -130,7 +129,7 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 	};
 	auto copyCallback = [=] {
 		QGuiApplication::clipboard()->setText(currentLink());
-		showToast(tr::lng_group_invite_copied(tr::now));
+		show->showToast(tr::lng_group_invite_copied(tr::now));
 	};
 	auto submitCallback = [=](
 			std::vector<not_null<Data::Thread*>> &&result,
@@ -191,7 +190,7 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 		if (*box) {
 			(*box)->closeBox();
 		}
-		showToast(tr::lng_share_done(tr::now));
+		show->showToast(tr::lng_share_done(tr::now));
 	};
 	auto filterCallback = [](not_null<Data::Thread*> thread) {
 		return Data::CanSend(thread, ChatRestriction::SendOther);
@@ -591,15 +590,11 @@ void SettingsBox(
 			box->getDelegate()->show(std::move(next));
 		});
 		const auto showToast = crl::guard(box, [=](QString text) {
-			Ui::ShowMultilineToast({
-				.parentOverride = Ui::BoxShow(box).toastParent(),
-				.text = { text },
-			});
+			box->showToast(text);
 		});
 		auto [shareLinkCallback, shareLinkLifetime] = ShareInviteLinkAction(
 			peer,
-			showBox,
-			showToast);
+			box->uiShow());
 		shareLink = std::move(shareLinkCallback);
 		box->lifetime().add(std::move(shareLinkLifetime));
 	} else {
@@ -635,10 +630,8 @@ void SettingsBox(
 				}
 				QGuiApplication::clipboard()->setText(link);
 				if (weakBox) {
-					Ui::ShowMultilineToast({
-						.parentOverride = Ui::BoxShow(box).toastParent(),
-						.text = { tr::lng_create_channel_link_copied(tr::now) },
-					});
+					box->showToast(
+						tr::lng_create_channel_link_copied(tr::now));
 				}
 				return true;
 			};
@@ -735,7 +728,7 @@ void SettingsBox(
 		StartRtmpProcess::FillRtmpRows(
 			layout,
 			false,
-			std::make_shared<Ui::BoxShow>(box),
+			box->uiShow(),
 			state->data.events(),
 			&st::groupCallBoxLabel,
 			&st::groupCallSettingsRtmpShowButton,
@@ -795,8 +788,7 @@ void SettingsBox(
 
 std::pair<Fn<void()>, rpl::lifetime> ShareInviteLinkAction(
 		not_null<PeerData*> peer,
-		Fn<void(object_ptr<Ui::BoxContent>)> showBox,
-		Fn<void(QString)> showToast) {
+		std::shared_ptr<Ui::Show> show) {
 	auto lifetime = rpl::lifetime();
 	struct State {
 		State(not_null<Main::Session*> session) : session(session) {
@@ -823,11 +815,11 @@ std::pair<Fn<void()>, rpl::lifetime> ShareInviteLinkAction(
 			|| state->linkListener.isEmpty()) {
 			return false;
 		}
-		showBox(ShareInviteLinkBox(
+		show->showBox(ShareInviteLinkBox(
 			peer,
 			*state->linkSpeaker,
 			state->linkListener,
-			showToast));
+			show));
 		return true;
 	};
 	auto callback = [=] {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_settings.h b/Telegram/SourceFiles/calls/group/calls_group_settings.h
index a4a829e90..598814ed2 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_settings.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_settings.h
@@ -25,8 +25,7 @@ void SettingsBox(
 
 [[nodiscard]] std::pair<Fn<void()>, rpl::lifetime> ShareInviteLinkAction(
 	not_null<PeerData*> peer,
-	Fn<void(object_ptr<Ui::BoxContent>)> showBox,
-	Fn<void(QString)> showToast);
+	std::shared_ptr<Ui::Show> show);
 
 class MicLevelTester final {
 public:
diff --git a/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp b/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
index 4abaab3ec..55e67be95 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer.h"
 #include "data/data_group_call.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
+#include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
 
 namespace Calls::Group {
@@ -83,15 +83,13 @@ void Toasts::setupAllowedToSpeak() {
 	_call->allowedToSpeakNotifications(
 	) | rpl::start_with_next([=] {
 		if (_panel->isActive()) {
-			_panel->showToast({
-				tr::lng_group_call_can_speak_here(tr::now),
-			});
+			_panel->showToast(tr::lng_group_call_can_speak_here(tr::now));
 		} else {
 			const auto real = _call->lookupReal();
 			const auto name = (real && !real->title().isEmpty())
 				? real->title()
 				: _call->peer()->name();
-			Ui::ShowMultilineToast({
+			Ui::Toast::Show({
 				.text = tr::lng_group_call_can_speak(
 					tr::now,
 					lt_chat,
@@ -139,7 +137,7 @@ void Toasts::setupPinnedVideo() {
 					: tr::lng_group_call_unpinned_screen);
 			return key(tr::now, lt_user, peer->shortName());
 		}();
-		_panel->showToast({ text });
+		_panel->showToast(text);
 	}, _lifetime);
 }
 
@@ -148,9 +146,8 @@ void Toasts::setupRequestedToSpeak() {
 	) | rpl::combine_previous(
 	) | rpl::start_with_next([=](MuteState was, MuteState now) {
 		if (was == MuteState::ForceMuted && now == MuteState::RaisedHand) {
-			_panel->showToast({
-				tr::lng_group_call_tooltip_raised_hand(tr::now),
-			});
+			_panel->showToast(
+				tr::lng_group_call_tooltip_raised_hand(tr::now));
 		}
 	}, _lifetime);
 }
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp b/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
new file mode 100644
index 000000000..9a27c6f82
--- /dev/null
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.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 "chat_helpers/compose/compose_show.h"
+
+#include "core/application.h"
+#include "main/main_session.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+
+namespace ChatHelpers {
+
+rpl::producer<bool> Show::adjustShadowLeft() const {
+	return rpl::single(false);
+}
+
+Window::SessionController *Show::resolveWindow(WindowUsage usage) const {
+	const auto session = &this->session();
+	const auto check = [&](Window::Controller *window) {
+		if (const auto controller = window->sessionController()) {
+			if (&controller->session() == session) {
+				return controller;
+			}
+		}
+		return (Window::SessionController*)nullptr;
+	};
+	auto &app = Core::App();
+	if (const auto a = check(app.activeWindow())) {
+		return a;
+	} else if (const auto b = check(app.activePrimaryWindow())) {
+		return b;
+	} else if (const auto c = check(app.windowFor(&session->account()))) {
+		return c;
+	} else if (const auto d = check(
+		app.ensureSeparateWindowForAccount(
+			&session->account()))) {
+		return d;
+	}
+	return nullptr;
+}
+
+} // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
new file mode 100644
index 000000000..ba2f391df
--- /dev/null
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
@@ -0,0 +1,68 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/flags.h"
+#include "main/session/session_show.h"
+
+class PhotoData;
+class DocumentData;
+
+namespace Data {
+struct FileOrigin;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace SendMenu {
+enum class Type;
+} // namespace SendMenu
+
+namespace ChatHelpers {
+
+struct FileChosen;
+
+enum class PauseReason {
+	Any = 0,
+	InlineResults = (1 << 0),
+	TabbedPanel = (1 << 1),
+	Layer = (1 << 2),
+	RoundPlaying = (1 << 3),
+	MediaPreview = (1 << 4),
+};
+using PauseReasons = base::flags<PauseReason>;
+inline constexpr bool is_flag_type(PauseReason) { return true; };
+
+enum class WindowUsage {
+	PremiumPromo,
+};
+
+class Show : public Main::SessionShow {
+public:
+	[[nodiscard]] virtual bool paused(PauseReason reason) const = 0;
+	[[nodiscard]] virtual rpl::producer<> pauseChanged() const = 0;
+
+	[[nodiscard]] virtual rpl::producer<bool> adjustShadowLeft() const;
+	[[nodiscard]] virtual SendMenu::Type sendMenuType() const = 0;
+
+	virtual bool showMediaPreview(
+		Data::FileOrigin origin,
+		not_null<DocumentData*> document) const = 0;
+	virtual bool showMediaPreview(
+		Data::FileOrigin origin,
+		not_null<PhotoData*> photo) const = 0;
+
+	virtual void processChosenSticker(FileChosen chosen) const = 0;
+
+	[[nodiscard]] virtual Window::SessionController *resolveWindow(
+		WindowUsage) const;
+};
+
+} // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 2183be406..19dd9c827 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -370,12 +370,11 @@ void EmojiColorPicker::drawVariant(QPainter &p, int variant) {
 EmojiListWidget::EmojiListWidget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
-	Window::GifPauseReason level,
+	PauseReason level,
 	Mode mode)
 : EmojiListWidget(parent, {
-	.session = &controller->session(),
+	.show = controller->uiShow(),
 	.mode = mode,
-	.controller = controller,
 	.paused = Window::PausedIn(controller, level),
 }) {
 }
@@ -386,9 +385,9 @@ EmojiListWidget::EmojiListWidget(
 : Inner(
 	parent,
 	descriptor.st ? *descriptor.st : st::defaultEmojiPan,
-	descriptor.session,
+	descriptor.show,
 	std::move(descriptor.paused))
-, _controller(descriptor.controller)
+, _show(std::move(descriptor.show))
 , _mode(descriptor.mode)
 , _staticCount(_mode == Mode::Full ? kEmojiSectionCount : 1)
 , _premiumIcon(_mode == Mode::EmojiStatus
@@ -466,7 +465,7 @@ EmojiListWidget::~EmojiListWidget() {
 }
 
 void EmojiListWidget::setupSearch() {
-	const auto session = &_controller->session();
+	const auto session = &_show->session();
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		_nextSearchQuery = std::move(query);
 		InvokeQueued(this, [=] {
@@ -1419,26 +1418,27 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 		Assert(button->section >= _staticCount
 			&& button->section < _staticCount + _custom.size());
 		const auto id = _custom[button->section - _staticCount].id;
+		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
 		if (hasRemoveButton(button->section)) {
 			removeSet(id);
 		} else if (hasAddButton(button->section)) {
 			_localSetsManager->install(id);
-		} else if (_controller) {
+		} else if (const auto resolved = _show->resolveWindow(usage)) {
 			_jumpedToPremium.fire({});
 			switch (_mode) {
 			case Mode::Full:
 			case Mode::UserpicBuilder:
-				Settings::ShowPremium(_controller, u"animated_emoji"_q);
+				Settings::ShowPremium(resolved, u"animated_emoji"_q);
 				break;
 			case Mode::FullReactions:
 			case Mode::RecentReactions:
-				Settings::ShowPremium(_controller, u"infinite_reactions"_q);
+				Settings::ShowPremium(resolved, u"infinite_reactions"_q);
 				break;
 			case Mode::EmojiStatus:
-				Settings::ShowPremium(_controller, u"emoji_status"_q);
+				Settings::ShowPremium(resolved, u"emoji_status"_q);
 				break;
 			case Mode::TopicIcon:
-				Settings::ShowPremium(_controller, u"forum_topic_icon"_q);
+				Settings::ShowPremium(resolved, u"forum_topic_icon"_q);
 				break;
 			}
 		}
@@ -1448,20 +1448,14 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 void EmojiListWidget::displaySet(uint64 setId) {
 	const auto &sets = session().data().stickers().sets();
 	auto it = sets.find(setId);
-	if (it != sets.cend() && _controller) {
-		checkHideWithBox(_controller->show(
-			Box<StickerSetBox>(_controller, it->second.get()),
-			Ui::LayerOption::KeepOther).data());
+	if (it != sets.cend()) {
+		checkHideWithBox(Box<StickerSetBox>(_show, it->second.get()));
 	}
 }
 
 void EmojiListWidget::removeSet(uint64 setId) {
 	if (auto box = MakeConfirmRemoveSetBox(&session(), setId)) {
-		if (_controller) {
-			checkHideWithBox(_controller->show(
-				std::move(box),
-				Ui::LayerOption::KeepOther));
-		}
+		checkHideWithBox(std::move(box));
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index e928bda69..fd307eda8 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -76,9 +76,8 @@ enum class EmojiListMode {
 };
 
 struct EmojiListDescriptor {
-	not_null<Main::Session*> session;
+	std::shared_ptr<Show> show;
 	EmojiListMode mode = EmojiListMode::Full;
-	Window::SessionController *controller = nullptr;
 	Fn<bool()> paused;
 	std::vector<DocumentId> customRecentList;
 	Fn<std::unique_ptr<Ui::Text::CustomEmoji>(
@@ -87,7 +86,7 @@ struct EmojiListDescriptor {
 	const style::EmojiPan *st = nullptr;
 };
 
-class EmojiListWidget
+class EmojiListWidget final
 	: public TabbedSelector::Inner
 	, public Ui::AbstractTooltipShower {
 public:
@@ -96,7 +95,7 @@ public:
 	EmojiListWidget(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
-		Window::GifPauseReason level,
+		PauseReason level,
 		Mode mode);
 	EmojiListWidget(QWidget *parent, EmojiListDescriptor &&descriptor);
 	~EmojiListWidget();
@@ -345,7 +344,7 @@ private:
 
 	void applyNextSearchQuery();
 
-	Window::SessionController *_controller = nullptr;
+	const std::shared_ptr<Show> _show;
 	Mode _mode = Mode::Full;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	const int _staticCount = 0;
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 724b34794..8b24df18a 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -51,11 +51,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtWidgets/QApplication>
 
+namespace {
+
 [[nodiscard]] QString PrimaryUsername(not_null<UserData*> user) {
 	const auto &usernames = user->usernames();
 	return usernames.empty() ? user->username() : usernames.front();
 }
 
+} // namespace
+
 class FieldAutocomplete::Inner final : public Ui::RpWidget {
 public:
 	struct ScrollTo {
@@ -64,7 +68,7 @@ public:
 	};
 
 	Inner(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<FieldAutocomplete*> parent,
 		not_null<MentionRows*> mrows,
 		not_null<HashtagRows*> hrows,
@@ -120,7 +124,8 @@ private:
 		Media::Clip::Notification notification,
 		not_null<DocumentData*> document);
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Main::Session*> _session;
 	const not_null<FieldAutocomplete*> _parent;
 	const not_null<MentionRows*> _mrows;
 	const not_null<HashtagRows*> _hrows;
@@ -140,7 +145,7 @@ private:
 
 	bool _previewShown = false;
 
-	bool _isOneColumn = false;
+	bool _adjustShadowLeft = false;
 
 	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
 	StickerPremiumMark _premiumMark;
@@ -182,8 +187,15 @@ struct FieldAutocomplete::BotCommandRow {
 FieldAutocomplete::FieldAutocomplete(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
+: FieldAutocomplete(parent, controller->uiShow()) {
+}
+
+FieldAutocomplete::FieldAutocomplete(
+	QWidget *parent,
+	std::shared_ptr<ChatHelpers::Show> show)
 : RpWidget(parent)
-, _controller(controller)
+, _show(std::move(show))
+, _session(&_show->session())
 , _scroll(this) {
 	hide();
 
@@ -191,7 +203,7 @@ FieldAutocomplete::FieldAutocomplete(
 
 	_inner = _scroll->setOwnedWidget(
 		object_ptr<Inner>(
-			_controller,
+			_show,
 			this,
 			&_mrows,
 			&_hrows,
@@ -215,8 +227,8 @@ FieldAutocomplete::FieldAutocomplete(
 	}), lifetime());
 }
 
-not_null<Window::SessionController*> FieldAutocomplete::controller() const {
-	return _controller;
+std::shared_ptr<ChatHelpers::Show> FieldAutocomplete::uiShow() const {
+	return _show;
 }
 
 auto FieldAutocomplete::mentionChosen() const
@@ -365,7 +377,7 @@ inline int indexOfInFirstN(const T &v, const U &elem, int last) {
 }
 
 FieldAutocomplete::StickerRows FieldAutocomplete::getStickerSuggestions() {
-	const auto data = &_controller->session().data().stickers();
+	const auto data = &_session->data().stickers();
 	const auto list = data->getListByEmoji({ _emoji }, _stickersSeed);
 	auto result = ranges::views::all(
 		list
@@ -804,13 +816,14 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
 }
 
 FieldAutocomplete::Inner::Inner(
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<FieldAutocomplete*> parent,
 	not_null<MentionRows*> mrows,
 	not_null<HashtagRows*> hrows,
 	not_null<BotCommandRows*> brows,
 	not_null<StickerRows*> srows)
-: _controller(controller)
+: _show(std::move(show))
+, _session(&_show->session())
 , _parent(parent)
 , _mrows(mrows)
 , _hrows(hrows)
@@ -820,16 +833,16 @@ FieldAutocomplete::Inner::Inner(
 	st::windowBgRipple,
 	st::windowBgOver,
 	[=] { update(); }))
-, _premiumMark(&controller->session())
+, _premiumMark(_session)
 , _previewTimer([=] { showPreview(); }) {
-	controller->session().downloaderTaskFinished(
+	_session->downloaderTaskFinished(
 	) | rpl::start_with_next([=] {
 		update();
 	}, lifetime());
 
-	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
-		_isOneColumn = controller->adaptive().isOneColumn();
+	_show->adjustShadowLeft(
+	) | rpl::start_with_next([=](bool adjust) {
+		_adjustShadowLeft = adjust;
 		update();
 	}, lifetime());
 }
@@ -891,8 +904,8 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 				}
 
 				media->checkStickerSmall();
-				const auto paused = _controller->isGifPausedAtLeastFor(
-					Window::GifPauseReason::TabbedPanel);
+				const auto paused = _show->paused(
+					ChatHelpers::PauseReason::TabbedPanel);
 				const auto size = ChatHelpers::ComputeStickerSize(
 					document,
 					stickerBoundingBox());
@@ -1062,9 +1075,19 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 				}
 			}
 		}
-		p.fillRect(_isOneColumn ? 0 : st::lineWidth, _parent->innerBottom() - st::lineWidth, width() - (_isOneColumn ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
+		p.fillRect(
+			_adjustShadowLeft ? st::lineWidth : 0,
+			_parent->innerBottom() - st::lineWidth,
+			width() - (_adjustShadowLeft ? st::lineWidth : 0),
+			st::lineWidth,
+			st::shadowFg);
 	}
-	p.fillRect(_isOneColumn ? 0 : st::lineWidth, _parent->innerTop(), width() - (_isOneColumn ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
+	p.fillRect(
+		_adjustShadowLeft ? st::lineWidth : 0,
+		_parent->innerTop(),
+		width() - (_adjustShadowLeft ? st::lineWidth : 0),
+		st::lineWidth,
+		st::shadowFg);
 }
 
 void FieldAutocomplete::Inner::resizeEvent(QResizeEvent *e) {
@@ -1158,7 +1181,7 @@ bool FieldAutocomplete::Inner::chooseAtIndex(
 				contentRect.moveCenter(bounding.center());
 				return {
 					Ui::MessageSendingAnimationFrom::Type::Sticker,
-					_controller->session().data().nextLocalMessageId(),
+					_show->session().data().nextLocalMessageId(),
 					mapToGlobal(std::move(contentRect)),
 				};
 			};
@@ -1231,7 +1254,7 @@ void FieldAutocomplete::Inner::mousePressEvent(QMouseEvent *e) {
 				}
 			}
 			if (removed) {
-				_controller->session().local().writeRecentHashtagsAndBots();
+				_show->session().local().writeRecentHashtagsAndBots();
 			}
 			_parent->updateFiltered();
 
@@ -1483,11 +1506,7 @@ void FieldAutocomplete::Inner::selectByMouse(QPoint globalPosition) {
 		setSel(sel);
 		if (_down >= 0 && _sel >= 0 && _down != _sel) {
 			_down = _sel;
-			if (_down >= 0 && _down < _srows->size()) {
-				_controller->widget()->showMediaPreview(
-					(*_srows)[_down].document->stickerSetOrigin(),
-					(*_srows)[_down].document);
-			}
+			showPreview();
 		}
 	}
 }
@@ -1504,9 +1523,8 @@ void FieldAutocomplete::Inner::onParentGeometryChanged() {
 
 void FieldAutocomplete::Inner::showPreview() {
 	if (_down >= 0 && _down < _srows->size()) {
-		_controller->widget()->showMediaPreview(
-			(*_srows)[_down].document->stickerSetOrigin(),
-			(*_srows)[_down].document);
+		const auto document = (*_srows)[_down].document;
+		_show->showMediaPreview(document->stickerSetOrigin(), document);
 		_previewShown = true;
 	}
 }
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
index a03d4c840..1bb75f122 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
@@ -25,6 +25,10 @@ class SinglePlayer;
 class FrameRenderer;
 } // namespace Lottie;
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -39,6 +43,7 @@ enum class Type;
 
 namespace ChatHelpers {
 struct FileChosen;
+class Show;
 } // namespace ChatHelpers
 
 class FieldAutocomplete final : public Ui::RpWidget {
@@ -46,9 +51,12 @@ public:
 	FieldAutocomplete(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller);
+	FieldAutocomplete(
+		QWidget *parent,
+		std::shared_ptr<ChatHelpers::Show> show);
 	~FieldAutocomplete();
 
-	[[nodiscard]] not_null<Window::SessionController*> controller() const;
+	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 
 	bool clearFilteredBotCommands();
 	void showFiltered(
@@ -112,6 +120,8 @@ public:
 	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
 
 	void hideFast();
+	void showAnimated();
+	void hideAnimated();
 
 	rpl::producer<MentionChosen> mentionChosen() const;
 	rpl::producer<HashtagChosen> hashtagChosen() const;
@@ -119,10 +129,6 @@ public:
 	rpl::producer<StickerChosen> stickerChosen() const;
 	rpl::producer<Type> choosingProcesses() const;
 
-public Q_SLOTS:
-	void showAnimated();
-	void hideAnimated();
-
 protected:
 	void paintEvent(QPaintEvent *e) override;
 
@@ -145,7 +151,8 @@ private:
 	void recount(bool resetScroll = false);
 	StickerRows getStickerSuggestions();
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Main::Session*> _session;
 	QPixmap _cache;
 	MentionRows _mrows;
 	HashtagRows _hrows;
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 668dc0231..d8ba04cf5 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -56,7 +56,7 @@ constexpr auto kMinAfterScrollDelay = crl::time(33);
 
 void AddGifAction(
 		Fn<void(QString, Fn<void()> &&, const style::icon*)> callback,
-		Window::SessionController *controller,
+		std::shared_ptr<Show> show,
 		not_null<DocumentData*> document) {
 	if (!document->isGifv()) {
 		return;
@@ -69,7 +69,7 @@ void AddGifAction(
 		: tr::lng_context_save_gif)(tr::now);
 	callback(text, [=] {
 		Api::ToggleSavedGif(
-			controller,
+			show,
 			document,
 			Data::FileOriginSavedGifs(),
 			!saved);
@@ -86,13 +86,22 @@ void AddGifAction(
 GifsListWidget::GifsListWidget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
-	Window::GifPauseReason level)
+	PauseReason level)
+: GifsListWidget(parent, {
+	.show = controller->uiShow(),
+	.paused = Window::PausedIn(controller, level),
+}) {
+}
+
+GifsListWidget::GifsListWidget(
+	QWidget *parent,
+	GifsListDescriptor &&descriptor)
 : Inner(
 	parent,
 	st::defaultEmojiPan,
-	&controller->session(),
-	Window::PausedIn(controller, level))
-, _controller(controller)
+	descriptor.show,
+	descriptor.paused)
+, _show(std::move(descriptor.show))
 , _api(&session().mtp())
 , _section(Section::Gifs)
 , _updateInlineItems([=] { updateInlineItems(); })
@@ -120,7 +129,7 @@ GifsListWidget::GifsListWidget(
 		updateInlineItems();
 	}, lifetime());
 
-	controller->gifPauseLevelChanged(
+	_show->pauseChanged(
 	) | rpl::start_with_next([=] {
 		if (!paused()) {
 			updateInlineItems();
@@ -395,7 +404,7 @@ base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
 					const style::icon *icon) {
 				menu->addAction(text, std::move(done), icon);
 			};
-			AddGifAction(std::move(callback), _controller, document);
+			AddGifAction(std::move(callback), _show, document);
 		}
 	}
 	return menu;
@@ -425,7 +434,7 @@ void GifsListWidget::mouseReleaseEvent(QMouseEvent *e) {
 		ActivateClickHandler(window(), activated, {
 			e->button(),
 			QVariant::fromValue(ClickHandlerContext{
-				.sessionWindow = base::make_weak(_controller),
+				.show = _show,
 			})
 		});
 	}
@@ -794,7 +803,7 @@ bool GifsListWidget::refreshInlineRows(int32 *added) {
 }
 
 void GifsListWidget::setupSearch() {
-	const auto session = &_controller->session();
+	const auto session = &_show->session();
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		const auto accumulated = ranges::accumulate(query, QString(), [](
 				QString a,
@@ -939,13 +948,11 @@ void GifsListWidget::updateSelected() {
 			_pressed = _selected;
 			if (item) {
 				if (const auto preview = item->getPreviewDocument()) {
-					_controller->widget()->showMediaPreview(
+					_show->showMediaPreview(
 						Data::FileOriginSavedGifs(),
 						preview);
 				} else if (const auto preview = item->getPreviewPhoto()) {
-					_controller->widget()->showMediaPreview(
-						Data::FileOrigin(),
-						preview);
+					_show->showMediaPreview(Data::FileOrigin(), preview);
 				}
 			}
 		}
@@ -961,11 +968,11 @@ void GifsListWidget::showPreview() {
 	}
 	if (const auto layout = _mosaic.maybeItemAt(_pressed)) {
 		if (const auto previewDocument = layout->getPreviewDocument()) {
-			_previewShown = _controller->widget()->showMediaPreview(
+			_previewShown = _show->showMediaPreview(
 				Data::FileOriginSavedGifs(),
 				previewDocument);
 		} else if (const auto previewPhoto = layout->getPreviewPhoto()) {
-			_previewShown = _controller->widget()->showMediaPreview(
+			_previewShown = _show->showMediaPreview(
 				Data::FileOrigin(),
 				previewPhoto);
 		}
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
index c4e007f73..d21c8e531 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
@@ -47,21 +47,28 @@ namespace ChatHelpers {
 
 void AddGifAction(
 	Fn<void(QString, Fn<void()> &&, const style::icon*)> callback,
-	Window::SessionController *controller,
+	std::shared_ptr<Show> show,
 	not_null<DocumentData*> document);
 
 class StickersListFooter;
 struct StickerIcon;
 struct GifSection;
 
-class GifsListWidget
+struct GifsListDescriptor {
+	std::shared_ptr<Show> show;
+	Fn<bool()> paused;
+	const style::EmojiPan *st = nullptr;
+};
+
+class GifsListWidget final
 	: public TabbedSelector::Inner
 	, public InlineBots::Layout::Context {
 public:
 	GifsListWidget(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
-		Window::GifPauseReason level);
+		PauseReason level);
+	GifsListWidget(QWidget *parent, GifsListDescriptor &&descriptor);
 
 	rpl::producer<FileChosen> fileChosen() const;
 	rpl::producer<PhotoChosen> photoChosen() const;
@@ -162,7 +169,7 @@ private:
 		Api::SendOptions options,
 		bool forceSend = false);
 
-	not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<Show> _show;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 
 	MTP::Sender _api;
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index ddceac33f..36696ccab 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -125,8 +125,7 @@ QString FieldTagMimeProcessor::operator()(QStringView mimeTag) {
 
 void EditLinkBox(
 		not_null<Ui::GenericBox*> box,
-		std::shared_ptr<Ui::Show> show,
-		not_null<Main::Session*> session,
+		std::shared_ptr<Main::SessionShow> show,
 		const QString &startText,
 		const QString &startLink,
 		Fn<void(QString, QString)> callback,
@@ -149,8 +148,8 @@ void EditLinkBox(
 	Ui::Emoji::SuggestionsController::Init(
 		box->getDelegate()->outerContainer(),
 		text,
-		session);
-	InitSpellchecker(std::move(show), session, text, fieldStyle != nullptr);
+		&show->session());
+	InitSpellchecker(show, text, fieldStyle != nullptr);
 
 	const auto placeholder = content->add(
 		object_ptr<Ui::RpWidget>(content),
@@ -284,8 +283,7 @@ Fn<bool(
 	QString text,
 	QString link,
 	EditLinkAction action)> DefaultEditLinkCallback(
-		std::shared_ptr<Ui::Show> show,
-		not_null<Main::Session*> session,
+		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
 		const style::InputField *fieldStyle) {
 	const auto weak = Ui::MakeWeak(field);
@@ -303,23 +301,20 @@ Fn<bool(
 				strong->commitMarkdownLinkEdit(selection, text, link);
 			}
 		};
-		show->showBox(
-			Box(
-				EditLinkBox,
-				show,
-				session,
-				text,
-				link,
-				std::move(callback),
-				fieldStyle),
-			Ui::LayerOption::KeepOther);
+		show->showBox(Box(
+			EditLinkBox,
+			show,
+			text,
+			link,
+			std::move(callback),
+			fieldStyle));
 		return true;
 	};
 }
 
 void InitMessageFieldHandlers(
 		not_null<Main::Session*> session,
-		std::shared_ptr<Ui::Show> show,
+		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
 		Fn<bool()> customEmojiPaused,
 		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji,
@@ -338,19 +333,19 @@ void InitMessageFieldHandlers(
 	field->setMarkdownReplacesEnabled(rpl::single(true));
 	if (show) {
 		field->setEditLinkCallback(
-			DefaultEditLinkCallback(show, session, field, fieldStyle));
-		InitSpellchecker(show, session, field, fieldStyle != nullptr);
+			DefaultEditLinkCallback(show, field, fieldStyle));
+		InitSpellchecker(show, field, fieldStyle != nullptr);
 	}
 }
 
 void InitMessageFieldHandlers(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::InputField*> field,
-		Window::GifPauseReason pauseReasonLevel,
+		ChatHelpers::PauseReason pauseReasonLevel,
 		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji) {
 	InitMessageFieldHandlers(
 		&controller->session(),
-		std::make_shared<Window::Show>(controller),
+		controller->uiShow(),
 		field,
 		[=] { return controller->isGifPausedAtLeastFor(pauseReasonLevel); },
 		allowPremiumEmoji);
@@ -366,25 +361,36 @@ void InitMessageFieldGeometry(not_null<Ui::InputField*> field) {
 }
 
 void InitMessageField(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::InputField*> field,
 		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji) {
 	InitMessageFieldHandlers(
-		controller,
+		&show->session(),
+		show,
 		field,
-		Window::GifPauseReason::Any,
-		allowPremiumEmoji);
+		[=] { return show->paused(ChatHelpers::PauseReason::Any); },
+		std::move(allowPremiumEmoji));
 	InitMessageFieldGeometry(field);
 	field->customTab(true);
 }
 
+void InitMessageField(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::InputField*> field,
+		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji) {
+	return InitMessageField(
+		controller->uiShow(),
+		field,
+		std::move(allowPremiumEmoji));
+}
+
 void InitSpellchecker(
-		std::shared_ptr<Ui::Show> show,
-		not_null<Main::Session*> session,
+		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
 		bool skipDictionariesManager) {
 #ifndef TDESKTOP_DISABLE_SPELLCHECK
 	using namespace Spellchecker;
+	const auto session = &show->session();
 	const auto menuItem = skipDictionariesManager
 		? std::nullopt
 		: std::make_optional(SpellingHighlighter::CustomContextMenuItem{
@@ -856,7 +862,7 @@ base::unique_qptr<Ui::RpWidget> CreateDisabledFieldView(
 		*toast = Ui::Toast::Show(parent, {
 			.text = { tr::lng_send_text_no_about(tr::now, lt_types, types) },
 			.st = &st::defaultMultilineToast,
-			.durationMs = kTypesDuration,
+			.duration = kTypesDuration,
 			.multiline = true,
 			.slideSide = RectPart::Bottom,
 		});
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 8efa27c2c..727e51a5b 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -20,16 +20,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Main {
 class Session;
+class SessionShow;
 } // namespace Main
 
 namespace Window {
 class SessionController;
-enum class GifPauseReason;
 } // namespace Window
 
+namespace ChatHelpers {
+enum class PauseReason;
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 class PopupMenu;
-class Show;
 } // namespace Ui
 
 QString PrepareMentionTag(not_null<UserData*> user);
@@ -40,13 +44,12 @@ Fn<bool(
 	QString text,
 	QString link,
 	Ui::InputField::EditLinkAction action)> DefaultEditLinkCallback(
-		std::shared_ptr<Ui::Show> show,
-		not_null<Main::Session*> session,
+		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
 		const style::InputField *fieldStyle = nullptr);
 void InitMessageFieldHandlers(
 	not_null<Main::Session*> session,
-	std::shared_ptr<Ui::Show> show,
+	std::shared_ptr<Main::SessionShow> show, // may be null
 	not_null<Ui::InputField*> field,
 	Fn<bool()> customEmojiPaused,
 	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji = nullptr,
@@ -54,16 +57,19 @@ void InitMessageFieldHandlers(
 void InitMessageFieldHandlers(
 	not_null<Window::SessionController*> controller,
 	not_null<Ui::InputField*> field,
-	Window::GifPauseReason pauseReasonLevel,
+	ChatHelpers::PauseReason pauseReasonLevel,
 	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji = nullptr);
+void InitMessageField(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Ui::InputField*> field,
+	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji);
 void InitMessageField(
 	not_null<Window::SessionController*> controller,
 	not_null<Ui::InputField*> field,
 	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji);
 
 void InitSpellchecker(
-	std::shared_ptr<Ui::Show> show,
-	not_null<Main::Session*> session,
+	std::shared_ptr<Main::SessionShow> show,
 	not_null<Ui::InputField*> field,
 	bool skipDictionariesManager = false);
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 55a356ba5..349980b6c 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -165,19 +165,29 @@ void StickersListWidget::Sticker::ensureMediaCreated() {
 StickersListWidget::StickersListWidget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
-	Window::GifPauseReason level,
+	PauseReason level,
 	Mode mode)
+: StickersListWidget(parent, {
+	.show = controller->uiShow(),
+	.mode = mode,
+	.paused = Window::PausedIn(controller, level),
+}) {
+}
+
+StickersListWidget::StickersListWidget(
+	QWidget *parent,
+	StickersListDescriptor &&descriptor)
 : Inner(
 	parent,
 	st::defaultEmojiPan,
-	&controller->session(),
-	Window::PausedIn(controller, level))
-, _mode(mode)
-, _controller(controller)
+	descriptor.show,
+	descriptor.paused)
+, _mode(descriptor.mode)
+, _show(std::move(descriptor.show))
 , _api(&session().mtp())
 , _localSetsManager(std::make_unique<LocalStickersManager>(&session()))
 , _section(Section::Stickers)
-, _isMasks(mode == Mode::Masks)
+, _isMasks(_mode == Mode::Masks)
 , _updateItemsTimer([=] { updateItems(); })
 , _updateSetsTimer([=] { updateSets(); })
 , _trendingAddBgOver(
@@ -210,9 +220,8 @@ StickersListWidget::StickersListWidget(
 
 	_settings->addClickHandler([=] {
 		using Section = StickersBox::Section;
-		controller->show(
-			Box<StickersBox>(controller, Section::Installed, _isMasks),
-			Ui::LayerOption::KeepOther);
+		_show->showBox(
+			Box<StickersBox>(_show, Section::Installed, _isMasks));
 	});
 
 	session().downloaderTaskFinished(
@@ -287,15 +296,14 @@ object_ptr<TabbedSelector::InnerFooter> StickersListWidget::createFooter() {
 	_footer->openSettingsRequests(
 	) | rpl::start_with_next([=] {
 		const auto onlyFeatured = _footer->hasOnlyFeaturedSets();
-		_controller->show(Box<StickersBox>(
-			_controller,
+		_show->showBox(Box<StickersBox>(
+			_show,
 			(onlyFeatured
 				? StickersBox::Section::Featured
 				: _isMasks
 				? StickersBox::Section::Masks
 				: StickersBox::Section::Installed),
-			onlyFeatured ? false : _isMasks),
-		Ui::LayerOption::KeepOther);
+			onlyFeatured ? false : _isMasks));
 	}, _footer->lifetime());
 
 	return result;
@@ -1569,7 +1577,10 @@ QPoint StickersListWidget::buttonRippleTopLeft(int section) const {
 
 void StickersListWidget::showStickerSetBox(not_null<DocumentData*> document) {
 	if (document->sticker() && document->sticker()->set) {
-		checkHideWithBox(StickerSetBox::Show(_controller, document));
+		checkHideWithBox(Box<StickerSetBox>(
+			_show,
+			document->sticker()->set,
+			document->sticker()->setType));
 	}
 }
 
@@ -1611,10 +1622,10 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 		SendMenu::DefaultScheduleCallback(this, type, send),
 		SendMenu::DefaultWhenOnlineCallback(send));
 
-	const auto window = _controller;
+	const auto show = _show;
 	const auto toggleFavedSticker = [=] {
 		Api::ToggleFavedSticker(
-			window,
+			show,
 			document,
 			Data::FileOriginStickerSet(Data::Stickers::FavedSetId, 0));
 	};
@@ -1716,7 +1727,7 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 				removeSet(sets[button->section].id);
 			}
 		} else if (std::get_if<OverGroupAdd>(&pressed)) {
-			_controller->show(Box<StickersBox>(_controller, _megagroupSet));
+			_show->showBox(Box<StickersBox>(_show, _megagroupSet));
 		}
 	}
 }
@@ -1774,9 +1785,9 @@ void StickersListWidget::removeFavedSticker(int section, int index) {
 	clearSelection();
 	const auto &sticker = _mySets[section].stickers[index];
 	const auto document = sticker.document;
-	session().data().stickers().setFaved(_controller, document, false);
+	session().data().stickers().setFaved(_show, document, false);
 	Api::ToggleFavedSticker(
-		_controller,
+		_show,
 		document,
 		Data::FileOriginStickerSet(Data::Stickers::FavedSetId, 0),
 		false);
@@ -2427,9 +2438,7 @@ void StickersListWidget::setSelected(OverState newSelected) {
 				const auto &set = sets[sticker->section];
 				Assert(sticker->index >= 0 && sticker->index < set.stickers.size());
 				const auto document = set.stickers[sticker->index].document;
-				_controller->widget()->showMediaPreview(
-					document->stickerSetOrigin(),
-					document);
+				_show->showMediaPreview(document->stickerSetOrigin(), document);
 			}
 		}
 	}
@@ -2442,9 +2451,7 @@ void StickersListWidget::showPreview() {
 		const auto &set = sets[sticker->section];
 		Assert(sticker->index >= 0 && sticker->index < set.stickers.size());
 		const auto document = set.stickers[sticker->index].document;
-		_controller->widget()->showMediaPreview(
-			document->stickerSetOrigin(),
-			document);
+		_show->showMediaPreview(document->stickerSetOrigin(), document);
 		_previewShown = true;
 	}
 }
@@ -2565,7 +2572,7 @@ void StickersListWidget::beforeHiding() {
 }
 
 void StickersListWidget::setupSearch() {
-	const auto session = &_controller->session();
+	const auto session = &_show->session();
 	_search = MakeSearch(this, st(), [=](std::vector<QString> &&query) {
 		auto set = base::flat_set<EmojiPtr>();
 		auto text = ranges::accumulate(query, QString(), [](
@@ -2580,9 +2587,7 @@ void StickersListWidget::setupSearch() {
 void StickersListWidget::displaySet(uint64 setId) {
 	if (setId == Data::Stickers::MegagroupSetId) {
 		if (_megagroupSet->canEditStickers()) {
-			checkHideWithBox(_controller->show(
-				Box<StickersBox>(_controller, _megagroupSet),
-				Ui::LayerOption::KeepOther).data());
+			checkHideWithBox(Box<StickersBox>(_show, _megagroupSet));
 			return;
 		} else if (_megagroupSet->mgInfo->stickerSet.id) {
 			setId = _megagroupSet->mgInfo->stickerSet.id;
@@ -2593,9 +2598,7 @@ void StickersListWidget::displaySet(uint64 setId) {
 	const auto &sets = session().data().stickers().sets();
 	auto it = sets.find(setId);
 	if (it != sets.cend()) {
-		checkHideWithBox(_controller->show(
-			Box<StickerSetBox>(_controller, it->second.get()),
-			Ui::LayerOption::KeepOther).data());
+		checkHideWithBox(Box<StickerSetBox>(_show, it->second.get()));
 	}
 }
 
@@ -2606,10 +2609,7 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
 		refreshStickers();
 		return;
 	}
-	const auto cancelled = [](Fn<void()> &&close) {
-		close();
-	};
-	checkHideWithBox(_controller->show(Ui::MakeConfirmBox({
+	checkHideWithBox(Ui::MakeConfirmBox({
 		.text = tr::lng_stickers_remove_group_set(),
 		.confirmed = crl::guard(this, [this, group = _megagroupSet](
 				Fn<void()> &&close) {
@@ -2620,8 +2620,8 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
 			}
 			close();
 		}),
-		.cancelled = cancelled,
-	})));
+		.cancelled = [](Fn<void()> &&close) { close(); },
+	}));
 }
 
 void StickersListWidget::removeSet(uint64 setId) {
@@ -2633,9 +2633,7 @@ void StickersListWidget::removeSet(uint64 setId) {
 			|| !_megagroupSet->canEditStickers();
 		removeMegagroupSet(removeLocally);
 	} else if (auto box = MakeConfirmRemoveSetBox(&session(), setId)) {
-		checkHideWithBox(_controller->show(
-			std::move(box),
-			Ui::LayerOption::KeepOther));
+		checkHideWithBox(std::move(box));
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index 1c0d8445c..afde28b81 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -65,6 +65,13 @@ enum class StickersListMode {
 	UserpicBuilder,
 };
 
+struct StickersListDescriptor {
+	std::shared_ptr<Show> show;
+	StickersListMode mode = StickersListMode::Full;
+	Fn<bool()> paused;
+	const style::EmojiPan *st = nullptr;
+};
+
 class StickersListWidget final : public TabbedSelector::Inner {
 public:
 	using Mode = StickersListMode;
@@ -72,8 +79,11 @@ public:
 	StickersListWidget(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
-		Window::GifPauseReason level,
+		PauseReason level,
 		Mode mode = Mode::Full);
+	StickersListWidget(
+		QWidget *parent,
+		StickersListDescriptor &&descriptor);
 
 	rpl::producer<FileChosen> chosen() const;
 	rpl::producer<> scrollUpdated() const;
@@ -340,8 +350,7 @@ private:
 		not_null<DocumentData*> document);
 
 	const Mode _mode;
-
-	not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<Show> _show;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	MTP::Sender _api;
 	std::unique_ptr<LocalStickersManager> _localSetsManager;
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index 606145eec..5321e649e 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -37,25 +37,31 @@ TabbedPanel::TabbedPanel(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
 	not_null<TabbedSelector*> selector)
-: TabbedPanel(parent, controller, { nullptr }, selector) {
+: TabbedPanel(parent, {
+	.regularWindow = controller,
+	.nonOwnedSelector = selector,
+}) {
 }
 
 TabbedPanel::TabbedPanel(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
 	object_ptr<TabbedSelector> selector)
-: TabbedPanel(parent, controller, std::move(selector), nullptr) {
+: TabbedPanel(parent, {
+	.regularWindow = controller,
+	.ownedSelector = std::move(selector),
+}) {
 }
 
 TabbedPanel::TabbedPanel(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	object_ptr<TabbedSelector> ownedSelector,
-	TabbedSelector *nonOwnedSelector)
+	TabbedPanelDescriptor &&descriptor)
 : RpWidget(parent)
-, _controller(controller)
-, _ownedSelector(std::move(ownedSelector))
-, _selector(nonOwnedSelector ? nonOwnedSelector : _ownedSelector.data())
+, _regularWindow(descriptor.regularWindow)
+, _ownedSelector(std::move(descriptor.ownedSelector))
+, _selector(descriptor.nonOwnedSelector
+	? descriptor.nonOwnedSelector
+	: _ownedSelector.data())
 , _heightRatio(st::emojiPanHeightRatio)
 , _minContentHeight(st::emojiPanMinHeight)
 , _maxContentHeight(st::emojiPanMaxHeight) {
@@ -64,17 +70,25 @@ TabbedPanel::TabbedPanel(
 	_selector->setParent(this);
 	_selector->setRoundRadius(st::emojiPanRadius);
 	_selector->setAfterShownCallback([=](SelectorTab tab) {
-		_controller->enableGifPauseReason(_selector->level());
+		if (_regularWindow) {
+			_regularWindow->enableGifPauseReason(_selector->level());
+		}
+		_pauseAnimations.fire(true);
 	});
 	_selector->setBeforeHidingCallback([=](SelectorTab tab) {
-		_controller->disableGifPauseReason(_selector->level());
+		if (_regularWindow) {
+			_regularWindow->disableGifPauseReason(_selector->level());
+		}
+		_pauseAnimations.fire(false);
 	});
 	_selector->showRequests(
 	) | rpl::start_with_next([=] {
 		showFromSelector();
 	}, lifetime());
 
-	resize(QRect(0, 0, st::emojiPanWidth, st::emojiPanMaxHeight).marginsAdded(innerPadding()).size());
+	resize(
+		QRect(0, 0, st::emojiPanWidth, st::emojiPanMaxHeight).marginsAdded(
+			innerPadding()).size());
 
 	_contentMaxHeight = st::emojiPanMaxHeight;
 	_contentHeight = _contentMaxHeight;
@@ -122,6 +136,10 @@ not_null<TabbedSelector*> TabbedPanel::selector() const {
 	return _selector;
 }
 
+rpl::producer<bool> TabbedPanel::pauseAnimations() const {
+	return _pauseAnimations.events();
+}
+
 bool TabbedPanel::isSelectorStolen() const {
 	return (_selector->parent() != this);
 }
@@ -478,8 +496,8 @@ bool TabbedPanel::overlaps(const QRect &globalRect) const {
 
 TabbedPanel::~TabbedPanel() {
 	hideFast();
-	if (!_ownedSelector) {
-		_controller->takeTabbedSelectorOwnershipFrom(this);
+	if (!_ownedSelector && _regularWindow) {
+		_regularWindow->takeTabbedSelectorOwnershipFrom(this);
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
index c592c4a48..153c19581 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
@@ -26,6 +26,12 @@ class TabbedSelector;
 
 extern const char kOptionTabbedPanelShowOnClick[];
 
+struct TabbedPanelDescriptor {
+	Window::SessionController *regularWindow = nullptr;
+	object_ptr<TabbedSelector> ownedSelector = { nullptr };
+	TabbedSelector *nonOwnedSelector = nullptr;
+};;
+
 class TabbedPanel : public Ui::RpWidget {
 public:
 	TabbedPanel(
@@ -36,9 +42,11 @@ public:
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
 		object_ptr<TabbedSelector> selector);
+	TabbedPanel(QWidget *parent, TabbedPanelDescriptor &&descriptor);
 
 	[[nodiscard]] bool isSelectorStolen() const;
 	[[nodiscard]] not_null<TabbedSelector*> selector() const;
+	[[nodiscard]] rpl::producer<bool> pauseAnimations() const;
 
 	void moveBottomRight(int bottom, int right);
 	void moveTopRight(int top, int right);
@@ -71,12 +79,6 @@ protected:
 	bool eventFilter(QObject *obj, QEvent *e) override;
 
 private:
-	TabbedPanel(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		object_ptr<TabbedSelector> ownedSelector,
-		TabbedSelector *nonOwnedSelector);
-
 	void hideByTimerOrLeave();
 	void moveHorizontally();
 	void showFromSelector();
@@ -99,9 +101,10 @@ private:
 	bool preventAutoHide() const;
 	void updateContentHeight();
 
-	const not_null<Window::SessionController*> _controller;
+	Window::SessionController * const _regularWindow = nullptr;
 	const object_ptr<TabbedSelector> _ownedSelector = { nullptr };
 	const not_null<TabbedSelector*> _selector;
+	rpl::event_stream<bool> _pauseAnimations;
 
 	int _contentMaxHeight = 0;
 	int _contentHeight = 0;
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index d34884edf..463b35f16 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -322,12 +322,12 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 
 TabbedSelector::TabbedSelector(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	Window::GifPauseReason level,
+	std::shared_ptr<Show> show,
+	PauseReason level,
 	Mode mode)
 : RpWidget(parent)
 , _st((mode == Mode::EmojiStatus) ? st::statusEmojiPan : st::defaultEmojiPan)
-, _controller(controller)
+, _show(std::move(show))
 , _level(level)
 , _mode(mode)
 , _panelRounding(Ui::PrepareCornerPixmaps(st::emojiPanRadius, _st.bg))
@@ -470,38 +470,59 @@ TabbedSelector::TabbedSelector(
 TabbedSelector::~TabbedSelector() = default;
 
 Main::Session &TabbedSelector::session() const {
-	return _controller->session();
+	return _show->session();
 }
 
-Window::GifPauseReason TabbedSelector::level() const {
+PauseReason TabbedSelector::level() const {
 	return _level;
 }
 
 TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 	auto createWidget = [&]() -> object_ptr<Inner> {
+		const auto paused = [show = _show, level = _level] {
+			return show->paused(level);
+		};
 		switch (type) {
-		case SelectorTab::Emoji:
+		case SelectorTab::Emoji: {
 			using EmojiMode = EmojiListWidget::Mode;
 			using Descriptor = EmojiListDescriptor;
 			return object_ptr<EmojiListWidget>(this, Descriptor{
-				.session = &_controller->session(),
+				.show = _show,
 				.mode = (_mode == Mode::EmojiStatus
 					? EmojiMode::EmojiStatus
 					: EmojiMode::Full),
-				.controller = _controller,
-				.paused = Window::PausedIn(_controller, _level),
+				.paused = paused,
 				.st = &_st,
 			});
-		case SelectorTab::Stickers:
-			return object_ptr<StickersListWidget>(this, _controller, _level);
-		case SelectorTab::Gifs:
-			return object_ptr<GifsListWidget>(this, _controller, _level);
-		case SelectorTab::Masks:
-			return object_ptr<StickersListWidget>(
-				this,
-				_controller,
-				_level,
-				StickersListWidget::Mode::Masks);
+		}
+		case SelectorTab::Stickers: {
+			using StickersMode = StickersListWidget::Mode;
+			using Descriptor = StickersListDescriptor;
+			return object_ptr<StickersListWidget>(this, Descriptor{
+				.show = _show,
+				.mode = StickersMode::Full,
+				.paused = paused,
+				.st = &_st,
+			});
+		}
+		case SelectorTab::Gifs: {
+			using Descriptor = GifsListDescriptor;
+			return object_ptr<GifsListWidget>(this, Descriptor{
+				.show = _show,
+				.paused = paused,
+				.st = &_st,
+			});
+		}
+		case SelectorTab::Masks: {
+			using StickersMode = StickersListWidget::Mode;
+			using Descriptor = StickersListDescriptor;
+			return object_ptr<StickersListWidget>(this, Descriptor{
+				.show = _show,
+				.mode = StickersMode::Masks,
+				.paused = paused,
+				.st = &_st,
+			});
+		}
 		}
 		Unexpected("Type in TabbedSelector::createTab.");
 	};
@@ -1237,23 +1258,24 @@ not_null<const TabbedSelector::Tab*> TabbedSelector::currentTab() const {
 
 TabbedSelector::Inner::Inner(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	Window::GifPauseReason level)
+	std::shared_ptr<Show> show,
+	PauseReason level)
 : Inner(
 	parent,
 	st::defaultEmojiPan,
-	&controller->session(),
-	Window::PausedIn(controller, level)) {
+	show,
+	[show, level] { return show->paused(level); }) {
 }
 
 TabbedSelector::Inner::Inner(
 	QWidget *parent,
 	const style::EmojiPan &st,
-	not_null<Main::Session*> session,
+	std::shared_ptr<Show> show,
 	Fn<bool()> paused)
 : RpWidget(parent)
 , _st(st)
-, _session(session)
+, _show(std::move(show))
+, _session(&_show->session())
 , _paused(paused) {
 }
 
@@ -1273,12 +1295,15 @@ void TabbedSelector::Inner::disableScroll(bool disabled) {
 	_disableScrollRequests.fire_copy(disabled);
 }
 
-void TabbedSelector::Inner::checkHideWithBox(QPointer<Ui::BoxContent> box) {
-	if (!box) {
+void TabbedSelector::Inner::checkHideWithBox(
+		object_ptr<Ui::BoxContent> box) {
+	const auto raw = QPointer<Ui::BoxContent>(box.data());
+	_show->showBox(std::move(box));
+	if (!raw) {
 		return;
 	}
 	_preventHideWithBox = true;
-	connect(box, &QObject::destroyed, this, [=] {
+	connect(raw, &QObject::destroyed, this, [=] {
 		_preventHideWithBox = false;
 		_checkForHide.fire({});
 	});
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index 74036ab30..f7f65811a 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -34,11 +34,6 @@ class BoxContent;
 class TabbedSearch;
 } // namespace Ui
 
-namespace Window {
-class SessionController;
-enum class GifPauseReason;
-} // namespace Window
-
 namespace SendMenu {
 enum class Type;
 } // namespace SendMenu
@@ -49,9 +44,11 @@ struct EmojiPan;
 
 namespace ChatHelpers {
 
+class Show;
 class EmojiListWidget;
 class StickersListWidget;
 class GifsListWidget;
+enum class PauseReason;
 
 enum class SelectorTab {
 	Emoji,
@@ -102,31 +99,32 @@ public:
 
 	TabbedSelector(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		Window::GifPauseReason level,
+		std::shared_ptr<Show> show,
+		PauseReason level,
 		Mode mode = Mode::Full);
 	~TabbedSelector();
 
-	Main::Session &session() const;
-	Window::GifPauseReason level() const;
+	[[nodiscard]] Main::Session &session() const;
+	[[nodiscard]] PauseReason level() const;
 
-	rpl::producer<EmojiChosen> emojiChosen() const;
-	rpl::producer<FileChosen> customEmojiChosen() const;
-	rpl::producer<FileChosen> fileChosen() const;
-	rpl::producer<PhotoChosen> photoChosen() const;
-	rpl::producer<InlineChosen> inlineResultChosen() const;
+	[[nodiscard]] rpl::producer<EmojiChosen> emojiChosen() const;
+	[[nodiscard]] rpl::producer<FileChosen> customEmojiChosen() const;
+	[[nodiscard]] rpl::producer<FileChosen> fileChosen() const;
+	[[nodiscard]] rpl::producer<PhotoChosen> photoChosen() const;
+	[[nodiscard]] rpl::producer<InlineChosen> inlineResultChosen() const;
 
-	rpl::producer<> cancelled() const;
-	rpl::producer<> checkForHide() const;
-	rpl::producer<> slideFinished() const;
-	rpl::producer<> contextMenuRequested() const;
-	rpl::producer<Action> choosingStickerUpdated() const;
+	[[nodiscard]] rpl::producer<> cancelled() const;
+	[[nodiscard]] rpl::producer<> checkForHide() const;
+	[[nodiscard]] rpl::producer<> slideFinished() const;
+	[[nodiscard]] rpl::producer<> contextMenuRequested() const;
+	[[nodiscard]] rpl::producer<Action> choosingStickerUpdated() const;
 
 	void setAllowEmojiWithoutPremium(bool allow);
 	void setRoundRadius(int radius);
 	void refreshStickers();
 	void setCurrentPeer(PeerData *peer);
-	void provideRecentEmoji(const std::vector<DocumentId> &customRecentList);
+	void provideRecentEmoji(
+		const std::vector<DocumentId> &customRecentList);
 
 	void hideFinished();
 	void showStarted();
@@ -256,8 +254,8 @@ private:
 	not_null<StickersListWidget*> masks() const;
 
 	const style::EmojiPan &_st;
-	const not_null<Window::SessionController*> _controller;
-	const Window::GifPauseReason _level = {};
+	const std::shared_ptr<Show> _show;
+	const PauseReason _level = {};
 
 	Mode _mode = Mode::Full;
 	int _roundRadius = 0;
@@ -299,12 +297,12 @@ class TabbedSelector::Inner : public Ui::RpWidget {
 public:
 	Inner(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		Window::GifPauseReason level);
+		std::shared_ptr<Show> show,
+		PauseReason level);
 	Inner(
 		QWidget *parent,
 		const style::EmojiPan &st,
-		not_null<Main::Session*> session,
+		std::shared_ptr<Show> show,
 		Fn<bool()> paused);
 
 	[[nodiscard]] Main::Session &session() const {
@@ -374,7 +372,7 @@ protected:
 	void scrollTo(int y);
 	void disableScroll(bool disabled);
 
-	void checkHideWithBox(QPointer<Ui::BoxContent> box);
+	void checkHideWithBox(object_ptr<Ui::BoxContent> box);
 
 	void paintEmptySearchResults(
 		Painter &p,
@@ -383,6 +381,7 @@ protected:
 
 private:
 	const style::EmojiPan &_st;
+	const std::shared_ptr<Show> _show;
 	const not_null<Main::Session*> _session;
 	const Fn<bool()> _paused;
 
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 21a54c785..cc4040612 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -917,6 +917,14 @@ rpl::producer<bool> Application::appDeactivatedValue() const {
 	});
 }
 
+void Application::materializeLocalDrafts() {
+	_materializeLocalDraftsRequests.fire({});
+}
+
+rpl::producer<> Application::materializeLocalDraftsRequests() const {
+	return _materializeLocalDraftsRequests.events();
+}
+
 void Application::switchDebugMode() {
 	if (Logs::DebugEnabled()) {
 		Logs::SetDebugEnabled(false);
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 3ad642c6b..0a90308b9 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -314,6 +314,9 @@ public:
 	void handleAppDeactivated();
 	[[nodiscard]] rpl::producer<bool> appDeactivatedValue() const;
 
+	void materializeLocalDrafts();
+	[[nodiscard]] rpl::producer<> materializeLocalDraftsRequests() const;
+
 	void switchDebugMode();
 	void writeInstallBetaVersionsSetting();
 
@@ -444,6 +447,8 @@ private:
 
 	rpl::event_stream<Media::View::OpenRequest> _openInMediaViewRequests;
 
+	rpl::event_stream<> _materializeLocalDraftsRequests;
+
 	rpl::lifetime _lifetime;
 
 	crl::time _lastNonIdleTime = 0;
diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index 39ba3369e..02472e437 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -146,7 +146,7 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 			if (my.show) {
 				my.show->showBox(std::move(box));
 			} else if (use) {
-				use->show(std::move(box), Ui::LayerOption::KeepOther);
+				use->show(std::move(box));
 			}
 		} else {
 			open();
@@ -335,16 +335,13 @@ void MonospaceClickHandler::onClick(ClickContext context) const {
 		const auto hasCopyRestriction = item
 			&& (!item->history()->peer->allowsForwarding()
 				|| item->forbidsForward());
-		const auto toastParent = Window::Show(controller).toastParent();
 		if (hasCopyRestriction) {
-			Ui::Toast::Show(
-				toastParent,
-				item->history()->peer->isBroadcast()
-					? tr::lng_error_nocopy_channel(tr::now)
-					: tr::lng_error_nocopy_group(tr::now));
+			controller->showToast(item->history()->peer->isBroadcast()
+				? tr::lng_error_nocopy_channel(tr::now)
+				: tr::lng_error_nocopy_group(tr::now));
 			return;
 		}
-		Ui::Toast::Show(toastParent, tr::lng_text_copied(tr::now));
+		controller->showToast(tr::lng_text_copied(tr::now));
 	}
 	TextUtilities::SetClipboardText(TextForMimeData::Simple(_text.trimmed()));
 }
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 5ef839888..60f65f230 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -100,7 +100,7 @@ bool ShowStickerSet(
 	}
 	Core::App().hideMediaView();
 	controller->show(Box<StickerSetBox>(
-		controller,
+		controller->uiShow(),
 		StickerSetIdentifier{ .shortName = match->captured(2) },
 		(match->captured(1) == "addemoji"
 			? Data::StickersType::Emoji
@@ -607,9 +607,7 @@ bool ShowInviteLink(
 		return false;
 	}
 	QGuiApplication::clipboard()->setText(link);
-	Ui::Toast::Show(
-		Window::Show(controller).toastParent(),
-		tr::lng_group_invite_copied(tr::now));
+	controller->showToast(tr::lng_group_invite_copied(tr::now));
 	return true;
 }
 
@@ -626,12 +624,12 @@ void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
 	const auto session = &controller->session();
-	const auto show = std::make_shared<Window::Show>(controller);
+	const auto show = controller->uiShow();
 	const auto inputSettings = [&](Data::CloudThemeType type)
 	-> std::optional<MTPInputThemeSettings> {
 		const auto i = theme->settings.find(type);
 		if (i == end(theme->settings)) {
-			Ui::Toast::Show(show->toastParent(), "Something went wrong :(");
+			show->showToast(u"Something went wrong :("_q);
 			return std::nullopt;
 		}
 		const auto &fields = i->second;
@@ -639,17 +637,15 @@ void ExportTestChatTheme(
 			|| !fields.paper->isPattern()
 			|| fields.paper->backgroundColors().empty()
 			|| !fields.paper->hasShareUrl()) {
-			Ui::Toast::Show(show->toastParent(), "Something went wrong :(");
+			show->showToast(u"Something went wrong :("_q);
 			return std::nullopt;
 		}
 		const auto &bg = fields.paper->backgroundColors();
-		const auto url = fields.paper->shareUrl(session);
+		const auto url = fields.paper->shareUrl(&show->session());
 		const auto from = url.indexOf("bg/");
 		const auto till = url.indexOf("?");
 		if (from < 0 || till <= from) {
-			Ui::Toast::Show(
-				show->toastParent(),
-				"Bad WallPaper link: " + url);
+			show->showToast(u"Bad WallPaper link: "_q + url);
 			return std::nullopt;
 		}
 
@@ -731,15 +727,9 @@ void ExportTestChatTheme(
 		const auto slug = Data::CloudTheme::Parse(session, result, true).slug;
 		QGuiApplication::clipboard()->setText(
 			session->createInternalLinkFull("addtheme/" + slug));
-		if (show->valid()) {
-			Ui::Toast::Show(
-				show->toastParent(),
-				tr::lng_background_link_copied(tr::now));
-		}
+		show->showToast(tr::lng_background_link_copied(tr::now));
 	}).fail([=](const MTP::Error &error) {
-		if (show->valid()) {
-			Ui::Toast::Show(show->toastParent(), "Error: " + error.type());
-		}
+		show->showToast(u"Error: "_q + error.type());
 	}).send();
 }
 
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index d202d083c..4e311e1f1 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -62,7 +62,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/click_handler_types.h" // ClickHandlerContext
 #include "lang/lang_keys.h"
 #include "storage/file_upload.h"
-#include "window/window_session_controller.h" // Window::Show
+#include "window/window_session_controller.h" // SessionController::uiShow.
 #include "apiwrap.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
@@ -1828,7 +1828,7 @@ ClickHandlerPtr MediaDice::MakeHandler(
 		auto config = Ui::Toast::Config{
 			.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) },
 			.st = &st::historyDiceToast,
-			.durationMs = Ui::Toast::kDefaultDuration * 2,
+			.duration = Ui::Toast::kDefaultDuration * 2,
 			.multiline = true,
 		};
 		if (CanSend(history->peer, ChatRestriction::SendOther)) {
@@ -1857,9 +1857,7 @@ ClickHandlerPtr MediaDice::MakeHandler(
 		const auto my = context.other.value<ClickHandlerContext>();
 		const auto weak = my.sessionWindow;
 		if (const auto strong = weak.get()) {
-			ShownToast = Ui::Toast::Show(
-				Window::Show(strong).toastParent(),
-				config);
+			ShownToast = strong->showToast(std::move(config));
 		} else {
 			ShownToast = Ui::Toast::Show(config);
 		}
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 42c548438..c096853c6 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -39,7 +39,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image.h"
 #include "ui/empty_userpic.h"
 #include "ui/text/text_options.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "history/history.h"
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 4b778d0b1..c18a1c3bf 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/stickers/data_stickers.h"
 
 #include "api/api_hash.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -29,7 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_app_config.h"
 #include "mtproto/mtproto_config.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/image/image_location_factory.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
@@ -78,24 +78,24 @@ using SetFlag = StickersSetFlag;
 }
 
 void MaybeShowPremiumToast(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		TextWithEntities text,
 		const QString &ref) {
-	if (!controller) {
+	if (!show) {
 		return;
 	}
-	const auto session = &controller->session();
+	const auto session = &show->session();
 	if (session->user()->isPremium()) {
 		return;
 	}
-	const auto widget = QPointer<Ui::RpWidget>(
-		controller->window().widget()->bodyWidget());
 	const auto filter = [=](const auto ...) {
-		Settings::ShowPremium(controller, ref);
+		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
+		if (const auto controller = show->resolveWindow(usage)) {
+			Settings::ShowPremium(controller, ref);
+		}
 		return false;
 	};
-	Ui::ShowMultilineToast({
-		.parentOverride = widget,
+	show->showToast({
 		.text = std::move(text),
 		.duration = kPremiumToastDuration,
 		.filter = filter,
@@ -313,7 +313,7 @@ void Stickers::incrementSticker(not_null<DocumentData*> document) {
 }
 
 void Stickers::addSavedGif(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document) {
 	const auto index = _savedGifs.indexOf(document);
 	if (!index) {
@@ -328,7 +328,7 @@ void Stickers::addSavedGif(
 	if (_savedGifs.size() > limits.gifsCurrent()) {
 		_savedGifs.pop_back();
 		MaybeShowPremiumToast(
-			controller,
+			show,
 			SavedGifsToast(limits),
 			LimitsPremiumRef("saved_gifs"));
 	}
@@ -518,7 +518,7 @@ bool Stickers::isFaved(not_null<const DocumentData*> document) {
 
 void Stickers::checkFavedLimit(
 		StickersSet &set,
-		Window::SessionController *controller) {
+		std::shared_ptr<ChatHelpers::Show> show) {
 	const auto session = &_owner->session();
 	const auto limits = Data::PremiumLimits(session);
 	if (set.stickers.size() <= limits.stickersFavedCurrent()) {
@@ -538,21 +538,21 @@ void Stickers::checkFavedLimit(
 		++i;
 	}
 	MaybeShowPremiumToast(
-		controller,
+		std::move(show),
 		FaveStickersToast(limits),
 		LimitsPremiumRef("stickers_faved"));
 }
 
 void Stickers::pushFavedToFront(
 		StickersSet &set,
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		const std::vector<not_null<EmojiPtr>> &emojiList) {
 	set.stickers.push_front(document);
 	for (auto emoji : emojiList) {
 		set.emoji[emoji].push_front(document);
 	}
-	checkFavedLimit(set, controller);
+	checkFavedLimit(set, std::move(show));
 }
 
 void Stickers::moveFavedToFront(StickersSet &set, int index) {
@@ -575,7 +575,7 @@ void Stickers::moveFavedToFront(StickersSet &set, int index) {
 }
 
 void Stickers::setIsFaved(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		std::optional<std::vector<not_null<EmojiPtr>>> emojiList) {
 	auto &sets = setsRef();
@@ -600,11 +600,11 @@ void Stickers::setIsFaved(
 	if (index > 0) {
 		moveFavedToFront(*set, index);
 	} else if (emojiList) {
-		pushFavedToFront(*set, controller, document, *emojiList);
+		pushFavedToFront(*set, show, document, *emojiList);
 	} else if (auto list = getEmojiListFromSet(document)) {
-		pushFavedToFront(*set, controller, document, *list);
+		pushFavedToFront(*set, show, document, *list);
 	} else {
-		requestSetToPushFaved(controller, document);
+		requestSetToPushFaved(show, document);
 		return;
 	}
 	session().local().writeFavedStickers();
@@ -613,10 +613,8 @@ void Stickers::setIsFaved(
 }
 
 void Stickers::requestSetToPushFaved(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document) {
-	controller = nullptr;
-	const auto weak = base::make_weak(controller);
 	auto addAnyway = [=](std::vector<not_null<EmojiPtr>> list) {
 		if (list.empty()) {
 			if (auto sticker = document->sticker()) {
@@ -625,7 +623,7 @@ void Stickers::requestSetToPushFaved(
 				}
 			}
 		}
-		setIsFaved(weak.get(), document, std::move(list));
+		setIsFaved(nullptr, document, std::move(list));
 	};
 	session().api().request(MTPmessages_GetStickerSet(
 		Data::InputStickerSet(document->sticker()->set),
@@ -668,11 +666,11 @@ void Stickers::setIsNotFaved(not_null<DocumentData*> document) {
 }
 
 void Stickers::setFaved(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		bool faved) {
 	if (faved) {
-		setIsFaved(controller, document);
+		setIsFaved(std::move(show), document);
 	} else {
 		setIsNotFaved(document);
 	}
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.h b/Telegram/SourceFiles/data/stickers/data_stickers.h
index da202f337..f469f173c 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.h
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.h
@@ -22,6 +22,10 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Data {
 
 class Session;
@@ -200,7 +204,7 @@ public:
 	void removeFromRecentSet(not_null<DocumentData*> document);
 
 	void addSavedGif(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document);
 	void checkSavedGif(not_null<HistoryItem*> item);
 
@@ -210,7 +214,7 @@ public:
 	void undoInstallLocally(uint64 setId);
 	bool isFaved(not_null<const DocumentData*> document);
 	void setFaved(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		bool faved);
 
@@ -260,21 +264,21 @@ private:
 	}
 	void checkFavedLimit(
 		StickersSet &set,
-		Window::SessionController *controller = nullptr);
+		std::shared_ptr<ChatHelpers::Show> show);
 	void setIsFaved(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		std::optional<std::vector<not_null<EmojiPtr>>> emojiList
 			= std::nullopt);
 	void setIsNotFaved(not_null<DocumentData*> document);
 	void pushFavedToFront(
 		StickersSet &set,
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		const std::vector<not_null<EmojiPtr>> &emojiList);
 	void moveFavedToFront(StickersSet &set, int index);
 	void requestSetToPushFaved(
-		Window::SessionController *controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document);
 	void setPackAndEmoji(
 		StickersSet &set,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a33208ce6..dc8f3243e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2286,7 +2286,7 @@ void Widget::showSearchFrom() {
 			}),
 			crl::guard(this, [=] { _filter->setFocus(); }));
 		if (box) {
-			Window::Show(controller()).showBox(std::move(box));
+			controller()->show(std::move(box));
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
index 91748f82d..66fc0f997 100644
--- a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
+++ b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
@@ -24,7 +24,7 @@ StickersPanelController::StickersPanelController(
 		controller,
 		object_ptr<ChatHelpers::TabbedSelector>(
 			nullptr,
-			controller,
+			controller->uiShow(),
 			Window::GifPauseReason::Layer,
 			ChatHelpers::TabbedSelector::Mode::MediaEditor))) {
 	_stickersPanel->setDesiredHeightValues(
diff --git a/Telegram/SourceFiles/editor/photo_editor.cpp b/Telegram/SourceFiles/editor/photo_editor.cpp
index ef91a1aa8..a11fe9760 100644
--- a/Telegram/SourceFiles/editor/photo_editor.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor.cpp
@@ -61,7 +61,7 @@ PhotoEditor::PhotoEditor(
 			controller->sessionController())
 		: nullptr,
 	std::make_unique<UndoController>(),
-	std::make_shared<Window::Show>(controller)))
+	controller->uiShow()))
 , _content(base::make_unique_q<PhotoEditorContent>(
 	this,
 	photo,
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 c2dd3e4ce..ec8f4c593 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1362,7 +1362,7 @@ void InnerWidget::copySelectedText() {
 }
 
 void InnerWidget::showStickerPackInfo(not_null<DocumentData*> document) {
-	StickerSetBox::Show(_controller, document);
+	StickerSetBox::Show(_controller->uiShow(), document);
 }
 
 void InnerWidget::cancelContextDownload(not_null<DocumentData*> document) {
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 b70d43d21..de4e92724 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -1117,7 +1117,7 @@ void GenerateItems(
 				if (const auto controller = my.sessionWindow.get()) {
 					controller->show(
 						Box<StickerSetBox>(
-							controller,
+							controller->uiShow(),
 							Data::FromInputSet(set),
 							Data::StickersType::Stickers),
 						Ui::LayerOption::CloseOther);
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index a3f2cc87d..262af2bec 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -54,8 +54,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "support/support_helper.h"
 #include "ui/image/image.h"
 #include "ui/text/text_options.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "payments/payments_checkout_process.h"
 #include "core/crash_reports.h"
 #include "core/application.h"
@@ -1176,7 +1176,7 @@ void History::applyServiceChanges(
 			}
 			if (paid) {
 				// Toast on a current active window.
-				Ui::ShowMultilineToast({
+				Ui::Toast::Show({
 					.text = tr::lng_payments_success(
 						tr::now,
 						lt_amount,
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index c1e0d510a..e719d9716 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -33,7 +33,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/menu/menu_multiline_action.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/image/image.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/message_sending_animation_controller.h"
 #include "ui/effects/reaction_fly_animation.h"
@@ -139,7 +138,7 @@ void FillSponsoredMessagesMenu(
 		not_null<Ui::PopupMenu*> menu) {
 	const auto &data = controller->session().data().sponsoredMessages();
 	const auto info = data.lookupDetails(itemId).info;
-	const auto toastParent = Window::Show(controller).toastParent();
+	const auto show = controller->uiShow();
 	if (!info.empty()) {
 		auto fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
 			const auto allText = ranges::accumulate(
@@ -150,10 +149,7 @@ void FillSponsoredMessagesMenu(
 				}).text;
 			const auto callback = [=] {
 				QGuiApplication::clipboard()->setText(allText);
-				Ui::ShowMultilineToast({
-					.parentOverride = toastParent,
-					.text = { tr::lng_text_copied(tr::now) },
-				});
+				show->showToast(tr::lng_text_copied(tr::now));
 			};
 			for (const auto &i : info) {
 				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
@@ -2478,7 +2474,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 							}, &st::menuIconStickers);
 							const auto isFaved = session->data().stickers().isFaved(document);
 							_menu->addAction(isFaved ? tr::lng_faved_stickers_remove(tr::now) : tr::lng_faved_stickers_add(tr::now), [=] {
-								Api::ToggleFavedSticker(controller, document, itemId);
+								Api::ToggleFavedSticker(controller->uiShow(), document, itemId);
 							}, isFaved ? &st::menuIconUnfave : &st::menuIconFave);
 						}
 						if (!hasCopyMediaRestriction(item)) {
@@ -2681,12 +2677,9 @@ bool HistoryInner::showCopyRestriction(HistoryItem *item) {
 	if (!hasCopyRestriction(item)) {
 		return false;
 	}
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(_controller).toastParent(),
-		.text = { _peer->isBroadcast()
-			? tr::lng_error_nocopy_channel(tr::now)
-			: tr::lng_error_nocopy_group(tr::now) },
-	});
+	_controller->showToast(_peer->isBroadcast()
+		? tr::lng_error_nocopy_channel(tr::now)
+		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
 
@@ -2694,12 +2687,9 @@ bool HistoryInner::showCopyMediaRestriction(not_null<HistoryItem*> item) {
 	if (!hasCopyMediaRestriction(item)) {
 		return false;
 	}
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(_controller).toastParent(),
-		.text = { _peer->isBroadcast()
-			? tr::lng_error_nocopy_channel(tr::now)
-			: tr::lng_error_nocopy_group(tr::now) },
-		});
+	_controller->showToast(_peer->isBroadcast()
+		? tr::lng_error_nocopy_channel(tr::now)
+		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
 
@@ -2762,7 +2752,7 @@ void HistoryInner::copyContextImage(
 }
 
 void HistoryInner::showStickerPackInfo(not_null<DocumentData*> document) {
-	StickerSetBox::Show(_controller, document);
+	StickerSetBox::Show(_controller->uiShow(), document);
 }
 
 void HistoryInner::cancelContextDownload(not_null<DocumentData*> document) {
@@ -2801,7 +2791,7 @@ void HistoryInner::saveContextGif(FullMsgId itemId) {
 			if (const auto media = item->media()) {
 				if (const auto document = media->document()) {
 					Api::ToggleSavedGif(
-						_controller,
+						_controller->uiShow(),
 						document,
 						item->fullId(),
 						true);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index a63048d06..8cdf3d2c4 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -4836,7 +4836,7 @@ void HistoryItem::setupTTLChange() {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto controller = my.sessionWindow.get()) {
 			const auto validator = TTLMenu::TTLValidator(
-				std::make_shared<Window::Show>(controller),
+				controller->uiShow(),
 				peer);
 			if (validator.can()) {
 				validator.showBox();
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 8b6573935..0cecbe2fe 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -135,9 +135,7 @@ ClickHandlerPtr HiddenSenderInfo::ForwardClickHandler() {
 		const auto my = context.other.value<ClickHandlerContext>();
 		const auto weak = my.sessionWindow;
 		if (const auto strong = weak.get()) {
-			Ui::Toast::Show(
-				Window::Show(strong).toastParent(),
-				tr::lng_forwarded_hidden(tr::now));
+			strong->showToast(tr::lng_forwarded_hidden(tr::now));
 		}
 	});
 	return hidden;
diff --git a/Telegram/SourceFiles/history/history_view_top_toast.cpp b/Telegram/SourceFiles/history/history_view_top_toast.cpp
index 2315e20c6..155f13996 100644
--- a/Telegram/SourceFiles/history/history_view_top_toast.cpp
+++ b/Telegram/SourceFiles/history/history_view_top_toast.cpp
@@ -41,7 +41,7 @@ void InfoTooltip::show(
 	_topToast = Ui::Toast::Show(parent, Ui::Toast::Config{
 		.text = text,
 		.st = &st::historyInfoToast,
-		.durationMs = CountToastDuration(text),
+		.duration = CountToastDuration(text),
 		.multiline = true,
 		.dark = true,
 		.slideSide = RectPart::Top,
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index cd07b0767..03eff7f27 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -225,7 +225,7 @@ HistoryWidget::HistoryWidget(
 	_scroll.data(),
 	controller->chatStyle(),
 	static_cast<HistoryView::CornerButtonsDelegate*>(this))
-, _fieldAutocomplete(this, controller)
+, _fieldAutocomplete(this, controller->uiShow())
 , _supportAutocomplete(session().supportMode()
 	? object_ptr<Support::Autocomplete>(this, &session())
 	: nullptr)
@@ -248,7 +248,7 @@ HistoryWidget::HistoryWidget(
 , _botCommandStart(this, st::historyBotCommandStart)
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
 	this,
-	controller,
+	controller->uiShow(),
 	_send,
 	st::historySendSize.height()))
 , _forwardPanel(std::make_unique<ForwardPanel>([=] { updateField(); }))
@@ -746,7 +746,7 @@ HistoryWidget::HistoryWidget(
 				const auto account = &_peer->account();
 				closeCurrent();
 				if (const auto primary = Core::App().windowFor(account)) {
-					controller->showToast({ unavailable });
+					controller->showToast(unavailable);
 				}
 				return;
 			}
@@ -879,7 +879,7 @@ HistoryWidget::HistoryWidget(
 		}, lifetime());
 	}
 
-	controller->materializeLocalDraftsRequests(
+	Core::App().materializeLocalDraftsRequests(
 	) | rpl::start_with_next([=] {
 		saveFieldToHistoryLocalDraft();
 	}, lifetime());
@@ -967,7 +967,7 @@ void HistoryWidget::initVoiceRecordBar() {
 			return std::nullopt;
 		}();
 		if (error) {
-			controller()->showToast({ *error });
+			controller()->showToast(*error);
 			return true;
 		} else if (showSlowmodeError()) {
 			return true;
@@ -1028,7 +1028,12 @@ void HistoryWidget::initVoiceRecordBar() {
 
 	_voiceRecordBar->recordingTipRequests(
 	) | rpl::start_with_next([=] {
-		controller()->showToast({ tr::lng_record_hold_tip(tr::now) });
+		controller()->showToast(tr::lng_record_hold_tip(tr::now));
+	}, lifetime());
+
+	_voiceRecordBar->recordingStateChanges(
+	) | rpl::start_with_next([=](bool active) {
+		controller()->widget()->setInnerFocus();
 	}, lifetime());
 
 	_voiceRecordBar->hideFast();
@@ -1581,7 +1586,7 @@ void HistoryWidget::toggleChooseChatTheme(
 	} else if (!show.value_or(true)) {
 		return;
 	} else if (_voiceRecordBar->isActive()) {
-		controller()->showToast({ tr::lng_chat_theme_cant_voice(tr::now) });
+		controller()->showToast(tr::lng_chat_theme_cant_voice(tr::now));
 		return;
 	}
 	_chooseTheme = std::make_unique<Ui::ChooseThemeController>(
@@ -3096,9 +3101,9 @@ void HistoryWidget::messagesFailed(const MTP::Error &error, int requestId) {
 		auto was = _peer;
 		closeCurrent();
 		if (const auto primary = Core::App().windowFor(&was->account())) {
-			controller()->showToast({ (was && was->isMegagroup())
+			controller()->showToast((was && was->isMegagroup())
 				? tr::lng_group_not_accessible(tr::now)
-				: tr::lng_channel_not_accessible(tr::now) });
+				: tr::lng_channel_not_accessible(tr::now));
 		}
 		return;
 	}
@@ -3740,9 +3745,8 @@ void HistoryWidget::saveEditMsg() {
 		return;
 	} else if (!left.text.isEmpty()) {
 		const auto remove = left.text.size();
-		controller()->showToast({
-			tr::lng_edit_limit_reached(tr::now, lt_count, remove)
-		});
+		controller()->showToast(
+			tr::lng_edit_limit_reached(tr::now, lt_count, remove));
 		return;
 	}
 
@@ -3775,14 +3779,14 @@ void HistoryWidget::saveEditMsg() {
 				_saveEditMsgRequestId = 0;
 			}
 			if (ranges::contains(Api::kDefaultEditMessagesErrors, error)) {
-				controller()->showToast({ tr::lng_edit_error(tr::now) });
+				controller()->showToast(tr::lng_edit_error(tr::now));
 			} else if (error == u"MESSAGE_NOT_MODIFIED"_q) {
 				cancelEdit();
 			} else if (error == u"MESSAGE_EMPTY"_q) {
 				_field->selectAll();
 				setInnerFocus();
 			} else {
-				controller()->showToast({ tr::lng_edit_error(tr::now) });
+				controller()->showToast(tr::lng_edit_error(tr::now));
 			}
 			update();
 		})();
@@ -3935,8 +3939,7 @@ void HistoryWidget::sendScheduled() {
 	}
 	const auto callback = [=](Api::SendOptions options) { send(options); };
 	controller()->show(
-		HistoryView::PrepareScheduleBox(_list, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+		HistoryView::PrepareScheduleBox(_list, sendMenuType(), callback));
 }
 
 void HistoryWidget::sendWhenOnline() {
@@ -4024,8 +4027,8 @@ void HistoryWidget::reportSelectedMessages() {
 				clearSelected();
 				controller()->clearChooseReportMessages();
 			}
-			const auto toastParent = Window::Show(controller()).toastParent();
-			Api::SendReport(toastParent, peer, reason, text, ids);
+			const auto show = controller()->uiShow();
+			Api::SendReport(show, peer, reason, text, ids);
 			box->closeBox();
 		});
 	}));
@@ -4223,14 +4226,14 @@ void HistoryWidget::finishAnimating() {
 void HistoryWidget::chooseAttach(
 		std::optional<bool> overrideSendImagesAsPhotos) {
 	if (_editMsgId) {
-		controller()->showToast({ tr::lng_edit_caption_attach(tr::now) });
+		controller()->showToast(tr::lng_edit_caption_attach(tr::now));
 		return;
 	}
 
 	if (!_peer || !_canSendMessages) {
 		return;
 	} else if (const auto error = Data::AnyFileRestrictionError(_peer)) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return;
 	} else if (showSlowmodeError()) {
 		return;
@@ -5154,7 +5157,7 @@ bool HistoryWidget::showSendingFilesError(
 		controller()->show(Box(FileSizeLimitBox, &session(), fileSize));
 		return true;
 	}
-	controller()->showToast({ text });
+	controller()->showToast(text);
 	return true;
 }
 
@@ -5178,7 +5181,7 @@ bool HistoryWidget::showSendMessageError(
 	if (error.isEmpty()) {
 		return false;
 	}
-	controller()->showToast({ error });
+	controller()->showToast(error);
 	return true;
 }
 
@@ -5212,7 +5215,7 @@ bool HistoryWidget::confirmSendingFiles(
 				crl::guard(_list, [=] { cancelEdit(); }));
 			return true;
 		}
-		controller()->showToast({ tr::lng_edit_caption_attach(tr::now) });
+		controller()->showToast(tr::lng_edit_caption_attach(tr::now));
 		return false;
 	} else if (showSendingFilesError(list)) {
 		return false;
@@ -5582,7 +5585,7 @@ int HistoryWidget::countInitialScrollTop() {
 		const auto itemTop = _list->itemTop(item);
 		if (itemTop < 0) {
 			setMsgId(0);
-			controller()->showToast({ tr::lng_message_not_found(tr::now) });
+			controller()->showToast(tr::lng_message_not_found(tr::now));
 			return countInitialScrollTop();
 		} else {
 			const auto view = item->mainView();
@@ -6136,7 +6139,7 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 			crl::guard(_list, [=] { cancelEdit(); }));
 	} else if (_inReplyEditForward) {
 		if (readyToForward()) {
-			_forwardPanel->editOptions(controller());
+			_forwardPanel->editOptions(controller()->uiShow());
 		} else {
 			controller()->showPeerHistory(
 				_peer,
@@ -6293,7 +6296,7 @@ bool HistoryWidget::showSlowmodeError() {
 	if (text.isEmpty()) {
 		return false;
 	}
-	controller()->showToast({ text });
+	controller()->showToast(text);
 	return true;
 }
 
@@ -6314,7 +6317,7 @@ void HistoryWidget::sendInlineResult(InlineBots::ResultSelected result) {
 
 	auto errorText = result.result->getErrorOnSend(_history);
 	if (!errorText.isEmpty()) {
-		controller()->showToast({ errorText });
+		controller()->showToast(errorText);
 		return;
 	}
 
@@ -6600,7 +6603,7 @@ void HistoryWidget::checkMessagesTTL() {
 	} else if (!_ttlInfo || _ttlInfo->peer() != _peer) {
 		_ttlInfo = std::make_unique<HistoryView::Controls::TTLButton>(
 			this,
-			std::make_shared<Window::Show>(controller()),
+			controller()->uiShow(),
 			_peer);
 		orderWidgets();
 		updateControlsGeometry();
@@ -6821,7 +6824,7 @@ bool HistoryWidget::sendExistingDocument(
 		? Data::RestrictionError(_peer, ChatRestriction::SendStickers)
 		: std::nullopt;
 	if (error) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return false;
 	} else if (!_peer
 		|| !_canSendMessages
@@ -6856,7 +6859,7 @@ bool HistoryWidget::sendExistingPhoto(
 		? Data::RestrictionError(_peer, ChatRestriction::SendPhotos)
 		: std::nullopt;
 	if (error) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return false;
 	} else if (!_peer || !_canSendMessages) {
 		return false;
@@ -6972,7 +6975,7 @@ void HistoryWidget::processReply() {
 		return;
 	} else if (_processingReplyItem->history() == _migrated) {
 		if (_processingReplyItem->isService()) {
-			controller()->showToast({ tr::lng_reply_cant(tr::now) });
+			controller()->showToast(tr::lng_reply_cant(tr::now));
 		} else {
 			const auto itemId = _processingReplyItem->fullId();
 			controller()->show(
@@ -7060,7 +7063,7 @@ void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
 	if (_chooseTheme) {
 		toggleChooseChatTheme(_peer);
 	} else if (_voiceRecordBar->isActive()) {
-		controller()->showToast({ tr::lng_edit_caption_voice(tr::now) });
+		controller()->showToast(tr::lng_edit_caption_voice(tr::now));
 		return;
 	} else if (_composeSearch) {
 		_composeSearch->hideAnimated();
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 1da520824..4146e8eb8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qt_signal_producer.h"
 #include "base/unixtime.h"
 #include "boxes/edit_caption_box.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/message_field.h"
 #include "menu/menu_send.h"
@@ -340,7 +341,7 @@ class FieldHeader final : public Ui::RpWidget {
 public:
 	FieldHeader(
 		QWidget *parent,
-		not_null<Window::SessionController*> controller);
+		std::shared_ptr<ChatHelpers::Show> show);
 
 	void setHistory(const SetHistoryArgs &args);
 	void init();
@@ -402,7 +403,7 @@ private:
 		bool cancelled = false;
 	};
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
 	History *_history = nullptr;
 	rpl::variable<QString> _title;
 	rpl::variable<QString> _description;
@@ -436,12 +437,12 @@ private:
 
 FieldHeader::FieldHeader(
 	QWidget *parent,
-	not_null<Window::SessionController*> controller)
+	std::shared_ptr<ChatHelpers::Show> show)
 : RpWidget(parent)
-, _controller(controller)
+, _show(std::move(show))
 , _forwardPanel(
 	std::make_unique<ForwardPanel>([=] { customEmojiRepaint(); }))
-, _data(&controller->session().data())
+, _data(&_show->session().data())
 , _cancel(Ui::CreateChild<Ui::IconButton>(this, st::historyReplyCancel)) {
 	resize(QSize(parent->width(), st::historyReplyHeight));
 	init();
@@ -466,8 +467,7 @@ void FieldHeader::init() {
 	paintRequest(
 	) | rpl::start_with_next([=] {
 		Painter p(this);
-		p.setInactive(
-			_controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any));
+		p.setInactive(_show->paused(Window::GifPauseReason::Any));
 		p.fillRect(rect(), st::historyComposeAreaBg);
 
 		const auto position = st::historyReplyIconPosition;
@@ -581,7 +581,7 @@ void FieldHeader::init() {
 				update();
 			} else if (isLeftButton && inPreviewRect) {
 				if (!isEditingMessage() && readyToForward()) {
-					_forwardPanel->editOptions(_controller);
+					_forwardPanel->editOptions(_show);
 				} else {
 					auto id = isEditingMessage()
 						? _editMsgId.current()
@@ -915,13 +915,37 @@ MessageToEdit FieldHeader::queryToEdit() {
 
 ComposeControls::ComposeControls(
 	not_null<Ui::RpWidget*> parent,
-	not_null<Window::SessionController*> window,
+	not_null<Window::SessionController*> controller,
 	Fn<void(not_null<DocumentData*>)> unavailableEmojiPasted,
 	Mode mode,
 	SendMenu::Type sendMenuType)
+: ComposeControls(parent, ComposeControlsDescriptor{
+	.show = controller->uiShow(),
+	.unavailableEmojiPasted = std::move(unavailableEmojiPasted),
+	.mode = mode,
+	.sendMenuType = sendMenuType,
+	.regularWindow = controller,
+	.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
+}) {
+}
+
+ComposeControls::ComposeControls(
+	not_null<Ui::RpWidget*> parent,
+	ComposeControlsDescriptor descriptor)
 : _parent(parent)
-, _window(window)
-, _mode(mode)
+, _show(std::move(descriptor.show))
+, _session(&_show->session())
+, _regularWindow(descriptor.regularWindow)
+, _ownedSelector(_regularWindow
+	? nullptr
+	: std::make_unique<ChatHelpers::TabbedSelector>(
+		_parent,
+		_show,
+		Window::GifPauseReason::TabbedPanel))
+, _selector(_regularWindow
+	? _regularWindow->tabbedSelector()
+	: not_null(_ownedSelector.get()))
+, _mode(descriptor.mode)
 , _wrap(std::make_unique<Ui::RpWidget>(parent))
 , _writeRestricted(std::make_unique<Ui::RpWidget>(parent))
 , _send(std::make_shared<Ui::SendButton>(_wrap.get()))
@@ -940,20 +964,23 @@ ComposeControls::ComposeControls(
 , _botCommandStart(Ui::CreateChild<Ui::IconButton>(
 	_wrap.get(),
 	st::historyBotCommandStart))
-, _autocomplete(std::make_unique<FieldAutocomplete>(
-	parent,
-	window))
-, _header(std::make_unique<FieldHeader>(_wrap.get(), _window))
+, _autocomplete(std::make_unique<FieldAutocomplete>(parent, _show))
+, _header(std::make_unique<FieldHeader>(_wrap.get(), _show))
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
 	_wrap.get(),
 	parent,
-	window,
+	_show,
 	_send,
 	st::historySendSize.height()))
-, _sendMenuType(sendMenuType)
-, _unavailableEmojiPasted(unavailableEmojiPasted)
+, _sendMenuType(descriptor.sendMenuType)
+, _unavailableEmojiPasted(std::move(descriptor.unavailableEmojiPasted))
 , _saveDraftTimer([=] { saveDraft(); })
 , _saveCloudDraftTimer([=] { saveCloudDraft(); }) {
+	if (descriptor.stickerOrEmojiChosen) {
+		std::move(
+			descriptor.stickerOrEmojiChosen
+		) | rpl::start_to_stream(_stickerOrEmojiChosen, _wrap->lifetime());
+	}
 	init();
 }
 
@@ -965,7 +992,7 @@ ComposeControls::~ComposeControls() {
 }
 
 Main::Session &ComposeControls::session() const {
-	return _window->session();
+	return _show->session();
 }
 
 void ComposeControls::setHistory(SetHistoryArgs &&args) {
@@ -989,8 +1016,7 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	_history = history;
 	_header->setHistory(args);
 	registerDraftSource();
-	_window->tabbedSelector()->setCurrentPeer(
-		history ? history->peer.get() : nullptr);
+	_selector->setCurrentPeer(history ? history->peer.get() : nullptr);
 	initWebpageProcess();
 	initForwardProcess();
 	updateBotCommandShown();
@@ -1095,6 +1121,10 @@ auto ComposeControls::replyNextRequests() const
 	return _replyNextRequests.events();
 }
 
+rpl::producer<> ComposeControls::focusRequests() const {
+	return _focusRequests.events();
+}
+
 auto ComposeControls::sendContentRequests(SendRequestType requestType) const {
 	auto filter = rpl::filter([=] {
 		const auto type = (_mode == Mode::Normal)
@@ -1146,7 +1176,8 @@ rpl::producer<std::optional<bool>> ComposeControls::attachRequests() const {
 		_attachRequests.events()
 	) | rpl::filter([=] {
 		if (isEditingMessage()) {
-			_window->show(Ui::MakeInformBox(tr::lng_edit_caption_attach()));
+			_show->showBox(
+				Ui::MakeInformBox(tr::lng_edit_caption_attach()));
 			return false;
 		}
 		return true;
@@ -1158,17 +1189,17 @@ void ComposeControls::setMimeDataHook(MimeDataHook hook) {
 }
 
 bool ComposeControls::confirmMediaEdit(Ui::PreparedList &list) {
-	if (!isEditingMessage()) {
+	if (!isEditingMessage() || !_regularWindow) {
 		return false;
 	} else if (_canReplaceMedia) {
 		EditCaptionBox::StartMediaReplace(
-			_window,
+			_regularWindow,
 			_editingId,
 			std::move(list),
 			_field->getTextWithTags(),
 			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
 	} else {
-		_window->showToast({ tr::lng_edit_caption_attach(tr::now) });
+		_show->showToast(tr::lng_edit_caption_attach(tr::now));
 	}
 	return true;
 }
@@ -1459,7 +1490,7 @@ void ComposeControls::init() {
 		cancelEditMessage();
 	}, _wrap->lifetime());
 
-	_window->materializeLocalDraftsRequests(
+	Core::App().materializeLocalDraftsRequests(
 	) | rpl::start_with_next([=] {
 		saveFieldToHistoryLocalDraft();
 	}, _wrap->lifetime());
@@ -1573,7 +1604,7 @@ void ComposeControls::initField() {
 	Ui::Connect(_field, &Ui::InputField::resized, [=] { updateHeight(); });
 	//Ui::Connect(_field, &Ui::InputField::focused, [=] { fieldFocused(); });
 	Ui::Connect(_field, &Ui::InputField::changed, [=] { fieldChanged(); });
-	InitMessageField(_window, _field, [=](not_null<DocumentData*> emoji) {
+	InitMessageField(_show, _field, [=](not_null<DocumentData*> emoji) {
 		if (_history && Data::AllowEmojiWithoutPremium(_history->peer)) {
 			return true;
 		}
@@ -1589,7 +1620,7 @@ void ComposeControls::initField() {
 	const auto suggestions = Ui::Emoji::SuggestionsController::Init(
 		_parent,
 		_field,
-		&_window->session(),
+		_session,
 		{ .suggestCustomEmoji = true, .allowCustomWithoutPremium = allow });
 	_raiseEmojiSuggestions = [=] { suggestions->raise(); };
 
@@ -1678,7 +1709,7 @@ void ComposeControls::initAutocomplete() {
 
 	_field->rawTextEdit()->installEventFilter(_autocomplete.get());
 
-	_window->session().data().botCommandsChanges(
+	_session->data().botCommandsChanges(
 	) | rpl::filter([=](not_null<PeerData*> peer) {
 		return _history && (_history->peer == peer);
 	}) | rpl::start_with_next([=] {
@@ -1687,7 +1718,7 @@ void ComposeControls::initAutocomplete() {
 		}
 	}, _autocomplete->lifetime());
 
-	_window->session().data().stickers().updated(
+	_session->data().stickers().updated(
 		Data::StickersType::Stickers
 	) | rpl::start_with_next([=] {
 		updateStickersByEmoji();
@@ -1989,7 +2020,7 @@ rpl::producer<SendActionUpdate> ComposeControls::sendActionUpdates() const {
 }
 
 void ComposeControls::initTabbedSelector() {
-	if (_window->hasTabbedSelectorOwnership()) {
+	if (!_regularWindow || _regularWindow->hasTabbedSelectorOwnership()) {
 		createTabbedPanel();
 	} else {
 		setTabbedPanel(nullptr);
@@ -2003,25 +2034,24 @@ void ComposeControls::initTabbedSelector() {
 		}
 	});
 
-	const auto selector = _window->tabbedSelector();
 	const auto wrap = _wrap.get();
 
-	base::install_event_filter(wrap, selector, [=](not_null<QEvent*> e) {
+	base::install_event_filter(wrap, _selector, [=](not_null<QEvent*> e) {
 		if (_tabbedPanel && e->type() == QEvent::ParentChange) {
 			setTabbedPanel(nullptr);
 		}
 		return base::EventFilterResult::Continue;
 	});
 
-	selector->emojiChosen(
+	_selector->emojiChosen(
 	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, wrap->lifetime());
 
 	rpl::merge(
-		selector->fileChosen(),
-		selector->customEmojiChosen(),
-		_window->stickerOrEmojiChosen()
+		_selector->fileChosen(),
+		_selector->customEmojiChosen(),
+		_stickerOrEmojiChosen.events()
 	) | rpl::start_with_next([=](ChatHelpers::FileChosen &&data) {
 		if (const auto info = data.document->sticker()
 			; info && info->setType == Data::StickersType::Emoji) {
@@ -2040,18 +2070,18 @@ void ComposeControls::initTabbedSelector() {
 		}
 	}, wrap->lifetime());
 
-	selector->photoChosen(
+	_selector->photoChosen(
 	) | rpl::start_to_stream(_photoChosen, wrap->lifetime());
 
-	selector->inlineResultChosen(
+	_selector->inlineResultChosen(
 	) | rpl::start_to_stream(_inlineResultChosen, wrap->lifetime());
 
-	selector->contextMenuRequested(
+	_selector->contextMenuRequested(
 	) | rpl::start_with_next([=] {
-		selector->showMenuWithType(sendMenuType());
+		_selector->showMenuWithType(sendMenuType());
 	}, wrap->lifetime());
 
-	selector->choosingStickerUpdated(
+	_selector->choosingStickerUpdated(
 	) | rpl::start_with_next([=](ChatHelpers::TabbedSelector::Action action) {
 		_sendActionUpdates.fire({
 			.type = Api::SendProgressType::ChooseSticker,
@@ -2166,10 +2196,23 @@ void ComposeControls::initWriteRestriction() {
 	}, _wrap->lifetime());
 }
 
+void ComposeControls::changeFocusedControl() {
+	_focusRequests.fire({});
+	if (_regularWindow) {
+		_regularWindow->widget()->setInnerFocus();
+	}
+}
+
 void ComposeControls::initVoiceRecordBar() {
 	_voiceRecordBar->recordingStateChanges(
 	) | rpl::start_with_next([=](bool active) {
+		if (active) {
+			changeFocusedControl();
+		}
 		_field->setVisible(!active);
+		if (!active) {
+			changeFocusedControl();
+		}
 	}, _wrap->lifetime());
 
 	_voiceRecordBar->setStartRecordingFilter([=] {
@@ -2185,7 +2228,7 @@ void ComposeControls::initVoiceRecordBar() {
 			return std::nullopt;
 		}();
 		if (error) {
-			_window->show(Ui::MakeInformBox(*error));
+			_show->showBox(Ui::MakeInformBox(*error));
 			return true;
 		} else if (_showSlowmodeError && _showSlowmodeError()) {
 			return true;
@@ -2396,7 +2439,7 @@ void ComposeControls::updateMessagesTTLShown() {
 	} else if (shown && !_ttlInfo) {
 		_ttlInfo = std::make_unique<Controls::TTLButton>(
 			_wrap.get(),
-			std::make_shared<Window::Show>(_window),
+			_show,
 			peer);
 		orderControls();
 		updateControlsVisibility();
@@ -2408,7 +2451,9 @@ bool ComposeControls::updateSendAsButton() {
 	Expects(_history != nullptr);
 
 	const auto peer = _history->peer;
-	if (isEditingMessage() || !session().sendAsPeers().shouldChoose(peer)) {
+	if (!_regularWindow
+		|| isEditingMessage()
+		|| !session().sendAsPeers().shouldChoose(peer)) {
 		if (!_sendAs) {
 			return false;
 		}
@@ -2423,18 +2468,18 @@ bool ComposeControls::updateSendAsButton() {
 	Ui::SetupSendAsButton(
 		_sendAs.get(),
 		rpl::single(peer.get()),
-		_window);
+		_regularWindow);
 	return true;
 }
 
 void ComposeControls::updateAttachBotsMenu() {
 	_attachBotsMenu = nullptr;
-	if (!_history || !_sendActionFactory) {
+	if (!_history || !_sendActionFactory || !_regularWindow) {
 		return;
 	}
 	_attachBotsMenu = InlineBots::MakeAttachBotsMenu(
 		_parent,
-		_window,
+		_regularWindow,
 		_history->peer,
 		_sendActionFactory,
 		[=](bool compress) { _attachRequests.fire_copy(compress); });
@@ -2467,7 +2512,7 @@ void ComposeControls::escape() {
 bool ComposeControls::pushTabbedSelectorToThirdSection(
 		not_null<Data::Thread*> thread,
 		const Window::SectionShow &params) {
-	if (!_tabbedPanel) {
+	if (!_tabbedPanel || !_regularWindow) {
 		return true;
 	//} else if (!_canSendMessages) {
 	//	Core::App().settings().setTabbedReplacedWithInfo(true);
@@ -2479,8 +2524,8 @@ bool ComposeControls::pushTabbedSelectorToThirdSection(
 		&st::historyAttachEmojiActive,
 		&st::historyRecordVoiceFgActive,
 		&st::historyRecordVoiceRippleBgActive);
-	_window->resizeForThirdSection();
-	_window->showSection(
+	_regularWindow->resizeForThirdSection();
+	_regularWindow->showSection(
 		std::make_shared<ChatHelpers::TabbedMemento>(),
 		params.withThirdColumn());
 	return true;
@@ -2493,10 +2538,13 @@ bool ComposeControls::returnTabbedSelector() {
 }
 
 void ComposeControls::createTabbedPanel() {
+	auto descriptor = ChatHelpers::TabbedPanelDescriptor{
+		.regularWindow = _regularWindow,
+		.nonOwnedSelector = _selector,
+	};
 	setTabbedPanel(std::make_unique<ChatHelpers::TabbedPanel>(
 		_parent,
-		_window,
-		_window->tabbedSelector()));
+		std::move(descriptor)));
 }
 
 void ComposeControls::setTabbedPanel(
@@ -2514,12 +2562,12 @@ void ComposeControls::setTabbedPanel(
 }
 
 void ComposeControls::toggleTabbedSelectorMode() {
-	if (!_history) {
+	if (!_history || !_regularWindow) {
 		return;
 	}
 	if (_tabbedPanel) {
-		if (_window->canShowThirdSection()
-				&& !_window->adaptive().isOneColumn()) {
+		if (_regularWindow->canShowThirdSection()
+				&& !_regularWindow->adaptive().isOneColumn()) {
 			Core::App().settings().setTabbedSelectorSectionEnabled(true);
 			Core::App().saveSettingsDelayed();
 			const auto topic = _history->peer->forumTopicFor(
@@ -2531,7 +2579,7 @@ void ComposeControls::toggleTabbedSelectorMode() {
 			_tabbedPanel->toggleAnimated();
 		}
 	} else {
-		_window->closeThirdSection();
+		_regularWindow->closeThirdSection();
 	}
 }
 
@@ -2555,7 +2603,7 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 	Expects(draftKeyCurrent() != Data::DraftKey::None());
 
 	if (_voiceRecordBar->isActive()) {
-		_window->show(Ui::MakeInformBox(tr::lng_edit_caption_voice()));
+		_show->showBox(Ui::MakeInformBox(tr::lng_edit_caption_voice()));
 		return;
 	}
 
@@ -2609,7 +2657,7 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 }
 
 bool ComposeControls::updateReplaceMediaButton() {
-	if (!_canReplaceMedia) {
+	if (!_canReplaceMedia || !_regularWindow) {
 		const auto result = (_replaceMedia != nullptr);
 		_replaceMedia = nullptr;
 		return result;
@@ -2621,7 +2669,7 @@ bool ComposeControls::updateReplaceMediaButton() {
 		st::historyReplaceMedia);
 	_replaceMedia->setClickedCallback([=] {
 		EditCaptionBox::StartMediaReplace(
-			_window,
+			_regularWindow,
 			_editingId,
 			_field->getTextWithTags(),
 			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
@@ -2852,7 +2900,7 @@ bool ComposeControls::hasSilentBroadcastToggle() const {
 }
 
 void ComposeControls::updateInlineBotQuery() {
-	if (!_history) {
+	if (!_history || !_regularWindow) {
 		return;
 	}
 	const auto query = ParseInlineBotQuery(&session(), _field);
@@ -2916,6 +2964,8 @@ void ComposeControls::updateInlineBotQuery() {
 void ComposeControls::applyInlineBotQuery(
 		UserData *bot,
 		const QString &query) {
+	Expects(_regularWindow != nullptr);
+
 	if (_history && bot) {
 		if (_inlineBot != bot) {
 			_inlineBot = bot;
@@ -2925,15 +2975,15 @@ void ComposeControls::applyInlineBotQuery(
 		if (!_inlineResults) {
 			_inlineResults = std::make_unique<InlineBots::Layout::Widget>(
 				_parent,
-				_window);
+				_regularWindow);
 			_inlineResults->setResultSelectedCallback([=](
 					InlineBots::ResultSelected result) {
 				if (result.open) {
 					const auto request = result.result->openRequest();
 					if (const auto photo = request.photo()) {
-						_window->openPhoto(photo, {}, {});
+						_regularWindow->openPhoto(photo, {}, {});
 					} else if (const auto document = request.document()) {
-						_window->openDocument(document, {}, {});
+						_regularWindow->openDocument(document, {}, {});
 					}
 				} else {
 					_inlineResultChosen.fire_copy(result);
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 20be24131..c09b938d6 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 
 class History;
+class DocumentData;
 class FieldAutocomplete;
 
 namespace SendMenu {
@@ -29,6 +30,7 @@ class TabbedPanel;
 class TabbedSelector;
 struct FileChosen;
 struct PhotoChosen;
+class Show;
 } // namespace ChatHelpers
 
 namespace Data {
@@ -63,8 +65,8 @@ class Session;
 } // namespace Main
 
 namespace Window {
-class SessionController;
 struct SectionShow;
+class SessionController;
 } // namespace Window
 
 namespace Api {
@@ -81,6 +83,20 @@ class TTLButton;
 class FieldHeader;
 class WebpageProcessor;
 
+enum class ComposeControlsMode {
+	Normal,
+	Scheduled,
+};
+
+struct ComposeControlsDescriptor {
+	std::shared_ptr<ChatHelpers::Show> show;
+	Fn<void(not_null<DocumentData*>)> unavailableEmojiPasted;
+	ComposeControlsMode mode = ComposeControlsMode::Normal;
+	SendMenu::Type sendMenuType = {};
+	Window::SessionController *regularWindow = nullptr;
+	rpl::producer<ChatHelpers::FileChosen> stickerOrEmojiChosen;
+};
+
 class ComposeControls final {
 public:
 	using FileChosen = ChatHelpers::FileChosen;
@@ -93,18 +109,17 @@ public:
 	using SetHistoryArgs = Controls::SetHistoryArgs;
 	using ReplyNextRequest = Controls::ReplyNextRequest;
 	using FieldHistoryAction = Ui::InputField::HistoryAction;
-
-	enum class Mode {
-		Normal,
-		Scheduled,
-	};
+	using Mode = ComposeControlsMode;
 
 	ComposeControls(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> window,
+		not_null<Window::SessionController*> controller,
 		Fn<void(not_null<DocumentData*>)> unavailableEmojiPasted,
 		Mode mode,
 		SendMenu::Type sendMenuType);
+	ComposeControls(
+		not_null<Ui::RpWidget*> parent,
+		ComposeControlsDescriptor descriptor);
 	~ComposeControls();
 
 	[[nodiscard]] Main::Session &session() const;
@@ -139,6 +154,7 @@ public:
 	-> rpl::producer<not_null<QKeyEvent*>>;
 	[[nodiscard]] auto replyNextRequests() const
 	-> rpl::producer<ReplyNextRequest>;
+	[[nodiscard]] rpl::producer<> focusRequests() const;
 
 	using MimeDataHook = Fn<bool(
 		not_null<const QMimeData*> data,
@@ -292,9 +308,17 @@ private:
 
 	void unregisterDraftSources();
 	void registerDraftSource();
+	void changeFocusedControl();
 
 	const not_null<QWidget*> _parent;
-	const not_null<Window::SessionController*> _window;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Main::Session*> _session;
+
+	Window::SessionController * const _regularWindow = nullptr;
+	const std::unique_ptr<ChatHelpers::TabbedSelector> _ownedSelector;
+	const not_null<ChatHelpers::TabbedSelector*> _selector;
+	rpl::event_stream<ChatHelpers::FileChosen> _stickerOrEmojiChosen;
+
 	History *_history = nullptr;
 	Fn<bool()> _showSlowmodeError;
 	Fn<Api::SendAction()> _sendActionFactory;
@@ -340,6 +364,7 @@ private:
 	rpl::event_stream<not_null<QKeyEvent*>> _editLastMessageRequests;
 	rpl::event_stream<std::optional<bool>> _attachRequests;
 	rpl::event_stream<ReplyNextRequest> _replyNextRequests;
+	rpl::event_stream<> _focusRequests;
 
 	TextUpdateEvents _textUpdateEvents = TextUpdateEvents()
 		| TextUpdateEvent::SaveDraft
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
index b7024d55d..45ba94da2 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
@@ -818,12 +818,12 @@ ComposeSearch::Inner::Inner(
 		auto box = Dialogs::SearchFromBox(
 			peer,
 			crl::guard(_bottomBar.get(), [=](not_null<PeerData*> from) {
-				Window::Show(_window).hideLayer();
+				_window->hideLayer();
 				_topBar->setFrom(from);
 			}),
 			crl::guard(_bottomBar.get(), [=] { setInnerFocus(); }));
 
-		Window::Show(_window).showBox(std::move(box));
+		_window->show(std::move(box));
 	}, _bottomBar->lifetime());
 
 	_bottomBar->showListRequests(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
index efb85e7bc..30e3b26e0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
@@ -218,8 +218,7 @@ bool ForwardPanel::empty() const {
 	return _data.items.empty();
 }
 
-void ForwardPanel::editOptions(
-		not_null<Window::SessionController*> controller) {
+void ForwardPanel::editOptions(std::shared_ptr<ChatHelpers::Show> show) {
 	using Options = Data::ForwardOptions;
 	const auto now = _data.options;
 	const auto count = _data.items.size();
@@ -258,7 +257,7 @@ void ForwardPanel::editOptions(
 		}
 		auto data = base::take(_data);
 		_to->owningHistory()->setForwardDraft(_to->topicRootId(), {});
-		Window::ShowForwardMessagesBox(controller, {
+		Window::ShowForwardMessagesBox(show, {
 			.ids = _to->owner().itemsToIds(data.items),
 			.options = data.options,
 		});
@@ -287,7 +286,7 @@ void ForwardPanel::editOptions(
 			_repaint();
 		}
 	});
-	controller->show(Box(
+	show->showBox(Box(
 		Ui::ForwardOptionsBox,
 		count,
 		Ui::ForwardOptions{
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
index af052ec8a..b178e27d0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
@@ -26,6 +26,10 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace HistoryView::Controls {
 
 class ForwardPanel final : public base::has_weak_ptr {
@@ -42,7 +46,7 @@ public:
 
 	[[nodiscard]] rpl::producer<> itemsUpdated() const;
 
-	void editOptions(not_null<Window::SessionController*> controller);
+	void editOptions(std::shared_ptr<ChatHelpers::Show> show);
 
 	[[nodiscard]] const HistoryItemsList &items() const;
 	[[nodiscard]] bool empty() const;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 3b65bc18a..b80310d3b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/random.h"
 #include "base/unixtime.h"
 #include "ui/boxes/confirm_box.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "core/application.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
@@ -34,7 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/format_values.h"
 #include "ui/painter.h"
-#include "window/window_session_controller.h"
 
 namespace HistoryView::Controls {
 
@@ -206,7 +206,7 @@ class ListenWrap final {
 public:
 	ListenWrap(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		not_null<Main::Session*> session,
 		::Media::Capture::Result &&data,
 		const style::font &font);
 
@@ -231,7 +231,7 @@ private:
 
 	not_null<Ui::RpWidget*> _parent;
 
-	const not_null<Window::SessionController*> _controller;
+	const not_null<Main::Session*> _session;
 	const not_null<DocumentData*> _document;
 	const std::unique_ptr<VoiceData> _voiceData;
 	const std::shared_ptr<Data::DocumentMedia> _mediaView;
@@ -264,12 +264,12 @@ private:
 
 ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
-	not_null<Window::SessionController*> controller,
+	not_null<Main::Session*> session,
 	::Media::Capture::Result &&data,
 	const style::font &font)
 : _parent(parent)
-, _controller(controller)
-, _document(DummyDocument(&_controller->session().data()))
+, _session(session)
+, _document(DummyDocument(&session->data()))
 , _voiceData(ProcessCaptureResult(data))
 , _mediaView(_document->createMediaView())
 , _data(std::make_unique<::Media::Capture::Result>(std::move(data)))
@@ -456,13 +456,6 @@ void ListenWrap::initPlayButton() {
 	) | rpl::start_with_next([=] {
 		*showPause = false;
 	}, _lifetime);
-
-	const auto weak = Ui::MakeWeak(_controller->content().get());
-	_lifetime.add([=] {
-		if (weak && isInPlayer()) {
-			weak->stopAndClosePlayer();
-		}
-	});
 }
 
 void ListenWrap::initPlayProgress() {
@@ -991,17 +984,15 @@ void CancelButton::requestPaintProgress(float64 progress) {
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Ui::RpWidget*> sectionWidget,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	std::shared_ptr<Ui::SendButton> send,
 	int recorderHeight)
 : RpWidget(parent)
 , _sectionWidget(sectionWidget)
-, _controller(controller)
+, _show(std::move(show))
 , _send(send)
 , _lock(std::make_unique<RecordLock>(sectionWidget))
-, _level(std::make_unique<VoiceRecordButton>(
-	sectionWidget,
-	_controller->widget()->leaveEvents()))
+, _level(std::make_unique<VoiceRecordButton>(sectionWidget))
 , _cancel(std::make_unique<CancelButton>(this, recorderHeight))
 , _startTimer([=] { startRecording(); })
 , _message(
@@ -1016,10 +1007,10 @@ VoiceRecordBar::VoiceRecordBar(
 
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	std::shared_ptr<Ui::SendButton> send,
 	int recorderHeight)
-: VoiceRecordBar(parent, parent, controller, send, recorderHeight) {
+: VoiceRecordBar(parent, parent, std::move(show), send, recorderHeight) {
 }
 
 VoiceRecordBar::~VoiceRecordBar() {
@@ -1325,7 +1316,6 @@ void VoiceRecordBar::startRecording() {
 		startRedCircleAnimation();
 
 		_recording = true;
-		_controller->widget()->setInnerFocus();
 		instance()->start();
 		instance()->updated(
 		) | rpl::start_with_next_error([=](const Update &update) {
@@ -1410,7 +1400,6 @@ void VoiceRecordBar::finish() {
 	_listen = nullptr;
 
 	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
-	_controller->widget()->setInnerFocus();
 }
 
 void VoiceRecordBar::hideFast() {
@@ -1434,14 +1423,15 @@ void VoiceRecordBar::stopRecording(StopType type) {
 			return;
 		}
 
-		Window::ActivateWindow(_controller);
+		window()->raise();
+		window()->activateWindow();
 		const auto duration = Duration(data.samples);
 		if (type == StopType::Send) {
 			_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
 		} else if (type == StopType::Listen) {
 			_listen = std::make_unique<ListenWrap>(
 				this,
-				_controller,
+				&_show->session(),
 				std::move(data),
 				_cancelFont);
 			_listenChanges.fire({});
@@ -1690,7 +1680,7 @@ void VoiceRecordBar::showDiscardBox(
 			callback();
 		}
 	};
-	_controller->show(Ui::MakeConfirmBox({
+	_show->showBox(Ui::MakeConfirmBox({
 		.text = (isListenState()
 			? tr::lng_record_listen_cancel_sure
 			: tr::lng_record_lock_cancel_sure)(),
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 6dcb19da9..ea48e887a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -23,6 +23,10 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace HistoryView::Controls {
 
 class VoiceRecordButton;
@@ -38,12 +42,12 @@ public:
 	VoiceRecordBar(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Ui::RpWidget*> sectionWidget,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		std::shared_ptr<Ui::SendButton> send,
 		int recorderHeight);
 	VoiceRecordBar(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		std::shared_ptr<Ui::SendButton> send,
 		int recorderHeight);
 	~VoiceRecordBar();
@@ -122,7 +126,7 @@ private:
 	void computeAndSetLockProgress(QPoint globalPos);
 
 	const not_null<Ui::RpWidget*> _sectionWidget;
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
 	const std::unique_ptr<VoiceRecordButton> _level;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 15dd53517..f05b3ed44 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -47,9 +47,7 @@ auto Blobs() {
 
 } // namespace
 
-VoiceRecordButton::VoiceRecordButton(
-	not_null<Ui::RpWidget*> parent,
-	rpl::producer<> leaveWindowEventProducer)
+VoiceRecordButton::VoiceRecordButton(not_null<Ui::RpWidget*> parent)
 : AbstractButton(parent)
 , _blobs(std::make_unique<Ui::Paint::Blobs>(
 	Blobs(),
@@ -57,11 +55,6 @@ VoiceRecordButton::VoiceRecordButton(
 	kMaxLevel))
 , _center(_blobs->maxRadius()) {
 	resize(_center * 2, _center * 2);
-	std::move(
-		leaveWindowEventProducer
-	) | rpl::start_with_next([=] {
-		_inCircle = false;
-	}, lifetime());
 	init();
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index 97c3d5072..750c8abfb 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -21,9 +21,7 @@ namespace HistoryView::Controls {
 
 class VoiceRecordButton final : public Ui::AbstractButton {
 public:
-	VoiceRecordButton(
-		not_null<Ui::RpWidget*> parent,
-		rpl::producer<> leaveWindowEventProducer);
+	explicit VoiceRecordButton(not_null<Ui::RpWidget*> parent);
 	~VoiceRecordButton();
 
 	enum class Type {
@@ -53,7 +51,6 @@ private:
 
 	rpl::variable<float64> _showProgress = 0.;
 	float64 _colorProgress = 0.;
-	rpl::variable<bool> _inCircle = false;
 	rpl::variable<Type> _state = Type::Record;
 
 	// This can animate for a very long time (like in music playing),
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index fb6687eac..6f6e14d4a 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -683,22 +683,17 @@ void ContactStatus::setupBlockHandler(not_null<UserData*> user) {
 void ContactStatus::setupShareHandler(not_null<UserData*> user) {
 	_inner->shareClicks(
 	) | rpl::start_with_next([=] {
-		const auto show = std::make_shared<Window::Show>(_controller);
+		const auto show = _controller->uiShow();
 		const auto share = [=](Fn<void()> &&close) {
 			user->setSettings(0);
 			user->session().api().request(MTPcontacts_AcceptContact(
 				user->inputUser
 			)).done([=](const MTPUpdates &result) {
 				user->session().api().applyUpdates(result);
-
-				if (show->valid()) {
-					Ui::Toast::Show(
-						show->toastParent(),
-						tr::lng_new_contact_share_done(
-							tr::now,
-							lt_user,
-							user->shortName()));
-				}
+				show->showToast(tr::lng_new_contact_share_done(
+					tr::now,
+					lt_user,
+					user->shortName()));
 			}).send();
 			close();
 		};
@@ -735,8 +730,8 @@ void ContactStatus::setupReportHandler(not_null<PeerData*> peer) {
 	_inner->reportClicks(
 	) | rpl::start_with_next([=] {
 		Expects(!peer->isUser());
-		const auto show = std::make_shared<Window::Show>(_controller);
 
+		const auto show = _controller->uiShow();
 		const auto callback = crl::guard(_inner, [=](Fn<void()> &&close) {
 			close();
 
@@ -751,11 +746,7 @@ void ContactStatus::setupReportHandler(not_null<PeerData*> peer) {
 				peer->session().api().deleteConversation(peer, false);
 			});
 
-			if (show->valid()) {
-				Ui::Toast::Show(
-					show->toastParent(),
-					tr::lng_report_spam_done(tr::now));
-			}
+			show->showToast(tr::lng_report_spam_done(tr::now));
 
 			// Destroys _bar.
 			_controller->showBackFromStack();
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index cc3d8586b..14f211bac 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -130,14 +130,14 @@ void CopyImage(not_null<PhotoData*> photo) {
 void ShowStickerPackInfo(
 		not_null<DocumentData*> document,
 		not_null<ListWidget*> list) {
-	StickerSetBox::Show(list->controller(), document);
+	StickerSetBox::Show(list->controller()->uiShow(), document);
 }
 
 void ToggleFavedSticker(
 		not_null<Window::SessionController*> controller,
 		not_null<DocumentData*> document,
 		FullMsgId contextId) {
-	Api::ToggleFavedSticker(controller, document, contextId);
+	Api::ToggleFavedSticker(controller->uiShow(), document, contextId);
 }
 
 void AddPhotoActions(
@@ -181,7 +181,7 @@ void SaveGif(
 		if (const auto media = item->media()) {
 			if (const auto document = media->document()) {
 				Api::ToggleSavedGif(
-					controller,
+					controller->uiShow(),
 					document,
 					item->fullId(),
 					true);
@@ -564,8 +564,7 @@ bool AddRescheduleAction(
 				&request.navigation->session(),
 				sendMenuType,
 				callback,
-				date),
-			Ui::LayerOption::KeepOther);
+				date));
 
 		owner->itemRemoved(
 		) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
@@ -1126,11 +1125,9 @@ void CopyPostLink(
 		return channel->hasUsername();
 	}();
 
-	Ui::Toast::Show(
-		Window::Show(controller).toastParent(),
-		isPublicLink
-			? tr::lng_channel_public_link_copied(tr::now)
-			: tr::lng_context_about_private_link(tr::now));
+	controller->showToast(isPublicLink
+		? tr::lng_channel_public_link_copied(tr::now)
+		: tr::lng_context_about_private_link(tr::now));
 }
 
 void AddPollActions(
@@ -1148,7 +1145,7 @@ void AddPollActions(
 		}
 		if (!Ui::SkipTranslate({ text })) {
 			menu->addAction(tr::lng_context_translate(tr::now), [=] {
-				Window::Show(controller).showBox(Box(
+				controller->show(Box(
 					Ui::TranslateBox,
 					item->history()->peer,
 					MsgId(),
@@ -1211,16 +1208,13 @@ void AddSaveSoundForNotifications(
 	} else {
 		return;
 	}
-	const auto toastParent = Window::Show(controller).toastParent();
+	const auto show = controller->uiShow();
 	menu->addAction(tr::lng_context_save_custom_sound(tr::now), [=] {
 		Api::ToggleSavedRingtone(
 			document,
 			item->fullId(),
-			crl::guard(toastParent, [=] {
-				Ui::Toast::Show(
-					toastParent,
-					tr::lng_ringtones_toast_added(tr::now));
-			}),
+			[=] { show->showToast(
+				tr::lng_ringtones_toast_added(tr::now)); },
 			true);
 	}, &st::menuIconSoundAdd);
 }
@@ -1451,17 +1445,14 @@ void AddEmojiPacksAction(
 		if (!strong) {
 			return;
 		} else if (packIds.size() > 1) {
-			strong->show(Box<StickersBox>(strong, packIds));
+			strong->show(Box<StickersBox>(strong->uiShow(), packIds));
 			return;
 		}
 		// Single used emoji pack.
-		strong->show(
-			Box<StickerSetBox>(
-				strong,
-				packIds.front(),
-				Data::StickersType::Emoji),
-			Ui::LayerOption::KeepOther);
-
+		strong->show(Box<StickerSetBox>(
+			strong->uiShow(),
+			packIds.front(),
+			Data::StickersType::Emoji));
 	});
 	menu->addAction(std::move(button));
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 8f13011cd..d219727c1 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -36,7 +36,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/chat/chat_style.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/item_text_options.h"
@@ -1012,10 +1011,7 @@ ClickHandlerPtr Element::fromLink() const {
 				const auto my = context.other.value<ClickHandlerContext>();
 				const auto weak = my.sessionWindow;
 				if (const auto strong = weak.get()) {
-					Ui::ShowMultilineToast({
-						.parentOverride = Window::Show(strong).toastParent(),
-						.text = { tr::lng_forwarded_imported(tr::now) },
-					});
+					strong->showToast(tr::lng_forwarded_imported(tr::now));
 				}
 			});
 			return imported;
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index d1d792ddc..f45f4f62b 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -44,7 +44,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/inactive_press.h"
 #include "ui/effects/message_sending_animation_controller.h"
 #include "ui/effects/path_shift_gradient.h"
@@ -1443,12 +1442,9 @@ bool ListWidget::showCopyRestriction(HistoryItem *item) {
 	if (type == CopyRestrictionType::None) {
 		return false;
 	}
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(_controller).toastParent(),
-		.text = { (type == CopyRestrictionType::Channel)
-			? tr::lng_error_nocopy_channel(tr::now)
-			: tr::lng_error_nocopy_group(tr::now) },
-	});
+	_controller->showToast((type == CopyRestrictionType::Channel)
+		? tr::lng_error_nocopy_channel(tr::now)
+		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
 
@@ -1457,12 +1453,9 @@ bool ListWidget::showCopyMediaRestriction(not_null<HistoryItem*> item) {
 	if (type == CopyRestrictionType::None) {
 		return false;
 	}
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(_controller).toastParent(),
-		.text = { (type == CopyRestrictionType::Channel)
-			? tr::lng_error_nocopy_channel(tr::now)
-			: tr::lng_error_nocopy_group(tr::now) },
-	});
+	_controller->showToast((type == CopyRestrictionType::Channel)
+		? tr::lng_error_nocopy_channel(tr::now)
+		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 01d654cd1..5e0f36ddf 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -25,7 +25,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/chat/message_bubble.h"
 #include "ui/chat/chat_style.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_entity.h"
 #include "ui/cached_round_corners.h"
@@ -2061,11 +2060,8 @@ ClickHandlerPtr Message::createGoToCommentsLink() const {
 			const auto history = item->history();
 			if (const auto channel = history->peer->asChannel()) {
 				if (channel->invitePeekExpires()) {
-					const auto show = Window::Show(controller);
-					Ui::ShowMultilineToast({
-						.parentOverride = show.toastParent(),
-						.text = { tr::lng_channel_invite_private(tr::now) },
-					});
+					controller->showToast(
+						tr::lng_channel_invite_private(tr::now));
 					return;
 				}
 			}
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 22ca0af7a..0fc999bec 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/ui_utility.h"
-#include "ui/toasts/common_toasts.h"
 #include "base/timer_rpl.h"
 #include "apiwrap.h"
 #include "window/window_adaptive.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 0056d6a29..22145b376 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -861,7 +861,7 @@ void RepliesWidget::chooseAttach(
 		std::optional<bool> overrideSendImagesAsPhotos) {
 	_choosingAttach = false;
 	if (const auto error = Data::AnyFileRestrictionError(_history->peer)) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return;
 	} else if (showSlowmodeError()) {
 		return;
@@ -1054,7 +1054,7 @@ bool RepliesWidget::showSlowmodeError() {
 	if (text.isEmpty()) {
 		return false;
 	}
-	controller()->showToast({ text });
+	controller()->showToast(text);
 	return true;
 }
 
@@ -1127,7 +1127,7 @@ bool RepliesWidget::showSendingFilesError(
 		return true;
 	}
 
-	controller()->showToast({ text });
+	controller()->showToast(text);
 	return true;
 }
 
@@ -1189,7 +1189,7 @@ void RepliesWidget::send(Api::SendOptions options) {
 			.ignoreSlowmodeCountdown = (options.scheduled != 0),
 		});
 	if (!error.isEmpty()) {
-		controller()->showToast({ error });
+		controller()->showToast(error);
 		return;
 	}
 
@@ -1238,9 +1238,8 @@ void RepliesWidget::edit(
 		return;
 	} else if (!left.text.isEmpty()) {
 		const auto remove = left.text.size();
-		controller()->showToast({
-			tr::lng_edit_limit_reached(tr::now, lt_count, remove),
-		});
+		controller()->showToast(
+			tr::lng_edit_limit_reached(tr::now, lt_count, remove));
 		return;
 	}
 
@@ -1264,13 +1263,13 @@ void RepliesWidget::edit(
 		}
 
 		if (ranges::contains(Api::kDefaultEditMessagesErrors, error)) {
-			controller()->showToast({ tr::lng_edit_error(tr::now) });
+			controller()->showToast(tr::lng_edit_error(tr::now));
 		} else if (error == u"MESSAGE_NOT_MODIFIED"_q) {
 			_composeControls->cancelEditMessage();
 		} else if (error == u"MESSAGE_EMPTY"_q) {
 			doSetInnerFocus();
 		} else {
-			controller()->showToast({ tr::lng_edit_error(tr::now) });
+			controller()->showToast(tr::lng_edit_error(tr::now));
 		}
 		update();
 		return true;
@@ -1351,7 +1350,7 @@ bool RepliesWidget::sendExistingDocument(
 		_history->peer,
 		ChatRestriction::SendStickers);
 	if (error) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return false;
 	} else if (showSlowmodeError()
 		|| ShowSendPremiumError(controller(), document)) {
@@ -1386,7 +1385,7 @@ bool RepliesWidget::sendExistingPhoto(
 		_history->peer,
 		ChatRestriction::SendPhotos);
 	if (error) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return false;
 	} else if (showSlowmodeError()) {
 		return false;
@@ -1406,7 +1405,7 @@ void RepliesWidget::sendInlineResult(
 		not_null<UserData*> bot) {
 	const auto errorText = result->getErrorOnSend(_history);
 	if (!errorText.isEmpty()) {
-		controller()->showToast({ errorText });
+		controller()->showToast(errorText);
 		return;
 	}
 	sendInlineResult(result, bot, {}, std::nullopt);
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index ce01b68c2..85ce03471 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -332,7 +332,7 @@ void ScheduledWidget::setupComposeControls() {
 
 void ScheduledWidget::chooseAttach() {
 	if (const auto error = Data::AnyFileRestrictionError(_history->peer)) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return;
 	}
 
@@ -526,9 +526,7 @@ void ScheduledWidget::uploadFile(
 			type,
 			prepareSendAction(options));
 	};
-	controller()->show(
-		PrepareScheduleBox(this, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
 }
 
 bool ScheduledWidget::showSendingFilesError(
@@ -565,7 +563,7 @@ bool ScheduledWidget::showSendingFilesError(
 		return true;
 	}
 
-	controller()->showToast({ text });
+	controller()->showToast(text);
 	return true;
 }
 
@@ -591,13 +589,11 @@ void ScheduledWidget::send() {
 			.ignoreSlowmodeCountdown = true,
 		});
 	if (!error.isEmpty()) {
-		controller()->showToast({ error });
+		controller()->showToast(error);
 		return;
 	}
 	const auto callback = [=](Api::SendOptions options) { send(options); };
-	controller()->show(
-		PrepareScheduleBox(this, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
 }
 
 void ScheduledWidget::send(Api::SendOptions options) {
@@ -627,9 +623,7 @@ void ScheduledWidget::sendVoice(
 	const auto callback = [=](Api::SendOptions options) {
 		sendVoice(bytes, waveform, duration, options);
 	};
-	controller()->show(
-		PrepareScheduleBox(this, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
 }
 
 void ScheduledWidget::sendVoice(
@@ -674,9 +668,8 @@ void ScheduledWidget::edit(
 		return;
 	} else if (!left.text.isEmpty()) {
 		const auto remove = left.text.size();
-		controller()->showToast({
-			tr::lng_edit_limit_reached(tr::now, lt_count, remove)
-		});
+		controller()->showToast(
+			tr::lng_edit_limit_reached(tr::now, lt_count, remove));
 		return;
 	}
 
@@ -700,13 +693,13 @@ void ScheduledWidget::edit(
 		}
 
 		if (ranges::contains(Api::kDefaultEditMessagesErrors, error)) {
-			controller()->showToast({ tr::lng_edit_error(tr::now) });
+			controller()->showToast(tr::lng_edit_error(tr::now));
 		} else if (error == u"MESSAGE_NOT_MODIFIED"_q) {
 			_composeControls->cancelEditMessage();
 		} else if (error == u"MESSAGE_EMPTY"_q) {
 			_composeControls->focus();
 		} else {
-			controller()->showToast({ tr::lng_edit_error(tr::now) });
+			controller()->showToast(tr::lng_edit_error(tr::now));
 		}
 		update();
 		return true;
@@ -728,9 +721,7 @@ void ScheduledWidget::sendExistingDocument(
 	const auto callback = [=](Api::SendOptions options) {
 		sendExistingDocument(document, options);
 	};
-	controller()->show(
-		PrepareScheduleBox(this, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
 }
 
 bool ScheduledWidget::sendExistingDocument(
@@ -740,7 +731,7 @@ bool ScheduledWidget::sendExistingDocument(
 		_history->peer,
 		ChatRestriction::SendStickers);
 	if (error) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return false;
 	} else if (ShowSendPremiumError(controller(), document)) {
 		return false;
@@ -759,9 +750,7 @@ void ScheduledWidget::sendExistingPhoto(not_null<PhotoData*> photo) {
 	const auto callback = [=](Api::SendOptions options) {
 		sendExistingPhoto(photo, options);
 	};
-	controller()->show(
-		PrepareScheduleBox(this, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
 }
 
 bool ScheduledWidget::sendExistingPhoto(
@@ -771,7 +760,7 @@ bool ScheduledWidget::sendExistingPhoto(
 		_history->peer,
 		ChatRestriction::SendPhotos);
 	if (error) {
-		controller()->showToast({ *error });
+		controller()->showToast(*error);
 		return false;
 	}
 
@@ -789,15 +778,13 @@ void ScheduledWidget::sendInlineResult(
 		not_null<UserData*> bot) {
 	const auto errorText = result->getErrorOnSend(_history);
 	if (!errorText.isEmpty()) {
-		controller()->showToast({ errorText });
+		controller()->showToast(errorText);
 		return;
 	}
 	const auto callback = [=](Api::SendOptions options) {
 		sendInlineResult(result, bot, options);
 	};
-	controller()->show(
-		PrepareScheduleBox(this, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
 }
 
 void ScheduledWidget::sendInlineResult(
@@ -1264,9 +1251,7 @@ void ScheduledWidget::listSendBotCommand(
 		message.textWithTags = { text };
 		session().api().sendMessage(std::move(message));
 	};
-	controller()->show(
-		PrepareScheduleBox(this, sendMenuType(), callback),
-		Ui::LayerOption::KeepOther);
+	controller()->show(PrepareScheduleBox(this, sendMenuType(), callback));
 }
 
 void ScheduledWidget::listHandleViaClick(not_null<UserData*> bot) {
diff --git a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
index 5cf22f446..f10d8e328 100644
--- a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
@@ -165,7 +165,7 @@ void StickerToast::showWithTitle(const QString &title) {
 	_weak = Ui::Toast::Show(_parent, Ui::Toast::Config{
 		.text = text,
 		.st = &_st,
-		.durationMs = kPremiumToastDuration,
+		.duration = kPremiumToastDuration,
 		.multiline = true,
 		.dark = true,
 		.slideSide = RectPart::Bottom,
@@ -241,7 +241,7 @@ void StickerToast::showWithTitle(const QString &title) {
 				PremiumPreview::AnimatedEmoji);
 		} else {
 			_controller->show(Box<StickerSetBox>(
-				_controller,
+				_controller->uiShow(),
 				_for->sticker()->set,
 				setType));
 		}
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 808c26e5d..fa0d6ed7f 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -31,7 +31,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/effects/radial_animation.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/boxes/report_box.h" // Ui::ReportReason
 #include "ui/text/text.h"
 #include "ui/text/text_options.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
index adf6b75e5..456e5cd87 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
@@ -524,7 +524,7 @@ void TranslateBar::showToast(
 	const auto weak = Ui::Toast::Show(_wrap.window(), Ui::Toast::Config{
 		.text = std::move(text),
 		.st = st.get(),
-		.durationMs = kToastDuration,
+		.duration = kToastDuration,
 		.multiline = true,
 		.dark = true,
 		.slideSide = RectPart::Bottom,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index b4000725b..b3ff9b069 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -412,7 +412,7 @@ ClickHandlerPtr Sticker::ShowSetHandler(not_null<DocumentData*> document) {
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto window = my.sessionWindow.get()) {
-			StickerSetBox::Show(window, document);
+			StickerSetBox::Show(window->uiShow(), document);
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index ac730600d..0cd31f483 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -483,12 +483,10 @@ ClickHandlerPtr ThemeDocumentBox::createViewLink() {
 			if (out) {
 				controller->toggleChooseChatTheme(to);
 			} else if (maybe) {
-				controller->show(
-					Box<BackgroundPreviewBox>(
-						controller,
-						*maybe,
-						BackgroundPreviewArgs{ to, itemId }),
-					Ui::LayerOption::KeepOther);
+				controller->show(Box<BackgroundPreviewBox>(
+					controller,
+					*maybe,
+					BackgroundPreviewArgs{ to, itemId }));
 			}
 		}
 	});
diff --git a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
index 1d4603a14..7056a7780 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
@@ -143,11 +143,10 @@ void ShowSetToast(
 	st->padding.setLeft(skip + size + skip);
 	st->palette.linkFg = st->palette.selectLinkFg = st::mediaviewTextLinkFg;
 
-	const auto parent = Window::Show(controller).toastParent();
-	const auto weak = Ui::Toast::Show(parent, {
+	const auto weak = controller->showToast({
 		.text = text,
 		.st = st.get(),
-		.durationMs = kToastDuration,
+		.duration = kToastDuration,
 		.multiline = true,
 		.dark = true,
 		.slideSide = RectPart::Bottom,
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 aed682aeb..ca6ddf226 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -777,9 +777,8 @@ void Selector::createList(not_null<Window::SessionController*> controller) {
 	}
 	_list = _scroll->setOwnedWidget(
 		object_ptr<EmojiListWidget>(_scroll, EmojiListDescriptor{
-			.session = &controller->session(),
+			.show = controller->uiShow(),
 			.mode = _listMode,
-			.controller = controller,
 			.paused = [] { return false; },
 			.customRecentList = std::move(recent),
 			.customRecentFactory = std::move(factory),
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 fb8e5f9a0..fed48653b 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
@@ -172,7 +172,7 @@ InnerWidget::InnerWidget(
 	not_null<Controller*> controller,
 	not_null<UserData*> user)
 : RpWidget(parent)
-, _show(std::make_unique<Window::Show>(controller->parentController()))
+, _show(controller->uiShow())
 , _controller(controller)
 , _user(user)
 , _listController(std::make_unique<ListController>(controller, _user))
@@ -291,8 +291,8 @@ void InnerWidget::peerListHideLayer() {
 	_show->hideLayer();
 }
 
-not_null<QWidget*> InnerWidget::peerListToastParent() {
-	return _show->toastParent();
+std::shared_ptr<Main::SessionShow> InnerWidget::peerListUiShow() {
+	return _show;
 }
 
 } // namespace CommonGroups
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
index dc8573355..91d906782 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
@@ -11,9 +11,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "boxes/peer_list_box.h"
 
-namespace Window {
+namespace Ui {
 class Show;
-} // namespace Window
+} // namespace Ui
 
 namespace Info {
 
@@ -68,13 +68,13 @@ private:
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 	void peerListHideLayer() override;
-	not_null<QWidget*> peerListToastParent() override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 
 	object_ptr<ListWidget> setupList(
 		RpWidget *parent,
 		not_null<PeerListController*> controller) const;
 
-	std::unique_ptr<Window::Show> _show;
+	std::shared_ptr<Main::SessionShow> _show;
 	not_null<Controller*> _controller;
 	not_null<UserData*> _user;
 	std::unique_ptr<PeerListController> _listController;
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
index 2b8248e13..c4086ff5a 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -55,7 +55,7 @@ public:
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 	void peerListHideLayer() override;
-	not_null<QWidget*> peerListToastParent() override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 
 };
 
@@ -100,8 +100,8 @@ void ListDelegate::peerListShowBox(
 void ListDelegate::peerListHideLayer() {
 }
 
-not_null<QWidget*> ListDelegate::peerListToastParent() {
-	Unexpected("...ListDelegate::peerListToastParent");
+std::shared_ptr<Main::SessionShow> ListDelegate::peerListUiShow() {
+	Unexpected("...ListDelegate::peerListUiShow");
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index c319afaf5..82e0e5720 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -103,7 +103,7 @@ namespace {
 
 [[nodiscard]] Fn<void(QString)> UsernamesLinkCallback(
 		not_null<PeerData*> peer,
-		Window::Show show,
+		std::shared_ptr<Ui::Show> show,
 		const QString &addToLink) {
 	return [=](QString link) {
 		if (!link.startsWith(u"https://"_q)) {
@@ -112,9 +112,7 @@ namespace {
 		}
 		if (!link.isEmpty()) {
 			QGuiApplication::clipboard()->setText(link);
-			Ui::Toast::Show(
-				show.toastParent(),
-				tr::lng_username_copied(tr::now));
+			show->showToast(tr::lng_username_copied(tr::now));
 		}
 	};
 }
@@ -424,7 +422,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			st::infoProfileLabeledUsernamePadding);
 		const auto callback = UsernamesLinkCallback(
 			_peer,
-			Window::Show(controller),
+			controller->uiShow(),
 			QString());
 		const auto hook = [=](Ui::FlatLabel::ContextMenuRequest request) {
 			if (!request.link) {
@@ -471,9 +469,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 					user->userName());
 				if (!link.isEmpty()) {
 					QGuiApplication::clipboard()->setText(link);
-					Ui::Toast::Show(
-						Window::Show(controller).toastParent(),
-						tr::lng_username_copied(tr::now));
+					controller->showToast(tr::lng_username_copied(tr::now));
 				}
 				return false;
 			});
@@ -511,7 +507,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		const auto controller = _controller->parentController();
 		const auto linkCallback = UsernamesLinkCallback(
 			_peer,
-			Window::Show(controller),
+			controller->uiShow(),
 			addToLink);
 		linkLine.text->overrideLinkClickHandler(linkCallback);
 		linkLine.subtext->overrideLinkClickHandler(linkCallback);
@@ -603,7 +599,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupMuteToggle() {
 			}
 		}) | rpl::to_empty,
 		makeThread,
-		std::make_shared<Window::Show>(_controller));
+		_controller->uiShow());
 	object_ptr<FloatingIcon>(
 		result,
 		st::infoIconNotifications,
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 c65c4cf40..352aa8b45 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
@@ -134,7 +134,7 @@ void EmojiStatusPanel::create(
 		controller,
 		object_ptr<Selector>(
 			nullptr,
-			controller,
+			controller->uiShow(),
 			Window::GifPauseReason::Layer,
 			ChatHelpers::TabbedSelector::Mode::EmojiStatus));
 	_panel->setDropDown(true);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index 88915b760..605ebbad5 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -46,7 +46,7 @@ Members::Members(
 	QWidget *parent,
 	not_null<Controller*> controller)
 : RpWidget(parent)
-, _show(std::make_unique<Window::Show>(controller->parentController()))
+, _show(controller->uiShow())
 , _controller(controller)
 , _peer(_controller->key().peer())
 , _listController(CreateMembersController(controller, _peer)) {
@@ -467,8 +467,8 @@ void Members::peerListHideLayer() {
 	_show->hideLayer();
 }
 
-not_null<QWidget*> Members::peerListToastParent() {
-	return _show->toastParent();
+std::shared_ptr<Main::SessionShow> Members::peerListUiShow() {
+	return _show;
 }
 
 void Members::peerListSetDescription(
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.h b/Telegram/SourceFiles/info/profile/info_profile_members.h
index 99a6135d3..2789756ce 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.h
@@ -82,7 +82,7 @@ private:
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther) override;
 	void peerListHideLayer() override;
-	not_null<QWidget*> peerListToastParent() override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 
 	//void peerListAppendRow(
 	//	std::unique_ptr<PeerListRow> row) override {
@@ -114,7 +114,7 @@ private:
 	void updateHeaderControlsGeometry(int newWidth);
 	//void updateSearchEnabledByContent();
 
-	std::unique_ptr<Window::Show> _show;
+	std::shared_ptr<Main::SessionShow> _show;
 
 	//Wrap _wrap;
 	not_null<Controller*> _controller;
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index 8756628f4..6f9186882 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -153,7 +153,7 @@ void ShowGradientEditor(
 		not_null<Window::SessionController*> controller,
 		StartData data,
 		Fn<void(std::vector<QColor>)> &&doneCallback) {
-	Window::Show(controller).showBox(Box([=](not_null<Ui::GenericBox*> box) {
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
 		struct State {
 			rpl::event_stream<> saveRequests;
 		};
@@ -180,7 +180,6 @@ void ShowGradientEditor(
 			});
 		box->setWidth(content->width());
 		box->addRow(std::move(content), {});
-
 	}));
 }
 
@@ -242,9 +241,8 @@ EmojiSelector::Selector EmojiSelector::createEmojiList(
 	const auto manager = &session->data().customEmojiManager();
 	const auto tag = Data::CustomEmojiManager::SizeTag::Large;
 	auto args = ChatHelpers::EmojiListDescriptor{
-		.session = session,
+		.show = _controller->uiShow(),
 		.mode = ChatHelpers::EmojiListMode::UserpicBuilder,
-		.controller = _controller,
 		.paused = [=] { return true; },
 		.customRecentList = _lastRecent,
 		.customRecentFactory = [=](DocumentId id, Fn<void()> repaint) {
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 30927307f..09de04d9b 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -19,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_domain.h"
 #include "info/profile/info_profile_values.h"
 #include "ui/boxes/confirm_box.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/chat/attach/attach_bot_webview.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/dropdown_menu.h"
@@ -182,7 +181,7 @@ void ShowChooseBox(
 			&controller->session(),
 			std::move(done),
 			std::move(filter)),
-		std::move(initBox)), Ui::LayerOption::KeepOther);
+		std::move(initBox)));
 }
 
 [[nodiscard]] base::flat_set<not_null<AttachWebView*>> &ActiveWebViews() {
@@ -1216,12 +1215,9 @@ void AttachWebView::showToast(
 		: _addToMenuContext
 		? _addToMenuContext->controller.get()
 		: nullptr;
-	Ui::ShowMultilineToast({
-		.parentOverride = (strong
-			? Window::Show(strong).toastParent().get()
-			: nullptr),
-		.text = { text },
-	});
+	if (strong) {
+		strong->showToast(text);
+	}
 }
 
 void AttachWebView::confirmAddToMenu(
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index b0dd9d710..0103789ec 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -357,7 +357,7 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
 		};
 		ChatHelpers::AddGifAction(
 			std::move(callback),
-			_controller,
+			_controller->uiShow(),
 			previewDocument);
 	}
 
diff --git a/Telegram/SourceFiles/intro/intro_phone.cpp b/Telegram/SourceFiles/intro/intro_phone.cpp
index 1e2560a8c..d822d056b 100644
--- a/Telegram/SourceFiles/intro/intro_phone.cpp
+++ b/Telegram/SourceFiles/intro/intro_phone.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "boxes/phone_banned_box.h"
 #include "core/application.h"
+#include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "countries/countries_instance.h" // Countries::Groups
 
@@ -46,7 +47,7 @@ PhoneWidget::PhoneWidget(
 : Step(parent, account, data)
 , _country(
 	this,
-	std::make_shared<Window::Show>(getData()->controller),
+	getData()->controller->uiShow(),
 	st::introCountry)
 , _code(this, st::introCountryCode)
 , _phone(
diff --git a/Telegram/SourceFiles/main/session/session_show.cpp b/Telegram/SourceFiles/main/session/session_show.cpp
new file mode 100644
index 000000000..bbd0b4284
--- /dev/null
+++ b/Telegram/SourceFiles/main/session/session_show.cpp
@@ -0,0 +1,77 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "main/session/session_show.h"
+
+namespace Main {
+namespace {
+
+class SimpleSessionShow final : public SessionShow {
+public:
+	SimpleSessionShow(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Session*> session);
+
+	void showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options
+		= Ui::LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	not_null<QWidget*> toastParent() const override;
+	bool valid() const override;
+	operator bool() const override;
+
+	Session &session() const override;
+
+private:
+	const std::shared_ptr<Ui::Show> _show;
+	const not_null<Session*> _session;
+
+};
+
+SimpleSessionShow::SimpleSessionShow(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Session*> session)
+: _show(std::move(show))
+, _session(session) {
+}
+
+void SimpleSessionShow::showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options) const {
+	_show->showBox(std::move(content), options);
+}
+
+void SimpleSessionShow::hideLayer() const {
+	_show->hideLayer();
+}
+
+not_null<QWidget*> SimpleSessionShow::toastParent() const {
+	return _show->toastParent();
+}
+
+bool SimpleSessionShow::valid() const {
+	return _show->valid();
+}
+
+SimpleSessionShow::operator bool() const {
+	return _show->operator bool();
+}
+
+Session &SimpleSessionShow::session() const {
+	return *_session;
+}
+
+} // namespace
+
+std::shared_ptr<SessionShow> MakeSessionShow(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Session*> session) {
+	return std::make_shared<SimpleSessionShow>(std::move(show), session);
+}
+
+} // namespace Main
diff --git a/Telegram/SourceFiles/main/session/session_show.h b/Telegram/SourceFiles/main/session/session_show.h
new file mode 100644
index 000000000..ae764e125
--- /dev/null
+++ b/Telegram/SourceFiles/main/session/session_show.h
@@ -0,0 +1,25 @@
+/*
+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/show.h"
+
+namespace Main {
+
+class Session;
+
+class SessionShow : public Ui::Show {
+public:
+	[[nodiscard]] virtual Main::Session &session() const = 0;
+};
+
+[[nodiscard]] std::shared_ptr<SessionShow> MakeSessionShow(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Session*> session);
+
+} // namespace Main
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index e43864568..4b46807d0 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -35,7 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/chat_theme.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/image/image.h"
 #include "ui/focus_persister.h"
@@ -941,7 +940,7 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 void MainWidget::createCallTopBar() {
 	Expects(_currentCall != nullptr || _currentGroupCall != nullptr);
 
-	const auto show = std::make_shared<Window::Show>(controller());
+	const auto show = controller()->uiShow();
 	_callTopBar.create(
 		this,
 		(_currentCall
@@ -1221,10 +1220,7 @@ void MainWidget::showChooseReportMessages(
 		peer,
 		SectionShow::Way::Forward,
 		ShowForChooseMessagesMsgId);
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(controller()).toastParent(),
-		.text = { tr::lng_report_please_select_messages(tr::now) },
-	});
+	controller()->showToast(tr::lng_report_please_select_messages(tr::now));
 }
 
 void MainWidget::clearChooseReportMessages() {
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 65daf78ed..3447c00b9 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -352,8 +352,7 @@ void MainWindow::ensureLayerCreated() {
 	}
 	_layer = base::make_unique_q<Ui::LayerStackWidget>(
 		bodyWidget(),
-		crl::guard(this, [=] {
-			return std::make_shared<Window::Show>(&controller()); }));
+		crl::guard(this, [=] { return controller().uiShow(); }));
 
 	_layer->hideFinishEvents(
 	) | rpl::filter([=] {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index a33342ea5..fb5bfb546 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/platform/ui_platform_window_title.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/text/format_values.h"
 #include "ui/item_text_options.h"
 #include "ui/painter.h"
@@ -860,12 +859,9 @@ bool OverlayWidget::showCopyMediaRestriction() {
 	if (!hasCopyMediaRestriction()) {
 		return false;
 	}
-	Ui::ShowMultilineToast({
-		.parentOverride = _widget,
-		.text = { _history->peer->isBroadcast()
-			? tr::lng_error_nocopy_channel(tr::now)
-			: tr::lng_error_nocopy_group(tr::now) },
-	});
+	Ui::Toast::Show(_widget, _history->peer->isBroadcast()
+		? tr::lng_error_nocopy_channel(tr::now)
+		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
index bb48448a6..b15ad5809 100644
--- a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
+++ b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "settings/settings_common.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
@@ -99,14 +99,11 @@ object_ptr<Ui::RpWidget> AntiSpamValidator::createButton() const {
 	) | rpl::start_with_next([=, controller = _controller](bool toggled) {
 		if (state->locked.current() && toggled) {
 			state->toggled.fire(false);
-			Ui::ShowMultilineToast({
-				.parentOverride = Window::Show(controller).toastParent(),
-				.text = tr::lng_manage_peer_antispam_not_enough(
-					tr::now,
-					lt_count,
-					EnableAntiSpamMinMembers(channel),
-					Ui::Text::RichLangValue),
-			});
+			controller->showToast(tr::lng_manage_peer_antispam_not_enough(
+				tr::now,
+				lt_count,
+				EnableAntiSpamMinMembers(channel),
+				Ui::Text::RichLangValue));
 		} else {
 			channel->session().api().request(MTPchannels_ToggleAntiSpam(
 				channel->inputChannel,
@@ -168,8 +165,7 @@ void AntiSpamValidator::addAction(
 		const auto showToast = [=,
 				window = _controller,
 				channel = _channel] {
-			Ui::ShowMultilineToast({
-				.parentOverride = Window::Show(window).toastParent(),
+			window->showToast({
 				.text = text,
 				.duration = ApiWrap::kJoinErrorDuration,
 				.filter = [=](
diff --git a/Telegram/SourceFiles/menu/menu_item_download_files.cpp b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
index 032471a96..3c4573e80 100644
--- a/Telegram/SourceFiles/menu/menu_item_download_files.cpp
+++ b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
@@ -115,7 +115,7 @@ void AddAction(
 				File::ShowInFolder(lastPath);
 				return false;
 			};
-			const auto config = Ui::Toast::Config{
+			controller->showToast({
 				.text = (photos.size() > 1
 						? tr::lng_mediaview_saved_images_to
 						: tr::lng_mediaview_saved_to)(
@@ -127,8 +127,7 @@ void AddAction(
 					Ui::Text::WithEntities),
 				.st = &st::defaultToast,
 				.filter = filter,
-			};
-			Ui::Toast::Show(Window::Show(controller).toastParent(), config);
+			});
 		}
 	};
 	const auto saveDocuments = [=](const QString &folderPath) {
diff --git a/Telegram/SourceFiles/menu/menu_ttl_validator.cpp b/Telegram/SourceFiles/menu/menu_ttl_validator.cpp
index 4a0edd2e7..a5ecac427 100644
--- a/Telegram/SourceFiles/menu/menu_ttl_validator.cpp
+++ b/Telegram/SourceFiles/menu/menu_ttl_validator.cpp
@@ -19,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/show.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/text/format_values.h"
 #include "styles/style_chat.h"
 #include "styles/style_menu_icons.h"
@@ -30,11 +29,11 @@ namespace {
 constexpr auto kToastDuration = crl::time(3500);
 
 void ShowAutoDeleteToast(
-		not_null<QWidget*> parent,
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer) {
 	const auto period = peer->messagesTTL();
 	if (!period) {
-		Ui::Toast::Show(parent, tr::lng_ttl_about_tooltip_off(tr::now));
+		show->showToast(tr::lng_ttl_about_tooltip_off(tr::now));
 		return;
 	}
 
@@ -44,11 +43,7 @@ void ShowAutoDeleteToast(
 	const auto text = peer->isBroadcast()
 		? tr::lng_ttl_about_tooltip_channel(tr::now, lt_duration, duration)
 		: tr::lng_ttl_about_tooltip(tr::now, lt_duration, duration);
-	Ui::ShowMultilineToast({
-		.parentOverride = parent,
-		.text = { text },
-		.duration = kToastDuration,
-	});
+	show->showToast(text, kToastDuration);
 }
 
 } // namespace
@@ -79,15 +74,12 @@ Args TTLValidator::createArgs() const {
 			api.request(state->savingRequestId).cancel();
 		}
 		state->savingPeriod = period;
-		const auto weak = Ui::MakeWeak(show->toastParent().get());
 		state->savingRequestId = api.request(MTPmessages_SetHistoryTTL(
 			peer->input,
 			MTP_int(period)
 		)).done([=](const MTPUpdates &result) {
 			peer->session().api().applyUpdates(result);
-			if (const auto strong = weak.data()) {
-				ShowAutoDeleteToast(strong, peer);
-			}
+			ShowAutoDeleteToast(show, peer);
 			state->savingRequestId = 0;
 		}).fail([=] {
 			state->savingRequestId = 0;
@@ -130,7 +122,7 @@ bool TTLValidator::can() const {
 }
 
 void TTLValidator::showToast() const {
-	ShowAutoDeleteToast(_show->toastParent(), _peer);
+	ShowAutoDeleteToast(_show, _peer);
 }
 
 const style::icon *TTLValidator::icon() const {
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index ee6ef45e2..6b289c67c 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -342,9 +342,9 @@ void CheckoutProcess::handleFormUpdate(const FormUpdate &update) {
 }
 
 void CheckoutProcess::handleError(const Error &error) {
-	const auto showToast = [&](const TextWithEntities &text) {
+	const auto showToast = [&](TextWithEntities &&text) {
 		_panel->requestActivate();
-		_panel->showToast(text);
+		_panel->showToast(std::move(text));
 	};
 	const auto &id = error.id;
 	switch (error.type) {
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index 2f9b1cfa4..e68fab149 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -859,8 +859,8 @@ void Panel::showBox(object_ptr<BoxContent> box) {
 		anim::type::normal);
 }
 
-void Panel::showToast(const TextWithEntities &text) {
-	_widget->showToast(text);
+void Panel::showToast(TextWithEntities &&text) {
+	_widget->showToast(std::move(text));
 }
 
 void Panel::showCriticalError(const TextWithEntities &text) {
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.h b/Telegram/SourceFiles/payments/ui/payments_panel.h
index 502eb5f07..47ec4284f 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.h
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.h
@@ -90,7 +90,7 @@ public:
 	[[nodiscard]] rpl::producer<QString> savedMethodChosen() const;
 
 	void showBox(object_ptr<Ui::BoxContent> box);
-	void showToast(const TextWithEntities &text);
+	void showToast(TextWithEntities &&text);
 	void showCriticalError(const TextWithEntities &text);
 	[[nodiscard]] std::shared_ptr<Show> uiShow();
 
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp
index b1bb38c26..55916a97b 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/settings_calls.cpp
@@ -223,10 +223,7 @@ void Calls::setupContent() {
 	if (!GetVideoInputList().empty()) {
 		AddSkip(content);
 		AddSubsectionTitle(content, tr::lng_settings_call_camera());
-		AddCameraSubsection(
-			std::make_shared<Window::Show>(_controller),
-			content,
-			true);
+		AddCameraSubsection(_controller->uiShow(), content, true);
 		AddSkip(content);
 		AddDivider(content);
 	}
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 1156bdb50..188d70140 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -807,8 +807,9 @@ void SetupStickersEmoji(
 		st::settingsButton,
 		{ &st::settingsIconStickers, kIconLightOrange }
 	)->addClickHandler([=] {
-		controller->show(
-			Box<StickersBox>(controller, StickersBox::Section::Installed));
+		controller->show(Box<StickersBox>(
+			controller->uiShow(),
+			StickersBox::Section::Installed));
 	});
 
 	AddButton(
@@ -991,8 +992,8 @@ void SetupMessages(
 		Core::App().saveSettingsDelayed();
 	});
 
-	buttonRight->setClickedCallback([=, show = Window::Show(controller)] {
-		show.showBox(Box(ReactionsSettingsBox, controller));
+	buttonRight->setClickedCallback([=, show = controller->uiShow()] {
+		show->showBox(Box(ReactionsSettingsBox, controller));
 	});
 
 	AddSkip(inner, st::settingsSendTypeSkip);
diff --git a/Telegram/SourceFiles/settings/settings_global_ttl.cpp b/Telegram/SourceFiles/settings/settings_global_ttl.cpp
index 435bc00f3..cba6a2c00 100644
--- a/Telegram/SourceFiles/settings/settings_global_ttl.cpp
+++ b/Telegram/SourceFiles/settings/settings_global_ttl.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
@@ -119,10 +118,8 @@ void TTLChatsBoxController::prepareViewHook() {
 
 void TTLChatsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	if (!TTLMenu::TTLValidator(nullptr, row->peer()).can()) {
-		Ui::ShowMultilineToast({
-			.parentOverride = delegate()->peerListToastParent(),
-			.text = { tr::lng_settings_ttl_select_chats_sorry(tr::now) },
-		});
+		delegate()->peerListUiShow()->showToast(
+			{ tr::lng_settings_ttl_select_chats_sorry(tr::now) });
 		return;
 	}
 	delegate()->peerListSetRowChecked(row, !row->checked());
@@ -208,7 +205,7 @@ private:
 
 	const not_null<Window::SessionController*> _controller;
 	const std::shared_ptr<Ui::RadiobuttonGroup> _group;
-	const std::shared_ptr<Window::Show> _show;
+	const std::shared_ptr<Main::SessionShow> _show;
 
 	not_null<Ui::VerticalLayout*> _buttons;
 
@@ -223,7 +220,7 @@ GlobalTTL::GlobalTTL(
 : Section(parent)
 , _controller(controller)
 , _group(std::make_shared<Ui::RadiobuttonGroup>(0))
-, _show(std::make_shared<Window::Show>(controller))
+, _show(controller->uiShow())
 , _buttons(Ui::CreateChild<Ui::VerticalLayout>(this)) {
 	setupContent();
 }
@@ -244,14 +241,11 @@ void GlobalTTL::showSure(TimeId ttl, bool rebuild) const {
 		}
 		_group->setChangedCallback([=](int value) {
 			_group->setChangedCallback(nullptr);
-			Ui::ShowMultilineToast({
-				.parentOverride = _show->toastParent(),
-				.text = tr::lng_settings_ttl_after_toast(
-					tr::now,
-					lt_after_duration,
-					{ .text = ttlText },
-					Ui::Text::WithEntities)
-			});
+			_show->showToast(tr::lng_settings_ttl_after_toast(
+				tr::now,
+				lt_after_duration,
+				{ .text = ttlText },
+				Ui::Text::WithEntities));
 			_show->hideLayer(); // Don't use close().
 		});
 		request(ttl);
@@ -348,7 +342,7 @@ void GlobalTTL::setupContent() {
 		) | rpl::start_with_next(rebuild, content->lifetime());
 	}
 
-	const auto show = std::make_shared<Window::Show>(_controller);
+	const auto show = _controller->uiShow();
 	AddButton(
 		content,
 		tr::lng_settings_ttl_after_custom(),
@@ -398,29 +392,25 @@ void GlobalTTL::setupContent() {
 						peer->session().api().applyUpdates(result);
 					}).send();
 				}
-				Ui::ShowMultilineToast({
-					.parentOverride = Ui::BoxShow(box).toastParent(),
-					.text = ttl
-						? tr::lng_settings_ttl_select_chats_toast(
-							tr::now,
-							lt_count,
-							peers.size(),
-							lt_duration,
-							{ .text = Ui::FormatTTL(ttl) },
-							Ui::Text::WithEntities)
-						: tr::lng_settings_ttl_select_chats_disabled_toast(
-							tr::now,
-							lt_count,
-							peers.size(),
-							Ui::Text::WithEntities),
-				});
+				box->showToast(ttl
+					? tr::lng_settings_ttl_select_chats_toast(
+						tr::now,
+						lt_count,
+						peers.size(),
+						lt_duration,
+						{ .text = Ui::FormatTTL(ttl) },
+						Ui::Text::WithEntities)
+					: tr::lng_settings_ttl_select_chats_disabled_toast(
+						tr::now,
+						lt_count,
+						peers.size(),
+						Ui::Text::WithEntities));
 				box->closeBox();
 			}));
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 		};
 		_controller->show(
-			Box<PeerListBox>(std::move(controller), std::move(initBox)),
-			Ui::LayerOption::KeepOther);
+			Box<PeerListBox>(std::move(controller), std::move(initBox)));
 	}));
 	content->add(object_ptr<Ui::DividerLabel>(
 		content,
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 7b46bb111..488676af2 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -213,9 +213,7 @@ void Cover::initViewers() {
 		} else {
 			QGuiApplication::clipboard()->setText(
 				_user->session().createInternalLinkFull(username));
-			Ui::Toast::Show(
-				Window::Show(_controller).toastParent(),
-				tr::lng_username_copied(tr::now));
+			_controller->showToast(tr::lng_username_copied(tr::now));
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/settings/settings_power_saving.cpp b/Telegram/SourceFiles/settings/settings_power_saving.cpp
index 21974c9a0..15b83b18d 100644
--- a/Telegram/SourceFiles/settings/settings_power_saving.cpp
+++ b/Telegram/SourceFiles/settings/settings_power_saving.cpp
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "settings/settings_common.h"
 #include "ui/layers/generic_box.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/widgets/buttons.h"
 #include "ui/power_saving.h"
 #include "styles/style_menu_icons.h"
@@ -84,13 +83,13 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 				: rpl::single(QString());
 		}) | rpl::flatten_latest();
 
-		const auto disabler = Ui::CreateChild<Ui::AbstractButton>(container.get());
+		const auto show = box->uiShow();
+		const auto disabler = Ui::CreateChild<Ui::AbstractButton>(
+			container.get());
 		disabler->setClickedCallback([=] {
-			Ui::ShowMultilineToast({
-				.parentOverride = container,
-				.text = { tr::lng_settings_power_turn_off(tr::now) },
-				.duration = kForceDisableTooltipDuration,
-			});
+			show->showToast(
+				tr::lng_settings_power_turn_off(tr::now),
+				kForceDisableTooltipDuration);
 		});
 		disabler->paintRequest() | rpl::start_with_next([=](QRect clip) {
 			auto color = st::boxBg->c;
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 78c324fe6..2c3f2eecf 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -860,12 +860,10 @@ void TopBarUser::updateTitle(
 	auto link = std::make_shared<LambdaClickHandler>([=,
 			stickerSetIdentifier = stickerInfo->set] {
 		setPaused(true);
-		const auto box = controller->show(
-			Box<StickerSetBox>(
-				controller,
-				stickerSetIdentifier,
-				Data::StickersType::Emoji),
-			Ui::LayerOption::KeepOther);
+		const auto box = controller->show(Box<StickerSetBox>(
+			controller->uiShow(),
+			stickerSetIdentifier,
+			Data::StickersType::Emoji));
 
 		box->boxClosing(
 		) | rpl::start_with_next(crl::guard(this, [=] {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index f28b44e96..665c44ed4 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -418,8 +418,7 @@ void BlockedBoxController::BlockNewPeer(
 		box->addButton(tr::lng_cancel(), [box] { box->closeBox(); });
 	};
 	window->show(
-		Box<PeerListBox>(std::move(controller), std::move(initBox)),
-		Ui::LayerOption::KeepOther);
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
 bool BlockedBoxController::appendRow(not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 42b2980ff..d9fff1232 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -193,14 +193,14 @@ void AddPremiumPrivacyButton(
 			tr::lng_settings_privacy_premium_link(tr::now));
 		link.entities.push_back(
 			EntityInText(EntityType::Semibold, 0, link.text.size()));
-		const auto config = Ui::Toast::Config{
+		(*toast) = controller->showToast({
 			.text = tr::lng_settings_privacy_premium(
 				tr::now,
 				lt_link,
 				link,
 				Ui::Text::WithEntities),
 			.st = &st::defaultMultilineToast,
-			.durationMs = Ui::Toast::kDefaultDuration * 2,
+			.duration = Ui::Toast::kDefaultDuration * 2,
 			.multiline = true,
 			.filter = crl::guard(&controller->session(), [=](
 					const ClickHandlerPtr &,
@@ -215,10 +215,7 @@ void AddPremiumPrivacyButton(
 				}
 				return false;
 			}),
-		};
-		(*toast) = Ui::Toast::Show(
-			Window::Show(controller).toastParent(),
-			config);
+		});
 	};
 	button->addClickHandler([=] {
 		if (!session->premium()) {
@@ -232,9 +229,10 @@ void AddPremiumPrivacyButton(
 		) | rpl::take(
 			1
 		) | rpl::start_with_next([=](const Privacy::Rule &value) {
-			controller->show(
-				Box<EditPrivacyBox>(controller, controllerFactory(), value),
-				Ui::LayerOption::KeepOther);
+			controller->show(Box<EditPrivacyBox>(
+				controller,
+				controllerFactory(),
+				value));
 		});
 	});
 }
@@ -833,9 +831,10 @@ void AddPrivacyButton(
 		) | rpl::take(
 			1
 		) | rpl::start_with_next([=](const Privacy::Rule &value) {
-			controller->show(
-				Box<EditPrivacyBox>(controller, controllerFactory(), value),
-				Ui::LayerOption::KeepOther);
+			controller->show(Box<EditPrivacyBox>(
+				controller,
+				controllerFactory(),
+				value));
 		});
 	});
 }
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index 274b543ed..642f138c2 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -88,10 +88,7 @@ EditInfoBox::EditInfoBox(
 		Core::App().settings().replaceEmojiValue());
 	_field->setMarkdownReplacesEnabled(rpl::single(true));
 	_field->setEditLinkCallback(
-		DefaultEditLinkCallback(
-			std::make_shared<Window::Show>(controller),
-			&controller->session(),
-			_field));
+		DefaultEditLinkCallback(controller->uiShow(), _field));
 }
 
 void EditInfoBox::prepare() {
@@ -495,9 +492,7 @@ void Helper::showEditInfoBox(
 			TextUtilities::ConvertTextTagsToEntities(result.tags)
 		}, done);
 	};
-	controller->show(
-		Box<EditInfoBox>(controller, editData, save),
-		Ui::LayerOption::KeepOther);
+	controller->show(Box<EditInfoBox>(controller, editData, save));
 }
 
 void Helper::saveInfo(
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index d77b84f3e..c00a2b278 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -1045,8 +1045,8 @@ void Panel::showBox(object_ptr<BoxContent> box) {
 		anim::type::normal);
 }
 
-void Panel::showToast(const TextWithEntities &text) {
-	_widget->showToast(text);
+void Panel::showToast(TextWithEntities &&text) {
+	_widget->showToast(std::move(text));
 }
 
 void Panel::showCriticalError(const TextWithEntities &text) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index a3f48b2d2..c2898afc2 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -66,7 +66,7 @@ public:
 		rpl::producer<QString> bottomText);
 
 	void showBox(object_ptr<BoxContent> box);
-	void showToast(const TextWithEntities &text);
+	void showToast(TextWithEntities &&text);
 	void showCriticalError(const TextWithEntities &text);
 	void showWebviewError(
 		const QString &text,
diff --git a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
index c3be83c2f..fc24f1aab 100644
--- a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
@@ -176,14 +176,14 @@ void ShowPremiumPromoToast(not_null<Window::SessionController*> controller) {
 		tr::lng_send_as_premium_required_link(tr::now));
 	link.entities.push_back(
 		EntityInText(EntityType::Semibold, 0, link.text.size()));
-	const auto config = Ui::Toast::Config{
+	(*toast) = controller->showToast({
 		.text = tr::lng_send_as_premium_required(
 			tr::now,
 			lt_link,
 			link,
 			Ui::Text::WithEntities),
 		.st = &st::defaultMultilineToast,
-		.durationMs = Ui::Toast::kDefaultDuration * 2,
+		.duration = Ui::Toast::kDefaultDuration * 2,
 		.multiline = true,
 		.filter = crl::guard(&controller->session(), [=](
 				const ClickHandlerPtr &,
@@ -198,10 +198,7 @@ void ShowPremiumPromoToast(not_null<Window::SessionController*> controller) {
 			}
 			return false;
 		}),
-	};
-	(*toast) = Ui::Toast::Show(
-		Window::Show(controller).toastParent(),
-		config);
+	});
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index c4439d25e..df5f98e04 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -63,7 +63,7 @@ void CameraBox(
 	using namespace Webrtc;
 
 	const auto track = Settings::Calls::AddCameraSubsection(
-		std::make_shared<Ui::BoxShow>(box),
+		box->uiShow(),
 		box->verticalLayout(),
 		false);
 	if (!track) {
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index c140f7947..002159100 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 CountryInput::CountryInput(
 	QWidget *parent,
-	std::shared_ptr<Window::Show> show,
+	std::shared_ptr<Ui::Show> show,
 	const style::InputField &st)
 : RpWidget(parent)
 , _show(show)
diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h
index 986b741a5..7bf3f9796 100644
--- a/Telegram/SourceFiles/ui/countryinput.h
+++ b/Telegram/SourceFiles/ui/countryinput.h
@@ -17,16 +17,15 @@ namespace Countries {
 struct Info;
 } // namespace Countries
 
-namespace Window {
+namespace Ui {
 class Show;
-} // namespace Window
+} // namespace Ui
 
 class CountryInput : public Ui::RpWidget {
-
 public:
 	CountryInput(
 		QWidget *parent,
-		std::shared_ptr<Window::Show> show,
+		std::shared_ptr<Ui::Show> show,
 		const style::InputField &st);
 
 	[[nodiscard]] QString iso() const {
@@ -49,7 +48,7 @@ private:
 	void chooseCountry(not_null<const Countries::Info*> info, int codeIndex);
 	void setText(const QString &newText);
 
-	const std::shared_ptr<Window::Show> _show;
+	const std::shared_ptr<Ui::Show> _show;
 	const style::InputField &_st;
 	bool _active = false;
 	QString _text;
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 1ad731fc4..bdc5fc849 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwidget.h"
 #include "ui/ui_utility.h"
 #include "ui/chat/chat_theme.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/painter.h"
 #include "boxes/premium_preview_box.h"
 #include "data/data_peer.h"
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index d1c648fc0..b045fb2de 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -892,12 +892,11 @@ void SaveThemeBox(
 			} else if (error == u"THEME_SLUG_INVALID"_q) {
 				type = SaveErrorType::Link;
 			} else if (error == u"THEME_SLUG_OCCUPIED"_q) {
-				Ui::Toast::Show(
-					Ui::BoxShow(box).toastParent(),
+				box->showToast(
 					tr::lng_create_channel_link_occupied(tr::now));
 				type = SaveErrorType::Link;
 			} else if (!error.isEmpty()) {
-				Ui::Toast::Show(Ui::BoxShow(box).toastParent(), error);
+				box->showToast(error);
 			}
 			if (type == SaveErrorType::Name) {
 				name->showError();
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index 25e62283f..ca6f48b3d 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -39,6 +39,61 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QScreen>
 
 namespace Window {
+namespace {
+
+class Show final : public Ui::Show {
+public:
+	explicit Show(not_null<Controller*> window);
+
+	void showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options
+			= Ui::LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+
+private:
+	const base::weak_ptr<Controller> _window;
+
+};
+
+Show::Show(not_null<Controller*> window)
+: _window(base::make_weak(window)) {
+}
+
+void Show::showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options) const {
+	if (const auto window = _window.get()) {
+		window->show(std::move(content), options);
+	}
+}
+
+void Show::hideLayer() const {
+	if (const auto window = _window.get()) {
+		window->show(
+			object_ptr<Ui::BoxContent>{ nullptr },
+			Ui::LayerOption::CloseOther);
+	}
+}
+
+not_null<QWidget*> Show::toastParent() const {
+	const auto window = _window.get();
+	Assert(window != nullptr);
+	return window->widget()->bodyWidget();
+}
+
+bool Show::valid() const {
+	return !_window.empty();
+}
+
+Show::operator bool() const {
+	return valid();
+}
+
+} // namespace
 
 Controller::Controller() : Controller(CreateArgs{}) {
 }
@@ -220,13 +275,11 @@ void Controller::checkLockByTerms() {
 }
 
 void Controller::showTermsDecline() {
-	const auto box = show(
-		Box<Window::TermsBox>(
-			TextWithEntities{ tr::lng_terms_update_sorry(tr::now) },
-			tr::lng_terms_decline_and_delete(),
-			tr::lng_terms_back(),
-			true),
-		Ui::LayerOption::KeepOther);
+	const auto box = show(Box<Window::TermsBox>(
+		TextWithEntities{ tr::lng_terms_update_sorry(tr::now) },
+		tr::lng_terms_decline_and_delete(),
+		tr::lng_terms_back(),
+		true));
 
 	box->agreeClicks(
 	) | rpl::start_with_next([=] {
@@ -252,14 +305,12 @@ void Controller::showTermsDelete() {
 			hideLayer();
 		}
 	};
-	show(
-		Ui::MakeConfirmBox({
-			.text = tr::lng_terms_delete_warning(),
-			.confirmed = deleteByTerms,
-			.confirmText = tr::lng_terms_delete_now(),
-			.confirmStyle = &st::attentionBoxButton,
-		}),
-		Ui::LayerOption::KeepOther);
+	show(Ui::MakeConfirmBox({
+		.text = tr::lng_terms_delete_warning(),
+		.confirmed = deleteByTerms,
+		.confirmText = tr::lng_terms_delete_now(),
+		.confirmStyle = &st::attentionBoxButton,
+	}));
 }
 
 void Controller::finishFirstShow() {
@@ -341,8 +392,16 @@ int Controller::verticalShadowTop() const {
 		: 0;
 }
 
-void Controller::showToast(const QString &text) {
-	Ui::Toast::Show(_widget.bodyWidget(), text);
+void Controller::showToast(Ui::Toast::Config &&config) {
+	Show(this).showToast(std::move(config));
+}
+
+void Controller::showToast(TextWithEntities &&text, crl::time duration) {
+	Show(this).showToast(std::move(text), duration);
+}
+
+void Controller::showToast(const QString &text, crl::time duration) {
+	Show(this).showToast(text, duration);
 }
 
 void Controller::showLayer(
@@ -515,6 +574,10 @@ auto Controller::floatPlayerDelegateValue() const
 	return _floatPlayerDelegate.value();
 }
 
+std::shared_ptr<Ui::Show> Controller::uiShow() {
+	return std::make_shared<Show>(this);
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index b106a4d51..62abd54bb 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -16,6 +16,14 @@ class Account;
 class Session;
 } // namespace Main
 
+namespace Ui {
+class Show;
+} // namespace Ui
+
+namespace Ui::Toast {
+struct Config;
+} // namespace Ui::Toast
+
 namespace Media::View {
 struct OpenRequest;
 } // namespace Media::View
@@ -87,7 +95,11 @@ public:
 		showBox(std::move(content), options, animated);
 		return result;
 	}
-	void showToast(const QString &text);
+
+	void showToast(Ui::Toast::Config &&config);
+	void showToast(TextWithEntities &&text, crl::time duration = 0);
+	void showToast(const QString &text, crl::time duration = 0);
+
 	void showLayer(
 		std::unique_ptr<Ui::LayerWidget> &&layer,
 		Ui::LayerOptions options,
@@ -131,6 +143,8 @@ public:
 	[[nodiscard]] auto floatPlayerDelegateValue() const
 		-> rpl::producer<FloatDelegate*>;
 
+	[[nodiscard]] std::shared_ptr<Ui::Show> uiShow();
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp
index a68a25025..c0b02c9c3 100644
--- a/Telegram/SourceFiles/window/window_lock_widgets.cpp
+++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp
@@ -243,7 +243,7 @@ void TermsBox::prepare() {
 			st::termsPadding),
 		0,
 		age ? age->height() : 0);
-	const auto toastParent = Ui::BoxShow(this).toastParent();
+	const auto show = uiShow();
 	content->entity()->setClickHandlerFilter([=](
 			const ClickHandlerPtr &handler,
 			Qt::MouseButton button) {
@@ -252,8 +252,7 @@ void TermsBox::prepare() {
 			: QString();
 		if (TextUtilities::RegExpMention().match(link).hasMatch()) {
 			_lastClickedMention = link;
-			Ui::Toast::Show(
-				toastParent,
+			show->showToast(
 				tr::lng_terms_agree_to_proceed(tr::now, lt_bot, link));
 			return false;
 		}
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 2feff047b..305b88329 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -157,7 +157,7 @@ void ShowCallsBox(not_null<Window::SessionController*> window) {
 					Window::SectionShow(anim::type::instant));
 			};
 			const auto clearAll = crl::guard(box, [=] {
-				Ui::BoxShow(box).showBox(Box(Calls::ClearCallsBox, window));
+				box->uiShow()->showBox(Box(Calls::ClearCallsBox, window));
 			});
 			state->menu->addAction(
 				tr::lng_settings_section_call_settings(tr::now),
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 6b3f84e81..77055b6bf 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "menu/menu_check_item.h"
 #include "boxes/share_box.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/message_field.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/input_fields.h"
@@ -40,7 +41,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/layers/generic_box.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/delayed_activation.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
@@ -197,7 +197,7 @@ void PeerMenuAddMuteSubmenuAction(
 			notifySettings->update(thread, { .unmute = true });
 		}), &st::menuIconUnmute);
 	} else {
-		const auto show = std::make_shared<Window::Show>(controller);
+		const auto show = controller->uiShow();
 		addAction(PeerMenuCallback::Args{
 			.text = tr::lng_context_mute(tr::now),
 			.handler = nullptr,
@@ -212,23 +212,19 @@ void PeerMenuAddMuteSubmenuAction(
 }
 
 void ForwardToSelf(
-		not_null<Window::SessionNavigation*> navigation,
+		std::shared_ptr<Main::SessionShow> show,
 		const Data::ForwardDraft &draft) {
-	const auto content = navigation->parentController()->content();
-	const auto session = &navigation->session();
+	const auto session = &show->session();
 	const auto history = session->data().history(session->user());
 	auto resolved = history->resolveForwardDraft(draft);
 	if (!resolved.items.empty()) {
 		auto action = Api::SendAction(history);
 		action.clearDraft = false;
 		action.generateLocal = false;
-		const auto weakContent = Ui::MakeWeak(content);
 		session->api().forwardMessages(
 			std::move(resolved),
 			action,
-			crl::guard(weakContent, [w = weakContent] {
-				Ui::Toast::Show(w, tr::lng_share_done(tr::now));
-			}));
+			[=] { show->showToast(tr::lng_share_done(tr::now)); });
 	}
 }
 
@@ -414,9 +410,7 @@ void TogglePinnedThread(
 			(&owner->session())->data().chatsFilters().list(),
 			filterId,
 			&Data::ChatFilter::id)) {
-		Ui::Toast::Show(
-			Window::Show(controller).toastParent(),
-			tr::lng_cant_do_this(tr::now));
+		controller->showToast(tr::lng_cant_do_this(tr::now));
 		return;
 	}
 
@@ -777,9 +771,7 @@ void Filler::addViewDiscussion() {
 	const auto navigation = _controller;
 	_addAction(tr::lng_profile_view_discussion(tr::now), [=] {
 		if (channel->invitePeekExpires()) {
-			Ui::Toast::Show(
-				Window::Show(navigation).toastParent(),
-				tr::lng_channel_invite_private(tr::now));
+			navigation->showToast(tr::lng_channel_invite_private(tr::now));
 			return;
 		}
 		navigation->showPeerHistory(
@@ -955,11 +947,9 @@ void Filler::addTopicLink() {
 		const auto query = base + '/' + QString::number(id.bare);
 		const auto link = channel->session().createInternalLinkFull(query);
 		QGuiApplication::clipboard()->setText(link);
-		Ui::Toast::Show(
-			Window::Show(controller).toastParent(),
-			(channel->hasUsername()
-				? tr::lng_channel_public_link_copied(tr::now)
-				: tr::lng_context_about_private_link(tr::now)));
+		controller->showToast(channel->hasUsername()
+			? tr::lng_channel_public_link_copied(tr::now)
+			: tr::lng_context_about_private_link(tr::now));
 	}, &st::menuIconCopy);
 }
 
@@ -1048,7 +1038,7 @@ void Filler::addTTLSubmenu(bool addSeparator) {
 		return; // #TODO later forum
 	}
 	const auto validator = TTLMenu::TTLValidator(
-		std::make_shared<Window::Show>(_controller),
+		_controller->uiShow(),
 		_peer);
 	if (!validator.can()) {
 		return;
@@ -1170,7 +1160,6 @@ void Filler::addVideoChat() {
 		FillVideoChatMenu(_controller, _request, _addAction);
 		return;
 	}
-	const auto show = std::make_shared<Window::Show>(_controller);
 	_addAction(PeerMenuCallback::Args{
 		.text = tr::lng_menu_start_group_call_options(tr::now),
 		.handler = nullptr,
@@ -1276,14 +1265,11 @@ void Filler::fillArchiveActions() {
 	}, hidden ? &st::menuIconExpand : &st::menuIconCollapse);
 
 	_addAction(tr::lng_context_archive_to_menu(tr::now), [=] {
-		Ui::Toast::Show(
-			Window::Show(controller).toastParent(),
-			Ui::Toast::Config{
-				.text = { tr::lng_context_archive_to_menu_info(tr::now) },
-				.st = &st::windowArchiveToast,
-				.durationMs = kArchivedToastDuration,
-				.multiline = true,
-			});
+		controller->showToast({
+			.text = { tr::lng_context_archive_to_menu_info(tr::now) },
+			.st = &st::windowArchiveToast,
+			.duration = kArchivedToastDuration,
+		});
 
 		controller->session().settings().setArchiveInMainMenu(
 			!controller->session().settings().archiveInMainMenu());
@@ -1378,16 +1364,13 @@ void PeerMenuShareContactBox(
 		const auto peer = thread->peer();
 		if (!Data::CanSend(thread, ChatRestriction::SendOther)) {
 			navigation->parentController()->show(
-				Ui::MakeInformBox(tr::lng_forward_share_cant()),
-				Ui::LayerOption::KeepOther);
+				Ui::MakeInformBox(tr::lng_forward_share_cant()));
 			return;
 		} else if (peer->isSelf()) {
 			auto action = Api::SendAction(thread);
 			action.clearDraft = false;
 			user->session().api().shareContact(user, action);
-			Ui::Toast::Show(
-				Window::Show(navigation).toastParent(),
-				tr::lng_share_done(tr::now));
+			navigation->showToast(tr::lng_share_done(tr::now));
 			if (auto strong = *weak) {
 				strong->closeBox();
 			}
@@ -1419,8 +1402,7 @@ void PeerMenuShareContactBox(
 					close();
 				},
 				.confirmText = tr::lng_forward_send(),
-			}),
-			Ui::LayerOption::KeepOther);
+			}));
 	};
 	*weak = navigation->parentController()->show(
 		Box<PeerListBox>(
@@ -1431,8 +1413,7 @@ void PeerMenuShareContactBox(
 				box->addButton(tr::lng_cancel(), [=] {
 					box->closeBox();
 				});
-			}),
-		Ui::LayerOption::CloseOther);
+			}));
 }
 
 void PeerMenuCreatePoll(
@@ -1585,8 +1566,7 @@ void PeerMenuBlockUserBox(
 			}
 		}
 
-		Ui::Toast::Show(
-			Window::Show(window).toastParent(),
+		window->showToast(
 			tr::lng_new_contact_block_done(tr::now, lt_user, name));
 	}, st::attentionBoxButton);
 
@@ -1650,15 +1630,16 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 		std::make_unique<ChooseRecipientBoxController>(
 			&navigation->session(),
 			std::move(callback)),
-		std::move(initBox)), Ui::LayerOption::KeepOther);
+		std::move(initBox)));
 	return weak->data();
 }
 
 QPointer<Ui::BoxContent> ShowForwardMessagesBox(
-		not_null<Window::SessionNavigation*> navigation,
+		std::shared_ptr<ChatHelpers::Show> show,
 		Data::ForwardDraft &&draft,
 		Fn<void()> &&successCallback) {
-	const auto owner = &navigation->session().data();
+	const auto session = &show->session();
+	const auto owner = &session->data();
 	const auto msgIds = owner->itemsToIds(owner->idsToItems(draft.ids));
 	if (msgIds.empty()) {
 		return nullptr;
@@ -1753,7 +1734,6 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 
 	};
 
-	const auto session = &navigation->session();
 	struct State {
 		not_null<ListBox*> box;
 		not_null<Controller*> controller;
@@ -1764,24 +1744,37 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		const auto controllerRaw = controller.get();
 		auto box = Box<ListBox>(std::move(controller), nullptr);
 		const auto boxRaw = box.data();
-		navigation->parentController()->show(
-			std::move(box),
-			Ui::LayerOption::KeepOther);
+		show->showBox(std::move(box));
 		auto state = State{ boxRaw, controllerRaw };
 		return boxRaw->lifetime().make_state<State>(std::move(state));
 	}();
 
 	{ // Chosen a single.
-		auto chosen = [navigation, draft = std::move(draft)](
+		auto chosen = [show, draft = std::move(draft)](
 				not_null<Data::Thread*> thread) mutable {
-			const auto content = navigation->parentController()->content();
 			const auto peer = thread->peer();
 			if (peer->isSelf()
 				&& !draft.ids.empty()
 				&& draft.ids.front().peer != peer->id) {
-				ForwardToSelf(navigation, draft);
+				ForwardToSelf(show, draft);
 				return true;
 			}
+			auto controller = Core::App().windowFor(peer);
+			if (!controller) {
+				return false;
+			}
+			if (controller->maybeSession() != &peer->session()) {
+				controller = peer->isForum()
+					? Core::App().ensureSeparateWindowForAccount(
+						&peer->account())
+					: Core::App().ensureSeparateWindowForPeer(
+						peer,
+						ShowAtUnreadMsgId);
+				if (controller->maybeSession() != &peer->session()) {
+					return false;
+				}
+			}
+			const auto content = controller->sessionController()->content();
 			return content->setForwardDraft(thread, std::move(draft));
 		};
 		auto callback = [=, chosen = std::move(chosen)](
@@ -1810,7 +1803,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		st::shareCommentPadding);
 
 	const auto send = ShareBox::DefaultForwardCallback(
-		std::make_shared<Window::Show>(navigation),
+		show,
 		session->data().message(msgIds.front())->history(),
 		msgIds);
 
@@ -1913,10 +1906,11 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 	QObject::connect(field, &Ui::InputField::submitted, [=] {
 		submit({});
 	});
-	const auto show = std::make_shared<Ui::BoxShow>(state->box);
-	if (show->valid()) {
-		InitMessageFieldHandlers(session, show, field, nullptr);
-	}
+	InitMessageFieldHandlers(
+		session,
+		show,
+		field,
+		[=] { return show->paused(GifPauseReason::Layer); });
 	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
 
 	Ui::SendPendingMoveResizeEvents(comment);
@@ -1951,6 +1945,16 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 	return QPointer<Ui::BoxContent>(state->box);
 }
 
+QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+		not_null<Window::SessionNavigation*> navigation,
+		Data::ForwardDraft &&draft,
+		Fn<void()> &&successCallback) {
+	return ShowForwardMessagesBox(
+		navigation->uiShow(),
+		std::move(draft),
+		std::move(successCallback));
+}
+
 QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		not_null<Window::SessionNavigation*> navigation,
 		MessageIdsList &&items,
@@ -1994,8 +1998,7 @@ QPointer<Ui::BoxContent> ShowShareGameBox(
 			Ui::MakeConfirmBox({
 				.text = confirmText,
 				.confirmed = std::move(send),
-			}),
-			Ui::LayerOption::KeepOther);
+			}));
 	};
 	auto filter = [](not_null<Data::Thread*> thread) {
 		return !thread->peer()->isSelf()
@@ -2012,7 +2015,7 @@ QPointer<Ui::BoxContent> ShowShareGameBox(
 			&navigation->session(),
 			std::move(chosen),
 			std::move(filter)),
-		std::move(initBox)), Ui::LayerOption::KeepOther);
+		std::move(initBox)));
 	return weak->data();
 }
 
@@ -2071,10 +2074,7 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 		history->peer,
 		{ .forward = &list });
 	if (!error.isEmpty()) {
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(navigation).toastParent(),
-			.text = { error },
-		});
+		navigation->showToast(error);
 		return { nullptr };
 	}
 	auto done = [
@@ -2102,13 +2102,11 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 			callback();
 		}
 	};
-	return navigation->parentController()->show(
-		Ui::MakeConfirmBox({
-			.text = text,
-			.confirmed = std::move(done),
-			.confirmText = tr::lng_send_button(),
-		}),
-		Ui::LayerOption::KeepOther).data();
+	return navigation->parentController()->show(Ui::MakeConfirmBox({
+		.text = text,
+		.confirmed = std::move(done),
+		.confirmText = tr::lng_send_button(),
+	})).data();
 }
 
 void PeerMenuAddChannelMembers(
@@ -2117,9 +2115,7 @@ void PeerMenuAddChannelMembers(
 	if (!channel->isMegagroup()
 		&& (channel->membersCount()
 			>= channel->session().serverConfig().chatSizeMax)) {
-		navigation->parentController()->show(
-			Box<MaxInviteBox>(channel),
-			Ui::LayerOption::KeepOther);
+		navigation->parentController()->show(Box<MaxInviteBox>(channel));
 		return;
 	}
 	const auto api = &channel->session().api();
@@ -2325,7 +2321,7 @@ void ToggleHistoryArchived(not_null<History*> history, bool archived) {
 				? tr::lng_archived_added(tr::now)
 				: tr::lng_archived_removed(tr::now)) },
 			.st = &st::windowArchiveToast,
-			.durationMs = (archived
+			.duration = (archived
 				? kArchivedToastDuration
 				: Ui::Toast::kDefaultDuration),
 			.multiline = true,
@@ -2341,9 +2337,7 @@ Fn<void()> ClearHistoryHandler(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
 	return [=] {
-		controller->show(
-			Box<DeleteMessagesBox>(peer, true),
-			Ui::LayerOption::KeepOther);
+		controller->show(Box<DeleteMessagesBox>(peer, true));
 	};
 }
 
@@ -2351,9 +2345,7 @@ Fn<void()> DeleteAndLeaveHandler(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
 	return [=] {
-		controller->show(
-			Box<DeleteMessagesBox>(peer, false),
-			Ui::LayerOption::KeepOther);
+		controller->show(Box<DeleteMessagesBox>(peer, false));
 	};
 }
 
@@ -2377,9 +2369,7 @@ bool FillVideoChatMenu(
 		controller->startOrJoinGroupCall(peer, std::move(args));
 	};
 	const auto rtmpCallback = [=] {
-		Core::App().calls().showStartWithRtmp(
-			std::make_shared<Window::Show>(controller),
-			peer);
+		Core::App().calls().showStartWithRtmp(controller->uiShow(), peer);
 	};
 	const auto livestream = !peer->isMegagroup() && peer->isChannel();
 	const auto has = (peer->groupCall() != nullptr);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index d224197d1..44e3bd90f 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -34,6 +34,10 @@ class MainList;
 struct EntryState;
 } // namespace Dialogs
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Window {
 
 class Controller;
@@ -119,6 +123,10 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 	rpl::producer<QString> titleOverride = nullptr,
 	FnMut<void()> &&successCallback = nullptr);
+QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	Data::ForwardDraft &&draft,
+	Fn<void()> &&successCallback = nullptr);
 QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 	not_null<Window::SessionNavigation*> navigation,
 	Data::ForwardDraft &&draft,
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index add465f59..d40800ef7 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document_resolver.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
+#include "data/data_file_origin.h"
 #include "data/data_folder.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -64,7 +65,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/message_sending_animation_controller.h"
 #include "ui/style/style_palette_colorizer.h"
 #include "ui/toast/toast.h"
-#include "ui/toasts/common_toasts.h"
 #include "calls/calls_instance.h" // Core::App().calls().inCall().
 #include "calls/group/calls_group_call.h"
 #include "ui/boxes/calendar_box.h"
@@ -109,6 +109,137 @@ constexpr auto kMaxChatEntryHistorySize = 50;
 	};
 }
 
+class MainWindowShow final : public ChatHelpers::Show {
+public:
+	explicit MainWindowShow(not_null<SessionNavigation*> navigation);
+
+	void showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options
+			= Ui::LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	not_null<QWidget*> toastParent() const override;
+	bool valid() const override;
+	operator bool() const override;
+
+	Main::Session &session() const override;
+	bool paused(ChatHelpers::PauseReason reason) const override;
+	rpl::producer<> pauseChanged() const override;
+
+	rpl::producer<bool> adjustShadowLeft() const override;
+	SendMenu::Type sendMenuType() const override;
+
+	bool showMediaPreview(
+		Data::FileOrigin origin,
+		not_null<DocumentData*> document) const override;
+	bool showMediaPreview(
+		Data::FileOrigin origin,
+		not_null<PhotoData*> photo) const override;
+
+	void processChosenSticker(
+		ChatHelpers::FileChosen chosen) const override;
+
+private:
+	const base::weak_ptr<SessionController> _window;
+
+};
+
+MainWindowShow::MainWindowShow(
+	not_null<SessionNavigation*> navigation)
+: _window(base::make_weak(navigation->parentController())) {
+}
+
+void MainWindowShow::showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options) const {
+	if (const auto window = _window.get()) {
+		window->show(std::move(content), options);
+	}
+}
+
+void MainWindowShow::hideLayer() const {
+	if (const auto window = _window.get()) {
+		window->show(
+			object_ptr<Ui::BoxContent>{ nullptr },
+			Ui::LayerOption::CloseOther);
+	}
+}
+
+not_null<QWidget*> MainWindowShow::toastParent() const {
+	const auto window = _window.get();
+	Assert(window != nullptr);
+	return window->widget()->bodyWidget();
+}
+
+bool MainWindowShow::valid() const {
+	return !_window.empty();
+}
+
+MainWindowShow::operator bool() const {
+	return valid();
+}
+
+Main::Session &MainWindowShow::session() const {
+	const auto window = _window.get();
+	Assert(window != nullptr);
+	return window->session();
+}
+
+bool MainWindowShow::paused(ChatHelpers::PauseReason reason) const {
+	const auto window = _window.get();
+	return window && window->isGifPausedAtLeastFor(reason);
+}
+
+rpl::producer<> MainWindowShow::pauseChanged() const {
+	const auto window = _window.get();
+	if (!window) {
+		return rpl::never<>();
+	}
+	return window->gifPauseLevelChanged();
+}
+
+rpl::producer<bool> MainWindowShow::adjustShadowLeft() const {
+	const auto window = _window.get();
+	if (!window) {
+		return rpl::single(false);
+	}
+	return window->adaptive().value(
+	) | rpl::map([=] {
+		return !window->adaptive().isOneColumn();
+	});
+}
+
+SendMenu::Type MainWindowShow::sendMenuType() const {
+	const auto window = _window.get();
+	if (!window) {
+		return SendMenu::Type::Disabled;
+	}
+	return window->content()->sendMenuType();
+}
+
+bool MainWindowShow::showMediaPreview(
+		Data::FileOrigin origin,
+		not_null<DocumentData*> document) const {
+	const auto window = _window.get();
+	return window && window->widget()->showMediaPreview(origin, document);
+}
+
+bool MainWindowShow::showMediaPreview(
+		Data::FileOrigin origin,
+		not_null<PhotoData*> photo) const {
+	const auto window = _window.get();
+	return window && window->widget()->showMediaPreview(origin, photo);
+}
+
+void MainWindowShow::processChosenSticker(
+		ChatHelpers::FileChosen chosen) const {
+	if (const auto window = _window.get()) {
+		Ui::PostponeCall(window, [=, chosen = std::move(chosen)]() mutable {
+			window->stickerOrEmojiChosen(std::move(chosen));
+		});
+	}
+}
+
 } // namespace
 
 void ActivateWindow(not_null<SessionController*> controller) {
@@ -160,8 +291,8 @@ void DateClickHandler::onClick(ClickContext context) const {
 }
 
 SessionNavigation::SessionNavigation(not_null<Main::Session*> session)
-	: _session(session)
-	, _api(&_session->mtp()) {
+: _session(session)
+, _api(&_session->mtp()) {
 }
 
 SessionNavigation::~SessionNavigation() = default;
@@ -263,12 +394,10 @@ void SessionNavigation::resolveChannelById(
 		done(channel);
 		return;
 	}
-	const auto fail = [=] {
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(this).toastParent(),
-			.text = { tr::lng_error_post_link_invalid(tr::now) }
-		});
-	};
+	const auto fail = crl::guard(this, [=] {
+		MainWindowShow(this).showToast(
+			tr::lng_error_post_link_invalid(tr::now));
+	});
 	_api.request(base::take(_resolveRequestId)).cancel();
 	_resolveRequestId = _api.request(MTPchannels_GetChannels(
 		MTP_vector<MTPInputChannel>(
@@ -464,12 +593,10 @@ void SessionNavigation::joinVoiceChatFromLink(
 		const PeerByLinkInfo &info) {
 	Expects(info.voicechatHash.has_value());
 
-	const auto bad = [=] {
-		Ui::ShowMultilineToast({
-			.parentOverride = Window::Show(this).toastParent(),
-			.text = { tr::lng_group_invite_bad_link(tr::now) }
-		});
-	};
+	const auto bad = crl::guard(this, [=] {
+		MainWindowShow(this).showToast(
+			tr::lng_group_invite_bad_link(tr::now));
+	});
 	const auto hash = *info.voicechatHash;
 	_api.request(base::take(_resolveRequestId)).cancel();
 	_resolveRequestId = _api.request(
@@ -603,9 +730,7 @@ void SessionNavigation::showRepliesForMessage(
 		_showingRepliesRequestId = 0;
 		if (error.type() == u"CHANNEL_PRIVATE"_q
 			|| error.type() == u"USER_BANNED_IN_CHANNEL"_q) {
-			Ui::Toast::Show(
-				Show(this).toastParent(),
-				tr::lng_group_not_accessible(tr::now));
+			showToast(tr::lng_group_not_accessible(tr::now));
 		}
 	}).send();
 }
@@ -697,6 +822,27 @@ void SessionNavigation::showPollResults(
 	showSection(std::make_shared<Info::Memento>(poll, contextId), params);
 }
 
+auto SessionNavigation::showToast(Ui::Toast::Config &&config)
+-> base::weak_ptr<Ui::Toast::Instance> {
+	return MainWindowShow(this).showToast(std::move(config));
+}
+
+auto SessionNavigation::showToast(const QString &text, crl::time duration)
+-> base::weak_ptr<Ui::Toast::Instance> {
+	return MainWindowShow(this).showToast(text);
+}
+
+auto SessionNavigation::showToast(
+	TextWithEntities &&text,
+	crl::time duration)
+-> base::weak_ptr<Ui::Toast::Instance> {
+	return MainWindowShow(this).showToast(std::move(text));
+}
+
+std::shared_ptr<ChatHelpers::Show> SessionNavigation::uiShow() {
+	return std::make_shared<MainWindowShow>(this);
+}
+
 struct SessionController::CachedThemeKey {
 	Ui::ChatThemeKey theme;
 	QString paper;
@@ -731,7 +877,7 @@ SessionController::SessionController(
 , _tabbedSelector(
 	std::make_unique<ChatHelpers::TabbedSelector>(
 		_window->widget(),
-		this,
+		uiShow(),
 		GifPauseReason::TabbedPanel))
 , _invitePeekTimer([=] { checkInvitePeek(); })
 , _activeChatsFilter(session->data().chatsFilters().defaultId())
@@ -1065,12 +1211,8 @@ void SessionController::setupPremiumToast() {
 		session().mtp().requestConfig();
 		return premium;
 	}) | rpl::start_with_next([=] {
-		Ui::Toast::Show(
-			Window::Show(this).toastParent(),
-			{
-				.text = { tr::lng_premium_success(tr::now) },
-				.st = &st::defaultToast,
-			});
+		MainWindowShow(this).showToast(
+			{ tr::lng_premium_success(tr::now) });
 	}, _lifetime);
 }
 
@@ -1327,14 +1469,6 @@ void SessionController::floatPlayerAreaUpdated() {
 	}
 }
 
-void SessionController::materializeLocalDrafts() {
-	_materializeLocalDraftsRequests.fire({});
-}
-
-rpl::producer<> SessionController::materializeLocalDraftsRequests() const {
-	return _materializeLocalDraftsRequests.events();
-}
-
 int SessionController::dialogsSmallColumnWidth() const {
 	return st::defaultDialogRow.padding.left()
 		+ st::defaultDialogRow.photoSize
@@ -1558,14 +1692,9 @@ void SessionController::showPeer(not_null<PeerData*> peer, MsgId msgId) {
 			&& (!currentPeer->isChannel()
 				|| currentPeer->asChannel()->linkedChat()
 					!= clickedChannel)) {
-			Ui::ShowMultilineToast({
-				.parentOverride = Window::Show(this).toastParent(),
-				.text = {
-					.text = peer->isMegagroup()
-						? tr::lng_group_not_accessible(tr::now)
-						: tr::lng_channel_not_accessible(tr::now)
-				},
-			});
+			MainWindowShow(this).showToast(peer->isMegagroup()
+				? tr::lng_group_not_accessible(tr::now)
+				: tr::lng_channel_not_accessible(tr::now));
 		} else {
 			showPeerHistory(peer->id, SectionShow(), msgId);
 		}
@@ -1581,10 +1710,7 @@ void SessionController::startOrJoinGroupCall(not_null<PeerData*> peer) {
 void SessionController::startOrJoinGroupCall(
 		not_null<PeerData*> peer,
 		Calls::StartGroupCallArgs args) {
-	Core::App().calls().startOrJoinGroupCall(
-		std::make_shared<Show>(this),
-		peer,
-		args);
+	Core::App().calls().startOrJoinGroupCall(uiShow(), peer, args);
 }
 
 void SessionController::showCalendar(Dialogs::Key chat, QDate requestedDate) {
@@ -1963,21 +2089,15 @@ void SessionController::setActiveChatsFilter(
 }
 
 void SessionController::showAddContact() {
-	_window->show(
-		Box<AddContactBox>(&session()),
-		Ui::LayerOption::KeepOther);
+	_window->show(Box<AddContactBox>(&session()));
 }
 
 void SessionController::showNewGroup() {
-	_window->show(
-		Box<GroupInfoBox>(this, GroupInfoBox::Type::Group),
-		Ui::LayerOption::KeepOther);
+	_window->show(Box<GroupInfoBox>(this, GroupInfoBox::Type::Group));
 }
 
 void SessionController::showNewChannel() {
-	_window->show(
-		Box<GroupInfoBox>(this, GroupInfoBox::Type::Channel),
-		Ui::LayerOption::KeepOther);
+	_window->show(Box<GroupInfoBox>(this, GroupInfoBox::Type::Channel));
 }
 
 Window::Adaptive &SessionController::adaptive() const {
@@ -2012,13 +2132,6 @@ void SessionController::hideLayer(anim::type animated) {
 	_window->hideLayer(animated);
 }
 
-void SessionController::showToast(TextWithEntities &&text) {
-	Ui::ShowMultilineToast({
-		.parentOverride = Window::Show(this).toastParent(),
-		.text = std::move(text),
-	});
-}
-
 void SessionController::openPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId contextId,
@@ -2376,44 +2489,4 @@ SessionController::~SessionController() {
 	resetFakeUnreadWhileOpened();
 }
 
-Show::Show(not_null<SessionNavigation*> navigation)
-: Show(&navigation->parentController()->window()) {
-}
-
-Show::Show(Controller *window)
-: _window(base::make_weak(window)) {
-}
-
-Show::~Show() = default;
-
-void Show::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
-	if (const auto window = _window.get()) {
-		window->show(std::move(content), options);
-	}
-}
-
-void Show::hideLayer() const {
-	if (const auto window = _window.get()) {
-		window->show(
-			object_ptr<Ui::BoxContent>{ nullptr },
-			Ui::LayerOption::CloseOther);
-	}
-}
-
-not_null<QWidget*> Show::toastParent() const {
-	const auto window = _window.get();
-	Assert(window != nullptr);
-	return window->widget()->bodyWidget();
-}
-
-bool Show::valid() const {
-	return !_window.empty();
-}
-
-Show::operator bool() const {
-	return valid();
-}
-
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index b06dd32c7..70b3c7716 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "base/timer.h"
 #include "boxes/gift_premium_box.h" // GiftPremiumValidator.
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_chat_participant_status.h"
 #include "dialogs/dialogs_key.h"
 #include "ui/layers/layer_widget.h"
@@ -80,22 +81,14 @@ class CachedIconFactory;
 
 namespace Window {
 
+using GifPauseReason = ChatHelpers::PauseReason;
+using GifPauseReasons = ChatHelpers::PauseReasons;
+
 class MainWindow;
 class SectionMemento;
 class Controller;
 class FiltersMenu;
 
-enum class GifPauseReason {
-	Any           = 0,
-	InlineResults = (1 << 0),
-	TabbedPanel   = (1 << 1),
-	Layer         = (1 << 2),
-	RoundPlaying  = (1 << 3),
-	MediaPreview  = (1 << 4),
-};
-using GifPauseReasons = base::flags<GifPauseReason>;
-inline constexpr bool is_flag_type(GifPauseReason) { return true; };
-
 enum class ResolveType {
 	Default,
 	BotApp,
@@ -186,7 +179,7 @@ public:
 	explicit SessionNavigation(not_null<Main::Session*> session);
 	virtual ~SessionNavigation();
 
-	Main::Session &session() const;
+	[[nodiscard]] Main::Session &session() const;
 
 	virtual void showSection(
 		std::shared_ptr<SectionMemento> memento,
@@ -276,6 +269,17 @@ public:
 		FullMsgId contextId,
 		const SectionShow &params = SectionShow());
 
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		Ui::Toast::Config &&config);
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		TextWithEntities &&text,
+		crl::time duration = 0);
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		const QString &text,
+		crl::time duration = 0);
+
+	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow();
+
 private:
 	void resolvePhone(
 		const QString &phone,
@@ -345,8 +349,6 @@ public:
 		anim::type animated = anim::type::normal);
 	void hideLayer(anim::type animated = anim::type::normal);
 
-	void showToast(TextWithEntities &&text);
-
 	[[nodiscard]] auto sendingAnimation() const
 	-> Ui::MessageSendingAnimationController &;
 	[[nodiscard]] auto tabbedSelector() const
@@ -406,9 +408,6 @@ public:
 	bool isGifPausedAtLeastFor(GifPauseReason reason) const;
 	void floatPlayerAreaUpdated();
 
-	void materializeLocalDrafts();
-	[[nodiscard]] rpl::producer<> materializeLocalDraftsRequests() const;
-
 	struct ColumnLayout {
 		int bodyWidth = 0;
 		int dialogsWidth = 0;
@@ -696,8 +695,6 @@ private:
 
 	QString _premiumRef;
 
-	rpl::event_stream<> _materializeLocalDraftsRequests;
-
 	rpl::lifetime _lifetime;
 
 };
@@ -711,22 +708,4 @@ void ActivateWindow(not_null<SessionController*> controller);
 	not_null<SessionController*> controller,
 	GifPauseReason level);
 
-class Show : public Ui::Show {
-public:
-	explicit Show(not_null<SessionNavigation*> navigation);
-	explicit Show(Controller *window);
-	~Show();
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options = Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
-	[[nodiscard]] not_null<QWidget*> toastParent() const override;
-	[[nodiscard]] bool valid() const override;
-	operator bool() const override;
-
-private:
-	const base::weak_ptr<Controller> _window;
-
-};
-
 } // namespace Window
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 7c9aa9453..b85085222 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7c9aa94533276d693942ed0ffb39d3d66a49e124
+Subproject commit b850852221fd27e8c70b01238638a29b50774369

From d909248e2502ed3f85597ab3f3a2471a47c1f0d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 May 2023 15:55:26 +0400
Subject: [PATCH 149/676] 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 b85085222..f0225406e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b850852221fd27e8c70b01238638a29b50774369
+Subproject commit f0225406ec57d0cdccc05166ff398b0dec4bedfe

From e8a4a7b754c9c85cb57b5d54e11b4564a6353d0a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 May 2023 16:29:26 +0400
Subject: [PATCH 150/676] Some build fixes.

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

diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index 2fd3a249a..b94ec0107 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit 2fd3a249a984019c79d8cbfac33ac92ed58fbf30
+Subproject commit b94ec0107b03f13c28f336642411c6df21107a63
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f0225406e..303a07f94 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f0225406ec57d0cdccc05166ff398b0dec4bedfe
+Subproject commit 303a07f9461524dc6debf86ae04d0ee6d3134eb6

From e05b813b6ee4e81b16f9da661de708af35383eef Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 17 May 2023 17:24:38 +0400
Subject: [PATCH 151/676] Fix gobject-inrospection dependency in snap

Debian's weird package naming goes on
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a6f548b1b..da7dd6199 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -97,12 +97,12 @@ parts:
       - LDFLAGS: -s
     build-packages:
       - clang
-      - gobject-introspection
       - python3
       - libasound2-dev
       - libavif-dev
       - libboost-program-options-dev
       - libfmt-dev
+      - libgirepository1.0-dev
       - libheif-dev
       - libopus-dev
       - libpulse-dev

From 90b5c6a5822961a9c96ba4c729f8bdd6951d0f77 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 May 2023 11:54:45 +0400
Subject: [PATCH 152/676] Version 4.8.2: Hardened Runtime in Mac App Store.

---
 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/Telegram/Telegram Lite.entitlements | 2 ++
 Telegram/build/build.sh                      | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 4 ++++
 8 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 8bd060316..555c4fafe 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.8.1.0" />
+    Version="4.8.2.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 1c61220e5..388da258a 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,8,1,0
- PRODUCTVERSION 4,8,1,0
+ FILEVERSION 4,8,2,0
+ PRODUCTVERSION 4,8,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.1.0"
+            VALUE "FileVersion", "4.8.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.1.0"
+            VALUE "ProductVersion", "4.8.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index e8302a2cb..41f5d267d 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,8,1,0
- PRODUCTVERSION 4,8,1,0
+ FILEVERSION 4,8,2,0
+ PRODUCTVERSION 4,8,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.1.0"
+            VALUE "FileVersion", "4.8.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.1.0"
+            VALUE "ProductVersion", "4.8.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index b96e0183e..1eef1dce2 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 = 4008001;
-constexpr auto AppVersionStr = "4.8.1";
+constexpr auto AppVersion = 4008002;
+constexpr auto AppVersionStr = "4.8.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/Telegram/Telegram Lite.entitlements b/Telegram/Telegram/Telegram Lite.entitlements
index 0db87db6e..46355b637 100644
--- a/Telegram/Telegram/Telegram Lite.entitlements	
+++ b/Telegram/Telegram/Telegram Lite.entitlements	
@@ -16,5 +16,7 @@
 	<true/>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
+	<key>com.apple.security.device.camera</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh
index 7e7759309..65bb3725c 100755
--- a/Telegram/build/build.sh
+++ b/Telegram/build/build.sh
@@ -329,8 +329,8 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
     if [ "$BuildTarget" == "mac" ]; then
       codesign --force --deep --timestamp --options runtime --sign "Developer ID Application: John Preston" "$ReleasePath/$BundleName" --entitlements "$HomePath/Telegram/Telegram.entitlements"
     elif [ "$BuildTarget" == "macstore" ]; then
-      codesign --force --sign "3rd Party Mac Developer Application: Telegram FZ-LLC (C67CF9S4VU)" "$ReleasePath/$BundleName/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib" --entitlements "$HomePath/Telegram/Breakpad.entitlements"
-      codesign --force --deep --sign "3rd Party Mac Developer Application: Telegram FZ-LLC (C67CF9S4VU)" "$ReleasePath/$BundleName" --entitlements "$HomePath/Telegram/Telegram Lite.entitlements"
+      codesign --force --timestamp --options runtime --sign "3rd Party Mac Developer Application: Telegram FZ-LLC (C67CF9S4VU)" "$ReleasePath/$BundleName/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib" --entitlements "$HomePath/Telegram/Breakpad.entitlements"
+      codesign --force --deep --timestamp --options runtime --sign "3rd Party Mac Developer Application: Telegram FZ-LLC (C67CF9S4VU)" "$ReleasePath/$BundleName" --entitlements "$HomePath/Telegram/Telegram Lite.entitlements"
       echo "Making an installer.."
       productbuild --sign "3rd Party Mac Developer Installer: Telegram FZ-LLC (C67CF9S4VU)" --component "$ReleasePath/$BundleName" /Applications "$ReleasePath/$BinaryName.pkg"
     fi
diff --git a/Telegram/build/version b/Telegram/build/version
index d5aaf3055..8286557cf 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008001
+AppVersion         4008002
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.1
-AppVersionStr      4.8.1
+AppVersionStrSmall 4.8.2
+AppVersionStr      4.8.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.1
+AppVersionOriginal 4.8.2
diff --git a/changelog.txt b/changelog.txt
index dc4a30397..5808d84d5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.2 (16.05.23)
+
+- Apply hardening runtime for Mac App Store version.
+
 4.8.1 (24.04.23)
 
 - Fix sending an album of ten scheduled messages.

From 6dff1f11ba3adb823ebe0ed3875a24d65bb5118c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 18 May 2023 11:00:34 +0400
Subject: [PATCH 153/676] Fix .gir file generation in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index da7dd6199..e412c8950 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -97,6 +97,7 @@ parts:
       - LDFLAGS: -s
     build-packages:
       - clang
+      - libtool-bin
       - python3
       - libasound2-dev
       - libavif-dev

From 862f4822f29277605009165f40c69f7791c9ed46 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 18 May 2023 15:18:50 +0400
Subject: [PATCH 154/676] Don't drop default LDFLAGS in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e412c8950..267e36019 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -94,7 +94,7 @@ parts:
     parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
     build-environment:
       - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-      - LDFLAGS: -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
       - clang
       - libtool-bin
@@ -274,7 +274,7 @@ parts:
     source-tag: v0.8.1
     plugin: cmake
     build-environment:
-      - LDFLAGS: -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -307,7 +307,7 @@ parts:
     source-tag: v4.0.3
     plugin: cmake
     build-environment:
-      - LDFLAGS: -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -328,7 +328,7 @@ parts:
     source-tag: 1.23.0
     plugin: cmake
     build-environment:
-      - LDFLAGS: -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
       - libasound2-dev
       - libdbus-1-dev
@@ -358,7 +358,7 @@ parts:
     source-tag: v21.9
     plugin: cmake
     build-environment:
-      - LDFLAGS: -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
       - zlib1g-dev
     stage-packages:
@@ -379,7 +379,7 @@ parts:
   qt:
     plugin: nil
     build-environment:
-      - LDFLAGS: -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
       - libdbus-1-dev
       - libegl-dev
@@ -534,7 +534,7 @@ parts:
     source-commit: dcb5069ff76bd293e86928804208737e6cee2ccc
     plugin: cmake
     build-environment:
-      - LDFLAGS: -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
       - yasm
       - libdrm-dev

From 3eca5d206b4c8cde394cfff31f6002d135313a53 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Mon, 1 May 2023 00:24:08 +0000
Subject: [PATCH 155/676] Update User-Agent for DNS to Chrome 112.0.5615.165.

---
 .../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 83078ef5a..ae5ad7a04 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/111.0.5563.110 Safari/537.36");
+		"Chrome/112.0.5615.165 Safari/537.36");
 	return kResult;
 }
 

From 2ea50f5c85a8139ef8ce2861f0770b5adb738b65 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 19 May 2023 11:24:38 +0400
Subject: [PATCH 156/676] Constify options in Linux screen locker monitor

That's possible now thanks to cppgir update
---
 Telegram/SourceFiles/platform/linux/integration_linux.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index fd8553f6f..6015f05d9 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -101,7 +101,7 @@ void LinuxIntegration::init() {
 		);
 	});
 
-	auto options = std::array{
+	const auto options = std::array{
 		GLib::Variant::new_dict_entry(
 			GLib::Variant::new_string("handle_token"),
 			GLib::Variant::new_variant(

From 9514b0d1f1f8f7c9f960e7c0bc2b8119b27173e7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 19 May 2023 11:25:38 +0400
Subject: [PATCH 157/676] Get rid of unneeded gi::result wrap

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

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 6015f05d9..e501ce93b 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -30,10 +30,10 @@ public:
 
 private:
 	[[nodiscard]] XdpInhibit::Inhibit inhibit() {
-		return *_inhibitProxy;
+		return _inhibitProxy;
 	}
 
-	gi::result<XdpInhibit::InhibitProxy> _inhibitProxy;
+	XdpInhibit::InhibitProxy _inhibitProxy;
 	base::Platform::XDP::SettingWatcher _darkModeWatcher;
 };
 
@@ -43,7 +43,8 @@ LinuxIntegration::LinuxIntegration()
 		Gio::BusType::SESSION_,
 		Gio::DBusProxyFlags::DO_NOT_AUTO_START_AT_CONSTRUCTION_,
 		std::string(base::Platform::XDP::kService),
-		std::string(base::Platform::XDP::kObjectPath)))
+		std::string(base::Platform::XDP::kObjectPath),
+		nullptr))
 , _darkModeWatcher([](
 	const Glib::ustring &group,
 	const Glib::ustring &key,
@@ -67,7 +68,7 @@ void LinuxIntegration::init() {
 		return;
 	}
 
-	auto uniqueName = _inhibitProxy->get_connection().get_unique_name();
+	auto uniqueName = _inhibitProxy.get_connection().get_unique_name();
 	uniqueName.erase(0, 1);
 	uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
 

From 082ffb6cd1ee0a78dfa4131681b246d11ed054b2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 19 May 2023 14:15:23 +0400
Subject: [PATCH 158/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 92a2915b4..840250261 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 92a2915b4bc831d9d3e725a462c9736bcabb9632
+Subproject commit 8402502615af3d58da6785f00681fc5fb43b907f
diff --git a/cmake b/cmake
index ff81e9562..cb7a966ad 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit ff81e9562db1b573036d3e5c9dbd7b6f9d1b8b8f
+Subproject commit cb7a966ad88c7a5eb0bceb4d0c52a2f0872fc4b2

From 1d2a50c4079818663880a6a10fd16ade90a6c0b2 Mon Sep 17 00:00:00 2001
From: Vedant <83997633+vedantmgoyal2009@users.noreply.github.com>
Date: Sun, 21 May 2023 18:37:04 +0530
Subject: [PATCH 159/676] Fix installer selection for winget-releaser

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

diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
index a9f25a450..0ff2d50d8 100644
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -10,9 +10,11 @@ jobs:
         uses: telegramdesktop/winget-releaser@main
         with:
           identifier: Telegram.TelegramDesktop
+          installers-regex: 't(setup|portable).*(exe|zip)$'
           token: ${{ secrets.WINGET_TOKEN }}
       - if: github.event.action == 'prereleased'
         uses: telegramdesktop/winget-releaser@main
         with:
           identifier: Telegram.TelegramDesktop.Beta
+          installers-regex: 't(setup|portable).*(exe|zip)$'
           token: ${{ secrets.WINGET_TOKEN }}

From ad573ecc84a043ff8740f48a92659fdaf1212f9f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 12:50:54 +0400
Subject: [PATCH 160/676] Fix a possible crash in Large Emoji toggling.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index d219727c1..d6e7c4099 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -1493,6 +1493,7 @@ auto Element::takeReactionAnimations()
 
 Element::~Element() {
 	// Delete media while owner still exists.
+	clearSpecialOnlyEmoji();
 	base::take(_media);
 	if (_heavyCustomEmoji) {
 		_heavyCustomEmoji = false;

From b6395d08d84ae1626211f3e1c671b6edb42b6ac9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 13:20:13 +0400
Subject: [PATCH 161/676] Remove streaming channel from live stream
 "participants".

---
 .../view/history_view_group_call_bar.cpp        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
index 0e5176c12..bce9881b4 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
@@ -70,8 +70,10 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 		std::vector<UserpicInRow> userpics;
 		Ui::GroupCallBarContent current;
 		base::has_weak_ptr guard;
+		uint64 ownerId = 0;
 		bool someUserpicsNotLoaded = false;
 		bool pushScheduled = false;
+		bool noUserpics = false;
 	};
 
 	// speaking DESC, std::max(date, lastActive) DESC
@@ -244,6 +246,8 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 	return [=](auto consumer) {
 		auto lifetime = rpl::lifetime();
 		auto state = lifetime.make_state<State>();
+		state->noUserpics = call->listenersHidden();
+		state->ownerId = call->peer()->id.value;
 		state->current.shown = true;
 		state->current.livestream = call->peer()->isBroadcast();
 
@@ -254,7 +258,18 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 			state->pushScheduled = true;
 			crl::on_main(&state->guard, [=] {
 				state->pushScheduled = false;
-				consumer.put_next_copy(state->current);
+				auto copy = state->current;
+				if (state->noUserpics && copy.count > 0) {
+					const auto i = ranges::find(
+						copy.users,
+						state->ownerId,
+						&Ui::GroupCallUser::id);
+					if (i != end(copy.users)) {
+						copy.users.erase(i);
+						--copy.count;
+					}
+				}
+				consumer.put_next(std::move(copy));
 			});
 		};
 

From 8ae373b654ab86c936797ff68484b4f647678f43 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 13:23:01 +0400
Subject: [PATCH 162/676] Update patches with a commit revert.

---
 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 4068f53ef..8ed900010 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -58,7 +58,7 @@ ENV CXXFLAGS $CFLAGS
 FROM builder AS patches
 RUN git clone {{ GIT }}/desktop-app/patches.git \
 	&& cd patches \
-	&& git checkout bf05b2a1cc \
+	&& git checkout 3fad86d684 \
 	&& rm -rf .git
 
 FROM builder AS nasm
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index f01db1f26..813716b75 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -404,7 +404,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout d0e227f7fd
+    git checkout 3fad86d684
 """)
 
 stage('msys64', """

From abc32c63b09b763946560c63b3f7c059cbaa361d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 16:58:34 +0400
Subject: [PATCH 163/676] Force-hide media viewer on passcode lock.

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

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index cc4040612..fbc4c6fb1 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -1138,7 +1138,7 @@ void Application::lockByPasscode() {
 	enumerateWindows([&](not_null<Window::Controller*> w) {
 		w->setupPasscodeLock();
 	});
-	hideMediaView();
+	_mediaView->close();
 }
 
 void Application::maybeLockByPasscode() {

From 0fa2f83cf86396665c8779a18b99a7336d9139b1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 23 May 2023 12:25:16 +0400
Subject: [PATCH 164/676] Fix gobject-introspection base in Dockerfile

It doesn't use patches
---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 8ed900010..94152c021 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -694,7 +694,7 @@ RUN git clone -b 2.76.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
 	&& cd .. \
 	&& rm -rf glibmm
 
-FROM patches AS gobject-introspection
+FROM builder AS gobject-introspection
 COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
 COPY --link --from=glibmm {{ LibrariesPath }}/glibmm-cache /
 

From c4b95b40e57173748cf8929e2738e1020d08cf69 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 23 May 2023 12:25:34 +0400
Subject: [PATCH 165/676] 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 2e313690d..46c465a2a 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 2e313690d9765f28fc98c6c79473296de3a3d85c
+Subproject commit 46c465a2aa1b0c127c6453f89d98301f4c525c48

From d34976346055fa23b5cb569d56f4eb1096e0a489 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 17:17:31 +0400
Subject: [PATCH 166/676] Fix "Remain Anonymous" change in recent actions.

---
 Telegram/Resources/langs/lang.strings               |  1 +
 .../history/admin_log/history_admin_log_item.cpp    | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index bb61f52c1..e43ba3a8a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3212,6 +3212,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_admin_post_messages" = "Post messages";
 "lng_admin_log_admin_edit_messages" = "Edit messages";
 "lng_admin_log_admin_delete_messages" = "Delete messages";
+"lng_admin_log_admin_remain_anonymous" = "Remain anonymous";
 "lng_admin_log_admin_ban_users" = "Ban users";
 "lng_admin_log_admin_invite_users" = "Add members";
 "lng_admin_log_admin_invite_link" = "Invite users via link";
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 de4e92724..ba2442308 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -226,6 +226,7 @@ TextWithEntities GenerateAdminChangeText(
 		{ Flag::PinMessages, tr::lng_admin_log_admin_pin_messages },
 		{ Flag::ManageCall, tr::lng_admin_log_admin_manage_calls },
 		{ Flag::AddAdmins, tr::lng_admin_log_admin_add_admins },
+		{ Flag::Anonymous, tr::lng_admin_log_admin_remain_anonymous },
 	};
 	phraseMap[Flag::InviteByLinkOrAdd] = invitePhrase;
 	phraseMap[Flag::ManageCall] = callPhrase;
@@ -559,10 +560,20 @@ auto GenerateParticipantChangeText(
 		switch (participant.type()) {
 		case Api::ChatParticipant::Type::Creator: {
 			// No valid string here :(
+			const auto user = GenerateParticipantString(
+				&channel->session(),
+				peerId);
+			if (peerId == channel->session().userPeerId()) {
+				return GenerateAdminChangeText(
+					channel,
+					user,
+					participant.rights(),
+					oldRights);
+			}
 			return tr::lng_admin_log_transferred(
 				tr::now,
 				lt_user,
-				GenerateParticipantString(&channel->session(), peerId),
+				user,
 				Ui::Text::WithEntities);
 		}
 		case Api::ChatParticipant::Type::Admin: {

From 04a3a50e74f0a82caa02664526f54ad9c9e20122 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 18:11:17 +0400
Subject: [PATCH 167/676] Show error when trying change number from TDesktop.

---
 Telegram/CMakeLists.txt                       |   2 -
 Telegram/Resources/langs/lang.strings         |  10 +-
 .../Resources/qrc/telegram/animations.qrc     |   1 -
 .../SourceFiles/boxes/change_phone_box.cpp    | 569 ------------------
 Telegram/SourceFiles/boxes/change_phone_box.h |  43 --
 .../SourceFiles/core/local_url_handlers.cpp   |   5 +-
 .../settings/settings_information.cpp         |   4 +-
 7 files changed, 6 insertions(+), 628 deletions(-)
 delete mode 100644 Telegram/SourceFiles/boxes/change_phone_box.cpp
 delete mode 100644 Telegram/SourceFiles/boxes/change_phone_box.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 78a649937..b84d103d2 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -230,8 +230,6 @@ PRIVATE
     boxes/background_box.h
     boxes/background_preview_box.cpp
     boxes/background_preview_box.h
-    boxes/change_phone_box.cpp
-    boxes/change_phone_box.h
     boxes/choose_filter_box.cpp
     boxes/choose_filter_box.h
     boxes/connection_box.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e43ba3a8a..570b7b3ed 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1056,17 +1056,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_self_destruct_sessions_title" = "Session termination";
 "lng_self_destruct_sessions_description" = "If you don't come online from a specific session at least once within this period, it will be terminated.";
 
-"lng_change_phone_title" = "Change phone number";
-"lng_change_phone_about" = "You can change your Telegram number\nhere. Your account and all your cloud data\n— messages, media, contacts, etc. will be\nmoved to the new number.\n\n**Important**: all your Telegram contacts will\nget your **new number** added to their address\nbook, provided they had your old number and\nyou haven't blocked them in Telegram.";
-"lng_change_phone_warning" = "All your Telegram contacts will get your new number added to their address book, provided they had your old number and you haven't blocked them in Telegram.";
-"lng_change_phone_occupied" = "The number {phone} is already connected to a Telegram account. Please delete that account before migrating to the new number.";
-"lng_change_phone_button" = "Change number";
-"lng_change_phone_new_title" = "Enter new number";
-"lng_change_phone_new_description" = "We will send an SMS with a confirmation code to your new number.";
 "lng_change_phone_new_submit" = "Submit";
 "lng_change_phone_code_title" = "Enter code";
-"lng_change_phone_code_description" = "We've sent an SMS with a confirmation code to your phone {phone}.";
-"lng_change_phone_success" = "Your phone number has been changed.";
+"lng_change_phone_error" = "You can only change your phone number using mobile Telegram apps. Please use an official Telegram app on your phone to update your number.";
 
 "lng_mute_menu_mute" = "Mute";
 "lng_mute_menu_unmute" = "Unmute";
diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index 01ab9a5f7..28b0c58cc 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -1,6 +1,5 @@
 <RCC>
   <qresource prefix="/animations">
-    <file alias="change_number.tgs">../../animations/change_number.tgs</file>
     <file alias="blocked_peers_empty.tgs">../../animations/blocked_peers_empty.tgs</file>
     <file alias="filters.tgs">../../animations/filters.tgs</file>
     <file alias="cloud_filters.tgs">../../animations/cloud_filters.tgs</file>
diff --git a/Telegram/SourceFiles/boxes/change_phone_box.cpp b/Telegram/SourceFiles/boxes/change_phone_box.cpp
deleted file mode 100644
index d9032c5a4..000000000
--- a/Telegram/SourceFiles/boxes/change_phone_box.cpp
+++ /dev/null
@@ -1,569 +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 "boxes/change_phone_box.h"
-
-#include "core/file_utilities.h"
-#include "lang/lang_keys.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/sent_code_field.h"
-#include "ui/widgets/buttons.h"
-#include "ui/wrap/fade_wrap.h"
-#include "ui/toast/toast.h"
-#include "ui/text/format_values.h" // Ui::FormatPhone
-#include "ui/text/text_utilities.h"
-#include "ui/widgets/fields/special_fields.h"
-#include "ui/boxes/confirm_box.h"
-#include "boxes/phone_banned_box.h"
-#include "countries/countries_instance.h" // Countries::ExtractPhoneCode.
-#include "main/main_account.h"
-#include "main/main_session.h"
-#include "data/data_session.h"
-#include "data/data_user.h"
-#include "info/profile/info_profile_values.h"
-#include "lottie/lottie_icon.h"
-#include "mtproto/sender.h"
-#include "apiwrap.h"
-#include "window/window_session_controller.h"
-#include "styles/style_layers.h"
-#include "styles/style_boxes.h"
-
-namespace {
-
-void CreateErrorLabel(
-		QWidget *parent,
-		object_ptr<Ui::FadeWrap<Ui::FlatLabel>> &label,
-		const QString &text,
-		int x,
-		int y) {
-	if (label) {
-		label->hide(anim::type::normal);
-
-		auto saved = label.data();
-		auto destroy = [old = std::move(label)]() mutable {
-			old.destroyDelayed();
-		};
-
-		using namespace rpl::mappers;
-		saved->shownValue()
-			| rpl::filter(_1 == false)
-			| rpl::take(1)
-			| rpl::start_with_done(
-				std::move(destroy),
-				saved->lifetime());
-	}
-	if (!text.isEmpty()) {
-		label.create(
-			parent,
-			object_ptr<Ui::FlatLabel>(
-				parent,
-				text,
-				st::changePhoneError));
-		label->hide(anim::type::instant);
-		label->moveToLeft(x, y);
-		label->show(anim::type::normal);
-	}
-}
-
-[[nodiscard]] int ErrorSkip() {
-	return st::boxLittleSkip + st::changePhoneError.style.font->height;
-}
-
-} // namespace
-
-namespace Settings {
-
-class ChangePhone::EnterPhone : public Ui::BoxContent {
-public:
-	EnterPhone(QWidget*, not_null<Window::SessionController*> controller);
-
-	void setInnerFocus() override {
-		_phone->setFocusFast();
-	}
-
-protected:
-	void prepare() override;
-
-private:
-	void submit();
-	void sendPhoneDone(
-		const MTPauth_SentCode &result,
-		const QString &phoneNumber);
-	void sendPhoneFail(const MTP::Error &error, const QString &phoneNumber);
-	void showError(const QString &text);
-	void hideError() {
-		showError(QString());
-	}
-
-	const not_null<Window::SessionController*> _controller;
-	MTP::Sender _api;
-
-	object_ptr<Ui::PhoneInput> _phone = { nullptr };
-	object_ptr<Ui::FadeWrap<Ui::FlatLabel>> _error = { nullptr };
-	mtpRequestId _requestId = 0;
-
-};
-
-class ChangePhone::EnterCode : public Ui::BoxContent {
-public:
-	EnterCode(
-		QWidget*,
-		not_null<Window::SessionController*> controller,
-		const QString &phone,
-		const QString &hash,
-		const QString &openUrl,
-		int codeLength,
-		int callTimeout);
-
-	void setInnerFocus() override {
-		_code->setFocusFast();
-	}
-
-protected:
-	void prepare() override;
-
-private:
-	void submit(const QString &code);
-	void sendCall();
-	void updateCall();
-	void sendCodeFail(const MTP::Error &error);
-	void showError(const QString &text);
-	void hideError() {
-		showError(QString());
-	}
-	[[nodiscard]] int countHeight() const;
-
-	const not_null<Window::SessionController*> _controller;
-	MTP::Sender _api;
-
-	QString _phone;
-	QString _hash;
-	QString _openUrl;
-	int _codeLength = 0;
-	int _callTimeout = 0;
-	object_ptr<Ui::SentCodeField> _code = { nullptr };
-	object_ptr<Ui::FadeWrap<Ui::FlatLabel>> _error = { nullptr };
-	object_ptr<Ui::FlatLabel> _callLabel = { nullptr };
-	object_ptr<Ui::RoundButton> _fragment = { nullptr };
-	mtpRequestId _requestId = 0;
-	Ui::SentCodeCall _call;
-
-};
-
-ChangePhone::EnterPhone::EnterPhone(
-	QWidget*,
-	not_null<Window::SessionController*> controller)
-: _controller(controller)
-, _api(&controller->session().mtp()) {
-}
-
-void ChangePhone::EnterPhone::prepare() {
-	setTitle(tr::lng_change_phone_title());
-
-	const auto phoneValue = QString();
-	_phone.create(
-		this,
-		st::defaultInputField,
-		tr::lng_change_phone_new_title(),
-		Countries::ExtractPhoneCode(_controller->session().user()->phone()),
-		phoneValue,
-		[](const QString &s) { return Countries::Groups(s); });
-
-	_phone->resize(
-		st::boxWidth - 2 * st::boxPadding.left(),
-		_phone->height());
-	_phone->moveToLeft(st::boxPadding.left(), st::boxLittleSkip);
-	connect(_phone, &Ui::PhoneInput::submitted, [=] { submit(); });
-
-	const auto description = object_ptr<Ui::FlatLabel>(
-		this,
-		tr::lng_change_phone_new_description(tr::now),
-		st::changePhoneLabel);
-	description->moveToLeft(
-		st::boxPadding.left(),
-		_phone->y() + _phone->height() + ErrorSkip() + st::boxLittleSkip);
-
-	setDimensions(
-		st::boxWidth,
-		description->bottomNoMargins() + st::boxLittleSkip);
-
-	addButton(tr::lng_change_phone_new_submit(), [this] { submit(); });
-	addButton(tr::lng_cancel(), [this] { closeBox(); });
-}
-
-void ChangePhone::EnterPhone::submit() {
-	if (_requestId) {
-		return;
-	}
-	hideError();
-
-	const auto phoneNumber = _phone->getLastText().trimmed();
-	_requestId = _api.request(MTPaccount_SendChangePhoneCode(
-		MTP_string(phoneNumber),
-		MTP_codeSettings(
-			MTP_flags(0),
-			MTPVector<MTPbytes>(),
-			MTPstring(),
-			MTPBool())
-	)).done([=](const MTPauth_SentCode &result) {
-		_requestId = 0;
-		sendPhoneDone(result, phoneNumber);
-	}).fail([=](const MTP::Error &error) {
-		_requestId = 0;
-		sendPhoneFail(error, phoneNumber);
-	}).handleFloodErrors().send();
-}
-
-void ChangePhone::EnterPhone::sendPhoneDone(
-		const MTPauth_SentCode &result,
-		const QString &phoneNumber) {
-	const auto data = result.match([](const MTPDauth_sentCode &data) {
-		return &data;
-	}, [](const MTPDauth_sentCodeSuccess &) -> const MTPDauth_sentCode* {
-		LOG(("API Error: Unexpected auth.sentCodeSuccess "
-			"(ChangePhone::EnterPhone)."));
-		return nullptr;
-	});
-	if (!data) {
-		showError(Lang::Hard::ServerError());
-		return;
-	}
-
-	const auto bad = [&](const char *type) {
-		LOG(("API Error: Should not be '%1'.").arg(type));
-		showError(Lang::Hard::ServerError());
-		return false;
-	};
-	auto codeLength = 0;
-	auto codeByFragmentUrl = QString();
-	const auto hasLength = data->vtype().match([&](
-			const MTPDauth_sentCodeTypeApp &typeData) {
-		LOG(("Error: should not be in-app code!"));
-		showError(Lang::Hard::ServerError());
-		return false;
-	}, [&](const MTPDauth_sentCodeTypeSms &typeData) {
-		codeLength = typeData.vlength().v;
-		return true;
-	}, [&](const MTPDauth_sentCodeTypeFragmentSms &typeData) {
-		codeLength = typeData.vlength().v;
-		codeByFragmentUrl = qs(typeData.vurl());
-		return true;
-	}, [&](const MTPDauth_sentCodeTypeCall &typeData) {
-		codeLength = typeData.vlength().v;
-		return true;
-	}, [&](const MTPDauth_sentCodeTypeFlashCall &) {
-		return bad("FlashCall");
-	}, [&](const MTPDauth_sentCodeTypeMissedCall &) {
-		return bad("MissedCall");
-	}, [&](const MTPDauth_sentCodeTypeFirebaseSms &) {
-		return bad("FirebaseSms");
-	}, [&](const MTPDauth_sentCodeTypeEmailCode &) {
-		return bad("EmailCode");
-	}, [&](const MTPDauth_sentCodeTypeSetUpEmailRequired &) {
-		return bad("SetUpEmailRequired");
-	});
-	if (!hasLength) {
-		return;
-	}
-	const auto phoneCodeHash = qs(data->vphone_code_hash());
-	const auto callTimeout = [&] {
-		if (const auto nextType = data->vnext_type()) {
-			return nextType->match([&](const MTPDauth_sentCodeTypeCall &) {
-				return data->vtimeout().value_or(60);
-			}, [](const auto &) {
-				return 0;
-			});
-		}
-		return 0;
-	}();
-	_controller->show(Box<EnterCode>(
-		_controller,
-		phoneNumber,
-		phoneCodeHash,
-		codeByFragmentUrl,
-		codeLength,
-		callTimeout));
-}
-
-void ChangePhone::EnterPhone::sendPhoneFail(
-		const MTP::Error &error,
-		const QString &phoneNumber) {
-	if (MTP::IsFloodError(error)) {
-		showError(tr::lng_flood_error(tr::now));
-	} else if (error.type() == u"PHONE_NUMBER_INVALID"_q) {
-		showError(tr::lng_bad_phone(tr::now));
-	} else if (error.type() == u"PHONE_NUMBER_BANNED"_q) {
-		Ui::ShowPhoneBannedError(&_controller->window(), phoneNumber);
-	} else if (error.type() == u"PHONE_NUMBER_OCCUPIED"_q) {
-		_controller->show(
-			Ui::MakeInformBox(
-				tr::lng_change_phone_occupied(
-					tr::now,
-					lt_phone,
-					Ui::FormatPhone(phoneNumber))),
-			Ui::LayerOption::CloseOther);
-	} else {
-		showError(Lang::Hard::ServerError());
-	}
-}
-
-void ChangePhone::EnterPhone::showError(const QString &text) {
-	CreateErrorLabel(
-		this,
-		_error,
-		text,
-		st::boxPadding.left(),
-		_phone->y() + _phone->height() + st::boxLittleSkip);
-	if (!text.isEmpty()) {
-		_phone->showError();
-	}
-}
-
-ChangePhone::EnterCode::EnterCode(
-	QWidget*,
-	not_null<Window::SessionController*> controller,
-	const QString &phone,
-	const QString &hash,
-	const QString &openUrl,
-	int codeLength,
-	int callTimeout)
-: _controller(controller)
-, _api(&controller->session().mtp())
-, _phone(phone)
-, _hash(hash)
-, _openUrl(openUrl)
-, _codeLength(codeLength)
-, _callTimeout(callTimeout)
-, _call([this] { sendCall(); }, [this] { updateCall(); }) {
-}
-
-void ChangePhone::EnterCode::prepare() {
-	const auto width = st::boxWidth;
-	setTitle(tr::lng_change_phone_title());
-
-	const auto descriptionText = tr::lng_change_phone_code_description(
-		tr::now,
-		lt_phone,
-		Ui::Text::Bold(Ui::FormatPhone(_phone)),
-		Ui::Text::WithEntities);
-	const auto description = object_ptr<Ui::FlatLabel>(
-		this,
-		rpl::single(descriptionText),
-		st::changePhoneLabel);
-	description->moveToLeft(st::boxPadding.left(), 0);
-
-	const auto submitInput = [=] { submit(_code->getDigitsOnly()); };
-
-	const auto phoneValue = QString();
-	_code.create(
-		this,
-		st::defaultInputField,
-		tr::lng_change_phone_code_title(),
-		phoneValue);
-	_code->setAutoSubmit(_codeLength, submitInput);
-	_code->setChangedCallback([=] { hideError(); });
-
-	_code->resize(width - 2 * st::boxPadding.left(), _code->height());
-	_code->moveToLeft(st::boxPadding.left(), description->bottomNoMargins());
-	connect(_code, &Ui::InputField::submitted, submitInput);
-
-	if (!_openUrl.isEmpty()) {
-		_fragment.create(
-			this,
-			tr::lng_intro_fragment_button(),
-			st::fragmentBoxButton);
-		_fragment->setClickedCallback([=] { File::OpenUrl(_openUrl); });
-		_fragment->setTextTransform(
-			Ui::RoundButton::TextTransform::NoTransform);
-		const auto codeBottom = _code->y() + _code->height();
-		_fragment->setFullWidth(_code->width());
-		_fragment->moveToLeft(
-			(width - _fragment->width()) / 2,
-			codeBottom + ErrorSkip() + st::boxLittleSkip);
-	}
-
-	_controller->session().account().setHandleLoginCode([=](QString code) {
-		submit(code);
-	});
-	boxClosing(
-	) | rpl::start_with_next([controller = _controller] {
-		controller->session().account().setHandleLoginCode(nullptr);
-	}, lifetime());
-
-	setDimensions(width, countHeight());
-
-	if (_callTimeout > 0) {
-		_call.setStatus({ Ui::SentCodeCall::State::Waiting, _callTimeout });
-		updateCall();
-	}
-
-	addButton(tr::lng_change_phone_new_submit(), submitInput);
-	addButton(tr::lng_cancel(), [=] { closeBox(); });
-}
-
-int ChangePhone::EnterCode::countHeight() const {
-	return _code->bottomNoMargins()
-		+ ErrorSkip()
-		+ 3 * st::boxLittleSkip
-		+ (_fragment ? _fragment->height() : 0);
-}
-
-void ChangePhone::EnterCode::submit(const QString &code) {
-	if (_requestId) {
-		return;
-	}
-	hideError();
-
-	const auto session = &_controller->session();
-	const auto weak = Ui::MakeWeak(this);
-	_requestId = session->api().request(MTPaccount_ChangePhone(
-		MTP_string(_phone),
-		MTP_string(_hash),
-		MTP_string(code)
-	)).done([=, show = _controller->uiShow()](const MTPUser &result) {
-		_requestId = 0;
-		session->data().processUser(result);
-		if (weak) {
-			show->hideLayer();
-		}
-		show->showToast(tr::lng_change_phone_success(tr::now));
-	}).fail(crl::guard(this, [=](const MTP::Error &error) {
-		_requestId = 0;
-		sendCodeFail(error);
-	})).handleFloodErrors().send();
-}
-
-void ChangePhone::EnterCode::sendCall() {
-	_api.request(MTPauth_ResendCode(
-		MTP_string(_phone),
-		MTP_string(_hash)
-	)).done([=] {
-		_call.callDone();
-	}).send();
-}
-
-void ChangePhone::EnterCode::updateCall() {
-	const auto text = _call.getText();
-	if (text.isEmpty()) {
-		_callLabel.destroy();
-	} else if (!_callLabel) {
-		_callLabel.create(this, text, st::changePhoneLabel);
-		_callLabel->moveToLeft(
-			st::boxPadding.left(),
-			countHeight() - _callLabel->height());
-		_callLabel->show();
-	} else {
-		_callLabel->setText(text);
-	}
-}
-
-void ChangePhone::EnterCode::showError(const QString &text) {
-	CreateErrorLabel(
-		this,
-		_error,
-		text,
-		st::boxPadding.left(),
-		_code->y() + _code->height() + st::boxLittleSkip);
-	if (!text.isEmpty()) {
-		_code->showError();
-	}
-}
-
-void ChangePhone::EnterCode::sendCodeFail(const MTP::Error &error) {
-	if (MTP::IsFloodError(error)) {
-		showError(tr::lng_flood_error(tr::now));
-	} else if (error.type() == u"PHONE_CODE_EMPTY"_q
-		|| error.type() == u"PHONE_CODE_INVALID"_q) {
-		showError(tr::lng_bad_code(tr::now));
-	} else if (error.type() == u"PHONE_CODE_EXPIRED"_q
-		|| error.type() == u"PHONE_NUMBER_BANNED"_q) {
-		closeBox(); // Go back to phone input.
-	} else if (error.type() == u"PHONE_NUMBER_INVALID"_q) {
-		showError(tr::lng_bad_phone(tr::now));
-	} else {
-		showError(Lang::Hard::ServerError());
-	}
-}
-
-ChangePhone::ChangePhone(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller) {
-	setupContent();
-}
-
-rpl::producer<QString> ChangePhone::title() {
-	return Info::Profile::PhoneValue(
-		_controller->session().user()
-	) | rpl::map([](const TextWithEntities &text) {
-		return text.text;
-	});
-}
-
-void ChangePhone::setupContent() {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-
-	auto icon = CreateLottieIcon(content, {
-		.name = u"change_number"_q,
-		.sizeOverride = {
-			st::changePhoneIconSize,
-			st::changePhoneIconSize,
-		},
-	}, st::changePhoneIconPadding);
-	content->add(std::move(icon.widget));
-	_animate = std::move(icon.animate);
-
-	content->add(
-		object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				tr::lng_change_phone_button(),
-				st::changePhoneTitle)),
-		st::changePhoneTitlePadding);
-
-	content->add(
-		object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				tr::lng_change_phone_about(Ui::Text::RichLangValue),
-				st::changePhoneDescription)),
-		st::changePhoneDescriptionPadding);
-
-	const auto button = content->add(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
-			content,
-			object_ptr<Ui::RoundButton>(
-				content,
-				tr::lng_change_phone_button(),
-				st::changePhoneButton)),
-		st::changePhoneButtonPadding)->entity();
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	button->setClickedCallback([=] {
-		auto callback = [=] {
-			_controller->show(
-				Box<EnterPhone>(_controller),
-				Ui::LayerOption::CloseOther);
-		};
-		_controller->show(
-			Ui::MakeConfirmBox({
-				.text = tr::lng_change_phone_warning(),
-				.confirmed = std::move(callback),
-			}),
-			Ui::LayerOption::CloseOther);
-	});
-
-	Ui::ResizeFitChild(this, content);
-}
-
-void ChangePhone::showFinished() {
-	_animate(anim::repeat::loop);
-}
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/boxes/change_phone_box.h b/Telegram/SourceFiles/boxes/change_phone_box.h
deleted file mode 100644
index b837079e9..000000000
--- a/Telegram/SourceFiles/boxes/change_phone_box.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "boxes/abstract_box.h"
-#include "settings/settings_common.h"
-
-namespace Lottie {
-class Icon;
-} // namespace Lottie
-
-namespace Window {
-class SessionController;
-} // namespace Window
-
-namespace Settings {
-
-class ChangePhone : public Section<ChangePhone> {
-public:
-	ChangePhone(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	void showFinished() override;
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-private:
-	class EnterPhone;
-	class EnterCode;
-
-	void setupContent();
-
-	const not_null<Window::SessionController*> _controller;
-	Fn<void(anim::repeat)> _animate;
-
-};
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 60f65f230..1e6cda40f 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/sticker_set_box.h"
 #include "boxes/sessions_box.h"
 #include "boxes/language_box.h"
-#include "boxes/change_phone_box.h"
 #include "passport/passport_form_controller.h"
 #include "window/window_session_controller.h"
 #include "ui/toast/toast.h"
@@ -503,7 +502,9 @@ bool ResolveSettings(
 		} else if (section == u"themes"_q) {
 			return ::Settings::Chat::Id();
 		} else if (section == u"change_number"_q) {
-			return ::Settings::ChangePhone::Id();
+			controller->show(
+				Ui::MakeInformBox(tr::lng_change_phone_error()));
+			return {};
 		} else if (section == u"auto_delete"_q) {
 			return ::Settings::GlobalTTLId();
 		} else if (section == u"information"_q) {
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 7a001d74d..fd04b4af8 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -29,7 +29,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/core_settings.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "boxes/add_contact_box.h"
-#include "boxes/change_phone_box.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/username_box.h"
 #include "data/data_session.h"
@@ -374,7 +373,8 @@ void SetupRows(
 		{ &st::settingsIconUser, kIconLightBlue });
 
 	const auto showChangePhone = [=] {
-		controller->showSettings(ChangePhone::Id());
+		controller->show(
+			Ui::MakeInformBox(tr::lng_change_phone_error()));
 		controller->window().activate();
 	};
 	AddRow(

From f46f655a0ee87221c4fe9689186a7ccfc990e45e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 18:11:36 +0400
Subject: [PATCH 168/676] Revert "Disable xcb_xlib"

This reverts commit d1ff6e583dcb658e358ee8300715328d53a590be.

Otherwise HIME input is broken:
https://github.com/telegramdesktop/tdesktop/issues/26228
---
 .../platform/linux/specific_linux.cpp         | 22 -------------------
 Telegram/build/docker/centos_env/Dockerfile   |  1 -
 cmake                                         |  2 +-
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 1ea753fd3..6fd0d7478 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -50,20 +50,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <unistd.h>
 #include <dirent.h>
 #include <pwd.h>
-#include <dlfcn.h>
 
 #include <iostream>
 
 using namespace Platform;
 using Platform::internal::WaylandIntegration;
 
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-typedef struct _XDisplay Display;
-struct XErrorEvent;
-typedef int (*XErrorHandler)(Display*, XErrorEvent*);
-typedef XErrorHandler (*LPXSETERRORHANDLER)(XErrorHandler);
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
-
 typedef GApplication TDesktopApplication;
 typedef GApplicationClass TDesktopApplicationClass;
 
@@ -840,20 +832,6 @@ void start() {
 			"except various functionality to not to work.");
 	}
 
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-	// tdesktop doesn't use xlib by itself,
-	// but some libraries it depends on may do
-	const auto XSetErrorHandler = reinterpret_cast<LPXSETERRORHANDLER>(
-		dlsym(RTLD_DEFAULT, "XSetErrorHandler"));
-
-	// Reset errors if any
-	(void) dlerror();
-
-	if (XSetErrorHandler) {
-		XSetErrorHandler([](Display *dpy, XErrorEvent *err) { return 0; });
-	}
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
-
 	InstallLauncher();
 	LaunchGApplication();
 }
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 94152c021..36ebe4f30 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -744,7 +744,6 @@ RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }
 		-qt-harfbuzz \
 		-qt-pcre \
 		-no-icu \
-		-no-feature-xcb-xlib \
 		-no-feature-xcb-sm \
 		-no-feature-egl-extension-platform-wayland \
 		-static \
diff --git a/cmake b/cmake
index cb7a966ad..32e1044c5 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit cb7a966ad88c7a5eb0bceb4d0c52a2f0872fc4b2
+Subproject commit 32e1044c5198819dd470e3262275a9747dfd65de

From 8a99de16f6b8a3246c6361df1f70388e87dde12d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 18:48:48 +0400
Subject: [PATCH 169/676] Allow editing messages even if sending is not
 allowed.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 03eff7f27..86e37617c 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1763,7 +1763,7 @@ void HistoryWidget::setInnerFocus() {
 			|| isRecording()
 			|| isBotStart()
 			|| isBlocked()
-			|| !_canSendTexts) {
+			|| (!_canSendTexts && !_editMsgId)) {
 			if (_scroll->isHidden()) {
 				setFocus();
 			} else {
@@ -1881,10 +1881,6 @@ void HistoryWidget::fastShowAtEnd(not_null<History*> history) {
 bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	InvokeQueued(this, [=] { updateStickersByEmoji(); });
 
-	if (_voiceRecordBar->isActive() || !_canSendTexts) {
-		return false;
-	}
-
 	const auto editDraft = _history ? _history->localEditDraft({}) : nullptr;
 	const auto draft = editDraft
 		? editDraft
@@ -1892,7 +1888,15 @@ bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		? _history->localDraft({})
 		: nullptr;
 	auto fieldAvailable = canWriteMessage();
-	if (!draft || (!_history->localEditDraft({}) && !fieldAvailable)) {
+	const auto editMsgId = editDraft ? editDraft->msgId : 0;
+	if (_voiceRecordBar->isActive() || (!_canSendTexts && !editMsgId)) {
+		if (!_canSendTexts) {
+			clearFieldText(0, fieldHistoryAction);
+		}
+		return false;
+	}
+
+	if (!draft || (!editDraft && !fieldAvailable)) {
 		auto fieldWillBeHiddenAfterEdit = (!fieldAvailable && _editMsgId != 0);
 		clearFieldText(0, fieldHistoryAction);
 		setInnerFocus();
@@ -1922,11 +1926,7 @@ bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 
 	_processingReplyItem = _replyEditMsg = nullptr;
 	_processingReplyId = _replyToId = 0;
-	if (const auto editDraft = _history->localEditDraft({})) {
-		setEditMsgId(editDraft->msgId);
-	} else {
-		setEditMsgId(0);
-	}
+	setEditMsgId(editMsgId);
 	updateCmdStartShown();
 	updateControlsVisibility();
 	updateControlsGeometry();
@@ -2805,7 +2805,7 @@ void HistoryWidget::updateControlsVisibility() {
 		_send->show();
 		updateSendButtonType();
 
-		if (_canSendTexts) {
+		if (_canSendTexts || _editMsgId) {
 			_field->show();
 		} else {
 			fieldDisabledRemoved = false;
@@ -4922,7 +4922,7 @@ void HistoryWidget::recountChatWidth() {
 }
 
 int HistoryWidget::fieldHeight() const {
-	return _canSendTexts
+	return (_canSendTexts || _editMsgId)
 		? _field->height()
 		: (st::historySendSize.height() - 2 * st::historySendPadding);
 }
@@ -7641,7 +7641,7 @@ void HistoryWidget::updateTopBarSelection() {
 			|| isRecording()
 			|| isBotStart()
 			|| isBlocked()
-			|| !_canSendTexts) {
+			|| (!_canSendTexts && !_editMsgId)) {
 			_list->setFocus();
 		} else {
 			_field->setFocus();

From 7877463468c6f44fa3b1688960950cd4154bf2b4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 19:36:58 +0400
Subject: [PATCH 170/676] Respect peer_types in the switch inline button.

Fixes #26274.
---
 Telegram/SourceFiles/api/api_bot.cpp          | 12 +++++----
 Telegram/SourceFiles/api/api_bot.h            |  2 +-
 Telegram/SourceFiles/data/data_session.cpp    |  2 +-
 .../history/history_item_reply_markup.cpp     | 26 +++++++++++++++++++
 .../history/history_item_reply_markup.h       |  6 +++++
 .../SourceFiles/window/window_peer_menu.cpp   | 24 +++++++++++++++--
 .../SourceFiles/window/window_peer_menu.h     |  8 +++++-
 7 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 8fa7f884c..165402d7e 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -279,11 +279,11 @@ void SendBotCallbackDataWithPassword(
 
 bool SwitchInlineBotButtonReceived(
 		not_null<Window::SessionController*> controller,
-		const QString &query,
+		const QByteArray &queryWithPeerTypes,
 		UserData *samePeerBot,
 		MsgId samePeerReplyTo) {
 	return controller->content()->notify_switchInlineBotButtonReceived(
-		query,
+		QString::fromUtf8(queryWithPeerTypes),
 		samePeerBot,
 		samePeerReplyTo);
 }
@@ -441,14 +441,14 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 				if (samePeer) {
 					SwitchInlineBotButtonReceived(
 						controller,
-						QString::fromUtf8(button->data),
+						button->data,
 						bot,
 						item->id);
 					return true;
 				} else if (bot->isBot() && bot->botInfo->inlineReturnTo.key) {
 					const auto switched = SwitchInlineBotButtonReceived(
 						controller,
-						QString::fromUtf8(button->data));
+						button->data);
 					if (switched) {
 						return true;
 					}
@@ -466,7 +466,9 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 				Window::ShowChooseRecipientBox(
 					controller,
 					chosen,
-					tr::lng_inline_switch_choose());
+					tr::lng_inline_switch_choose(),
+					nullptr,
+					button->peerTypes);
 			}
 		}
 	} break;
diff --git a/Telegram/SourceFiles/api/api_bot.h b/Telegram/SourceFiles/api/api_bot.h
index 198ad926b..7e26dd103 100644
--- a/Telegram/SourceFiles/api/api_bot.h
+++ b/Telegram/SourceFiles/api/api_bot.h
@@ -30,7 +30,7 @@ void SendBotCallbackDataWithPassword(
 
 bool SwitchInlineBotButtonReceived(
 	not_null<Window::SessionController*> controller,
-	const QString &query,
+	const QByteArray &queryWithPeerTypes,
 	UserData *samePeerBot = nullptr,
 	MsgId samePeerReplyTo = 0);
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 59bf0886d..bb1fc659f 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -117,7 +117,7 @@ void CheckForSwitchInlineButton(not_null<HistoryItem*> item) {
 						if (!windows.empty()) {
 							Api::SwitchInlineBotButtonReceived(
 								windows.front(),
-								QString::fromUtf8(button.data));
+								button.data);
 						}
 						return;
 					}
diff --git a/Telegram/SourceFiles/history/history_item_reply_markup.cpp b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
index fecb3598e..c15381e92 100644
--- a/Telegram/SourceFiles/history/history_item_reply_markup.cpp
+++ b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
@@ -10,9 +10,32 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
+#include "inline_bots/bot_attach_web_view.h"
 
 namespace {
 
+[[nodiscard]] InlineBots::PeerTypes PeerTypesFromMTP(
+		const MTPvector<MTPInlineQueryPeerType> &types) {
+	using namespace InlineBots;
+	auto result = PeerTypes(0);
+	for (const auto &type : types.v) {
+		result |= type.match([&](const MTPDinlineQueryPeerTypePM &data) {
+			return PeerType::User;
+		}, [&](const MTPDinlineQueryPeerTypeChat &data) {
+			return PeerType::Group;
+		}, [&](const MTPDinlineQueryPeerTypeMegagroup &data) {
+			return PeerType::Group;
+		}, [&](const MTPDinlineQueryPeerTypeBroadcast &data) {
+			return PeerType::Broadcast;
+		}, [&](const MTPDinlineQueryPeerTypeBotPM &data) {
+			return PeerType::Bot;
+		}, [&](const MTPDinlineQueryPeerTypeSameBotPM &data) {
+			return PeerType();
+		});
+	}
+	return result;
+}
+
 [[nodiscard]] RequestPeerQuery RequestPeerQueryFromTL(
 		const MTPRequestPeerType &query) {
 	using Type = RequestPeerQuery::Type;
@@ -134,6 +157,9 @@ void HistoryMessageMarkupData::fillRows(
 						// Optimization flag.
 						// Fast check on all new messages if there is a switch button to auto-click it.
 						flags |= ReplyMarkupFlag::HasSwitchInlineButton;
+						if (const auto types = data.vpeer_types()) {
+							row.back().peerTypes = PeerTypesFromMTP(*types);
+						}
 					}
 				}, [&](const MTPDkeyboardButtonGame &data) {
 					row.emplace_back(Type::Game, qs(data.vtext()));
diff --git a/Telegram/SourceFiles/history/history_item_reply_markup.h b/Telegram/SourceFiles/history/history_item_reply_markup.h
index 719711d53..828432113 100644
--- a/Telegram/SourceFiles/history/history_item_reply_markup.h
+++ b/Telegram/SourceFiles/history/history_item_reply_markup.h
@@ -14,6 +14,11 @@ namespace Data {
 class Session;
 } // namespace Data
 
+namespace InlineBots {
+enum class PeerType : uint8;
+using PeerTypes = base::flags<PeerType>;
+} // namespace InlineBots
+
 enum class ReplyMarkupFlag : uint32 {
 	None                  = (1U << 0),
 	ForceReply            = (1U << 1),
@@ -89,6 +94,7 @@ struct HistoryMessageMarkupButton {
 	QString text, forwardText;
 	QByteArray data;
 	int64 buttonId = 0;
+	InlineBots::PeerTypes peerTypes = 0;
 	mutable mtpRequestId requestId = 0;
 
 };
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 77055b6bf..3921a21cb 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/edit_forum_topic_box.h"
 #include "boxes/peers/edit_contact_box.h"
 #include "calls/calls_instance.h"
+#include "inline_bots/bot_attach_web_view.h" // InlineBots::PeerType.
 #include "ui/boxes/report_box.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
@@ -1602,7 +1603,8 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 		not_null<Window::SessionNavigation*> navigation,
 		FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 		rpl::producer<QString> titleOverride,
-		FnMut<void()> &&successCallback) {
+		FnMut<void()> &&successCallback,
+		InlineBots::PeerTypes typesRestriction) {
 	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
 	auto callback = [
 		chosen = std::move(chosen),
@@ -1618,6 +1620,23 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 			success();
 		}
 	};
+	auto filter = typesRestriction
+		? [=](not_null<Data::Thread*> thread) -> bool {
+			using namespace InlineBots;
+			const auto peer = thread->peer();
+			if (const auto user = peer->asUser()) {
+				if (user->isBot()) {
+					return (typesRestriction & PeerType::Bot);
+				} else {
+					return (typesRestriction & PeerType::User);
+				}
+			} else if (peer->isBroadcast()) {
+				return (typesRestriction & PeerType::Broadcast);
+			} else {
+				return (typesRestriction & PeerType::Group);
+			}
+		}
+		: Fn<bool(not_null<Data::Thread*>)>();
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_cancel(), [box] {
 			box->closeBox();
@@ -1629,7 +1648,8 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 	*weak = navigation->parentController()->show(Box<PeerListBox>(
 		std::make_unique<ChooseRecipientBoxController>(
 			&navigation->session(),
-			std::move(callback)),
+			std::move(callback),
+			std::move(filter)),
 		std::move(initBox)));
 	return weak->data();
 }
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 44e3bd90f..7fde1f407 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -38,6 +38,11 @@ namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
 
+namespace InlineBots {
+enum class PeerType : uint8;
+using PeerTypes = base::flags<PeerType>;
+} // namespace InlineBots
+
 namespace Window {
 
 class Controller;
@@ -122,7 +127,8 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 	not_null<Window::SessionNavigation*> navigation,
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 	rpl::producer<QString> titleOverride = nullptr,
-	FnMut<void()> &&successCallback = nullptr);
+	FnMut<void()> &&successCallback = nullptr,
+	InlineBots::PeerTypes typesRestriction = 0);
 QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	Data::ForwardDraft &&draft,

From f671897a4db0897d74296353f5244e8af2622901 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 20:18:28 +0400
Subject: [PATCH 171/676] Fix a possible crash in Go to Message on macOS.

Fixes #26273.

This crash happens with a very deep stack trace that is caused by
destroying shared media layer on Go to Message click, which starts
destroying Media::ListWidget, which destroys Ui::PopupMenu, which is
a window, so when it destructs it triggers a sync repaint of the main
window (by a system event), which tries to render the new messages slice,
which starts a photo download, which calls an item repaint in Data::Session,
and the semi-destroyed Media::ListWidget is still subscribed to the
item repaint requests and tries to repaint and crashes there.

The fix is to destroy all session-related subscriptions before the PopupMenu.
---
 Telegram/SourceFiles/info/media/info_media_list_widget.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index e95d5842b..e9149d336 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -295,7 +295,6 @@ private:
 	bool _wasSelectedText = false; // was some text selected in current drag action
 
 	const std::unique_ptr<DateBadge> _dateBadge;
-	base::flat_map<not_null<Main::Session*>, rpl::lifetime> _trackedSessions;
 
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
 	rpl::event_stream<> _checkForHide;
@@ -305,6 +304,8 @@ private:
 	QPoint _trippleClickPoint;
 	crl::time _trippleClickStartTime = 0;
 
+	base::flat_map<not_null<Main::Session*>, rpl::lifetime> _trackedSessions;
+
 };
 
 } // namespace Media

From 2fb7bdc803fd346d77dcd22b0ed9642397a806f4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 21:20:18 +0400
Subject: [PATCH 172/676] Skip refocus InputField::Inner if field unfocused.

I hope this fixes #26223.
---
 .../calls/group/calls_group_panel.cpp         | 58 ++++++++++++-----
 .../calls/group/calls_group_panel.h           |  5 ++
 .../view/export_view_panel_controller.cpp     |  2 +-
 .../SourceFiles/main/session/session_show.cpp | 28 ++++----
 Telegram/SourceFiles/mainwindow.cpp           | 18 +-----
 Telegram/SourceFiles/mainwindow.h             | 19 ++----
 .../payments/ui/payments_panel.cpp            |  2 +-
 .../ui/chat/attach/attach_bot_webview.cpp     |  2 +-
 .../SourceFiles/window/window_controller.cpp  | 41 ++++++------
 .../SourceFiles/window/window_controller.h    | 35 +++++-----
 .../window/window_session_controller.cpp      | 64 ++++++++++---------
 .../window/window_session_controller.h        |  6 +-
 Telegram/lib_ui                               |  2 +-
 13 files changed, 152 insertions(+), 130 deletions(-)

diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 31758718d..454d658ed 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -80,11 +80,13 @@ public:
 	explicit Show(not_null<Panel*> panel);
 	~Show();
 
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options
-			= Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const override;
 	[[nodiscard]] not_null<QWidget*> toastParent() const override;
 	[[nodiscard]] bool valid() const override;
 	operator bool() const override;
@@ -102,19 +104,27 @@ Show::Show(not_null<Panel*> panel)
 
 Show::~Show() = default;
 
-void Show::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
-	if (const auto panel = _panel.get()) {
-		panel->showBox(std::move(content), options);
+void Show::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const {
+	using UniqueLayer = std::unique_ptr<Ui::LayerWidget>;
+	using ObjectBox = object_ptr<Ui::BoxContent>;
+	if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) {
+		if (const auto panel = _panel.get()) {
+			panel->showLayer(std::move(*layerWidget), options, animated);
+		}
+	} else if (auto box = std::get_if<ObjectBox>(&layer)) {
+		if (const auto panel = _panel.get()) {
+			panel->showBox(std::move(*box), options, animated);
+		}
+	} else if (const auto panel = _panel.get()) {
+		panel->hideLayer(animated);
 	}
-}
-
-void Show::hideLayer() const {
-	if (const auto panel = _panel.get()) {
-		panel->hideLayer();
-	}
-}
+ }
 
 not_null<QWidget*> Show::toastParent() const {
 	const auto panel = _panel.get();
@@ -1527,6 +1537,20 @@ void Panel::showBox(
 	_layerBg->showBox(std::move(box), options, animated);
 }
 
+void Panel::showLayer(
+		std::unique_ptr<Ui::LayerWidget> layer,
+		Ui::LayerOptions options,
+		anim::type animated) {
+	hideStickedTooltip(StickedTooltipHide::Unavailable);
+	if (window()->width() < st::groupCallWidth
+		|| window()->height() < st::groupCallWidth) {
+		window()->resize(
+			std::max(window()->width(), st::groupCallWidth),
+			std::max(window()->height(), st::groupCallWidth));
+	}
+	_layerBg->showLayer(std::move(layer), options, animated);
+}
+
 void Panel::hideLayer(anim::type animated) {
 	_layerBg->hideAll(animated);
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.h b/Telegram/SourceFiles/calls/group/calls_group_panel.h
index 2a05232c5..8fab14540 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.h
@@ -34,6 +34,7 @@ class GroupCall;
 
 namespace Ui {
 class BoxContent;
+class LayerWidget;
 enum class LayerOption;
 using LayerOptions = base::flags<LayerOption>;
 class AbstractButton;
@@ -106,6 +107,10 @@ public:
 		object_ptr<Ui::BoxContent> box,
 		Ui::LayerOptions options,
 		anim::type animated = anim::type::normal);
+	void showLayer(
+		std::unique_ptr<Ui::LayerWidget> layer,
+		Ui::LayerOptions options,
+		anim::type animated = anim::type::normal);
 	void hideLayer(anim::type animated = anim::type::normal);
 	[[nodiscard]] bool isLayerShown() const;
 
diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
index 24293ca84..4aef9c36e 100644
--- a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
@@ -156,7 +156,7 @@ PanelController::~PanelController() {
 		saveSettings();
 	}
 	if (_panel) {
-		_panel->destroyLayer();
+		_panel->hideLayer(anim::type::instant);
 	}
 }
 
diff --git a/Telegram/SourceFiles/main/session/session_show.cpp b/Telegram/SourceFiles/main/session/session_show.cpp
index bbd0b4284..a9914e87d 100644
--- a/Telegram/SourceFiles/main/session/session_show.cpp
+++ b/Telegram/SourceFiles/main/session/session_show.cpp
@@ -16,11 +16,13 @@ public:
 		std::shared_ptr<Ui::Show> show,
 		not_null<Session*> session);
 
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options
-		= Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const override;
 	not_null<QWidget*> toastParent() const override;
 	bool valid() const override;
 	operator bool() const override;
@@ -40,14 +42,14 @@ SimpleSessionShow::SimpleSessionShow(
 , _session(session) {
 }
 
-void SimpleSessionShow::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
-	_show->showBox(std::move(content), options);
-}
-
-void SimpleSessionShow::hideLayer() const {
-	_show->hideLayer();
+void SimpleSessionShow::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const {
+	_show->showOrHideBoxOrLayer(std::move(layer), options, animated);
 }
 
 not_null<QWidget*> SimpleSessionShow::toastParent() const {
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 3447c00b9..e96a5c248 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -407,7 +407,7 @@ MainWidget *MainWindow::sessionContent() const {
 	return _main.data();
 }
 
-void MainWindow::showBoxOrLayer(
+void MainWindow::showOrHideBoxOrLayer(
 		std::variant<
 			v::null_t,
 			object_ptr<Ui::BoxContent>,
@@ -419,7 +419,7 @@ void MainWindow::showBoxOrLayer(
 	if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) {
 		ensureLayerCreated();
 		_layer->showLayer(std::move(*layerWidget), options, animated);
-	} else if (auto box = std::get_if<ObjectBox>(&layer); *box != nullptr) {
+	} else if (auto box = std::get_if<ObjectBox>(&layer)) {
 		ensureLayerCreated();
 		_layer->showBox(std::move(*box), options, animated);
 	} else {
@@ -435,20 +435,6 @@ void MainWindow::showBoxOrLayer(
 	}
 }
 
-void MainWindow::ui_showBox(
-		object_ptr<Ui::BoxContent> box,
-		Ui::LayerOptions options,
-		anim::type animated) {
-	showBoxOrLayer(std::move(box), options, animated);
-}
-
-void MainWindow::showLayer(
-		std::unique_ptr<Ui::LayerWidget> &&layer,
-		Ui::LayerOptions options,
-		anim::type animated) {
-	showBoxOrLayer(std::move(layer), options, animated);
-}
-
 bool MainWindow::ui_isLayerShown() const {
 	return _layer != nullptr;
 }
diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index 37e501269..5b6926e69 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -83,8 +83,11 @@ public:
 
 	[[nodiscard]] QPixmap grabForSlideAnimation();
 
-	void showLayer(
-		std::unique_ptr<Ui::LayerWidget> &&layer,
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
 		Ui::LayerOptions options,
 		anim::type animated);
 	void showSpecialLayer(
@@ -93,10 +96,6 @@ public:
 	bool showSectionInExistingLayer(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params);
-	void ui_showBox(
-		object_ptr<Ui::BoxContent> box,
-		Ui::LayerOptions options,
-		anim::type animated);
 	void ui_hideSettingsAndLayer(anim::type animated);
 	void ui_removeLayerBlackout();
 	[[nodiscard]] bool ui_isLayerShown() const;
@@ -122,14 +121,6 @@ private:
 	void ensureLayerCreated();
 	void destroyLayer();
 
-	void showBoxOrLayer(
-		std::variant<
-			v::null_t,
-			object_ptr<Ui::BoxContent>,
-			std::unique_ptr<Ui::LayerWidget>> &&layer,
-		Ui::LayerOptions options,
-		anim::type animated);
-
 	void themeUpdated(const Window::Theme::BackgroundUpdate &data);
 
 	QPoint _lastMousePosition;
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index e68fab149..0ee46d64a 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -487,7 +487,7 @@ bool Panel::showWebview(
 		return false;
 	}
 	showWebviewProgress();
-	_widget->destroyLayer();
+	_widget->hideLayer(anim::type::instant);
 	_webview->window.navigate(url);
 	_widget->setBackAllowed(allowBack);
 	if (bottomText) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index c00a2b278..1930c5484 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -510,7 +510,7 @@ bool Panel::showWebview(
 	}
 	const auto allowBack = false;
 	showWebviewProgress();
-	_widget->destroyLayer();
+	_widget->hideLayer(anim::type::instant);
 	updateThemeParams(params);
 	_webview->window.navigate(url);
 	_widget->setBackAllowed(allowBack);
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index ca6f48b3d..7f5bd3c2d 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -45,11 +45,13 @@ class Show final : public Ui::Show {
 public:
 	explicit Show(not_null<Controller*> window);
 
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options
-			= Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const override;
 	[[nodiscard]] not_null<QWidget*> toastParent() const override;
 	[[nodiscard]] bool valid() const override;
 	operator bool() const override;
@@ -63,19 +65,18 @@ Show::Show(not_null<Controller*> window)
 : _window(base::make_weak(window)) {
 }
 
-void Show::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
+void Show::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const {
 	if (const auto window = _window.get()) {
-		window->show(std::move(content), options);
-	}
-}
-
-void Show::hideLayer() const {
-	if (const auto window = _window.get()) {
-		window->show(
-			object_ptr<Ui::BoxContent>{ nullptr },
-			Ui::LayerOption::CloseOther);
+		window->widget()->showOrHideBoxOrLayer(
+			std::move(layer),
+			options,
+			animated);
 	}
 }
 
@@ -408,14 +409,14 @@ void Controller::showLayer(
 		std::unique_ptr<Ui::LayerWidget> &&layer,
 		Ui::LayerOptions options,
 		anim::type animated) {
-	_widget.showLayer(std::move(layer), options, animated);
+	_widget.showOrHideBoxOrLayer(std::move(layer), options, animated);
 }
 
 void Controller::showBox(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options,
 		anim::type animated) {
-	_widget.ui_showBox(std::move(content), options, animated);
+	_widget.showOrHideBoxOrLayer(std::move(content), options, animated);
 }
 
 void Controller::showRightColumn(object_ptr<TWidget> widget) {
@@ -423,7 +424,7 @@ void Controller::showRightColumn(object_ptr<TWidget> widget) {
 }
 
 void Controller::hideLayer(anim::type animated) {
-	_widget.ui_showBox({ nullptr }, Ui::LayerOption::CloseOther, animated);
+	_widget.showOrHideBoxOrLayer(v::null, Ui::LayerOption::CloseOther, animated);
 }
 
 void Controller::hideSettingsAndLayer(anim::type animated) {
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index 62abd54bb..787cae3a0 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -86,31 +86,38 @@ public:
 
 	[[nodiscard]] int verticalShadowTop() const;
 
-	template <typename BoxType>
-	QPointer<BoxType> show(
-			object_ptr<BoxType> content,
-			Ui::LayerOptions options = Ui::LayerOption::KeepOther,
-			anim::type animated = anim::type::normal) {
-		const auto result = QPointer<BoxType>(content.data());
-		showBox(std::move(content), options, animated);
-		return result;
-	}
-
 	void showToast(Ui::Toast::Config &&config);
 	void showToast(TextWithEntities &&text, crl::time duration = 0);
 	void showToast(const QString &text, crl::time duration = 0);
 
+	void showRightColumn(object_ptr<TWidget> widget);
+
+	void showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options,
+		anim::type animated);
 	void showLayer(
 		std::unique_ptr<Ui::LayerWidget> &&layer,
 		Ui::LayerOptions options,
 		anim::type animated = anim::type::normal);
 
-	void showRightColumn(object_ptr<TWidget> widget);
-
 	void hideLayer(anim::type animated = anim::type::normal);
 	void hideSettingsAndLayer(anim::type animated = anim::type::normal);
 	[[nodiscard]] bool isLayerShown() const;
 
+	template <
+		typename BoxType,
+		typename = std::enable_if_t<
+			std::is_base_of_v<Ui::BoxContent, BoxType>>>
+	QPointer<BoxType> show(
+			object_ptr<BoxType> content,
+			Ui::LayerOptions options = Ui::LayerOption::KeepOther,
+			anim::type animated = anim::type()) {
+		auto result = QPointer<BoxType>(content.data());
+		showBox(std::move(content), options, animated);
+		return result;
+	}
+
 	void activate();
 	void reActivate();
 	void updateIsActiveFocus();
@@ -162,10 +169,6 @@ private:
 	void setupSideBar();
 	void sideBarChanged();
 
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options,
-		anim::type animated);
 	void checkThemeEditor();
 	void checkLockByTerms();
 	void showTermsDecline();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index d40800ef7..601463962 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -111,13 +111,16 @@ constexpr auto kMaxChatEntryHistorySize = 50;
 
 class MainWindowShow final : public ChatHelpers::Show {
 public:
-	explicit MainWindowShow(not_null<SessionNavigation*> navigation);
+	explicit MainWindowShow(not_null<SessionController*> controller);
+
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const override;
 
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options
-			= Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
 	not_null<QWidget*> toastParent() const override;
 	bool valid() const override;
 	operator bool() const override;
@@ -144,24 +147,22 @@ private:
 
 };
 
-MainWindowShow::MainWindowShow(
-	not_null<SessionNavigation*> navigation)
-: _window(base::make_weak(navigation->parentController())) {
+MainWindowShow::MainWindowShow(not_null<SessionController*> controller)
+: _window(base::make_weak(controller)) {
 }
 
-void MainWindowShow::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
+void MainWindowShow::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const {
 	if (const auto window = _window.get()) {
-		window->show(std::move(content), options);
-	}
-}
-
-void MainWindowShow::hideLayer() const {
-	if (const auto window = _window.get()) {
-		window->show(
-			object_ptr<Ui::BoxContent>{ nullptr },
-			Ui::LayerOption::CloseOther);
+		window->window().widget()->showOrHideBoxOrLayer(
+			std::move(layer),
+			options,
+			animated);
 	}
 }
 
@@ -395,8 +396,7 @@ void SessionNavigation::resolveChannelById(
 		return;
 	}
 	const auto fail = crl::guard(this, [=] {
-		MainWindowShow(this).showToast(
-			tr::lng_error_post_link_invalid(tr::now));
+		uiShow()->showToast(tr::lng_error_post_link_invalid(tr::now));
 	});
 	_api.request(base::take(_resolveRequestId)).cancel();
 	_resolveRequestId = _api.request(MTPchannels_GetChannels(
@@ -594,8 +594,7 @@ void SessionNavigation::joinVoiceChatFromLink(
 	Expects(info.voicechatHash.has_value());
 
 	const auto bad = crl::guard(this, [=] {
-		MainWindowShow(this).showToast(
-			tr::lng_group_invite_bad_link(tr::now));
+		uiShow()->showToast(tr::lng_group_invite_bad_link(tr::now));
 	});
 	const auto hash = *info.voicechatHash;
 	_api.request(base::take(_resolveRequestId)).cancel();
@@ -824,23 +823,23 @@ void SessionNavigation::showPollResults(
 
 auto SessionNavigation::showToast(Ui::Toast::Config &&config)
 -> base::weak_ptr<Ui::Toast::Instance> {
-	return MainWindowShow(this).showToast(std::move(config));
+	return uiShow()->showToast(std::move(config));
 }
 
 auto SessionNavigation::showToast(const QString &text, crl::time duration)
 -> base::weak_ptr<Ui::Toast::Instance> {
-	return MainWindowShow(this).showToast(text);
+	return uiShow()->showToast(text);
 }
 
 auto SessionNavigation::showToast(
 	TextWithEntities &&text,
 	crl::time duration)
 -> base::weak_ptr<Ui::Toast::Instance> {
-	return MainWindowShow(this).showToast(std::move(text));
+	return uiShow()->showToast(std::move(text));
 }
 
 std::shared_ptr<ChatHelpers::Show> SessionNavigation::uiShow() {
-	return std::make_shared<MainWindowShow>(this);
+	return parentController()->uiShow();
 }
 
 struct SessionController::CachedThemeKey {
@@ -2485,6 +2484,13 @@ bool SessionController::contentOverlapped(QWidget *w, QPaintEvent *e) {
 	return widget()->contentOverlapped(w, e);
 }
 
+std::shared_ptr<ChatHelpers::Show> SessionController::uiShow() {
+	if (!_cachedShow) {
+		_cachedShow = std::make_shared<MainWindowShow>(this);
+	}
+	return _cachedShow;
+}
+
 SessionController::~SessionController() {
 	resetFakeUnreadWhileOpened();
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 70b3c7716..5258e7b8e 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -278,7 +278,7 @@ public:
 		const QString &text,
 		crl::time duration = 0);
 
-	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow();
+	[[nodiscard]] virtual std::shared_ptr<ChatHelpers::Show> uiShow();
 
 private:
 	void resolvePhone(
@@ -591,6 +591,8 @@ public:
 
 	[[nodiscard]] bool contentOverlapped(QWidget *w, QPaintEvent *e);
 
+	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() override;
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -641,6 +643,8 @@ private:
 	const std::unique_ptr<ChatHelpers::EmojiInteractions> _emojiInteractions;
 	const bool _isPrimary = false;
 
+	mutable std::shared_ptr<ChatHelpers::Show> _cachedShow;
+
 	QString _authedName;
 
 	using SendingAnimation = Ui::MessageSendingAnimationController;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 303a07f94..a7d503188 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 303a07f9461524dc6debf86ae04d0ee6d3134eb6
+Subproject commit a7d503188918904d12a069bca7d3f6c92b9fb553

From d57aa2a1f6580d4b7b7af0938e8414df996b532c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 25 May 2023 11:50:06 +0400
Subject: [PATCH 173/676] Fix possible crash on MTP::Instance shutdown.

---
 Telegram/SourceFiles/mtproto/session.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp
index a10f2e7d5..0a50a4561 100644
--- a/Telegram/SourceFiles/mtproto/session.cpp
+++ b/Telegram/SourceFiles/mtproto/session.cpp
@@ -557,13 +557,22 @@ void Session::tryToReceive() {
 		if (messages.empty()) {
 			break;
 		}
+		const auto guard = QPointer<Session>(this);
+		const auto instance = QPointer<Instance>(_instance);
+		const auto main = (_shiftedDcId == BareDcId(_shiftedDcId));
 		for (const auto &message : messages) {
 			if (message.requestId) {
-				_instance->processCallback(message);
-			} else if (_shiftedDcId == BareDcId(_shiftedDcId)) {
+				instance->processCallback(message);
+			} else if (main) {
 				// Process updates only in main session.
-				_instance->processUpdate(message);
+				instance->processUpdate(message);
 			}
+			if (!instance) {
+				return;
+			}
+		}
+		if (!guard) {
+			break;
 		}
 	}
 }

From e9787170d5b55033769f28aca1fd25a232ce0992 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 25 May 2023 00:12:44 +0400
Subject: [PATCH 174/676] Update Qt to 6.5.1 on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 36ebe4f30..0644338d4 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.5.0" -%}
+{%- set QT = "6.5.1" -%}
 {%- set QT_TAG = "v" ~ QT -%}
 {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
 {%- set OPENSSL_VER = "1_1_1" -%}
@@ -58,7 +58,7 @@ ENV CXXFLAGS $CFLAGS
 FROM builder AS patches
 RUN git clone {{ GIT }}/desktop-app/patches.git \
 	&& cd patches \
-	&& git checkout 3fad86d684 \
+	&& git checkout 1d72fdb335 \
 	&& rm -rf .git
 
 FROM builder AS nasm
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 267e36019..335911817 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -460,7 +460,7 @@ parts:
       - libxkbcommon-x11-0
       - zlib1g
     override-pull: |
-      QT=6.5.0
+      QT=6.5.1
 
       git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools

From fc66a0eea882ef666ed2b809d5b32f4e5ff124f2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 25 May 2023 09:36:30 +0400
Subject: [PATCH 175/676] Destroy Wayland integration before Wayland
 disconnection

---
 .../linux/linux_wayland_integration.cpp       | 28 +++++++------------
 .../linux/linux_wayland_integration.h         |  6 ++--
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index dab8fa498..c693282e2 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
+#include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformwindow_p.h>
 #include <wayland-client.h>
 
@@ -157,22 +158,6 @@ WaylandIntegration::WaylandIntegration()
 		&Private::RegistryListener,
 		_private.get());
 
-	base::qt_signal_producer(
-		qApp,
-		&QObject::destroyed
-	) | rpl::start_with_next([=] {
-		// too late for standard destructors, just free
-		for (auto it = _private->plasmaSurfaces.begin()
-			; it != _private->plasmaSurfaces.cend()
-			; ++it) {
-			free(it->second.release());
-			_private->plasmaSurfaces.erase(it);
-		}
-		free(_private->plasmaShell.object());
-		_private->plasmaShell.init(nullptr);
-		free(_private->registry.release());
-	}, _private->lifetime);
-
 	wl_display_roundtrip(display);
 }
 
@@ -180,8 +165,15 @@ WaylandIntegration::~WaylandIntegration() = default;
 
 WaylandIntegration *WaylandIntegration::Instance() {
 	if (!IsWayland()) return nullptr;
-	static WaylandIntegration instance;
-	return &instance;
+	static std::optional<WaylandIntegration> instance(std::in_place);
+	base::qt_signal_producer(
+		QGuiApplication::platformNativeInterface(),
+		&QObject::destroyed
+	) | rpl::start_with_next([&] {
+		instance = std::nullopt;
+	}, instance->_private->lifetime);
+	if (!instance) return nullptr;
+	return &*instance;
 }
 
 bool WaylandIntegration::skipTaskbarSupported() {
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
index b7b093ffe..bb74be0b3 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
@@ -12,15 +12,15 @@ namespace internal {
 
 class WaylandIntegration {
 public:
+	WaylandIntegration();
+	~WaylandIntegration();
+
 	[[nodiscard]] static WaylandIntegration *Instance();
 
 	[[nodiscard]] bool skipTaskbarSupported();
 	void skipTaskbar(QWindow *window, bool skip);
 
 private:
-	WaylandIntegration();
-	~WaylandIntegration();
-
 	struct Private;
 	const std::unique_ptr<Private> _private;
 };

From 54841de9911133e3e731d7624acba6a7d9e98829 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 25 May 2023 03:38:38 +0400
Subject: [PATCH 176/676] Use new base_linux_wayland_utilities

---
 .../linux/linux_wayland_integration.cpp       | 85 ++++++-------------
 Telegram/lib_base                             |  2 +-
 Telegram/lib_ui                               |  2 +-
 3 files changed, 27 insertions(+), 62 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index c693282e2..c6193869f 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "platform/linux/linux_wayland_integration.h"
 
+#include "base/platform/linux/base_linux_wayland_utilities.h"
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
 #include "base/flat_map.h"
@@ -20,62 +21,27 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 using namespace QNativeInterface;
 using namespace QNativeInterface::Private;
+using namespace base::Platform::Wayland;
 
 namespace Platform {
 namespace internal {
-namespace {
-
-struct WlRegistryDeleter {
-	void operator()(wl_registry *value) {
-		wl_registry_destroy(value);
-	}
-};
-
-struct PlasmaSurfaceDeleter {
-	void operator()(org_kde_plasma_surface *value) {
-		org_kde_plasma_surface_destroy(value);
-	}
-};
-
-template <typename T>
-class QtWaylandAutoDestroyer : public T {
-public:
-	QtWaylandAutoDestroyer() = default;
-
-	~QtWaylandAutoDestroyer() {
-		if (!this->isInitialized()) {
-			return;
-		}
-
-		static constexpr auto HasDestroy = requires(const T &t) {
-			t.destroy();
-		};
-
-		if constexpr (HasDestroy) {
-			this->destroy();
-		} else {
-			free(this->object());
-			this->init(nullptr);
-		}
-	}
-};
-
-} // namespace
 
 struct WaylandIntegration::Private {
-	org_kde_plasma_surface *plasmaSurface(QWindow *window);
-	std::unique_ptr<wl_registry, WlRegistryDeleter> registry;
-	QtWaylandAutoDestroyer<QtWayland::org_kde_plasma_shell> plasmaShell;
+	QtWayland::org_kde_plasma_surface plasmaSurface(QWindow *window);
+
+	std::unique_ptr<wl_registry, RegistryDeleter> registry;
+	AutoDestroyer<QtWayland::org_kde_plasma_shell> plasmaShell;
 	uint32_t plasmaShellName = 0;
-	base::flat_map<wl_surface*, std::unique_ptr<
-		org_kde_plasma_surface,
-		PlasmaSurfaceDeleter>> plasmaSurfaces;
+	base::flat_map<
+		wl_surface*,
+		AutoDestroyer<QtWayland::org_kde_plasma_surface>
+	> plasmaSurfaces;
 	rpl::lifetime lifetime;
 
-	static const struct wl_registry_listener RegistryListener;
+	static const wl_registry_listener RegistryListener;
 };
 
-const struct wl_registry_listener WaylandIntegration::Private::RegistryListener = {
+const wl_registry_listener WaylandIntegration::Private::RegistryListener = {
 	decltype(wl_registry_listener::global)(+[](
 			Private *data,
 			wl_registry *registry,
@@ -92,40 +58,39 @@ const struct wl_registry_listener WaylandIntegration::Private::RegistryListener
 			wl_registry *registry,
 			uint32_t name) {
 		if (name == data->plasmaShellName) {
-			free(data->plasmaShell.object());
-			data->plasmaShell.init(nullptr);
+			data->plasmaShell = {};
 			data->plasmaShellName = 0;
 		}
 	}),
 };
 
-org_kde_plasma_surface *WaylandIntegration::Private::plasmaSurface(
+QtWayland::org_kde_plasma_surface WaylandIntegration::Private::plasmaSurface(
 		QWindow *window) {
 	if (!plasmaShell.isInitialized()) {
-		return nullptr;
+		return {};
 	}
 
 	const auto native = window->nativeInterface<QWaylandWindow>();
 	if (!native) {
-		return nullptr;
+		return {};
 	}
 
 	const auto surface = native->surface();
 	if (!surface) {
-		return nullptr;
+		return {};
 	}
 
 	const auto it = plasmaSurfaces.find(surface);
 	if (it != plasmaSurfaces.cend()) {
-		return it->second.get();
+		return it->second;
 	}
 
-	const auto result = plasmaShell.get_surface(surface);
-	if (!result) {
-		return nullptr;
+	const auto plasmaSurface = plasmaShell.get_surface(surface);
+	if (!plasmaSurface) {
+		return {};
 	}
 
-	plasmaSurfaces.emplace(surface, result);
+	const auto result = plasmaSurfaces.emplace(surface, plasmaSurface);
 
 	base::qt_signal_producer(
 		native,
@@ -137,7 +102,7 @@ org_kde_plasma_surface *WaylandIntegration::Private::plasmaSurface(
 		}
 	}, lifetime);
 
-	return result;
+	return result.first->second;
 }
 
 WaylandIntegration::WaylandIntegration()
@@ -182,11 +147,11 @@ bool WaylandIntegration::skipTaskbarSupported() {
 
 void WaylandIntegration::skipTaskbar(QWindow *window, bool skip) {
 	auto plasmaSurface = _private->plasmaSurface(window);
-	if (!plasmaSurface) {
+	if (!plasmaSurface.isInitialized()) {
 		return;
 	}
 
-	org_kde_plasma_surface_set_skip_taskbar(plasmaSurface, skip);
+	plasmaSurface.set_skip_taskbar(skip);
 }
 
 } // namespace internal
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 840250261..26894d78f 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 8402502615af3d58da6785f00681fc5fb43b907f
+Subproject commit 26894d78fa7b49fd218e54d1f118842a3ab4288b
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a7d503188..bf4cb33fa 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a7d503188918904d12a069bca7d3f6c92b9fb553
+Subproject commit bf4cb33faba84b855eff583bb1b20004434b5424

From 6aef6d7f4ecf785e1e9cde372d617de2dedee99a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 27 May 2023 17:49:43 +0400
Subject: [PATCH 177/676] Integrate GApplication with QFileOpenEvent and
 Core::Application::activate

---
 Telegram/SourceFiles/core/application.cpp     | 29 +++++++++++----
 Telegram/SourceFiles/core/application.h       |  4 ++
 .../platform/linux/specific_linux.cpp         | 37 +++----------------
 3 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index fbc4c6fb1..8d8e7fc2f 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -107,6 +107,7 @@ namespace {
 constexpr auto kQuitPreventTimeoutMs = crl::time(1500);
 constexpr auto kAutoLockTimeoutLateMs = crl::time(3000);
 constexpr auto kClearEmojiImageSourceTimeout = 10 * crl::time(1000);
+constexpr auto kFileOpenTimeoutMs = crl::time(1000);
 
 LaunchState GlobalLaunchState/* = LaunchState::Running*/;
 
@@ -161,7 +162,8 @@ Application::Application(not_null<Launcher*> launcher)
 , _langCloudManager(std::make_unique<Lang::CloudManager>(langpack()))
 , _emojiKeywords(std::make_unique<ChatHelpers::EmojiKeywords>())
 , _tray(std::make_unique<Tray>())
-, _autoLockTimer([=] { checkAutoLock(); }) {
+, _autoLockTimer([=] { checkAutoLock(); })
+, _fileOpenTimer([=] { checkFileOpen(); }) {
 	Ui::Integration::Set(&_private->uiIntegration);
 
 	_platformIntegration->init();
@@ -656,14 +658,21 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 	case QEvent::FileOpen: {
 		if (object == QCoreApplication::instance()) {
 			const auto event = static_cast<QFileOpenEvent*>(e);
-			const auto url = QString::fromUtf8(
-				event->url().toEncoded().trimmed());
-			if (url.startsWith(u"tg://"_q, Qt::CaseInsensitive)) {
+			if (const auto file = event->file(); !file.isEmpty()) {
+				_filesToOpen.append(file);
+				_fileOpenTimer.callOnce(kFileOpenTimeoutMs);
+			} else if (event->url().scheme() == u"tg"_q) {
+				const auto url = QString::fromUtf8(
+					event->url().toEncoded().trimmed());
 				cSetStartUrl(url.mid(0, 8192));
 				checkStartUrl();
-			}
-			if (_lastActivePrimaryWindow && StartUrlRequiresActivate(url)) {
-				_lastActivePrimaryWindow->activate();
+				if (_lastActivePrimaryWindow
+					&& StartUrlRequiresActivate(url)) {
+					_lastActivePrimaryWindow->activate();
+				}
+			} else if (event->url().scheme() == u"interpret"_q) {
+				_filesToOpen.append(event->url().toString());
+				_fileOpenTimer.callOnce(kFileOpenTimeoutMs);
 			}
 		}
 	} break;
@@ -1033,6 +1042,12 @@ bool Application::canApplyLangPackWithoutRestart() const {
 	return true;
 }
 
+void Application::checkFileOpen() {
+	cSetSendPaths(_filesToOpen);
+	_filesToOpen.clear();
+	checkSendPaths();
+}
+
 void Application::checkSendPaths() {
 	if (!cSendPaths().isEmpty()
 		&& _lastActivePrimaryWindow
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 0a90308b9..ef65d170e 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -263,6 +263,7 @@ public:
 	// Internal links.
 	void checkStartUrl();
 	void checkSendPaths();
+	void checkFileOpen();
 	bool openLocalUrl(const QString &url, QVariant context);
 	bool openInternalUrl(const QString &url, QVariant context);
 	[[nodiscard]] QString changelogLink() const;
@@ -437,6 +438,9 @@ private:
 	crl::time _shouldLockAt = 0;
 	base::Timer _autoLockTimer;
 
+	QStringList _filesToOpen;
+	base::Timer _fileOpenTimer;
+
 	std::optional<base::Timer> _saveSettingsTimer;
 
 	struct LeaveFilter {
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 6fd0d7478..817997802 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -262,11 +262,8 @@ void LaunchGApplication() {
 
 		app->signal_activate().connect([] {
 			Core::Sandbox::Instance().customEnterFromEventLoop([] {
-				const auto window = Core::IsAppLaunched()
-					? Core::App().activePrimaryWindow()
-					: nullptr;
-				if (window) {
-					window->activate();
+				if (Core::IsAppLaunched()) {
+					Core::App().activate();
 				}
 			});
 		}, true);
@@ -276,33 +273,9 @@ void LaunchGApplication() {
 				const Glib::ustring &hint) {
 			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 				for (const auto &file : files) {
-					if (file->get_uri_scheme() == "file") {
-						gSendPaths.append(
-							QString::fromStdString(file->get_path()));
-						continue;
-					}
-					const auto url = QString::fromStdString(file->get_uri());
-					if (url.isEmpty()) {
-						continue;
-					}
-					if (url.startsWith(qstr("interpret://"))) {
-						gSendPaths.append(url);
-						continue;
-					}
-					if (Core::StartUrlRequiresActivate(url)) {
-						const auto window = Core::IsAppLaunched()
-							? Core::App().activePrimaryWindow()
-							: nullptr;
-						if (window) {
-							window->activate();
-						}
-					}
-					cSetStartUrl(url);
-					Core::App().checkStartUrl();
-				}
-
-				if (!cSendPaths().isEmpty()) {
-					Core::App().checkSendPaths();
+					QFileOpenEvent e(
+						QUrl(QString::fromStdString(file->get_uri())));
+					QGuiApplication::sendEvent(qApp, &e);
 				}
 			});
 		}, true);

From 2ce9e610fafd1ef32e3d64caff82c633014a5b48 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 27 May 2023 12:35:17 +0400
Subject: [PATCH 178/676] Update icons when icon theme on Linux changes

---
 Telegram/SourceFiles/core/application.cpp           |  8 ++++++++
 .../media/view/media_view_overlay_widget.cpp        |  2 ++
 .../platform/linux/main_window_linux.cpp            | 13 +++++++------
 .../SourceFiles/platform/linux/main_window_linux.h  |  3 ---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 8d8e7fc2f..ede17c597 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -100,6 +100,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QMimeDatabase>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>
+#include <QtGui/QWindow>
 
 namespace Core {
 namespace {
@@ -676,6 +677,13 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 			}
 		}
 	} break;
+
+	case QEvent::ThemeChange: {
+		if (Platform::IsLinux() && object == QGuiApplication::allWindows().first()) {
+			Core::App().refreshApplicationIcon();
+			Core::App().tray().updateIconCounters();
+		}
+	} break;
 	}
 
 	return QObject::eventFilter(object, e);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index fb5bfb546..f19623e48 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -400,6 +400,8 @@ OverlayWidget::OverlayWidget()
 			e->ignore();
 			close();
 			return base::EventFilterResult::Cancel;
+		} else if (type == QEvent::ThemeChange && Platform::IsLinux()) {
+			_window->setWindowIcon(Window::CreateIcon(_session));
 		}
 		return base::EventFilterResult::Continue;
 	});
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 0598d9fbd..98c6ff40a 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -179,6 +179,12 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 }
 
 void MainWindow::initHook() {
+	events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::ThemeChange) {
+			updateWindowIcon();
+		}
+	}, lifetime());
+
 	base::install_event_filter(windowHandle(), [=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Expose) {
 			auto ee = static_cast<QExposeEvent*>(e.get());
@@ -221,12 +227,7 @@ void MainWindow::updateWindowIcon() {
 	const auto session = sessionController()
 		? &sessionController()->session()
 		: nullptr;
-	const auto supportIcon = session && session->supportMode();
-	if (supportIcon != _usingSupportIcon || _icon.isNull()) {
-		_icon = Window::CreateIcon(session);
-		_usingSupportIcon = supportIcon;
-	}
-	setWindowIcon(_icon);
+	setWindowIcon(Window::CreateIcon(session));
 }
 
 void MainWindow::updateUnityCounter() {
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
index 3f074db1f..467f690b7 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
@@ -60,9 +60,6 @@ private:
 	QAction *psMonospace = nullptr;
 	QAction *psClearFormat = nullptr;
 
-	QIcon _icon;
-	bool _usingSupportIcon = false;
-
 };
 
 [[nodiscard]] inline int32 ScreenNameChecksum(const QString &name) {

From c8407e5bdee887bb8d1c49aa847e668b50b903a3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 27 May 2023 12:35:31 +0400
Subject: [PATCH 179/676] Update lib_base

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 26894d78f..7fb87f102 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 26894d78fa7b49fd218e54d1f118842a3ab4288b
+Subproject commit 7fb87f1027b550556d89a67af35619a80aff839c

From 8c38d319507f4c313970abaeea802e0c7e949214 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 30 May 2023 04:37:05 +0400
Subject: [PATCH 180/676] C++ify wl_registry

---
 .gitmodules                                   |  3 ++
 Telegram/CMakeLists.txt                       |  1 +
 .../linux/linux_wayland_integration.cpp       | 46 +++++++------------
 Telegram/ThirdParty/wayland                   |  1 +
 4 files changed, 22 insertions(+), 29 deletions(-)
 create mode 160000 Telegram/ThirdParty/wayland

diff --git a/.gitmodules b/.gitmodules
index 052fbbe91..2de5f5b1f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,3 +100,6 @@
 [submodule "Telegram/ThirdParty/cld3"]
 	path = Telegram/ThirdParty/cld3
 	url = https://github.com/google/cld3.git
+[submodule "Telegram/ThirdParty/wayland"]
+	path = Telegram/ThirdParty/wayland
+	url = https://github.com/gitlab-freedesktop-mirrors/wayland.git
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index b84d103d2..d61a678dd 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1529,6 +1529,7 @@ else()
     if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
         qt_generate_wayland_protocol_client_sources(Telegram
         FILES
+            ${third_party_loc}/wayland/protocol/wayland.xml
             ${third_party_loc}/plasma-wayland-protocols/src/protocols/plasma-shell.xml
         )
 
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index c6193869f..050b27528 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -11,13 +11,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
 #include "base/flat_map.h"
+
+#include "qwayland-wayland.h"
 #include "qwayland-plasma-shell.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformwindow_p.h>
-#include <wayland-client.h>
 
 using namespace QNativeInterface;
 using namespace QNativeInterface::Private;
@@ -26,10 +27,9 @@ using namespace base::Platform::Wayland;
 namespace Platform {
 namespace internal {
 
-struct WaylandIntegration::Private {
+struct WaylandIntegration::Private : public AutoDestroyer<QtWayland::wl_registry> {
 	QtWayland::org_kde_plasma_surface plasmaSurface(QWindow *window);
 
-	std::unique_ptr<wl_registry, RegistryDeleter> registry;
 	AutoDestroyer<QtWayland::org_kde_plasma_shell> plasmaShell;
 	uint32_t plasmaShellName = 0;
 	base::flat_map<
@@ -38,30 +38,23 @@ struct WaylandIntegration::Private {
 	> plasmaSurfaces;
 	rpl::lifetime lifetime;
 
-	static const wl_registry_listener RegistryListener;
-};
-
-const wl_registry_listener WaylandIntegration::Private::RegistryListener = {
-	decltype(wl_registry_listener::global)(+[](
-			Private *data,
-			wl_registry *registry,
+protected:
+	void registry_global(
 			uint32_t name,
-			const char *interface,
-			uint32_t version) {
+			const QString &interface,
+			uint32_t version) override {
 		if (interface == qstr("org_kde_plasma_shell")) {
-			data->plasmaShell.init(registry, name, version);
-			data->plasmaShellName = name;
+			plasmaShell.init(object(), name, version);
+			plasmaShellName = name;
 		}
-	}),
-	decltype(wl_registry_listener::global_remove)(+[](
-			Private *data,
-			wl_registry *registry,
-			uint32_t name) {
-		if (name == data->plasmaShellName) {
-			data->plasmaShell = {};
-			data->plasmaShellName = 0;
+	}
+
+	void registry_global_remove(uint32_t name) override {
+		if (name == plasmaShellName) {
+			plasmaShell = {};
+			plasmaShellName = 0;
 		}
-	}),
+	}
 };
 
 QtWayland::org_kde_plasma_surface WaylandIntegration::Private::plasmaSurface(
@@ -117,12 +110,7 @@ WaylandIntegration::WaylandIntegration()
 		return;
 	}
 
-	_private->registry.reset(wl_display_get_registry(display));
-	wl_registry_add_listener(
-		_private->registry.get(),
-		&Private::RegistryListener,
-		_private.get());
-
+	_private->init(wl_display_get_registry(display));
 	wl_display_roundtrip(display);
 }
 
diff --git a/Telegram/ThirdParty/wayland b/Telegram/ThirdParty/wayland
new file mode 160000
index 000000000..b2649cb3e
--- /dev/null
+++ b/Telegram/ThirdParty/wayland
@@ -0,0 +1 @@
+Subproject commit b2649cb3ee6bd70828a17e50beb16591e6066288

From 71570f5be14641cec7936a1235187a3048481e6d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 30 May 2023 19:02:23 +0400
Subject: [PATCH 181/676] Store managed objects inside managers

---
 .../linux/linux_wayland_integration.cpp       | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index 050b27528..064fb818b 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -26,16 +26,22 @@ using namespace base::Platform::Wayland;
 
 namespace Platform {
 namespace internal {
+namespace {
+
+class PlasmaShell : public Global<QtWayland::org_kde_plasma_shell> {
+public:
+	using Global::Global;
+
+	using Surface = AutoDestroyer<QtWayland::org_kde_plasma_surface>;
+	base::flat_map<wl_surface*, Surface> surfaces;
+};
+
+} // namespace
 
 struct WaylandIntegration::Private : public AutoDestroyer<QtWayland::wl_registry> {
 	QtWayland::org_kde_plasma_surface plasmaSurface(QWindow *window);
 
-	AutoDestroyer<QtWayland::org_kde_plasma_shell> plasmaShell;
-	uint32_t plasmaShellName = 0;
-	base::flat_map<
-		wl_surface*,
-		AutoDestroyer<QtWayland::org_kde_plasma_surface>
-	> plasmaSurfaces;
+	std::optional<PlasmaShell> plasmaShell;
 	rpl::lifetime lifetime;
 
 protected:
@@ -44,22 +50,20 @@ protected:
 			const QString &interface,
 			uint32_t version) override {
 		if (interface == qstr("org_kde_plasma_shell")) {
-			plasmaShell.init(object(), name, version);
-			plasmaShellName = name;
+			plasmaShell.emplace(object(), name, version);
 		}
 	}
 
 	void registry_global_remove(uint32_t name) override {
-		if (name == plasmaShellName) {
-			plasmaShell = {};
-			plasmaShellName = 0;
+		if (plasmaShell && name == plasmaShell->id()) {
+			plasmaShell = std::nullopt;
 		}
 	}
 };
 
 QtWayland::org_kde_plasma_surface WaylandIntegration::Private::plasmaSurface(
 		QWindow *window) {
-	if (!plasmaShell.isInitialized()) {
+	if (!plasmaShell) {
 		return {};
 	}
 
@@ -73,25 +77,25 @@ QtWayland::org_kde_plasma_surface WaylandIntegration::Private::plasmaSurface(
 		return {};
 	}
 
-	const auto it = plasmaSurfaces.find(surface);
-	if (it != plasmaSurfaces.cend()) {
+	const auto it = plasmaShell->surfaces.find(surface);
+	if (it != plasmaShell->surfaces.cend()) {
 		return it->second;
 	}
 
-	const auto plasmaSurface = plasmaShell.get_surface(surface);
+	const auto plasmaSurface = plasmaShell->get_surface(surface);
 	if (!plasmaSurface) {
 		return {};
 	}
 
-	const auto result = plasmaSurfaces.emplace(surface, plasmaSurface);
+	const auto result = plasmaShell->surfaces.emplace(surface, plasmaSurface);
 
 	base::qt_signal_producer(
 		native,
 		&QWaylandWindow::surfaceDestroyed
 	) | rpl::start_with_next([=] {
-		auto it = plasmaSurfaces.find(surface);
-		if (it != plasmaSurfaces.cend()) {
-			plasmaSurfaces.erase(it);
+		auto it = plasmaShell->surfaces.find(surface);
+		if (it != plasmaShell->surfaces.cend()) {
+			plasmaShell->surfaces.erase(it);
 		}
 	}, lifetime);
 
@@ -130,7 +134,7 @@ WaylandIntegration *WaylandIntegration::Instance() {
 }
 
 bool WaylandIntegration::skipTaskbarSupported() {
-	return _private->plasmaShell.isInitialized();
+	return _private->plasmaShell.has_value();
 }
 
 void WaylandIntegration::skipTaskbar(QWindow *window, bool skip) {

From 898581badd9b6a55b54d10f318dc708efea1b410 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 30 May 2023 19:02:59 +0400
Subject: [PATCH 182/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 7fb87f102..a62d6bb76 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 7fb87f1027b550556d89a67af35619a80aff839c
+Subproject commit a62d6bb766f12640c696c0fd4e736ddcfca5c2c5
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index bf4cb33fa..cf906f14b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit bf4cb33faba84b855eff583bb1b20004434b5424
+Subproject commit cf906f14bd6ed66826527f072f249840dc578f8c

From e1350d681319c14138a234fdac9aacab1cd75b45 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 31 May 2023 21:44:46 +0400
Subject: [PATCH 183/676] Fix webview links opening from webview.

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

diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 09de04d9b..5b4398c9f 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -1061,8 +1061,10 @@ void AttachWebView::show(
 		} else if (!local.startsWith(u"tg://"_q, Qt::CaseInsensitive)) {
 			return false;
 		}
-		UrlClickHandler::Open(local, {});
 		close();
+		crl::on_main([=] {
+			UrlClickHandler::Open(local, {});
+		});
 		return true;
 	};
 	const auto panel = std::make_shared<

From c5cb928724e036c59746b693744d2485596f3447 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 31 May 2023 21:50:53 +0400
Subject: [PATCH 184/676] Version 4.8.3.

- Fix main window focus from notifications with disabled animations.
- Some minor fixes and improvements.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 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 555c4fafe..a46c1f439 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.8.2.0" />
+    Version="4.8.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 388da258a..bff12b87a 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,8,2,0
- PRODUCTVERSION 4,8,2,0
+ FILEVERSION 4,8,3,0
+ PRODUCTVERSION 4,8,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.2.0"
+            VALUE "FileVersion", "4.8.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.2.0"
+            VALUE "ProductVersion", "4.8.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 41f5d267d..92cdd7b32 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,8,2,0
- PRODUCTVERSION 4,8,2,0
+ FILEVERSION 4,8,3,0
+ PRODUCTVERSION 4,8,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.2.0"
+            VALUE "FileVersion", "4.8.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.2.0"
+            VALUE "ProductVersion", "4.8.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 1eef1dce2..0079871c5 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 = 4008002;
-constexpr auto AppVersionStr = "4.8.2";
+constexpr auto AppVersion = 4008003;
+constexpr auto AppVersionStr = "4.8.3";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 8286557cf..26a1c6afc 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008002
+AppVersion         4008003
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.2
-AppVersionStr      4.8.2
+AppVersionStrSmall 4.8.3
+AppVersionStr      4.8.3
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.2
+AppVersionOriginal 4.8.3
diff --git a/changelog.txt b/changelog.txt
index 5808d84d5..57529e508 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+4.8.3 (31.05.23)
+
+- Fix main window focus from notifications with disabled animations.
+- Some minor fixes and improvements. 
+
 4.8.2 (16.05.23)
 
 - Apply hardening runtime for Mac App Store version.

From 1e9087db4a6c6edf923caa214b1c4b853d8b4620 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Thu, 1 Jun 2023 00:30:34 +0000
Subject: [PATCH 185/676] Update User-Agent for DNS to Chrome 113.0.5672.63.

---
 .../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 ae5ad7a04..e5d229bcf 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/112.0.5615.165 Safari/537.36");
+		"Chrome/113.0.5672.63 Safari/537.36");
 	return kResult;
 }
 

From bcf91e2f2cefaa4819badc209811e14b60b7aefe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 1 Jun 2023 11:43:18 +0400
Subject: [PATCH 186/676] Version 4.8.3: Fix statup crash with passcode.

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

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index ede17c597..1202168ae 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -1161,7 +1161,9 @@ void Application::lockByPasscode() {
 	enumerateWindows([&](not_null<Window::Controller*> w) {
 		w->setupPasscodeLock();
 	});
-	_mediaView->close();
+	if (_mediaView) {
+		_mediaView->close();
+	}
 }
 
 void Application::maybeLockByPasscode() {

From 8352aeb338e91b0c86de4caafd4f9f92f2e93e3b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Jun 2023 05:46:15 +0400
Subject: [PATCH 187/676] Send mouse release event after
 startSystemMove/startSystemResize

---
 Telegram/SourceFiles/media/view/media_view_pip.cpp | 5 +++++
 Telegram/build/docker/centos_env/Dockerfile        | 2 +-
 Telegram/lib_ui                                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 3a0a50397..4a0183d96 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -768,6 +768,11 @@ void PipPanel::startSystemDrag() {
 	} else {
 		widget()->windowHandle()->startSystemMove();
 	}
+
+	Ui::SendSynteticMouseEvent(
+		widget().get(),
+		QEvent::MouseButtonRelease,
+		Qt::LeftButton);
 }
 
 void PipPanel::processDrag(QPoint point) {
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 0644338d4..6463f6374 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -58,7 +58,7 @@ ENV CXXFLAGS $CFLAGS
 FROM builder AS patches
 RUN git clone {{ GIT }}/desktop-app/patches.git \
 	&& cd patches \
-	&& git checkout 1d72fdb335 \
+	&& git checkout a1b912c90e \
 	&& rm -rf .git
 
 FROM builder AS nasm
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index cf906f14b..83cab52cd 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit cf906f14bd6ed66826527f072f249840dc578f8c
+Subproject commit 83cab52cd6ba93e9292405b23358d8dde3f95567

From 7cc191ba611fa02222235d07922ca4dd7bb2d83c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Jun 2023 19:56:03 +0400
Subject: [PATCH 188/676] Update lib_base

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index a62d6bb76..c7db733a9 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit a62d6bb766f12640c696c0fd4e736ddcfca5c2c5
+Subproject commit c7db733a9861177c796162bf1cbe5e052962afd8

From be89e57d27e9f8f852b08eac46d6f6643a876ca7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 31 May 2023 08:33:59 +0400
Subject: [PATCH 189/676] Use ARGN where applicable

---
 Telegram/cmake/generate_midl.cmake | 5 +----
 cmake                              | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Telegram/cmake/generate_midl.cmake b/Telegram/cmake/generate_midl.cmake
index 6bbf128e6..51d960ba8 100644
--- a/Telegram/cmake/generate_midl.cmake
+++ b/Telegram/cmake/generate_midl.cmake
@@ -5,9 +5,6 @@
 # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 function(generate_midl target_name src_loc)
-    set(list ${ARGV})
-    list(REMOVE_AT list 0 1)
-
     set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen)
     file(MAKE_DIRECTORY ${gen_dst})
 
@@ -21,7 +18,7 @@ function(generate_midl target_name src_loc)
     set(gen_files "")
     set(full_generation_sources "")
     set(full_dependencies_list "")
-    foreach (file ${list})
+    foreach (file ${ARGN})
         list(APPEND full_generation_sources ${src_loc}/${file})
         get_filename_component(file_name ${file} NAME_WLE)
         list(APPEND gen_files
diff --git a/cmake b/cmake
index 32e1044c5..1c07a71d6 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 32e1044c5198819dd470e3262275a9747dfd65de
+Subproject commit 1c07a71d6fde4e71ca9f98d343d09d7503ef15d2

From 30b20a2102258f8f7121eab667c72be439e0ee18 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 5 Jun 2023 05:36:57 +0400
Subject: [PATCH 190/676] Convert all the dependencies in Dockerfile to use
 depth=1

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 6463f6374..8ff098e36 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -56,9 +56,11 @@ ENV CFLAGS {% if DEBUG %}-g{% endif %} -O3 {% if LTO %}{{ CFLAGS_LTO }}{% endif
 ENV CXXFLAGS $CFLAGS
 
 FROM builder AS patches
-RUN git clone {{ GIT }}/desktop-app/patches.git \
+RUN git init patches \
 	&& cd patches \
-	&& git checkout a1b912c90e \
+	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
+	&& git fetch --depth=1 origin a1b912c90eaab470ef283622a8f890ee6264dae7 \
+	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
 FROM builder AS nasm
@@ -92,7 +94,7 @@ RUN git clone -b v1.2.11 --depth=1 {{ GIT }}/madler/zlib.git \
 	&& rm -rf zlib
 
 FROM builder AS xz
-RUN git clone -b v5.2.5 https://git.tukaani.org/xz.git \
+RUN git clone -b v5.2.5 --depth=1 {{ GIT }}/tukaani-project/xz.git \
 	&& cd xz \
 	&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=None \
 	&& cmake --build build --parallel \
@@ -101,26 +103,23 @@ RUN git clone -b v5.2.5 https://git.tukaani.org/xz.git \
 	&& rm -rf xz
 
 FROM builder AS protobuf
-RUN git clone --recursive -b v21.9 https://github.com/protocolbuffers/protobuf \
-    && cd protobuf \
-    && git clone https://github.com/abseil/abseil-cpp third_party/abseil-cpp \
-    && cd third_party/abseil-cpp \
-    && git checkout 273292d1cf \
-    && cd ../.. \
-    && mkdir build \
-    && cd build \
-    && cmake -GNinja .. \
-    	-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-        -Dprotobuf_BUILD_TESTS=OFF \
-        -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
-        -Dprotobuf_BUILD_LIBPROTOC=ON \
-        -Dprotobuf_WITH_ZLIB_DEFAULT=OFF \
-        -Dprotobuf_DEBUG_POSTFIX="" \
-    && cmake --build . --parallel \
-    && cd .. \
-    && rm -rf .git
+RUN git clone -b v21.9 --depth=1 --recursive {{ GIT }}/protocolbuffers/protobuf.git \
+	&& cd protobuf \
+	&& git init third_party/abseil-cpp \
+	&& cd third_party/abseil-cpp \
+	&& git remote add origin {{ GIT }}/abseil/abseil-cpp.git \
+	&& git fetch --depth=1 origin 273292d1cfc0a94a65082ee350509af1d113344d \
+	&& git reset --hard FETCH_HEAD \
+	&& cd ../.. \
+	&& cmake -GNinja -B build . \
+		-DCMAKE_BUILD_TYPE=None \
+		-Dprotobuf_BUILD_TESTS=OFF \
+		-Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
+		-Dprotobuf_BUILD_LIBPROTOC=ON \
+		-Dprotobuf_WITH_ZLIB_DEFAULT=OFF \
+		-Dprotobuf_DEBUG_POSTFIX="" \
+	&& cmake --build build --parallel \
+	&& rm -rf .git
 
 FROM patches AS libproxy
 RUN git clone -b 0.4.17 --depth=1 {{ GIT }}/libproxy/libproxy.git \
@@ -303,7 +302,7 @@ RUN git clone -b v0.8.1 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 	&& rm -rf libjxl
 
 FROM builder AS rnnoise
-RUN git clone -b master --depth=1 {{ GIT }}/desktop-app/rnnoise \
+RUN git clone -b master --depth=1 {{ GIT }}/desktop-app/rnnoise.git \
 	&& cd rnnoise \
 	&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=None \
 	&& cmake --build build --parallel \
@@ -757,13 +756,17 @@ RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }
 	&& rm -rf qt_{{ QT }}
 
 FROM patches AS breakpad
-RUN git clone https://chromium.googlesource.com/breakpad/breakpad.git \
+RUN git init breakpad \
 	&& cd breakpad \
-	&& git checkout dfcb7b6799 \
+	&& git remote add origin https://chromium.googlesource.com/breakpad/breakpad.git \
+	&& git fetch --depth=1 origin dfcb7b6799b7c1e2c8d65e857d8afede185471d8 \
+	&& git reset --hard FETCH_HEAD \
 	&& git apply ../patches/breakpad.diff \
-	&& git clone https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss \
+	&& git init src/third_party/lss \
 	&& cd src/third_party/lss \
-	&& git checkout e1e7b0ad8e \
+	&& git remote add origin https://chromium.googlesource.com/linux-syscall-support.git \
+	&& git fetch --depth=1 origin e1e7b0ad8ee99a875b272c8e33e308472e897660 \
+	&& git reset --hard FETCH_HEAD \
 	&& cd ../../.. \
 	&& env -u CFLAGS -u CXXFLAGS ./configure \
 	&& make -j$(nproc) \

From d40205135c58b94988e5fa9aaf0fe8e21454fd78 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 5 Jun 2023 05:40:52 +0400
Subject: [PATCH 191/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index c7db733a9..6041498fb 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit c7db733a9861177c796162bf1cbe5e052962afd8
+Subproject commit 6041498fbafcd0a22df88b7973d9e8f9bdf16958
diff --git a/cmake b/cmake
index 1c07a71d6..02e600c6f 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 1c07a71d6fde4e71ca9f98d343d09d7503ef15d2
+Subproject commit 02e600c6f3af297c2e18af0ea5ee8320e5725554

From a128fdcc283c9e66b2f211267e97c14b1a6f8e5a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 5 Jun 2023 08:46:17 +0400
Subject: [PATCH 192/676] Always use Python3 cmake package instead of the
 Python one

---
 CMakeLists.txt                       | 2 +-
 Telegram/cmake/generate_scheme.cmake | 4 ++--
 cmake                                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c45a8132a..e456192cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ get_filename_component(submodules_loc "Telegram" REALPATH)
 get_filename_component(cmake_helpers_loc "cmake" REALPATH)
 
 if (NOT DESKTOP_APP_USE_PACKAGED AND WIN32)
-    set(Python_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/python/Scripts/python)
+    set(Python3_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/python/Scripts/python)
 endif()
 
 include(cmake/variables.cmake)
diff --git a/Telegram/cmake/generate_scheme.cmake b/Telegram/cmake/generate_scheme.cmake
index e5802742a..310e49d68 100644
--- a/Telegram/cmake/generate_scheme.cmake
+++ b/Telegram/cmake/generate_scheme.cmake
@@ -5,7 +5,7 @@
 # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 function(generate_scheme target_name script scheme_files)
-    find_package(Python REQUIRED)
+    find_package(Python3 REQUIRED)
 
     set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen)
     file(MAKE_DIRECTORY ${gen_dst})
@@ -24,7 +24,7 @@ function(generate_scheme target_name script scheme_files)
     BYPRODUCTS
         ${gen_files}
     COMMAND
-        ${Python_EXECUTABLE}
+        ${Python3_EXECUTABLE}
         ${script}
         -o${gen_dst}/scheme
         ${scheme_files}
diff --git a/cmake b/cmake
index 02e600c6f..a41fa6e14 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 02e600c6f3af297c2e18af0ea5ee8320e5725554
+Subproject commit a41fa6e14006204f3fea7993a775e14f8fdde9fc

From ea82c9ba3e74facc2db445621a3c305acc673b4f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 6 Jun 2023 05:03:15 +0400
Subject: [PATCH 193/676] Enable control flow protection

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 8ff098e36..d34728fed 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -7,7 +7,7 @@
 {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
 {%- set CMAKE_VER = "3.26.3" -%}
 {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%}
-{%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -D_GLIBCXX_ASSERTIONS" -%}
+{%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
 {%- set CFLAGS_LTO = "-flto=auto -ffat-lto-objects" -%}
 {%- set LibrariesPath = "/usr/src/Libraries" -%}
 
@@ -52,7 +52,7 @@ FROM builder-base AS builder
 ENV AR gcc-ar
 ENV RANLIB gcc-ranlib
 ENV NM gcc-nm
-ENV CFLAGS {% if DEBUG %}-g{% endif %} -O3 {% if LTO %}{{ CFLAGS_LTO }}{% endif %} -pipe -fPIC -fstack-protector-all -fstack-clash-protection -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS
+ENV CFLAGS {% if DEBUG %}-g{% endif %} -O3 {% if LTO %}{{ CFLAGS_LTO }}{% endif %} -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS
 ENV CXXFLAGS $CFLAGS
 
 FROM builder AS patches
diff --git a/cmake b/cmake
index a41fa6e14..a1ec454cb 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a41fa6e14006204f3fea7993a775e14f8fdde9fc
+Subproject commit a1ec454cbcc1a6ce9970968e3413c9a4341968d0

From 63ccf1bed461267f492e17bd294aad4929c275eb Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 9 Jun 2023 14:55:05 -0400
Subject: [PATCH 194/676] snap: connect to the network-bind interface,
 necessary on systems where desktop-legacy isn't supported like Ubuntu Core
 Desktop.

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 335911817..7fbd74ff9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -31,6 +31,7 @@ apps:
       - hardware-observe
       - home
       - network
+      - network-bind
       - network-status
       - opengl
       - removable-media

From a7bd097b2f4b5d4a6f90d697f4e69b0cb04b9d38 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 13 Jun 2023 04:34:27 +0400
Subject: [PATCH 195/676] Have a global Core::Launcher accessor

This allows to use Launcher in code executing before Sandbox is created
---
 Telegram/SourceFiles/core/application.cpp     | 13 ++++-------
 Telegram/SourceFiles/core/application.h       |  8 +------
 .../SourceFiles/core/crash_report_window.cpp  |  2 --
 .../SourceFiles/core/crash_report_window.h    |  5 +----
 Telegram/SourceFiles/core/launcher.cpp        |  8 ++++++-
 Telegram/SourceFiles/core/launcher.h          | 19 +++++++++++++++-
 Telegram/SourceFiles/core/sandbox.cpp         | 22 +++++--------------
 Telegram/SourceFiles/core/sandbox.h           |  6 +----
 .../platform/linux/launcher_linux.cpp         | 11 ----------
 .../platform/linux/launcher_linux.h           |  2 --
 .../platform/linux/specific_linux.cpp         | 15 +++++++------
 .../settings/settings_advanced.cpp            |  3 ++-
 .../SourceFiles/support/support_helper.cpp    |  6 ++---
 13 files changed, 50 insertions(+), 70 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 1202168ae..533ad5c77 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -143,9 +143,8 @@ struct Application::Private {
 	Settings settings;
 };
 
-Application::Application(not_null<Launcher*> launcher)
+Application::Application()
 : QObject()
-, _launcher(launcher)
 , _private(std::make_unique<Private>())
 , _platformIntegration(Platform::Integration::Create())
 , _batterySaving(std::make_unique<base::BatterySaving>())
@@ -945,11 +944,11 @@ rpl::producer<> Application::materializeLocalDraftsRequests() const {
 void Application::switchDebugMode() {
 	if (Logs::DebugEnabled()) {
 		Logs::SetDebugEnabled(false);
-		_launcher->writeDebugModeSetting();
+		Launcher::Instance().writeDebugModeSetting();
 		Restart();
 	} else {
 		Logs::SetDebugEnabled(true);
-		_launcher->writeDebugModeSetting();
+		Launcher::Instance().writeDebugModeSetting();
 		DEBUG_LOG(("Debug logs started."));
 		if (_lastActivePrimaryWindow) {
 			_lastActivePrimaryWindow->hideLayer();
@@ -957,10 +956,6 @@ void Application::switchDebugMode() {
 	}
 }
 
-void Application::writeInstallBetaVersionsSetting() {
-	_launcher->writeInstallBetaVersionsSetting();
-}
-
 Main::Account &Application::activeAccount() const {
 	return _domain->active();
 }
@@ -1770,7 +1765,7 @@ void Application::RegisterUrlScheme() {
 		.executable = (!Platform::IsLinux() || !Core::UpdaterDisabled())
 			? (cExeDir() + cExeName())
 			: cExeName(),
-		.arguments = Sandbox::Instance().customWorkingDir()
+		.arguments = Launcher::Instance().customWorkingDir()
 			? u"-workdir \"%1\""_q.arg(cWorkingDir())
 			: QString(),
 		.protocol = u"tg"_q,
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index ef65d170e..f9059da8d 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -103,7 +103,6 @@ class Instance;
 
 namespace Core {
 
-class Launcher;
 struct LocalUrlHandler;
 class Settings;
 class Tray;
@@ -126,16 +125,13 @@ public:
 		MTP::ProxyData now;
 	};
 
-	Application(not_null<Launcher*> launcher);
+	Application();
 	Application(const Application &other) = delete;
 	Application &operator=(const Application &other) = delete;
 	~Application();
 
 	void run();
 
-	[[nodiscard]] Launcher &launcher() const {
-		return *_launcher;
-	}
 	[[nodiscard]] Platform::Integration &platformIntegration() const {
 		return *_platformIntegration;
 	}
@@ -319,7 +315,6 @@ public:
 	[[nodiscard]] rpl::producer<> materializeLocalDraftsRequests() const;
 
 	void switchDebugMode();
-	void writeInstallBetaVersionsSetting();
 
 	void preventOrInvoke(Fn<void()> &&callback);
 
@@ -381,7 +376,6 @@ private:
 	};
 	InstanceSetter _setter = { this };
 
-	const not_null<Launcher*> _launcher;
 	rpl::event_stream<ProxyChange> _proxyChanges;
 
 	// Some fields are just moved from the declaration.
diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp
index e8e866ab2..41bacf4ba 100644
--- a/Telegram/SourceFiles/core/crash_report_window.cpp
+++ b/Telegram/SourceFiles/core/crash_report_window.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "core/crash_reports.h"
 #include "core/application.h"
-#include "core/launcher.h"
 #include "core/sandbox.h"
 #include "core/update_checker.h"
 #include "core/ui_integration.h"
@@ -250,7 +249,6 @@ LastCrashedWindow::UpdaterData::UpdaterData(QWidget *buttonParent)
 }
 
 LastCrashedWindow::LastCrashedWindow(
-	not_null<Core::Launcher*> launcher,
 	const QByteArray &crashdump,
 	Fn<void()> launch)
 : _dumpraw(crashdump)
diff --git a/Telegram/SourceFiles/core/crash_report_window.h b/Telegram/SourceFiles/core/crash_report_window.h
index 75e17ba23..5c20c26c8 100644
--- a/Telegram/SourceFiles/core/crash_report_window.h
+++ b/Telegram/SourceFiles/core/crash_report_window.h
@@ -94,10 +94,7 @@ private:
 class LastCrashedWindow : public PreLaunchWindow {
 
 public:
-	LastCrashedWindow(
-		not_null<Core::Launcher*> launcher,
-		const QByteArray &crashdump,
-		Fn<void()> launch);
+	LastCrashedWindow(const QByteArray &crashdump, Fn<void()> launch);
 
 	rpl::producer<MTP::ProxyData> proxyChanges() const;
 
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index e5cc426d0..c6127295b 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -281,6 +281,8 @@ base::options::toggle OptionFractionalScalingEnabled({
 const char kOptionFractionalScalingEnabled[] = "fractional-scaling-enabled";
 const char kOptionFreeType[] = "freetype";
 
+Launcher *Launcher::InstanceSetter::Instance = nullptr;
+
 std::unique_ptr<Launcher> Launcher::Create(int argc, char *argv[]) {
 	return std::make_unique<Platform::Launcher>(argc, argv);
 }
@@ -294,6 +296,10 @@ Launcher::Launcher(int argc, char *argv[])
 	base::Integration::Set(&_baseIntegration);
 }
 
+Launcher::~Launcher() {
+	InstanceSetter::Instance = nullptr;
+}
+
 void Launcher::init() {
 	_arguments = readArguments(_argc, _argv);
 
@@ -558,7 +564,7 @@ void Launcher::processArguments() {
 
 int Launcher::executeApplication() {
 	FilteredCommandLineArguments arguments(_argc, _argv);
-	Sandbox sandbox(this, arguments.count(), arguments.values());
+	Sandbox sandbox(arguments.count(), arguments.values());
 	Ui::MainQueueProcessor processor;
 	base::ConcurrentTimerEnvironment environment;
 	return sandbox.start();
diff --git a/Telegram/SourceFiles/core/launcher.h b/Telegram/SourceFiles/core/launcher.h
index 047218951..4d1f17edc 100644
--- a/Telegram/SourceFiles/core/launcher.h
+++ b/Telegram/SourceFiles/core/launcher.h
@@ -20,6 +20,12 @@ public:
 
 	static std::unique_ptr<Launcher> Create(int argc, char *argv[]);
 
+	static Launcher &Instance() {
+		Expects(InstanceSetter::Instance != nullptr);
+
+		return *InstanceSetter::Instance;
+	}
+
 	virtual int exec();
 
 	QString argumentsString() const;
@@ -32,7 +38,7 @@ public:
 	void writeDebugModeSetting();
 	void writeInstallBetaVersionsSetting();
 
-	virtual ~Launcher() = default;
+	virtual ~Launcher();
 
 protected:
 	enum class UpdaterLaunch {
@@ -61,6 +67,17 @@ private:
 
 	int executeApplication();
 
+	struct InstanceSetter {
+		InstanceSetter(not_null<Launcher*> instance) {
+			Expects(Instance == nullptr);
+
+			Instance = instance;
+		}
+
+		static Launcher *Instance;
+	};
+	InstanceSetter _setter = { this };
+
 	int _argc;
 	char **_argv;
 	QStringList _arguments;
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 741f7d072..6c332bbc1 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -78,13 +78,9 @@ QString _escapeFrom7bit(const QString &str) {
 
 bool Sandbox::QuitOnStartRequested = false;
 
-Sandbox::Sandbox(
-	not_null<Core::Launcher*> launcher,
-	int &argc,
-	char **argv)
+Sandbox::Sandbox(int &argc, char **argv)
 : QApplication(argc, argv)
-, _mainThreadId(QThread::currentThreadId())
-, _launcher(launcher) {
+, _mainThreadId(QThread::currentThreadId()) {
 	setQuitOnLastWindowClosed(false);
 }
 
@@ -107,7 +103,8 @@ int Sandbox::start() {
 		hashMd5Hex(d.constData(), d.size(), h.data());
 		_lockFile = std::make_unique<QLockFile>(QDir::tempPath() + '/' + h + '-' + cGUIDStr());
 		_lockFile->setStaleLockTime(0);
-		if (!_lockFile->tryLock() && _launcher->customWorkingDir()) {
+		if (!_lockFile->tryLock()
+			&& Launcher::Instance().customWorkingDir()) {
 			// On Windows, QLockFile has problems detecting a stale lock
 			// if the machine's hostname contains characters outside the US-ASCII character set.
 			if constexpr (Platform::IsWindows()) {
@@ -200,7 +197,7 @@ void Sandbox::launchApplication() {
 		}
 		setupScreenScale();
 
-		_application = std::make_unique<Application>(_launcher);
+		_application = std::make_unique<Application>();
 
 		// Ideally this should go to constructor.
 		// But we want to catch all native events and Application installs
@@ -401,7 +398,6 @@ void Sandbox::singleInstanceChecked() {
 		}
 		_lastCrashDump = crashdump;
 		auto window = new LastCrashedWindow(
-			_launcher,
 			_lastCrashDump,
 			[=] { launchApplication(); });
 		window->proxyChanges(
@@ -529,14 +525,6 @@ void Sandbox::refreshGlobalProxy() {
 	}
 }
 
-bool Sandbox::customWorkingDir() const {
-	return _launcher->customWorkingDir();
-}
-
-uint64 Sandbox::installationTag() const {
-	return _launcher->installationTag();
-}
-
 void Sandbox::checkForEmptyLoopNestingLevel() {
 	// _loopNestingLevel == _eventNestingLevel means that we had a
 	// native event in a nesting loop that didn't get a notify() call
diff --git a/Telegram/SourceFiles/core/sandbox.h b/Telegram/SourceFiles/core/sandbox.h
index bcf83982a..d8f47cd5a 100644
--- a/Telegram/SourceFiles/core/sandbox.h
+++ b/Telegram/SourceFiles/core/sandbox.h
@@ -19,7 +19,6 @@ class QLockFile;
 
 namespace Core {
 
-class Launcher;
 class UpdateChecker;
 class Application;
 
@@ -33,7 +32,7 @@ private:
 	}
 
 public:
-	Sandbox(not_null<Launcher*> launcher, int &argc, char **argv);
+	Sandbox(int &argc, char **argv);
 
 	Sandbox(const Sandbox &other) = delete;
 	Sandbox &operator=(const Sandbox &other) = delete;
@@ -41,8 +40,6 @@ public:
 	int start();
 
 	void refreshGlobalProxy();
-	bool customWorkingDir() const;
-	uint64 installationTag() const;
 
 	void postponeCall(FnMut<void()> &&callable);
 	bool notify(QObject *receiver, QEvent *e) override;
@@ -116,7 +113,6 @@ private:
 	std::vector<int> _previousLoopNestingLevels;
 	std::vector<PostponedCall> _postponedCalls;
 
-	not_null<Launcher*> _launcher;
 	std::unique_ptr<Application> _application;
 
 	QString _localServerName, _localSocketReadData;
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
index a2bc1c237..10f4e82b6 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -24,8 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Platform {
 namespace {
 
-Launcher *LauncherInstance = nullptr;
-
 class Arguments {
 public:
 	void push(QByteArray argument) {
@@ -50,15 +48,6 @@ private:
 Launcher::Launcher(int argc, char *argv[])
 : Core::Launcher(argc, argv)
 , _arguments(argv, argv + argc) {
-	Expects(LauncherInstance == nullptr);
-
-	LauncherInstance = this;
-}
-
-Launcher &Launcher::Instance() {
-	Expects(LauncherInstance != nullptr);
-
-	return *LauncherInstance;
 }
 
 int Launcher::exec() {
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.h b/Telegram/SourceFiles/platform/linux/launcher_linux.h
index 99d7259ee..36625a36a 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.h
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.h
@@ -15,8 +15,6 @@ class Launcher : public Core::Launcher {
 public:
 	Launcher(int argc, char *argv[]);
 
-	static Launcher &Instance();
-
 	int exec() override;
 
 private:
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 817997802..1ab7a8d54 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -15,10 +15,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/linux_wayland_integration.h"
-#include "platform/platform_launcher.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "storage/localstorage.h"
+#include "core/launcher.h"
 #include "core/sandbox.h"
 #include "core/application.h"
 #include "core/local_url_handlers.h"
@@ -138,7 +138,7 @@ bool PortalAutostart(bool start, bool silent) {
 
 		std::vector<Glib::ustring> commandline;
 		commandline.push_back(cExeName().toStdString());
-		if (Core::Sandbox::Instance().customWorkingDir()) {
+		if (Core::Launcher::Instance().customWorkingDir()) {
 			commandline.push_back("-workdir");
 			commandline.push_back(cWorkingDir().toStdString());
 		}
@@ -403,7 +403,7 @@ bool GenerateDesktopFile(
 					exec.append(!Core::UpdaterDisabled()
 						? (cExeDir() + cExeName())
 						: cExeName());
-					if (Core::Sandbox::Instance().customWorkingDir()) {
+					if (Core::Launcher::Instance().customWorkingDir()) {
 						exec.append(u"-workdir"_q);
 						exec.append(cWorkingDir());
 					}
@@ -426,7 +426,7 @@ bool GenerateDesktopFile(
 						exec[0] = !Core::UpdaterDisabled()
 							? (cExeDir() + cExeName())
 							: cExeName();
-						if (Core::Sandbox::Instance().customWorkingDir()) {
+						if (Core::Launcher::Instance().customWorkingDir()) {
 							exec.insert(1, u"-workdir"_q);
 							exec.insert(2, cWorkingDir());
 						}
@@ -479,7 +479,7 @@ bool GenerateDesktopFile(
 		const auto d = QFile::encodeName(QDir(cWorkingDir()).absolutePath());
 		hashMd5Hex(d.constData(), d.size(), md5Hash);
 
-		if (!Core::Sandbox::Instance().customWorkingDir()) {
+		if (!Core::Launcher::Instance().customWorkingDir()) {
 			const auto exePath = QFile::encodeName(
 				cExeDir() + cExeName());
 			hashMd5Hex(exePath.constData(), exePath.size(), md5Hash);
@@ -676,7 +676,7 @@ void start() {
 
 		if (!Core::UpdaterDisabled()) {
 			QByteArray md5Hash(h);
-			if (!Launcher::Instance().customWorkingDir()) {
+			if (!Core::Launcher::Instance().customWorkingDir()) {
 				const auto exePath = QFile::encodeName(
 					cExeDir() + cExeName());
 
@@ -726,6 +726,8 @@ void start() {
 		h,
 		cGUIDStr(),
 		u"%1"_q).toStdString());
+
+	InstallLauncher();
 }
 
 void finish() {
@@ -805,7 +807,6 @@ void start() {
 			"except various functionality to not to work.");
 	}
 
-	InstallLauncher();
 	LaunchGApplication();
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 0a105c158..0cd7c485f 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
 #include "core/update_checker.h"
+#include "core/launcher.h"
 #include "core/application.h"
 #include "tray.h"
 #include "storage/localstorage.h"
@@ -224,7 +225,7 @@ void SetupUpdate(
 			return (toggled != cInstallBetaVersion());
 		}) | rpl::start_with_next([=](bool toggled) {
 			cSetInstallBetaVersion(toggled);
-			Core::App().writeInstallBetaVersionsSetting();
+			Core::Launcher::Instance().writeInstallBetaVersionsSetting();
 
 			Core::UpdateChecker checker;
 			checker.stop();
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index 642f138c2..bb0888d13 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "storage/storage_media_prepare.h"
 #include "storage/localimageloader.h"
-#include "core/sandbox.h"
+#include "core/launcher.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "main/main_session.h"
@@ -138,7 +138,7 @@ void EditInfoBox::setInnerFocus() {
 }
 
 uint32 OccupationTag() {
-	return uint32(Core::Sandbox::Instance().installationTag() & 0xFFFFFFFF);
+	return uint32(Core::Launcher::Instance().installationTag() & 0xFFFFFFFF);
 }
 
 QString NormalizeName(QString name) {
@@ -268,7 +268,7 @@ Helper::Helper(not_null<Main::Session*> session)
 	}).fail([=] {
 		setSupportName(
 			u"[rand^"_q
-			+ QString::number(Core::Sandbox::Instance().installationTag())
+			+ QString::number(Core::Launcher::Instance().installationTag())
 			+ ']');
 	}).send();
 }

From af00247362a7ecc235ac8b4689ef9db6d7d4cf0c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 13 Jun 2023 06:03:19 +0400
Subject: [PATCH 196/676] Provide access to un-joined argument list in
 Core::Launcher

This allows to re-use the variable in Linux-specific code
---
 Telegram/SourceFiles/core/launcher.cpp                 | 7 +++----
 Telegram/SourceFiles/core/launcher.h                   | 2 +-
 Telegram/SourceFiles/logs.cpp                          | 2 +-
 Telegram/SourceFiles/platform/linux/launcher_linux.cpp | 9 ++++-----
 Telegram/SourceFiles/platform/linux/launcher_linux.h   | 2 --
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index c6127295b..dc1ac3235 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -290,6 +290,7 @@ std::unique_ptr<Launcher> Launcher::Create(int argc, char *argv[]) {
 Launcher::Launcher(int argc, char *argv[])
 : _argc(argc)
 , _argv(argv)
+, _arguments(readArguments(_argc, _argv))
 , _baseIntegration(_argc, _argv) {
 	crl::toggle_fp_exceptions(true);
 
@@ -301,8 +302,6 @@ Launcher::~Launcher() {
 }
 
 void Launcher::init() {
-	_arguments = readArguments(_argc, _argv);
-
 	prepareSettings();
 	initQtMessageLogging();
 
@@ -431,8 +430,8 @@ QStringList Launcher::readArguments(int argc, char *argv[]) const {
 	return result;
 }
 
-QString Launcher::argumentsString() const {
-	return _arguments.join(' ');
+const QStringList &Launcher::arguments() const {
+	return _arguments;
 }
 
 bool Launcher::customWorkingDir() const {
diff --git a/Telegram/SourceFiles/core/launcher.h b/Telegram/SourceFiles/core/launcher.h
index 4d1f17edc..264085f20 100644
--- a/Telegram/SourceFiles/core/launcher.h
+++ b/Telegram/SourceFiles/core/launcher.h
@@ -28,7 +28,7 @@ public:
 
 	virtual int exec();
 
-	QString argumentsString() const;
+	const QStringList &arguments() const;
 	bool customWorkingDir() const;
 
 	uint64 installationTag() const;
diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index 75ac2e87e..443e26049 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -430,7 +430,7 @@ void start(not_null<Core::Launcher*> launcher) {
 	LOG(("Executable dir: %1, name: %2").arg(cExeDir(), cExeName()));
 	LOG(("Initial working dir: %1").arg(initialWorkingDir));
 	LOG(("Working dir: %1").arg(cWorkingDir()));
-	LOG(("Command line: %1").arg(launcher->argumentsString()));
+	LOG(("Command line: %1").arg(launcher->arguments().join(' ')));
 
 	if (!LogsData) {
 		LOG(("FATAL: Could not open '%1' for writing log!"
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
index 10f4e82b6..9662cf427 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -46,14 +46,13 @@ private:
 } // namespace
 
 Launcher::Launcher(int argc, char *argv[])
-: Core::Launcher(argc, argv)
-, _arguments(argv, argv + argc) {
+: Core::Launcher(argc, argv) {
 }
 
 int Launcher::exec() {
-	for (auto i = begin(_arguments), e = end(_arguments); i != e; ++i) {
-		if (*i == "-webviewhelper" && std::distance(i, e) > 1) {
-			Webview::WebKitGTK::SetSocketPath(*(i + 1));
+	for (auto i = arguments().begin(), e = arguments().end(); i != e; ++i) {
+		if (*i == u"-webviewhelper"_q && std::distance(i, e) > 1) {
+			Webview::WebKitGTK::SetSocketPath((i + 1)->toStdString());
 			return Webview::WebKitGTK::Exec();
 		}
 	}
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.h b/Telegram/SourceFiles/platform/linux/launcher_linux.h
index 36625a36a..e0a45af0f 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.h
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.h
@@ -21,8 +21,6 @@ private:
 	void initHook() override;
 	bool launchUpdater(UpdaterLaunch action) override;
 
-	std::vector<std::string> _arguments;
-
 };
 
 } // namespace Platform

From 074c725c6c4fabd6e054f5ffcf5ba101fbca9a42 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 13 Jun 2023 04:54:57 +0400
Subject: [PATCH 197/676] Move Platform::ThirdParty::start content to
 LinuxIntegration

---
 .../platform/linux/integration_linux.cpp      | 200 +++++++++++++++++-
 .../platform/linux/specific_linux.cpp         | 174 ---------------
 2 files changed, 197 insertions(+), 177 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index e501ce93b..d69e06030 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -8,20 +8,89 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/integration_linux.h"
 
 #include "platform/platform_integration.h"
+#include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
+#include "core/sandbox.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "base/random.h"
 
-#include <xdpinhibit/xdpinhibit.hpp>
-#include <glibmm.h>
+#include <QtCore/QAbstractEventDispatcher>
 
-using namespace gi::repository;
+#include <xdpinhibit/xdpinhibit.hpp>
+#include <giomm.h>
+
+typedef GApplication TDesktopApplication;
+typedef GApplicationClass TDesktopApplicationClass;
+
+G_DEFINE_TYPE(
+	TDesktopApplication,
+	t_desktop_application,
+	G_TYPE_APPLICATION)
+
+static void t_desktop_application_class_init(
+		TDesktopApplicationClass *klass) {
+	const auto application_class = G_APPLICATION_CLASS(klass);
+
+	application_class->local_command_line = [](
+			GApplication *application,
+			char ***arguments,
+			int *exit_status) -> gboolean {
+		return false;
+	};
+
+	application_class->command_line = [](
+			GApplication *application,
+			GApplicationCommandLine *cmdline) {
+		return 0;
+	};
+
+	application_class->before_emit = [](
+			GApplication *application,
+			GVariant *platformData) {
+		if (Platform::IsWayland()) {
+			static const auto keys = {
+				"activation-token",
+				"desktop-startup-id",
+			};
+			for (const auto &key : keys) {
+				const char *token = nullptr;
+				g_variant_lookup(platformData, key, "&s", &token);
+				if (token) {
+					qputenv("XDG_ACTIVATION_TOKEN", token);
+					break;
+				}
+			}
+		}
+	};
+
+	application_class->add_platform_data = [](
+			GApplication *application,
+			GVariantBuilder *builder) {
+		if (Platform::IsWayland()) {
+			const auto token = qgetenv("XDG_ACTIVATION_TOKEN");
+			if (!token.isEmpty()) {
+				g_variant_builder_add(
+					builder,
+					"{sv}",
+					"activation-token",
+					g_variant_new_string(token.constData()));
+				qunsetenv("XDG_ACTIVATION_TOKEN");
+			}
+		}
+	};
+}
+
+static void t_desktop_application_init(TDesktopApplication *application) {
+}
 
 namespace Platform {
 namespace {
 
+using namespace gi::repository;
+namespace Gio = gi::repository::Gio;
+
 class LinuxIntegration final : public Integration {
 public:
 	LinuxIntegration();
@@ -33,6 +102,10 @@ private:
 		return _inhibitProxy;
 	}
 
+	void initInhibit();
+
+	static void LaunchNativeApplication();
+
 	XdpInhibit::InhibitProxy _inhibitProxy;
 	base::Platform::XDP::SettingWatcher _darkModeWatcher;
 };
@@ -61,9 +134,25 @@ LinuxIntegration::LinuxIntegration()
 		}
 	}
 }) {
+	LOG(("Icon theme: %1").arg(QIcon::themeName()));
+	LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
+
+	if (!QCoreApplication::eventDispatcher()->inherits(
+		"QEventDispatcherGlib")) {
+		g_warning("Qt is running without GLib event loop integration, "
+			"except various functionality to not to work.");
+	}
 }
 
 void LinuxIntegration::init() {
+	initInhibit();
+
+	Glib::signal_idle().connect_once([] {
+		LaunchNativeApplication();
+	});
+}
+
+void LinuxIntegration::initInhibit() {
 	if (!_inhibitProxy) {
 		return;
 	}
@@ -119,6 +208,111 @@ void LinuxIntegration::init() {
 		nullptr);
 }
 
+void LinuxIntegration::LaunchNativeApplication() {
+	const auto appId = QGuiApplication::desktopFileName()
+		.chopped(8)
+		.toStdString();
+
+	const auto app = Glib::wrap(
+		G_APPLICATION(
+			g_object_new(
+				t_desktop_application_get_type(),
+				"application-id",
+				::Gio::Application::id_is_valid(appId)
+					? appId.c_str()
+					: nullptr,
+				"flags",
+				G_APPLICATION_HANDLES_OPEN,
+				nullptr)));
+
+	app->signal_startup().connect([=] {
+		// GNotification
+		InvokeQueued(qApp, [] {
+			Core::App().notifications().createManager();
+		});
+
+		QEventLoop().exec();
+		app->quit();
+	}, true);
+
+	app->signal_activate().connect([] {
+		Core::Sandbox::Instance().customEnterFromEventLoop([] {
+			Core::App().activate();
+		});
+	}, true);
+
+	app->signal_open().connect([](
+			const ::Gio::Application::type_vec_files &files,
+			const Glib::ustring &hint) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			for (const auto &file : files) {
+				QFileOpenEvent e(
+					QUrl(QString::fromStdString(file->get_uri())));
+				QGuiApplication::sendEvent(qApp, &e);
+			}
+		});
+	}, true);
+
+	app->add_action("quit", [] {
+		Core::Sandbox::Instance().customEnterFromEventLoop([] {
+			Core::Quit();
+		});
+	});
+
+	using Window::Notifications::Manager;
+	using NotificationId = Manager::NotificationId;
+	using NotificationIdTuple = std::invoke_result_t<
+		decltype(&NotificationId::toTuple),
+		NotificationId*
+	>;
+
+	const auto notificationIdVariantType = [] {
+		try {
+			return base::Platform::MakeGlibVariant(
+				NotificationId().toTuple()).get_type();
+		} catch (...) {
+			return Glib::VariantType();
+		}
+	}();
+
+	app->add_action_with_parameter(
+		"notification-activate",
+		notificationIdVariantType,
+		[](const Glib::VariantBase &parameter) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				try {
+					const auto &app = Core::App();
+					app.notifications().manager().notificationActivated(
+						NotificationId::FromTuple(
+							base::Platform::GlibVariantCast<
+								NotificationIdTuple
+							>(parameter)));
+				} catch (...) {
+				}
+			});
+		});
+
+	app->add_action_with_parameter(
+		"notification-mark-as-read",
+		notificationIdVariantType,
+		[](const Glib::VariantBase &parameter) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				try {
+					const auto &app = Core::App();
+					app.notifications().manager().notificationReplied(
+						NotificationId::FromTuple(
+							base::Platform::GlibVariantCast<
+								NotificationIdTuple
+							>(parameter)),
+						{});
+				} catch (...) {
+				}
+			});
+		});
+
+	app->run(0, nullptr);
+}
+
 } // namespace
 
 std::unique_ptr<Integration> CreateIntegration() {
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 1ab7a8d54..5ecf4229a 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/specific_linux.h"
 
 #include "base/random.h"
-#include "base/options.h"
 #include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_dbus_utilities.h"
@@ -19,9 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "storage/localstorage.h"
 #include "core/launcher.h"
-#include "core/sandbox.h"
 #include "core/application.h"
-#include "core/local_url_handlers.h"
 #include "core/core_settings.h"
 #include "core/update_checker.h"
 #include "window/window_controller.h"
@@ -35,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QSystemTrayIcon>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QProcess>
-#include <QtCore/QAbstractEventDispatcher>
 
 #include <kshell.h>
 #include <ksandbox.h>
@@ -56,57 +52,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 using namespace Platform;
 using Platform::internal::WaylandIntegration;
 
-typedef GApplication TDesktopApplication;
-typedef GApplicationClass TDesktopApplicationClass;
-
-G_DEFINE_TYPE(
-	TDesktopApplication,
-	t_desktop_application,
-	G_TYPE_APPLICATION)
-
-static void t_desktop_application_class_init(
-		TDesktopApplicationClass *klass) {
-	const auto application_class = G_APPLICATION_CLASS(klass);
-
-	application_class->before_emit = [](
-			GApplication *application,
-			GVariant *platformData) {
-		if (Platform::IsWayland()) {
-			static const auto keys = {
-				"activation-token",
-				"desktop-startup-id",
-			};
-			for (const auto &key : keys) {
-				const char *token = nullptr;
-				g_variant_lookup(platformData, key, "&s", &token);
-				if (token) {
-					qputenv("XDG_ACTIVATION_TOKEN", token);
-					break;
-				}
-			}
-		}
-	};
-
-	application_class->add_platform_data = [](
-			GApplication *application,
-			GVariantBuilder *builder) {
-		if (Platform::IsWayland()) {
-			const auto token = qgetenv("XDG_ACTIVATION_TOKEN");
-			if (!token.isEmpty()) {
-				g_variant_builder_add(
-					builder,
-					"{sv}",
-					"activation-token",
-					g_variant_new_string(token.constData()));
-				qunsetenv("XDG_ACTIVATION_TOKEN");
-			}
-		}
-	};
-}
-
-static void t_desktop_application_init(TDesktopApplication *application) {
-}
-
 namespace Platform {
 namespace {
 
@@ -232,115 +177,6 @@ bool PortalAutostart(bool start, bool silent) {
 	return !error;
 }
 
-void LaunchGApplication() {
-	Glib::signal_idle().connect_once([] {
-		const auto appId = QGuiApplication::desktopFileName()
-			.chopped(8)
-			.toStdString();
-
-		const auto app = Glib::wrap(
-			G_APPLICATION(
-				g_object_new(
-					t_desktop_application_get_type(),
-					"application-id",
-					Gio::Application::id_is_valid(appId)
-						? appId.c_str()
-						: nullptr,
-					"flags",
-					G_APPLICATION_HANDLES_OPEN,
-					nullptr)));
-
-		app->signal_startup().connect([=] {
-			// GNotification
-			InvokeQueued(qApp, [] {
-				Core::App().notifications().createManager();
-			});
-
-			QEventLoop().exec();
-			app->quit();
-		}, true);
-
-		app->signal_activate().connect([] {
-			Core::Sandbox::Instance().customEnterFromEventLoop([] {
-				if (Core::IsAppLaunched()) {
-					Core::App().activate();
-				}
-			});
-		}, true);
-
-		app->signal_open().connect([](
-				const Gio::Application::type_vec_files &files,
-				const Glib::ustring &hint) {
-			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-				for (const auto &file : files) {
-					QFileOpenEvent e(
-						QUrl(QString::fromStdString(file->get_uri())));
-					QGuiApplication::sendEvent(qApp, &e);
-				}
-			});
-		}, true);
-
-		app->add_action("quit", [] {
-			Core::Sandbox::Instance().customEnterFromEventLoop([] {
-				Core::Quit();
-			});
-		});
-
-		using Window::Notifications::Manager;
-		using NotificationId = Manager::NotificationId;
-		using NotificationIdTuple = std::invoke_result_t<
-			decltype(&NotificationId::toTuple),
-			NotificationId*
-		>;
-
-		const auto notificationIdVariantType = [] {
-			try {
-				return base::Platform::MakeGlibVariant(
-					NotificationId().toTuple()).get_type();
-			} catch (...) {
-				return Glib::VariantType();
-			}
-		}();
-
-		app->add_action_with_parameter(
-			"notification-activate",
-			notificationIdVariantType,
-			[](const Glib::VariantBase &parameter) {
-				Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-					try {
-						const auto &app = Core::App();
-						app.notifications().manager().notificationActivated(
-							NotificationId::FromTuple(
-								base::Platform::GlibVariantCast<
-									NotificationIdTuple
-								>(parameter)));
-					} catch (...) {
-					}
-				});
-			});
-
-		app->add_action_with_parameter(
-			"notification-mark-as-read",
-			notificationIdVariantType,
-			[](const Glib::VariantBase &parameter) {
-				Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-					try {
-						const auto &app = Core::App();
-						app.notifications().manager().notificationReplied(
-							NotificationId::FromTuple(
-								base::Platform::GlibVariantCast<
-									NotificationIdTuple
-								>(parameter)),
-							{});
-					} catch (...) {
-					}
-				});
-			});
-
-		app->run(0, nullptr);
-	});
-}
-
 bool GenerateDesktopFile(
 		const QString &targetPath,
 		const QStringList &args = {},
@@ -798,16 +634,6 @@ QImage DefaultApplicationIcon() {
 namespace ThirdParty {
 
 void start() {
-	LOG(("Icon theme: %1").arg(QIcon::themeName()));
-	LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
-
-	if (!QCoreApplication::eventDispatcher()->inherits(
-		"QEventDispatcherGlib")) {
-		g_warning("Qt is running without GLib event loop integration, "
-			"except various functionality to not to work.");
-	}
-
-	LaunchGApplication();
 }
 
 void finish() {

From c81e2c525fb136d4cb146915ae23403af425cf05 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Jun 2023 22:59:33 +0400
Subject: [PATCH 198/676] Update submodules.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 83cab52cd..1e89c19a0 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 83cab52cd6ba93e9292405b23358d8dde3f95567
+Subproject commit 1e89c19a03ddd654e063e26fbb5223247212822d
diff --git a/cmake b/cmake
index a1ec454cb..92ec041c3 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a1ec454cbcc1a6ce9970968e3413c9a4341968d0
+Subproject commit 92ec041c38a432a4a282987d54f77457e71a2d4e

From 9c6ffa01015bdb9747a9bb3b7f21369a0154fe00 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 14 Jun 2023 16:11:20 +0400
Subject: [PATCH 199/676] Version 4.8.4.

- Fix opening links on Linux.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 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 a46c1f439..475e3ee7e 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.8.3.0" />
+    Version="4.8.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 bff12b87a..6f39c1168 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,8,3,0
- PRODUCTVERSION 4,8,3,0
+ FILEVERSION 4,8,4,0
+ PRODUCTVERSION 4,8,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.3.0"
+            VALUE "FileVersion", "4.8.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.3.0"
+            VALUE "ProductVersion", "4.8.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 92cdd7b32..732642486 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,8,3,0
- PRODUCTVERSION 4,8,3,0
+ FILEVERSION 4,8,4,0
+ PRODUCTVERSION 4,8,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.3.0"
+            VALUE "FileVersion", "4.8.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.3.0"
+            VALUE "ProductVersion", "4.8.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 0079871c5..0058d08cf 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 = 4008003;
-constexpr auto AppVersionStr = "4.8.3";
+constexpr auto AppVersion = 4008004;
+constexpr auto AppVersionStr = "4.8.4";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 26a1c6afc..e74e8988d 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008003
+AppVersion         4008004
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.3
-AppVersionStr      4.8.3
+AppVersionStrSmall 4.8.4
+AppVersionStr      4.8.4
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.3
+AppVersionOriginal 4.8.4
diff --git a/changelog.txt b/changelog.txt
index 57529e508..5906c8a22 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.4 (13.06.23)
+
+- Fix opening links on Linux.
+
 4.8.3 (31.05.23)
 
 - Fix main window focus from notifications with disabled animations.

From 22235226d646c6dc2c579b40aee41d3439fda01f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 14 Jun 2023 16:31:01 +0400
Subject: [PATCH 200/676] Make the full-tarball script collect nested
 submodules.

---
 Telegram/build/release.py | 83 +++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 34 deletions(-)

diff --git a/Telegram/build/release.py b/Telegram/build/release.py
index 83429b191..ce96bf9da 100644
--- a/Telegram/build/release.py
+++ b/Telegram/build/release.py
@@ -63,20 +63,11 @@ def getOutput(command):
     sys.exit(1)
   return output.decode('utf-8')
 
-def prepareSources():
-  workpath = os.getcwd()
-  os.chdir('../..')
-  rootpath = os.getcwd()
-  finalpath = rootpath + '/out/Release/sources.tar'
-  if os.path.exists(finalpath):
-    os.remove(finalpath)
-  if os.path.exists(finalpath + '.gz'):
-    os.remove(finalpath + '.gz')
-  tmppath = rootpath + '/out/Release/tmp.tar'
-  print('Preparing source tarball...')
-  if (call(('git archive --prefix=tdesktop-' + version + '-full/ -o ' + finalpath + ' v' + version).split()) != 0):
-    os.remove(finalpath)
-    sys.exit(1)
+def invoke(command):
+  return call(command.split()) == 0
+
+def appendSubmodules(appendTo, root, rootRevision):
+  startpath = os.getcwd()
   lines = getOutput('git submodule foreach').split('\n')
   for line in lines:
     if len(line) == 0:
@@ -84,23 +75,48 @@ def prepareSources():
     match = re.match(r"^Entering '([^']+)'$", line)
     if not match:
       print('Bad line: ' + line)
-      sys.exit(1)
+      return False
     path = match.group(1)
-    revision = getOutput('git rev-parse v' + version + ':' + path).split('\n')[0]
+    subroot = root + '/' + path
+    revision = getOutput('git rev-parse ' + rootRevision + ':' + path).split('\n')[0]
     print('Adding submodule ' + path + '...')
     os.chdir(path)
-    if (call(('git archive --prefix=tdesktop-' + version + '-full/' + path + '/ ' + revision + ' -o ' + tmppath).split()) != 0):
-      os.remove(finalpath)
-      os.remove(tmppath)
-      sys.exit(1)
-    if (call(('gtar --concatenate --file=' + finalpath + ' ' + tmppath).split()) != 0):
-      os.remove(finalpath)
-      os.remove(tmppath)
-      sys.exit(1)
-    os.remove(tmppath)
-    os.chdir(rootpath)
+    tmppath = appendTo + '_tmp'
+    if not invoke('git archive --prefix=' + subroot + '/ ' + revision + ' -o ' + tmppath + '.tar'):
+      os.remove(appendTo + '.tar')
+      os.remove(tmppath + '.tar')
+      return False
+    if not appendSubmodules(tmppath, subroot, revision):
+      return False
+    if not invoke('gtar --concatenate --file=' + appendTo + '.tar ' + tmppath + '.tar'):
+      os.remove(appendTo + '.tar')
+      os.remove(tmppath + '.tar')
+      return False
+    os.remove(tmppath + '.tar')
+    os.chdir(startpath)
+  return True
+
+def prepareSources():
+  workpath = os.getcwd()
+  os.chdir('../..')
+  rootpath = os.getcwd()
+  finalpart = rootpath + '/out/Release/sources'
+  finalpath = finalpart + '.tar'
+  if os.path.exists(finalpath):
+    os.remove(finalpath)
+  if os.path.exists(finalpath + '.gz'):
+    os.remove(finalpath + '.gz')
+  tmppath = rootpath + '/out/Release/tmp.tar'
+  print('Preparing source tarball...')
+  revision = 'v' + version
+  targetRoot = 'tdesktop-' + version + '-full';
+  if not invoke('git archive --prefix=' + targetRoot + '/ -o ' + finalpath + ' ' + revision):
+    os.remove(finalpath)
+    sys.exit(1)
+  if not appendSubmodules(finalpart, targetRoot, revision):
+    sys.exit(1)
   print('Compressing...')
-  if (call(('gzip -9 ' + finalpath).split()) != 0):
+  if not invoke('gzip -9 ' + finalpath):
     os.remove(finalpath)
     sys.exit(1)
   os.chdir(workpath)
@@ -254,12 +270,12 @@ if r.status_code == 404:
   checkResponseCode(r, 201)
 
 tagname = 'v' + version
-call("git fetch origin".split())
+invoke("git fetch origin")
 if stable == 1:
-  call("git push launchpad {}:master".format(tagname).split())
+  invoke("git push launchpad {}:master".format(tagname))
 else:
-  call("git push launchpad {}:beta".format(tagname).split())
-call("git push --tags launchpad".split())
+  invoke("git push launchpad {}:beta".format(tagname))
+invoke("git push --tags launchpad")
 
 r = requests.get(url + 'repos/telegramdesktop/tdesktop/releases/tags/v' + version)
 checkResponseCode(r, 200)
@@ -307,9 +323,8 @@ for file in files:
   checkResponseCode(r, 201)
 
   print('Success! Removing.')
-  return_code = call(["rm", file_path])
-  if return_code != 0:
-    print('Bad rm code: ' + str(return_code))
+  if not invoke('rm ' + file_path):
+    print('Bad rm return code :(')
     sys.exit(1)
 
 sys.exit()

From 32f13c3716f156cd68954cce6a9f10eb8ceeb29c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 15 Jun 2023 00:36:50 +0400
Subject: [PATCH 201/676] Deduplicate executable path computation

---
 Telegram/SourceFiles/core/launcher.cpp | 11 -----------
 Telegram/SourceFiles/settings.cpp      |  2 +-
 Telegram/SourceFiles/settings.h        | 11 ++++++++---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index dc1ac3235..bf5de7ac6 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -441,17 +441,6 @@ bool Launcher::customWorkingDir() const {
 void Launcher::prepareSettings() {
 	auto path = base::Platform::CurrentExecutablePath(_argc, _argv);
 	LOG(("Executable path before check: %1").arg(path));
-	if (!path.isEmpty()) {
-		auto info = QFileInfo(path);
-		if (info.isSymLink()) {
-			info = QFileInfo(info.symLinkTarget());
-		}
-		if (info.exists()) {
-			const auto dir = info.absoluteDir().absolutePath();
-			gExeDir = (dir.endsWith('/') ? dir : (dir + '/'));
-			gExeName = info.fileName();
-		}
-	}
 	if (cExeName().isEmpty()) {
 		LOG(("WARNING: Could not compute executable path, some features will be disabled."));
 	}
diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp
index e546b14d3..4e2f6e878 100644
--- a/Telegram/SourceFiles/settings.cpp
+++ b/Telegram/SourceFiles/settings.cpp
@@ -18,7 +18,7 @@ QByteArray gAlphaPrivateKey;
 
 bool gManyInstance = false;
 QString gKeyFile;
-QString gWorkingDir, gExeDir, gExeName;
+QString gWorkingDir;
 
 QStringList gSendPaths;
 QString gStartUrl;
diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h
index 298283651..c99ad9597 100644
--- a/Telegram/SourceFiles/settings.h
+++ b/Telegram/SourceFiles/settings.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/integration.h"
 #include "ui/style/style_core.h"
 
 #define DeclareReadSetting(Type, Name) extern Type g##Name; \
@@ -56,11 +57,15 @@ inline void cForceWorkingDir(const QString &newDir) {
 	}
 
 }
-DeclareReadSetting(QString, ExeName);
-DeclareReadSetting(QString, ExeDir);
+inline QString cExeName() {
+	return base::Integration::Instance().executableName();
+}
+inline QString cExeDir() {
+	return base::Integration::Instance().executableDir();
+}
 DeclareSetting(QString, DialogLastPath);
 DeclareSetting(QString, DialogHelperPath);
-inline const QString &cDialogHelperPathFinal() {
+inline QString cDialogHelperPathFinal() {
 	return cDialogHelperPath().isEmpty() ? cExeDir() : cDialogHelperPath();
 }
 

From 8aee08eaef61cbb426567b1b5753a1eeda420b9b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Jun 2023 00:01:45 +0400
Subject: [PATCH 202/676] Track argv0 through relaunches

---
 Telegram/SourceFiles/_other/updater_linux.cpp | 10 ++++---
 .../platform/linux/launcher_linux.cpp         | 30 ++++++++++++++-----
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/_other/updater_linux.cpp b/Telegram/SourceFiles/_other/updater_linux.cpp
index 40e887c52..f286b05be 100644
--- a/Telegram/SourceFiles/_other/updater_linux.cpp
+++ b/Telegram/SourceFiles/_other/updater_linux.cpp
@@ -46,6 +46,7 @@ string updaterName;
 string workDir;
 string exeName;
 string exePath;
+string argv0;
 
 FILE *_logFile = 0;
 void openLog() {
@@ -388,6 +389,8 @@ int main(int argc, char *argv[]) {
 			exeName = argv[i];
 		} else if (equal(argv[i], "-exepath") && ++i < argc) {
 			exePath = argv[i];
+		} else if (equal(argv[i], "-argv0") && ++i < argc) {
+			argv0 = argv[i];
 		}
 	}
 	if (exeName.empty() || exeName.find('/') != string::npos) {
@@ -461,15 +464,14 @@ int main(int argc, char *argv[]) {
 		writeLog("Error: short exe name!");
 	}
 
-	auto fullBinaryPath = exePath + exeName;
-	const auto path = fullBinaryPath.c_str();
+	const auto fullBinaryPath = exePath + exeName;
 
 	auto values = vector<string>();
 	const auto push = [&](string arg) {
 		// Force null-terminated .data() call result.
 		values.push_back(arg + char(0));
 	};
-	push(path);
+	push(!argv0.empty() ? argv0 : fullBinaryPath);
 	push("-noupdate");
 	if (autostart) push("-autostart");
 	if (debug) push("-debug");
@@ -498,7 +500,7 @@ int main(int argc, char *argv[]) {
 			writeLog("fork() failed!");
 			return 1;
 		case 0:
-			execv(args[0], args.data());
+			execv(fullBinaryPath.c_str(), args.data());
 			return 1;
 		}
 	}
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
index 9662cf427..e5ae4efb5 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -69,17 +69,23 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 		return false;
 	}
 
-	const auto binaryPath = (action == UpdaterLaunch::JustRelaunch)
-		? (cExeDir() + cExeName())
-		: (cWriteProtected()
+	const auto justRelaunch = action == UpdaterLaunch::JustRelaunch;
+	const auto writeProtectedUpdate = action == UpdaterLaunch::PerformUpdate
+		&& cWriteProtected();
+
+	const auto binaryPath = justRelaunch
+		? QFile::encodeName(cExeDir() + cExeName())
+		: QFile::encodeName(cWriteProtected()
 			? (cWorkingDir() + u"tupdates/temp/Updater"_q)
 			: (cExeDir() + u"Updater"_q));
 
 	auto argumentsList = Arguments();
-	if (action == UpdaterLaunch::PerformUpdate && cWriteProtected()) {
+	if (writeProtectedUpdate) {
 		argumentsList.push("pkexec");
 	}
-	argumentsList.push(QFile::encodeName(binaryPath));
+	argumentsList.push((justRelaunch && !arguments().isEmpty())
+		? QFile::encodeName(arguments().first())
+		: binaryPath);
 
 	if (cLaunchMode() == LaunchModeAutoStart) {
 		argumentsList.push("-autostart");
@@ -95,7 +101,7 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 		argumentsList.push(QFile::encodeName(cDataFile()));
 	}
 
-	if (action == UpdaterLaunch::JustRelaunch) {
+	if (justRelaunch) {
 		argumentsList.push("-noupdate");
 		argumentsList.push("-tosettings");
 		if (customWorkingDir()) {
@@ -109,6 +115,10 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 		argumentsList.push(QFile::encodeName(cExeName()));
 		argumentsList.push("-exepath");
 		argumentsList.push(QFile::encodeName(cExeDir()));
+		if (!arguments().isEmpty()) {
+			argumentsList.push("-argv0");
+			argumentsList.push(QFile::encodeName(arguments().first()));
+		}
 		if (customWorkingDir()) {
 			argumentsList.push("-workdir_custom");
 		}
@@ -125,11 +135,15 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 	pid_t pid = fork();
 	switch (pid) {
 	case -1: return false;
-	case 0: execvp(args[0], args); return false;
+	case 0:
+		execvp(
+			writeProtectedUpdate ? args[0] : binaryPath.constData(),
+			args);
+		return false;
 	}
 
 	// pkexec needs an alive parent
-	if (action == UpdaterLaunch::PerformUpdate && cWriteProtected()) {
+	if (writeProtectedUpdate) {
 		waitpid(pid, nullptr, 0);
 		// launch new version in the same environment
 		return launchUpdater(UpdaterLaunch::JustRelaunch);

From 1d234ea9908151872b842082c6b0cf6088b5a8e6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Jun 2023 00:15:23 +0400
Subject: [PATCH 203/676] Use argv0 for shortcuts when updater is disabled

---
 Telegram/SourceFiles/core/application.cpp     |  4 +--
 .../platform/linux/specific_linux.cpp         | 29 ++++++++++++-------
 .../SourceFiles/platform/mac/specific_mac.h   |  4 +++
 .../SourceFiles/platform/platform_specific.h  |  3 +-
 .../SourceFiles/platform/win/specific_win.h   |  4 +++
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 533ad5c77..4fb01d12b 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -1762,9 +1762,7 @@ void Application::startShortcuts() {
 
 void Application::RegisterUrlScheme() {
 	base::Platform::RegisterUrlScheme(base::Platform::UrlSchemeDescriptor{
-		.executable = (!Platform::IsLinux() || !Core::UpdaterDisabled())
-			? (cExeDir() + cExeName())
-			: cExeName(),
+		.executable = Platform::ExecutablePathForShortcuts(),
 		.arguments = Launcher::Instance().customWorkingDir()
 			? u"-workdir \"%1\""_q.arg(cWorkingDir())
 			: QString(),
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 5ecf4229a..64b6b0ff0 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -191,6 +191,7 @@ bool GenerateDesktopFile(
 
 	const auto sourceFile = kDesktopFile.utf16();
 	const auto targetFile = targetPath + QGuiApplication::desktopFileName();
+	const auto executable = ExecutablePathForShortcuts();
 
 	const auto sourceText = [&] {
 		QFile source(sourceFile);
@@ -224,11 +225,7 @@ bool GenerateDesktopFile(
 				target->set_string(
 					group,
 					"TryExec",
-					KShell::joinArgs({
-						!Core::UpdaterDisabled()
-							? (cExeDir() + cExeName())
-							: cExeName()
-					}).replace(
+					KShell::joinArgs({ executable }).replace(
 						'\\',
 						qstr("\\\\")).toStdString());
 			}
@@ -236,9 +233,7 @@ bool GenerateDesktopFile(
 			if (target->has_key(group, "Exec")) {
 				if (group == "Desktop Entry" && !args.isEmpty()) {
 					QStringList exec;
-					exec.append(!Core::UpdaterDisabled()
-						? (cExeDir() + cExeName())
-						: cExeName());
+					exec.append(executable);
 					if (Core::Launcher::Instance().customWorkingDir()) {
 						exec.append(u"-workdir"_q);
 						exec.append(cWorkingDir());
@@ -259,9 +254,7 @@ bool GenerateDesktopFile(
 							qstr("\\")));
 
 					if (!exec.isEmpty()) {
-						exec[0] = !Core::UpdaterDisabled()
-							? (cExeDir() + cExeName())
-							: cExeName();
+						exec[0] = executable;
 						if (Core::Launcher::Instance().customWorkingDir()) {
 							exec.insert(1, u"-workdir"_q);
 							exec.insert(2, cWorkingDir());
@@ -451,6 +444,20 @@ bool SkipTaskbarSupported() {
 	return false;
 }
 
+QString ExecutablePathForShortcuts() {
+	if (Core::UpdaterDisabled()) {
+		const auto &arguments = Core::Launcher::Instance().arguments();
+		if (!arguments.isEmpty()) {
+			const auto result = QFileInfo(arguments.first()).fileName();
+			if (!result.isEmpty()) {
+				return result;
+			}
+		}
+		return cExeName();
+	}
+	return cExeDir() + cExeName();
+}
+
 } // namespace Platform
 
 QString psAppDataPath() {
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index fb63752c1..12cc59024 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -40,6 +40,10 @@ inline uint64 ActivationWindowId(not_null<QWidget*> window) {
 inline void ActivateOtherProcess(uint64 processId, uint64 windowId) {
 }
 
+inline QString ExecutablePathForShortcuts() {
+	return cExeDir() + cExeName();
+}
+
 namespace ThirdParty {
 
 inline void start() {
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index 2056b8c87..604676615 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -46,10 +46,9 @@ bool TrayIconSupported();
 bool SkipTaskbarSupported();
 void WriteCrashDumpDetails();
 void NewVersionLaunched(int oldVersion);
-
 [[nodiscard]] QImage DefaultApplicationIcon();
-
 [[nodiscard]] bool PreventsQuit(Core::QuitReason reason);
+[[nodiscard]] QString ExecutablePathForShortcuts();
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 [[nodiscard]] std::optional<bool> IsDarkMode();
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index db10b458e..0b0945dd5 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -42,6 +42,10 @@ void SetWindowPriority(not_null<QWidget*> window, uint32 priority);
 // Activate window with windowId (if found) or the largest priority.
 void ActivateOtherProcess(uint64 processId, uint64 windowId);
 
+inline QString ExecutablePathForShortcuts() {
+	return cExeDir() + cExeName();
+}
+
 namespace ThirdParty {
 
 void start();

From 2c1a2088b7b27e53fdcf4cf31576a9fe01d269dd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Jun 2023 02:57:27 +0400
Subject: [PATCH 204/676] Port forgetten places to Core::Launcher::Instance()

---
 Telegram/SourceFiles/core/crash_report_window.h |  4 ----
 Telegram/SourceFiles/core/crash_reports.cpp     |  4 ++--
 Telegram/SourceFiles/core/crash_reports.h       |  6 +-----
 Telegram/SourceFiles/core/launcher.cpp          |  2 +-
 Telegram/SourceFiles/logs.cpp                   | 10 +++++-----
 Telegram/SourceFiles/logs.h                     |  6 +-----
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/core/crash_report_window.h b/Telegram/SourceFiles/core/crash_report_window.h
index 5c20c26c8..f0c438119 100644
--- a/Telegram/SourceFiles/core/crash_report_window.h
+++ b/Telegram/SourceFiles/core/crash_report_window.h
@@ -20,10 +20,6 @@ namespace MTP {
 struct ProxyData;
 } // namespace MTP
 
-namespace Core {
-class Launcher;
-} // namespace Core
-
 class PreLaunchWindow : public QWidget {
 public:
 	PreLaunchWindow(QString title = QString());
diff --git a/Telegram/SourceFiles/core/crash_reports.cpp b/Telegram/SourceFiles/core/crash_reports.cpp
index 9419e9c89..be7e77cdd 100644
--- a/Telegram/SourceFiles/core/crash_reports.cpp
+++ b/Telegram/SourceFiles/core/crash_reports.cpp
@@ -313,7 +313,7 @@ QString PlatformString() {
 	Unexpected("Platform in CrashReports::PlatformString.");
 }
 
-void StartCatching(not_null<Core::Launcher*> launcher) {
+void StartCatching() {
 #ifndef DESKTOP_APP_DISABLE_CRASH_REPORTS
 	ProcessAnnotations["Binary"] = cExeName().toUtf8().constData();
 	ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData();
@@ -324,7 +324,7 @@ void StartCatching(not_null<Core::Launcher*> launcher) {
 			: u"%1"_q).arg(AppVersion)).toUtf8().constData();
 	ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData();
 	ProcessAnnotations["Platform"] = PlatformString().toUtf8().constData();
-	ProcessAnnotations["UserTag"] = QString::number(launcher->installationTag(), 16).toUtf8().constData();
+	ProcessAnnotations["UserTag"] = QString::number(Core::Launcher::Instance().installationTag(), 16).toUtf8().constData();
 
 	QString dumpspath = cWorkingDir() + u"tdata/dumps"_q;
 	QDir().mkpath(dumpspath);
diff --git a/Telegram/SourceFiles/core/crash_reports.h b/Telegram/SourceFiles/core/crash_reports.h
index b60941642..6a1f0e1d4 100644
--- a/Telegram/SourceFiles/core/crash_reports.h
+++ b/Telegram/SourceFiles/core/crash_reports.h
@@ -7,10 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-namespace Core {
-class Launcher;
-} // namespace Core
-
 namespace CrashReports {
 
 QString PlatformString();
@@ -53,7 +49,7 @@ inline void ClearAnnotationRef(const std::string &key) {
 	SetAnnotationRef(key, nullptr);
 }
 
-void StartCatching(not_null<Core::Launcher*> launcher);
+void StartCatching();
 void FinishCatching();
 
 } // namespace CrashReports
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index bf5de7ac6..52ebbd7c7 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -348,7 +348,7 @@ int Launcher::exec() {
 	}
 
 	// Must be started before Platform is started.
-	Logs::start(this);
+	Logs::start();
 	base::options::init(cWorkingDir() + "tdata/experimental_options.json");
 
 	// Must be called after options are inited.
diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index 443e26049..03cfe4c49 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -343,10 +343,10 @@ bool WritingEntry() {
 	return WritingEntryFlag;
 }
 
-void start(not_null<Core::Launcher*> launcher) {
+void start() {
 	Assert(LogsData == nullptr);
 
-	if (!launcher->checkPortableVersionFolder()) {
+	if (!Core::Launcher::Instance().checkPortableVersionFolder()) {
 		return;
 	}
 
@@ -414,8 +414,8 @@ void start(not_null<Core::Launcher*> launcher) {
 
 	QDir().mkpath(cWorkingDir() + u"tdata"_q);
 
-	launcher->workingFolderReady();
-	CrashReports::StartCatching(launcher);
+	Core::Launcher::Instance().workingFolderReady();
+	CrashReports::StartCatching();
 
 	if (!LogsData->openMain()) {
 		delete LogsData;
@@ -430,7 +430,7 @@ void start(not_null<Core::Launcher*> launcher) {
 	LOG(("Executable dir: %1, name: %2").arg(cExeDir(), cExeName()));
 	LOG(("Initial working dir: %1").arg(initialWorkingDir));
 	LOG(("Working dir: %1").arg(cWorkingDir()));
-	LOG(("Command line: %1").arg(launcher->arguments().join(' ')));
+	LOG(("Command line: %1").arg(Core::Launcher::Instance().arguments().join(' ')));
 
 	if (!LogsData) {
 		LOG(("FATAL: Could not open '%1' for writing log!"
diff --git a/Telegram/SourceFiles/logs.h b/Telegram/SourceFiles/logs.h
index f45b07658..b9de4401f 100644
--- a/Telegram/SourceFiles/logs.h
+++ b/Telegram/SourceFiles/logs.h
@@ -11,17 +11,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/assertion.h"
 #include "base/debug_log.h"
 
-namespace Core {
-class Launcher;
-} // namespace Core
-
 namespace Logs {
 
 void SetDebugEnabled(bool enabled);
 bool DebugEnabled();
 [[nodiscard]] bool WritingEntry();
 
-void start(not_null<Core::Launcher*> launcher);
+void start();
 bool started();
 void finish();
 

From c9179b78b36ba677f47dfd08ae44cfcaa39a3e1b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Jun 2023 10:30:33 +0400
Subject: [PATCH 205/676] Update lib_base

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 6041498fb..e0763c0c7 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 6041498fbafcd0a22df88b7973d9e8f9bdf16958
+Subproject commit e0763c0c7ae38c89e09b0d41080293a0cb77ecde

From a3cdf19c1fb3816604a96e4a8b56c3b2dac5fc65 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Jun 2023 11:59:40 +0400
Subject: [PATCH 206/676] Ensure Wayland integration instance accessor doesn't
 leak

---
 .../platform/linux/linux_wayland_integration.cpp  | 15 +++++++++------
 Telegram/lib_base                                 |  2 +-
 Telegram/lib_ui                                   |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index 064fb818b..b6cc6c888 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -123,12 +123,15 @@ WaylandIntegration::~WaylandIntegration() = default;
 WaylandIntegration *WaylandIntegration::Instance() {
 	if (!IsWayland()) return nullptr;
 	static std::optional<WaylandIntegration> instance(std::in_place);
-	base::qt_signal_producer(
-		QGuiApplication::platformNativeInterface(),
-		&QObject::destroyed
-	) | rpl::start_with_next([&] {
-		instance = std::nullopt;
-	}, instance->_private->lifetime);
+	[[maybe_unused]] static const auto Inited = [] {
+		base::qt_signal_producer(
+			QGuiApplication::platformNativeInterface(),
+			&QObject::destroyed
+		) | rpl::start_with_next([] {
+			instance = std::nullopt;
+		}, instance->_private->lifetime);
+		return true;
+	}();
 	if (!instance) return nullptr;
 	return &*instance;
 }
diff --git a/Telegram/lib_base b/Telegram/lib_base
index e0763c0c7..249814b33 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit e0763c0c7ae38c89e09b0d41080293a0cb77ecde
+Subproject commit 249814b3343c5ed06b56597ac870df81c77f8417
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 1e89c19a0..8a5604880 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 1e89c19a03ddd654e063e26fbb5223247212822d
+Subproject commit 8a560488011f833b7ba534999f878d20d5152e6c

From 00a237c144ad2c862ba1dc590075dd41b202dd75 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 17 Jun 2023 15:12:11 +0400
Subject: [PATCH 207/676] 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 46c465a2a..674eb837f 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 46c465a2aa1b0c127c6453f89d98301f4c525c48
+Subproject commit 674eb837fb9a5eed570261818b44a9510e0e3fab

From 9f34f049eccedcd1d355b57195006180d84065ec Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 18 Mar 2023 00:40:18 +0400
Subject: [PATCH 208/676] Simplify setting Dockerfile defaults

---
 Telegram/build/docker/centos_env/gen_dockerfile.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/gen_dockerfile.py b/Telegram/build/docker/centos_env/gen_dockerfile.py
index 76143aa39..997b784ca 100755
--- a/Telegram/build/docker/centos_env/gen_dockerfile.py
+++ b/Telegram/build/docker/centos_env/gen_dockerfile.py
@@ -3,10 +3,13 @@ from os import environ
 from os.path import dirname
 from jinja2 import Environment, FileSystemLoader
 
+def checkEnv(envName, defaultValue):
+    return bool(len(environ[envName])) if envName in environ else defaultValue
+
 def main():
     print(Environment(loader=FileSystemLoader(dirname(__file__))).get_template("Dockerfile").render(
-        DEBUG=bool(len(environ["DEBUG"])) if "DEBUG" in environ else True,
-        LTO=bool(len(environ["LTO"])) if "LTO" in environ else True,
+        DEBUG=checkEnv("DEBUG", True),
+        LTO=checkEnv("LTO", True),
     ))
 
 if __name__ == '__main__':

From 0eff5236d4f376cbb66e4d572431450a36b3e97f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 17 Jun 2023 16:48:22 +0400
Subject: [PATCH 209/676] Free disk space for Docker and Snap

---
 .github/workflows/docker.yml                | 7 ++++++-
 .github/workflows/snap.yml                  | 3 +++
 Telegram/build/docker/centos_env/Dockerfile | 4 ----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 520caaf68..ad5ccedc5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -25,7 +25,12 @@ jobs:
           submodules: recursive
 
       - name: First set up.
-        run: curl -sSL https://install.python-poetry.org | python3 -
+        run: |
+          sudo apt update
+          curl -sSL https://install.python-poetry.org | python3 -
+
+      - name: Free up some disk space.
+        uses: jlumbroso/free-disk-space@76866dbe54312617f00798d1762df7f43def6e5c
 
       - name: Docker image build.
         run: |
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 18ad071b8..4191aced9 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -60,6 +60,9 @@ jobs:
           sudo snap run lxd init --auto
           sudo snap run lxd waitready
 
+      - name: Free up some disk space.
+        uses: jlumbroso/free-disk-space@76866dbe54312617f00798d1762df7f43def6e5c
+
       - name: Telegram Desktop snap build.
         run: sg lxd -c 'snap run snapcraft -v'
 
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index d34728fed..44ca3b8ed 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -729,10 +729,6 @@ RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }
 	&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
 	&& cd qtbase \
 	&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
-	&& cd ../qtdeclarative \
-	&& sed -i '/add_subdirectory(quickcontrols)/d' src/CMakeLists.txt \
-	&& sed -i '/add_subdirectory(quickdialogs)/d' src/CMakeLists.txt \
-	&& sed -i '/add_subdirectory(quicknativestyle)/d' src/CMakeLists.txt \
 	&& cd .. \
 	&& ./configure -prefix "{{ QT_PREFIX }}" \
 		CMAKE_BUILD_TYPE=None \

From 78b003761f990287c2b7790b9d8bdc449c9bcc9b Mon Sep 17 00:00:00 2001
From: CaledoniaProject <CaledoniaProject@users.noreply.github.com>
Date: Mon, 19 Jun 2023 10:04:34 +0800
Subject: [PATCH 210/676] Update building-mac.md

ninja is required to run prepare.py
---
 docs/building-mac.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/building-mac.md b/docs/building-mac.md
index c9bd02fbf..d357c66c1 100644
--- a/docs/building-mac.md
+++ b/docs/building-mac.md
@@ -13,7 +13,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
 Go to ***BuildPath*** and run
 
     ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-    brew install git automake cmake wget pkg-config gnu-tar
+    brew install git automake cmake wget pkg-config gnu-tar ninja
 
     sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 

From 63cc462b0689db4e096d7834f1fd19e3cd72c217 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 17 Jun 2023 02:52:24 +0400
Subject: [PATCH 211/676] Migrate from qt_static_plugins.cpp to the
 Qt6-pregenerated initializators

---
 Telegram/SourceFiles/_other/packer.cpp | 6 ------
 Telegram/codegen                       | 2 +-
 cmake                                  | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/_other/packer.cpp b/Telegram/SourceFiles/_other/packer.cpp
index 2bf651bc6..0ba79c1be 100644
--- a/Telegram/SourceFiles/_other/packer.cpp
+++ b/Telegram/SourceFiles/_other/packer.cpp
@@ -7,12 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "packer.h"
 
-#include <QtCore/QtPlugin>
-
-#ifdef Q_OS_MAC
-//Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
-#endif
-
 bool BetaChannel = false;
 quint64 AlphaVersion = 0;
 bool OnlyAlphaKey = false;
diff --git a/Telegram/codegen b/Telegram/codegen
index 1a969faa0..5a11029c4 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 1a969faa0afb29d53af03e530775eccdfb8433f1
+Subproject commit 5a11029c461416407a423ac9921356fba0088ab6
diff --git a/cmake b/cmake
index 92ec041c3..926c3119d 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 92ec041c38a432a4a282987d54f77457e71a2d4e
+Subproject commit 926c3119df0b9873537a19209277252004ef1af3

From 44c9cfc36b8e7e282edee67738686e7829df8b81 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 17 Jun 2023 16:25:07 +0400
Subject: [PATCH 212/676] Fix a warning in snap build

Looks like having gsettings in global plugs is no more valid
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7fbd74ff9..2251e0548 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -28,6 +28,7 @@ apps:
       - camera
       - desktop
       - desktop-legacy
+      - gsettings
       - hardware-observe
       - home
       - network
@@ -53,7 +54,6 @@ plugs:
     mount-host-font-cache: false
   # Support for common GTK themes
   # https://forum.snapcraft.io/t/how-to-use-the-system-gtk-theme-via-the-gtk-common-themes-snap/6235
-  gsettings:
   gtk-3-themes:
     interface: content
     target: $SNAP/data-dir/themes

From cadacc1f51c3192979dca0463daad5e8cf79bd0a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 19 Jun 2023 17:57:56 +0400
Subject: [PATCH 213/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 249814b33..770995801 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 249814b3343c5ed06b56597ac870df81c77f8417
+Subproject commit 770995801b817b3b627b12dc15a25e38e221e411
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 674eb837f..c47b21c4e 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 674eb837fb9a5eed570261818b44a9510e0e3fab
+Subproject commit c47b21c4eef4ac2f214c6c94c9afc9036ca0606e
diff --git a/cmake b/cmake
index 926c3119d..9e47fc7e2 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 926c3119df0b9873537a19209277252004ef1af3
+Subproject commit 9e47fc7e2042fc723785b99753a67eb298e296ca

From fd0456b03715932bfd720889fd176d98babceaf9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 22 Jun 2023 17:33:13 +0400
Subject: [PATCH 214/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 770995801..f904c6098 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 770995801b817b3b627b12dc15a25e38e221e411
+Subproject commit f904c60987115a4b514a575b23009ff25de0fafa
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index c47b21c4e..0f78952e9 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit c47b21c4eef4ac2f214c6c94c9afc9036ca0606e
+Subproject commit 0f78952e907a30a94756dd8b7a34117c3f8017ac
diff --git a/cmake b/cmake
index 9e47fc7e2..0811c5f44 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9e47fc7e2042fc723785b99753a67eb298e296ca
+Subproject commit 0811c5f4469e4da50e9ca0034913569e05913cc5

From ac589cb51e9de850f91d2d12c7734f309df878a9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 27 Jun 2023 18:27:00 +0400
Subject: [PATCH 215/676] Update submodules

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 Telegram/lib_base                           | 2 +-
 Telegram/lib_webview                        | 2 +-
 cmake                                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 44ca3b8ed..e4b9ad10e 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -59,7 +59,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 a1b912c90eaab470ef283622a8f890ee6264dae7 \
+	&& git fetch --depth=1 origin 963f5b0c2a57f7e90239e64c9e14ed5f043e637e \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/Telegram/lib_base b/Telegram/lib_base
index f904c6098..9aaee8907 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit f904c60987115a4b514a575b23009ff25de0fafa
+Subproject commit 9aaee890765618e9d9ea52fba0a03ab4baa7dfda
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 0f78952e9..5c3e82bfe 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 0f78952e907a30a94756dd8b7a34117c3f8017ac
+Subproject commit 5c3e82bfe71627ddeffee6ec44a7215bfb52e38e
diff --git a/cmake b/cmake
index 0811c5f44..dbc4f3aae 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 0811c5f4469e4da50e9ca0034913569e05913cc5
+Subproject commit dbc4f3aaed033915f8014fdbb6d115ec566c205a

From 0421e41c47200f22775cce476b5b1faf1527a085 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 1 Jul 2023 10:25:47 +0400
Subject: [PATCH 216/676] Check actual executable path instead of cExeName in
 GenerateDesktopFile

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

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 64b6b0ff0..ba1b42d27 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -182,7 +182,8 @@ bool GenerateDesktopFile(
 		const QStringList &args = {},
 		bool onlyMainGroup = false,
 		bool silent = false) {
-	if (targetPath.isEmpty() || cExeName().isEmpty()) {
+	const auto executable = ExecutablePathForShortcuts();
+	if (targetPath.isEmpty() || executable.isEmpty()) {
 		return false;
 	}
 
@@ -191,7 +192,6 @@ bool GenerateDesktopFile(
 
 	const auto sourceFile = kDesktopFile.utf16();
 	const auto targetFile = targetPath + QGuiApplication::desktopFileName();
-	const auto executable = ExecutablePathForShortcuts();
 
 	const auto sourceText = [&] {
 		QFile source(sourceFile);

From 2dfe85832717ccfd9268a5b767f03eb4e8665b8f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 1 Jul 2023 10:30:48 +0400
Subject: [PATCH 217/676] Support D-Bus activation

---
 Telegram/CMakeLists.txt                       |  1 +
 .../platform/linux/specific_linux.cpp         | 50 +++++++++++++++++++
 lib/xdg/org.telegram.desktop.desktop          |  1 +
 lib/xdg/org.telegram.desktop.service          |  3 ++
 4 files changed, 55 insertions(+)
 create mode 100644 lib/xdg/org.telegram.desktop.service

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d61a678dd..991101b61 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1730,5 +1730,6 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     install(FILES "Resources/art/icon256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "telegram.png")
     install(FILES "../lib/xdg/org.telegram.desktop.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+    install(FILES "../lib/xdg/org.telegram.desktop.service" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
 endif()
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index ba1b42d27..f0f673c7f 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -322,6 +322,55 @@ bool GenerateDesktopFile(
 	return true;
 }
 
+bool GenerateServiceFile(bool silent = false) {
+	const auto executable = ExecutablePathForShortcuts();
+	if (executable.isEmpty()) {
+		return false;
+	}
+
+	const auto targetPath = QStandardPaths::writableLocation(
+		QStandardPaths::GenericDataLocation) + u"/dbus-1/services/"_q;
+
+	const auto targetFile = targetPath
+		+ QGuiApplication::desktopFileName().chopped(8)
+		+ u".service"_q;
+
+	DEBUG_LOG(("App Info: placing .service file to %1").arg(targetPath));
+	if (!QDir(targetPath).exists()) QDir().mkpath(targetPath);
+
+	const auto target = Glib::KeyFile::create();
+	constexpr auto group = "D-BUS Service";
+
+	target->set_string(
+		group,
+		"Name",
+		QGuiApplication::desktopFileName().chopped(8).toStdString());
+
+	target->set_string(
+		group,
+		"Exec",
+		KShell::joinArgs({ executable }).replace(
+			'\\',
+			qstr("\\\\")).toStdString());
+
+	try {
+		target->save_to_file(targetFile.toStdString());
+	} catch (const std::exception &e) {
+		if (!silent) {
+			LOG(("App Error: %1").arg(QString::fromStdString(e.what())));
+		}
+		return false;
+	}
+
+	QProcess::execute(u"systemctl"_q, {
+		u"--user"_q,
+		u"reload"_q,
+		u"dbus"_q,
+	});
+
+	return true;
+}
+
 void InstallLauncher() {
 	static const auto DisabledByEnv = !qEnvironmentVariableIsEmpty(
 		"DESKTOPINTEGRATION");
@@ -335,6 +384,7 @@ void InstallLauncher() {
 		QStandardPaths::ApplicationsLocation) + '/';
 
 	GenerateDesktopFile(applicationsPath);
+	GenerateServiceFile();
 
 	const auto icons = QStandardPaths::writableLocation(
 		QStandardPaths::GenericDataLocation) + u"/icons/"_q;
diff --git a/lib/xdg/org.telegram.desktop.desktop b/lib/xdg/org.telegram.desktop.desktop
index 38fbe2c63..d4bd3b8b4 100644
--- a/lib/xdg/org.telegram.desktop.desktop
+++ b/lib/xdg/org.telegram.desktop.desktop
@@ -11,6 +11,7 @@ Categories=Chat;Network;InstantMessaging;Qt;
 MimeType=x-scheme-handler/tg;
 Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;
 Actions=quit;
+DBusActivatable=true
 SingleMainWindow=true
 X-GNOME-UsesNotifications=true
 X-GNOME-SingleWindow=true
diff --git a/lib/xdg/org.telegram.desktop.service b/lib/xdg/org.telegram.desktop.service
new file mode 100644
index 000000000..0f9caabbc
--- /dev/null
+++ b/lib/xdg/org.telegram.desktop.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.telegram.desktop
+Exec=telegram-desktop

From 86cc3c5557c3c4ad9bd948b7e6a9eea27c5eafb2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 27 Jun 2023 22:01:06 +0400
Subject: [PATCH 218/676] Fail docker script on cmake fail

---
 Telegram/build/docker/centos_env/build.sh | 1 +
 cmake                                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/build/docker/centos_env/build.sh b/Telegram/build/docker/centos_env/build.sh
index b86f9911e..6aee294a4 100755
--- a/Telegram/build/docker/centos_env/build.sh
+++ b/Telegram/build/docker/centos_env/build.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 cd Telegram
 ./configure.sh "$@"
diff --git a/cmake b/cmake
index dbc4f3aae..3eec2fe48 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit dbc4f3aaed033915f8014fdbb6d115ec566c205a
+Subproject commit 3eec2fe482d4a9afcf8c5ae78da647f277bcc6f0

From 1da95a03c7ccc4ca28cc918f2bfa06f34f6799d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Wed, 5 Jul 2023 11:12:04 +0200
Subject: [PATCH 219/676] Update cmake_helpers submodule

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

diff --git a/cmake b/cmake
index 3eec2fe48..f20e647e2 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 3eec2fe482d4a9afcf8c5ae78da647f277bcc6f0
+Subproject commit f20e647e297b6dd006e77f288465e6a1cdab10e9

From 8bd9293a490332c28b77a3c712f57bb41db780bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Fri, 23 Jun 2023 15:48:21 +0200
Subject: [PATCH 220/676] Update dav1d, libde265, libheif, libjxl in Windows
 build

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

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 813716b75..8b8bfd1d3 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -673,7 +673,7 @@ mac:
 
 stage('dav1d', """
 win:
-    git clone -b 1.0.0 --depth 1 https://code.videolan.org/videolan/dav1d.git
+    git clone -b 1.2.1 --depth 1 https://code.videolan.org/videolan/dav1d.git
     cd dav1d
 depends:python/Scripts/activate.bat
     %THIRDPARTY_DIR%\\python\\Scripts\\activate.bat
@@ -710,7 +710,7 @@ release:
 
 stage('libde265', """
 win:
-    git clone --depth 1 -b v1.0.11 https://github.com/strukturag/libde265.git
+    git clone --depth 1 -b v1.0.12 https://github.com/strukturag/libde265.git
     cd libde265
     cmake . ^
         -A %WIN32X64% ^
@@ -734,7 +734,7 @@ release:
 
 stage('libheif', """
 win:
-    git clone --depth 1 -b v1.15.1 https://github.com/strukturag/libheif.git
+    git clone --depth 1 -b v1.16.2 https://github.com/strukturag/libheif.git
     cd libheif
     %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/LIBHEIF_EXPORTS/LIBDE265_STATIC_BUILD/g' libheif/CMakeLists.txt
     %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/HAVE_VISIBILITY/LIBHEIF_STATIC_BUILD/g' libheif/CMakeLists.txt
@@ -762,7 +762,7 @@ release:
 
 stage('libjxl', """
 win:
-    git clone -b v0.8.1 --depth 1 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
+    git clone -b v0.8.2 --depth 1 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
     cd libjxl
     cmake . ^
         -A %WIN32X64% ^

From 23778bec9f854d41b29220291f5e5fa24ba5d894 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 1 Jul 2023 00:30:02 +0000
Subject: [PATCH 221/676] Update User-Agent for DNS to Chrome 114.0.5735.133.

---
 .../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 e5d229bcf..d339bc228 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/113.0.5672.63 Safari/537.36");
+		"Chrome/114.0.5735.133 Safari/537.36");
 	return kResult;
 }
 

From 2534fab7e7ddc67588792c55a426c78135af6bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Mon, 17 Jul 2023 17:22:19 +0200
Subject: [PATCH 222/676] Upgrade libjxl in snapcraft.yaml

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2251e0548..693773d0b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -272,7 +272,7 @@ parts:
   libjxl:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1
-    source-tag: v0.8.1
+    source-tag: v0.8.2
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s

From d0e851647a6262e10cdc35f931603e4160ea0fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Mon, 17 Jul 2023 17:29:07 +0200
Subject: [PATCH 223/676] Upgrade dav1d, libde265, libheif, libjxl in Linux
 build

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index e4b9ad10e..a7de4ed0d 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -196,7 +196,7 @@ RUN git clone -b v1.3.1 --depth=1 {{ GIT }}/xiph/opus.git \
 FROM builder AS dav1d
 COPY --link --from=nasm {{ LibrariesPath }}/nasm-cache /
 
-RUN git clone -b 1.0.0 --depth=1 {{ GIT }}/videolan/dav1d.git \
+RUN git clone -b 1.2.1 --depth=1 {{ GIT }}/videolan/dav1d.git \
 	&& cd dav1d \
 	&& meson build \
 		--buildtype=plain \
@@ -209,7 +209,7 @@ RUN git clone -b 1.0.0 --depth=1 {{ GIT }}/videolan/dav1d.git \
 	&& rm -rf dav1d
 
 FROM builder AS libde265
-RUN git clone -b v1.0.11 --depth=1 {{ GIT }}/strukturag/libde265.git \
+RUN git clone -b v1.0.12 --depth=1 {{ GIT }}/strukturag/libde265.git \
 	&& cd libde265 \
 	&& cmake -GNinja . \
 		-DCMAKE_BUILD_TYPE=None \
@@ -254,7 +254,7 @@ RUN git clone -b v0.11.1 --depth=1 {{ GIT }}/AOMediaCodec/libavif.git \
 FROM builder AS libheif
 COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
 
-RUN git clone -b v1.15.1 --depth=1 {{ GIT }}/strukturag/libheif.git \
+RUN git clone -b v1.16.2 --depth=1 {{ GIT }}/strukturag/libheif.git \
 	&& cd libheif \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
@@ -279,7 +279,7 @@ COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
 COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
 COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
 
-RUN git clone -b v0.8.1 --depth=1 {{ GIT }}/libjxl/libjxl.git \
+RUN git clone -b v0.8.2 --depth=1 {{ GIT }}/libjxl/libjxl.git \
 	&& cd libjxl \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \

From 0534a2fb6213a2c05e06c4a1f7668a9c31b6c326 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Jun 2023 07:20:11 +0400
Subject: [PATCH 224/676] Fix QGuiApplication::desktopFileName usage

The Qt documentation says:
This is the file name, without the full path or the trailing ".desktop" extension of the desktop entry that represents this application according to the freedesktop desktop entry specification.

Qt 6.5.2 also automatically fixes it breaking all the current tdesktop and desktop-app usage expecting the file extension.
---
 .../platform/linux/integration_linux.cpp      |  4 +---
 .../platform/linux/main_window_linux.cpp      |  7 +++---
 .../linux/notifications_manager_linux.cpp     |  2 +-
 .../platform/linux/specific_linux.cpp         | 24 ++++++++++---------
 Telegram/lib_base                             |  2 +-
 Telegram/lib_webview                          |  2 +-
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index d69e06030..26ed0d9fe 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -209,9 +209,7 @@ void LinuxIntegration::initInhibit() {
 }
 
 void LinuxIntegration::LaunchNativeApplication() {
-	const auto appId = QGuiApplication::desktopFileName()
-		.chopped(8)
-		.toStdString();
+	const auto appId = QGuiApplication::desktopFileName().toStdString();
 
 	const auto app = Glib::wrap(
 		G_APPLICATION(
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 98c6ff40a..c0b76494e 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -118,9 +118,7 @@ void XCBSetDesktopFileName(QWindow *window) {
 		base::Platform::XCB::GetAtom(connection, "_KDE_NET_WM_DESKTOP_FILE"),
 	};
 
-	const auto filename = QGuiApplication::desktopFileName()
-		.chopped(8)
-		.toUtf8();
+	const auto filename = QGuiApplication::desktopFileName().toUtf8();
 
 	for (const auto atom : filenameAtoms) {
 		if (atom.has_value()) {
@@ -244,7 +242,8 @@ void MainWindow::updateUnityCounter() {
 
 	const auto launcherUrl = Glib::ustring(
 		"application://"
-			+ QGuiApplication::desktopFileName().toStdString());
+			+ QGuiApplication::desktopFileName().toStdString()
+			+ ".desktop");
 	const auto counterSlice = std::min(Core::App().unreadBadge(), 9999);
 	std::map<Glib::ustring, Glib::VariantBase> dbusUnityProperties;
 
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 456be21ba..210064ac0 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -591,7 +591,7 @@ bool NotificationData::init(
 	_hints["category"] = Glib::Variant<Glib::ustring>::create("im.received");
 
 	_hints["desktop-entry"] = Glib::Variant<Glib::ustring>::create(
-		QGuiApplication::desktopFileName().chopped(8).toStdString());
+		QGuiApplication::desktopFileName().toStdString());
 
 	_notificationClosedSignalId = _dbusConnection->signal_subscribe(
 		signalEmitted,
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index f0f673c7f..9e9fe63ba 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -191,7 +191,9 @@ bool GenerateDesktopFile(
 	if (!QDir(targetPath).exists()) QDir().mkpath(targetPath);
 
 	const auto sourceFile = kDesktopFile.utf16();
-	const auto targetFile = targetPath + QGuiApplication::desktopFileName();
+	const auto targetFile = targetPath
+		+ QGuiApplication::desktopFileName()
+		+ u".desktop"_q;
 
 	const auto sourceText = [&] {
 		QFile source(sourceFile);
@@ -332,7 +334,7 @@ bool GenerateServiceFile(bool silent = false) {
 		QStandardPaths::GenericDataLocation) + u"/dbus-1/services/"_q;
 
 	const auto targetFile = targetPath
-		+ QGuiApplication::desktopFileName().chopped(8)
+		+ QGuiApplication::desktopFileName()
 		+ u".service"_q;
 
 	DEBUG_LOG(("App Info: placing .service file to %1").arg(targetPath));
@@ -344,7 +346,7 @@ bool GenerateServiceFile(bool silent = false) {
 	target->set_string(
 		group,
 		"Name",
-		QGuiApplication::desktopFileName().chopped(8).toStdString());
+		QGuiApplication::desktopFileName().toStdString());
 
 	target->set_string(
 		group,
@@ -455,7 +457,9 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
 
 		if (!enabled) {
 			return QFile::remove(
-				autostart + QGuiApplication::desktopFileName());
+				autostart
+					+ QGuiApplication::desktopFileName()
+					+ u".desktop"_q);
 		}
 
 		return GenerateDesktopFile(
@@ -557,14 +561,13 @@ void start() {
 
 	QGuiApplication::setDesktopFileName([&] {
 		if (KSandbox::isFlatpak()) {
-			return qEnvironmentVariable("FLATPAK_ID") + u".desktop"_q;
+			return qEnvironmentVariable("FLATPAK_ID");
 		}
 
 		if (KSandbox::isSnap()) {
 			return qEnvironmentVariable("SNAP_INSTANCE_NAME")
 				+ '_'
-				+ cExeName()
-				+ u".desktop"_q;
+				+ cExeName();
 		}
 
 		if (!Core::UpdaterDisabled()) {
@@ -579,14 +582,13 @@ void start() {
 					md5Hash.data());
 			}
 
-			return u"org.telegram.desktop._%1.desktop"_q.arg(
-				md5Hash.constData());
+			return u"org.telegram.desktop._%1"_q.arg(md5Hash.constData());
 		}
 
-		return u"org.telegram.desktop.desktop"_q;
+		return u"org.telegram.desktop"_q;
 	}());
 
-	LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName()));
+	LOG(("App ID: %1").arg(QGuiApplication::desktopFileName()));
 
 	if (!qEnvironmentVariableIsSet("XDG_ACTIVATION_TOKEN")
 		&& qEnvironmentVariableIsSet("DESKTOP_STARTUP_ID")) {
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 9aaee8907..4efa613fe 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 9aaee890765618e9d9ea52fba0a03ab4baa7dfda
+Subproject commit 4efa613fe3fb5e1db8a4c53b08852cfe538d2601
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 5c3e82bfe..ec24c7a96 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 5c3e82bfe71627ddeffee6ec44a7215bfb52e38e
+Subproject commit ec24c7a96036268b2024ca9765a66c63e6b8396a

From 59bb46aa406a0e446aec4984025045e86881b2f7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 19 Jul 2023 22:58:22 +0400
Subject: [PATCH 225/676] Update Qt to 6.5.2 on Linux

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index a7de4ed0d..88fe34eb2 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.5.1" -%}
+{%- set QT = "6.5.2" -%}
 {%- set QT_TAG = "v" ~ QT -%}
 {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
 {%- set OPENSSL_VER = "1_1_1" -%}
@@ -59,7 +59,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 963f5b0c2a57f7e90239e64c9e14ed5f043e637e \
+	&& git fetch --depth=1 origin 523b061671d4dd2f29979c982a2d03c2cc8eaf4f \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 693773d0b..f6ccbea64 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -461,7 +461,7 @@ parts:
       - libxkbcommon-x11-0
       - zlib1g
     override-pull: |
-      QT=6.5.1
+      QT=6.5.2
 
       git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools

From 29d0c8c2eca5cbb196d8d66910aac0e200a736f1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Apr 2023 17:43:57 +0400
Subject: [PATCH 226/676] Update API scheme to layer 159.

---
 Telegram/Resources/tl/api.tl                  | 31 +++++++++++--------
 Telegram/SourceFiles/api/api_updates.cpp      |  6 ++--
 Telegram/SourceFiles/api/api_user_privacy.cpp | 21 ++++++-------
 Telegram/SourceFiles/api/api_user_privacy.h   |  1 +
 Telegram/SourceFiles/data/data_poll.cpp       | 18 +++++------
 Telegram/SourceFiles/data/data_poll.h         |  2 +-
 .../history/view/media/history_view_poll.cpp  | 14 ++++-----
 .../polls/info_polls_results_inner_widget.cpp | 27 ++++++++--------
 8 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 6a606b743..aa3934e16 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -370,7 +370,7 @@ updateDeleteScheduledMessages#90866cee peer:Peer messages:Vector<int> = Update;
 updateTheme#8216fba3 theme:Theme = Update;
 updateGeoLiveViewed#871fb939 peer:Peer msg_id:int = Update;
 updateLoginToken#564fe691 = Update;
-updateMessagePollVote#106395c9 poll_id:long user_id:long options:Vector<bytes> qts:int = Update;
+updateMessagePollVote#24f40e77 poll_id:long peer:Peer options:Vector<bytes> qts:int = Update;
 updateDialogFilter#26ffde7d flags:# id:int filter:flags.0?DialogFilter = Update;
 updateDialogFilterOrder#a5d72105 order:Vector<int> = Update;
 updateDialogFilters#3504914f = Update;
@@ -514,6 +514,7 @@ inputPrivacyKeyProfilePhoto#5719bacc = InputPrivacyKey;
 inputPrivacyKeyPhoneNumber#352dafa = InputPrivacyKey;
 inputPrivacyKeyAddedByPhone#d1219bdd = InputPrivacyKey;
 inputPrivacyKeyVoiceMessages#aee69d68 = InputPrivacyKey;
+inputPrivacyKeyAbout#3823cc40 = InputPrivacyKey;
 
 privacyKeyStatusTimestamp#bc2eab30 = PrivacyKey;
 privacyKeyChatInvite#500e6dfa = PrivacyKey;
@@ -524,6 +525,7 @@ privacyKeyProfilePhoto#96151fed = PrivacyKey;
 privacyKeyPhoneNumber#d19ae46d = PrivacyKey;
 privacyKeyAddedByPhone#42ffd42b = PrivacyKey;
 privacyKeyVoiceMessages#697f414 = PrivacyKey;
+privacyKeyAbout#a486b761 = PrivacyKey;
 
 inputPrivacyValueAllowContacts#d09e07b = InputPrivacyRule;
 inputPrivacyValueAllowAll#184b35ce = InputPrivacyRule;
@@ -1135,7 +1137,7 @@ poll#86e18161 id:long flags:# closed:flags.0?true public_voters:flags.1?true mul
 
 pollAnswerVoters#3b6ddad2 flags:# chosen:flags.0?true correct:flags.1?true option:bytes voters:int = PollAnswerVoters;
 
-pollResults#dcb82ea3 flags:# min:flags.0?true results:flags.1?Vector<PollAnswerVoters> total_voters:flags.2?int recent_voters:flags.3?Vector<long> solution:flags.4?string solution_entities:flags.4?Vector<MessageEntity> = PollResults;
+pollResults#7adf2420 flags:# min:flags.0?true results:flags.1?Vector<PollAnswerVoters> total_voters:flags.2?int recent_voters:flags.3?Vector<Peer> solution:flags.4?string solution_entities:flags.4?Vector<MessageEntity> = PollResults;
 
 chatOnlines#f041e250 onlines:int = ChatOnlines;
 
@@ -1156,7 +1158,7 @@ codeSettings#ad253d78 flags:# allow_flashcall:flags.0?true current_number:flags.
 
 wallPaperSettings#1dc1bca4 flags:# blur:flags.1?true motion:flags.2?true background_color:flags.0?int second_background_color:flags.4?int third_background_color:flags.5?int fourth_background_color:flags.6?int intensity:flags.3?int rotation:flags.4?int = WallPaperSettings;
 
-autoDownloadSettings#8efab953 flags:# disabled:flags.0?true video_preload_large:flags.1?true audio_preload_next:flags.2?true phonecalls_less_data:flags.3?true photo_size_max:int video_size_max:long file_size_max:long video_upload_maxbitrate:int = AutoDownloadSettings;
+autoDownloadSettings#baa57628 flags:# disabled:flags.0?true video_preload_large:flags.1?true audio_preload_next:flags.2?true phonecalls_less_data:flags.3?true photo_size_max:int video_size_max:long file_size_max:long video_upload_maxbitrate:int small_queue_active_operations_max:int large_queue_active_operations_max:int = AutoDownloadSettings;
 
 account.autoDownloadSettings#63cacf26 low:AutoDownloadSettings medium:AutoDownloadSettings high:AutoDownloadSettings = account.AutoDownloadSettings;
 
@@ -1217,11 +1219,7 @@ themeSettings#fa58b6d4 flags:# message_colors_animated:flags.2?true base_theme:B
 
 webPageAttributeTheme#54b56617 flags:# documents:flags.0?Vector<Document> settings:flags.1?ThemeSettings = WebPageAttribute;
 
-messageUserVote#34d247b4 user_id:long option:bytes date:int = MessageUserVote;
-messageUserVoteInputOption#3ca5b0ec user_id:long date:int = MessageUserVote;
-messageUserVoteMultiple#8a65e557 user_id:long options:Vector<bytes> date:int = MessageUserVote;
-
-messages.votesList#823f649 flags:# count:int votes:Vector<MessageUserVote> users:Vector<User> next_offset:flags.0?string = messages.VotesList;
+messages.votesList#4899484e flags:# count:int votes:Vector<MessagePeerVote> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?string = messages.VotesList;
 
 bankCardOpenUrl#f568028a url:string name:string = BankCardOpenUrl;
 
@@ -1346,7 +1344,7 @@ account.resetPasswordFailedWait#e3779861 retry_date:int = account.ResetPasswordR
 account.resetPasswordRequestedWait#e9effc7d until_date:int = account.ResetPasswordResult;
 account.resetPasswordOk#e926d63e = account.ResetPasswordResult;
 
-sponsoredMessage#fc25b828 flags:# recommended:flags.5?true show_peer_photo:flags.6?true random_id:bytes from_id:flags.3?Peer chat_invite:flags.4?ChatInvite chat_invite_hash:flags.4?string channel_post:flags.2?int start_param:flags.0?string message:string entities:flags.1?Vector<MessageEntity> sponsor_info:flags.7?string additional_info:flags.8?string = SponsoredMessage;
+sponsoredMessage#daafff6b flags:# recommended:flags.5?true show_peer_photo:flags.6?true random_id:bytes from_id:flags.3?Peer chat_invite:flags.4?ChatInvite chat_invite_hash:flags.4?string channel_post:flags.2?int start_param:flags.0?string webpage:flags.9?SponsoredWebPage message:string entities:flags.1?Vector<MessageEntity> sponsor_info:flags.7?string additional_info:flags.8?string = SponsoredMessage;
 
 messages.sponsoredMessages#c9ee1d87 flags:# posts_between:flags.0?int messages:Vector<SponsoredMessage> chats:Vector<Chat> users:Vector<User> = messages.SponsoredMessages;
 messages.sponsoredMessagesEmpty#1839490f = messages.SponsoredMessages;
@@ -1378,7 +1376,7 @@ availableReaction#c077ec01 flags:# inactive:flags.0?true premium:flags.2?true re
 messages.availableReactionsNotModified#9f071957 = messages.AvailableReactions;
 messages.availableReactions#768e3aad hash:int reactions:Vector<AvailableReaction> = messages.AvailableReactions;
 
-messagePeerReaction#8c79b63c flags:# big:flags.0?true unread:flags.1?true peer_id:Peer date:int reaction:Reaction = MessagePeerReaction;
+messagePeerReaction#8c79b63c flags:# big:flags.0?true unread:flags.1?true my:flags.2?true peer_id:Peer date:int reaction:Reaction = MessagePeerReaction;
 
 groupCallStreamChannel#80eb48af channel:int scale:int last_timestamp_ms:long = GroupCallStreamChannel;
 
@@ -1543,6 +1541,12 @@ chatlists.chatlistUpdates#93bd878d missing_peers:Vector<Peer> chats:Vector<Chat>
 
 bots.botInfo#e8a775b0 name:string about:string description:string = bots.BotInfo;
 
+messagePeerVote#b6cc2d5c peer:Peer option:bytes date:int = MessagePeerVote;
+messagePeerVoteInputOption#74cda504 peer:Peer date:int = MessagePeerVote;
+messagePeerVoteMultiple#4628f6e6 peer:Peer options:Vector<bytes> date:int = MessagePeerVote;
+
+sponsoredWebPage#3db8ec63 flags:# url:string site_name:string photo:flags.0?Photo = SponsoredWebPage;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1663,6 +1667,7 @@ account.getDefaultGroupPhotoEmojis#915860ae hash:long = EmojiList;
 account.getAutoSaveSettings#adcbbcda = account.AutoSaveSettings;
 account.saveAutoSaveSettings#d69b8361 flags:# users:flags.0?true chats:flags.1?true broadcasts:flags.2?true peer:flags.3?InputPeer settings:AutoSaveSettings = Bool;
 account.deleteAutoSaveExceptions#53bc0020 = Bool;
+account.invalidateSignInCodes#ca8ae8ba codes:Vector<string> = Bool;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
@@ -1768,7 +1773,6 @@ messages.setInlineGameScore#15ad9f64 flags:# edit_message:flags.0?true force:fla
 messages.getGameHighScores#e822649d peer:InputPeer id:int user_id:InputUser = messages.HighScores;
 messages.getInlineGameHighScores#f635e1b id:InputBotInlineMessageID user_id:InputUser = messages.HighScores;
 messages.getCommonChats#e40ca104 user_id:InputUser max_id:long limit:int = messages.Chats;
-messages.getAllChats#875f74be except_ids:Vector<long> = messages.Chats;
 messages.getWebPage#32ca8f91 url:string hash:int = WebPage;
 messages.toggleDialogPin#a731e257 flags:# pinned:flags.0?true peer:InputDialogPeer = Bool;
 messages.reorderPinnedDialogs#3b1adf37 flags:# force:flags.0?true folder_id:int order:Vector<InputDialogPeer> = Bool;
@@ -1882,7 +1886,7 @@ messages.requestAppWebView#8c5a3b3c flags:# write_allowed:flags.0?true peer:Inpu
 messages.setChatWallPaper#8ffacae1 flags:# peer:InputPeer wallpaper:flags.0?InputWallPaper settings:flags.2?WallPaperSettings id:flags.1?int = Updates;
 
 updates.getState#edd4882a = updates.State;
-updates.getDifference#25939651 flags:# pts:int pts_total_limit:flags.0?int date:int qts:int = updates.Difference;
+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;
 updates.getChannelDifference#3173d78 flags:# force:flags.0?true channel:InputChannel filter:ChannelMessagesFilter pts:int limit:int = updates.ChannelDifference;
 
 photos.updateProfilePhoto#9e82039 flags:# fallback:flags.0?true bot:flags.1?InputUser id:InputPhoto = photos.Photo;
@@ -1979,6 +1983,7 @@ channels.reorderPinnedForumTopics#2950a18f flags:# force:flags.0?true channel:In
 channels.toggleAntiSpam#68f3e4eb channel:InputChannel enabled:Bool = Updates;
 channels.reportAntiSpamFalsePositive#a850a693 channel:InputChannel msg_id:int = Bool;
 channels.toggleParticipantsHidden#6a6e7854 channel:InputChannel enabled:Bool = Updates;
+channels.clickSponsoredMessage#18afbc93 channel:InputChannel random_id:bytes = Bool;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;
@@ -2075,4 +2080,4 @@ chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
 chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
-// LAYER 158
+// LAYER 159
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 59f8b098b..4a8ce5173 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -677,9 +677,11 @@ void Updates::getDifference() {
 	api().request(MTPupdates_GetDifference(
 		MTP_flags(0),
 		MTP_int(_ptsWaiter.current()),
-		MTPint(),
+		MTPint(), // pts_limit
+		MTPint(), // pts_total_limit
 		MTP_int(_updatesDate),
-		MTP_int(_updatesQts)
+		MTP_int(_updatesQts),
+		MTPint() // qts_limit
 	)).done([=](const MTPupdates_Difference &result) {
 		differenceDone(result);
 	}).fail([=](const MTP::Error &error) {
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index 8c97479c6..6cd57e2ec 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -177,18 +177,13 @@ MTPInputPrivacyKey KeyToTL(UserPrivacy::Key key) {
 	case Key::Calls: return MTP_inputPrivacyKeyPhoneCall();
 	case Key::Invites: return MTP_inputPrivacyKeyChatInvite();
 	case Key::PhoneNumber: return MTP_inputPrivacyKeyPhoneNumber();
-	case Key::AddedByPhone:
-		return MTP_inputPrivacyKeyAddedByPhone();
-	case Key::LastSeen:
-		return MTP_inputPrivacyKeyStatusTimestamp();
-	case Key::CallsPeer2Peer:
-		return MTP_inputPrivacyKeyPhoneP2P();
-	case Key::Forwards:
-		return MTP_inputPrivacyKeyForwards();
-	case Key::ProfilePhoto:
-		return MTP_inputPrivacyKeyProfilePhoto();
-	case Key::Voices:
-		return MTP_inputPrivacyKeyVoiceMessages();
+	case Key::AddedByPhone: return MTP_inputPrivacyKeyAddedByPhone();
+	case Key::LastSeen: return MTP_inputPrivacyKeyStatusTimestamp();
+	case Key::CallsPeer2Peer: return MTP_inputPrivacyKeyPhoneP2P();
+	case Key::Forwards: return MTP_inputPrivacyKeyForwards();
+	case Key::ProfilePhoto: return MTP_inputPrivacyKeyProfilePhoto();
+	case Key::Voices: return MTP_inputPrivacyKeyVoiceMessages();
+	case Key::About: return MTP_inputPrivacyKeyAbout();
 	}
 	Unexpected("Key in Api::UserPrivacy::KetToTL.");
 }
@@ -214,6 +209,8 @@ std::optional<UserPrivacy::Key> TLToKey(mtpTypeId type) {
 	case mtpc_inputPrivacyKeyProfilePhoto: return Key::ProfilePhoto;
 	case mtpc_privacyKeyVoiceMessages:
 	case mtpc_inputPrivacyKeyVoiceMessages: return Key::Voices;
+	case mtpc_privacyKeyAbout:
+	case mtpc_inputPrivacyKeyAbout: return Key::About;
 	}
 	return std::nullopt;
 }
diff --git a/Telegram/SourceFiles/api/api_user_privacy.h b/Telegram/SourceFiles/api/api_user_privacy.h
index 39d8025b5..905d298e7 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -29,6 +29,7 @@ public:
 		Forwards,
 		ProfilePhoto,
 		Voices,
+		About,
 	};
 	enum class Option {
 		Everyone,
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index ce2cbee35..efe928960 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -139,19 +139,19 @@ bool PollData::applyResults(const MTPPollResults &results) {
 				recentVoters,
 				recent->v,
 				ranges::equal_to(),
-				bareProj,
-				&MTPlong::v);
+				&PeerData::id,
+				peerFromMTP);
 			if (recentChanged) {
 				changed = true;
 				recentVoters = ranges::views::all(
 					recent->v
-				) | ranges::views::transform([&](MTPlong userId) {
-					const auto user = _owner->user(userId.v);
-					return user->isMinimalLoaded() ? user.get() : nullptr;
-				}) | ranges::views::filter([](UserData *user) {
-					return user != nullptr;
-				}) | ranges::views::transform([](UserData *user) {
-					return not_null<UserData*>(user);
+				) | ranges::views::transform([&](MTPPeer peerId) {
+					const auto peer = _owner->peer(peerFromMTP(peerId));
+					return peer->isMinimalLoaded() ? peer.get() : nullptr;
+				}) | ranges::views::filter([](PeerData *peer) {
+					return peer != nullptr;
+				}) | ranges::views::transform([](PeerData *peer) {
+					return not_null(peer);
 				}) | ranges::to_vector;
 			}
 		}
diff --git a/Telegram/SourceFiles/data/data_poll.h b/Telegram/SourceFiles/data/data_poll.h
index 72d2731d6..4f428479b 100644
--- a/Telegram/SourceFiles/data/data_poll.h
+++ b/Telegram/SourceFiles/data/data_poll.h
@@ -67,7 +67,7 @@ struct PollData {
 	PollId id = 0;
 	QString question;
 	std::vector<PollAnswer> answers;
-	std::vector<not_null<UserData*>> recentVoters;
+	std::vector<not_null<PeerData*>> recentVoters;
 	std::vector<QByteArray> sendingVotes;
 	TextWithEntities solution;
 	TimeId closePeriod = 0;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index b991e911f..c08d8fde5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -182,7 +182,7 @@ struct Poll::CloseInformation {
 };
 
 struct Poll::RecentVoter {
-	not_null<UserData*> user;
+	not_null<PeerData*> peer;
 	mutable Ui::PeerUserpicView userpic;
 };
 
@@ -487,20 +487,20 @@ void Poll::updateRecentVoters() {
 		_recentVoters,
 		sliced,
 		ranges::equal_to(),
-		&RecentVoter::user);
+		&RecentVoter::peer);
 	if (changed) {
 		auto updated = ranges::views::all(
 			sliced
-		) | ranges::views::transform([](not_null<UserData*> user) {
-			return RecentVoter{ user };
+		) | ranges::views::transform([](not_null<PeerData*> peer) {
+			return RecentVoter{ peer };
 		}) | ranges::to_vector;
 		const auto has = hasHeavyPart();
 		if (has) {
 			for (auto &voter : updated) {
 				const auto i = ranges::find(
 					_recentVoters,
-					voter.user,
-					&RecentVoter::user);
+					voter.peer,
+					&RecentVoter::peer);
 				if (i != end(_recentVoters)) {
 					voter.userpic = std::move(i->userpic);
 				}
@@ -892,7 +892,7 @@ void Poll::paintRecentVoters(
 	auto created = false;
 	for (auto &recent : _recentVoters) {
 		const auto was = !recent.userpic.null();
-		recent.user->paintUserpic(p, recent.userpic, x, y, size);
+		recent.peer->paintUserpic(p, recent.userpic, x, y, size);
 		if (!was && !recent.userpic.null()) {
 			created = true;
 		}
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
index c4086ff5a..5fc2308a5 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -143,12 +143,12 @@ private:
 		QString loadForOffset;
 		int leftToLoad = 0;
 		int fullCount = 0;
-		std::vector<not_null<UserData*>> preloaded;
+		std::vector<not_null<PeerData*>> preloaded;
 		bool wasLoading = false;
 	};
 
-	bool appendRow(not_null<UserData*> user);
-	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const;
+	bool appendRow(not_null<PeerData*> peer);
+	std::unique_ptr<PeerListRow> createRow(not_null<PeerData*> peer) const;
 	void addPreloaded();
 	bool addPreloadedPage();
 	void preloadedAdded();
@@ -163,7 +163,7 @@ private:
 	QString _offset;
 	mtpRequestId _loadRequestId = 0;
 	QString _loadForOffset;
-	std::vector<not_null<UserData*>> _preloaded;
+	std::vector<not_null<PeerData*>> _preloaded;
 	rpl::variable<int> _count = 0;
 	rpl::variable<int> _fullCount;
 	rpl::variable<int> _leftToLoad;
@@ -227,16 +227,17 @@ void ListController::loadMoreRows() {
 			_offset = data.vnext_offset().value_or_empty();
 			auto &owner = session().data();
 			owner.processUsers(data.vusers());
+			owner.processChats(data.vchats());
 			auto add = limit - kLeavePreloaded;
 			for (const auto &vote : data.vvotes().v) {
 				vote.match([&](const auto &data) {
-					const auto user = owner.user(data.vuser_id().v);
-					if (user->isMinimalLoaded()) {
+					const auto peer = owner.peer(peerFromMTP(data.vpeer()));
+					if (peer->isMinimalLoaded()) {
 						if (add) {
-							appendRow(user);
+							appendRow(peer);
 							--add;
 						} else {
-							_preloaded.push_back(user);
+							_preloaded.push_back(peer);
 						}
 					}
 				});
@@ -393,17 +394,17 @@ void ListController::rowClicked(not_null<PeerListRow*> row) {
 	_showPeerInfoRequests.fire(row->peer());
 }
 
-bool ListController::appendRow(not_null<UserData*> user) {
-	if (delegate()->peerListFindRow(user->id.value)) {
+bool ListController::appendRow(not_null<PeerData*> peer) {
+	if (delegate()->peerListFindRow(peer->id.value)) {
 		return false;
 	}
-	delegate()->peerListAppendRow(createRow(user));
+	delegate()->peerListAppendRow(createRow(peer));
 	return true;
 }
 
 std::unique_ptr<PeerListRow> ListController::createRow(
-		not_null<UserData*> user) const {
-	auto row = std::make_unique<PeerListRow>(user);
+		not_null<PeerData*> peer) const {
+	auto row = std::make_unique<PeerListRow>(peer);
 	row->setCustomStatus(QString());
 	return row;
 }

From 918af601cf92c3931f548c32662f03c210827a1d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Apr 2023 20:16:22 +0400
Subject: [PATCH 227/676] Correctly handle reactions from channels.

---
 .../data/data_message_reactions.cpp           | 113 ++++++++++++------
 .../SourceFiles/data/data_message_reactions.h |  17 +--
 Telegram/SourceFiles/history/history_item.cpp |   2 +-
 3 files changed, 89 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index a0834888d..c0e7d9b87 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "main/main_app_config.h"
+#include "main/session/send_as_peers.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
 #include "data/data_histories.h"
@@ -82,6 +83,30 @@ constexpr auto kTopReactionsLimit = 14;
 		: config->get<int>("reactions_user_max_default", 1);
 }
 
+bool IsMyRecent(
+		const MTPDmessagePeerReaction &data,
+		const ReactionId &id,
+		not_null<PeerData*> peer,
+		const base::flat_map<
+			ReactionId,
+			std::vector<RecentReaction>> &recent,
+		bool ignoreChosen) {
+	if (peer->id == peer->session().userPeerId()) {
+		return true;
+	} else if (!ignoreChosen) {
+		return data.is_my();
+	}
+	const auto j = recent.find(id);
+	if (j == end(recent)) {
+		return false;
+	}
+	const auto k = ranges::find(
+		j->second,
+		peer,
+		&RecentReaction::peer);
+	return (k != end(j->second)) && k->my;
+}
+
 } // namespace
 
 PossibleItemReactionsRef LookupPossibleReactions(
@@ -953,7 +978,6 @@ void MessageReactions::add(const ReactionId &id, bool addToRecent) {
 	Expects(!id.empty());
 
 	const auto history = _item->history();
-	const auto self = history->session().user();
 	const auto myLimit = SentReactionsLimit(_item);
 	if (ranges::contains(chosen(), id)) {
 		return;
@@ -973,7 +997,7 @@ void MessageReactions::add(const ReactionId &id, bool addToRecent) {
 				_recent.erase(j);
 			} else {
 				j->second.erase(
-					ranges::remove(j->second, self, &RecentReaction::peer),
+					ranges::remove(j->second, true, &RecentReaction::my),
 					end(j->second));
 				if (j->second.empty()) {
 					_recent.erase(j);
@@ -982,9 +1006,14 @@ void MessageReactions::add(const ReactionId &id, bool addToRecent) {
 		}
 		return removed;
 	}), end(_list));
-	if (_item->canViewReactions() || history->peer->isUser()) {
+	const auto peer = history->peer;
+	if (_item->canViewReactions() || peer->isUser()) {
 		auto &list = _recent[id];
-		list.insert(begin(list), RecentReaction{ self });
+		const auto from = peer->session().sendAsPeers().resolveChosen(peer);
+		list.insert(begin(list), RecentReaction{
+			.peer = from,
+			.my = true,
+		});
 	}
 	const auto i = ranges::find(_list, id, &MessageReaction::id);
 	if (i != end(_list)) {
@@ -1018,13 +1047,16 @@ void MessageReactions::remove(const ReactionId &id) {
 		_list.erase(i);
 	}
 	if (j != end(_recent)) {
-		j->second.erase(
-			ranges::remove(j->second, self, &RecentReaction::peer),
-			end(j->second));
-		if (j->second.empty()) {
+		if (removed) {
+			j->second.clear();
 			_recent.erase(j);
 		} else {
-			Assert(!removed);
+			j->second.erase(
+				ranges::remove(j->second, true, &RecentReaction::my),
+				end(j->second));
+			if (j->second.empty()) {
+				_recent.erase(j);
+			}
 		}
 	}
 	auto &owner = history->owner();
@@ -1034,7 +1066,8 @@ void MessageReactions::remove(const ReactionId &id) {
 
 bool MessageReactions::checkIfChanged(
 		const QVector<MTPReactionCount> &list,
-		const QVector<MTPMessagePeerReaction> &recent) const {
+		const QVector<MTPMessagePeerReaction> &recent,
+		bool min) const {
 	auto &owner = _item->history()->owner();
 	if (owner.reactions().sending(_item)) {
 		// We'll apply non-stale data from the request response.
@@ -1066,13 +1099,18 @@ bool MessageReactions::checkIfChanged(
 	for (const auto &reaction : recent) {
 		reaction.match([&](const MTPDmessagePeerReaction &data) {
 			const auto id = ReactionFromMTP(data.vreaction());
-			if (ranges::contains(_list, id, &MessageReaction::id)) {
-				parsed[id].push_back(RecentReaction{
-					.peer = owner.peer(peerFromMTP(data.vpeer_id())),
-					.unread = data.is_unread(),
-					.big = data.is_big(),
-				});
+			if (!ranges::contains(_list, id, &MessageReaction::id)) {
+				return;
 			}
+			const auto peerId = peerFromMTP(data.vpeer_id());
+			const auto peer = owner.peer(peerId);
+			const auto my = IsMyRecent(data, id, peer, _recent, min);
+			parsed[id].push_back({
+				.peer = peer,
+				.unread = data.is_unread(),
+				.big = data.is_big(),
+				.my = my,
+			});
 		});
 	}
 	return !ranges::equal(_recent, parsed, [](
@@ -1081,7 +1119,7 @@ bool MessageReactions::checkIfChanged(
 		return ranges::equal(a.second, b.second, [](
 				const RecentReaction &a,
 				const RecentReaction &b) {
-			return (a.peer == b.peer) && (a.big == b.big);
+			return (a.peer == b.peer) && (a.big == b.big) && (a.my == b.my);
 		});
 	});
 }
@@ -1089,7 +1127,7 @@ bool MessageReactions::checkIfChanged(
 bool MessageReactions::change(
 		const QVector<MTPReactionCount> &list,
 		const QVector<MTPMessagePeerReaction> &recent,
-		bool ignoreChosen) {
+		bool min) {
 	auto &owner = _item->history()->owner();
 	if (owner.reactions().sending(_item)) {
 		// We'll apply non-stale data from the request response.
@@ -1102,7 +1140,7 @@ bool MessageReactions::change(
 		count.match([&](const MTPDreactionCount &data) {
 			const auto id = ReactionFromMTP(data.vreaction());
 			const auto &chosen = data.vchosen_order();
-			if (!ignoreChosen && chosen) {
+			if (!min && chosen) {
 				order[id] = chosen->v;
 			}
 			const auto i = ranges::find(_list, id, &MessageReaction::id);
@@ -1112,10 +1150,10 @@ bool MessageReactions::change(
 				_list.push_back({
 					.id = id,
 					.count = nowCount,
-					.my = (!ignoreChosen && chosen)
+					.my = (!min && chosen)
 				});
 			} else {
-				const auto nowMy = ignoreChosen ? i->my : chosen.has_value();
+				const auto nowMy = min ? i->my : chosen.has_value();
 				if (i->count != nowCount || i->my != nowMy) {
 					i->count = nowCount;
 					i->my = nowMy;
@@ -1125,13 +1163,13 @@ bool MessageReactions::change(
 			existing.emplace(id);
 		});
 	}
-	if (!ignoreChosen && !order.empty()) {
-		const auto min = std::numeric_limits<int>::min();
+	if (!min && !order.empty()) {
+		const auto minimal = std::numeric_limits<int>::min();
 		const auto proj = [&](const MessageReaction &reaction) {
-			return reaction.my ? order[reaction.id] : min;
+			return reaction.my ? order[reaction.id] : minimal;
 		};
 		const auto correctOrder = [&] {
-			auto previousOrder = min;
+			auto previousOrder = minimal;
 			for (const auto &reaction : _list) {
 				const auto nowOrder = proj(reaction);
 				if (nowOrder < previousOrder) {
@@ -1156,21 +1194,28 @@ bool MessageReactions::change(
 			}
 		}
 	}
+	const auto selfId = owner.session().userPeerId();
 	auto parsed = base::flat_map<ReactionId, std::vector<RecentReaction>>();
 	for (const auto &reaction : recent) {
 		reaction.match([&](const MTPDmessagePeerReaction &data) {
 			const auto id = ReactionFromMTP(data.vreaction());
 			const auto i = ranges::find(_list, id, &MessageReaction::id);
-			if (i != end(_list)) {
-				auto &list = parsed[id];
-				if (list.size() < i->count) {
-					list.push_back(RecentReaction{
-						.peer = owner.peer(peerFromMTP(data.vpeer_id())),
-						.unread = data.is_unread(),
-						.big = data.is_big(),
-					});
-				}
+			if (i == end(_list)) {
+				return;
 			}
+			auto &list = parsed[id];
+			if (list.size() >= i->count) {
+				return;
+			}
+			const auto peerId = peerFromMTP(data.vpeer_id());
+			const auto peer = owner.peer(peerId);
+			const auto my = IsMyRecent(data, id, peer, _recent, min);
+			list.push_back({
+				.peer = peer,
+				.unread = data.is_unread(),
+				.big = data.is_big(),
+				.my = my,
+			});
 		});
 	}
 	if (_recent != parsed) {
diff --git a/Telegram/SourceFiles/data/data_message_reactions.h b/Telegram/SourceFiles/data/data_message_reactions.h
index c1aeb6f73..61b29107d 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.h
+++ b/Telegram/SourceFiles/data/data_message_reactions.h
@@ -225,14 +225,14 @@ struct RecentReaction {
 	not_null<PeerData*> peer;
 	bool unread = false;
 	bool big = false;
+	bool my = false;
 
-	inline friend constexpr bool operator==(
-			const RecentReaction &a,
-			const RecentReaction &b) noexcept {
-		return (a.peer.get() == b.peer.get())
-			&& (a.unread == b.unread)
-			&& (a.big == b.big);
-	}
+	friend inline auto operator<=>(
+		const RecentReaction &a,
+		const RecentReaction &b) = default;
+	friend inline bool operator==(
+		const RecentReaction &a,
+		const RecentReaction &b) = default;
 };
 
 class MessageReactions final {
@@ -247,7 +247,8 @@ public:
 		bool ignoreChosen);
 	[[nodiscard]] bool checkIfChanged(
 		const QVector<MTPReactionCount> &list,
-		const QVector<MTPMessagePeerReaction> &recent) const;
+		const QVector<MTPMessagePeerReaction> &recent,
+		bool ignoreChosen) const;
 	[[nodiscard]] const std::vector<MessageReaction> &list() const;
 	[[nodiscard]] auto recent() const
 		-> const base::flat_map<ReactionId, std::vector<RecentReaction>> &;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 8cdf3d2c4..b0c2e55f0 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3199,7 +3199,7 @@ bool HistoryItem::changeReactions(const MTPMessageReactions *reactions) {
 		const auto &recent = data.vrecent_reactions().value_or_empty();
 		if (min && hasUnreadReaction()) {
 			// We can't update reactions from min if we have unread.
-			if (_reactions->checkIfChanged(list, recent)) {
+			if (_reactions->checkIfChanged(list, recent, min)) {
 				updateReactionsUnknown();
 			}
 			return false;

From 429a3da3e58eb83640231c5759a46beec9d6e04a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 May 2023 10:44:57 +0400
Subject: [PATCH 228/676] Update API scheme to layer 160.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/Resources/tl/api.tl                  | 46 +++++++++++++++++--
 Telegram/SourceFiles/api/api_media.cpp        |  3 +-
 Telegram/SourceFiles/api/api_sending.cpp      |  2 +
 Telegram/SourceFiles/api/api_user_privacy.cpp |  4 ++
 Telegram/SourceFiles/api/api_user_privacy.h   |  1 +
 .../SourceFiles/boxes/edit_privacy_box.cpp    |  7 ++-
 .../settings/settings_privacy_controllers.cpp | 22 ++++-----
 .../settings/settings_privacy_security.cpp    |  4 ++
 .../SourceFiles/storage/localimageloader.cpp  |  7 ++-
 .../storage/serialize_document.cpp            |  7 ++-
 11 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 570b7b3ed..8bfb90dff 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -961,6 +961,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_edit_privacy_everyone" = "Everybody";
 "lng_edit_privacy_contacts" = "My contacts";
+"lng_edit_privacy_close_friends" = "Close friends";
 "lng_edit_privacy_nobody" = "Nobody";
 "lng_edit_privacy_exceptions" = "Add exceptions";
 
diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index aa3934e16..4d682710b 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -110,7 +110,7 @@ storage.fileMp4#b3cea0e4 = storage.FileType;
 storage.fileWebp#1081464c = storage.FileType;
 
 userEmpty#d3bc4b7a id:long = User;
-user#8f97c628 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> = User;
+user#8f97c628 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_available:flags2.3?true stories_unavailable:flags2.4?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> = User;
 
 userProfilePhotoEmpty#4f11bae1 = UserProfilePhoto;
 userProfilePhoto#82d1f706 flags:# has_video:flags.0?true personal:flags.2?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = UserProfilePhoto;
@@ -150,7 +150,7 @@ messageMediaPhoto#695150d7 flags:# spoiler:flags.3?true photo:flags.0?Photo ttl_
 messageMediaGeo#56e0d474 geo:GeoPoint = MessageMedia;
 messageMediaContact#70322949 phone_number:string first_name:string last_name:string vcard:string user_id:long = MessageMedia;
 messageMediaUnsupported#9f84f49e = MessageMedia;
-messageMediaDocument#9cb070d7 flags:# nopremium:flags.3?true spoiler:flags.4?true document:flags.0?Document ttl_seconds:flags.2?int = MessageMedia;
+messageMediaDocument#4cf4d72d flags:# nopremium:flags.3?true spoiler:flags.4?true document:flags.0?Document alt_document:flags.5?Document ttl_seconds:flags.2?int = MessageMedia;
 messageMediaWebPage#a32dd600 webpage:WebPage = MessageMedia;
 messageMediaVenue#2ec0533f geo:GeoPoint title:string address:string provider:string venue_id:string venue_type:string = MessageMedia;
 messageMediaGame#fdb19008 game:Game = MessageMedia;
@@ -249,7 +249,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#93eadb53 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper = UserFull;
+userFull#4fe1cc86 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?UserStories = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -410,6 +410,8 @@ updateChannelPinnedTopics#fe198602 flags:# channel_id:long order:flags.0?Vector<
 updateUser#20529438 user_id:long = Update;
 updateAutoSaveSettings#ec05b097 = Update;
 updateGroupInvitePrivacyForbidden#ccf08ad6 user_id:long = Update;
+updateStories#66fad7b5 stories:UserStories = Update;
+updateReadStories#feb5345a user_id:long max_id:int = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -535,6 +537,7 @@ inputPrivacyValueDisallowAll#d66b66c9 = InputPrivacyRule;
 inputPrivacyValueDisallowUsers#90110467 users:Vector<InputUser> = InputPrivacyRule;
 inputPrivacyValueAllowChatParticipants#840649cf chats:Vector<long> = InputPrivacyRule;
 inputPrivacyValueDisallowChatParticipants#e94f0f86 chats:Vector<long> = InputPrivacyRule;
+inputPrivacyValueAllowCloseFriends#2f453e49 = InputPrivacyRule;
 
 privacyValueAllowContacts#fffe1bac = PrivacyRule;
 privacyValueAllowAll#65427b82 = PrivacyRule;
@@ -544,6 +547,7 @@ privacyValueDisallowAll#8b73e763 = PrivacyRule;
 privacyValueDisallowUsers#e4621141 users:Vector<long> = PrivacyRule;
 privacyValueAllowChatParticipants#6b134e8e chats:Vector<long> = PrivacyRule;
 privacyValueDisallowChatParticipants#41c87565 chats:Vector<long> = PrivacyRule;
+privacyValueAllowCloseFriends#f7e8d89b = PrivacyRule;
 
 account.privacyRules#50a04e45 rules:Vector<PrivacyRule> chats:Vector<Chat> users:Vector<User> = account.PrivacyRules;
 
@@ -552,7 +556,7 @@ accountDaysTTL#b8d0afdf days:int = AccountDaysTTL;
 documentAttributeImageSize#6c37c15c w:int h:int = DocumentAttribute;
 documentAttributeAnimated#11b58939 = DocumentAttribute;
 documentAttributeSticker#6319d612 flags:# mask:flags.1?true alt:string stickerset:InputStickerSet mask_coords:flags.0?MaskCoords = DocumentAttribute;
-documentAttributeVideo#ef02ce6 flags:# round_message:flags.0?true supports_streaming:flags.1?true duration:int w:int h:int = DocumentAttribute;
+documentAttributeVideo#e9407793 flags:# round_message:flags.0?true supports_streaming:flags.1?true duration:int w:int h:int preload_prefix_size:flags.2?int = DocumentAttribute;
 documentAttributeAudio#9852f9c6 flags:# voice:flags.10?true duration:int title:flags.0?string performer:flags.1?string waveform:flags.2?bytes = DocumentAttribute;
 documentAttributeFilename#15590068 file_name:string = DocumentAttribute;
 documentAttributeHasStickers#9801d2f7 = DocumentAttribute;
@@ -1547,6 +1551,25 @@ messagePeerVoteMultiple#4628f6e6 peer:Peer options:Vector<bytes> date:int = Mess
 
 sponsoredWebPage#3db8ec63 flags:# url:string site_name:string photo:flags.0?Photo = SponsoredWebPage;
 
+storyViews#518b47d8 recent_viewers:Vector<long> views_count:int = StoryViews;
+
+storyItemDeleted#51e6ee4f id:int = StoryItem;
+storyItemSkipped#a1d8cf8f id:int date:int = StoryItem;
+storyItem#8fcd96ac flags:# pinned:flags.5?true expired:flags.6?true id:int date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+
+userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
+
+stories.allStoriesNotModified#47e0a07e state:string = stories.AllStories;
+stories.allStories#5b1aa68c flags:# has_more:flags.0?true state:string user_stories:Vector<UserStories> users:Vector<User> = stories.AllStories;
+
+stories.stories#4fe57df1 count:int stories:Vector<StoryItem> users:Vector<User> = stories.Stories;
+
+storyView#a71aacc2 user_id:long date:int = StoryView;
+
+stories.storyViewsList#fb3f77ac count:int views:Vector<StoryView> users:Vector<User> = stories.StoryViewsList;
+
+stories.storyViews#de9eed1d views:Vector<StoryViews> users:Vector<User> = stories.StoryViews;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1696,6 +1719,7 @@ contacts.blockFromReplies#29a8962c flags:# delete_message:flags.0?true delete_hi
 contacts.resolvePhone#8af94344 phone:string = contacts.ResolvedPeer;
 contacts.exportContactToken#f8654027 = ExportedContactToken;
 contacts.importContactToken#13005788 token:string = User;
+contacts.editCloseFriends#ba6705f0 id:Vector<long> = Bool;
 
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0f4cb4f flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.Dialogs;
@@ -2080,4 +2104,16 @@ chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
 chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
-// LAYER 159
+stories.sendStory#8e826f5d flags:# pinned:flags.2?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> = Updates;
+stories.deleteStories#b5d501d7 id:Vector<int> = Vector<int>;
+stories.editStoryPrivacy#78981875 id:int privacy_rules:Vector<InputPrivacyRule> = Updates;
+stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
+stories.getAllStories#eeb0d625 flags:# next:flags.1?true state:flags.0?string = stories.AllStories;
+stories.getUserStories#c946f3c0 flags:# pinned:flags.0?true user_id:InputUser offset_id:int limit:int = stories.Stories;
+stories.getStoriesByID#6a15cf46 user_id:InputUser id:Vector<int> = stories.Stories;
+stories.getExpiredStories#8f792f2 offset_id:int limit:int = stories.Stories;
+stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
+stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;
+stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
+
+// LAYER 160
diff --git a/Telegram/SourceFiles/api/api_media.cpp b/Telegram/SourceFiles/api/api_media.cpp
index 7dd916140..72af0ba66 100644
--- a/Telegram/SourceFiles/api/api_media.cpp
+++ b/Telegram/SourceFiles/api/api_media.cpp
@@ -36,7 +36,8 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 				MTP_flags(flags),
 				MTP_int(duration),
 				MTP_int(dimensions.width()),
-				MTP_int(dimensions.height())));
+				MTP_int(dimensions.height()),
+				MTPint())); // preload_prefix_size
 		} else {
 			attributes.push_back(MTP_documentAttributeImageSize(
 				MTP_int(dimensions.width()),
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index dfba1d930..e8d18c03c 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -453,11 +453,13 @@ void SendConfirmedFile(
 				MTP_flags(Flag::f_document
 					| (file->spoiler ? Flag::f_spoiler : Flag())),
 				file->document,
+				MTPDocument(), // alt_document
 				MTPint());
 		} else if (file->type == SendMediaType::Audio) {
 			return MTP_messageMediaDocument(
 				MTP_flags(MTPDmessageMediaDocument::Flag::f_document),
 				file->document,
+				MTPDocument(), // alt_document
 				MTPint());
 		} else {
 			Unexpected("Type in sendFilesConfirmed.");
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index 6cd57e2ec..edaae7c97 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -82,6 +82,8 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		switch (rule.option) {
 		case Option::Everyone: return MTP_inputPrivacyValueAllowAll();
 		case Option::Contacts: return MTP_inputPrivacyValueAllowContacts();
+		case Option::CloseFriends:
+			return MTP_inputPrivacyValueAllowCloseFriends();
 		case Option::Nobody: return MTP_inputPrivacyValueDisallowAll();
 		}
 		Unexpected("Option value in Api::UserPrivacy::RulesToTL.");
@@ -110,6 +112,8 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 			setOption(Option::Everyone);
 		}, [&](const MTPDprivacyValueAllowContacts &) {
 			setOption(Option::Contacts);
+		}, [&](const MTPDprivacyValueAllowCloseFriends &) {
+			setOption(Option::CloseFriends);
 		}, [&](const MTPDprivacyValueAllowUsers &data) {
 			const auto &users = data.vusers().v;
 			always.reserve(always.size() + users.size());
diff --git a/Telegram/SourceFiles/api/api_user_privacy.h b/Telegram/SourceFiles/api/api_user_privacy.h
index 905d298e7..be8e452d9 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -34,6 +34,7 @@ public:
 	enum class Option {
 		Everyone,
 		Contacts,
+		CloseFriends,
 		Nobody,
 	};
 	struct Rule {
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index dfa6b3707..b30ecfb0c 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -116,6 +116,8 @@ QString EditPrivacyController::optionLabel(Option option) const {
 	switch (option) {
 	case Option::Everyone: return tr::lng_edit_privacy_everyone(tr::now);
 	case Option::Contacts: return tr::lng_edit_privacy_contacts(tr::now);
+	case Option::CloseFriends:
+		return tr::lng_edit_privacy_close_friends(tr::now);
 	case Option::Nobody: return tr::lng_edit_privacy_nobody(tr::now);
 	}
 	Unexpected("Option value in optionsLabelKey.");
@@ -182,10 +184,12 @@ bool EditPrivacyBox::showExceptionLink(Exception exception) const {
 	switch (exception) {
 	case Exception::Always:
 		return (_value.option == Option::Contacts)
+			|| (_value.option == Option::CloseFriends)
 			|| (_value.option == Option::Nobody);
 	case Exception::Never:
 		return (_value.option == Option::Everyone)
-			|| (_value.option == Option::Contacts);
+			|| (_value.option == Option::Contacts)
+			|| (_value.option == Option::CloseFriends);
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -326,6 +330,7 @@ void EditPrivacyBox::setupContent() {
 		{ 0, st::settingsPrivacySkipTop, 0, 0 });
 	addOptionRow(Option::Everyone);
 	addOptionRow(Option::Contacts);
+	addOptionRow(Option::CloseFriends);
 	addOptionRow(Option::Nobody);
 	const auto warning = addLabelOrDivider(
 		content,
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 665c44ed4..9468c13f2 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -252,6 +252,7 @@ struct ForwardedTooltip {
 		case Option::Everyone:
 			return tr::lng_edit_privacy_forwards_sample_everyone(tr::now);
 		case Option::Contacts:
+		case Option::CloseFriends:
 			return tr::lng_edit_privacy_forwards_sample_contacts(tr::now);
 		case Option::Nobody:
 			return tr::lng_edit_privacy_forwards_sample_nobody(tr::now);
@@ -783,15 +784,14 @@ rpl::producer<QString> CallsPeer2PeerPrivacyController::optionsTitleKey() const
 QString CallsPeer2PeerPrivacyController::optionLabel(
 		EditPrivacyBox::Option option) const {
 	switch (option) {
-	case Option::Everyone: {
+	case Option::Everyone:
 		return tr::lng_edit_privacy_calls_p2p_everyone(tr::now);
-	};
-	case Option::Contacts: {
+	case Option::Contacts:
 		return tr::lng_edit_privacy_calls_p2p_contacts(tr::now);
-	};
-	case Option::Nobody: {
+	case Option::CloseFriends:
+		return tr::lng_edit_privacy_close_friends(tr::now); // unused
+	case Option::Nobody:
 		return tr::lng_edit_privacy_calls_p2p_nobody(tr::now);
-	};
 	}
 	Unexpected("Option value in optionsLabelKey.");
 }
@@ -1215,15 +1215,13 @@ auto ProfilePhotoPrivacyController::exceptionsDescription() const
 	return _option.value(
 	) | rpl::map([](Option option) {
 		switch (option) {
-		case Option::Everyone: {
+		case Option::Everyone:
 			return tr::lng_edit_privacy_forwards_exceptions_everyone();
-		};
-		case Option::Contacts: {
+		case Option::Contacts:
+		case Option::CloseFriends:
 			return tr::lng_edit_privacy_forwards_exceptions();
-		};
-		case Option::Nobody: {
+		case Option::Nobody:
 			return tr::lng_edit_privacy_forwards_exceptions_nobody();
-		};
 		}
 		Unexpected("Option value in exceptionsDescription.");
 	}) | rpl::flatten_latest();
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index d9fff1232..164bb4443 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -80,6 +80,8 @@ QString PrivacyBase(Privacy::Key key, Privacy::Option option) {
 			return tr::lng_edit_privacy_calls_p2p_everyone(tr::now);
 		case Option::Contacts:
 			return tr::lng_edit_privacy_calls_p2p_contacts(tr::now);
+		case Option::CloseFriends:
+			return tr::lng_edit_privacy_close_friends(tr::now); // unused
 		case Option::Nobody:
 			return tr::lng_edit_privacy_calls_p2p_nobody(tr::now);
 		}
@@ -88,6 +90,8 @@ QString PrivacyBase(Privacy::Key key, Privacy::Option option) {
 		switch (option) {
 		case Option::Everyone: return tr::lng_edit_privacy_everyone(tr::now);
 		case Option::Contacts: return tr::lng_edit_privacy_contacts(tr::now);
+		case Option::CloseFriends:
+			return tr::lng_edit_privacy_close_friends(tr::now);
 		case Option::Nobody: return tr::lng_edit_privacy_nobody(tr::now);
 		}
 		Unexpected("Value in Privacy::Option.");
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 3f39944fa..1e9d03bdb 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -918,7 +918,12 @@ void FileLoadTask::process(Args &&args) {
 			if (video->supportsStreaming) {
 				flags |= MTPDdocumentAttributeVideo::Flag::f_supports_streaming;
 			}
-			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(video->duration), MTP_int(coverWidth), MTP_int(coverHeight)));
+			attributes.push_back(MTP_documentAttributeVideo(
+				MTP_flags(flags),
+				MTP_int(video->duration),
+				MTP_int(coverWidth),
+				MTP_int(coverHeight),
+				MTPint())); // preload_prefix_size
 
 			if (args.generateGoodThumbnail) {
 				goodThumbnail = video->thumbnail;
diff --git a/Telegram/SourceFiles/storage/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp
index a44207a52..04d8936e7 100644
--- a/Telegram/SourceFiles/storage/serialize_document.cpp
+++ b/Telegram/SourceFiles/storage/serialize_document.cpp
@@ -192,7 +192,12 @@ DocumentData *Document::readFromStreamHelper(
 			if (type == RoundVideoDocument) {
 				flags |= MTPDdocumentAttributeVideo::Flag::f_round_message;
 			}
-			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(duration), MTP_int(width), MTP_int(height)));
+			attributes.push_back(MTP_documentAttributeVideo(
+				MTP_flags(flags),
+				MTP_int(duration),
+				MTP_int(width),
+				MTP_int(height),
+				MTPint())); // preload_prefix_size
 		} else {
 			attributes.push_back(MTP_documentAttributeImageSize(MTP_int(width), MTP_int(height)));
 		}

From 89ca38ed29e5e69b53f893c9cf8be42040898101 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 3 May 2023 22:30:37 +0400
Subject: [PATCH 229/676] Start stories viewer with ComposeControls.

---
 Telegram/CMakeLists.txt                       |  16 +-
 Telegram/SourceFiles/api/api_updates.cpp      |   7 +-
 .../chat_helpers/compose/compose_show.h       |   2 +-
 Telegram/SourceFiles/data/data_session.cpp    |   6 +-
 Telegram/SourceFiles/data/data_session.h      |   5 +
 Telegram/SourceFiles/data/data_stories.cpp    | 246 ++++++++++++++++++
 Telegram/SourceFiles/data/data_stories.h      |  74 ++++++
 Telegram/SourceFiles/data/data_types.h        |   2 +
 .../history_view_compose_controls.cpp         |  10 +-
 .../controls/history_view_compose_controls.h  |   2 +-
 .../media/stories/media_stories_delegate.cpp  |   9 +
 .../media/stories/media_stories_delegate.h    |  30 +++
 .../media/stories/media_stories_header.cpp    |  65 +++++
 .../media/stories/media_stories_header.h      |  43 +++
 .../media/stories/media_stories_reply.cpp     |  50 ++++
 .../media/stories/media_stories_reply.h       |  39 +++
 .../media/stories/media_stories_slider.cpp    |  18 ++
 .../media/stories/media_stories_slider.h      |  20 ++
 .../media/stories/media_stories_view.cpp      |  37 +++
 .../media/stories/media_stories_view.h        |  40 +++
 .../media/view/media_view_overlay_widget.cpp  | 142 +++++++++-
 .../media/view/media_view_overlay_widget.h    |  37 ++-
 .../window/window_session_controller.cpp      |   4 +-
 23 files changed, 884 insertions(+), 20 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_stories.cpp
 create mode 100644 Telegram/SourceFiles/data/data_stories.h
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_delegate.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_delegate.h
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_header.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_header.h
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_reply.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_reply.h
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_slider.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_slider.h
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_view.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_view.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 991101b61..4b8b8b331 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -548,6 +548,8 @@ PRIVATE
     data/data_sparse_ids.h
     data/data_sponsored_messages.cpp
     data/data_sponsored_messages.h
+    data/data_stories.cpp
+    data/data_stories.h
     data/data_streaming.cpp
     data/data_streaming.h
     data/data_thread.cpp
@@ -936,8 +938,6 @@ PRIVATE
     main/session/send_as_peers.h
     main/session/session_show.cpp
     main/session/session_show.h
-    media/system_media_controls_manager.h
-    media/system_media_controls_manager.cpp
     media/audio/media_audio.cpp
     media/audio/media_audio.h
     media/audio/media_audio_capture.cpp
@@ -962,6 +962,16 @@ PRIVATE
     media/player/media_player_volume_controller.h
     media/player/media_player_widget.cpp
     media/player/media_player_widget.h
+    media/stories/media_stories_delegate.cpp
+    media/stories/media_stories_delegate.h
+    media/stories/media_stories_header.cpp
+    media/stories/media_stories_header.h
+    media/stories/media_stories_reply.cpp
+    media/stories/media_stories_reply.h
+    media/stories/media_stories_slider.cpp
+    media/stories/media_stories_slider.h
+    media/stories/media_stories_view.cpp
+    media/stories/media_stories_view.h
     media/streaming/media_streaming_audio_track.cpp
     media/streaming/media_streaming_audio_track.h
     media/streaming/media_streaming_common.h
@@ -1007,6 +1017,8 @@ PRIVATE
     media/view/media_view_playback_progress.cpp
     media/view/media_view_playback_progress.h
     media/view/media_view_open_common.h
+    media/system_media_controls_manager.h
+    media/system_media_controls_manager.cpp
     menu/menu_antispam_validator.cpp
     menu/menu_antispam_validator.h
     menu/menu_item_download_files.cpp
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 4a8ce5173..62bf94ba7 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum.h"
 #include "data/data_scheduled_messages.h"
 #include "data/data_send_action.h"
+#include "data/data_stories.h"
 #include "data/data_message_reactions.h"
 #include "inline_bots/bot_attach_web_view.h"
 #include "chat_helpers/emoji_interactions.h"
@@ -2517,7 +2518,11 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updateTranscribedAudio: {
 		const auto &data = update.c_updateTranscribedAudio();
 		_session->api().transcribes().apply(data);
-	}
+	} break;
+
+	case mtpc_updateStories: {
+		_session->data().stories().apply(update.c_updateStories());
+	} break;
 
 	}
 }
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
index ba2f391df..a1ad76e6c 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
@@ -59,7 +59,7 @@ public:
 		Data::FileOrigin origin,
 		not_null<PhotoData*> photo) const = 0;
 
-	virtual void processChosenSticker(FileChosen chosen) const = 0;
+	virtual void processChosenSticker(FileChosen &&chosen) const = 0;
 
 	[[nodiscard]] virtual Window::SessionController *resolveWindow(
 		WindowUsage) const;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index bb1fc659f..42a8644d1 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -66,6 +66,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_emoji_statuses.h"
 #include "data/data_forum_icons.h"
 #include "data/data_cloud_themes.h"
+#include "data/data_stories.h"
 #include "data/data_streaming.h"
 #include "data/data_media_rotation.h"
 #include "data/data_histories.h"
@@ -266,7 +267,8 @@ Session::Session(not_null<Main::Session*> session)
 , _emojiStatuses(std::make_unique<EmojiStatuses>(this))
 , _forumIcons(std::make_unique<ForumIcons>(this))
 , _notifySettings(std::make_unique<NotifySettings>(this))
-, _customEmojiManager(std::make_unique<CustomEmojiManager>(this)) {
+, _customEmojiManager(std::make_unique<CustomEmojiManager>(this))
+, _stories(std::make_unique<Stories>(this)) {
 	_cache->open(_session->local().cacheKey());
 	_bigFileCache->open(_session->local().cacheBigFileKey());
 
@@ -311,6 +313,8 @@ Session::Session(not_null<Main::Session*> session)
 				}
 			}
 		}, _lifetime);
+
+		_stories->loadMore();
 	});
 }
 
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 16c56c23e..154b1b73f 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -63,6 +63,7 @@ class Stickers;
 class GroupCall;
 class NotifySettings;
 class CustomEmojiManager;
+class Stories;
 
 struct RepliesReadTillUpdate {
 	FullMsgId id;
@@ -136,6 +137,9 @@ public:
 	[[nodiscard]] CustomEmojiManager &customEmojiManager() const {
 		return *_customEmojiManager;
 	}
+	[[nodiscard]] Stories &stories() const {
+		return *_stories;
+	}
 
 	[[nodiscard]] MsgId nextNonHistoryEntryId() {
 		return ++_nonHistoryEntryId;
@@ -1007,6 +1011,7 @@ private:
 	const std::unique_ptr<ForumIcons> _forumIcons;
 	const std::unique_ptr<NotifySettings> _notifySettings;
 	const std::unique_ptr<CustomEmojiManager> _customEmojiManager;
+	const std::unique_ptr<Stories> _stories;
 
 	MsgId _nonHistoryEntryId = ServerMaxMsgId.bare + ScheduledMsgIdsRange;
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
new file mode 100644
index 000000000..0a0fe8b02
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -0,0 +1,246 @@
+/*
+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_stories.h"
+
+#include "api/api_text_entities.h"
+#include "data/data_document.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "apiwrap.h"
+
+// #TODO stories testing
+#include "data/data_user.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "storage/storage_shared_media.h"
+
+namespace Data {
+namespace {
+
+} // namespace
+
+bool StoriesList::unread() const {
+	return !items.empty() && readTill < items.front().id;
+}
+
+Stories::Stories(not_null<Session*> owner) : _owner(owner) {
+}
+
+Stories::~Stories() {
+}
+
+Session &Stories::owner() const {
+	return *_owner;
+}
+
+void Stories::apply(const MTPDupdateStories &data) {
+	pushToFront(parse(data.vstories()));
+}
+
+StoriesList Stories::parse(const MTPUserStories &stories) {
+	const auto &data = stories.data();
+	const auto userId = UserId(data.vuser_id());
+	const auto readTill = data.vmax_read_id().value_or_empty();
+	const auto count = int(data.vstories().v.size());
+	auto result = StoriesList{
+		.user = _owner->user(userId),
+		.readTill = readTill,
+		.total = count,
+	};
+	const auto &list = data.vstories().v;
+	result.items.reserve(list.size());
+	for (const auto &story : list) {
+		story.match([&](const MTPDstoryItem &data) {
+			if (auto entry = parse(data)) {
+				result.items.push_back(std::move(*entry));
+			} else {
+				--result.total;
+			}
+		}, [&](const MTPDstoryItemSkipped &) {
+		}, [&](const MTPDstoryItemDeleted &) {
+			--result.total;
+		});
+	}
+	result.total = std::min(result.total, int(result.items.size()));
+	return result;
+}
+
+std::optional<StoryItem> Stories::parse(const MTPDstoryItem &data) {
+	const auto id = data.vid().v;
+	using MaybeMedia = std::optional<
+		std::variant<not_null<PhotoData*>, not_null<DocumentData*>>>;
+	const auto media = data.vmedia().match([&](
+			const MTPDmessageMediaPhoto &data) -> MaybeMedia {
+		if (const auto photo = data.vphoto()) {
+			const auto result = _owner->processPhoto(*photo);
+			if (!result->isNull()) {
+				return result;
+			}
+		}
+		return {};
+	}, [&](const MTPDmessageMediaDocument &data) -> MaybeMedia {
+		if (const auto document = data.vdocument()) {
+			const auto result = _owner->processDocument(*document);
+			if (!result->isNull()
+				&& (result->isGifv() || result->isVideoFile())) {
+				return result;
+			}
+		}
+		return {};
+	}, [](const auto &) { return MaybeMedia(); });
+	if (!media) {
+		return {};
+	}
+	auto caption = TextWithEntities{
+		data.vcaption().value_or_empty(),
+		Api::EntitiesFromMTP(
+			&_owner->session(),
+			data.ventities().value_or_empty()),
+	};
+	auto privacy = StoryPrivacy();
+
+	const auto date = data.vdate().v;
+	return StoryItem{
+		.id = data.vid().v,
+		.media = *media,
+		.caption = std::move(caption),
+		.date = date,
+		.privacy = privacy,
+	};
+}
+
+void Stories::loadMore() {
+	if (_loadMoreRequestId || _allLoaded) {
+		return;
+	}
+	const auto api = &_owner->session().api();
+	using Flag = MTPstories_GetAllStories::Flag;
+	_loadMoreRequestId = api->request(MTPstories_GetAllStories(
+		MTP_flags(_state.isEmpty() ? Flag(0) : Flag::f_next),
+		MTP_string(_state)
+	)).done([=](const MTPstories_AllStories &result) {
+		_loadMoreRequestId = 0;
+
+		result.match([&](const MTPDstories_allStories &data) {
+			_owner->processUsers(data.vusers());
+			_state = qs(data.vstate());
+			_allLoaded = !data.is_has_more();
+			for (const auto &single : data.vuser_stories().v) {
+				pushToBack(parse(single));
+			}
+		}, [](const MTPDstories_allStoriesNotModified &) {
+		});
+	}).fail([=] {
+		_loadMoreRequestId = 0;
+	}).send();
+}
+
+const std::vector<StoriesList> &Stories::all() {
+	return _all;
+}
+
+bool Stories::allLoaded() const {
+	return _allLoaded;
+}
+
+// #TODO stories testing
+StoryId Stories::generate(
+	not_null<HistoryItem*> item,
+	std::variant<
+		v::null_t,
+		not_null<PhotoData*>,
+		not_null<DocumentData*>> media) {
+	if (v::is_null(media)
+		|| !item->from()->isUser()
+		|| !item->isRegular()) {
+		return {};
+	}
+	const auto document = v::is<not_null<DocumentData*>>(media)
+		? v::get<not_null<DocumentData*>>(media).get()
+		: nullptr;
+	if (document && !document->isVideoFile()) {
+		return {};
+	}
+	using namespace Storage;
+	auto resultId = StoryId();
+	const auto listType = SharedMediaType::PhotoVideo;
+	const auto itemId = item->id;
+	const auto peer = item->history()->peer;
+	const auto session = &peer->session();
+	auto stories = StoriesList{ .user = item->from()->asUser() };
+	const auto lifetime = session->storage().query(SharedMediaQuery(
+		SharedMediaKey(peer->id, MsgId(0), listType, itemId),
+		32,
+		32
+	)) | rpl::start_with_next([&](SharedMediaResult &&result) {
+		stories.total = result.count.value_or(1);
+		if (!result.messageIds.contains(itemId)) {
+			result.messageIds.emplace(itemId);
+		}
+		stories.items.reserve(result.messageIds.size());
+		auto index = StoryId();
+		const auto owner = &peer->owner();
+		for (const auto id : result.messageIds) {
+			if (const auto item = owner->message(peer, id)) {
+				if (id == itemId) {
+					resultId = ++index;
+					stories.items.push_back({
+						.id = resultId,
+						.media = (document
+							? StoryMedia{ not_null(document) }
+							: StoryMedia{ v::get<not_null<PhotoData*>>(media) }),
+						.caption = item->originalText(),
+						.date = item->date(),
+					});
+				} else if (const auto media = item->media()) {
+					const auto photo = media->photo();
+					const auto document = media->document();
+					if (photo || (document && document->isVideoFile())) {
+						stories.items.push_back({
+							.id = ++index,
+							.media = (document
+								? StoryMedia{ not_null(document) }
+								: StoryMedia{ not_null(photo) }),
+							.caption = item->originalText(),
+							.date = item->date(),
+						});
+					}
+				}
+			}
+		}
+		const auto i = ranges::find(_all, stories.user, &StoriesList::user);
+		if (i != end(_all)) {
+			*i = std::move(stories);
+		} else {
+			_all.push_back(std::move(stories));
+		}
+	});
+	return resultId;
+}
+
+void Stories::pushToBack(StoriesList &&list) {
+	const auto i = ranges::find(_all, list.user, &StoriesList::user);
+	if (i != end(_all)) {
+		*i = std::move(list);
+	} else {
+		_all.push_back(std::move(list));
+	}
+}
+
+void Stories::pushToFront(StoriesList &&list) {
+	const auto i = ranges::find(_all, list.user, &StoriesList::user);
+	if (i != end(_all)) {
+		*i = std::move(list);
+		ranges::rotate(begin(_all), i, i + 1);
+	} else {
+		_all.insert(begin(_all), std::move(list));
+	}
+}
+
+} // namespace Data
\ No newline at end of file
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
new file mode 100644
index 000000000..ea3a033f1
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -0,0 +1,74 @@
+/*
+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 PhotoData;
+class DocumentData;
+
+namespace Data {
+
+class Session;
+
+struct StoryPrivacy {
+};
+
+struct StoryMedia {
+	std::variant<not_null<PhotoData*>, not_null<DocumentData*>> data;
+};
+
+struct StoryItem {
+	StoryId id = 0;
+	StoryMedia media;
+	TextWithEntities caption;
+	TimeId date = 0;
+	StoryPrivacy privacy;
+};
+
+struct StoriesList {
+	not_null<UserData*> user;
+	std::vector<StoryItem> items;
+	int total = 0;
+};
+
+class Stories final {
+public:
+	explicit Stories(not_null<Session*> owner);
+	~Stories();
+
+	void loadMore();
+	void apply(const MTPDupdateStories &data);
+
+	[[nodiscard]] const std::vector<StoriesList> &all();
+	[[nodiscard]] bool allLoaded() const;
+
+	// #TODO stories testing
+	[[nodiscard]] StoryId generate(
+		not_null<HistoryItem*> item,
+		std::variant<
+			v::null_t,
+			not_null<PhotoData*>,
+			not_null<DocumentData*>> media);
+
+private:
+	[[nodiscard]] StoriesList parse(const MTPUserStories &data);
+	[[nodiscard]] std::optional<StoryItem> parse(const MTPDstoryItem &data);
+
+	void pushToBack(StoriesList &&list);
+	void pushToFront(StoriesList &&list);
+
+	const not_null<Session*> _owner;
+
+	std::vector<StoriesList> _all;
+	QString _state;
+	bool _allLoaded = false;
+
+	mtpRequestId _loadMoreRequestId = 0;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index e07df91e3..8f6ee551b 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -135,6 +135,8 @@ using PollId = uint64;
 using WallPaperId = uint64;
 using CallId = uint64;
 using BotAppId = uint64;
+using StoryId = int32;
+
 constexpr auto CancelledWebPageId = WebPageId(0xFFFFFFFFFFFFFFFFULL);
 
 struct PreparedPhotoThumb {
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 4146e8eb8..75a46de3e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2538,11 +2538,15 @@ bool ComposeControls::returnTabbedSelector() {
 }
 
 void ComposeControls::createTabbedPanel() {
-	auto descriptor = ChatHelpers::TabbedPanelDescriptor{
+	using namespace ChatHelpers;
+	auto descriptor = TabbedPanelDescriptor{
 		.regularWindow = _regularWindow,
-		.nonOwnedSelector = _selector,
+		.ownedSelector = (_ownedSelector
+			? object_ptr<TabbedSelector>::fromRaw(_ownedSelector.release())
+			: object_ptr<TabbedSelector>(nullptr)),
+		.nonOwnedSelector = _ownedSelector ? nullptr : _selector.get(),
 	};
-	setTabbedPanel(std::make_unique<ChatHelpers::TabbedPanel>(
+	setTabbedPanel(std::make_unique<TabbedPanel>(
 		_parent,
 		std::move(descriptor)));
 }
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 c09b938d6..a24b5940a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -315,7 +315,7 @@ private:
 	const not_null<Main::Session*> _session;
 
 	Window::SessionController * const _regularWindow = nullptr;
-	const std::unique_ptr<ChatHelpers::TabbedSelector> _ownedSelector;
+	std::unique_ptr<ChatHelpers::TabbedSelector> _ownedSelector;
 	const not_null<ChatHelpers::TabbedSelector*> _selector;
 	rpl::event_stream<ChatHelpers::FileChosen> _stickerOrEmojiChosen;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.cpp b/Telegram/SourceFiles/media/stories/media_stories_delegate.cpp
new file mode 100644
index 000000000..721d9803c
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.cpp
@@ -0,0 +1,9 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_delegate.h"
+
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
new file mode 100644
index 000000000..fd00b7cf9
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.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
+
+namespace ChatHelpers {
+class Show;
+struct FileChosen;
+} // namespace ChatHelpers
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Media::Stories {
+
+class Delegate {
+public:
+	[[nodiscard]] virtual not_null<Ui::RpWidget*> storiesWrap() = 0;
+	[[nodiscard]] virtual auto storiesShow()
+		-> std::shared_ptr<ChatHelpers::Show> = 0;
+	[[nodiscard]] virtual auto storiesStickerOrEmojiChosen()
+		-> rpl::producer<ChatHelpers::FileChosen> = 0;
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
new file mode 100644
index 000000000..08e81fccc
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_header.h"
+
+#include "base/unixtime.h"
+#include "data/data_user.h"
+#include "media/stories/media_stories_delegate.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/text/format_values.h"
+#include "ui/widgets/labels.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "styles/style_boxes.h" // defaultUserpicButton.
+
+namespace Media::Stories {
+
+Header::Header(not_null<Delegate*> delegate)
+: _delegate(delegate) {
+}
+
+Header::~Header() {
+}
+
+void Header::show(HeaderData data) {
+	if (_data == data) {
+		return;
+	}
+	const auto userChanged = (!_data || _data->user != data.user);
+	_data = data;
+	if (userChanged) {
+		_date = nullptr;
+		const auto parent = _delegate->storiesWrap();
+		auto widget = std::make_unique<Ui::RpWidget>(parent);
+		const auto raw = widget.get();
+		parent->sizeValue() | rpl::start_with_next([=](QSize size) {
+			raw->setGeometry(50, 50, 600, 100);
+		}, raw->lifetime());
+		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+			raw,
+			data.user,
+			st::defaultUserpicButton);
+		userpic->move(0, 0);
+		const auto name = Ui::CreateChild<Ui::FlatLabel>(
+			raw,
+			data.user->firstName,
+			st::defaultFlatLabel);
+		name->move(100, 0);
+		raw->show();
+		_widget = std::move(widget);
+	}
+	_date = std::make_unique<Ui::FlatLabel>(
+		_widget.get(),
+		Ui::FormatDateTime(base::unixtime::parse(data.date)),
+		st::defaultFlatLabel);
+	_date->move(100, 50);
+	_date->show();
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
new file mode 100644
index 000000000..8df09a64f
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.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/userpic_view.h"
+
+namespace Ui {
+class RpWidget;
+class FlatLabel;
+} // namespace Ui
+
+namespace Media::Stories {
+
+class Delegate;
+
+struct HeaderData {
+	not_null<UserData*> user;
+	TimeId date = 0;
+
+	friend inline auto operator<=>(HeaderData, HeaderData) = default;
+};
+
+class Header final {
+public:
+	explicit Header(not_null<Delegate*> delegate);
+	~Header();
+
+	void show(HeaderData data);
+
+private:
+	const not_null<Delegate*> _delegate;
+	std::unique_ptr<Ui::RpWidget> _widget;
+	std::unique_ptr<Ui::FlatLabel> _date;
+	std::optional<HeaderData> _data;
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
new file mode 100644
index 000000000..cf2226bd1
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_reply.h"
+
+#include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "history/view/controls/history_view_compose_controls.h"
+#include "media/stories/media_stories_delegate.h"
+#include "menu/menu_send.h"
+
+namespace Media::Stories {
+
+ReplyArea::ReplyArea(not_null<Delegate*> delegate)
+: _delegate(delegate)
+, _controls(std::make_unique<HistoryView::ComposeControls>(
+	_delegate->storiesWrap(),
+	HistoryView::ComposeControlsDescriptor{
+		.show = _delegate->storiesShow(),
+		.unavailableEmojiPasted = [=](not_null<DocumentData*> emoji) {
+			showPremiumToast(emoji);
+		},
+		.mode = HistoryView::ComposeControlsMode::Normal,
+		.sendMenuType = SendMenu::Type::SilentOnly,
+		.stickerOrEmojiChosen = _delegate->storiesStickerOrEmojiChosen(),
+	}
+)) {
+	_delegate->storiesWrap()->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		_controls->resizeToWidth(size.width() - 200);
+		_controls->move(100, size.height() - _controls->heightCurrent() - 20);
+		_controls->setAutocompleteBoundingRect({ QPoint() ,size });
+	}, _lifetime);
+
+	_controls->show();
+	_controls->showFinished();
+}
+
+ReplyArea::~ReplyArea() {
+}
+
+void ReplyArea::showPremiumToast(not_null<DocumentData*> emoji) {
+	// #TODO stories
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
new file mode 100644
index 000000000..4d13cff79
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.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 HistoryView {
+class ComposeControls;
+} // namespace HistoryView
+
+namespace Media::Stories {
+
+class Delegate;
+
+struct ReplyAreaData {
+	not_null<UserData*> user;
+
+	friend inline auto operator<=>(ReplyAreaData, ReplyAreaData) = default;
+};
+
+class ReplyArea final {
+public:
+	explicit ReplyArea(not_null<Delegate*> delegate);
+	~ReplyArea();
+
+private:
+	void showPremiumToast(not_null<DocumentData*> emoji);
+
+	const not_null<Delegate*> _delegate;
+	const std::unique_ptr<HistoryView::ComposeControls> _controls;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
new file mode 100644
index 000000000..cc64c952e
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
@@ -0,0 +1,18 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_slider.h"
+
+namespace Media::Stories {
+
+Slider::Slider() {
+}
+
+Slider::~Slider() {
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.h b/Telegram/SourceFiles/media/stories/media_stories_slider.h
new file mode 100644
index 000000000..bb908a9e2
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Media::Stories {
+
+class Slider final {
+public:
+	Slider();
+	~Slider();
+
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
new file mode 100644
index 000000000..131a4d8d2
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -0,0 +1,37 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_view.h"
+
+#include "media/stories/media_stories_delegate.h"
+#include "media/stories/media_stories_header.h"
+#include "media/stories/media_stories_slider.h"
+#include "media/stories/media_stories_reply.h"
+
+namespace Media::Stories {
+
+View::View(not_null<Delegate*> delegate)
+: _delegate(delegate)
+, _wrap(_delegate->storiesWrap())
+, _header(std::make_unique<Header>(_delegate))
+, _slider(std::make_unique<Slider>())
+, _replyArea(std::make_unique<ReplyArea>(_delegate)) {
+}
+
+View::~View() = default;
+
+void View::show(const Data::StoriesList &list, int index) {
+	Expects(index < list.items.size());
+
+	const auto &item = list.items[index];
+	_header->show({
+		.user = list.user,
+		.date = item.date,
+	});
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
new file mode 100644
index 000000000..884d44219
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_stories.h"
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Media::Stories {
+
+class Header;
+class Slider;
+class ReplyArea;
+class Delegate;
+
+class View final {
+public:
+	explicit View(not_null<Delegate*> delegate);
+	~View();
+
+	void show(const Data::StoriesList &list, int index);
+
+private:
+	const not_null<Delegate*> _delegate;
+	const not_null<Ui::RpWidget*> _wrap;
+
+	std::unique_ptr<Header> _header;
+	std::unique_ptr<Slider> _slider;
+	std::unique_ptr<ReplyArea> _replyArea;
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index f19623e48..cfedf5ef8 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/buttons.h"
 #include "ui/image/image.h"
+#include "ui/layers/layer_manager.h"
 #include "ui/text/text_utilities.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/platform/ui_platform_window_title.h"
@@ -45,6 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/view/media_view_pip.h"
 #include "media/view/media_view_overlay_raster.h"
 #include "media/view/media_view_overlay_opengl.h"
+#include "media/stories/media_stories_view.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "media/player/media_player_instance.h"
@@ -54,6 +56,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -331,6 +334,7 @@ OverlayWidget::OverlayWidget()
 , _widget(_surface->rpWidget())
 , _fullscreen(Core::App().settings().mediaViewPosition().maximized == 2)
 , _windowed(Core::App().settings().mediaViewPosition().maximized == 0)
+, _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)
 , _docCancel(_body, tr::lng_cancel(tr::now), st::mediaviewFileLink)
@@ -2870,6 +2874,14 @@ void OverlayWidget::show(OpenRequest request) {
 		}
 		setSession(&photo->session());
 
+		// #TODO stories testing
+		if (const auto storyId = (!contextPeer && contextItem)
+			? contextItem->history()->owner().stories().generate(
+				contextItem,
+				photo)
+			: StoryId()) {
+			setContext(StoriesContext{ contextItem->from()->asUser(), storyId });
+		} else
 		if (contextPeer) {
 			setContext(contextPeer);
 		} else if (contextItem) {
@@ -2888,6 +2900,14 @@ void OverlayWidget::show(OpenRequest request) {
 	} else if (document) {
 		setSession(&document->session());
 
+		// #TODO stories testing
+		if (const auto storyId = contextItem
+			? contextItem->history()->owner().stories().generate(
+				contextItem,
+				document)
+			: StoryId()) {
+			setContext(StoriesContext{ contextItem->from()->asUser(), storyId });
+		} else
 		if (contextItem) {
 			setContext(ItemContext{ contextItem, contextTopicRootId });
 		} else {
@@ -3808,6 +3828,91 @@ void OverlayWidget::switchToPip() {
 	}
 }
 
+not_null<Ui::RpWidget*> OverlayWidget::storiesWrap() {
+	return _body;
+}
+
+std::shared_ptr<ChatHelpers::Show> OverlayWidget::storiesShow() {
+	class Show final : public ChatHelpers::Show {
+	public:
+		explicit Show(not_null<OverlayWidget*> widget) : _widget(widget) {
+		}
+
+		void showBox(
+			object_ptr<Ui::BoxContent> content,
+			Ui::LayerOptions options
+				= Ui::LayerOption::KeepOther) const override {
+			_widget->_layerBg->showBox(
+				std::move(content),
+				options,
+				anim::type::normal);
+		}
+		void hideLayer() const override {
+			_widget->_layerBg->hideAll(anim::type::normal);
+		}
+		not_null<QWidget*> toastParent() const override {
+			return _widget->_body;
+		}
+		bool valid() const override {
+			return _widget->_storiesUser != nullptr;
+		}
+		operator bool() const override {
+			return valid();
+		}
+
+		Main::Session &session() const override {
+			return _widget->_storiesUser->session();
+		}
+		bool paused(ChatHelpers::PauseReason reason) const override {
+			if (_widget->isHidden()
+				|| (!_widget->_fullscreen
+					&& !_widget->_window->isActiveWindow())) {
+				return true;
+			} else if (reason < ChatHelpers::PauseReason::Layer
+				&& _widget->_layerBg->topShownLayer() != nullptr) {
+				return true;
+			}
+			return false;
+		}
+		rpl::producer<> pauseChanged() const override {
+			return rpl::never<>();
+		}
+
+		rpl::producer<bool> adjustShadowLeft() const override {
+			return rpl::single(false);
+		}
+		SendMenu::Type sendMenuType() const override {
+			return SendMenu::Type::SilentOnly;
+		}
+
+		bool showMediaPreview(
+				Data::FileOrigin origin,
+				not_null<DocumentData*> document) const override {
+			return false; // #TODO stories
+		}
+		bool showMediaPreview(
+				Data::FileOrigin origin,
+				not_null<PhotoData*> photo) const override {
+			return false; // #TODO stories
+		}
+
+		void processChosenSticker(
+				ChatHelpers::FileChosen &&chosen) const override {
+			_widget->_storiesStickerOrEmojiChosen.fire(std::move(chosen));
+		}
+
+	private:
+		not_null<OverlayWidget*> _widget;
+
+	};
+	return std::make_shared<Show>(this);
+}
+
+auto OverlayWidget::storiesStickerOrEmojiChosen()
+-> rpl::producer<ChatHelpers::FileChosen> {
+	return _storiesStickerOrEmojiChosen.events();
+}
+
 void OverlayWidget::playbackToggleFullScreen() {
 	Expects(_streamed != nullptr);
 
@@ -4619,22 +4724,49 @@ void OverlayWidget::setContext(
 	std::variant<
 		v::null_t,
 		ItemContext,
-		not_null<PeerData*>> context) {
+		not_null<PeerData*>,
+		StoriesContext> context) {
 	if (const auto item = std::get_if<ItemContext>(&context)) {
 		_message = item->item;
 		_history = _message->history();
 		_peer = _history->peer;
 		_topicRootId = _peer->isForum() ? item->topicRootId : MsgId();
+		_stories = nullptr;
+		_storiesUser = nullptr;
 	} else if (const auto peer = std::get_if<not_null<PeerData*>>(&context)) {
 		_peer = *peer;
 		_history = _peer->owner().history(_peer);
 		_message = nullptr;
 		_topicRootId = MsgId();
+		_stories = nullptr;
+		_storiesUser = nullptr;
+	} else if (const auto story = std::get_if<StoriesContext>(&context)) {
+		_message = nullptr;
+		_topicRootId = MsgId();
+		_history = nullptr;
+		_peer = nullptr;
+		const auto &all = story->user->owner().stories().all();
+		const auto i = ranges::find(
+			all,
+			story->user,
+			&Data::StoriesList::user);
+		Assert(i != end(all));
+		const auto j = ranges::find(
+			i->items,
+			story->id,
+			&Data::StoryItem::id);
+		_storiesUser = story->user;
+		if (!_stories) {
+			_stories = std::make_unique<Stories::View>(
+				static_cast<Stories::Delegate*>(this));
+		}
+		_stories->show(*i, j - begin(i->items));
 	} else {
 		_message = nullptr;
 		_topicRootId = MsgId();
 		_history = nullptr;
 		_peer = nullptr;
+		_stories = nullptr;
 	}
 	_migrated = nullptr;
 	if (_history) {
@@ -4704,6 +4836,14 @@ bool OverlayWidget::moveToEntity(const Entity &entity, int preloadDelta) {
 	if (v::is_null(entity.data) && !entity.item) {
 		return false;
 	}
+	// #TODO stories testing
+	if (const auto storyId = entity.item
+		? entity.item->history()->owner().stories().generate(
+			entity.item,
+			entity.data)
+		: StoryId()) {
+		setContext(StoriesContext{ entity.item->from()->asUser(), storyId });
+	} else
 	if (const auto item = entity.item) {
 		setContext(ItemContext{ item, entity.topicRootId });
 	} else if (_peer) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index b47a8de03..4d6d6d3f2 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_cloud_themes.h" // Data::CloudTheme.
 #include "media/view/media_view_playback_controls.h"
 #include "media/view/media_view_open_common.h"
+#include "media/stories/media_stories_delegate.h"
 
 class History;
 
@@ -32,6 +33,7 @@ class PopupMenu;
 class LinkButton;
 class RoundButton;
 class RpWindow;
+class LayerManager;
 } // namespace Ui
 
 namespace Ui::GL {
@@ -50,17 +52,20 @@ struct Preview;
 } // namespace Theme
 } // namespace Window
 
-namespace Media {
-namespace Player {
+namespace Media::Player {
 struct TrackState;
-} // namespace Player
-namespace Streaming {
+} // namespace Media::Player
+
+namespace Media::Streaming {
 struct Information;
 struct Update;
 struct FrameWithInfo;
 enum class Error;
-} // namespace Streaming
-} // namespace Media
+} // namespace Media::Streaming
+
+namespace Media::Stories {
+class View;
+} // namespace Media::Stories
 
 namespace Media::View {
 
@@ -69,7 +74,8 @@ class Pip;
 
 class OverlayWidget final
 	: public ClickHandlerHost
-	, private PlaybackControls::Delegate {
+	, private PlaybackControls::Delegate
+	, private Stories::Delegate {
 public:
 	OverlayWidget();
 	~OverlayWidget();
@@ -217,6 +223,11 @@ private:
 	void playbackPauseMusic();
 	void switchToPip();
 
+	not_null<Ui::RpWidget*> storiesWrap() override;
+	std::shared_ptr<ChatHelpers::Show> storiesShow() override;
+	auto storiesStickerOrEmojiChosen()
+		-> rpl::producer<ChatHelpers::FileChosen> override;
+
 	void hideControls(bool force = false);
 	void subscribeToScreenGeometry();
 
@@ -268,10 +279,15 @@ private:
 		not_null<HistoryItem*> item;
 		MsgId topicRootId = 0;
 	};
+	struct StoriesContext {
+		not_null<UserData*> user;
+		StoryId id = 0;
+	};
 	void setContext(std::variant<
 		v::null_t,
 		ItemContext,
-		not_null<PeerData*>> context);
+		not_null<PeerData*>,
+		StoriesContext> context);
 
 	void refreshLang();
 	void showSaveMsgFile();
@@ -551,6 +567,11 @@ private:
 	int _streamedCreated = 0;
 	bool _showAsPip = false;
 
+	std::unique_ptr<Stories::View> _stories;
+	UserData *_storiesUser = nullptr;
+	rpl::event_stream<ChatHelpers::FileChosen> _storiesStickerOrEmojiChosen;
+	std::unique_ptr<Ui::LayerManager> _layerBg;
+
 	const style::icon *_docIcon = nullptr;
 	style::color _docIconColor;
 	QString _docName, _docSize, _docExt;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 601463962..8ec809049 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -140,7 +140,7 @@ public:
 		not_null<PhotoData*> photo) const override;
 
 	void processChosenSticker(
-		ChatHelpers::FileChosen chosen) const override;
+		ChatHelpers::FileChosen &&chosen) const override;
 
 private:
 	const base::weak_ptr<SessionController> _window;
@@ -233,7 +233,7 @@ bool MainWindowShow::showMediaPreview(
 }
 
 void MainWindowShow::processChosenSticker(
-		ChatHelpers::FileChosen chosen) const {
+		ChatHelpers::FileChosen &&chosen) const {
 	if (const auto window = _window.get()) {
 		Ui::PostponeCall(window, [=, chosen = std::move(chosen)]() mutable {
 			window->stickerOrEmojiChosen(std::move(chosen));

From 027bd89e5bf201292c98d0e1859d30ff170f98d7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 May 2023 14:40:51 +0400
Subject: [PATCH 230/676] Apply geometry constraints in stories viewer.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../history_view_compose_controls.cpp         |  58 ++++---
 .../controls/history_view_compose_controls.h  |   5 +-
 .../stories/media_stories_controller.cpp      | 155 ++++++++++++++++++
 .../media/stories/media_stories_controller.h  |  91 ++++++++++
 .../media/stories/media_stories_header.cpp    |  33 ++--
 .../media/stories/media_stories_header.h      |   8 +-
 .../media/stories/media_stories_reply.cpp     | 144 ++++++++++++++--
 .../media/stories/media_stories_reply.h       |  36 +++-
 .../media/stories/media_stories_slider.cpp    |  58 ++++++-
 .../media/stories/media_stories_slider.h      |  24 ++-
 .../media/stories/media_stories_view.cpp      |  17 +-
 .../media/stories/media_stories_view.h        |  20 +--
 .../SourceFiles/media/view/media_view.style   |  39 +++++
 .../media/view/media_view_overlay_widget.cpp  |   8 +
 15 files changed, 607 insertions(+), 91 deletions(-)
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_controller.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_controller.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 4b8b8b331..1a76befc0 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -962,6 +962,8 @@ PRIVATE
     media/player/media_player_volume_controller.h
     media/player/media_player_widget.cpp
     media/player/media_player_widget.h
+    media/stories/media_stories_controller.cpp
+    media/stories/media_stories_controller.h
     media/stories/media_stories_delegate.cpp
     media/stories/media_stories_delegate.h
     media/stories/media_stories_header.cpp
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 75a46de3e..6c0f635e8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -355,6 +355,7 @@ public:
 		rpl::producer<QString> title,
 		rpl::producer<QString> description,
 		rpl::producer<WebPageData*> page);
+	void previewUnregister();
 
 	[[nodiscard]] bool isDisplayed() const;
 	[[nodiscard]] bool isEditingMessage() const;
@@ -413,6 +414,7 @@ private:
 	rpl::event_stream<> _replyCancelled;
 	rpl::event_stream<> _forwardCancelled;
 	rpl::event_stream<> _previewCancelled;
+	rpl::lifetime _previewLifetime;
 
 	rpl::variable<FullMsgId> _editMsgId;
 	rpl::variable<FullMsgId> _replyToId;
@@ -677,17 +679,18 @@ void FieldHeader::resolveMessageData() {
 }
 
 void FieldHeader::previewRequested(
-	rpl::producer<QString> title,
-	rpl::producer<QString> description,
-	rpl::producer<WebPageData*> page) {
+		rpl::producer<QString> title,
+		rpl::producer<QString> description,
+		rpl::producer<WebPageData*> page) {
+	_previewLifetime.destroy();
 
 	std::move(
 		title
 	) | rpl::filter([=] {
 		return !_preview.cancelled;
-	}) | start_with_next([=](const QString &t) {
+	}) | rpl::start_with_next([=](const QString &t) {
 		_title = t;
-	}, lifetime());
+	}, _previewLifetime);
 
 	std::move(
 		description
@@ -695,7 +698,7 @@ void FieldHeader::previewRequested(
 		return !_preview.cancelled;
 	}) | rpl::start_with_next([=](const QString &d) {
 		_description = d;
-	}, lifetime());
+	}, _previewLifetime);
 
 	std::move(
 		page
@@ -704,8 +707,11 @@ void FieldHeader::previewRequested(
 	}) | rpl::start_with_next([=](WebPageData *p) {
 		_preview.data = p;
 		updateVisible();
-	}, lifetime());
+	}, _previewLifetime);
+}
 
+void FieldHeader::previewUnregister() {
+	_previewLifetime.destroy();
 }
 
 void FieldHeader::paintWebPage(Painter &p, not_null<PeerData*> context) {
@@ -996,10 +1002,6 @@ Main::Session &ComposeControls::session() const {
 }
 
 void ComposeControls::setHistory(SetHistoryArgs &&args) {
-	// Right now only single non-null set of history is supported.
-	// Otherwise initWebpageProcess should be updated / rewritten.
-	Expects(!_history && (*args.history));
-
 	_showSlowmodeError = std::move(args.showSlowmodeError);
 	_sendActionFactory = std::move(args.sendActionFactory);
 	_slowmodeSecondsLeft = rpl::single(0)
@@ -1014,6 +1016,7 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	}
 	unregisterDraftSources();
 	_history = history;
+	_historyLifetime.destroy();
 	_header->setHistory(args);
 	registerDraftSource();
 	_selector->setCurrentPeer(history ? history->peer.get() : nullptr);
@@ -1025,9 +1028,12 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	updateControlsVisibility();
 	updateFieldPlaceholder();
 	updateAttachBotsMenu();
-	//if (!_history) {
-	//	return;
-	//}
+
+	_sendAs = nullptr;
+	_silent = nullptr;
+	if (!_history) {
+		return;
+	}
 	const auto peer = _history->peer;
 	initSendAsButton(peer);
 	if (peer->isChat() && peer->asChat()->noParticipantInfo()) {
@@ -2134,7 +2140,7 @@ void ComposeControls::initSendAsButton(not_null<PeerData*> peer) {
 			updateControlsGeometry(_wrap->size());
 			orderControls();
 		}
-	}, _wrap->lifetime());
+	}, _historyLifetime);
 
 	updateSendAsButton();
 }
@@ -2218,7 +2224,7 @@ void ComposeControls::initVoiceRecordBar() {
 	_voiceRecordBar->setStartRecordingFilter([=] {
 		const auto error = [&]() -> std::optional<QString> {
 			const auto peer = _history ? _history->peer.get() : nullptr;
-			if (!peer) {
+			if (peer) {
 				if (const auto error = Data::RestrictionError(
 						peer,
 						ChatRestriction::SendVoiceMessages)) {
@@ -2448,10 +2454,9 @@ void ComposeControls::updateMessagesTTLShown() {
 }
 
 bool ComposeControls::updateSendAsButton() {
-	Expects(_history != nullptr);
-
-	const auto peer = _history->peer;
-	if (!_regularWindow
+	const auto peer = _history ? _history->peer.get() : nullptr;
+	if (!peer
+		|| !_regularWindow
 		|| isEditingMessage()
 		|| !session().sendAsPeers().shouldChoose(peer)) {
 		if (!_sendAs) {
@@ -2467,7 +2472,7 @@ bool ComposeControls::updateSendAsButton() {
 		st::sendAsButton);
 	Ui::SetupSendAsButton(
 		_sendAs.get(),
-		rpl::single(peer.get()),
+		rpl::single(peer),
 		_regularWindow);
 	return true;
 }
@@ -2781,15 +2786,18 @@ bool ComposeControls::handleCancelRequest() {
 }
 
 void ComposeControls::initWebpageProcess() {
-	Expects(_history);
+	if (!_history) {
+		_preview = nullptr;
+		_header->previewUnregister();
+		return;
+	}
 
-	auto &lifetime = _wrap->lifetime();
 	_preview = std::make_unique<WebpageProcessor>(_history, _field);
 
 	_preview->paintRequests(
 	) | rpl::start_with_next(crl::guard(_header.get(), [=] {
 		_header->update();
-	}), lifetime);
+	}), _historyLifetime);
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::Rights
@@ -2818,7 +2826,7 @@ void ComposeControls::initWebpageProcess() {
 				updateControlsGeometry(_wrap->size());
 			}
 		}
-	}, lifetime);
+	}, _historyLifetime);
 
 	_header->previewRequested(
 		_preview->titleChanges(),
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 a24b5940a..2f5b12491 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -389,10 +389,11 @@ private:
 
 	std::unique_ptr<WebpageProcessor> _preview;
 
-	rpl::lifetime _uploaderSubscriptions;
-
 	Fn<void()> _raiseEmojiSuggestions;
 
+	rpl::lifetime _historyLifetime;
+	rpl::lifetime _uploaderSubscriptions;
+
 };
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
new file mode 100644
index 000000000..3fbbdb1ef
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -0,0 +1,155 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_controller.h"
+
+#include "data/data_stories.h"
+#include "media/stories/media_stories_delegate.h"
+#include "media/stories/media_stories_header.h"
+#include "media/stories/media_stories_slider.h"
+#include "media/stories/media_stories_reply.h"
+#include "ui/rp_widget.h"
+#include "styles/style_media_view.h"
+#include "styles/style_widgets.h"
+#include "styles/style_boxes.h" // UserpicButton
+
+namespace Media::Stories {
+
+Controller::Controller(not_null<Delegate*> delegate)
+: _delegate(delegate)
+, _wrap(_delegate->storiesWrap())
+, _header(std::make_unique<Header>(this))
+, _slider(std::make_unique<Slider>(this))
+, _replyArea(std::make_unique<ReplyArea>(this)) {
+	initLayout();
+}
+
+void Controller::initLayout() {
+	const auto headerHeight = st::storiesHeaderMargin.top()
+		+ st::storiesHeaderPhoto.photoSize
+		+ st::storiesHeaderMargin.bottom();
+	const auto sliderHeight = st::storiesSliderMargin.top()
+		+ st::storiesSlider.width
+		+ st::storiesSliderMargin.bottom();
+	const auto outsideHeaderHeight = headerHeight + sliderHeight;
+	const auto fieldMinHeight = st::storiesFieldMargin.top()
+		+ st::storiesAttach.height
+		+ st::storiesFieldMargin.bottom();
+	const auto minHeightForOutsideHeader = st::storiesMaxSize.height()
+		+ outsideHeaderHeight
+		+ fieldMinHeight;
+	_layout = _wrap->sizeValue(
+	) | rpl::map([=](QSize size) {
+		size = QSize(
+			std::max(size.width(), st::mediaviewMinWidth),
+			std::max(size.height(), st::mediaviewMinHeight));
+
+		auto layout = Layout();
+		layout.headerLayout = (size.height() >= minHeightForOutsideHeader)
+			? HeaderLayout::Outside
+			: HeaderLayout::Normal;
+
+		const auto topSkip = (layout.headerLayout == HeaderLayout::Outside)
+			? outsideHeaderHeight
+			: st::storiesFieldMargin.bottom();
+		const auto bottomSkip = fieldMinHeight;
+		const auto maxWidth = size.width() - 2 * st::storiesSideSkip;
+		const auto availableHeight = size.height() - topSkip - bottomSkip;
+		const auto maxContentHeight = std::min(
+			availableHeight,
+			st::storiesMaxSize.height());
+		const auto nowWidth = maxContentHeight * st::storiesMaxSize.width()
+			/ st::storiesMaxSize.height();
+		const auto contentWidth = std::min(nowWidth, maxWidth);
+		const auto contentHeight = (contentWidth < nowWidth)
+			? (contentWidth * st::storiesMaxSize.height()
+				/ st::storiesMaxSize.width())
+			: maxContentHeight;
+		const auto addedTopSkip = (availableHeight - contentHeight) / 2;
+		layout.content = QRect(
+			(size.width() - contentWidth) / 2,
+			addedTopSkip + topSkip,
+			contentWidth,
+			contentHeight);
+
+		if (layout.headerLayout == HeaderLayout::Outside) {
+			layout.header = QRect(
+				layout.content.topLeft() - QPoint(0, outsideHeaderHeight),
+				QSize(contentWidth, outsideHeaderHeight));
+			layout.slider = QRect(
+				layout.header.topLeft() + QPoint(0, headerHeight),
+				QSize(contentWidth, sliderHeight));
+		} else {
+			layout.slider = QRect(
+				layout.content.topLeft(),
+				QSize(contentWidth, sliderHeight));
+			layout.header = QRect(
+				layout.slider.topLeft() + QPoint(0, sliderHeight),
+				QSize(contentWidth, headerHeight));
+		}
+		layout.controlsWidth = std::max(
+			layout.content.width(),
+			st::storiesControlsMinWidth);
+		layout.controlsBottomPosition = QPoint(
+			(size.width() - layout.controlsWidth) / 2,
+			(layout.content.y()
+				+ layout.content.height()
+				+ fieldMinHeight
+				- st::storiesFieldMargin.bottom()));
+		layout.autocompleteRect = QRect(
+			layout.controlsBottomPosition.x(),
+			0,
+			layout.controlsWidth,
+			layout.controlsBottomPosition.y());
+
+		return layout;
+	});
+}
+
+not_null<Ui::RpWidget*> Controller::wrap() const {
+	return _wrap;
+}
+
+Layout Controller::layout() const {
+	Expects(_layout.current().has_value());
+
+	return *_layout.current();
+}
+
+rpl::producer<Layout> Controller::layoutValue() const {
+	return _layout.value() | rpl::filter_optional();
+}
+
+std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
+	return _delegate->storiesShow();
+}
+
+auto Controller::stickerOrEmojiChosen() const
+->rpl::producer<ChatHelpers::FileChosen> {
+	return _delegate->storiesStickerOrEmojiChosen();
+}
+
+void Controller::show(const Data::StoriesList &list, int index) {
+	Expects(index < list.items.size());
+
+	const auto &item = list.items[index];
+
+	const auto id = ShownId{
+		.user = list.user,
+		.id = item.id,
+	};
+	if (_shown == id) {
+		return;
+	}
+	_shown = id;
+
+	_header->show({ .user = list.user, .date = item.date });
+	_slider->show({ .index = index, .total = int(list.items.size()) });
+	_replyArea->show({ .user = list.user });
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
new file mode 100644
index 000000000..a50ff6c8a
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -0,0 +1,91 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace ChatHelpers {
+class Show;
+struct FileChosen;
+} // namespace ChatHelpers
+
+namespace Data {
+struct StoriesList;
+} // namespace Data
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Media::Stories {
+
+class Header;
+class Slider;
+class ReplyArea;
+class Delegate;
+
+struct ShownId {
+	UserData *user = nullptr;
+	StoryId id = 0;
+
+	explicit operator bool() const {
+		return user != nullptr && id != 0;
+	}
+	friend inline auto operator<=>(ShownId, ShownId) = default;
+	friend inline bool operator==(ShownId, ShownId) = default;
+};
+
+enum class HeaderLayout {
+	Normal,
+	Outside,
+};
+
+struct Layout {
+	QRect content;
+	QRect header;
+	QRect slider;
+	int controlsWidth = 0;
+	QPoint controlsBottomPosition;
+	QRect autocompleteRect;
+	HeaderLayout headerLayout = HeaderLayout::Normal;
+
+	friend inline auto operator<=>(Layout, Layout) = default;
+	friend inline bool operator==(Layout, Layout) = default;
+};
+
+class Controller final {
+public:
+	explicit Controller(not_null<Delegate*> delegate);
+
+	[[nodiscard]] not_null<Ui::RpWidget*> wrap() const;
+	[[nodiscard]] Layout layout() const;
+	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
+
+	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
+	[[nodiscard]] auto stickerOrEmojiChosen() const
+	-> rpl::producer<ChatHelpers::FileChosen>;
+
+	void show(const Data::StoriesList &list, int index);
+
+private:
+	void initLayout();
+
+	const not_null<Delegate*> _delegate;
+
+	rpl::variable<std::optional<Layout>> _layout;
+
+	const not_null<Ui::RpWidget*> _wrap;
+	const std::unique_ptr<Header> _header;
+	const std::unique_ptr<Slider> _slider;
+	const std::unique_ptr<ReplyArea> _replyArea;
+
+	ShownId _shown;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 08e81fccc..849e07e97 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -9,18 +9,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/unixtime.h"
 #include "data/data_user.h"
-#include "media/stories/media_stories_delegate.h"
+#include "media/stories/media_stories_controller.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/text/format_values.h"
 #include "ui/widgets/labels.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
-#include "styles/style_boxes.h" // defaultUserpicButton.
+#include "styles/style_media_view.h"
 
 namespace Media::Stories {
 
-Header::Header(not_null<Delegate*> delegate)
-: _delegate(delegate) {
+Header::Header(not_null<Controller*> controller)
+: _controller(controller) {
 }
 
 Header::~Header() {
@@ -34,32 +34,37 @@ void Header::show(HeaderData data) {
 	_data = data;
 	if (userChanged) {
 		_date = nullptr;
-		const auto parent = _delegate->storiesWrap();
+		const auto parent = _controller->wrap();
 		auto widget = std::make_unique<Ui::RpWidget>(parent);
 		const auto raw = widget.get();
-		parent->sizeValue() | rpl::start_with_next([=](QSize size) {
-			raw->setGeometry(50, 50, 600, 100);
-		}, raw->lifetime());
 		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
 		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 			raw,
 			data.user,
-			st::defaultUserpicButton);
-		userpic->move(0, 0);
+			st::storiesHeaderPhoto);
+		userpic->show();
+		userpic->move(
+			st::storiesHeaderMargin.left(),
+			st::storiesHeaderMargin.top());
 		const auto name = Ui::CreateChild<Ui::FlatLabel>(
 			raw,
 			data.user->firstName,
-			st::defaultFlatLabel);
-		name->move(100, 0);
+			st::storiesHeaderName);
+		name->move(st::storiesHeaderNamePosition);
 		raw->show();
 		_widget = std::move(widget);
+
+		_controller->layoutValue(
+		) | rpl::start_with_next([=](const Layout &layout) {
+			raw->setGeometry(layout.header);
+		}, raw->lifetime());
 	}
 	_date = std::make_unique<Ui::FlatLabel>(
 		_widget.get(),
 		Ui::FormatDateTime(base::unixtime::parse(data.date)),
-		st::defaultFlatLabel);
-	_date->move(100, 50);
+		st::storiesHeaderDate);
 	_date->show();
+	_date->move(st::storiesHeaderDatePosition);
 }
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 8df09a64f..3f0be2e5c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -16,24 +16,26 @@ class FlatLabel;
 
 namespace Media::Stories {
 
-class Delegate;
+class Controller;
 
 struct HeaderData {
 	not_null<UserData*> user;
 	TimeId date = 0;
 
 	friend inline auto operator<=>(HeaderData, HeaderData) = default;
+	friend inline bool operator==(HeaderData, HeaderData) = default;
 };
 
 class Header final {
 public:
-	explicit Header(not_null<Delegate*> delegate);
+	explicit Header(not_null<Controller*> controller);
 	~Header();
 
 	void show(HeaderData data);
 
 private:
-	const not_null<Delegate*> _delegate;
+	const not_null<Controller*> _controller;
+
 	std::unique_ptr<Ui::RpWidget> _widget;
 	std::unique_ptr<Ui::FlatLabel> _date;
 	std::optional<HeaderData> _data;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index cf2226bd1..e4a24807c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -7,42 +7,156 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_reply.h"
 
+#include "base/call_delayed.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/view/controls/compose_controls_common.h"
 #include "history/view/controls/history_view_compose_controls.h"
-#include "media/stories/media_stories_delegate.h"
+#include "inline_bots/inline_bot_result.h"
+#include "media/stories/media_stories_controller.h"
 #include "menu/menu_send.h"
+#include "styles/style_media_view.h"
 
 namespace Media::Stories {
 
-ReplyArea::ReplyArea(not_null<Delegate*> delegate)
-: _delegate(delegate)
+ReplyArea::ReplyArea(not_null<Controller*> controller)
+: _controller(controller)
 , _controls(std::make_unique<HistoryView::ComposeControls>(
-	_delegate->storiesWrap(),
+	_controller->wrap(),
 	HistoryView::ComposeControlsDescriptor{
-		.show = _delegate->storiesShow(),
+		.show = _controller->uiShow(),
 		.unavailableEmojiPasted = [=](not_null<DocumentData*> emoji) {
 			showPremiumToast(emoji);
 		},
 		.mode = HistoryView::ComposeControlsMode::Normal,
 		.sendMenuType = SendMenu::Type::SilentOnly,
-		.stickerOrEmojiChosen = _delegate->storiesStickerOrEmojiChosen(),
+		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
 	}
 )) {
-	_delegate->storiesWrap()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
-		_controls->resizeToWidth(size.width() - 200);
-		_controls->move(100, size.height() - _controls->heightCurrent() - 20);
-		_controls->setAutocompleteBoundingRect({ QPoint() ,size });
-	}, _lifetime);
-
-	_controls->show();
-	_controls->showFinished();
+	initGeometry();
+	initActions();
 }
 
 ReplyArea::~ReplyArea() {
 }
 
+void ReplyArea::initGeometry() {
+	_controller->layoutValue(
+	) | rpl::start_with_next([=](const Layout &layout) {
+		_controls->resizeToWidth(layout.content.width());
+		const auto position = layout.controlsBottomPosition
+			- QPoint(0, _controls->heightCurrent());
+		_controls->move(position.x(), position.y());
+		_controls->setAutocompleteBoundingRect(layout.autocompleteRect);
+	}, _lifetime);
+}
+
+void ReplyArea::send(Api::SendOptions options) {
+	// #TODO stories
+}
+
+void ReplyArea::sendVoice(VoiceToSend &&data) {
+	// #TODO stories
+}
+
+void ReplyArea::chooseAttach(std::optional<bool> overrideCompress) {
+	// #TODO stories
+}
+
+void ReplyArea::initActions() {
+	_controls->cancelRequests(
+	) | rpl::start_with_next([=] {
+		// #TODO stories
+	}, _lifetime);
+
+	_controls->sendRequests(
+	) | rpl::start_with_next([=](Api::SendOptions options) {
+		send(options);
+	}, _lifetime);
+
+	_controls->sendVoiceRequests(
+	) | rpl::start_with_next([=](VoiceToSend &&data) {
+		sendVoice(std::move(data));
+	}, _lifetime);
+
+	_controls->attachRequests(
+	) | rpl::filter([=] {
+		return !_choosingAttach;
+	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
+		_choosingAttach = true;
+		base::call_delayed(
+			st::storiesAttach.ripple.hideDuration,
+			this,
+			[=] { chooseAttach(overrideCompress); });
+	}, _lifetime);
+
+	_controls->fileChosen(
+	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		_controller->uiShow()->hideLayer();
+		//controller()->sendingAnimation().appendSending(
+		//	data.messageSendingFrom);
+		//const auto localId = data.messageSendingFrom.localId;
+		//sendExistingDocument(data.document, data.options, localId);
+	}, _lifetime);
+
+	_controls->photoChosen(
+	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+		//sendExistingPhoto(chosen.photo, chosen.options);
+	}, _lifetime);
+
+	_controls->inlineResultChosen(
+	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+		//controller()->sendingAnimation().appendSending(
+		//	chosen.messageSendingFrom);
+		//const auto localId = chosen.messageSendingFrom.localId;
+		//sendInlineResult(chosen.result, chosen.bot, chosen.options, localId);
+	}, _lifetime);
+
+	_controls->setMimeDataHook([=](
+			not_null<const QMimeData*> data,
+			Ui::InputField::MimeAction action) {
+		if (action == Ui::InputField::MimeAction::Check) {
+			return false;// checkSendingFiles(data);
+		} else if (action == Ui::InputField::MimeAction::Insert) {
+			return false;/* confirmSendingFiles(
+				data,
+				std::nullopt,
+				Core::ReadMimeText(data));*/
+		}
+		Unexpected("action in MimeData hook.");
+	});
+
+	_controls->lockShowStarts(
+	) | rpl::start_with_next([=] {
+	}, _lifetime);
+
+	_controls->show();
+	_controls->finishAnimating();
+	_controls->showFinished();
+}
+
+void ReplyArea::show(ReplyAreaData data) {
+	if (_data == data) {
+		return;
+	}
+	const auto userChanged = (_data.user != data.user);
+	_data = data;
+	if (!userChanged) {
+		if (_data.user) {
+			_controls->clear();
+		}
+		return;
+	}
+	const auto user = data.user;
+	const auto history = user ? user->owner().history(user).get() : nullptr;
+	_controls->setHistory({
+		.history = history,
+	});
+	_controls->clear();
+}
+
 void ReplyArea::showPremiumToast(not_null<DocumentData*> emoji) {
 	// #TODO stories
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 4d13cff79..571c9c88c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -7,31 +7,57 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/weak_ptr.h"
+
+namespace Api {
+struct SendOptions;
+} // namespace Api
+
 namespace HistoryView {
 class ComposeControls;
 } // namespace HistoryView
 
+namespace HistoryView::Controls {
+struct VoiceToSend;
+} // namespace HistoryView::Controls
+
 namespace Media::Stories {
 
-class Delegate;
+class Controller;
 
 struct ReplyAreaData {
-	not_null<UserData*> user;
+	UserData *user = nullptr;
+	StoryId id = 0;
 
 	friend inline auto operator<=>(ReplyAreaData, ReplyAreaData) = default;
+	friend inline bool operator==(ReplyAreaData, ReplyAreaData) = default;
 };
 
-class ReplyArea final {
+class ReplyArea final : public base::has_weak_ptr {
 public:
-	explicit ReplyArea(not_null<Delegate*> delegate);
+	explicit ReplyArea(not_null<Controller*> controller);
 	~ReplyArea();
 
+	void show(ReplyAreaData data);
+
 private:
+	using VoiceToSend = HistoryView::Controls::VoiceToSend;
+
+	void initGeometry();
+	void initActions();
+
+	void send(Api::SendOptions options);
+	void sendVoice(VoiceToSend &&data);
+	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
+
 	void showPremiumToast(not_null<DocumentData*> emoji);
 
-	const not_null<Delegate*> _delegate;
+	const not_null<Controller*> _controller;
 	const std::unique_ptr<HistoryView::ComposeControls> _controls;
 
+	ReplyAreaData _data;
+	bool _choosingAttach = false;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
index cc64c952e..2fdb53884 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
@@ -7,12 +7,68 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_slider.h"
 
+#include "media/stories/media_stories_controller.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "styles/style_widgets.h"
+#include "styles/style_media_view.h"
+
 namespace Media::Stories {
 
-Slider::Slider() {
+Slider::Slider(not_null<Controller*> controller)
+: _controller(controller) {
 }
 
 Slider::~Slider() {
 }
 
+void Slider::show(SliderData data) {
+	if (_data == data) {
+		return;
+	}
+	_data = data;
+
+	const auto parent = _controller->wrap();
+	auto widget = std::make_unique<Ui::RpWidget>(parent);
+	const auto raw = widget.get();
+
+	raw->paintRequest(
+	) | rpl::filter([=] {
+		return (raw->width() >= st::storiesSlider.width);
+	}) | rpl::start_with_next([=](QRect clip) {
+		auto clipf = QRectF(clip);
+		auto p = QPainter(raw);
+		const auto single = st::storiesSlider.width;
+		const auto skip = st::storiesSliderSkip;
+		// width() == single * max + skip * (max - 1);
+		// max == (width() + skip) / (single + skip);
+		const auto max = (raw->width() + skip) / (single + skip);
+		Assert(max > 0);
+		const auto count = std::clamp(_data.total, 1, max);
+		const auto index = std::clamp(data.index, 0, count - 1);
+		const auto radius = st::storiesSlider.width / 2.;
+		const auto width = (raw->width() - (count - 1) * skip)
+			/ float64(count);
+		auto hq = PainterHighQualityEnabler(p);
+		auto left = 0.;
+		for (auto i = 0; i != count; ++i) {
+			const auto rect = QRectF(left, 0, width, single);
+			p.setBrush((i == index) // #TODO stories
+				? st::mediaviewPipControlsFgOver
+				: st::mediaviewPipPlaybackInactive);
+			p.setPen(Qt::NoPen);
+			p.drawRoundedRect(rect, radius, radius);
+			left += width + skip;
+		}
+	}, raw->lifetime());
+
+	raw->show();
+	_widget = std::move(widget);
+
+	_controller->layoutValue(
+	) | rpl::start_with_next([=](const Layout &layout) {
+		raw->setGeometry(layout.slider - st::storiesSliderMargin);
+	}, raw->lifetime());
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.h b/Telegram/SourceFiles/media/stories/media_stories_slider.h
index bb908a9e2..0dd18ef08 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.h
@@ -7,13 +7,35 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
 namespace Media::Stories {
 
+class Controller;
+
+struct SliderData {
+	int index = 0;
+	int total = 0;
+
+	friend inline auto operator<=>(SliderData, SliderData) = default;
+	friend inline bool operator==(SliderData, SliderData) = default;
+};
+
 class Slider final {
 public:
-	Slider();
+	explicit Slider(not_null<Controller*> controller);
 	~Slider();
 
+	void show(SliderData data);
+
+private:
+	const not_null<Controller*> _controller;
+
+	std::unique_ptr<Ui::RpWidget> _widget;
+
+	SliderData _data;
 
 };
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 131a4d8d2..6fcf4fd1c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_view.h"
 
+#include "media/stories/media_stories_controller.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
 #include "media/stories/media_stories_slider.h"
@@ -15,23 +16,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media::Stories {
 
 View::View(not_null<Delegate*> delegate)
-: _delegate(delegate)
-, _wrap(_delegate->storiesWrap())
-, _header(std::make_unique<Header>(_delegate))
-, _slider(std::make_unique<Slider>())
-, _replyArea(std::make_unique<ReplyArea>(_delegate)) {
+: _controller(std::make_unique<Controller>(delegate)) {
 }
 
 View::~View() = default;
 
 void View::show(const Data::StoriesList &list, int index) {
-	Expects(index < list.items.size());
+	_controller->show(list, index);
+}
 
-	const auto &item = list.items[index];
-	_header->show({
-		.user = list.user,
-		.date = item.date,
-	});
+QRect View::contentGeometry() const {
+	return _controller->layout().content;
 }
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 884d44219..133652e82 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -7,18 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "data/data_stories.h"
-
-namespace Ui {
-class RpWidget;
-} // namespace Ui
+namespace Data {
+struct StoriesList;
+} // namespace Data
 
 namespace Media::Stories {
 
-class Header;
-class Slider;
-class ReplyArea;
 class Delegate;
+class Controller;
 
 class View final {
 public:
@@ -26,14 +22,10 @@ public:
 	~View();
 
 	void show(const Data::StoriesList &list, int index);
+	[[nodiscard]] QRect contentGeometry() const;
 
 private:
-	const not_null<Delegate*> _delegate;
-	const not_null<Ui::RpWidget*> _wrap;
-
-	std::unique_ptr<Header> _header;
-	std::unique_ptr<Slider> _slider;
-	std::unique_ptr<ReplyArea> _replyArea;
+	const std::unique_ptr<Controller> _controller;
 
 };
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index c250e4616..fc2b6b18f 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -10,6 +10,7 @@ using "ui/basic.style";
 using "ui/widgets/widgets.style";
 using "ui/menu_icons.style";
 using "media/player/media_player.style";
+using "boxes/boxes.style";
 
 mediaviewOverDuration: 150;
 
@@ -403,3 +404,41 @@ pipVolumeIcon2: icon {{ "player/player_volume_on", mediaviewPipControlsFg }};
 pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOver }};
 
 speedSliderDividerSize: size(2px, 8px);
+
+storiesMaxSize: size(405px, 720px);
+storiesSlider: MediaSlider(mediaviewPlayback) {
+	width: 2px;
+	seekSize: size(2px, 2px);
+}
+storiesSliderMargin: margins(8px, 7px, 8px, 10px);
+storiesSliderSkip: 4px;
+storiesHeaderMargin: margins(12px, 3px, 12px, 8px);
+storiesHeaderPhoto: UserpicButton(defaultUserpicButton) {
+	size: size(28px, 28px);
+	photoSize: 28px;
+}
+storiesHeaderName: FlatLabel(defaultFlatLabel) {
+	textFg: mediaviewPipControlsFgOver; // #TODO stories
+	style: semiboldTextStyle;
+}
+storiesHeaderNamePosition: point(50px, 2px);
+storiesHeaderDate: FlatLabel(defaultFlatLabel) {
+	textFg: mediaviewPipControlsFg; // #TODO stories
+}
+storiesHeaderDatePosition: point(50px, 19px);
+storiesControlsMinWidth: 200px;
+storiesFieldMargin: margins(0px, 14px, 0px, 16px);
+storiesAttach: IconButton(defaultIconButton) {
+	width: 44px;
+	height: 46px;
+
+	icon: icon {{ "chat/input_attach", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_attach", historyComposeIconFgOver }};
+
+	rippleAreaPosition: point(2px, 3px);
+	rippleAreaSize: 40px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
+storiesSideSkip: 145px;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index cfedf5ef8..edb309b69 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1543,6 +1543,14 @@ void OverlayWidget::recountSkipTop() {
 }
 
 void OverlayWidget::resizeContentByScreenSize() {
+	if (_stories) {
+		const auto content = _stories->contentGeometry();
+		_x = content.x();
+		_y = content.y();
+		_w = content.width();
+		_h = content.height();
+		return;
+	}
 	recountSkipTop();
 	const auto availableWidth = width();
 	const auto countZoomFor = [&](int outerw, int outerh) {

From 7717de19abefac256f95d26dcd4bc4d3e53ec038 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 7 May 2023 00:20:21 +0400
Subject: [PATCH 231/676] Implement stories switching, photo "animation".

---
 Telegram/SourceFiles/data/data_stories.cpp    |   4 +-
 Telegram/SourceFiles/data/data_stories.h      |  18 ++
 .../stories/media_stories_controller.cpp      | 179 ++++++++++++-
 .../media/stories/media_stories_controller.h  |  42 ++-
 .../media/stories/media_stories_delegate.h    |  12 +
 .../media/stories/media_stories_header.cpp    |   8 +
 .../media/stories/media_stories_slider.cpp    | 123 +++++++--
 .../media/stories/media_stories_slider.h      |  19 ++
 .../media/stories/media_stories_view.cpp      |  24 ++
 .../media/stories/media_stories_view.h        |  14 +
 .../SourceFiles/media/view/media_view.style   |  15 +-
 .../media/view/media_view_overlay_widget.cpp  | 248 ++++++++++++------
 .../media/view/media_view_overlay_widget.h    |   6 +-
 13 files changed, 581 insertions(+), 131 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0a0fe8b02..c5634e4ac 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -179,7 +179,6 @@ StoryId Stories::generate(
 		32,
 		32
 	)) | rpl::start_with_next([&](SharedMediaResult &&result) {
-		stories.total = result.count.value_or(1);
 		if (!result.messageIds.contains(itemId)) {
 			result.messageIds.emplace(itemId);
 		}
@@ -214,6 +213,9 @@ StoryId Stories::generate(
 				}
 			}
 		}
+		stories.total = std::max(
+			result.count.value_or(1),
+			int(result.messageIds.size()));
 		const auto i = ranges::find(_all, stories.user, &StoriesList::user);
 		if (i != end(_all)) {
 			*i = std::move(stories);
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index ea3a033f1..26f1f76a2 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -15,10 +15,13 @@ namespace Data {
 class Session;
 
 struct StoryPrivacy {
+	friend inline bool operator==(StoryPrivacy, StoryPrivacy) = default;
 };
 
 struct StoryMedia {
 	std::variant<not_null<PhotoData*>, not_null<DocumentData*>> data;
+
+	friend inline bool operator==(StoryMedia, StoryMedia) = default;
 };
 
 struct StoryItem {
@@ -27,12 +30,27 @@ struct StoryItem {
 	TextWithEntities caption;
 	TimeId date = 0;
 	StoryPrivacy privacy;
+
+	friend inline bool operator==(StoryItem, StoryItem) = default;
 };
 
 struct StoriesList {
 	not_null<UserData*> user;
 	std::vector<StoryItem> items;
 	int total = 0;
+
+	friend inline bool operator==(StoriesList, StoriesList) = default;
+};
+
+struct FullStoryId {
+	UserData *user = nullptr;
+	StoryId id = 0;
+
+	explicit operator bool() const {
+		return user != nullptr && id != 0;
+	}
+	friend inline auto operator<=>(FullStoryId, FullStoryId) = default;
+	friend inline bool operator==(FullStoryId, FullStoryId) = default;
 };
 
 class Stories final {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 3fbbdb1ef..f88ebf8d3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -7,17 +7,95 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_controller.h"
 
+#include "base/timer.h"
+#include "base/power_save_blocker.h"
 #include "data/data_stories.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
 #include "media/stories/media_stories_slider.h"
 #include "media/stories/media_stories_reply.h"
+#include "media/audio/media_audio.h"
 #include "ui/rp_widget.h"
 #include "styles/style_media_view.h"
 #include "styles/style_widgets.h"
 #include "styles/style_boxes.h" // UserpicButton
 
 namespace Media::Stories {
+namespace {
+
+constexpr auto kPhotoProgressInterval = crl::time(100);
+constexpr auto kPhotoDuration = 5 * crl::time(1000);
+
+} // namespace
+
+class Controller::PhotoPlayback final {
+public:
+	explicit PhotoPlayback(not_null<Controller*> controller);
+
+	[[nodiscard]] bool paused() const;
+	void togglePaused(bool paused);
+
+private:
+	void callback();
+
+	const not_null<Controller*> _controller;
+
+	base::Timer _timer;
+	crl::time _started = 0;
+	crl::time _paused = 0;
+
+};
+
+Controller::PhotoPlayback::PhotoPlayback(not_null<Controller*> controller)
+: _controller(controller)
+, _timer([=] { callback(); })
+, _started(crl::now())
+, _paused(_started) {
+}
+
+bool Controller::PhotoPlayback::paused() const {
+	return _paused != 0;
+}
+
+void Controller::PhotoPlayback::togglePaused(bool paused) {
+	if (!_paused == !paused) {
+		return;
+	} else if (paused) {
+		const auto now = crl::now();
+		if (now - _started >= kPhotoDuration) {
+			return;
+		}
+		_paused = now;
+		_timer.cancel();
+	} else {
+		_started += crl::now() - _paused;
+		_paused = 0;
+		_timer.callEach(kPhotoProgressInterval);
+	}
+	callback();
+}
+
+void Controller::PhotoPlayback::callback() {
+	const auto now = crl::now();
+	const auto elapsed = now - _started;
+	const auto finished = (now - _started >= kPhotoDuration);
+	if (finished) {
+		_timer.cancel();
+	}
+	using State = Player::State;
+	const auto state = finished
+		? State::StoppedAtEnd
+		: _paused
+		? State::Paused
+		: State::Playing;
+	_controller->updatePhotoPlayback({
+		.state = state,
+		.position = elapsed,
+		.receivedTill = kPhotoDuration,
+		.length = kPhotoDuration,
+		.frequency = 1000,
+	});
+}
 
 Controller::Controller(not_null<Delegate*> delegate)
 : _delegate(delegate)
@@ -28,12 +106,14 @@ Controller::Controller(not_null<Delegate*> delegate)
 	initLayout();
 }
 
+Controller::~Controller() = default;
+
 void Controller::initLayout() {
 	const auto headerHeight = st::storiesHeaderMargin.top()
 		+ st::storiesHeaderPhoto.photoSize
 		+ st::storiesHeaderMargin.bottom();
 	const auto sliderHeight = st::storiesSliderMargin.top()
-		+ st::storiesSlider.width
+		+ st::storiesSliderWidth
 		+ st::storiesSliderMargin.bottom();
 	const auto outsideHeaderHeight = headerHeight + sliderHeight;
 	const auto fieldMinHeight = st::storiesFieldMargin.top()
@@ -42,6 +122,7 @@ void Controller::initLayout() {
 	const auto minHeightForOutsideHeader = st::storiesMaxSize.height()
 		+ outsideHeaderHeight
 		+ fieldMinHeight;
+
 	_layout = _wrap->sizeValue(
 	) | rpl::map([=](QSize size) {
 		size = QSize(
@@ -137,8 +218,19 @@ void Controller::show(const Data::StoriesList &list, int index) {
 	Expects(index < list.items.size());
 
 	const auto &item = list.items[index];
+	const auto guard = gsl::finally([&] {
+		if (v::is<not_null<PhotoData*>>(item.media.data)) {
+			_photoPlayback = std::make_unique<PhotoPlayback>(this);
+		} else {
+			_photoPlayback = nullptr;
+		}
+	});
+	if (_list != list) {
+		_list = list;
+	}
+	_index = index;
 
-	const auto id = ShownId{
+	const auto id = Data::FullStoryId{
 		.user = list.user,
 		.id = item.id,
 	};
@@ -152,4 +244,87 @@ void Controller::show(const Data::StoriesList &list, int index) {
 	_replyArea->show({ .user = list.user });
 }
 
+void Controller::ready() {
+	if (_photoPlayback) {
+		_photoPlayback->togglePaused(false);
+	}
+}
+
+void Controller::updateVideoPlayback(const Player::TrackState &state) {
+	updatePlayback(state);
+}
+
+void Controller::updatePhotoPlayback(const Player::TrackState &state) {
+	updatePlayback(state);
+}
+
+void Controller::updatePlayback(const Player::TrackState &state) {
+	_slider->updatePlayback(state);
+	updatePowerSaveBlocker(state);
+	if (Player::IsStoppedAtEnd(state.state)) {
+		if (!jumpFor(1)) {
+			_delegate->storiesJumpTo({});
+		}
+	}
+}
+
+bool Controller::jumpAvailable(int delta) const {
+	if (delta == -1) {
+		// Always allow to jump back for one.
+		// In case of the first story just jump to the beginning.
+		return _list && !_list->items.empty();
+	}
+	const auto index = _index + delta;
+	return index >= 0 && index < _list->total;
+}
+
+bool Controller::jumpFor(int delta) {
+	if (!_index && delta == -1) {
+		if (!_list || _list->items.empty()) {
+			return false;
+		}
+		_delegate->storiesJumpTo({
+			.user = _list->user,
+			.id = _list->items.front().id
+		});
+		return true;
+	}
+	const auto index = _index + delta;
+	if (index < 0 || index >= _list->total) {
+		return false;
+	} else if (index < _list->items.size()) {
+		// #TODO stories load more
+		_delegate->storiesJumpTo({
+			.user = _list->user,
+			.id = _list->items[index].id
+		});
+	}
+	return true;
+}
+
+bool Controller::paused() const {
+	return _photoPlayback
+		? _photoPlayback->paused()
+		: _delegate->storiesPaused();
+}
+
+void Controller::togglePaused(bool paused) {
+	if (_photoPlayback) {
+		_photoPlayback->togglePaused(paused);
+	} else {
+		_delegate->storiesTogglePaused(paused);
+	}
+}
+
+void Controller::updatePowerSaveBlocker(const Player::TrackState &state) {
+	const auto block = !Player::IsPausedOrPausing(state.state)
+		&& !Player::IsStoppedOrStopping(state.state);
+	base::UpdatePowerSaveBlocker(
+		_powerSaveBlocker,
+		block,
+		base::PowerSaveBlockType::PreventDisplaySleep,
+		[] { return u"Stories playback is active"_q; },
+		[=] { return _wrap->window()->windowHandle(); });
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index a50ff6c8a..2d9abb80c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -7,6 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_stories.h"
+
+namespace base {
+class PowerSaveBlocker;
+} // namespace base
+
 namespace ChatHelpers {
 class Show;
 struct FileChosen;
@@ -20,6 +26,10 @@ namespace Ui {
 class RpWidget;
 } // namespace Ui
 
+namespace Media::Player {
+struct TrackState;
+} // namespace Media::Player
+
 namespace Media::Stories {
 
 class Header;
@@ -27,17 +37,6 @@ class Slider;
 class ReplyArea;
 class Delegate;
 
-struct ShownId {
-	UserData *user = nullptr;
-	StoryId id = 0;
-
-	explicit operator bool() const {
-		return user != nullptr && id != 0;
-	}
-	friend inline auto operator<=>(ShownId, ShownId) = default;
-	friend inline bool operator==(ShownId, ShownId) = default;
-};
-
 enum class HeaderLayout {
 	Normal,
 	Outside,
@@ -59,6 +58,7 @@ struct Layout {
 class Controller final {
 public:
 	explicit Controller(not_null<Delegate*> delegate);
+	~Controller();
 
 	[[nodiscard]] not_null<Ui::RpWidget*> wrap() const;
 	[[nodiscard]] Layout layout() const;
@@ -69,9 +69,22 @@ public:
 	-> rpl::producer<ChatHelpers::FileChosen>;
 
 	void show(const Data::StoriesList &list, int index);
+	void ready();
+
+	void updateVideoPlayback(const Player::TrackState &state);
+
+	[[nodiscard]] bool jumpAvailable(int delta) const;
+	[[nodiscard]] bool jumpFor(int delta);
+	[[nodiscard]] bool paused() const;
+	void togglePaused(bool paused);
 
 private:
+	class PhotoPlayback;
+
 	void initLayout();
+	void updatePhotoPlayback(const Player::TrackState &state);
+	void updatePlayback(const Player::TrackState &state);
+	void updatePowerSaveBlocker(const Player::TrackState &state);
 
 	const not_null<Delegate*> _delegate;
 
@@ -82,7 +95,12 @@ private:
 	const std::unique_ptr<Slider> _slider;
 	const std::unique_ptr<ReplyArea> _replyArea;
 
-	ShownId _shown;
+	Data::FullStoryId _shown;
+	std::optional<Data::StoriesList> _list;
+	int _index = 0;
+	std::unique_ptr<PhotoPlayback> _photoPlayback;
+
+	std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index fd00b7cf9..3a2d700f6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -12,12 +12,21 @@ class Show;
 struct FileChosen;
 } // namespace ChatHelpers
 
+namespace Data {
+struct FullStoryId;
+} // namespace Data
+
 namespace Ui {
 class RpWidget;
 } // namespace Ui
 
 namespace Media::Stories {
 
+enum class JumpReason {
+	Finished,
+	User,
+};
+
 class Delegate {
 public:
 	[[nodiscard]] virtual not_null<Ui::RpWidget*> storiesWrap() = 0;
@@ -25,6 +34,9 @@ public:
 		-> std::shared_ptr<ChatHelpers::Show> = 0;
 	[[nodiscard]] virtual auto storiesStickerOrEmojiChosen()
 		-> rpl::producer<ChatHelpers::FileChosen> = 0;
+	virtual void storiesJumpTo(Data::FullStoryId id) = 0;
+	[[nodiscard]] virtual bool storiesPaused() = 0;
+	virtual void storiesTogglePaused(bool paused) = 0;
 };
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 849e07e97..af11254a5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -18,6 +18,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_media_view.h"
 
 namespace Media::Stories {
+namespace {
+
+constexpr auto kNameOpacity = 1.;
+constexpr auto kDateOpacity = 0.6;
+
+} // namespace
 
 Header::Header(not_null<Controller*> controller)
 : _controller(controller) {
@@ -50,6 +56,7 @@ void Header::show(HeaderData data) {
 			raw,
 			data.user->firstName,
 			st::storiesHeaderName);
+		name->setOpacity(kNameOpacity);
 		name->move(st::storiesHeaderNamePosition);
 		raw->show();
 		_widget = std::move(widget);
@@ -63,6 +70,7 @@ void Header::show(HeaderData data) {
 		_widget.get(),
 		Ui::FormatDateTime(base::unixtime::parse(data.date)),
 		st::storiesHeaderDate);
+	_date->setOpacity(kDateOpacity);
 	_date->show();
 	_date->move(st::storiesHeaderDatePosition);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
index 2fdb53884..57f16ddd1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
@@ -8,21 +8,34 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_slider.h"
 
 #include "media/stories/media_stories_controller.h"
+#include "media/view/media_view_playback_progress.h"
+#include "media/audio/media_audio.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "styles/style_widgets.h"
 #include "styles/style_media_view.h"
 
 namespace Media::Stories {
+namespace {
+
+constexpr auto kOpacityInactive = 0.4;
+constexpr auto kOpacityActive = 1.;
+
+} // namespace
 
 Slider::Slider(not_null<Controller*> controller)
-: _controller(controller) {
+: _controller(controller)
+, _progress(std::make_unique<View::PlaybackProgress>()) {
 }
 
 Slider::~Slider() {
 }
 
 void Slider::show(SliderData data) {
+	resetProgress();
+	data.total = std::max(data.total, 1);
+	data.index = std::clamp(data.index, 0, data.total - 1);
+
 	if (_data == data) {
 		return;
 	}
@@ -32,43 +45,101 @@ void Slider::show(SliderData data) {
 	auto widget = std::make_unique<Ui::RpWidget>(parent);
 	const auto raw = widget.get();
 
+	_rects.resize(_data.total);
+
+	raw->widthValue() | rpl::filter([=](int width) {
+		return (width >= st::storiesSliderWidth);
+	}) | rpl::start_with_next([=](int width) {
+		layout(width);
+	}, raw->lifetime());
+
 	raw->paintRequest(
 	) | rpl::filter([=] {
-		return (raw->width() >= st::storiesSlider.width);
+		return (raw->width() >= st::storiesSliderWidth);
 	}) | rpl::start_with_next([=](QRect clip) {
-		auto clipf = QRectF(clip);
-		auto p = QPainter(raw);
-		const auto single = st::storiesSlider.width;
-		const auto skip = st::storiesSliderSkip;
-		// width() == single * max + skip * (max - 1);
-		// max == (width() + skip) / (single + skip);
-		const auto max = (raw->width() + skip) / (single + skip);
-		Assert(max > 0);
-		const auto count = std::clamp(_data.total, 1, max);
-		const auto index = std::clamp(data.index, 0, count - 1);
-		const auto radius = st::storiesSlider.width / 2.;
-		const auto width = (raw->width() - (count - 1) * skip)
-			/ float64(count);
-		auto hq = PainterHighQualityEnabler(p);
-		auto left = 0.;
-		for (auto i = 0; i != count; ++i) {
-			const auto rect = QRectF(left, 0, width, single);
-			p.setBrush((i == index) // #TODO stories
-				? st::mediaviewPipControlsFgOver
-				: st::mediaviewPipPlaybackInactive);
-			p.setPen(Qt::NoPen);
-			p.drawRoundedRect(rect, radius, radius);
-			left += width + skip;
-		}
+		paint(QRectF(clip));
 	}, raw->lifetime());
 
 	raw->show();
 	_widget = std::move(widget);
 
+	_progress->setValueChangedCallback([=](float64, float64) {
+		_widget->update(_activeBoundingRect);
+	});
+
 	_controller->layoutValue(
 	) | rpl::start_with_next([=](const Layout &layout) {
 		raw->setGeometry(layout.slider - st::storiesSliderMargin);
 	}, raw->lifetime());
 }
 
+void Slider::updatePlayback(const Player::TrackState &state) {
+	_progress->updateState(state);
+}
+
+void Slider::resetProgress() {
+	_progress->updateState({});
+}
+
+void Slider::layout(int width) {
+	const auto single = st::storiesSliderWidth;
+	const auto skip = st::storiesSliderSkip;
+	// width == single * max + skip * (max - 1);
+	// max == (width + skip) / (single + skip);
+	const auto max = (width + skip) / (single + skip);
+	Assert(max > 0);
+	const auto count = std::clamp(_data.total, 1, max);
+	const auto one = (width - (count - 1) * skip) / float64(count);
+	auto left = 0.;
+	for (auto i = 0; i != count; ++i) {
+		_rects[i] = QRectF(left, 0, one, single);
+		if (i == _data.index) {
+			const auto from = int(std::floor(left));
+			const auto size = int(std::ceil(left + one)) - from;
+			_activeBoundingRect = QRect(from, 0, size, single);
+		}
+		left += one + skip;
+	}
+	for (auto i = count; i != _rects.size(); ++i) {
+		_rects[i] = QRectF();
+	}
+}
+
+void Slider::paint(QRectF clip) {
+	auto p = QPainter(_widget.get());
+	auto hq = PainterHighQualityEnabler(p);
+
+	p.setBrush(st::mediaviewControlFg);
+	p.setPen(Qt::NoPen);
+	const auto radius = st::storiesSliderWidth / 2.;
+	for (auto i = 0; i != int(_rects.size()); ++i) {
+		if (_rects[i].isEmpty()) {
+			break;
+		} else if (!_rects[i].intersects(clip)) {
+			continue;
+		} else if (i == _data.index) {
+			const auto progress = _progress->value();
+			const auto full = _rects[i].width();
+			const auto min = _rects[i].height();
+			const auto activeWidth = std::max(full * progress, min);
+			const auto inactiveWidth = full - activeWidth + min;
+			const auto activeLeft = _rects[i].left();
+			const auto inactiveLeft = activeLeft + activeWidth - min;
+			p.setOpacity(kOpacityInactive);
+			p.drawRoundedRect(
+				QRectF(inactiveLeft, 0, inactiveWidth, min),
+				radius,
+				radius);
+			p.setOpacity(kOpacityActive);
+			p.drawRoundedRect(
+				QRectF(activeLeft, 0, activeWidth, min),
+				radius,
+				radius);
+		} else {
+			p.setOpacity(kOpacityInactive);
+			p.drawRoundedRect(_rects[i], radius, radius);
+		}
+	}
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.h b/Telegram/SourceFiles/media/stories/media_stories_slider.h
index 0dd18ef08..140df471f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.h
@@ -11,6 +11,14 @@ namespace Ui {
 class RpWidget;
 } // namespace Ui
 
+namespace Media::View {
+class PlaybackProgress;
+} // namespace Media::View
+
+namespace Media::Player {
+struct TrackState;
+} // namespace Media::Player
+
 namespace Media::Stories {
 
 class Controller;
@@ -30,13 +38,24 @@ public:
 
 	void show(SliderData data);
 
+	void updatePlayback(const Player::TrackState &state);
+
 private:
+	void resetProgress();
+
+	void layout(int width);
+	void paint(QRectF clip);
+
 	const not_null<Controller*> _controller;
+	const std::unique_ptr<Media::View::PlaybackProgress> _progress;
 
 	std::unique_ptr<Ui::RpWidget> _widget;
+	std::vector<QRectF> _rects;
+	QRect _activeBoundingRect;
 
 	SliderData _data;
 
+
 };
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 6fcf4fd1c..cfe82693c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -25,8 +25,32 @@ void View::show(const Data::StoriesList &list, int index) {
 	_controller->show(list, index);
 }
 
+void View::ready() {
+	_controller->ready();
+}
+
 QRect View::contentGeometry() const {
 	return _controller->layout().content;
 }
 
+void View::updatePlayback(const Player::TrackState &state) {
+	_controller->updateVideoPlayback(state);
+}
+
+bool View::jumpAvailable(int delta) const {
+	return _controller->jumpAvailable(delta);
+}
+
+bool View::jumpFor(int delta) const {
+	return _controller->jumpFor(delta);
+}
+
+bool View::paused() const {
+	return _controller->paused();
+}
+
+void View::togglePaused(bool paused) {
+	_controller->togglePaused(paused);
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 133652e82..96f4e0042 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -11,6 +11,10 @@ namespace Data {
 struct StoriesList;
 } // namespace Data
 
+namespace Media::Player {
+struct TrackState;
+} // namespace Media::Player
+
 namespace Media::Stories {
 
 class Delegate;
@@ -22,8 +26,18 @@ public:
 	~View();
 
 	void show(const Data::StoriesList &list, int index);
+	void ready();
+
 	[[nodiscard]] QRect contentGeometry() const;
 
+	void updatePlayback(const Player::TrackState &state);
+
+	[[nodiscard]] bool jumpAvailable(int delta) const;
+	[[nodiscard]] bool jumpFor(int delta) const;
+
+	[[nodiscard]] bool paused() const;
+	void togglePaused(bool paused);
+
 private:
 	const std::unique_ptr<Controller> _controller;
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index fc2b6b18f..19dd46778 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -406,11 +406,8 @@ pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOve
 speedSliderDividerSize: size(2px, 8px);
 
 storiesMaxSize: size(405px, 720px);
-storiesSlider: MediaSlider(mediaviewPlayback) {
-	width: 2px;
-	seekSize: size(2px, 2px);
-}
-storiesSliderMargin: margins(8px, 7px, 8px, 10px);
+storiesSliderWidth: 2px;
+storiesSliderMargin: margins(8px, 7px, 8px, 11px);
 storiesSliderSkip: 4px;
 storiesHeaderMargin: margins(12px, 3px, 12px, 8px);
 storiesHeaderPhoto: UserpicButton(defaultUserpicButton) {
@@ -418,14 +415,14 @@ storiesHeaderPhoto: UserpicButton(defaultUserpicButton) {
 	photoSize: 28px;
 }
 storiesHeaderName: FlatLabel(defaultFlatLabel) {
-	textFg: mediaviewPipControlsFgOver; // #TODO stories
+	textFg: mediaviewControlFg;
 	style: semiboldTextStyle;
 }
-storiesHeaderNamePosition: point(50px, 2px);
+storiesHeaderNamePosition: point(50px, 0px);
 storiesHeaderDate: FlatLabel(defaultFlatLabel) {
-	textFg: mediaviewPipControlsFg; // #TODO stories
+	textFg: mediaviewControlFg;
 }
-storiesHeaderDatePosition: point(50px, 19px);
+storiesHeaderDatePosition: point(50px, 16px);
 storiesControlsMinWidth: 200px;
 storiesFieldMargin: margins(0px, 14px, 0px, 16px);
 storiesAttach: IconButton(defaultIconButton) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index edb309b69..13615c184 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -251,18 +251,14 @@ struct OverlayWidget::Streamed {
 	Streamed(
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin,
-		not_null<QWidget*> controlsParent,
-		not_null<PlaybackControls::Delegate*> controlsDelegate,
 		Fn<void()> waitingCallback);
 	Streamed(
 		not_null<PhotoData*> photo,
 		Data::FileOrigin origin,
-		not_null<QWidget*> controlsParent,
-		not_null<PlaybackControls::Delegate*> controlsDelegate,
 		Fn<void()> waitingCallback);
 
 	Streaming::Instance instance;
-	PlaybackControls controls;
+	std::unique_ptr<PlaybackControls> controls;
 	std::unique_ptr<base::PowerSaveBlocker> powerSaveBlocker;
 
 	bool withSound = false;
@@ -289,21 +285,15 @@ struct OverlayWidget::PipWrap {
 OverlayWidget::Streamed::Streamed(
 	not_null<DocumentData*> document,
 	Data::FileOrigin origin,
-	not_null<QWidget*> controlsParent,
-	not_null<PlaybackControls::Delegate*> controlsDelegate,
 	Fn<void()> waitingCallback)
-: instance(document, origin, std::move(waitingCallback))
-, controls(controlsParent, controlsDelegate) {
+: instance(document, origin, std::move(waitingCallback)) {
 }
 
 OverlayWidget::Streamed::Streamed(
 	not_null<PhotoData*> photo,
 	Data::FileOrigin origin,
-	not_null<QWidget*> controlsParent,
-	not_null<PlaybackControls::Delegate*> controlsDelegate,
 	Fn<void()> waitingCallback)
-: instance(photo, origin, std::move(waitingCallback))
-, controls(controlsParent, controlsDelegate) {
+: instance(photo, origin, std::move(waitingCallback)) {
 }
 
 OverlayWidget::PipWrap::PipWrap(
@@ -542,7 +532,9 @@ OverlayWidget::OverlayWidget()
 		Core::App().calls().currentGroupCallValue(),
 		_1 || _2
 	) | rpl::start_with_next([=](bool call) {
-		if (!_streamed || videoIsGifOrUserpic()) {
+		if (!_streamed
+			|| !_document
+			|| (_document->isAnimation() && !_document->isVideoMessage())) {
 			return;
 		} else if (call) {
 			playbackPauseOnCall();
@@ -583,7 +575,10 @@ void OverlayWidget::setupWindow() {
 			return Flag::None | Flag(0);
 		}
 		const auto inControls = (_over != OverNone) && (_over != OverVideo);
-		if (inControls || (_streamed && _streamed->controls.dragging())) {
+		if (inControls
+			|| (_streamed
+				&& _streamed->controls
+				&& _streamed->controls->dragging())) {
 			return Flag::None | Flag(0);
 		} else if ((_w > _widget->width() || _h > _widget->height())
 				&& (widgetPoint.y() > st::mediaviewHeaderTop)
@@ -881,10 +876,10 @@ QSize OverlayWidget::videoSize() const {
 	return flipSizeByRotation(_streamed->instance.info().video.size);
 }
 
-bool OverlayWidget::videoIsGifOrUserpic() const {
-	return _streamed
-		&& (!_document
-			|| (_document->isAnimation() && !_document->isVideoMessage()));
+bool OverlayWidget::streamingRequiresControls() const {
+	return !_stories
+		&& _document
+		&& (!_document->isAnimation() || _document->isVideoMessage());
 }
 
 QImage OverlayWidget::videoFrame() const {
@@ -979,13 +974,13 @@ void OverlayWidget::documentUpdated(not_null<DocumentData*> document) {
 			updateDocSize();
 			_widget->update(_docRect);
 		}
-	} else if (_streamed) {
+	} else if (_streamed && _streamed->controls) {
 		const auto ready = _documentMedia->loaded()
 			? _document->size
 			: _document->loading()
 			? std::clamp(_document->loadOffset(), int64(), _document->size)
 			: 0;
-		_streamed->controls.setLoadingProgress(ready, _document->size);
+		_streamed->controls->setLoadingProgress(ready, _document->size);
 	}
 }
 
@@ -1013,7 +1008,10 @@ void OverlayWidget::updateDocSize() {
 }
 
 void OverlayWidget::refreshNavVisibility() {
-	if (_sharedMediaData) {
+	if (_stories) {
+		_leftNavVisible = _stories->jumpAvailable(-1);
+		_rightNavVisible = _stories->jumpAvailable(1);
+	} else if (_sharedMediaData) {
 		_leftNavVisible = _index && (*_index > 0);
 		_rightNavVisible = _index && (*_index + 1 < _sharedMediaData->size());
 	} else if (_userPhotosData) {
@@ -1029,7 +1027,7 @@ void OverlayWidget::refreshNavVisibility() {
 }
 
 bool OverlayWidget::contentCanBeSaved() const {
-	if (hasCopyMediaRestriction()) {
+	if (_stories || hasCopyMediaRestriction()) {
 		return false;
 	} else if (_photo) {
 		return _photo->hasVideo() || _photoMedia->loaded();
@@ -1108,7 +1106,7 @@ void OverlayWidget::updateControls() {
 		QPoint(),
 		QSize(st::mediaviewIconOver, st::mediaviewIconOver));
 	_saveVisible = contentCanBeSaved();
-	_rotateVisible = !_themePreviewShown;
+	_rotateVisible = !_themePreviewShown && !_stories;
 	const auto navRect = [&](int i) {
 		return QRect(width() - st::mediaviewIconSize.width() * i,
 			height() - st::mediaviewIconSize.height(),
@@ -1181,8 +1179,8 @@ void OverlayWidget::refreshCaptionGeometry() {
 		_groupThumbs = nullptr;
 		_groupThumbsRect = QRect();
 	}
-	const auto captionBottom = (_streamed && !videoIsGifOrUserpic())
-		? (_streamed->controls.y() - st::mediaviewCaptionMargin.height())
+	const auto captionBottom = (_streamed && _streamed->controls)
+		? (_streamed->controls->y() - st::mediaviewCaptionMargin.height())
 		: _groupThumbs
 		? _groupThumbsTop
 		: height() - st::mediaviewCaptionMargin.height();
@@ -1523,9 +1521,9 @@ void OverlayWidget::contentSizeChanged() {
 }
 
 void OverlayWidget::recountSkipTop() {
-	const auto bottom = (!_streamed || videoIsGifOrUserpic())
+	const auto bottom = (!_streamed || !_streamed->controls)
 		? height()
-		: (_streamed->controls.y() - st::mediaviewCaptionPadding.bottom());
+		: (_streamed->controls->y() - st::mediaviewCaptionPadding.bottom());
 	const auto skipHeightBottom = (height() - bottom);
 	_skipTop = std::min(
 		std::max(
@@ -1869,12 +1867,12 @@ void OverlayWidget::toggleFullScreen(bool fullscreen) {
 }
 
 void OverlayWidget::activateControls() {
-	if (!_menu && !_mousePressed) {
+	if (!_menu && !_mousePressed && !_stories) {
 		_controlsHideTimer.callOnce(st::mediaviewWaitHide);
 	}
 	if (_fullScreenVideo) {
-		if (_streamed) {
-			_streamed->controls.showAnimated();
+		if (_streamed && _streamed->controls) {
+			_streamed->controls->showAnimated();
 		}
 	}
 	if (_controlsState == ControlsHiding || _controlsState == ControlsHidden) {
@@ -1888,16 +1886,23 @@ void OverlayWidget::activateControls() {
 }
 
 void OverlayWidget::hideControls(bool force) {
-	if (!force) {
+	if (_stories) {
+		_controlsState = ControlsShown;
+		_controlsOpacity = anim::value(1);
+		_helper->setControlsOpacity(1.);
+		return;
+	} else if (!force) {
 		if (!_dropdown->isHidden()
-			|| (_streamed && _streamed->controls.hasMenu())
+			|| (_streamed
+				&& _streamed->controls
+				&& _streamed->controls->hasMenu())
 			|| _menu
 			|| _mousePressed) {
 			return;
 		}
 	}
-	if (_fullScreenVideo) {
-		_streamed->controls.hideAnimated();
+	if (_fullScreenVideo && _streamed && _streamed->controls) {
+		_streamed->controls->hideAnimated();
 	}
 	if (_controlsState == ControlsHiding || _controlsState == ControlsHidden) return;
 
@@ -2959,7 +2964,7 @@ void OverlayWidget::displayPhoto(not_null<PhotoData*> photo) {
 	refreshMediaViewer();
 
 	_staticContent = QImage();
-	if (_photo->videoCanBePlayed()) {
+	if (!_stories && _photo->videoCanBePlayed()) {
 		initStreaming();
 	}
 
@@ -3133,7 +3138,7 @@ void OverlayWidget::displayDocument(
 	}
 	refreshFromLabel();
 	_blurred = false;
-	if (_showAsPip && _streamed && !videoIsGifOrUserpic()) {
+	if (_showAsPip && _streamed && _streamed->controls) {
 		switchToPip();
 	} else {
 		displayFinished();
@@ -3348,20 +3353,12 @@ void OverlayWidget::applyVideoSize() {
 bool OverlayWidget::createStreamingObjects() {
 	Expects(_photo || _document);
 
+	const auto origin = fileOrigin();
+	const auto callback = [=] { waitingAnimationCallback(); };
 	if (_document) {
-		_streamed = std::make_unique<Streamed>(
-			_document,
-			fileOrigin(),
-			_body,
-			static_cast<PlaybackControls::Delegate*>(this),
-			[=] { waitingAnimationCallback(); });
+		_streamed = std::make_unique<Streamed>(_document, origin, callback);
 	} else {
-		_streamed = std::make_unique<Streamed>(
-			_photo,
-			fileOrigin(),
-			_body,
-			static_cast<PlaybackControls::Delegate*>(this),
-			[=] { waitingAnimationCallback(); });
+		_streamed = std::make_unique<Streamed>(_photo, origin, callback);
 	}
 	if (!_streamed->instance.valid()) {
 		_streamed = nullptr;
@@ -3375,12 +3372,12 @@ bool OverlayWidget::createStreamingObjects() {
 			|| _document->isVideoFile()
 			|| _document->isVoiceMessage()
 			|| _document->isVideoMessage());
-
-	if (videoIsGifOrUserpic()) {
-		_streamed->controls.hide();
-	} else {
+	if (streamingRequiresControls()) {
+		_streamed->controls = std::make_unique<PlaybackControls>(
+			_body,
+			static_cast<PlaybackControls::Delegate*>(this));
+		_streamed->controls->show();
 		refreshClipControllerGeometry();
-		_streamed->controls.show();
 	}
 	return true;
 }
@@ -3569,7 +3566,7 @@ void OverlayWidget::initThemePreview() {
 }
 
 void OverlayWidget::refreshClipControllerGeometry() {
-	if (!_streamed || videoIsGifOrUserpic()) {
+	if (!_streamed || !_streamed->controls) {
 		return;
 	}
 
@@ -3584,13 +3581,15 @@ void OverlayWidget::refreshClipControllerGeometry() {
 	const auto controllerWidth = std::min(
 		st::mediaviewControllerSize.width(),
 		width() - 2 * skip);
-	_streamed->controls.resize(
+	_streamed->controls->resize(
 		controllerWidth,
 		st::mediaviewControllerSize.height());
-	_streamed->controls.move(
+	_streamed->controls->move(
 		(width() - controllerWidth) / 2,
-		controllerBottom - _streamed->controls.height() - st::mediaviewCaptionPadding.bottom());
-	Ui::SendPendingMoveResizeEvents(&_streamed->controls);
+		(controllerBottom
+			- _streamed->controls->height()
+			- st::mediaviewCaptionPadding.bottom()));
+	Ui::SendPendingMoveResizeEvents(_streamed->controls.get());
 }
 
 void OverlayWidget::playbackControlsPlay() {
@@ -3614,7 +3613,7 @@ void OverlayWidget::playbackControlsFromFullScreen() {
 }
 
 void OverlayWidget::playbackControlsToPictureInPicture() {
-	if (!videoIsGifOrUserpic()) {
+	if (_streamed && _streamed->controls) {
 		switchToPip();
 	}
 }
@@ -3775,7 +3774,7 @@ void OverlayWidget::playbackControlsSpeedChanged(float64 speed) {
 		Core::App().settings().setVideoPlaybackSpeed(speed);
 		Core::App().saveSettingsDelayed();
 	}
-	if (_streamed && !videoIsGifOrUserpic()) {
+	if (_streamed && _streamed->controls) {
 		DEBUG_LOG(("Media playback speed: %1 to _streamed.").arg(speed));
 		_streamed->instance.setSpeed(speed);
 	}
@@ -3921,10 +3920,66 @@ auto OverlayWidget::storiesStickerOrEmojiChosen()
 	return _storiesStickerOrEmojiChosen.events();
 }
 
+void OverlayWidget::storiesJumpTo(Data::FullStoryId id) {
+	Expects(_stories != nullptr);
+
+	if (!id) {
+		close();
+		return;
+	}
+	const auto &all = id.user->owner().stories().all();
+	const auto i = ranges::find(
+		all,
+		not_null(id.user),
+		&Data::StoriesList::user);
+	if (i == end(all)) {
+		close();
+		return;
+	}
+	const auto j = ranges::find(i->items, id.id, &Data::StoryItem::id);
+	if (j == end(i->items)) {
+		close();
+		return;
+	}
+	setContext(StoriesContext{ i->user, id.id });
+	clearStreaming();
+	_streamingStartPaused = false;
+	const auto &data = j->media.data;
+	if (const auto photo = std::get_if<not_null<PhotoData*>>(&data)) {
+		displayPhoto(*photo);
+	} else {
+		displayDocument(v::get<not_null<DocumentData*>>(data));
+	}
+}
+
+bool OverlayWidget::storiesPaused() {
+	return _streamed
+		&& !_streamed->instance.player().failed()
+		&& !_streamed->instance.player().finished()
+		&& _streamed->instance.player().active()
+		&& _streamed->instance.player().paused();
+}
+
+void OverlayWidget::storiesTogglePaused(bool paused) {
+	if (!_streamed
+		|| _streamed->instance.player().failed()
+		|| _streamed->instance.player().finished()
+		|| !_streamed->instance.player().active()) {
+		return;
+	} else if (_streamed->instance.player().paused()) {
+		_streamed->instance.resume();
+		updatePlaybackState();
+		playbackPauseMusic();
+	} else {
+		_streamed->instance.pause();
+		updatePlaybackState();
+	}
+}
+
 void OverlayWidget::playbackToggleFullScreen() {
 	Expects(_streamed != nullptr);
 
-	if (!videoShown() || (videoIsGifOrUserpic() && !_fullScreenVideo)) {
+	if (!videoShown() || (!_streamed->controls && !_fullScreenVideo)) {
 		return;
 	}
 	_fullScreenVideo = !_fullScreenVideo;
@@ -3936,10 +3991,12 @@ void OverlayWidget::playbackToggleFullScreen() {
 	setZoomLevel(
 		_fullScreenVideo ? kZoomToScreenLevel : _fullScreenZoomCache,
 		true);
-	if (!_fullScreenVideo) {
-		_streamed->controls.showAnimated();
+	if (_streamed->controls) {
+		if (!_fullScreenVideo) {
+			_streamed->controls->showAnimated();
+		}
+		_streamed->controls->setInFullScreen(_fullScreenVideo);
 	}
-	_streamed->controls.setInFullScreen(_fullScreenVideo);
 	_touchbarFullscreenToggled.fire_copy(_fullScreenVideo);
 	updateControls();
 	update();
@@ -3981,14 +4038,19 @@ void OverlayWidget::playbackPauseMusic() {
 void OverlayWidget::updatePlaybackState() {
 	Expects(_streamed != nullptr);
 
-	if (videoIsGifOrUserpic()) {
+	if (!_streamed->controls && !_stories) {
 		return;
 	}
 	const auto state = _streamed->instance.player().prepareLegacyState();
 	if (state.position != kTimeUnknown && state.length != kTimeUnknown) {
-		_streamed->controls.updatePlayback(state);
-		updatePowerSaveBlocker(state);
-		_touchbarTrackState.fire_copy(state);
+		if (_streamed->controls) {
+			_streamed->controls->updatePlayback(state);
+			_touchbarTrackState.fire_copy(state);
+			updatePowerSaveBlocker(state);
+		}
+		if (_stories) {
+			_stories->updatePlayback(state);
+		}
 	}
 }
 
@@ -4050,9 +4112,15 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 			renderer->paintTransformedVideoFrame(contentGeometry());
 			if (_streamed->instance.player().ready()) {
 				_streamed->instance.markFrameShown();
+				if (_stories) {
+					_stories->ready();
+				}
 			}
 		} else {
 			validatePhotoCurrentImage();
+			if (_stories && !_blurred) {
+				_stories->ready();
+			}
 			const auto fillTransparentBackground = (!_document
 				|| (!_document->sticker() && !_document->isVideoMessage()))
 				&& _staticContentTransparent;
@@ -4077,7 +4145,9 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 	const auto opacity = _fullScreenVideo ? 0. : _controlsOpacity.current();
 	if (opacity > 0) {
 		paintControls(renderer, opacity);
-		renderer->paintFooter(footerGeometry(), opacity);
+		if (!_stories) {
+			renderer->paintFooter(footerGeometry(), opacity);
+		}
 		if (!_caption.isEmpty()) {
 			renderer->paintCaption(captionGeometry(), opacity);
 		}
@@ -4510,6 +4580,10 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 	const auto key = e->key();
 	const auto modifiers = e->modifiers();
 	const auto ctrl = modifiers.testFlag(Qt::ControlModifier);
+	if (_stories && key == Qt::Key_Space && _down != OverVideo) {
+		_stories->togglePaused(!_stories->paused());
+		return;
+	}
 	if (_streamed) {
 		// Ctrl + F for full screen toggle is in eventFilter().
 		const auto toggleFull = (modifiers.testFlag(Qt::AltModifier) || ctrl)
@@ -4833,7 +4907,9 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 }
 
 bool OverlayWidget::moveToNext(int delta) {
-	if (!_index) {
+	if (_stories) {
+		return _stories->jumpFor(delta);
+	} else if (!_index) {
 		return false;
 	}
 	auto newIndex = *_index + delta;
@@ -4928,6 +5004,9 @@ void OverlayWidget::handleMousePress(
 				|| _over == OverMore
 				|| _over == OverVideo) {
 				_down = _over;
+				if (_over == OverVideo && _stories) {
+					_stories->togglePaused(true);
+				}
 			} else if (!_saveMsg.contains(position) || !isSaveMsgShown()) {
 				_pressed = true;
 				_dragging = 0;
@@ -4950,9 +5029,12 @@ bool OverlayWidget::handleDoubleClick(
 
 	if (_over != OverVideo || !_streamed || button != Qt::LeftButton) {
 		return false;
+	} else if (_stories) {
+		toggleFullScreen(_windowed);
+	} else {
+		playbackToggleFullScreen();
+		playbackPauseResume();
 	}
-	playbackToggleFullScreen();
-	playbackPauseResume();
 	return true;
 }
 
@@ -5090,11 +5172,11 @@ void OverlayWidget::updateOver(QPoint pos) {
 		updateOverState(OverLeftNav);
 	} else if (_rightNavVisible && _rightNav.contains(pos)) {
 		updateOverState(OverRightNav);
-	} else if (_from && _nameNav.contains(pos)) {
+	} else if (!_stories && _from && _nameNav.contains(pos)) {
 		updateOverState(OverName);
-	} else if (_message && _message->isRegular() && _dateNav.contains(pos)) {
+	} else if (!_stories && _message && _message->isRegular() && _dateNav.contains(pos)) {
 		updateOverState(OverDate);
-	} else if (_headerHasLink && _headerNav.contains(pos)) {
+	} else if (!_stories && _headerHasLink && _headerNav.contains(pos)) {
 		updateOverState(OverHeader);
 	} else if (_saveVisible && _saveNav.contains(pos)) {
 		updateOverState(OverSave);
@@ -5104,10 +5186,14 @@ void OverlayWidget::updateOver(QPoint pos) {
 		updateOverState(OverIcon);
 	} else if (_moreNav.contains(pos)) {
 		updateOverState(OverMore);
-	} else if (documentContentShown() && finalContentRect().contains(pos)) {
-		if ((_document->isVideoFile() || _document->isVideoMessage()) && _streamed) {
+	} else if (contentShown() && finalContentRect().contains(pos)) {
+		if (_stories) {
 			updateOverState(OverVideo);
-		} else if (!_streamed && !_documentMedia->loaded()) {
+		} else if (_streamed
+			&& _document
+			&& (_document->isVideoFile() || _document->isVideoMessage())) {
+			updateOverState(OverVideo);
+		} else if (!_streamed && _document && !_documentMedia->loaded()) {
 			updateOverState(OverIcon);
 		} else if (_over != OverNone) {
 			updateOverState(OverNone);
@@ -5163,7 +5249,9 @@ void OverlayWidget::handleMouseRelease(
 	} else if (_over == OverMore && _down == OverMore) {
 		InvokeQueued(_widget, [=] { showDropdown(); });
 	} else if (_over == OverVideo && _down == OverVideo) {
-		if (_streamed) {
+		if (_stories) {
+			_stories->togglePaused(false);
+		} else if (_streamed) {
 			playbackPauseResume();
 		}
 	} else if (_pressed) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 4d6d6d3f2..ad7506ee1 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -26,6 +26,7 @@ class History;
 namespace Data {
 class PhotoMedia;
 class DocumentMedia;
+struct FullStoryId;
 } // namespace Data
 
 namespace Ui {
@@ -227,6 +228,9 @@ private:
 	std::shared_ptr<ChatHelpers::Show> storiesShow() override;
 	auto storiesStickerOrEmojiChosen()
 		-> rpl::producer<ChatHelpers::FileChosen> override;
+	void storiesJumpTo(Data::FullStoryId id) override;
+	bool storiesPaused() override;
+	void storiesTogglePaused(bool paused) override;
 
 	void hideControls(bool force = false);
 	void subscribeToScreenGeometry();
@@ -458,7 +462,7 @@ private:
 	void applyVideoSize();
 	[[nodiscard]] bool videoShown() const;
 	[[nodiscard]] QSize videoSize() const;
-	[[nodiscard]] bool videoIsGifOrUserpic() const;
+	[[nodiscard]] bool streamingRequiresControls() const;
 	[[nodiscard]] QImage videoFrame() const; // ARGB (changes prepare format)
 	[[nodiscard]] QImage currentVideoFrameImage() const; // RGB (may convert)
 	[[nodiscard]] Streaming::FrameWithInfo videoFrameWithInfo() const; // YUV

From ae94cd2d42aedff0e96a560d403c8eb088ad2c28 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 May 2023 14:31:48 +0400
Subject: [PATCH 232/676] Allow navigating to stories of sibling users.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../icons/mediaview/stories_next.png          | Bin 0 -> 438 bytes
 .../icons/mediaview/stories_next@2x.png       | Bin 0 -> 806 bytes
 .../icons/mediaview/stories_next@3x.png       | Bin 0 -> 1260 bytes
 Telegram/SourceFiles/data/data_stories.cpp    |  37 ++-
 Telegram/SourceFiles/data/data_stories.h      |   5 +-
 .../stories/media_stories_controller.cpp      | 137 +++++++--
 .../media/stories/media_stories_controller.h  |  31 ++-
 .../media/stories/media_stories_delegate.h    |   1 +
 .../media/stories/media_stories_sibling.cpp   | 262 ++++++++++++++++++
 .../media/stories/media_stories_sibling.h     |  48 ++++
 .../media/stories/media_stories_slider.cpp    |   4 +-
 .../media/stories/media_stories_view.cpp      |  34 ++-
 .../media/stories/media_stories_view.h        |  25 +-
 .../SourceFiles/media/view/media_view.style   |  10 +-
 .../media/view/media_view_overlay_opengl.cpp  |  31 ++-
 .../media/view/media_view_overlay_opengl.h    |   4 +-
 .../media/view/media_view_overlay_widget.cpp  | 151 +++++++---
 .../media/view/media_view_overlay_widget.h    |   8 +-
 .../platform/platform_overlay_widget.h        |   2 +
 20 files changed, 699 insertions(+), 93 deletions(-)
 create mode 100644 Telegram/Resources/icons/mediaview/stories_next.png
 create mode 100644 Telegram/Resources/icons/mediaview/stories_next@2x.png
 create mode 100644 Telegram/Resources/icons/mediaview/stories_next@3x.png
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_sibling.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 1a76befc0..5a095f698 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -970,6 +970,8 @@ PRIVATE
     media/stories/media_stories_header.h
     media/stories/media_stories_reply.cpp
     media/stories/media_stories_reply.h
+    media/stories/media_stories_sibling.cpp
+    media/stories/media_stories_sibling.h
     media/stories/media_stories_slider.cpp
     media/stories/media_stories_slider.h
     media/stories/media_stories_view.cpp
diff --git a/Telegram/Resources/icons/mediaview/stories_next.png b/Telegram/Resources/icons/mediaview/stories_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd997b2d08ee91a322d9a8e0a1287e7313a292e2
GIT binary patch
literal 438
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfOu^H|F~mY}
z>l8yF7Xy*Dw_#DbbA#3vckFG--XXGit?-P6W{XYT(j~NbfA^=XacR1HcA0|y&;R~$
zD*l&6w$7fAEO9J3v+wbYWt_gT*DL4QPrtTp?S-Q}uXf3?I9@N^yd;r}>4b!|c*L}+
z%T~4=;BjU%Okb|3wrW+<lXk`<Ok&fj3U#9`bZYuMs#h!g&7AefB5zij{now%Kl}v#
zd+gZlImsdAc3I@K)stTz;IK~px$nI1<N_J@^Pl}9Hv|WWxH<{2{oZGvdeG0&HSmN(
zc*KU_3kE#w3v^GH-rXxy*6>bb*^{L@TjkBId7NkUZ@RB<Jt1=1!(e$Cj}=#A1RJKr
zMs2t<MX-V6b&{c_R!&Q+%*OabNe<_>thw@U?T^W&wI6F3|82jyugaxe0TgDQu6{1-
HoD!M<{so-R

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/stories_next@2x.png b/Telegram/Resources/icons/mediaview/stories_next@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..82b819e9e5425e6beded44dc875b5ce9e67c4eb4
GIT binary patch
literal 806
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz%;?r#W5s;
z^X<&NU0Q}B4cBX#Hr}~3J)nARjhOVoL$|!RH-<!S+_FV%i%>12pw9Za9ARA#{=S=g
zS5Y`wt$sJp9qZP#NuNLa78$9Z+_U%Z{x7x@E}Lsd7w?Q&8M5m7>!V2@AHS}$kvsnQ
z<MsQm3oOn&|NOPecj+ak4X3iUT1oX5^en%^ZP*gX`7F*PL~r`^)2Ui5K@6@}T(jd+
zkENQ;*0hZbO=1a-)6ls5aQWqvr#8At1ji}g$S`^LefP0OXJIzO*O&a84<0x;e<9bg
zw=*g@oG+hC68n3^fL(rNdR~mgQDI@l1QGk<4pR%S`Q?sjJ6?pwADgQ;Lu+bRTzt;n
zxb<(#c89I@RTJKLZ`+#c^mSp{#l?T??CW;qZO>k(;rU6f|E&s_&1#iZ`*Y1^FWSdH
z*=pDE#~bH4WZivR_Or&0L)bE6%je~1x(*q%cSp=VtHvR`j?u$FFmjRl=OPU?%PrP(
z`z%{jexAAV`m4&!E71%>wkC7^f=f-9{`oMdG>CP#9-HquSzVZcQ(;+8XZYST#+M5$
zuB<+?7AUDV-TTh7;0ZIhTALP{GAJ$h{(^ri%Y**=Cm3c*Z#u(TTDI(OI?u-IC495r
zmU$=H%|E}9HLhoEnD#zX%@Yia!R?2$XLU>qc3<)2mD^&EbzfG!{gk}_zW2&|y>0IT
zb?h0Ern=1jsj7QnPUeRdaSINnl+IDe`&N??r<cgMDeB4nyzTk%PYzF6n=9Zj^R~tz
zmyXm7ZC-)!ZG6&7%W`CoyZC$w{;=`zf}@T;M-=}F`7`o6*Ytl;GI|y}p`6j}5`X-W
za~GzcJQn6In8f82==ZED{n^?c1<M-+mwP1+>3_b$z5b-^S8m0XQ9m;oXTI3YwBP=F
frlZnt^}KrKi}F3np1FM2Kxx#|)z4*}Q$iB}0g+Os

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/stories_next@3x.png b/Telegram/Resources/icons/mediaview/stories_next@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3550c8cce46ff4f8984db7b426c134d4579001a1
GIT binary patch
literal 1260
zcmV<I1QYv-P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<R!KxbRA>e5n>#OUK@`VbHzE;N
zp;Ax~;?YxSM4?qERK5VwiEki?QX%03i1-8=jaKbdC`d>=lN$vR_x{+j&p0!C@0mSo
z&pFvSr(n+PS!@0O^H?*p_Bu^XjZdQo>Y@jJ6@j9=yL)_me0X?xaBy&7V4$<J^Uv1@
zTYtYkkB^TR7Z+z|XD25oM@L83*VjeBkkQ%P+&nosxwW-*et!PX@q-A0h@(UXjfj?>
zo}Sg!)vK#3M>>Y)C_xnpMS$g3(%;{|y}kYR_GZB7QH4U(qC7vc+>-6>?Hd~#@9*y(
z_%lRNjtLCq2I(v~Jw45G&%h=07(<wIhUhBL+S<CgxhaI%K@CPR?TXg6J!|^-_}BrC
zXj4oV;#5XPMnwFc4_N>J!*(2O+Kr8kJv==4V3Lvr24HM3XSbn~>V#F)JAe@wH>P#X
zXP`dXK=N8|IHDSQ3!RTz1F-ylvL>EgMW0><UiL!LTd*yr>#c{U&U-fpnP6uNpAG_K
z(wXbGK33GMtgK8;O&K3KRX#mEy}Z1%wY51(**EU!=wPKC92{7QaIE$}-9A4*&&<q3
z_UNPA+gqQJNs$Gr?LA;;XD3CG<)ej#1+^E4hK6o#ZY*V8n*mt0WiGQnh}^GwdwZ)4
z6vqv~`nFbm6`!A<Z)s_%!j$7HagHjf)6>(5i3#RpRlWaL00TQs4<QGsbH?7@p3zc4
z;|A=scnRSY*ZG~&etmsCBsaht&3#r9DoO#G<55U%fKMcrBXX9>HW)X+n~4$S%tV>5
zK`?GmFmRiloy~{aMk)+9D8$4n?w*KrTq|B!T3T9LThrCb?g3^BySuwKeecu8$PKnq
zdjJ&lzH16|r!15k6b!^JFE4#Y!(KLpn`dwZ3I<~L_xJYTJX<Dlo12^S(F_FxvDepE
zAEmCcMsB=C`}p{9RTZ~~LQJgU72~S16-ql5OY1yJ>+VaoL06my@9+zC8ypvxmzQ-D
z96JsV54*a$^hd5WW(tKKf{o4{+){_B$m6Sr;7X?ycWnv73U20W3lxjEXa-}Ic+rHI
zcxWIPD~2mAG$0$y3CRj#X~7)9@Z0|Wer5S8C0TC~`3(MMgx>%_#!uYZr!YD?s?hl^
z7Q_miz}C(EsF4bB_x1Jt&@1iP)lN5txT~yxeieBsvADRXsxEG<U`XPXYAdlU@*0V>
z#JYQp1Y@$Z)UnQ8CgJk#?k=~ujUZ4Hhe&@=f>*UVsqdO{zFd#Ul`|azZlz6Nfg9VJ
z)T=-nPhi;wNcy|k?<HjaubfF@5&v?g^+ntmx0=sM00<=X>2sB79VU`xTxpmVSXVl$
zs0Ke-lRW^V`IGpP$msR#-N91G0;Q+NBsp_&Nb^s*GS0fFvIajWi0N?;;Ep4bqNFlJ
zA!=<?zhX4v1=e)gezc?Z5%ChjDTIo0#PAS75b?CMA=Q{gx$(m|i%x1ZY4m_c5BvwQ
WX4EjbQt9vj0000<MNUMnLSTY#<u-8u

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index c5634e4ac..e7274fb04 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -173,7 +173,7 @@ StoryId Stories::generate(
 	const auto itemId = item->id;
 	const auto peer = item->history()->peer;
 	const auto session = &peer->session();
-	auto stories = StoriesList{ .user = item->from()->asUser() };
+	auto full = std::vector<StoriesList>();
 	const auto lifetime = session->storage().query(SharedMediaQuery(
 		SharedMediaKey(peer->id, MsgId(0), listType, itemId),
 		32,
@@ -182,21 +182,33 @@ StoryId Stories::generate(
 		if (!result.messageIds.contains(itemId)) {
 			result.messageIds.emplace(itemId);
 		}
-		stories.items.reserve(result.messageIds.size());
 		auto index = StoryId();
 		const auto owner = &peer->owner();
 		for (const auto id : result.messageIds) {
 			if (const auto item = owner->message(peer, id)) {
+				const auto user = item->from()->asUser();
+				if (!user) {
+					continue;
+				}
+				const auto i = ranges::find(
+					full,
+					not_null(user),
+					&StoriesList::user);
+				auto &stories = (i == end(full))
+					? full.emplace_back(StoriesList{ .user = user })
+					: *i;
 				if (id == itemId) {
 					resultId = ++index;
 					stories.items.push_back({
 						.id = resultId,
 						.media = (document
 							? StoryMedia{ not_null(document) }
-							: StoryMedia{ v::get<not_null<PhotoData*>>(media) }),
+							: StoryMedia{
+								v::get<not_null<PhotoData*>>(media) }),
 						.caption = item->originalText(),
 						.date = item->date(),
 					});
+					++stories.total;
 				} else if (const auto media = item->media()) {
 					const auto photo = media->photo();
 					const auto document = media->document();
@@ -209,18 +221,21 @@ StoryId Stories::generate(
 							.caption = item->originalText(),
 							.date = item->date(),
 						});
+						++stories.total;
 					}
 				}
 			}
 		}
-		stories.total = std::max(
-			result.count.value_or(1),
-			int(result.messageIds.size()));
-		const auto i = ranges::find(_all, stories.user, &StoriesList::user);
-		if (i != end(_all)) {
-			*i = std::move(stories);
-		} else {
-			_all.push_back(std::move(stories));
+		for (auto &stories : full) {
+			const auto i = ranges::find(
+				_all,
+				stories.user,
+				&StoriesList::user);
+			if (i != end(_all)) {
+				*i = std::move(stories);
+			} else {
+				_all.push_back(std::move(stories));
+			}
 		}
 	});
 	return resultId;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 26f1f76a2..373f90b95 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -46,9 +46,12 @@ struct FullStoryId {
 	UserData *user = nullptr;
 	StoryId id = 0;
 
-	explicit operator bool() const {
+	[[nodiscard]] bool valid() const {
 		return user != nullptr && id != 0;
 	}
+	explicit operator bool() const {
+		return valid();
+	}
 	friend inline auto operator<=>(FullStoryId, FullStoryId) = default;
 	friend inline bool operator==(FullStoryId, FullStoryId) = default;
 };
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index f88ebf8d3..c653ffb7f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -12,8 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_stories.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
+#include "media/stories/media_stories_sibling.h"
 #include "media/stories/media_stories_slider.h"
 #include "media/stories/media_stories_reply.h"
+#include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
 #include "ui/rp_widget.h"
 #include "styles/style_media_view.h"
@@ -25,6 +27,7 @@ namespace {
 
 constexpr auto kPhotoProgressInterval = crl::time(100);
 constexpr auto kPhotoDuration = 5 * crl::time(1000);
+constexpr auto kSiblingMultiplier = 0.448;
 
 } // namespace
 
@@ -115,12 +118,15 @@ void Controller::initLayout() {
 	const auto sliderHeight = st::storiesSliderMargin.top()
 		+ st::storiesSliderWidth
 		+ st::storiesSliderMargin.bottom();
-	const auto outsideHeaderHeight = headerHeight + sliderHeight;
+	const auto outsideHeaderHeight = headerHeight
+		+ sliderHeight
+		+ st::storiesSliderOutsideSkip;
 	const auto fieldMinHeight = st::storiesFieldMargin.top()
 		+ st::storiesAttach.height
 		+ st::storiesFieldMargin.bottom();
-	const auto minHeightForOutsideHeader = st::storiesMaxSize.height()
+	const auto minHeightForOutsideHeader = st::storiesFieldMargin.bottom()
 		+ outsideHeaderHeight
+		+ st::storiesMaxSize.height()
 		+ fieldMinHeight;
 
 	_layout = _wrap->sizeValue(
@@ -134,9 +140,10 @@ void Controller::initLayout() {
 			? HeaderLayout::Outside
 			: HeaderLayout::Normal;
 
-		const auto topSkip = (layout.headerLayout == HeaderLayout::Outside)
-			? outsideHeaderHeight
-			: st::storiesFieldMargin.bottom();
+		const auto topSkip = st::storiesFieldMargin.bottom()
+			+ (layout.headerLayout == HeaderLayout::Outside
+				? outsideHeaderHeight
+				: 0);
 		const auto bottomSkip = fieldMinHeight;
 		const auto maxWidth = size.width() - 2 * st::storiesSideSkip;
 		const auto availableHeight = size.height() - topSkip - bottomSkip;
@@ -187,6 +194,16 @@ void Controller::initLayout() {
 			layout.controlsWidth,
 			layout.controlsBottomPosition.y());
 
+		const auto siblingSize = layout.content.size() * kSiblingMultiplier;
+		const auto siblingTop = layout.content.y()
+			+ (layout.content.height() - siblingSize.height()) / 2;
+		layout.siblingLeft = QRect(
+			{ -siblingSize.width() / 3, siblingTop },
+			siblingSize);
+		layout.siblingRight = QRect(
+			{ size.width() - (2 * siblingSize.width() / 3), siblingTop },
+			siblingSize);
+
 		return layout;
 	});
 }
@@ -214,11 +231,19 @@ auto Controller::stickerOrEmojiChosen() const
 	return _delegate->storiesStickerOrEmojiChosen();
 }
 
-void Controller::show(const Data::StoriesList &list, int index) {
-	Expects(index < list.items.size());
+void Controller::show(
+		const std::vector<Data::StoriesList> &lists,
+		int index,
+		int subindex) {
+	Expects(index >= 0 && index < lists.size());
+	Expects(subindex >= 0 && subindex < lists[index].items.size());
 
-	const auto &item = list.items[index];
+	showSiblings(lists, index);
+
+	const auto &list = lists[index];
+	const auto &item = list.items[subindex];
 	const auto guard = gsl::finally([&] {
+		_started = false;
 		if (v::is<not_null<PhotoData*>>(item.media.data)) {
 			_photoPlayback = std::make_unique<PhotoPlayback>(this);
 		} else {
@@ -228,7 +253,7 @@ void Controller::show(const Data::StoriesList &list, int index) {
 	if (_list != list) {
 		_list = list;
 	}
-	_index = index;
+	_index = subindex;
 
 	const auto id = Data::FullStoryId{
 		.user = list.user,
@@ -240,11 +265,34 @@ void Controller::show(const Data::StoriesList &list, int index) {
 	_shown = id;
 
 	_header->show({ .user = list.user, .date = item.date });
-	_slider->show({ .index = index, .total = int(list.items.size()) });
+	_slider->show({ .index = _index, .total = list.total });
 	_replyArea->show({ .user = list.user });
 }
 
+void Controller::showSiblings(
+		const std::vector<Data::StoriesList> &lists,
+		int index) {
+	showSibling(_siblingLeft, (index > 0) ? &lists[index - 1] : nullptr);
+	showSibling(
+		_siblingRight,
+		(index + 1 < lists.size()) ? &lists[index + 1] : nullptr);
+}
+
+void Controller::showSibling(
+		std::unique_ptr<Sibling> &sibling,
+		const Data::StoriesList *list) {
+	if (!list || list->items.empty()) {
+		sibling = nullptr;
+	} else if (!sibling || !sibling->shows(*list)) {
+		sibling = std::make_unique<Sibling>(this, *list);
+	}
+}
+
 void Controller::ready() {
+	if (_started) {
+		return;
+	}
+	_started = true;
 	if (_photoPlayback) {
 		_photoPlayback->togglePaused(false);
 	}
@@ -262,25 +310,28 @@ void Controller::updatePlayback(const Player::TrackState &state) {
 	_slider->updatePlayback(state);
 	updatePowerSaveBlocker(state);
 	if (Player::IsStoppedAtEnd(state.state)) {
-		if (!jumpFor(1)) {
+		if (!subjumpFor(1)) {
 			_delegate->storiesJumpTo({});
 		}
 	}
 }
 
-bool Controller::jumpAvailable(int delta) const {
-	if (delta == -1) {
-		// Always allow to jump back for one.
-		// In case of the first story just jump to the beginning.
-		return _list && !_list->items.empty();
-	}
+bool Controller::subjumpAvailable(int delta) const {
 	const auto index = _index + delta;
+	if (index < 0) {
+		return _siblingLeft && _siblingLeft->shownId().valid();
+	} else if (index >= _list->total) {
+		return _siblingRight && _siblingRight->shownId().valid();
+	}
 	return index >= 0 && index < _list->total;
 }
 
-bool Controller::jumpFor(int delta) {
-	if (!_index && delta == -1) {
-		if (!_list || _list->items.empty()) {
+bool Controller::subjumpFor(int delta) {
+	const auto index = _index + delta;
+	if (index < 0) {
+		if (_siblingLeft->shownId().valid()) {
+			return jumpFor(-1);
+		} else if (!_list || _list->items.empty()) {
 			return false;
 		}
 		_delegate->storiesJumpTo({
@@ -288,10 +339,8 @@ bool Controller::jumpFor(int delta) {
 			.id = _list->items.front().id
 		});
 		return true;
-	}
-	const auto index = _index + delta;
-	if (index < 0 || index >= _list->total) {
-		return false;
+	} else if (index >= _list->total) {
+		return _siblingRight->shownId().valid() && jumpFor(1);
 	} else if (index < _list->items.size()) {
 		// #TODO stories load more
 		_delegate->storiesJumpTo({
@@ -302,6 +351,22 @@ bool Controller::jumpFor(int delta) {
 	return true;
 }
 
+
+bool Controller::jumpFor(int delta) {
+	if (delta == -1) {
+		if (const auto left = _siblingLeft.get()) {
+			_delegate->storiesJumpTo(left->shownId());
+			return true;
+		}
+	} else if (delta == 1) {
+		if (const auto right = _siblingRight.get()) {
+			_delegate->storiesJumpTo(right->shownId());
+			return true;
+		}
+	}
+	return false;
+}
+
 bool Controller::paused() const {
 	return _photoPlayback
 		? _photoPlayback->paused()
@@ -316,6 +381,30 @@ void Controller::togglePaused(bool paused) {
 	}
 }
 
+void Controller::repaintSibling(not_null<Sibling*> sibling) {
+	if (sibling == _siblingLeft.get() || sibling == _siblingRight.get()) {
+		_delegate->storiesRepaint();
+	}
+}
+
+SiblingView Controller::siblingLeft() const {
+	if (const auto value = _siblingLeft.get()) {
+		return { value->image(), _layout.current()->siblingLeft };
+	}
+	return {};
+}
+
+SiblingView Controller::siblingRight() const {
+	if (const auto value = _siblingRight.get()) {
+		return { value->image(), _layout.current()->siblingRight };
+	}
+	return {};
+}
+
+rpl::lifetime &Controller::lifetime() {
+	return _lifetime;
+}
+
 void Controller::updatePowerSaveBlocker(const Player::TrackState &state) {
 	const auto block = !Player::IsPausedOrPausing(state.state)
 		&& !Player::IsStoppedOrStopping(state.state);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 2d9abb80c..dc80c4667 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -35,7 +35,9 @@ namespace Media::Stories {
 class Header;
 class Slider;
 class ReplyArea;
+class Sibling;
 class Delegate;
+struct SiblingView;
 
 enum class HeaderLayout {
 	Normal,
@@ -50,6 +52,8 @@ struct Layout {
 	QPoint controlsBottomPosition;
 	QRect autocompleteRect;
 	HeaderLayout headerLayout = HeaderLayout::Normal;
+	QRect siblingLeft;
+	QRect siblingRight;
 
 	friend inline auto operator<=>(Layout, Layout) = default;
 	friend inline bool operator==(Layout, Layout) = default;
@@ -68,16 +72,26 @@ public:
 	[[nodiscard]] auto stickerOrEmojiChosen() const
 	-> rpl::producer<ChatHelpers::FileChosen>;
 
-	void show(const Data::StoriesList &list, int index);
+	void show(
+		const std::vector<Data::StoriesList> &lists,
+		int index,
+		int subindex);
 	void ready();
 
 	void updateVideoPlayback(const Player::TrackState &state);
 
-	[[nodiscard]] bool jumpAvailable(int delta) const;
+	[[nodiscard]] bool subjumpAvailable(int delta) const;
+	[[nodiscard]] bool subjumpFor(int delta);
 	[[nodiscard]] bool jumpFor(int delta);
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
 
+	void repaintSibling(not_null<Sibling*> sibling);
+	[[nodiscard]] SiblingView siblingLeft() const;
+	[[nodiscard]] SiblingView siblingRight() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
 private:
 	class PhotoPlayback;
 
@@ -86,6 +100,13 @@ private:
 	void updatePlayback(const Player::TrackState &state);
 	void updatePowerSaveBlocker(const Player::TrackState &state);
 
+	void showSiblings(
+		const std::vector<Data::StoriesList> &lists,
+		int index);
+	void showSibling(
+		std::unique_ptr<Sibling> &sibling,
+		const Data::StoriesList *list);
+
 	const not_null<Delegate*> _delegate;
 
 	rpl::variable<std::optional<Layout>> _layout;
@@ -94,11 +115,15 @@ private:
 	const std::unique_ptr<Header> _header;
 	const std::unique_ptr<Slider> _slider;
 	const std::unique_ptr<ReplyArea> _replyArea;
+	std::unique_ptr<PhotoPlayback> _photoPlayback;
 
 	Data::FullStoryId _shown;
 	std::optional<Data::StoriesList> _list;
 	int _index = 0;
-	std::unique_ptr<PhotoPlayback> _photoPlayback;
+	bool _started = false;
+
+	std::unique_ptr<Sibling> _siblingLeft;
+	std::unique_ptr<Sibling> _siblingRight;
 
 	std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index 3a2d700f6..256aff2f2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -37,6 +37,7 @@ public:
 	virtual void storiesJumpTo(Data::FullStoryId id) = 0;
 	[[nodiscard]] virtual bool storiesPaused() = 0;
 	virtual void storiesTogglePaused(bool paused) = 0;
+	virtual void storiesRepaint() = 0;
 };
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
new file mode 100644
index 000000000..006485088
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -0,0 +1,262 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_sibling.h"
+
+#include "base/weak_ptr.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "media/stories/media_stories_controller.h"
+#include "media/streaming/media_streaming_instance.h"
+#include "media/streaming/media_streaming_player.h"
+
+namespace Media::Stories {
+namespace {
+
+constexpr auto kGoodFadeDuration = crl::time(200);
+
+} // namespace
+
+class Sibling::Loader {
+public:
+	virtual ~Loader() = default;
+
+	virtual QImage blurred() = 0;
+	virtual QImage good() = 0;
+};
+
+class Sibling::LoaderPhoto final : public Sibling::Loader {
+public:
+	LoaderPhoto(
+		not_null<PhotoData*> photo,
+		Data::FileOrigin origin,
+		Fn<void()> update);
+
+	QImage blurred() override;
+	QImage good() override;
+
+private:
+	const not_null<PhotoData*> _photo;
+	const Fn<void()> _update;
+	std::shared_ptr<Data::PhotoMedia> _media;
+	rpl::lifetime _waitingLoading;
+
+};
+
+class Sibling::LoaderVideo final
+	: public Sibling::Loader
+	, public base::has_weak_ptr {
+public:
+	LoaderVideo(
+		not_null<DocumentData*> video,
+		Data::FileOrigin origin,
+		Fn<void()> update);
+
+	QImage blurred() override;
+	QImage good() override;
+
+private:
+	void waitForGoodThumbnail();
+	bool updateAfterGoodCheck();
+	void streamedFailed();
+
+	const not_null<DocumentData*> _video;
+	const Data::FileOrigin _origin;
+	const Fn<void()> _update;
+	std::shared_ptr<Data::DocumentMedia> _media;
+	std::unique_ptr<Streaming::Instance> _streamed;
+	rpl::lifetime _waitingGoodGeneration;
+	bool _checkingGoodInCache = false;
+	bool _failed = false;
+
+};
+
+Sibling::LoaderPhoto::LoaderPhoto(
+	not_null<PhotoData*> photo,
+	Data::FileOrigin origin,
+	Fn<void()> update)
+: _photo(photo)
+, _update(std::move(update))
+, _media(_photo->createMediaView()) {
+	_photo->load(origin, LoadFromCloudOrLocal, true);
+}
+
+QImage Sibling::LoaderPhoto::blurred() {
+	if (const auto image = _media->thumbnailInline()) {
+		return image->original();
+	}
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(ratio, ratio, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::black);
+	result.setDevicePixelRatio(ratio);
+	return result;
+}
+
+QImage Sibling::LoaderPhoto::good() {
+	if (const auto image = _media->image(Data::PhotoSize::Large)) {
+		return image->original();
+	} else if (!_waitingLoading) {
+		_photo->session().downloaderTaskFinished(
+		) | rpl::start_with_next([=] {
+			if (_media->loaded()) {
+				_update();
+			}
+		}, _waitingLoading);
+	}
+	return QImage();
+}
+
+Sibling::LoaderVideo::LoaderVideo(
+	not_null<DocumentData*> video,
+	Data::FileOrigin origin,
+	Fn<void()> update)
+: _video(video)
+, _origin(origin)
+, _update(std::move(                                                                                                                     update))
+, _media(_video->createMediaView()) {
+	_media->goodThumbnailWanted();
+}
+
+QImage Sibling::LoaderVideo::blurred() {
+	if (const auto image = _media->thumbnailInline()) {
+		return image->original();
+	}
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(ratio, ratio, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::black);
+	result.setDevicePixelRatio(ratio);
+	return result;
+}
+
+QImage Sibling::LoaderVideo::good() {
+	if (const auto image = _media->goodThumbnail()) {
+		return image->original();
+	} else if (!_video->goodThumbnailChecked()) {
+		if (!_checkingGoodInCache) {
+			waitForGoodThumbnail();
+		}
+	} else if (_failed) {
+		return QImage();
+	} else if (!_streamed) {
+		_streamed = std::make_unique<Streaming::Instance>(
+			_video,
+			_origin,
+			[] {}); // waitingCallback
+		_streamed->lockPlayer();
+		_streamed->player().updates(
+		) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+			v::match(update.data, [&](Streaming::Information &update) {
+				_update();
+			}, [](const auto &update) {
+			});
+		}, [=](Streaming::Error &&error) {
+			streamedFailed();
+		}, _streamed->lifetime());
+		if (_streamed->ready()) {
+			_update();
+		} else if (!_streamed->valid()) {
+			streamedFailed();
+		}
+	} else if (_streamed->ready()) {
+		return _streamed->info().video.cover;
+	}
+	return QImage();
+}
+
+void Sibling::LoaderVideo::streamedFailed() {
+	_failed = true;
+	_streamed = nullptr;
+	_update();
+}
+
+void Sibling::LoaderVideo::waitForGoodThumbnail() {
+	_checkingGoodInCache = true;
+	const auto weak = make_weak(this);
+	_video->owner().cache().get({}, [=](const auto &) {
+		crl::on_main([=] {
+			if (const auto strong = weak.get()) {
+				if (!strong->updateAfterGoodCheck()) {
+					strong->_video->session().downloaderTaskFinished(
+					) | rpl::start_with_next([=] {
+						strong->updateAfterGoodCheck();
+					}, strong->_waitingGoodGeneration);
+				}
+			}
+		});
+	});
+}
+
+bool Sibling::LoaderVideo::updateAfterGoodCheck() {
+	if (!_video->goodThumbnailChecked()) {
+		return false;
+	}
+	_checkingGoodInCache = false;
+	_waitingGoodGeneration.destroy();
+	_update();
+	return true;
+}
+
+Sibling::Sibling(
+	not_null<Controller*> controller,
+	const Data::StoriesList &list)
+: _controller(controller)
+, _id{ list.user, list.items.front().id } {
+	const auto &item = list.items.front();
+	const auto &data = item.media.data;
+	const auto origin = Data::FileOrigin();
+	if (const auto video = std::get_if<not_null<DocumentData*>>(&data)) {
+		_loader = std::make_unique<LoaderVideo>((*video), origin, [=] {
+			check();
+		});
+	} else if (const auto photo = std::get_if<not_null<PhotoData*>>(&data)) {
+		_loader = std::make_unique<LoaderPhoto>((*photo), origin, [=] {
+			check();
+		});
+	} else {
+		Unexpected("Media type in stories list.");
+	}
+	_blurred = _loader->blurred();
+	check();
+	_goodShown.stop();
+}
+
+Sibling::~Sibling() = default;
+
+Data::FullStoryId Sibling::shownId() const {
+	return _id;
+}
+
+bool Sibling::shows(const Data::StoriesList &list) const {
+	Expects(!list.items.empty());
+
+	return _id == Data::FullStoryId{ list.user, list.items.front().id };
+}
+
+QImage Sibling::image() const {
+	return _good.isNull() ? _blurred : _good;
+}
+
+void Sibling::check() {
+	Expects(_loader != nullptr);
+
+	auto good = _loader->good();
+	if (good.isNull()) {
+		return;
+	}
+	_loader = nullptr;
+	_good = std::move(good);
+	_goodShown.start([=] {
+		_controller->repaintSibling(this);
+	}, 0., 1., kGoodFadeDuration, anim::linear);
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.h b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
new file mode 100644
index 000000000..ad3b961d9
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.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 "data/data_stories.h"
+
+#include "ui/effects/animations.h"
+
+namespace Media::Stories {
+
+class Controller;
+
+class Sibling final {
+public:
+	Sibling(
+		not_null<Controller*> controller,
+		const Data::StoriesList &list);
+	~Sibling();
+
+	[[nodiscard]] Data::FullStoryId shownId() const;
+	[[nodiscard]] bool shows(const Data::StoriesList &list) const;
+
+	[[nodiscard]] QImage image() const;
+
+private:
+	class Loader;
+	class LoaderPhoto;
+	class LoaderVideo;
+
+	void check();
+
+	const not_null<Controller*> _controller;
+
+	Data::FullStoryId _id;
+	QImage _blurred;
+	QImage _good;
+	Ui::Animations::Simple _goodShown;
+
+	std::unique_ptr<Loader> _loader;
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
index 57f16ddd1..f4dc57956 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
@@ -136,7 +136,9 @@ void Slider::paint(QRectF clip) {
 				radius,
 				radius);
 		} else {
-			p.setOpacity(kOpacityInactive);
+			p.setOpacity((i < _data.index)
+				? kOpacityActive
+				: kOpacityInactive);
 			p.drawRoundedRect(_rects[i], radius, radius);
 		}
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index cfe82693c..19b4fddfe 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -21,8 +21,11 @@ View::View(not_null<Delegate*> delegate)
 
 View::~View() = default;
 
-void View::show(const Data::StoriesList &list, int index) {
-	_controller->show(list, index);
+void View::show(
+		const std::vector<Data::StoriesList> &lists,
+		int index,
+		int subindex) {
+	_controller->show(lists, index, subindex);
 }
 
 void View::ready() {
@@ -33,12 +36,23 @@ QRect View::contentGeometry() const {
 	return _controller->layout().content;
 }
 
+rpl::producer<QRect> View::contentGeometryValue() const {
+	return _controller->layoutValue(
+		) | rpl::map([=](const Layout &layout) {
+			return layout.content;
+		}) | rpl::distinct_until_changed();
+}
+
 void View::updatePlayback(const Player::TrackState &state) {
 	_controller->updateVideoPlayback(state);
 }
 
-bool View::jumpAvailable(int delta) const {
-	return _controller->jumpAvailable(delta);
+bool View::subjumpAvailable(int delta) const {
+	return _controller->subjumpAvailable(delta);
+}
+
+bool View::subjumpFor(int delta) const {
+	return _controller->subjumpFor(delta);
 }
 
 bool View::jumpFor(int delta) const {
@@ -53,4 +67,16 @@ void View::togglePaused(bool paused) {
 	_controller->togglePaused(paused);
 }
 
+SiblingView View::siblingLeft() const {
+	return _controller->siblingLeft();
+}
+
+SiblingView View::siblingRight() const {
+	return _controller->siblingRight();
+}
+
+rpl::lifetime &View::lifetime() {
+	return _controller->lifetime();
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 96f4e0042..f225d42ad 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -20,24 +20,45 @@ namespace Media::Stories {
 class Delegate;
 class Controller;
 
+struct SiblingView {
+	QImage image;
+	QRect geometry;
+
+	[[nodiscard]] bool valid() const {
+		return !image.isNull();
+	}
+	explicit operator bool() const {
+		return valid();
+	}
+};
+
 class View final {
 public:
 	explicit View(not_null<Delegate*> delegate);
 	~View();
 
-	void show(const Data::StoriesList &list, int index);
+	void show(
+		const std::vector<Data::StoriesList> &lists,
+		int index,
+		int subindex);
 	void ready();
 
 	[[nodiscard]] QRect contentGeometry() const;
+	[[nodiscard]] rpl::producer<QRect> contentGeometryValue() const;
+	[[nodiscard]] SiblingView siblingLeft() const;
+	[[nodiscard]] SiblingView siblingRight() const;
 
 	void updatePlayback(const Player::TrackState &state);
 
-	[[nodiscard]] bool jumpAvailable(int delta) const;
+	[[nodiscard]] bool subjumpAvailable(int delta) const;
+	[[nodiscard]] bool subjumpFor(int delta) const;
 	[[nodiscard]] bool jumpFor(int delta) const;
 
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
 
+	[[nodiscard]] rpl::lifetime &lifetime();
+
 private:
 	const std::unique_ptr<Controller> _controller;
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 19dd46778..3f3c9f595 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -406,10 +406,14 @@ pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOve
 speedSliderDividerSize: size(2px, 8px);
 
 storiesMaxSize: size(405px, 720px);
+storiesControlSize: 64px;
+storiesLeft: icon {{ "mediaview/stories_next-flip_horizontal", mediaviewControlFg }};
+storiesRight: icon {{ "mediaview/stories_next", mediaviewControlFg }};
 storiesSliderWidth: 2px;
-storiesSliderMargin: margins(8px, 7px, 8px, 11px);
+storiesSliderMargin: margins(8px, 7px, 8px, 6px);
 storiesSliderSkip: 4px;
-storiesHeaderMargin: margins(12px, 3px, 12px, 8px);
+storiesSliderOutsideSkip: 4px;
+storiesHeaderMargin: margins(12px, 4px, 12px, 8px);
 storiesHeaderPhoto: UserpicButton(defaultUserpicButton) {
 	size: size(28px, 28px);
 	photoSize: 28px;
@@ -422,7 +426,7 @@ storiesHeaderNamePosition: point(50px, 0px);
 storiesHeaderDate: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewControlFg;
 }
-storiesHeaderDatePosition: point(50px, 16px);
+storiesHeaderDatePosition: point(50px, 17px);
 storiesControlsMinWidth: 200px;
 storiesFieldMargin: margins(0px, 14px, 0px, 16px);
 storiesAttach: IconButton(defaultIconButton) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 1af0ea39b..2e037a46c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -112,6 +112,11 @@ OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 		_captionImage.invalidate();
 		invalidateControls();
 	}, _lifetime);
+
+	_owner->_storiesChanged.events(
+	) | rpl::start_with_next([=] {
+		invalidateControls();
+	}, _lifetime);
 }
 
 void OverlayWidget::RendererGL::init(
@@ -568,7 +573,8 @@ void OverlayWidget::RendererGL::paintControl(
 		QRect inner,
 		float64 innerOpacity,
 		const style::icon &icon) {
-	const auto meta = ControlMeta(control);
+	const auto stories = (_owner->_stories != nullptr);
+	const auto meta = ControlMeta(control, stories);
 	Assert(meta.icon == &icon);
 
 	const auto overAlpha = overOpacity * kOverBackgroundOpacity;
@@ -626,11 +632,17 @@ void OverlayWidget::RendererGL::paintControl(
 	FillTexturedRectangle(*_f, &*_controlsProgram, fgOffset);
 }
 
-auto OverlayWidget::RendererGL::ControlMeta(OverState control)
+auto OverlayWidget::RendererGL::ControlMeta(OverState control, bool stories)
 -> Control {
 	switch (control) {
-	case OverLeftNav: return { 0, &st::mediaviewLeft };
-	case OverRightNav: return { 1, &st::mediaviewRight };
+	case OverLeftNav: return {
+		0,
+		stories ? &st::storiesLeft : &st::mediaviewLeft
+	};
+	case OverRightNav: return {
+		1,
+		stories ? &st::storiesRight : &st::mediaviewRight
+	};
 	case OverSave: return { 2, &st::mediaviewSave };
 	case OverRotate: return { 3, &st::mediaviewRotate };
 	case OverMore: return { 4, &st::mediaviewMore };
@@ -642,12 +654,13 @@ void OverlayWidget::RendererGL::validateControls() {
 	if (!_controlsImage.image().isNull()) {
 		return;
 	}
+	const auto stories = (_owner->_stories != nullptr);
 	const auto metas = {
-		ControlMeta(OverLeftNav),
-		ControlMeta(OverRightNav),
-		ControlMeta(OverSave),
-		ControlMeta(OverRotate),
-		ControlMeta(OverMore),
+		ControlMeta(OverLeftNav, stories),
+		ControlMeta(OverRightNav, stories),
+		ControlMeta(OverSave, stories),
+		ControlMeta(OverRotate, stories),
+		ControlMeta(OverMore, stories),
 	};
 	auto maxWidth = 0;
 	auto fullHeight = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index effab47ad..88d66e2d4 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -134,7 +134,9 @@ private:
 	Ui::GL::Image _controlsImage;
 
 	static constexpr auto kControlsCount = 5;
-	[[nodiscard]] static Control ControlMeta(OverState control);
+	[[nodiscard]] static Control ControlMeta(
+		OverState control,
+		bool stories);
 
 	// Last one is for the over circle image.
 	std::array<QRect, kControlsCount + 1> _controlsTextures;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 13615c184..1514a7527 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -813,16 +813,7 @@ void OverlayWidget::updateGeometryToScreen(bool inMove) {
 }
 
 void OverlayWidget::updateControlsGeometry() {
-	const auto overRect = QRect(
-		QPoint(),
-		QSize(st::mediaviewIconOver, st::mediaviewIconOver));
-	const auto navSkip = st::mediaviewHeaderTop;
-	_leftNav = QRect(0, navSkip, st::mediaviewControlSize, height() - 2 * navSkip);
-	_leftNavOver = style::centerrect(_leftNav, overRect);
-	_leftNavIcon = style::centerrect(_leftNav, st::mediaviewLeft);
-	_rightNav = QRect(width() - st::mediaviewControlSize, navSkip, st::mediaviewControlSize, height() - 2 * navSkip);
-	_rightNavOver = style::centerrect(_rightNav, overRect);
-	_rightNavIcon = style::centerrect(_rightNav, st::mediaviewRight);
+	updateNavigationControlsGeometry();
 
 	_saveMsg.moveTo((width() - _saveMsg.width()) / 2, (height() - _saveMsg.height()) / 2);
 	_photoRadialRect = QRect(QPoint((width() - st::radialSize.width()) / 2, (height() - st::radialSize.height()) / 2), st::radialSize);
@@ -843,6 +834,32 @@ void OverlayWidget::updateControlsGeometry() {
 	update();
 }
 
+void OverlayWidget::updateNavigationControlsGeometry() {
+	const auto overRect = QRect(
+		QPoint(),
+		QSize(st::mediaviewIconOver, st::mediaviewIconOver));
+	const auto navSize = _stories
+		? st::storiesControlSize
+		: st::mediaviewControlSize;
+	const auto navSkip = st::mediaviewHeaderTop;
+	const auto xLeft = _stories ? (_x - navSize) : 0;
+	const auto xRight = _stories ? (_x + _w) : (width() - navSize);
+	_leftNav = QRect(xLeft, navSkip, navSize, height() - 2 * navSkip);
+	_leftNavOver = _stories
+		? QRect()
+		: style::centerrect(_leftNav, overRect);
+	_leftNavIcon = style::centerrect(
+		_leftNav,
+		_stories ? st::storiesLeft : st::mediaviewLeft);
+	_rightNav = QRect(xRight, navSkip, navSize, height() - 2 * navSkip);
+	_rightNavOver = _stories
+		? QRect()
+		: style::centerrect(_rightNav, overRect);
+	_rightNavIcon = style::centerrect(
+		_rightNav,
+		_stories ? st::storiesRight : st::mediaviewRight);
+}
+
 bool OverlayWidget::topShadowOnTheRight() const {
 	return _topShadowRight.current();
 }
@@ -1009,8 +1026,8 @@ void OverlayWidget::updateDocSize() {
 
 void OverlayWidget::refreshNavVisibility() {
 	if (_stories) {
-		_leftNavVisible = _stories->jumpAvailable(-1);
-		_rightNavVisible = _stories->jumpAvailable(1);
+		_leftNavVisible = _stories->subjumpAvailable(-1);
+		_rightNavVisible = _stories->subjumpAvailable(1);
 	} else if (_sharedMediaData) {
 		_leftNavVisible = _index && (*_index > 0);
 		_rightNavVisible = _index && (*_index + 1 < _sharedMediaData->size());
@@ -1432,6 +1449,12 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) {
 		+ (_over == OverSave ? _saveNavOver : _saveNavIcon)
 		+ (_over == OverRotate ? _rotateNavOver : _rotateNavIcon)
 		+ (_over == OverMore ? _moreNavOver : _moreNavIcon)
+		+ ((_stories && _over == OverLeftStories)
+			? _stories->siblingLeft().geometry
+			: QRect())
+		+ ((_stories && _over == OverRightStories)
+			? _stories->siblingRight().geometry
+			: QRect())
 		+ _headerNav
 		+ _nameNav
 		+ _dateNav
@@ -1547,6 +1570,7 @@ void OverlayWidget::resizeContentByScreenSize() {
 		_y = content.y();
 		_w = content.width();
 		_h = content.height();
+		updateNavigationControlsGeometry();
 		return;
 	}
 	recountSkipTop();
@@ -3861,14 +3885,16 @@ std::shared_ptr<ChatHelpers::Show> OverlayWidget::storiesShow() {
 			return _widget->_body;
 		}
 		bool valid() const override {
-			return _widget->_storiesUser != nullptr;
+			return _widget->_storiesSession != nullptr;
 		}
 		operator bool() const override {
 			return valid();
 		}
 
 		Main::Session &session() const override {
-			return _widget->_storiesUser->session();
+			Expects(_widget->_storiesSession != nullptr);
+
+			return *_widget->_storiesSession;
 		}
 		bool paused(ChatHelpers::PauseReason reason) const override {
 			if (_widget->isHidden()
@@ -3976,6 +4002,10 @@ void OverlayWidget::storiesTogglePaused(bool paused) {
 	}
 }
 
+void OverlayWidget::storiesRepaint() {
+	update();
+}
+
 void OverlayWidget::playbackToggleFullScreen() {
 	Expects(_streamed != nullptr);
 
@@ -4131,6 +4161,22 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 				fillTransparentBackground);
 		}
 		paintRadialLoading(renderer);
+		if (_stories) {
+			if (const auto left = _stories->siblingLeft()) {
+				renderer->paintTransformedStaticContent(
+					left.image,
+					{ .rect = left.geometry },
+					false, // semi-transparent
+					false); // fill transparent background
+			}
+			if (const auto right = _stories->siblingRight()) {
+				renderer->paintTransformedStaticContent(
+					right.image,
+					{ .rect = right.geometry },
+					false, // semi-transparent
+					false); // fill transparent background
+			}
+		}
 	} else {
 		if (_themePreviewShown) {
 			renderer->paintThemePreview(_themePreviewRect);
@@ -4420,14 +4466,14 @@ void OverlayWidget::paintControls(
 			_leftNavVisible,
 			_leftNavOver,
 			_leftNavIcon,
-			st::mediaviewLeft,
+			_stories ? st::storiesLeft : st::mediaviewLeft,
 			true },
 		{
 			OverRightNav,
 			_rightNavVisible,
 			_rightNavOver,
 			_rightNavIcon,
-			st::mediaviewRight,
+			_stories ? st::storiesRight : st::mediaviewRight,
 			true },
 		{
 			OverSave,
@@ -4470,6 +4516,10 @@ void OverlayWidget::paintControls(
 float64 OverlayWidget::controlOpacity(
 		float64 progress,
 		bool nonbright) const {
+	if (nonbright && _stories) {
+		return progress * kStoriesNavOverOpacity
+			+ (1. - progress) * kStoriesNavOpacity;
+	}
 	const auto normal = _windowed
 		? kNormalIconOpacity
 		: kMaximizedIconOpacity;
@@ -4813,15 +4863,13 @@ void OverlayWidget::setContext(
 		_history = _message->history();
 		_peer = _history->peer;
 		_topicRootId = _peer->isForum() ? item->topicRootId : MsgId();
-		_stories = nullptr;
-		_storiesUser = nullptr;
+		setStoriesUser(nullptr);
 	} else if (const auto peer = std::get_if<not_null<PeerData*>>(&context)) {
 		_peer = *peer;
 		_history = _peer->owner().history(_peer);
 		_message = nullptr;
 		_topicRootId = MsgId();
-		_stories = nullptr;
-		_storiesUser = nullptr;
+		setStoriesUser(nullptr);
 	} else if (const auto story = std::get_if<StoriesContext>(&context)) {
 		_message = nullptr;
 		_topicRootId = MsgId();
@@ -4837,18 +4885,14 @@ void OverlayWidget::setContext(
 			i->items,
 			story->id,
 			&Data::StoryItem::id);
-		_storiesUser = story->user;
-		if (!_stories) {
-			_stories = std::make_unique<Stories::View>(
-				static_cast<Stories::Delegate*>(this));
-		}
-		_stories->show(*i, j - begin(i->items));
+		setStoriesUser(story->user);
+		_stories->show(all, (i - begin(all)), j - begin(i->items));
 	} else {
 		_message = nullptr;
 		_topicRootId = MsgId();
 		_history = nullptr;
 		_peer = nullptr;
-		_stories = nullptr;
+		setStoriesUser(nullptr);
 	}
 	_migrated = nullptr;
 	if (_history) {
@@ -4863,6 +4907,27 @@ void OverlayWidget::setContext(
 	_user = _peer ? _peer->asUser() : nullptr;
 }
 
+void OverlayWidget::setStoriesUser(UserData *user) {
+	const auto session = user ? &user->session() : nullptr;
+	if (!session && !_storiesSession) {
+		Assert(!_stories);
+	} else if (!user) {
+		_stories = nullptr;
+		_storiesSession = nullptr;
+		_storiesChanged.fire({});
+	} else if (_storiesSession != session) {
+		_stories = nullptr;
+		_storiesSession = session;
+		const auto delegate = static_cast<Stories::Delegate*>(this);
+		_stories = std::make_unique<Stories::View>(delegate);
+		_stories->contentGeometryValue(
+		) | rpl::skip(1) | rpl::start_with_next([=] {
+			updateControlsGeometry();
+		}, _stories->lifetime());
+		_storiesChanged.fire({});
+	}
+}
+
 void OverlayWidget::setSession(not_null<Main::Session*> session) {
 	if (_session == session) {
 		return;
@@ -4908,7 +4973,7 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 
 bool OverlayWidget::moveToNext(int delta) {
 	if (_stories) {
-		return _stories->jumpFor(delta);
+		return _stories->subjumpFor(delta);
 	} else if (!_index) {
 		return false;
 	}
@@ -4991,9 +5056,14 @@ void OverlayWidget::handleMousePress(
 	if (button == Qt::LeftButton) {
 		_down = OverNone;
 		if (!ClickHandler::getPressed()) {
-			if (_over == OverLeftNav && moveToNext(-1)) {
-				_lastAction = position;
-			} else if (_over == OverRightNav && moveToNext(1)) {
+			if ((_over == OverLeftNav && moveToNext(-1))
+				|| (_over == OverRightNav && moveToNext(1))
+				|| (_stories
+					&& _over == OverLeftStories
+					&& _stories->jumpFor(-1))
+				|| (_stories
+					&& _over == OverRightStories
+					&& _stories->jumpFor(1))) {
 				_lastAction = position;
 			} else if (_over == OverName
 				|| _over == OverDate
@@ -5082,8 +5152,18 @@ void OverlayWidget::handleMouseMove(QPoint position) {
 
 void OverlayWidget::updateOverRect(OverState state) {
 	switch (state) {
-	case OverLeftNav: update(_leftNavOver); break;
-	case OverRightNav: update(_rightNavOver); break;
+	case OverLeftNav:
+		update(_stories ? _leftNavIcon : _leftNavOver);
+		break;
+	case OverRightNav:
+		update(_stories ? _rightNavIcon : _rightNavOver);
+		break;
+	case OverLeftStories:
+		update(_stories ? _stories->siblingLeft().geometry : QRect());
+		break;
+	case OverRightStories:
+		update(_stories ? _stories->siblingRight().geometry : QRect());
+		break;
 	case OverName: update(_nameNav); break;
 	case OverDate: update(_dateNav); break;
 	case OverSave: update(_saveNavOver); break;
@@ -5170,6 +5250,10 @@ void OverlayWidget::updateOver(QPoint pos) {
 		updateOverState(OverVideo);
 	} else if (_leftNavVisible && _leftNav.contains(pos)) {
 		updateOverState(OverLeftNav);
+	} else if (_stories && _stories->siblingLeft().geometry.contains(pos)) {
+		updateOverState(OverLeftStories);
+	} else if (_stories && _stories->siblingRight().geometry.contains(pos)) {
+		updateOverState(OverRightStories);
 	} else if (_rightNavVisible && _rightNav.contains(pos)) {
 		updateOverState(OverRightNav);
 	} else if (!_stories && _from && _nameNav.contains(pos)) {
@@ -5527,6 +5611,7 @@ void OverlayWidget::clearBeforeHide() {
 	_collage = nullptr;
 	_collageData = std::nullopt;
 	clearStreaming();
+	setStoriesUser(nullptr);
 	assignMediaPointer(nullptr);
 	_preloadPhotos.clear();
 	_preloadDocuments.clear();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index ad7506ee1..e0bed4d14 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -137,6 +137,8 @@ private:
 		OverNone,
 		OverLeftNav,
 		OverRightNav,
+		OverLeftStories,
+		OverRightStories,
 		OverHeader,
 		OverName,
 		OverDate,
@@ -231,6 +233,7 @@ private:
 	void storiesJumpTo(Data::FullStoryId id) override;
 	bool storiesPaused() override;
 	void storiesTogglePaused(bool paused) override;
+	void storiesRepaint() override;
 
 	void hideControls(bool force = false);
 	void subscribeToScreenGeometry();
@@ -292,6 +295,7 @@ private:
 		ItemContext,
 		not_null<PeerData*>,
 		StoriesContext> context);
+	void setStoriesUser(UserData *user);
 
 	void refreshLang();
 	void showSaveMsgFile();
@@ -332,6 +336,7 @@ private:
 	void updateDocSize();
 	void updateControls();
 	void updateControlsGeometry();
+	void updateNavigationControlsGeometry();
 
 	using MenuCallback = Fn<void(
 		const QString &,
@@ -572,7 +577,8 @@ private:
 	bool _showAsPip = false;
 
 	std::unique_ptr<Stories::View> _stories;
-	UserData *_storiesUser = nullptr;
+	rpl::event_stream<> _storiesChanged;
+	Main::Session *_storiesSession = nullptr;
 	rpl::event_stream<ChatHelpers::FileChosen> _storiesStickerOrEmojiChosen;
 	std::unique_ptr<Ui::LayerManager> _layerBg;
 
diff --git a/Telegram/SourceFiles/platform/platform_overlay_widget.h b/Telegram/SourceFiles/platform/platform_overlay_widget.h
index 2bc2eea33..97b6ef7ef 100644
--- a/Telegram/SourceFiles/platform/platform_overlay_widget.h
+++ b/Telegram/SourceFiles/platform/platform_overlay_widget.h
@@ -20,6 +20,8 @@ namespace Media::View {
 inline constexpr auto kMaximizedIconOpacity = 0.6;
 inline constexpr auto kNormalIconOpacity = 0.9;
 inline constexpr auto kOverBackgroundOpacity = 0.2775;
+inline constexpr auto kStoriesNavOpacity = 0.3;
+inline constexpr auto kStoriesNavOverOpacity = 0.7;
 [[nodiscard]] QColor OverBackgroundColor();
 
 } // namespace Media::View

From 2bc7f465c22e3c8ea8b5f1a69000a83f3390e5f8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 May 2023 19:34:04 +0400
Subject: [PATCH 233/676] Hide "Close friends" in privacy edit by default.

---
 Telegram/SourceFiles/boxes/edit_privacy_box.cpp | 4 ++++
 Telegram/SourceFiles/boxes/edit_privacy_box.h   | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index b30ecfb0c..51be4cd11 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -112,6 +112,10 @@ std::unique_ptr<PrivacyExceptionsBoxController::Row> PrivacyExceptionsBoxControl
 
 } // namespace
 
+bool EditPrivacyController::hasOption(Option option) const {
+	return (option != Option::CloseFriends);
+}
+
 QString EditPrivacyController::optionLabel(Option option) const {
 	switch (option) {
 	case Option::Everyone: return tr::lng_edit_privacy_everyone(tr::now);
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h
index 6a78c41ae..d9ba7dab9 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.h
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h
@@ -41,9 +41,7 @@ public:
 	[[nodiscard]] virtual Key key() const = 0;
 
 	[[nodiscard]] virtual rpl::producer<QString> title() const = 0;
-	[[nodiscard]] virtual bool hasOption(Option option) const {
-		return true;
-	}
+	[[nodiscard]] virtual bool hasOption(Option option) const;
 	[[nodiscard]] virtual rpl::producer<QString> optionsTitleKey() const = 0;
 	[[nodiscard]] virtual QString optionLabel(Option option) const;
 	[[nodiscard]] virtual rpl::producer<TextWithEntities> warning() const {

From 2212b55b1377a5b40214bf5090d829787fa5a97b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 May 2023 19:37:40 +0400
Subject: [PATCH 234/676] Allow downloading my own stories.

---
 .../SourceFiles/media/stories/media_stories_controller.cpp   | 5 +++++
 .../SourceFiles/media/stories/media_stories_controller.h     | 2 ++
 Telegram/SourceFiles/media/stories/media_stories_view.cpp    | 4 ++++
 Telegram/SourceFiles/media/stories/media_stories_view.h      | 1 +
 .../SourceFiles/media/view/media_view_overlay_widget.cpp     | 3 ++-
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index c653ffb7f..29d4f07c0 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
 #include "data/data_stories.h"
+#include "data/data_user.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
 #include "media/stories/media_stories_sibling.h"
@@ -381,6 +382,10 @@ void Controller::togglePaused(bool paused) {
 	}
 }
 
+bool Controller::canDownload() const {
+	return _list && _list->user->isSelf();
+}
+
 void Controller::repaintSibling(not_null<Sibling*> sibling) {
 	if (sibling == _siblingLeft.get() || sibling == _siblingRight.get()) {
 		_delegate->storiesRepaint();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index dc80c4667..3bfadaa88 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -86,6 +86,8 @@ public:
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
 
+	[[nodiscard]] bool canDownload() const;
+
 	void repaintSibling(not_null<Sibling*> sibling);
 	[[nodiscard]] SiblingView siblingLeft() const;
 	[[nodiscard]] SiblingView siblingRight() const;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 19b4fddfe..37454aa75 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -32,6 +32,10 @@ void View::ready() {
 	_controller->ready();
 }
 
+bool View::canDownload() const {
+	return _controller->canDownload();
+}
+
 QRect View::contentGeometry() const {
 	return _controller->layout().content;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index f225d42ad..e2399c483 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -43,6 +43,7 @@ public:
 		int subindex);
 	void ready();
 
+	[[nodiscard]] bool canDownload() const;
 	[[nodiscard]] QRect contentGeometry() const;
 	[[nodiscard]] rpl::producer<QRect> contentGeometryValue() const;
 	[[nodiscard]] SiblingView siblingLeft() const;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1514a7527..ab14487a5 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1044,7 +1044,8 @@ void OverlayWidget::refreshNavVisibility() {
 }
 
 bool OverlayWidget::contentCanBeSaved() const {
-	if (_stories || hasCopyMediaRestriction()) {
+	if ((_stories && !_stories->canDownload())
+		|| hasCopyMediaRestriction()) {
 		return false;
 	} else if (_photo) {
 		return _photo->hasVideo() || _photoMedia->loaded();

From 0ca40e9d34228992a981c957ca971fc0ba64a5a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 May 2023 21:40:06 +0400
Subject: [PATCH 235/676] Fix build with Xcode.

---
 Telegram/SourceFiles/data/data_stories.cpp                    | 2 +-
 Telegram/SourceFiles/media/stories/media_stories_controller.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index e7274fb04..827ec2e18 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -108,7 +108,7 @@ std::optional<StoryItem> Stories::parse(const MTPDstoryItem &data) {
 	const auto date = data.vdate().v;
 	return StoryItem{
 		.id = data.vid().v,
-		.media = *media,
+		.media = { *media },
 		.caption = std::move(caption),
 		.date = date,
 		.privacy = privacy,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 3bfadaa88..762554a43 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -55,7 +55,6 @@ struct Layout {
 	QRect siblingLeft;
 	QRect siblingRight;
 
-	friend inline auto operator<=>(Layout, Layout) = default;
 	friend inline bool operator==(Layout, Layout) = default;
 };
 

From bab66c4ff66562c88e90218df1fab127f47602d9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 10 May 2023 14:33:17 +0400
Subject: [PATCH 236/676] Darken and pause on reply field focus.

---
 .../history_view_compose_controls.cpp         | 14 ++++++++-
 .../controls/history_view_compose_controls.h  |  2 ++
 .../stories/media_stories_controller.cpp      | 23 ++++++++++++++
 .../media/stories/media_stories_controller.h  |  7 +++++
 .../media/stories/media_stories_reply.cpp     |  6 +++-
 .../media/stories/media_stories_reply.h       |  2 ++
 .../media/stories/media_stories_view.cpp      |  4 +++
 .../media/stories/media_stories_view.h        |  1 +
 .../media/view/media_view_overlay_opengl.cpp  | 31 ++++++++++++-------
 .../media/view/media_view_overlay_opengl.h    |  4 ++-
 .../media/view/media_view_overlay_widget.cpp  |  5 +--
 .../media/view/media_view_overlay_widget.h    |  1 +
 12 files changed, 83 insertions(+), 17 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 6c0f635e8..a4edc44cd 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1108,6 +1108,11 @@ bool ComposeControls::focus() {
 	return true;
 }
 
+rpl::producer<bool> ComposeControls::focusedValue() const {
+	return rpl::single(Ui::InFocusChain(_wrap.get()))
+		| rpl::then(_focusChanges.events());
+}
+
 rpl::producer<> ComposeControls::cancelRequests() const {
 	return _cancelRequests.events();
 }
@@ -1596,6 +1601,8 @@ void ComposeControls::initKeyHandler() {
 				});
 				return Result::Cancel;
 			}
+		} else if (k->key() == Qt::Key_Escape) {
+			return Result::Cancel;
 		}
 		return Result::Continue;
 	});
@@ -1608,7 +1615,12 @@ void ComposeControls::initField() {
 	Ui::Connect(_field, &Ui::InputField::cancelled, [=] { escape(); });
 	Ui::Connect(_field, &Ui::InputField::tabbed, [=] { fieldTabbed(); });
 	Ui::Connect(_field, &Ui::InputField::resized, [=] { updateHeight(); });
-	//Ui::Connect(_field, &Ui::InputField::focused, [=] { fieldFocused(); });
+	Ui::Connect(_field, &Ui::InputField::focused, [=] {
+		_focusChanges.fire(true);
+	});
+	Ui::Connect(_field, &Ui::InputField::blurred, [=] {
+		_focusChanges.fire(false);
+	});
 	Ui::Connect(_field, &Ui::InputField::changed, [=] { fieldChanged(); });
 	InitMessageField(_show, _field, [=](not_null<DocumentData*> emoji) {
 		if (_history && Data::AllowEmojiWithoutPremium(_history->peer)) {
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 2f5b12491..16a114ec8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -136,6 +136,7 @@ public:
 	[[nodiscard]] int heightCurrent() const;
 
 	bool focus();
+	[[nodiscard]] rpl::producer<bool> focusedValue() const;
 	[[nodiscard]] rpl::producer<> cancelRequests() const;
 	[[nodiscard]] rpl::producer<Api::SendOptions> sendRequests() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
@@ -390,6 +391,7 @@ private:
 	std::unique_ptr<WebpageProcessor> _preview;
 
 	Fn<void()> _raiseEmojiSuggestions;
+	rpl::event_stream<bool> _focusChanges;
 
 	rpl::lifetime _historyLifetime;
 	rpl::lifetime _uploaderSubscriptions;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 29d4f07c0..344b41738 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -29,6 +29,7 @@ namespace {
 constexpr auto kPhotoProgressInterval = crl::time(100);
 constexpr auto kPhotoDuration = 5 * crl::time(1000);
 constexpr auto kSiblingMultiplier = 0.448;
+constexpr auto kFullContentFade = 0.2;
 
 } // namespace
 
@@ -108,6 +109,19 @@ Controller::Controller(not_null<Delegate*> delegate)
 , _slider(std::make_unique<Slider>(this))
 , _replyArea(std::make_unique<ReplyArea>(this)) {
 	initLayout();
+
+	_replyArea->focusedValue(
+	) | rpl::start_with_next([=](bool focused) {
+		_contentFaded = focused;
+		_contentFadeAnimation.start(
+			[=] { _delegate->storiesRepaint(); },
+			focused ? 0. : 1.,
+			focused ? 1. : 0.,
+			st::fadeWrapDuration);
+		togglePaused(focused);
+	}, _lifetime);
+
+	_contentFadeAnimation.stop();
 }
 
 Controller::~Controller() = default;
@@ -223,6 +237,11 @@ rpl::producer<Layout> Controller::layoutValue() const {
 	return _layout.value() | rpl::filter_optional();
 }
 
+float64 Controller::contentFade() const {
+	return _contentFadeAnimation.value(_contentFaded ? 1. : 0.)
+		* kFullContentFade;
+}
+
 std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
 	return _delegate->storiesShow();
 }
@@ -406,6 +425,10 @@ SiblingView Controller::siblingRight() const {
 	return {};
 }
 
+void Controller::unfocusReply() {
+	_wrap->setFocus();
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 762554a43..9e3791442 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_stories.h"
+#include "ui/effects/animations.h"
 
 namespace base {
 class PowerSaveBlocker;
@@ -66,6 +67,7 @@ public:
 	[[nodiscard]] not_null<Ui::RpWidget*> wrap() const;
 	[[nodiscard]] Layout layout() const;
 	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
+	[[nodiscard]] float64 contentFade() const;
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 	[[nodiscard]] auto stickerOrEmojiChosen() const
@@ -91,6 +93,8 @@ public:
 	[[nodiscard]] SiblingView siblingLeft() const;
 	[[nodiscard]] SiblingView siblingRight() const;
 
+	void unfocusReply();
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
@@ -118,6 +122,9 @@ private:
 	const std::unique_ptr<ReplyArea> _replyArea;
 	std::unique_ptr<PhotoPlayback> _photoPlayback;
 
+	Ui::Animations::Simple _contentFadeAnimation;
+	bool _contentFaded = false;
+
 	Data::FullStoryId _shown;
 	std::optional<Data::StoriesList> _list;
 	int _index = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index e4a24807c..000635db6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -68,7 +68,7 @@ void ReplyArea::chooseAttach(std::optional<bool> overrideCompress) {
 void ReplyArea::initActions() {
 	_controls->cancelRequests(
 	) | rpl::start_with_next([=] {
-		// #TODO stories
+		_controller->unfocusReply();
 	}, _lifetime);
 
 	_controls->sendRequests(
@@ -157,6 +157,10 @@ void ReplyArea::show(ReplyAreaData data) {
 	_controls->clear();
 }
 
+rpl::producer<bool> ReplyArea::focusedValue() const {
+	return _controls->focusedValue();
+}
+
 void ReplyArea::showPremiumToast(not_null<DocumentData*> emoji) {
 	// #TODO stories
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 571c9c88c..9587e2e07 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -40,6 +40,8 @@ public:
 
 	void show(ReplyAreaData data);
 
+	[[nodiscard]] rpl::producer<bool> focusedValue() const;
+
 private:
 	using VoiceToSend = HistoryView::Controls::VoiceToSend;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 37454aa75..dbcf9cdf4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -47,6 +47,10 @@ rpl::producer<QRect> View::contentGeometryValue() const {
 		}) | rpl::distinct_until_changed();
 }
 
+float64 View::contentFade() const {
+	return _controller->contentFade();
+}
+
 void View::updatePlayback(const Player::TrackState &state) {
 	_controller->updateVideoPlayback(state);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index e2399c483..a11f49436 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -46,6 +46,7 @@ public:
 	[[nodiscard]] bool canDownload() const;
 	[[nodiscard]] QRect contentGeometry() const;
 	[[nodiscard]] rpl::producer<QRect> contentGeometryValue() const;
+	[[nodiscard]] float64 contentFade() const;
 	[[nodiscard]] SiblingView siblingLeft() const;
 	[[nodiscard]] SiblingView siblingRight() const;
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 2e037a46c..4756c6531 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -35,12 +35,13 @@ constexpr auto kControlValues = 4 * 4 + 4 * 4; // over + icon
 		.header = R"(
 uniform sampler2D f_texture;
 uniform vec4 shadowTopRect;
-uniform vec2 shadowBottomAndOpacity;
+uniform vec3 shadowBottomOpacityFullFade;
 )",
 		.body = R"(
 	float topHeight = shadowTopRect.w;
-	float bottomHeight = shadowBottomAndOpacity.x;
-	float opacity = shadowBottomAndOpacity.y;
+	float bottomHeight = shadowBottomOpacityFullFade.x;
+	float opacity = shadowBottomOpacityFullFade.y;
+	float fullFade = shadowBottomOpacityFullFade.z;
 	float viewportHeight = shadowTopRect.y + topHeight;
 	float fullHeight = topHeight + bottomHeight;
 	float topY = min(
@@ -50,7 +51,8 @@ uniform vec2 shadowBottomAndOpacity;
 	vec4 fadeTop = texture2D(f_texture, vec2(topX, topY)) * opacity;
 	float bottomY = max(fullHeight - gl_FragCoord.y, topHeight) / fullHeight;
 	vec4 fadeBottom = texture2D(f_texture, vec2(0.5, bottomY)) * opacity;
-	result.rgb = result.rgb * (1. - fadeTop.a) * (1. - fadeBottom.a);
+	float fade = min((1. - fadeTop.a) * (1. - fadeBottom.a), fullFade);
+	result.rgb = result.rgb * fade;
 )",
 	};
 }
@@ -113,10 +115,12 @@ OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 		invalidateControls();
 	}, _lifetime);
 
-	_owner->_storiesChanged.events(
-	) | rpl::start_with_next([=] {
-		invalidateControls();
-	}, _lifetime);
+	crl::on_main(this, [=] {
+		_owner->_storiesChanged.events(
+		) | rpl::start_with_next([=] {
+			invalidateControls();
+		}, _lifetime);
+	});
 }
 
 void OverlayWidget::RendererGL::init(
@@ -478,14 +482,17 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 
 	program->setUniformValue("viewport", _uniformViewport);
 	const auto &top = st::mediaviewShadowTop.size();
-	const auto point = QPoint(_shadowTopFlip ? 0 : (_viewport.width() - top.width()), 0);
+	const auto point = QPoint(
+		_shadowTopFlip ? 0 : (_viewport.width() - top.width()),
+		0);
 	program->setUniformValue(
 		"shadowTopRect",
 		Uniform(transformRect(QRect(point, top))));
 	const auto &bottom = st::mediaviewShadowBottom;
-	program->setUniformValue(
-		"shadowBottomAndOpacity",
-		QVector2D(bottom.height() * _factor, geometry.controlsOpacity));
+	program->setUniformValue("shadowBottomOpacityFullFade", QVector3D(
+		bottom.height() * _factor,
+		geometry.controlsOpacity,
+		1.f - float(geometry.fade)));
 
 	FillTexturedRectangle(*_f, &*program);
 }
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index 88d66e2d4..a171752de 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -15,7 +15,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Media::View {
 
-class OverlayWidget::RendererGL final : public OverlayWidget::Renderer {
+class OverlayWidget::RendererGL final
+	: public OverlayWidget::Renderer
+	, public base::has_weak_ptr {
 public:
 	explicit RendererGL(not_null<OverlayWidget*> owner);
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index ab14487a5..8c404e65d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1492,6 +1492,7 @@ QRect OverlayWidget::finalContentRect() const {
 }
 
 OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
+	const auto fade = _stories ? _stories->contentFade() : 0.;
 	const auto controlsOpacity = _controlsOpacity.current();
 	const auto toRotation = qreal(finalContentRotation());
 	const auto toRectRotated = QRectF(finalContentRect());
@@ -1504,7 +1505,7 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 			toRectRotated.width())
 		: toRectRotated;
 	if (!_geometryAnimation.animating()) {
-		return { toRect, toRotation, controlsOpacity };
+		return { toRect, toRotation, controlsOpacity, fade };
 	}
 	const auto fromRect = _oldGeometry.rect;
 	const auto fromRotation = _oldGeometry.rotation;
@@ -1527,7 +1528,7 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 		fromRect.width() + (toRect.width() - fromRect.width()) * progress,
 		fromRect.height() + (toRect.height() - fromRect.height()) * progress
 	);
-	return { useRect, useRotation, controlsOpacity };
+	return { useRect, useRotation, controlsOpacity, fade };
 }
 
 void OverlayWidget::updateContentRect() {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index e0bed4d14..61b240659 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -165,6 +165,7 @@ private:
 		QRectF rect;
 		qreal rotation = 0.;
 		qreal controlsOpacity = 0.;
+		qreal fade = 0.;
 	};
 	struct StartStreaming {
 		StartStreaming() : continueStreaming(false), startTime(0) {

From a0e9e148b0cedbb56eb476685155f2b1eb39b360 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 10 May 2023 23:32:32 +0400
Subject: [PATCH 237/676] Apply rounding to stories.

---
 .../SourceFiles/media/view/media_view.style   |  1 +
 .../media/view/media_view_overlay_opengl.cpp  | 35 +++++++++++++------
 .../media/view/media_view_overlay_opengl.h    |  3 +-
 .../media/view/media_view_overlay_widget.cpp  | 10 +++---
 .../media/view/media_view_overlay_widget.h    |  1 +
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 3f3c9f595..5e7a30bb8 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -406,6 +406,7 @@ pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOve
 speedSliderDividerSize: size(2px, 8px);
 
 storiesMaxSize: size(405px, 720px);
+storiesRadius: 8px;
 storiesControlSize: 64px;
 storiesLeft: icon {{ "mediaview/stories_next-flip_horizontal", mediaviewControlFg }};
 storiesRight: icon {{ "mediaview/stories_next", mediaviewControlFg }};
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 4756c6531..0ea2f2ee6 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -94,7 +94,7 @@ float roundedCorner() {
 }
 )",
 		.body = R"(
-	result = vec4(roundedCorner());
+	result *= roundedCorner();
 )",
 	};
 }
@@ -160,7 +160,8 @@ void OverlayWidget::RendererGL::init(
 		_texturedVertexShader,
 		FragmentShader({
 			FragmentSampleARGB32Texture(),
-			FragmentApplyControlsFade()
+			FragmentApplyControlsFade(),
+			FragmentRoundedCorners()
 		}));
 
 	_withTransparencyProgram.emplace();
@@ -179,7 +180,8 @@ void OverlayWidget::RendererGL::init(
 		_texturedVertexShader,
 		FragmentShader({
 			FragmentSampleYUV420Texture(),
-			FragmentApplyControlsFade()
+			FragmentApplyControlsFade(),
+			FragmentRoundedCorners()
 		}));
 
 	_nv12Program.emplace();
@@ -188,7 +190,8 @@ void OverlayWidget::RendererGL::init(
 		_texturedVertexShader,
 		FragmentShader({
 			FragmentSampleNV12Texture(),
-			FragmentApplyControlsFade()
+			FragmentApplyControlsFade(),
+			FragmentRoundedCorners()
 		}));
 
 	_fillProgram.emplace();
@@ -210,7 +213,10 @@ void OverlayWidget::RendererGL::init(
 	LinkProgram(
 		&*_roundedCornersProgram,
 		VertexShader({ VertexViewportTransform() }),
-		FragmentShader({ FragmentRoundedCorners() }));
+		FragmentShader({
+			{ .body = "result = vec4(1.);" },
+			FragmentRoundedCorners(),
+		}));
 
 	const auto renderer = reinterpret_cast<const char*>(
 		f.glGetString(GL_RENDERER));
@@ -369,8 +375,8 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 	}
 	program->setUniformValue("f_texture", GLint(nv12 ? 2 : 3));
 
-	toggleBlending(false);
-	paintTransformedContent(program, geometry);
+	toggleBlending(geometry.roundRadius > 0.);
+	paintTransformedContent(program, geometry, false);
 }
 
 void OverlayWidget::RendererGL::paintTransformedStaticContent(
@@ -440,13 +446,15 @@ void OverlayWidget::RendererGL::paintTransformedStaticContent(
 	program->setUniformValue("s_texture", GLint(0));
 	program->setUniformValue("f_texture", GLint(1));
 
-	toggleBlending(semiTransparent && !fillTransparentBackground);
-	paintTransformedContent(&*program, geometry);
+	toggleBlending((geometry.roundRadius > 0.)
+		|| (semiTransparent && !fillTransparentBackground));
+	paintTransformedContent(&*program, geometry, fillTransparentBackground);
 }
 
 void OverlayWidget::RendererGL::paintTransformedContent(
 		not_null<QOpenGLShaderProgram*> program,
-		ContentGeometry geometry) {
+		ContentGeometry geometry,
+		bool fillTransparentBackground) {
 	const auto rect = transformRect(geometry.rect);
 	const auto centerx = rect.x() + rect.width() / 2;
 	const auto centery = rect.y() + rect.height() / 2;
@@ -493,7 +501,12 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 		bottom.height() * _factor,
 		geometry.controlsOpacity,
 		1.f - float(geometry.fade)));
-
+	if (!fillTransparentBackground) {
+		program->setUniformValue("roundRect", Uniform(rect));
+		program->setUniformValue(
+			"roundRadius",
+			GLfloat(geometry.roundRadius * _factor));
+	}
 	FillTexturedRectangle(*_f, &*program);
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index a171752de..9cc233fba 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -51,7 +51,8 @@ private:
 		bool fillTransparentBackground) override;
 	void paintTransformedContent(
 		not_null<QOpenGLShaderProgram*> program,
-		ContentGeometry geometry);
+		ContentGeometry geometry,
+		bool fillTransparentBackground);
 	void paintRadialLoading(
 		QRect inner,
 		bool radial,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 8c404e65d..76111c5e0 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1493,6 +1493,7 @@ QRect OverlayWidget::finalContentRect() const {
 
 OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 	const auto fade = _stories ? _stories->contentFade() : 0.;
+	const auto radius = _stories ? float64(st::storiesRadius) : 0.;
 	const auto controlsOpacity = _controlsOpacity.current();
 	const auto toRotation = qreal(finalContentRotation());
 	const auto toRectRotated = QRectF(finalContentRect());
@@ -1505,7 +1506,7 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 			toRectRotated.width())
 		: toRectRotated;
 	if (!_geometryAnimation.animating()) {
-		return { toRect, toRotation, controlsOpacity, fade };
+		return { toRect, toRotation, controlsOpacity, fade, radius };
 	}
 	const auto fromRect = _oldGeometry.rect;
 	const auto fromRotation = _oldGeometry.rotation;
@@ -1528,7 +1529,7 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 		fromRect.width() + (toRect.width() - fromRect.width()) * progress,
 		fromRect.height() + (toRect.height() - fromRect.height()) * progress
 	);
-	return { useRect, useRotation, controlsOpacity, fade };
+	return { useRect, useRotation, controlsOpacity, fade, radius };
 }
 
 void OverlayWidget::updateContentRect() {
@@ -4164,17 +4165,18 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 		}
 		paintRadialLoading(renderer);
 		if (_stories) {
+			const auto radius = float64(st::storiesRadius);
 			if (const auto left = _stories->siblingLeft()) {
 				renderer->paintTransformedStaticContent(
 					left.image,
-					{ .rect = left.geometry },
+					{ .rect = left.geometry, .roundRadius = radius },
 					false, // semi-transparent
 					false); // fill transparent background
 			}
 			if (const auto right = _stories->siblingRight()) {
 				renderer->paintTransformedStaticContent(
 					right.image,
-					{ .rect = right.geometry },
+					{ .rect = right.geometry, .roundRadius = radius },
 					false, // semi-transparent
 					false); // fill transparent background
 			}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 61b240659..a95f5735d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -166,6 +166,7 @@ private:
 		qreal rotation = 0.;
 		qreal controlsOpacity = 0.;
 		qreal fade = 0.;
+		qreal roundRadius = 0.;
 	};
 	struct StartStreaming {
 		StartStreaming() : continueStreaming(false), startTime(0) {

From 30871ed1167a0ef8c6168650204cfdcce6cee9b8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 11 May 2023 18:36:59 +0400
Subject: [PATCH 238/676] Show userpic / name on sibling stories.

---
 .../stories/media_stories_controller.cpp      |  92 +++++++++++----
 .../media/stories/media_stories_controller.h  |  18 ++-
 .../media/stories/media_stories_delegate.h    |   6 +
 .../media/stories/media_stories_sibling.cpp   | 111 +++++++++++++++++-
 .../media/stories/media_stories_sibling.h     |  28 ++++-
 .../media/stories/media_stories_view.cpp      |  16 +--
 .../media/stories/media_stories_view.h        |  24 +++-
 .../SourceFiles/media/view/media_view.style   |   1 +
 .../media/view/media_view_overlay_opengl.cpp  |  71 +++++++++--
 .../media/view/media_view_overlay_opengl.h    |  15 ++-
 .../media/view/media_view_overlay_raster.cpp  |  73 +++++++-----
 .../media/view/media_view_overlay_raster.h    |   8 +-
 .../media/view/media_view_overlay_renderer.h  |  13 +-
 .../media/view/media_view_overlay_widget.cpp  | 109 ++++++++++++-----
 .../media/view/media_view_overlay_widget.h    |   4 +
 15 files changed, 469 insertions(+), 120 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 344b41738..d54ea6617 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -28,8 +28,11 @@ namespace {
 
 constexpr auto kPhotoProgressInterval = crl::time(100);
 constexpr auto kPhotoDuration = 5 * crl::time(1000);
-constexpr auto kSiblingMultiplier = 0.448;
 constexpr auto kFullContentFade = 0.2;
+constexpr auto kSiblingMultiplier = 0.448;
+constexpr auto kSiblingOutsidePart = 0.24;
+constexpr auto kSiblingUserpicSize = 0.3;
+constexpr auto kInnerHeightMultiplier = 1.6;
 
 } // namespace
 
@@ -210,14 +213,49 @@ void Controller::initLayout() {
 			layout.controlsBottomPosition.y());
 
 		const auto siblingSize = layout.content.size() * kSiblingMultiplier;
-		const auto siblingTop = layout.content.y()
-			+ (layout.content.height() - siblingSize.height()) / 2;
-		layout.siblingLeft = QRect(
-			{ -siblingSize.width() / 3, siblingTop },
-			siblingSize);
-		layout.siblingRight = QRect(
-			{ size.width() - (2 * siblingSize.width() / 3), siblingTop },
-			siblingSize);
+		const auto siblingTop = (size.height() - siblingSize.height()) / 2;
+		const auto outside = int(base::SafeRound(
+			siblingSize.width() * kSiblingOutsidePart));
+		const auto xLeft = -outside;
+		const auto xRight = size.width() - siblingSize.width() + outside;
+		const auto userpicSize = int(base::SafeRound(
+			siblingSize.width() * kSiblingUserpicSize));
+		const auto innerHeight = userpicSize * kInnerHeightMultiplier;
+		const auto userpic = [&](QRect geometry) {
+			return QRect(
+				(geometry.width() - userpicSize) / 2,
+				(geometry.height() - innerHeight) / 2,
+				userpicSize,
+				userpicSize
+			).translated(geometry.topLeft());
+		};
+		const auto nameFontSize = st::storiesMaxNameFontSize * contentHeight
+			/ st::storiesMaxSize.height();
+		const auto nameBoundingRect = [&](QRect geometry, bool left) {
+			const auto skipSmall = nameFontSize;
+			const auto skipBig = skipSmall + outside;
+			const auto top = userpic(geometry).y() + innerHeight;
+			return QRect(
+				left ? skipBig : skipSmall,
+				(geometry.height() - innerHeight) / 2,
+				geometry.width() - skipSmall - skipBig,
+				innerHeight
+			).translated(geometry.topLeft());
+		};
+		const auto left = QRect({ xLeft, siblingTop }, siblingSize);
+		const auto right = QRect({ xRight, siblingTop }, siblingSize);
+		layout.siblingLeft = {
+			.geometry = left,
+			.userpic = userpic(left),
+			.nameBoundingRect = nameBoundingRect(left, true),
+			.nameFontSize = nameFontSize,
+		};
+		layout.siblingRight = {
+			.geometry = right,
+			.userpic = userpic(right),
+			.nameBoundingRect = nameBoundingRect(right, false),
+			.nameFontSize = nameFontSize,
+		};
 
 		return layout;
 	});
@@ -237,9 +275,13 @@ rpl::producer<Layout> Controller::layoutValue() const {
 	return _layout.value() | rpl::filter_optional();
 }
 
-float64 Controller::contentFade() const {
-	return _contentFadeAnimation.value(_contentFaded ? 1. : 0.)
-		* kFullContentFade;
+ContentLayout Controller::contentLayout() const {
+	return {
+		.geometry = _layout.current()->content,
+		.fade = (_contentFadeAnimation.value(_contentFaded ? 1. : 0.)
+			* kFullContentFade),
+		.radius = float64(st::storiesRadius),
+	};
 }
 
 std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
@@ -349,7 +391,7 @@ bool Controller::subjumpAvailable(int delta) const {
 bool Controller::subjumpFor(int delta) {
 	const auto index = _index + delta;
 	if (index < 0) {
-		if (_siblingLeft->shownId().valid()) {
+		if (_siblingLeft && _siblingLeft->shownId().valid()) {
 			return jumpFor(-1);
 		} else if (!_list || _list->items.empty()) {
 			return false;
@@ -360,7 +402,9 @@ bool Controller::subjumpFor(int delta) {
 		});
 		return true;
 	} else if (index >= _list->total) {
-		return _siblingRight->shownId().valid() && jumpFor(1);
+		return _siblingRight
+			&& _siblingRight->shownId().valid()
+			&& jumpFor(1);
 	} else if (index < _list->items.size()) {
 		// #TODO stories load more
 		_delegate->storiesJumpTo({
@@ -411,16 +455,16 @@ void Controller::repaintSibling(not_null<Sibling*> sibling) {
 	}
 }
 
-SiblingView Controller::siblingLeft() const {
-	if (const auto value = _siblingLeft.get()) {
-		return { value->image(), _layout.current()->siblingLeft };
-	}
-	return {};
-}
-
-SiblingView Controller::siblingRight() const {
-	if (const auto value = _siblingRight.get()) {
-		return { value->image(), _layout.current()->siblingRight };
+SiblingView Controller::sibling(SiblingType type) const {
+	const auto &pointer = (type == SiblingType::Left)
+		? _siblingLeft
+		: _siblingRight;
+	if (const auto value = pointer.get()) {
+		const auto over = _delegate->storiesSiblingOver(type);
+		const auto layout = (type == SiblingType::Left)
+			? _layout.current()->siblingLeft
+			: _layout.current()->siblingRight;
+		return value->view(layout, over);
 	}
 	return {};
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 9e3791442..60c25011d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -39,12 +39,21 @@ class ReplyArea;
 class Sibling;
 class Delegate;
 struct SiblingView;
+enum class SiblingType;
+struct ContentLayout;
 
 enum class HeaderLayout {
 	Normal,
 	Outside,
 };
 
+struct SiblingLayout {
+	QRect geometry;
+	QRect userpic;
+	QRect nameBoundingRect;
+	int nameFontSize = 0;
+};
+
 struct Layout {
 	QRect content;
 	QRect header;
@@ -53,8 +62,8 @@ struct Layout {
 	QPoint controlsBottomPosition;
 	QRect autocompleteRect;
 	HeaderLayout headerLayout = HeaderLayout::Normal;
-	QRect siblingLeft;
-	QRect siblingRight;
+	SiblingLayout siblingLeft;
+	SiblingLayout siblingRight;
 
 	friend inline bool operator==(Layout, Layout) = default;
 };
@@ -67,7 +76,7 @@ public:
 	[[nodiscard]] not_null<Ui::RpWidget*> wrap() const;
 	[[nodiscard]] Layout layout() const;
 	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
-	[[nodiscard]] float64 contentFade() const;
+	[[nodiscard]] ContentLayout contentLayout() const;
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 	[[nodiscard]] auto stickerOrEmojiChosen() const
@@ -90,8 +99,7 @@ public:
 	[[nodiscard]] bool canDownload() const;
 
 	void repaintSibling(not_null<Sibling*> sibling);
-	[[nodiscard]] SiblingView siblingLeft() const;
-	[[nodiscard]] SiblingView siblingRight() const;
+	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 
 	void unfocusReply();
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index 256aff2f2..8a34c47bd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -27,6 +27,11 @@ enum class JumpReason {
 	User,
 };
 
+enum class SiblingType {
+	Left,
+	Right,
+};
+
 class Delegate {
 public:
 	[[nodiscard]] virtual not_null<Ui::RpWidget*> storiesWrap() = 0;
@@ -36,6 +41,7 @@ public:
 		-> rpl::producer<ChatHelpers::FileChosen> = 0;
 	virtual void storiesJumpTo(Data::FullStoryId id) = 0;
 	[[nodiscard]] virtual bool storiesPaused() = 0;
+	[[nodiscard]] virtual float64 storiesSiblingOver(SiblingType type) = 0;
 	virtual void storiesTogglePaused(bool paused) = 0;
 	virtual void storiesRepaint() = 0;
 };
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 006485088..8558e7980 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -14,15 +14,23 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
+#include "media/stories/media_stories_view.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
+#include "ui/painter.h"
+#include "styles/style_media_view.h"
 
 namespace Media::Stories {
 namespace {
 
 constexpr auto kGoodFadeDuration = crl::time(200);
+constexpr auto kSiblingFade = 0.5;
+constexpr auto kSiblingFadeOver = 0.4;
+constexpr auto kSiblingNameOpacity = 0.8;
+constexpr auto kSiblingNameOpacityOver = 1.;
 
 } // namespace
 
@@ -241,8 +249,107 @@ bool Sibling::shows(const Data::StoriesList &list) const {
 	return _id == Data::FullStoryId{ list.user, list.items.front().id };
 }
 
-QImage Sibling::image() const {
-	return _good.isNull() ? _blurred : _good;
+SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
+	const auto name = nameImage(layout);
+	return {
+		.image = _good.isNull() ? _blurred : _good,
+		.layout = {
+			.geometry = layout.geometry,
+			.fade = kSiblingFade * (1 - over) + kSiblingFadeOver * over,
+			.radius = float64(st::storiesRadius),
+		},
+		.userpic = userpicImage(layout),
+		.userpicPosition = layout.userpic.topLeft(),
+		.name = name,
+		.namePosition = namePosition(layout, name),
+		.nameOpacity = (kSiblingNameOpacity * (1 - over)
+			+ kSiblingNameOpacityOver * over),
+	};
+}
+
+QImage Sibling::userpicImage(const SiblingLayout &layout) {
+	Expects(_id.user != nullptr);
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto size = layout.userpic.width() * ratio;
+	const auto key = _id.user->userpicUniqueKey(_userpicView);
+	if (_userpicImage.width() != size || _userpicKey != key) {
+		_userpicKey = key;
+		_userpicImage = _id.user->generateUserpicImage(_userpicView, size);
+		_userpicImage.setDevicePixelRatio(ratio);
+	}
+	return _userpicImage;
+}
+
+QImage Sibling::nameImage(const SiblingLayout &layout) {
+	Expects(_id.user != nullptr);
+
+	if (_nameFontSize != layout.nameFontSize) {
+		_nameFontSize = layout.nameFontSize;
+
+		const auto family = 0; // Default font family.
+		const auto font = style::font(
+			_nameFontSize,
+			style::internal::FontSemibold,
+			family);
+		_name.reset();
+		_nameStyle = std::make_unique<style::TextStyle>(style::TextStyle{
+			.font = font,
+			.linkFont = font,
+			.linkFontOver = font,
+		});
+	};
+	const auto text = _id.user->shortName();
+	if (_nameText != text) {
+		_name.reset();
+		_nameText = text;
+	}
+	if (!_name) {
+		_nameAvailableWidth = 0;
+		_name.emplace(*_nameStyle, _nameText);
+	}
+	const auto available = layout.nameBoundingRect.width();
+	const auto wasCut = (_nameAvailableWidth < _name->maxWidth());
+	const auto nowCut = (available < _name->maxWidth());
+	if (_nameImage.isNull()
+		|| _nameAvailableWidth != layout.nameBoundingRect.width()) {
+		_nameAvailableWidth = layout.nameBoundingRect.width();
+		if (_nameImage.isNull() || nowCut || wasCut) {
+			const auto w = std::min(_nameAvailableWidth, _name->maxWidth());
+			const auto h = _nameStyle->font->height;
+			const auto ratio = style::DevicePixelRatio();
+			_nameImage = QImage(
+				QSize(w, h) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_nameImage.setDevicePixelRatio(ratio);
+			_nameImage.fill(Qt::transparent);
+			auto p = Painter(&_nameImage);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setFont(_nameStyle->font);
+			p.setPen(Qt::white);
+			_name->drawLeftElided(p, 0, 0, w, w);
+		}
+	}
+	return _nameImage;
+}
+
+QPoint Sibling::namePosition(
+		const SiblingLayout &layout,
+		const QImage &image) const {
+	const auto size = image.size() / image.devicePixelRatio();
+	const auto width = size.width();
+	const auto left = layout.geometry.x()
+		+ (layout.geometry.width() - width) / 2;
+	if (left < layout.nameBoundingRect.x()) {
+		return layout.nameBoundingRect.topLeft();
+	} else if (left + width > layout.nameBoundingRect.x() + layout.nameBoundingRect.width()) {
+		return layout.nameBoundingRect.topLeft()
+			+ QPoint(layout.nameBoundingRect.width() - width, 0);
+	}
+	const auto top = layout.nameBoundingRect.y()
+		+ layout.nameBoundingRect.height()
+		- size.height();
+	return QPoint(left, top);
 }
 
 void Sibling::check() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.h b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
index ad3b961d9..ecbd89de7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
@@ -10,10 +10,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_stories.h"
 
 #include "ui/effects/animations.h"
+#include "ui/userpic_view.h"
+
+namespace style {
+struct TextStyle;
+} // namespace style
 
 namespace Media::Stories {
 
 class Controller;
+struct SiblingView;
+struct SiblingLayout;
 
 class Sibling final {
 public:
@@ -25,7 +32,9 @@ public:
 	[[nodiscard]] Data::FullStoryId shownId() const;
 	[[nodiscard]] bool shows(const Data::StoriesList &list) const;
 
-	[[nodiscard]] QImage image() const;
+	[[nodiscard]] SiblingView view(
+		const SiblingLayout &layout,
+		float64 over);
 
 private:
 	class Loader;
@@ -34,6 +43,12 @@ private:
 
 	void check();
 
+	[[nodiscard]] QImage userpicImage(const SiblingLayout &layout);
+	[[nodiscard]] QImage nameImage(const SiblingLayout &layout);
+	[[nodiscard]] QPoint namePosition(
+		const SiblingLayout &layout,
+		const QImage &image) const;
+
 	const not_null<Controller*> _controller;
 
 	Data::FullStoryId _id;
@@ -41,6 +56,17 @@ private:
 	QImage _good;
 	Ui::Animations::Simple _goodShown;
 
+	QImage _userpicImage;
+	InMemoryKey _userpicKey = {};
+	Ui::PeerUserpicView _userpicView;
+
+	QImage _nameImage;
+	std::unique_ptr<style::TextStyle> _nameStyle;
+	std::optional<Ui::Text::String> _name;
+	QString _nameText;
+	int _nameAvailableWidth = 0;
+	int _nameFontSize = 0;
+
 	std::unique_ptr<Loader> _loader;
 
 };
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index dbcf9cdf4..f5cfd628d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -36,19 +36,19 @@ bool View::canDownload() const {
 	return _controller->canDownload();
 }
 
-QRect View::contentGeometry() const {
+QRect View::finalShownGeometry() const {
 	return _controller->layout().content;
 }
 
-rpl::producer<QRect> View::contentGeometryValue() const {
+rpl::producer<QRect> View::finalShownGeometryValue() const {
 	return _controller->layoutValue(
 		) | rpl::map([=](const Layout &layout) {
 			return layout.content;
 		}) | rpl::distinct_until_changed();
 }
 
-float64 View::contentFade() const {
-	return _controller->contentFade();
+ContentLayout View::contentLayout() const {
+	return _controller->contentLayout();
 }
 
 void View::updatePlayback(const Player::TrackState &state) {
@@ -75,12 +75,8 @@ void View::togglePaused(bool paused) {
 	_controller->togglePaused(paused);
 }
 
-SiblingView View::siblingLeft() const {
-	return _controller->siblingLeft();
-}
-
-SiblingView View::siblingRight() const {
-	return _controller->siblingRight();
+SiblingView View::sibling(SiblingType type) const {
+	return _controller->sibling(type);
 }
 
 rpl::lifetime &View::lifetime() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index a11f49436..09865c861 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -20,9 +20,22 @@ namespace Media::Stories {
 class Delegate;
 class Controller;
 
+struct ContentLayout {
+	QRect geometry;
+	float64 fade = 0.;
+	float64 radius = 0.;
+};
+
+enum class SiblingType;
+
 struct SiblingView {
 	QImage image;
-	QRect geometry;
+	ContentLayout layout;
+	QImage userpic;
+	QPoint userpicPosition;
+	QImage name;
+	QPoint namePosition;
+	float64 nameOpacity = 0.;
 
 	[[nodiscard]] bool valid() const {
 		return !image.isNull();
@@ -44,11 +57,10 @@ public:
 	void ready();
 
 	[[nodiscard]] bool canDownload() const;
-	[[nodiscard]] QRect contentGeometry() const;
-	[[nodiscard]] rpl::producer<QRect> contentGeometryValue() const;
-	[[nodiscard]] float64 contentFade() const;
-	[[nodiscard]] SiblingView siblingLeft() const;
-	[[nodiscard]] SiblingView siblingRight() const;
+	[[nodiscard]] QRect finalShownGeometry() const;
+	[[nodiscard]] rpl::producer<QRect> finalShownGeometryValue() const;
+	[[nodiscard]] ContentLayout contentLayout() const;
+	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 
 	void updatePlayback(const Player::TrackState &state);
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 5e7a30bb8..c896d253a 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -406,6 +406,7 @@ pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOve
 speedSliderDividerSize: size(2px, 8px);
 
 storiesMaxSize: size(405px, 720px);
+storiesMaxNameFontSize: 17px;
 storiesRadius: 8px;
 storiesControlSize: 64px;
 storiesLeft: icon {{ "mediaview/stories_next-flip_horizontal", mediaviewControlFg }};
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 0ea2f2ee6..8c1ea6cf9 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/gl/gl_shader.h"
 #include "ui/painter.h"
+#include "media/stories/media_stories_view.h"
 #include "media/streaming/media_streaming_common.h"
 #include "platform/platform_overlay_widget.h"
 #include "base/platform/base_platform_info.h"
@@ -133,7 +134,11 @@ void OverlayWidget::RendererGL::init(
 	constexpr auto kRoundingQuads = 4;
 	constexpr auto kRoundingVertices = kRoundingQuads * 6;
 	constexpr auto kRoundingValues = kRoundingVertices * 2;
-	constexpr auto kValues = kQuadValues + kControlsValues + kRoundingValues;
+	constexpr auto kStoriesSiblingValues = kStoriesSiblingPartsCount * 16;
+	constexpr auto kValues = kQuadValues
+		+ kControlsValues
+		+ kRoundingValues
+		+ kStoriesSiblingValues;
 
 	_contentBuffer.emplace();
 	_contentBuffer->setUsagePattern(QOpenGLBuffer::DynamicDraw);
@@ -315,7 +320,7 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 	_streamedIndex = _owner->streamedIndex();
 
 	_f->glActiveTexture(GL_TEXTURE0);
-	_textures.bind(*_f, 1);
+	_textures.bind(*_f, 3);
 	if (upload) {
 		_f->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 		uploadTexture(
@@ -328,7 +333,7 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 		_lumaSize = yuv->size;
 	}
 	_f->glActiveTexture(GL_TEXTURE1);
-	_textures.bind(*_f, 2);
+	_textures.bind(*_f, 4);
 	if (upload) {
 		uploadTexture(
 			nv12 ? GL_RG : GL_ALPHA,
@@ -350,7 +355,7 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 		_controlsFadeImage.bind(*_f);
 	} else {
 		_f->glActiveTexture(GL_TEXTURE2);
-		_textures.bind(*_f, 3);
+		_textures.bind(*_f, 5);
 		if (upload) {
 			uploadTexture(
 				GL_ALPHA,
@@ -383,7 +388,9 @@ void OverlayWidget::RendererGL::paintTransformedStaticContent(
 		const QImage &image,
 		ContentGeometry geometry,
 		bool semiTransparent,
-		bool fillTransparentBackground) {
+		bool fillTransparentBackground,
+		int index) {
+	Expects(index >= 0 && index < 3);
 	Expects(image.isNull()
 		|| image.format() == QImage::Format_RGB32
 		|| image.format() == QImage::Format_ARGB32_Premultiplied);
@@ -409,11 +416,11 @@ void OverlayWidget::RendererGL::paintTransformedStaticContent(
 	}
 
 	_f->glActiveTexture(GL_TEXTURE0);
-	_textures.bind(*_f, 0);
+	_textures.bind(*_f, index);
 	const auto cacheKey = image.isNull() ? qint64(-1) : image.cacheKey();
-	const auto upload = (_cacheKey != cacheKey);
+	const auto upload = (_cacheKeys[index] != cacheKey);
 	if (upload) {
-		_cacheKey = cacheKey;
+		_cacheKeys[index] = cacheKey;
 		if (image.isNull()) {
 			// Upload transparent 2x2 texture.
 			const auto stride = 2;
@@ -853,6 +860,54 @@ void OverlayWidget::RendererGL::paintRoundedCorners(int radius) {
 
 	_f->glDisableVertexAttribArray(position);
 }
+
+void OverlayWidget::RendererGL::paintStoriesSiblingPart(
+		int index,
+		const QImage &image,
+		QRect rect,
+		float64 opacity) {
+	Expects(index >= 0 && index < kStoriesSiblingPartsCount);
+
+	_f->glActiveTexture(GL_TEXTURE0);
+
+	auto &part = _storiesSiblingParts[index];
+	part.setImage(image);
+	part.bind(*_f);
+
+	const auto textured = part.texturedRect(
+		rect,
+		QRect(QPoint(), image.size()));
+	const auto geometry = transformRect(textured.geometry);
+	const GLfloat coords[] = {
+		geometry.left(), geometry.top(),
+		textured.texture.left(), textured.texture.bottom(),
+
+		geometry.right(), geometry.top(),
+		textured.texture.right(), textured.texture.bottom(),
+
+		geometry.right(), geometry.bottom(),
+		textured.texture.right(), textured.texture.top(),
+
+		geometry.left(), geometry.bottom(),
+		textured.texture.left(), textured.texture.top(),
+	};
+	const auto offset = kControlsOffset
+		+ (kControlsCount * kControlValues) / 4
+		+ (6 * 2 * 4) / 4 // rounding
+		+ (index * 4);
+	const auto byteOffset = offset * 4 * sizeof(GLfloat);
+	_contentBuffer->write(byteOffset, coords, sizeof(coords));
+
+	_controlsProgram->bind();
+	_controlsProgram->setUniformValue("viewport", _uniformViewport);
+	_contentBuffer->write(
+		offset * 4 * sizeof(GLfloat),
+		coords,
+		sizeof(coords));
+	_controlsProgram->setUniformValue("g_opacity", GLfloat(opacity));
+	FillTexturedRectangle(*_f, &*_controlsProgram, offset);
+}
+
 //
 //void OverlayWidget::RendererGL::invalidate() {
 //	_trackFrameIndex = -1;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index 9cc233fba..b0ba15dc8 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -48,7 +48,8 @@ private:
 		const QImage &image,
 		ContentGeometry geometry,
 		bool semiTransparent,
-		bool fillTransparentBackground) override;
+		bool fillTransparentBackground,
+		int index = 0) override;
 	void paintTransformedContent(
 		not_null<QOpenGLShaderProgram*> program,
 		ContentGeometry geometry,
@@ -72,6 +73,11 @@ private:
 	void paintCaption(QRect outer, float64 opacity) override;
 	void paintGroupThumbs(QRect outer, float64 opacity) override;
 	void paintRoundedCorners(int radius) override;
+	void paintStoriesSiblingPart(
+		int index,
+		const QImage &image,
+		QRect rect,
+		float64 opacity = 1.) override;
 
 	//void invalidate();
 
@@ -117,11 +123,11 @@ private:
 	std::optional<QOpenGLShaderProgram> _fillProgram;
 	std::optional<QOpenGLShaderProgram> _controlsProgram;
 	std::optional<QOpenGLShaderProgram> _roundedCornersProgram;
-	Ui::GL::Textures<4> _textures;
+	Ui::GL::Textures<6> _textures; // image, sibling, right sibling, y, u, v
 	QSize _rgbaSize;
 	QSize _lumaSize;
 	QSize _chromaSize;
-	qint64 _cacheKey = 0;
+	qint64 _cacheKeys[3] = { 0 }; // image, sibling, right sibling
 	int _trackFrameIndex = 0;
 	int _streamedIndex = 0;
 	bool _chromaNV12 = false;
@@ -136,6 +142,9 @@ private:
 	Ui::GL::Image _groupThumbsImage;
 	Ui::GL::Image _controlsImage;
 
+	static constexpr auto kStoriesSiblingPartsCount = 4;
+	Ui::GL::Image _storiesSiblingParts[kStoriesSiblingPartsCount];
+
 	static constexpr auto kControlsCount = 5;
 	[[nodiscard]] static Control ControlMeta(
 		OverState control,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
index bd9675380..9a345e3d7 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/view/media_view_overlay_raster.h"
 
 #include "ui/painter.h"
+#include "media/stories/media_stories_view.h"
 #include "media/view/media_view_pip.h"
 #include "platform/platform_overlay_widget.h"
 #include "styles/style_media_view.h"
@@ -15,14 +16,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media::View {
 
 OverlayWidget::RendererSW::RendererSW(not_null<OverlayWidget*> owner)
-: _owner(owner)
-, _transparentBrush(style::TransparentPlaceholder()) {
+	: _owner(owner)
+	, _transparentBrush(style::TransparentPlaceholder()) {
 }
 
 void OverlayWidget::RendererSW::paintFallback(
-		Painter &&p,
-		const QRegion &clip,
-		Ui::GL::Backend backend) {
+	Painter &&p,
+	const QRegion &clip,
+	Ui::GL::Backend backend) {
 	_p = &p;
 	_clip = &clip;
 	_clipOuter = clip.boundingRect();
@@ -48,8 +49,8 @@ void OverlayWidget::RendererSW::paintBackground() {
 }
 
 QRect OverlayWidget::RendererSW::TransformRect(
-		QRectF geometry,
-		int rotation) {
+	QRectF geometry,
+	int rotation) {
 	const auto center = geometry.center();
 	const auto rect = ((rotation % 180) == 90)
 		? QRectF(
@@ -66,7 +67,7 @@ QRect OverlayWidget::RendererSW::TransformRect(
 }
 
 void OverlayWidget::RendererSW::paintTransformedVideoFrame(
-		ContentGeometry geometry) {
+	ContentGeometry geometry) {
 	Expects(_owner->_streamed != nullptr);
 
 	const auto rotation = int(geometry.rotation);
@@ -79,10 +80,11 @@ void OverlayWidget::RendererSW::paintTransformedVideoFrame(
 }
 
 void OverlayWidget::RendererSW::paintTransformedStaticContent(
-		const QImage &image,
-		ContentGeometry geometry,
-		bool semiTransparent,
-		bool fillTransparentBackground) {
+	const QImage &image,
+	ContentGeometry geometry,
+	bool semiTransparent,
+	bool fillTransparentBackground,
+	int index) {
 	const auto rotation = int(geometry.rotation);
 	const auto rect = TransformRect(geometry.rect, rotation);
 	if (!rect.intersects(_clipOuter)) {
@@ -99,8 +101,8 @@ void OverlayWidget::RendererSW::paintTransformedStaticContent(
 }
 
 void OverlayWidget::RendererSW::paintControlsFade(
-		QRect geometry,
-		float64 opacity) {
+	QRect geometry,
+	float64 opacity) {
 	_p->setOpacity(opacity);
 	_p->setClipRect(geometry);
 	const auto width = _owner->width();
@@ -134,9 +136,9 @@ void OverlayWidget::RendererSW::paintControlsFade(
 }
 
 void OverlayWidget::RendererSW::paintTransformedImage(
-		const QImage &image,
-		QRect rect,
-		int rotation) {
+	const QImage &image,
+	QRect rect,
+	int rotation) {
 	PainterHighQualityEnabler hq(*_p);
 	if (UsePainterRotation(rotation)) {
 		if (rotation) {
@@ -153,9 +155,9 @@ void OverlayWidget::RendererSW::paintTransformedImage(
 }
 
 void OverlayWidget::RendererSW::paintRadialLoading(
-		QRect inner,
-		bool radial,
-		float64 radialOpacity) {
+	QRect inner,
+	bool radial,
+	float64 radialOpacity) {
 	_owner->paintRadialLoadingContent(*_p, inner, radial, radialOpacity);
 }
 
@@ -164,8 +166,8 @@ void OverlayWidget::RendererSW::paintThemePreview(QRect outer) {
 }
 
 void OverlayWidget::RendererSW::paintDocumentBubble(
-		QRect outer,
-		QRect icon) {
+	QRect outer,
+	QRect icon) {
 	if (outer.intersects(_clipOuter)) {
 		_owner->paintDocumentBubbleContent(*_p, outer, icon, _clipOuter);
 		if (icon.intersects(_clipOuter)) {
@@ -184,12 +186,12 @@ void OverlayWidget::RendererSW::paintControlsStart() {
 }
 
 void OverlayWidget::RendererSW::paintControl(
-		OverState control,
-		QRect over,
-		float64 overOpacity,
-		QRect inner,
-		float64 innerOpacity,
-		const style::icon &icon) {
+	OverState control,
+	QRect over,
+	float64 overOpacity,
+	QRect inner,
+	float64 innerOpacity,
+	const style::icon &icon) {
 	if (!over.isEmpty() && !over.intersects(_clipOuter)) {
 		return;
 	}
@@ -230,6 +232,21 @@ void OverlayWidget::RendererSW::paintRoundedCorners(int radius) {
 	// The RpWindow rounding overlay will do the job.
 }
 
+void OverlayWidget::RendererSW::paintStoriesSiblingPart(
+		int index,
+		const QImage &image,
+		QRect rect,
+		float64 opacity) {
+	const auto changeOpacity = (opacity != 1.);
+	if (changeOpacity) {
+		_p->setOpacity(opacity);
+	}
+	_p->drawImage(rect, image);
+	if (changeOpacity) {
+		_p->setOpacity(1.);
+	}
+}
+
 void OverlayWidget::RendererSW::validateOverControlImage() {
 	const auto size = QSize(st::mediaviewIconOver, st::mediaviewIconOver);
 	const auto alpha = base::SafeRound(kOverBackgroundOpacity * 255);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
index 3df304236..e1b6ca453 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
@@ -27,7 +27,8 @@ private:
 		const QImage &image,
 		ContentGeometry geometry,
 		bool semiTransparent,
-		bool fillTransparentBackground) override;
+		bool fillTransparentBackground,
+		int index = 0) override;
 	void paintTransformedImage(
 		const QImage &image,
 		QRect rect,
@@ -52,6 +53,11 @@ private:
 	void paintCaption(QRect outer, float64 opacity) override;
 	void paintGroupThumbs(QRect outer, float64 opacity) override;
 	void paintRoundedCorners(int radius) override;
+	void paintStoriesSiblingPart(
+		int index,
+		const QImage &image,
+		QRect rect,
+		float64 opacity = 1.) override;
 
 	void validateOverControlImage();
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h b/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
index f4a8cb9bb..cd3ea698e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
@@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "media/view/media_view_overlay_widget.h"
 
+namespace Media::Stories {
+struct SiblingView;
+} // namespace Media::Stories
+
 namespace Media::View {
 
 class OverlayWidget::Renderer : public Ui::GL::Renderer {
@@ -19,7 +23,8 @@ public:
 		const QImage &image,
 		ContentGeometry geometry,
 		bool semiTransparent,
-		bool fillTransparentBackground) = 0;
+		bool fillTransparentBackground,
+		int index = 0) = 0; // image, left sibling, right sibling
 	virtual void paintRadialLoading(
 		QRect inner,
 		bool radial,
@@ -39,7 +44,11 @@ public:
 	virtual void paintCaption(QRect outer, float64 opacity) = 0;
 	virtual void paintGroupThumbs(QRect outer, float64 opacity) = 0;
 	virtual void paintRoundedCorners(int radius) = 0;
-
+	virtual void paintStoriesSiblingPart(
+		int index,
+		const QImage &image,
+		QRect rect,
+		float64 opacity = 1.) = 0;
 };
 
 } // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 76111c5e0..f154a93b8 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -125,6 +125,9 @@ constexpr auto kIdsLimit = 48;
 // Preload next messages if we went further from current than that.
 constexpr auto kIdsPreloadAfter = 28;
 
+constexpr auto kLeftSiblingTextureIndex = 1;
+constexpr auto kRightSiblingTextureIndex = 2;
+
 class PipDelegate final : public Pip::Delegate {
 public:
 	PipDelegate(QWidget *parent, not_null<Main::Session*> session);
@@ -1444,17 +1447,18 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) {
 	}
 	_helper->setControlsOpacity(_controlsOpacity.current());
 	const auto content = finalContentRect();
+	const auto siblingType = (_over == OverLeftStories)
+		? Stories::SiblingType::Left
+		: Stories::SiblingType::Right;
 	const auto toUpdate = QRegion()
 		+ (_over == OverLeftNav ? _leftNavOver : _leftNavIcon)
 		+ (_over == OverRightNav ? _rightNavOver : _rightNavIcon)
 		+ (_over == OverSave ? _saveNavOver : _saveNavIcon)
 		+ (_over == OverRotate ? _rotateNavOver : _rotateNavIcon)
 		+ (_over == OverMore ? _moreNavOver : _moreNavIcon)
-		+ ((_stories && _over == OverLeftStories)
-			? _stories->siblingLeft().geometry
-			: QRect())
-		+ ((_stories && _over == OverRightStories)
-			? _stories->siblingRight().geometry
+		+ ((_stories
+			&& (_over == OverLeftStories && _over == OverRightStories))
+			? _stories->sibling(siblingType).layout.geometry
 			: QRect())
 		+ _headerNav
 		+ _nameNav
@@ -1492,8 +1496,9 @@ QRect OverlayWidget::finalContentRect() const {
 }
 
 OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
-	const auto fade = _stories ? _stories->contentFade() : 0.;
-	const auto radius = _stories ? float64(st::storiesRadius) : 0.;
+	if (_stories) {
+		return storiesContentGeometry(_stories->contentLayout());
+	}
 	const auto controlsOpacity = _controlsOpacity.current();
 	const auto toRotation = qreal(finalContentRotation());
 	const auto toRectRotated = QRectF(finalContentRect());
@@ -1506,7 +1511,7 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 			toRectRotated.width())
 		: toRectRotated;
 	if (!_geometryAnimation.animating()) {
-		return { toRect, toRotation, controlsOpacity, fade, radius };
+		return { toRect, toRotation, controlsOpacity };
 	}
 	const auto fromRect = _oldGeometry.rect;
 	const auto fromRotation = _oldGeometry.rotation;
@@ -1529,7 +1534,17 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 		fromRect.width() + (toRect.width() - fromRect.width()) * progress,
 		fromRect.height() + (toRect.height() - fromRect.height()) * progress
 	);
-	return { useRect, useRotation, controlsOpacity, fade, radius };
+	return { useRect, useRotation, controlsOpacity };
+}
+
+OverlayWidget::ContentGeometry OverlayWidget::storiesContentGeometry(
+		const Stories::ContentLayout &layout) const {
+	return {
+		.rect = QRectF(layout.geometry),
+		.controlsOpacity = 0., // #TODO stories ?..
+		.fade = layout.fade,
+		.roundRadius = layout.radius,
+	};
 }
 
 void OverlayWidget::updateContentRect() {
@@ -1568,7 +1583,7 @@ void OverlayWidget::recountSkipTop() {
 
 void OverlayWidget::resizeContentByScreenSize() {
 	if (_stories) {
-		const auto content = _stories->contentGeometry();
+		const auto content = _stories->finalShownGeometry();
 		_x = content.x();
 		_y = content.y();
 		_w = content.width();
@@ -4005,6 +4020,11 @@ void OverlayWidget::storiesTogglePaused(bool paused) {
 	}
 }
 
+float64 OverlayWidget::storiesSiblingOver(Stories::SiblingType type) {
+	return (type == Stories::SiblingType::Left)
+		? overLevel(OverLeftStories)
+		: overLevel(OverRightStories);
+}
 void OverlayWidget::storiesRepaint() {
 	update();
 }
@@ -4165,20 +4185,34 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 		}
 		paintRadialLoading(renderer);
 		if (_stories) {
-			const auto radius = float64(st::storiesRadius);
-			if (const auto left = _stories->siblingLeft()) {
+			using namespace Stories;
+			const auto paint = [&](const SiblingView &view, int index) {
 				renderer->paintTransformedStaticContent(
-					left.image,
-					{ .rect = left.geometry, .roundRadius = radius },
+					view.image,
+					storiesContentGeometry(view.layout),
 					false, // semi-transparent
-					false); // fill transparent background
+					false, // fill transparent background
+					index);
+				const auto base = (index - 1) * 2;
+				const auto userpicSize = view.userpic.size()
+					/ view.userpic.devicePixelRatio();
+				renderer->paintStoriesSiblingPart(
+					base,
+					view.userpic,
+					QRect(view.userpicPosition, userpicSize));
+				const auto nameSize = view.name.size()
+					/ view.name.devicePixelRatio();
+				renderer->paintStoriesSiblingPart(
+					base + 1,
+					view.name,
+					QRect(view.namePosition, nameSize),
+					view.nameOpacity);
+			};
+			if (const auto left = _stories->sibling(SiblingType::Left)) {
+				paint(left, kLeftSiblingTextureIndex);
 			}
-			if (const auto right = _stories->siblingRight()) {
-				renderer->paintTransformedStaticContent(
-					right.image,
-					{ .rect = right.geometry, .roundRadius = radius },
-					false, // semi-transparent
-					false); // fill transparent background
+			if (const auto right = _stories->sibling(SiblingType::Right)) {
+				paint(right, kRightSiblingTextureIndex);
 			}
 		}
 	} else {
@@ -4924,7 +4958,7 @@ void OverlayWidget::setStoriesUser(UserData *user) {
 		_storiesSession = session;
 		const auto delegate = static_cast<Stories::Delegate*>(this);
 		_stories = std::make_unique<Stories::View>(delegate);
-		_stories->contentGeometryValue(
+		_stories->finalShownGeometryValue(
 		) | rpl::skip(1) | rpl::start_with_next([=] {
 			updateControlsGeometry();
 		}, _stories->lifetime());
@@ -5155,6 +5189,7 @@ void OverlayWidget::handleMouseMove(QPoint position) {
 }
 
 void OverlayWidget::updateOverRect(OverState state) {
+	using Type = Stories::SiblingType;
 	switch (state) {
 	case OverLeftNav:
 		update(_stories ? _leftNavIcon : _leftNavOver);
@@ -5163,10 +5198,14 @@ void OverlayWidget::updateOverRect(OverState state) {
 		update(_stories ? _rightNavIcon : _rightNavOver);
 		break;
 	case OverLeftStories:
-		update(_stories ? _stories->siblingLeft().geometry : QRect());
+		update(_stories
+			? _stories->sibling(Type::Left).layout.geometry :
+			QRect());
 		break;
 	case OverRightStories:
-		update(_stories ? _stories->siblingRight().geometry : QRect());
+		update(_stories
+			? _stories->sibling(Type::Right).layout.geometry
+			: QRect());
 		break;
 	case OverName: update(_nameNav); break;
 	case OverDate: update(_dateNav); break;
@@ -5250,19 +5289,27 @@ void OverlayWidget::updateOver(QPoint pos) {
 
 	if (_pressed || _dragging) return;
 
+	using SiblingType = Stories::SiblingType;
 	if (_fullScreenVideo) {
 		updateOverState(OverVideo);
 	} else if (_leftNavVisible && _leftNav.contains(pos)) {
 		updateOverState(OverLeftNav);
-	} else if (_stories && _stories->siblingLeft().geometry.contains(pos)) {
-		updateOverState(OverLeftStories);
-	} else if (_stories && _stories->siblingRight().geometry.contains(pos)) {
-		updateOverState(OverRightStories);
 	} else if (_rightNavVisible && _rightNav.contains(pos)) {
 		updateOverState(OverRightNav);
+	} else if (_stories
+		&& _stories->sibling(
+			SiblingType::Left).layout.geometry.contains(pos)) {
+		updateOverState(OverLeftStories);
+	} else if (_stories
+		&& _stories->sibling(
+			SiblingType::Right).layout.geometry.contains(pos)) {
+		updateOverState(OverRightStories);
 	} else if (!_stories && _from && _nameNav.contains(pos)) {
 		updateOverState(OverName);
-	} else if (!_stories && _message && _message->isRegular() && _dateNav.contains(pos)) {
+	} else if (!_stories
+		&& _message
+		&& _message->isRegular()
+		&& _dateNav.contains(pos)) {
 		updateOverState(OverDate);
 	} else if (!_stories && _headerHasLink && _headerNav.contains(pos)) {
 		updateOverState(OverHeader);
@@ -5270,7 +5317,9 @@ void OverlayWidget::updateOver(QPoint pos) {
 		updateOverState(OverSave);
 	} else if (_rotateVisible && _rotateNav.contains(pos)) {
 		updateOverState(OverRotate);
-	} else if (_document && documentBubbleShown() && _docIconRect.contains(pos)) {
+	} else if (_document
+		&& documentBubbleShown()
+		&& _docIconRect.contains(pos)) {
 		updateOverState(OverIcon);
 	} else if (_moreNav.contains(pos)) {
 		updateOverState(OverMore);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index a95f5735d..49c4a6df7 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -66,6 +66,7 @@ enum class Error;
 
 namespace Media::Stories {
 class View;
+struct ContentLayout;
 } // namespace Media::Stories
 
 namespace Media::View {
@@ -235,6 +236,7 @@ private:
 	void storiesJumpTo(Data::FullStoryId id) override;
 	bool storiesPaused() override;
 	void storiesTogglePaused(bool paused) override;
+	float64 storiesSiblingOver(Stories::SiblingType type) override;
 	void storiesRepaint() override;
 
 	void hideControls(bool force = false);
@@ -390,6 +392,8 @@ private:
 	[[nodiscard]] int finalContentRotation() const;
 	[[nodiscard]] QRect finalContentRect() const;
 	[[nodiscard]] ContentGeometry contentGeometry() const;
+	[[nodiscard]] ContentGeometry storiesContentGeometry(
+		const Stories::ContentLayout &layout) const;
 	void updateContentRect();
 	void contentSizeChanged();
 

From 0d3df824e37e70ccd7420e1b1e9be3277706b132 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 May 2023 10:07:37 +0400
Subject: [PATCH 239/676] Apply stories fade in raster renderer.

---
 .../media/view/media_view_overlay_raster.cpp  | 69 ++++++++++---------
 .../media/view/media_view_overlay_raster.h    |  5 +-
 .../media/view/media_view_overlay_widget.cpp  | 10 +--
 3 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
index 9a345e3d7..d6d24e1e8 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
@@ -16,14 +16,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media::View {
 
 OverlayWidget::RendererSW::RendererSW(not_null<OverlayWidget*> owner)
-	: _owner(owner)
-	, _transparentBrush(style::TransparentPlaceholder()) {
+: _owner(owner)
+, _transparentBrush(style::TransparentPlaceholder()) {
 }
 
 void OverlayWidget::RendererSW::paintFallback(
-	Painter &&p,
-	const QRegion &clip,
-	Ui::GL::Backend backend) {
+		Painter &&p,
+		const QRegion &clip,
+		Ui::GL::Backend backend) {
 	_p = &p;
 	_clip = &clip;
 	_clipOuter = clip.boundingRect();
@@ -49,8 +49,8 @@ void OverlayWidget::RendererSW::paintBackground() {
 }
 
 QRect OverlayWidget::RendererSW::TransformRect(
-	QRectF geometry,
-	int rotation) {
+		QRectF geometry,
+		int rotation) {
 	const auto center = geometry.center();
 	const auto rect = ((rotation % 180) == 90)
 		? QRectF(
@@ -67,7 +67,7 @@ QRect OverlayWidget::RendererSW::TransformRect(
 }
 
 void OverlayWidget::RendererSW::paintTransformedVideoFrame(
-	ContentGeometry geometry) {
+		ContentGeometry geometry) {
 	Expects(_owner->_streamed != nullptr);
 
 	const auto rotation = int(geometry.rotation);
@@ -76,15 +76,15 @@ void OverlayWidget::RendererSW::paintTransformedVideoFrame(
 		return;
 	}
 	paintTransformedImage(_owner->videoFrame(), rect, rotation);
-	paintControlsFade(rect, geometry.controlsOpacity);
+	paintControlsFade(rect, geometry.controlsOpacity, geometry.fade);
 }
 
 void OverlayWidget::RendererSW::paintTransformedStaticContent(
-	const QImage &image,
-	ContentGeometry geometry,
-	bool semiTransparent,
-	bool fillTransparentBackground,
-	int index) {
+		const QImage &image,
+		ContentGeometry geometry,
+		bool semiTransparent,
+		bool fillTransparentBackground,
+		int index) {
 	const auto rotation = int(geometry.rotation);
 	const auto rect = TransformRect(geometry.rect, rotation);
 	if (!rect.intersects(_clipOuter)) {
@@ -97,12 +97,19 @@ void OverlayWidget::RendererSW::paintTransformedStaticContent(
 	if (!image.isNull()) {
 		paintTransformedImage(image, rect, rotation);
 	}
-	paintControlsFade(rect, geometry.controlsOpacity);
+	paintControlsFade(rect, geometry.controlsOpacity, geometry.fade);
 }
 
 void OverlayWidget::RendererSW::paintControlsFade(
-	QRect geometry,
-	float64 opacity) {
+		QRect geometry,
+		float64 opacity,
+		float64 fullFade) {
+	if (fullFade > 0.) {
+		_p->setOpacity(fullFade);
+		_p->fillRect(geometry, Qt::black);
+		opacity *= 1. - fullFade;
+	}
+
 	_p->setOpacity(opacity);
 	_p->setClipRect(geometry);
 	const auto width = _owner->width();
@@ -136,9 +143,9 @@ void OverlayWidget::RendererSW::paintControlsFade(
 }
 
 void OverlayWidget::RendererSW::paintTransformedImage(
-	const QImage &image,
-	QRect rect,
-	int rotation) {
+		const QImage &image,
+		QRect rect,
+		int rotation) {
 	PainterHighQualityEnabler hq(*_p);
 	if (UsePainterRotation(rotation)) {
 		if (rotation) {
@@ -155,9 +162,9 @@ void OverlayWidget::RendererSW::paintTransformedImage(
 }
 
 void OverlayWidget::RendererSW::paintRadialLoading(
-	QRect inner,
-	bool radial,
-	float64 radialOpacity) {
+		QRect inner,
+		bool radial,
+		float64 radialOpacity) {
 	_owner->paintRadialLoadingContent(*_p, inner, radial, radialOpacity);
 }
 
@@ -166,8 +173,8 @@ void OverlayWidget::RendererSW::paintThemePreview(QRect outer) {
 }
 
 void OverlayWidget::RendererSW::paintDocumentBubble(
-	QRect outer,
-	QRect icon) {
+		QRect outer,
+		QRect icon) {
 	if (outer.intersects(_clipOuter)) {
 		_owner->paintDocumentBubbleContent(*_p, outer, icon, _clipOuter);
 		if (icon.intersects(_clipOuter)) {
@@ -186,12 +193,12 @@ void OverlayWidget::RendererSW::paintControlsStart() {
 }
 
 void OverlayWidget::RendererSW::paintControl(
-	OverState control,
-	QRect over,
-	float64 overOpacity,
-	QRect inner,
-	float64 innerOpacity,
-	const style::icon &icon) {
+		OverState control,
+		QRect over,
+		float64 overOpacity,
+		QRect inner,
+		float64 innerOpacity,
+		const style::icon &icon) {
 	if (!over.isEmpty() && !over.intersects(_clipOuter)) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
index e1b6ca453..5c6a7880a 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
@@ -33,7 +33,10 @@ private:
 		const QImage &image,
 		QRect rect,
 		int rotation);
-	void paintControlsFade(QRect geometry, float64 opacity);
+	void paintControlsFade(
+		QRect geometry,
+		float64 opacity,
+		float64 fullFade);
 	void paintRadialLoading(
 		QRect inner,
 		bool radial,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index f154a93b8..33526046c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4011,10 +4011,12 @@ void OverlayWidget::storiesTogglePaused(bool paused) {
 		|| !_streamed->instance.player().active()) {
 		return;
 	} else if (_streamed->instance.player().paused()) {
-		_streamed->instance.resume();
-		updatePlaybackState();
-		playbackPauseMusic();
-	} else {
+		if (!paused) {
+			_streamed->instance.resume();
+			updatePlaybackState();
+			playbackPauseMusic();
+		}
+	} else if (paused) {
 		_streamed->instance.pause();
 		updatePlaybackState();
 	}

From 0331955ce7cfaf2731afdb58db43a1e4433c0c77 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 May 2023 13:41:25 +0400
Subject: [PATCH 240/676] Show captions with darkening over stories.

---
 .../stories/media_stories_controller.cpp      | 15 +++-
 .../media/stories/media_stories_controller.h  |  2 +
 .../media/stories/media_stories_header.cpp    |  2 +-
 .../media/stories/media_stories_sibling.cpp   |  2 +-
 .../media/stories/media_stories_view.cpp      |  4 +
 .../media/stories/media_stories_view.h        |  4 +-
 .../SourceFiles/media/view/media_view.style   |  3 +
 .../media/view/media_view_overlay_opengl.cpp  | 73 +++++++++------
 .../media/view/media_view_overlay_opengl.h    |  6 +-
 .../media/view/media_view_overlay_raster.cpp  | 17 ++--
 .../media/view/media_view_overlay_widget.cpp  | 89 +++++++++++++------
 .../media/view/media_view_overlay_widget.h    |  6 +-
 12 files changed, 151 insertions(+), 72 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index d54ea6617..7bb7409f1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -28,7 +28,7 @@ namespace {
 
 constexpr auto kPhotoProgressInterval = crl::time(100);
 constexpr auto kPhotoDuration = 5 * crl::time(1000);
-constexpr auto kFullContentFade = 0.2;
+constexpr auto kFullContentFade = 0.35;
 constexpr auto kSiblingMultiplier = 0.448;
 constexpr auto kSiblingOutsidePart = 0.24;
 constexpr auto kSiblingUserpicSize = 0.3;
@@ -276,14 +276,22 @@ rpl::producer<Layout> Controller::layoutValue() const {
 }
 
 ContentLayout Controller::contentLayout() const {
+	const auto &current = _layout.current();
+	Assert(current.has_value());
+
 	return {
-		.geometry = _layout.current()->content,
+		.geometry = current->content,
 		.fade = (_contentFadeAnimation.value(_contentFaded ? 1. : 0.)
 			* kFullContentFade),
-		.radius = float64(st::storiesRadius),
+		.radius = st::storiesRadius,
+		.headerOutside = (current->headerLayout == HeaderLayout::Outside),
 	};
 }
 
+TextWithEntities Controller::captionText() const {
+	return _captionText;
+}
+
 std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
 	return _delegate->storiesShow();
 }
@@ -325,6 +333,7 @@ void Controller::show(
 		return;
 	}
 	_shown = id;
+	_captionText = item.caption;
 
 	_header->show({ .user = list.user, .date = item.date });
 	_slider->show({ .index = _index, .total = list.total });
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 60c25011d..3f9eee581 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -77,6 +77,7 @@ public:
 	[[nodiscard]] Layout layout() const;
 	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
+	[[nodiscard]] TextWithEntities captionText() const;
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 	[[nodiscard]] auto stickerOrEmojiChosen() const
@@ -134,6 +135,7 @@ private:
 	bool _contentFaded = false;
 
 	Data::FullStoryId _shown;
+	TextWithEntities _captionText;
 	std::optional<Data::StoriesList> _list;
 	int _index = 0;
 	bool _started = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index af11254a5..fca65c8ca 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -21,7 +21,7 @@ namespace Media::Stories {
 namespace {
 
 constexpr auto kNameOpacity = 1.;
-constexpr auto kDateOpacity = 0.6;
+constexpr auto kDateOpacity = 0.8;
 
 } // namespace
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 8558e7980..05e66297b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -256,7 +256,7 @@ SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
 		.layout = {
 			.geometry = layout.geometry,
 			.fade = kSiblingFade * (1 - over) + kSiblingFadeOver * over,
-			.radius = float64(st::storiesRadius),
+			.radius = st::storiesRadius,
 		},
 		.userpic = userpicImage(layout),
 		.userpicPosition = layout.userpic.topLeft(),
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index f5cfd628d..0412a6d78 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -79,6 +79,10 @@ SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
 
+TextWithEntities View::captionText() const {
+	return _controller->captionText();
+}
+
 rpl::lifetime &View::lifetime() {
 	return _controller->lifetime();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 09865c861..b5d591e16 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -23,7 +23,8 @@ class Controller;
 struct ContentLayout {
 	QRect geometry;
 	float64 fade = 0.;
-	float64 radius = 0.;
+	int radius = 0;
+	bool headerOutside = false;
 };
 
 enum class SiblingType;
@@ -61,6 +62,7 @@ public:
 	[[nodiscard]] rpl::producer<QRect> finalShownGeometryValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
+	[[nodiscard]] TextWithEntities captionText() const;
 
 	void updatePlayback(const Player::TrackState &state);
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index c896d253a..a69039406 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -196,6 +196,7 @@ mediaviewSaveMsgStyle: TextStyle(defaultTextStyle) {
 mediaviewTextPalette: TextPalette(defaultTextPalette) {
 	linkFg: mediaviewTextLinkFg;
 	monoFg: mediaviewCaptionFg;
+	spoilerFg: mediaviewCaptionFg;
 }
 
 mediaviewCaptionStyle: defaultTextStyle;
@@ -429,6 +430,8 @@ storiesHeaderDate: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewControlFg;
 }
 storiesHeaderDatePosition: point(50px, 17px);
+storiesShadowTop: icon{{ "mediaview/shadow_bottom-flip_vertical", windowShadowFg }};
+storiesShadowBottom: mediaviewShadowBottom;
 storiesControlsMinWidth: 200px;
 storiesFieldMargin: margins(0px, 14px, 0px, 16px);
 storiesAttach: IconButton(defaultIconButton) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 8c1ea6cf9..e2f2bff04 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -36,13 +36,14 @@ constexpr auto kControlValues = 4 * 4 + 4 * 4; // over + icon
 		.header = R"(
 uniform sampler2D f_texture;
 uniform vec4 shadowTopRect;
-uniform vec3 shadowBottomOpacityFullFade;
+uniform vec4 shadowBottomSkipOpacityFullFade;
 )",
 		.body = R"(
 	float topHeight = shadowTopRect.w;
-	float bottomHeight = shadowBottomOpacityFullFade.x;
-	float opacity = shadowBottomOpacityFullFade.y;
-	float fullFade = shadowBottomOpacityFullFade.z;
+	float bottomHeight = shadowBottomSkipOpacityFullFade.x;
+	float bottomSkip = shadowBottomSkipOpacityFullFade.y;
+	float opacity = shadowBottomSkipOpacityFullFade.z;
+	float fullFade = shadowBottomSkipOpacityFullFade.w;
 	float viewportHeight = shadowTopRect.y + topHeight;
 	float fullHeight = topHeight + bottomHeight;
 	float topY = min(
@@ -50,7 +51,8 @@ uniform vec3 shadowBottomOpacityFullFade;
 		topHeight / fullHeight);
 	float topX = (gl_FragCoord.x - shadowTopRect.x) / shadowTopRect.z;
 	vec4 fadeTop = texture2D(f_texture, vec2(topX, topY)) * opacity;
-	float bottomY = max(fullHeight - gl_FragCoord.y, topHeight) / fullHeight;
+	float bottomY = max(bottomSkip + fullHeight - gl_FragCoord.y, topHeight)
+		/ fullHeight;
 	vec4 fadeBottom = texture2D(f_texture, vec2(0.5, bottomY)) * opacity;
 	float fade = min((1. - fadeTop.a) * (1. - fadeBottom.a), fullFade);
 	result.rgb = result.rgb * fade;
@@ -496,16 +498,30 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 	_contentBuffer->write(0, coords, sizeof(coords));
 
 	program->setUniformValue("viewport", _uniformViewport);
-	const auto &top = st::mediaviewShadowTop.size();
-	const auto point = QPoint(
-		_shadowTopFlip ? 0 : (_viewport.width() - top.width()),
-		0);
-	program->setUniformValue(
-		"shadowTopRect",
-		Uniform(transformRect(QRect(point, top))));
-	const auto &bottom = st::mediaviewShadowBottom;
-	program->setUniformValue("shadowBottomOpacityFullFade", QVector3D(
+	if (_owner->_stories) {
+		const auto &top = st::storiesShadowTop.size();
+		const auto shadowTop = geometry.topShadowShown
+			? geometry.rect.y()
+			: geometry.rect.y() - top.height();
+		program->setUniformValue(
+			"shadowTopRect",
+			Uniform(transformRect(
+				QRect(QPoint(geometry.rect.x(), shadowTop), top))));
+	} else {
+		const auto &top = st::mediaviewShadowTop.size();
+		const auto point = QPoint(
+			_shadowTopFlip ? 0 : (_viewport.width() - top.width()),
+			0);
+		program->setUniformValue(
+			"shadowTopRect",
+			Uniform(transformRect(QRect(point, top))));
+	}
+	const auto &bottom = _owner->_stories
+		? st::storiesShadowBottom
+		: st::mediaviewShadowBottom;
+	program->setUniformValue("shadowBottomSkipOpacityFullFade", QVector4D(
 		bottom.height() * _factor,
+		geometry.bottomShadowSkip * _factor,
 		geometry.controlsOpacity,
 		1.f - float(geometry.fade)));
 	if (!fillTransparentBackground) {
@@ -733,14 +749,23 @@ void OverlayWidget::RendererGL::invalidateControls() {
 
 void OverlayWidget::RendererGL::validateControlsFade() {
 	const auto flip = !_owner->topShadowOnTheRight();
+	const auto forStories = (_owner->_stories != nullptr);
 	if (!_controlsFadeImage.image().isNull()
-		&& _shadowTopFlip == flip) {
+		&& _shadowTopFlip == flip
+		&& _shadowsForStories == forStories) {
 		return;
 	}
 	_shadowTopFlip = flip;
-	const auto width = st::mediaviewShadowTop.width();
-	const auto bottomTop = st::mediaviewShadowTop.height();
-	const auto height = bottomTop + st::mediaviewShadowBottom.height();
+	_shadowsForStories = forStories;
+	const auto &top = _shadowsForStories
+		? st::storiesShadowTop
+		: st::mediaviewShadowTop;
+	const auto &bottom = _shadowsForStories
+		? st::storiesShadowBottom
+		: st::mediaviewShadowBottom;
+	const auto width = top.width();
+	const auto bottomTop = top.height();
+	const auto height = bottomTop + bottom.height();
 
 	auto image = QImage(
 		QSize(width, height) * _factor,
@@ -749,10 +774,10 @@ void OverlayWidget::RendererGL::validateControlsFade() {
 	image.setDevicePixelRatio(_factor);
 
 	auto p = QPainter(&image);
-	st::mediaviewShadowTop.paint(p, 0, 0, width);
-	st::mediaviewShadowBottom.fill(
+	top.paint(p, 0, 0, width);
+	bottom.fill(
 		p,
-		QRect(0, bottomTop, width, st::mediaviewShadowBottom.height()));
+		QRect(0, bottomTop, width, bottom.height()));
 	p.end();
 
 	if (flip) {
@@ -760,12 +785,6 @@ void OverlayWidget::RendererGL::validateControlsFade() {
 	}
 
 	_controlsFadeImage.setImage(std::move(image));
-	_shadowTopTexture = QRect(
-		QPoint(),
-		QSize(width, st::mediaviewShadowTop.height()) * _factor);
-	_shadowBottomTexture = QRect(
-		QPoint(0, bottomTop) * _factor,
-		QSize(width, st::mediaviewShadowBottom.height()) * _factor);
 }
 
 void OverlayWidget::RendererGL::paintFooter(QRect outer, float64 opacity) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index b0ba15dc8..95d57ec87 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -153,10 +153,8 @@ private:
 	// Last one is for the over circle image.
 	std::array<QRect, kControlsCount + 1> _controlsTextures;
 
-	QRect _shadowTopTexture;
-	QRect _shadowBottomTexture;
-
-	bool _shadowTopFlip;
+	bool _shadowTopFlip = false;
+	bool _shadowsForStories = false;
 	bool _blendingEnabled = false;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
index d6d24e1e8..13109e828 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
@@ -113,11 +113,16 @@ void OverlayWidget::RendererSW::paintControlsFade(
 	_p->setOpacity(opacity);
 	_p->setClipRect(geometry);
 	const auto width = _owner->width();
-	const auto &top = st::mediaviewShadowTop;
 	const auto flip = !_owner->topShadowOnTheRight();
-	const auto topShadow = QRect(
-		QPoint(flip ? 0 : (width - top.width()), 0),
-		top.size());
+	const auto stories = (_owner->_stories != nullptr);
+	const auto &top = stories
+		? st::storiesShadowTop
+		: st::mediaviewShadowTop;
+	const auto topShadow = stories
+		? QRect(geometry.topLeft(), QSize(geometry.width(), top.height()))
+		: QRect(
+			QPoint(flip ? 0 : (width - top.width()), 0),
+			top.size());
 	if (topShadow.intersected(geometry).intersects(_clipOuter)) {
 		if (flip) {
 			if (_topShadowCache.isNull()
@@ -131,7 +136,9 @@ void OverlayWidget::RendererSW::paintControlsFade(
 			top.paint(*_p, topShadow.topLeft(), width);
 		}
 	}
-	const auto &bottom = st::mediaviewShadowBottom;
+	const auto &bottom = stories
+		? st::storiesShadowBottom
+		: st::mediaviewShadowBottom;
 	const auto bottomShadow = QRect(
 		QPoint(0, _owner->height() - bottom.height()),
 		QSize(width, bottom.height()));
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 33526046c..f5fd2623e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -127,6 +127,7 @@ constexpr auto kIdsPreloadAfter = 28;
 
 constexpr auto kLeftSiblingTextureIndex = 1;
 constexpr auto kRightSiblingTextureIndex = 2;
+constexpr auto kStoriesControlsOpacity = 1.;
 
 class PipDelegate final : public Pip::Delegate {
 public:
@@ -1200,27 +1201,35 @@ void OverlayWidget::refreshCaptionGeometry() {
 		_groupThumbs = nullptr;
 		_groupThumbsRect = QRect();
 	}
-	const auto captionBottom = (_streamed && _streamed->controls)
+	const auto captionBottom = _stories
+		? (_y + _h)
+		: (_streamed && _streamed->controls)
 		? (_streamed->controls->y() - st::mediaviewCaptionMargin.height())
 		: _groupThumbs
 		? _groupThumbsTop
 		: height() - st::mediaviewCaptionMargin.height();
-	const auto captionWidth = std::min(
-		_groupThumbsAvailableWidth
-		- st::mediaviewCaptionPadding.left()
-		- st::mediaviewCaptionPadding.right(),
-		_caption.maxWidth());
-	const auto captionHeight = std::min(
-		_caption.countHeight(captionWidth),
-		height() / 4
+	const auto captionWidth = _stories
+		? (_w
+			- st::mediaviewCaptionPadding.left()
+			- st::mediaviewCaptionPadding.right())
+		: std::min(
+			(_groupThumbsAvailableWidth
+				- st::mediaviewCaptionPadding.left()
+				- st::mediaviewCaptionPadding.right()),
+			_caption.maxWidth());
+	const auto maxHeight = (_stories ? (_h / 3) : (height() / 4))
 		- st::mediaviewCaptionPadding.top()
 		- st::mediaviewCaptionPadding.bottom()
-		- 2 * st::mediaviewCaptionMargin.height());
+		- (_stories ? 0 : (2 * st::mediaviewCaptionMargin.height()));
+	const auto lineHeight = st::mediaviewCaptionStyle.font->height;
+	const auto captionHeight = std::min(
+		_caption.countHeight(captionWidth),
+		(maxHeight / lineHeight) * lineHeight);
 	_captionRect = QRect(
 		(width() - captionWidth) / 2,
-		captionBottom
-		- captionHeight
-		- st::mediaviewCaptionPadding.bottom(),
+		(captionBottom
+			- captionHeight
+			- st::mediaviewCaptionPadding.bottom()),
 		captionWidth,
 		captionHeight);
 }
@@ -1497,7 +1506,14 @@ QRect OverlayWidget::finalContentRect() const {
 
 OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 	if (_stories) {
-		return storiesContentGeometry(_stories->contentLayout());
+		auto result = storiesContentGeometry(_stories->contentLayout());
+		if (!_caption.isEmpty()) {
+			result.bottomShadowSkip = _widget->height()
+				- _captionRect.y()
+				+ st::mediaviewCaptionStyle.font->height
+				- st::storiesShadowBottom.height();
+		}
+		return result;
 	}
 	const auto controlsOpacity = _controlsOpacity.current();
 	const auto toRotation = qreal(finalContentRotation());
@@ -1541,9 +1557,10 @@ OverlayWidget::ContentGeometry OverlayWidget::storiesContentGeometry(
 		const Stories::ContentLayout &layout) const {
 	return {
 		.rect = QRectF(layout.geometry),
-		.controlsOpacity = 0., // #TODO stories ?..
+		.controlsOpacity = kStoriesControlsOpacity,
 		.fade = layout.fade,
 		.roundRadius = layout.radius,
+		.topShadowShown = !layout.headerOutside,
 	};
 }
 
@@ -2708,21 +2725,26 @@ void OverlayWidget::refreshFromLabel() {
 
 void OverlayWidget::refreshCaption() {
 	_caption = Ui::Text::String();
-	if (!_message) {
-		return;
-	} else if (const auto media = _message->media()) {
-		if (media->webpage()) {
-			return;
+	const auto caption = [&] {
+		if (_message) {
+			if (const auto media = _message->media()) {
+				if (media->webpage()) {
+					return TextWithEntities();
+				}
+			}
+			return _message->translatedText();
+		} else if (_stories) {
+			return _stories->captionText();
 		}
-	}
-	const auto caption = _message->translatedText();
+		return TextWithEntities();
+	}();
 	if (caption.text.isEmpty()) {
 		return;
 	}
 
 	using namespace HistoryView;
 	_caption = Ui::Text::String(st::msgMinWidth);
-	const auto duration = (_streamed && _document)
+	const auto duration = (_streamed && _document && _message)
 		? DurationForTimestampLinks(_document)
 		: 0;
 	const auto base = duration
@@ -2735,7 +2757,9 @@ void OverlayWidget::refreshCaption() {
 		update(captionGeometry());
 	};
 	const auto context = Core::MarkedTextContext{
-		.session = &_message->history()->session(),
+		.session = (_stories
+			? _storiesSession
+			: &_message->history()->session()),
 		.customEmojiRepaint = captionRepaint,
 	};
 	_caption.setMarkedText(
@@ -2743,7 +2767,9 @@ void OverlayWidget::refreshCaption() {
 		(base.isEmpty()
 			? caption
 			: AddTimestampLinks(caption, duration, base)),
-		Ui::ItemTextOptions(_message),
+		(_message
+			? Ui::ItemTextOptions(_message)
+			: Ui::ItemTextDefaultOptions()),
 		context);
 	if (_caption.hasSpoilers()) {
 		const auto weak = Ui::MakeWeak(widget());
@@ -4627,10 +4653,15 @@ void OverlayWidget::paintCaptionContent(
 		QRect clip,
 		float64 opacity) {
 	const auto inner = outer.marginsRemoved(st::mediaviewCaptionPadding);
-	p.setOpacity(opacity);
-	p.setBrush(st::mediaviewCaptionBg);
-	p.setPen(Qt::NoPen);
-	p.drawRoundedRect(outer, st::mediaviewCaptionRadius, st::mediaviewCaptionRadius);
+	if (!_stories) {
+		p.setOpacity(opacity);
+		p.setBrush(st::mediaviewCaptionBg);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(
+			outer,
+			st::mediaviewCaptionRadius,
+			st::mediaviewCaptionRadius);
+	}
 	if (inner.intersects(clip)) {
 		p.setPen(st::mediaviewCaptionFg);
 		_caption.draw(p, {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 49c4a6df7..fdb8997c6 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -166,8 +166,12 @@ private:
 		QRectF rect;
 		qreal rotation = 0.;
 		qreal controlsOpacity = 0.;
+
+		// Stories.
 		qreal fade = 0.;
-		qreal roundRadius = 0.;
+		int bottomShadowSkip = 0;
+		int roundRadius = 0;
+		bool topShadowShown = false;
 	};
 	struct StartStreaming {
 		StartStreaming() : continueStreaming(false), startTime(0) {

From a745c9ff75b00257b7044751624ad5c475ad67a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 May 2023 21:10:00 +0400
Subject: [PATCH 241/676] Display full caption if it doesn't fit.

---
 Telegram/CMakeLists.txt                       |  2 +
 .../media_stories_caption_full_view.cpp       | 81 +++++++++++++++++++
 .../stories/media_stories_caption_full_view.h | 46 +++++++++++
 .../stories/media_stories_controller.cpp      | 25 ++++++
 .../media/stories/media_stories_controller.h  |  3 +
 .../media/stories/media_stories_view.cpp      |  4 +
 .../media/stories/media_stories_view.h        |  1 +
 .../SourceFiles/media/view/media_view.style   |  5 ++
 .../media/view/media_view_overlay_widget.cpp  | 77 +++++++++++++++---
 .../media/view/media_view_overlay_widget.h    | 17 +++-
 10 files changed, 246 insertions(+), 15 deletions(-)
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 5a095f698..5c559e8a5 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -962,6 +962,8 @@ PRIVATE
     media/player/media_player_volume_controller.h
     media/player/media_player_widget.cpp
     media/player/media_player_widget.h
+    media/stories/media_stories_caption_full_view.cpp
+    media/stories/media_stories_caption_full_view.h
     media/stories/media_stories_controller.cpp
     media/stories/media_stories_controller.h
     media/stories/media_stories_delegate.cpp
diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
new file mode 100644
index 000000000..b301ced92
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.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 "media/stories/media_stories_caption_full_view.h"
+
+#include "core/ui_integration.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_media_view.h"
+
+namespace Media::Stories {
+
+CaptionFullView::CaptionFullView(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Main::Session*> session,
+	const TextWithEntities &text,
+	Fn<void()> close)
+: RpWidget(parent)
+, _scroll(std::make_unique<Ui::ScrollArea>((RpWidget*)this))
+, _text(_scroll->setOwnedWidget(
+	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
+		_scroll.get(),
+		object_ptr<Ui::FlatLabel>(_scroll.get(), st::storiesCaptionFull),
+		st::mediaviewCaptionPadding))->entity())
+, _close(std::move(close))
+, _background(st::storiesRadius, st::mediaviewCaptionBg) {
+	_text->setMarkedText(text, Core::MarkedTextContext{
+		.session = session,
+		.customEmojiRepaint = [=] { _text->update(); },
+	});
+
+	parent->sizeValue() | rpl::start_with_next([=](QSize size) {
+		setGeometry(QRect(QPoint(), size));
+	}, lifetime());
+
+	show();
+	setFocus();
+}
+
+CaptionFullView::~CaptionFullView() = default;
+
+void CaptionFullView::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	_background.paint(p, _scroll->geometry());
+	_background.paint(p, _scroll->geometry());
+}
+
+void CaptionFullView::resizeEvent(QResizeEvent *e) {
+	const auto wanted = _text->naturalWidth();
+	const auto padding = st::mediaviewCaptionPadding;
+	const auto margin = st::mediaviewCaptionMargin * 2;
+	const auto available = (rect() - padding).width()
+		- (margin.width() * 2);
+	const auto use = std::min(wanted, available);
+	_text->resizeToWidth(use);
+	const auto fullw = use + padding.left() + padding.right();
+	const auto fullh = std::min(
+		_text->height() + padding.top() + padding.bottom(),
+		height() - (margin.height() * 2));
+	const auto left = (width() - fullw) / 2;
+	const auto top = (height() - fullh) / 2;
+	_scroll->setGeometry(left, top, fullw, fullh);
+}
+
+void CaptionFullView::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Escape) {
+		_close();
+	}
+}
+
+void CaptionFullView::mousePressEvent(QMouseEvent *e) {
+	if (e->button() == Qt::LeftButton) {
+		_close();
+	}
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h
new file mode 100644
index 000000000..94b6e2cff
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/round_rect.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class FlatLabel;
+class ScrollArea;
+} // namespace Ui
+
+namespace Media::Stories {
+
+class CaptionFullView final : private Ui::RpWidget {
+public:
+	CaptionFullView(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		const TextWithEntities &text,
+		Fn<void()> close);
+	~CaptionFullView();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+
+	std::unique_ptr<Ui::ScrollArea> _scroll;
+	const not_null<Ui::FlatLabel*> _text;
+	Fn<void()> _close;
+	Ui::RoundRect _background;
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 7bb7409f1..a0ff10a86 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -9,8 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
+#include "media/stories/media_stories_caption_full_view.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
 #include "media/stories/media_stories_sibling.h"
@@ -115,6 +117,9 @@ Controller::Controller(not_null<Delegate*> delegate)
 
 	_replyArea->focusedValue(
 	) | rpl::start_with_next([=](bool focused) {
+		if (focused) {
+			_captionFullView = nullptr;
+		}
 		_contentFaded = focused;
 		_contentFadeAnimation.start(
 			[=] { _delegate->storiesRepaint(); },
@@ -292,6 +297,18 @@ TextWithEntities Controller::captionText() const {
 	return _captionText;
 }
 
+void Controller::showFullCaption() {
+	if (_captionText.empty()) {
+		return;
+	}
+	togglePaused(true);
+	_captionFullView = std::make_unique<CaptionFullView>(
+		wrap(),
+		&_delegate->storiesShow()->session(),
+		_captionText,
+		[=] { togglePaused(false); });
+}
+
 std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
 	return _delegate->storiesShow();
 }
@@ -334,10 +351,15 @@ void Controller::show(
 	}
 	_shown = id;
 	_captionText = item.caption;
+	_captionFullView = nullptr;
 
 	_header->show({ .user = list.user, .date = item.date });
 	_slider->show({ .index = _index, .total = list.total });
 	_replyArea->show({ .user = list.user });
+
+	if (_contentFaded) {
+		togglePaused(true);
+	}
 }
 
 void Controller::showSiblings(
@@ -447,6 +469,9 @@ bool Controller::paused() const {
 }
 
 void Controller::togglePaused(bool paused) {
+	if (!paused) {
+		_captionFullView = nullptr;
+	}
 	if (_photoPlayback) {
 		_photoPlayback->togglePaused(paused);
 	} else {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 3f9eee581..88a307dc0 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -41,6 +41,7 @@ class Delegate;
 struct SiblingView;
 enum class SiblingType;
 struct ContentLayout;
+class CaptionFullView;
 
 enum class HeaderLayout {
 	Normal,
@@ -78,6 +79,7 @@ public:
 	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
 	[[nodiscard]] TextWithEntities captionText() const;
+	void showFullCaption();
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 	[[nodiscard]] auto stickerOrEmojiChosen() const
@@ -130,6 +132,7 @@ private:
 	const std::unique_ptr<Slider> _slider;
 	const std::unique_ptr<ReplyArea> _replyArea;
 	std::unique_ptr<PhotoPlayback> _photoPlayback;
+	std::unique_ptr<CaptionFullView> _captionFullView;
 
 	Ui::Animations::Simple _contentFadeAnimation;
 	bool _contentFaded = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 0412a6d78..82c4388d2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -83,6 +83,10 @@ TextWithEntities View::captionText() const {
 	return _controller->captionText();
 }
 
+void View::showFullCaption() {
+	_controller->showFullCaption();
+}
+
 rpl::lifetime &View::lifetime() {
 	return _controller->lifetime();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index b5d591e16..f36b65cf1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -63,6 +63,7 @@ public:
 	[[nodiscard]] ContentLayout contentLayout() const;
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 	[[nodiscard]] TextWithEntities captionText() const;
+	void showFullCaption();
 
 	void updatePlayback(const Player::TrackState &state);
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index a69039406..3cd675b90 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -448,3 +448,8 @@ storiesAttach: IconButton(defaultIconButton) {
 	}
 }
 storiesSideSkip: 145px;
+storiesCaptionFull: FlatLabel(defaultFlatLabel) {
+	style: mediaviewCaptionStyle;
+	textFg: mediaviewCaptionFg;
+	minWidth: 360px;
+}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index f5fd2623e..2d7da4d8b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1217,14 +1217,32 @@ void OverlayWidget::refreshCaptionGeometry() {
 				- st::mediaviewCaptionPadding.left()
 				- st::mediaviewCaptionPadding.right()),
 			_caption.maxWidth());
-	const auto maxHeight = (_stories ? (_h / 3) : (height() / 4))
+	const auto maxExpandedOuterHeight = (_stories
+		? (_h - st::storiesShadowTop.height())
+		: height());
+	const auto maxCollapsedOuterHeight = !_stories
+		? (height() / 4)
+		: (_h / 3);
+	const auto maxExpandedHeight = maxExpandedOuterHeight
 		- st::mediaviewCaptionPadding.top()
-		- st::mediaviewCaptionPadding.bottom()
-		- (_stories ? 0 : (2 * st::mediaviewCaptionMargin.height()));
+		- st::mediaviewCaptionPadding.bottom();
+	const auto maxCollapsedHeight = maxCollapsedOuterHeight
+		- st::mediaviewCaptionPadding.top()
+		- st::mediaviewCaptionPadding.bottom();
 	const auto lineHeight = st::mediaviewCaptionStyle.font->height;
+	const auto wantedHeight = _caption.countHeight(captionWidth);
+	const auto maxHeight = _captionExpanded
+		? maxExpandedHeight
+		: maxCollapsedHeight;
 	const auto captionHeight = std::min(
-		_caption.countHeight(captionWidth),
+		wantedHeight,
 		(maxHeight / lineHeight) * lineHeight);
+	_captionFitsIfExpanded = _stories
+		&& (wantedHeight <= maxExpandedHeight);
+	_captionShownFull = (wantedHeight <= maxCollapsedHeight);
+	if (_captionShownFull) {
+		_captionExpanded = false;
+	}
 	_captionRect = QRect(
 		(width() - captionWidth) / 2,
 		(captionBottom
@@ -3000,6 +3018,7 @@ void OverlayWidget::show(OpenRequest request) {
 		_streamingStartPaused = false;
 		displayDocument(
 			document,
+			anim::activation::normal,
 			request.cloudTheme()
 				? *request.cloudTheme()
 				: Data::CloudTheme(),
@@ -3014,9 +3033,11 @@ void OverlayWidget::show(OpenRequest request) {
 	}
 }
 
-void OverlayWidget::displayPhoto(not_null<PhotoData*> photo) {
+void OverlayWidget::displayPhoto(
+		not_null<PhotoData*> photo,
+		anim::activation activation) {
 	if (photo->isNull()) {
-		displayDocument(nullptr);
+		displayDocument(nullptr, activation);
 		return;
 	}
 	_touchbarDisplay.fire(TouchBarItemType::Photo);
@@ -3055,7 +3076,7 @@ void OverlayWidget::displayPhoto(not_null<PhotoData*> photo) {
 	}
 	contentSizeChanged();
 	refreshFromLabel();
-	displayFinished();
+	displayFinished(activation);
 }
 
 void OverlayWidget::destroyThemePreview() {
@@ -3071,15 +3092,16 @@ void OverlayWidget::redisplayContent() {
 	if (isHidden() || !_session) {
 		return;
 	} else if (_photo) {
-		displayPhoto(_photo);
+		displayPhoto(_photo, anim::activation::background);
 	} else {
-		displayDocument(_document);
+		displayDocument(_document, anim::activation::background);
 	}
 }
 
 // Empty messages shown as docs: doc can be nullptr.
 void OverlayWidget::displayDocument(
 		DocumentData *doc,
+		anim::activation activation,
 		const Data::CloudTheme &cloud,
 		const StartStreaming &startStreaming) {
 	_fullScreenVideo = false;
@@ -3209,7 +3231,7 @@ void OverlayWidget::displayDocument(
 	if (_showAsPip && _streamed && _streamed->controls) {
 		switchToPip();
 	} else {
-		displayFinished();
+		displayFinished(activation);
 	}
 }
 
@@ -3236,7 +3258,8 @@ void OverlayWidget::updateThemePreviewGeometry() {
 	}
 }
 
-void OverlayWidget::displayFinished() {
+void OverlayWidget::displayFinished(anim::activation activation) {
+	_captionExpanded = _captionFitsIfExpanded = _captionShownFull = false;
 	updateControls();
 	if (isHidden()) {
 		_helper->beforeShow(_fullscreen);
@@ -3247,6 +3270,8 @@ void OverlayWidget::displayFinished() {
 		//setAttribute(Qt::WA_DontShowOnScreen, false);
 		//Ui::Platform::UpdateOverlayed(_window);
 		showAndActivate();
+	} else if (activation == anim::activation::background) {
+		return;
 	} else if (isMinimized()) {
 		_helper->beforeShow(_fullscreen);
 		showAndActivate();
@@ -4015,10 +4040,11 @@ void OverlayWidget::storiesJumpTo(Data::FullStoryId id) {
 	clearStreaming();
 	_streamingStartPaused = false;
 	const auto &data = j->media.data;
+	const auto activation = anim::activation::background;
 	if (const auto photo = std::get_if<not_null<PhotoData*>>(&data)) {
-		displayPhoto(*photo);
+		displayPhoto(*photo, activation);
 	} else {
-		displayDocument(v::get<not_null<DocumentData*>>(data));
+		displayDocument(v::get<not_null<DocumentData*>>(data), activation);
 	}
 }
 
@@ -5302,6 +5328,9 @@ void OverlayWidget::updateOver(QPoint pos) {
 	} else if (_captionRect.contains(pos)) {
 		auto textState = _caption.getState(pos - _captionRect.topLeft(), _captionRect.width());
 		lnk = textState.link;
+		if (_stories && !_captionShownFull && !lnk) {
+			lnk = ensureCaptionExpandLink();
+		}
 		lnkhost = this;
 	} else if (_groupThumbs && _groupThumbsRect.contains(pos)) {
 		const auto point = pos - QPoint(_groupThumbsLeft, _groupThumbsTop);
@@ -5373,6 +5402,28 @@ void OverlayWidget::updateOver(QPoint pos) {
 	}
 }
 
+ClickHandlerPtr OverlayWidget::ensureCaptionExpandLink() {
+	if (!_captionExpandLink) {
+		const auto toggle = crl::guard(_widget, [=] {
+			if (!_stories) {
+				return;
+			} else if (_captionExpanded) {
+				_captionExpanded = false;
+				refreshCaptionGeometry();
+				update();
+			} else if (_captionFitsIfExpanded) {
+				_captionExpanded = true;
+				refreshCaptionGeometry();
+				update();
+			} else {
+				_stories->showFullCaption();
+			}
+		});
+		_captionExpandLink = std::make_shared<LambdaClickHandler>(toggle);
+	}
+	return _captionExpandLink;
+}
+
 void OverlayWidget::handleMouseRelease(
 		QPoint position,
 		Qt::MouseButton button) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index fdb8997c6..6007e9fab 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -23,6 +23,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class History;
 
+namespace anim {
+enum class activation : uchar;
+} // namespace anim
+
 namespace Data {
 class PhotoMedia;
 class DocumentMedia;
@@ -148,6 +152,7 @@ private:
 		OverMore,
 		OverIcon,
 		OverVideo,
+		OverCaption,
 	};
 	struct Entity {
 		std::variant<
@@ -356,12 +361,15 @@ private:
 	void resizeContentByScreenSize();
 	void recountSkipTop();
 
-	void displayPhoto(not_null<PhotoData*> photo);
+	void displayPhoto(
+		not_null<PhotoData*> photo,
+		anim::activation activation = anim::activation::normal);
 	void displayDocument(
 		DocumentData *document,
+		anim::activation activation = anim::activation::normal,
 		const Data::CloudTheme &cloud = Data::CloudTheme(),
 		const StartStreaming &startStreaming = StartStreaming());
-	void displayFinished();
+	void displayFinished(anim::activation activation);
 	void redisplayContent();
 	void findCurrent();
 
@@ -496,6 +504,7 @@ private:
 
 	[[nodiscard]] bool topShadowOnTheRight() const;
 	void applyHideWindowWorkaround();
+	[[nodiscard]] ClickHandlerPtr ensureCaptionExpandLink();
 
 	Window::SessionController *findWindow(bool switchTo = true) const;
 
@@ -558,6 +567,10 @@ private:
 	int _groupThumbsTop = 0;
 	Ui::Text::String _caption;
 	QRect _captionRect;
+	ClickHandlerPtr _captionExpandLink;
+	bool _captionShownFull = false;
+	bool _captionFitsIfExpanded = false;
+	bool _captionExpanded = false;
 
 	int _width = 0;
 	int _height = 0;

From 75d2b5994f6cdf8dd46955fd07bc1441d375c1dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 May 2023 19:48:49 +0400
Subject: [PATCH 242/676] Apply dark theme to reply controls in stories.

---
 .../chat_helpers/chat_helpers.style           | 505 ++++++++++++++++--
 .../chat_helpers/emoji_list_widget.cpp        |  17 +-
 .../chat_helpers/field_autocomplete.cpp       |  19 +-
 .../chat_helpers/field_autocomplete.h         |   8 +-
 .../chat_helpers/gifs_list_widget.cpp         |   4 +-
 .../chat_helpers/message_field.cpp            |   1 +
 .../chat_helpers/stickers_list_footer.cpp     |   2 +-
 .../chat_helpers/stickers_list_widget.cpp     |  15 +-
 .../chat_helpers/stickers_list_widget.h       |   3 +
 .../chat_helpers/tabbed_selector.cpp          |  53 +-
 .../chat_helpers/tabbed_selector.h            |  26 +-
 .../SourceFiles/history/history_widget.cpp    |   2 +-
 .../history_view_compose_controls.cpp         |  83 ++-
 .../controls/history_view_compose_controls.h  |  23 +-
 .../media/stories/media_stories_reply.cpp     |   9 +
 .../SourceFiles/media/view/media_view.style   | 111 +++-
 .../media/view/media_view_overlay_widget.cpp  |   3 +
 .../SourceFiles/ui/boxes/time_picker_box.cpp  |   2 +-
 .../attach_abstract_single_file_preview.cpp   |   1 +
 .../ui/chat/attach/attach_album_thumbnail.cpp |   1 +
 Telegram/SourceFiles/ui/chat/chat.style       | 359 +------------
 Telegram/SourceFiles/ui/chat/message_bar.cpp  |   1 +
 Telegram/SourceFiles/ui/chat/pinned_bar.cpp   |   2 +-
 Telegram/SourceFiles/ui/chat/requests_bar.cpp |   4 +-
 .../SourceFiles/ui/controls/emoji_button.cpp  |  28 +-
 .../SourceFiles/ui/controls/emoji_button.h    |   8 +-
 .../ui/controls/jump_down_button.cpp          |   2 +-
 .../SourceFiles/ui/controls/send_button.cpp   |  62 +--
 .../SourceFiles/ui/controls/send_button.h     |   8 +-
 .../SourceFiles/ui/controls/tabbed_search.cpp |   2 +-
 .../window/themes/window_theme_preview.cpp    |  22 +-
 Telegram/SourceFiles/window/window.style      |   2 +-
 32 files changed, 836 insertions(+), 552 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 97f94cb19..ceec7e3ec 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -11,9 +11,17 @@ using "boxes/boxes.style";
 using "ui/layers/layers.style";
 using "ui/widgets/widgets.style";
 
+GroupCallUserpics {
+	size: pixels;
+	shift: pixels;
+	stroke: pixels;
+	align: align;
+}
+
 TabbedSearch {
 	outer: color;
 	bg: color;
+	bgActive: color;
 	fg: color;
 	fgActive: color;
 	fadeLeft: icon;
@@ -44,14 +52,53 @@ EmojiPan {
 	iconArea: pixels;
 	bg: color;
 	overBg: color;
+	expandBg: color;
+	pathBg: color;
+	pathFg: color;
+	textFg: color;
 	categoriesBg: color;
 	categoriesBgOver: color;
 	fadeLeft: icon;
 	fadeRight: icon;
+	tabs: SettingsSlider;
 	search: TabbedSearch;
 	searchMargin: margins;
 }
 
+MessageBar {
+	title: TextStyle;
+	titleFg: color;
+	text: TextStyle;
+	textFg: color;
+	textPalette: TextPalette;
+	duration: int;
+}
+
+EmojiButton {
+	inner: IconButton;
+	bg: color;
+	lineFg: color;
+	lineFgOver: color;
+}
+
+SendButton {
+	inner: IconButton;
+	record: icon;
+	recordOver: icon;
+	sendDisabledFg: color;
+}
+
+ComposeControls {
+	bg: color;
+	radius: pixels;
+
+	field: InputField;
+	send: SendButton;
+	attach: IconButton;
+	emoji: EmojiButton;
+	tabbed: EmojiPan;
+}
+
 switchPmButton: RoundButton(defaultBoxButton) {
 	width: 320px;
 	height: 34px;
@@ -196,50 +243,55 @@ emojiPanSlideDuration: 200;
 emojiPanArea: size(34px, 32px);
 emojiPanRadius: 8px;
 
+defaultTabbedSearchCancel: CrossButton {
+	width: 33px;
+	height: 33px;
+
+	cross: CrossAnimation {
+		size: 27px;
+		skip: 8px;
+		stroke: 1.;
+		minScale: 0.3;
+	}
+	crossFg: menuIconFg;
+	crossFgOver: menuIconFg;
+	crossPosition: point(1px, 3px);
+
+	duration: 150;
+	loadingPeriod: 1000;
+	ripple: emptyRippleAnimation;
+}
+defaultTabbedSearchField: InputField(defaultMultiSelectSearchField) {
+	textMargins: margins(2px, 7px, 2px, 0px);
+}
+defaultTabbedSearchButton: IconButton(defaultIconButton) {
+	width: 33px;
+	height: 33px;
+	icon: icon{{ "emoji/emoji_search_input", emojiIconFg }};
+	iconOver: icon{{ "emoji/emoji_search_input", emojiIconFg }};
+	iconPosition: point(7px, -1px);
+	ripple: emptyRippleAnimation;
+}
+defaultTabbedSearchBack: IconButton(defaultIconButton) {
+	width: 33px;
+	height: 33px;
+	icon: icon{{ "emoji/emoji_back", menuIconFg }};
+	iconOver: icon{{ "emoji/emoji_back", menuIconFg }};
+	iconPosition: point(7px, -1px);
+	ripple: emptyRippleAnimation;
+}
 defaultTabbedSearch: TabbedSearch {
 	outer: emojiPanBg;
 	bg: emojiPanHover;
+	bgActive: windowBgRipple;
 	fg: emojiIconFg;
 	fgActive: emojiSubIconFgActive;
 	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanHover }};
 	fadeRight: icon {{ "fade_horizontal", emojiPanHover }};
-	field: InputField(defaultMultiSelectSearchField) {
-		textMargins: margins(2px, 7px, 2px, 0px);
-	}
-	search: IconButton(defaultIconButton) {
-		width: 33px;
-		height: 33px;
-		icon: icon{{ "emoji/emoji_search_input", emojiIconFg }};
-		iconOver: icon{{ "emoji/emoji_search_input", emojiIconFg }};
-		iconPosition: point(7px, -1px);
-		ripple: emptyRippleAnimation;
-	}
-	back: IconButton(defaultIconButton) {
-		width: 33px;
-		height: 33px;
-		icon: icon{{ "emoji/emoji_back", menuIconFg }};
-		iconOver: icon{{ "emoji/emoji_back", menuIconFg }};
-		iconPosition: point(7px, -1px);
-		ripple: emptyRippleAnimation;
-	}
-	cancel: CrossButton {
-		width: 33px;
-		height: 33px;
-
-		cross: CrossAnimation {
-			size: 27px;
-			skip: 8px;
-			stroke: 1.;
-			minScale: 0.3;
-		}
-		crossFg: menuIconFg;
-		crossFgOver: menuIconFg;
-		crossPosition: point(1px, 3px);
-
-		duration: 150;
-		loadingPeriod: 1000;
-		ripple: emptyRippleAnimation;
-	}
+	field: defaultTabbedSearchField;
+	search: defaultTabbedSearchButton;
+	back: defaultTabbedSearchBack;
+	cancel: defaultTabbedSearchCancel;
 	defaultFieldWidth: 103px;
 	groupWidth: 30px;
 	groupSkip: 2px;
@@ -261,10 +313,15 @@ defaultEmojiPan: EmojiPan {
 	iconArea: 28px;
 	bg: emojiPanBg;
 	overBg: emojiPanHover;
+	expandBg: emojiPanHeaderFg;
+	pathBg: windowBgRipple;
+	pathFg: windowBgOver;
+	textFg: windowFg;
 	categoriesBg: emojiPanCategories;
 	categoriesBgOver: windowBgRipple;
 	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
 	fadeRight: icon {{ "fade_horizontal", emojiPanCategories }};
+	tabs: emojiTabs;
 	search: defaultTabbedSearch;
 	searchMargin: margins(1px, 11px, 2px, 5px);
 }
@@ -428,3 +485,377 @@ emojiSuggestionsFadeRight: icon {{ "fade_horizontal", boxBg }};
 choosePeerGroupIcon: icon {{ "info/edit/create_group", lightButtonFg }};
 choosePeerChannelIcon: icon {{ "info/edit/create_channel", lightButtonFg }};
 choosePeerCreateIconLeft: 25px;
+
+historyRequestsUserpics: GroupCallUserpics {
+	size: 22px;
+	shift: 8px;
+	stroke: 4px;
+	align: align(left);
+}
+historyRequestsHeight: 33px;
+
+historySlowmodeCounterMargins: margins(0px, 0px, 10px, 0px);
+
+historyComposeAreaPalette: TextPalette(defaultTextPalette) {
+	linkFg: historyComposeAreaFgService;
+}
+
+defaultMessageBar: MessageBar {
+	title: semiboldTextStyle;
+	titleFg: windowActiveTextFg;
+	text: defaultTextStyle;
+	textFg: historyComposeAreaFg;
+	textPalette: historyComposeAreaPalette;
+	duration: 160;
+}
+
+historyComposeButton: FlatButton {
+	color: windowActiveTextFg;
+	overColor: windowActiveTextFg;
+
+	bgColor: historyComposeButtonBg;
+	overBgColor: historyComposeButtonBgOver;
+
+	width: -32px;
+	height: 46px;
+
+	textTop: 14px;
+
+	font: semiboldFont;
+	overFont: semiboldFont;
+
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: historyComposeButtonBgRipple;
+	}
+}
+historyUnblock: FlatButton(historyComposeButton) {
+	color: attentionButtonFg;
+	overColor: attentionButtonFgOver;
+}
+historyContactStatusButton: FlatButton(historyComposeButton) {
+	height: 49px;
+	textTop: 16px;
+	overBgColor: historyComposeButtonBg;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: historyComposeButtonBgOver;
+	}
+}
+historyContactStatusBlock: FlatButton(historyContactStatusButton) {
+	color: attentionButtonFg;
+	overColor: attentionButtonFg;
+}
+historyContactStatusLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 240px;
+}
+historyEmojiStatusInfoLabel: FlatLabel(historyContactStatusLabel) {
+	align: align(top);
+	textFg: windowSubTextFg;
+}
+historyContactStatusMinSkip: 16px;
+
+historyReplySkip: 51px;
+historyReplyNameFg: windowActiveTextFg;
+historyReplyHeight: 49px;
+historyReplyIconPosition: point(5px, 5px);
+historyReplyIcon: icon {{ "chat/input_reply", historyReplyIconFg }};
+historyForwardIcon: icon {{ "chat/input_forward", historyReplyIconFg }};
+historyEditIcon: icon {{ "chat/input_edit", historyReplyIconFg }};
+historyReplyCancel: IconButton {
+	width: 49px;
+	height: 49px;
+
+	icon: historyReplyCancelIcon;
+	iconOver: historyReplyCancelIconOver;
+	iconPosition: point(-1px, -1px);
+
+	rippleAreaPosition: point(4px, 4px);
+	rippleAreaSize: 40px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
+historyPinnedShowAll: IconButton(historyReplyCancel) {
+	icon: icon {{ "pinned_show_all", historyReplyCancelFg }};
+	iconOver: icon {{ "pinned_show_all", historyReplyCancelFgOver }};
+}
+historyPinnedBotButton: RoundButton(defaultActiveButton) {
+	width: -34px;
+	height: 30px;
+	textTop: 6px;
+	padding: margins(2px, 10px, 10px, 9px);
+}
+historyPinnedBotButtonMaxWidth: 150px;
+
+historyToDownPosition: point(12px, 10px);
+historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg }};
+historyToDownAboveOver: icon {{ "history_down_arrow", historyToDownFgOver }};
+historyToDownPaddingTop: 10px;
+historyToDownBelow: icon {
+	{ "history_down_shadow", historyToDownShadow },
+	{ "history_down_circle", historyToDownBg },
+};
+historyToDownBelowOver: icon {
+	{ "history_down_shadow", historyToDownShadow },
+	{ "history_down_circle", historyToDownBgOver },
+};
+historyToDown: TwoIconButton {
+	width: 52px;
+	height: 62px;
+
+	iconBelow: historyToDownBelow;
+	iconBelowOver: historyToDownBelowOver;
+	iconAbove: historyToDownAbove;
+	iconAboveOver: historyToDownAboveOver;
+	iconPosition: point(0px, historyToDownPaddingTop);
+
+	rippleAreaPosition: point(5px, 15px);
+	rippleAreaSize: 42px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: historyToDownBgRipple;
+	}
+}
+historyToDownBadgeFont: semiboldFont;
+historyToDownBadgeSize: 22px;
+
+historyToDownShownAfter: 480px;
+historyToDownDuration: 150;
+
+dialogsToUpAbove: icon {{ "history_down_arrow-flip_vertical", historyToDownFg, point(0px, 1px) }};
+dialogsToUpAboveOver: icon {{ "history_down_arrow-flip_vertical", historyToDownFgOver, point(0px, 1px) }};
+
+dialogsToUp: TwoIconButton(historyToDown) {
+	iconAbove: dialogsToUpAbove;
+	iconAboveOver: dialogsToUpAboveOver;
+}
+
+historyUnreadMentions: TwoIconButton(historyToDown) {
+	iconAbove: icon {{ "history_unread_mention", historyToDownFg }};
+	iconAboveOver: icon {{ "history_unread_mention", historyToDownFgOver }};
+}
+historyUnreadReactions: TwoIconButton(historyToDown) {
+	iconAbove: icon {{ "history_unread_reaction", historyToDownFg }};
+	iconAboveOver: icon {{ "history_unread_reaction", historyToDownFgOver }};
+}
+historyUnreadThingsSkip: 4px;
+
+historyComposeField: InputField(defaultInputField) {
+	font: normalFont;
+	textMargins: margins(0px, 0px, 0px, 0px);
+	textAlign: align(left);
+	textFg: historyComposeAreaFg;
+	textBg: historyComposeAreaBg;
+	heightMin: 36px;
+	heightMax: 72px;
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(7px, 5px, 7px, 5px);
+	placeholderAlign: align(topleft);
+	placeholderScale: 0.;
+	placeholderFont: normalFont;
+	placeholderShift: -50px;
+	border: 0px;
+	borderActive: 0px;
+	duration: 100;
+}
+historyComposeFieldMaxHeight: 224px;
+// historyMinHeight: 56px;
+
+historyAttach: IconButton(defaultIconButton) {
+	width: 44px;
+	height: 46px;
+
+	icon: icon {{ "chat/input_attach", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_attach", historyComposeIconFgOver }};
+
+	rippleAreaPosition: point(2px, 3px);
+	rippleAreaSize: 40px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
+
+historyMessagesTTL: IconButtonWithText {
+	iconButton: IconButton(historyAttach) {
+		icon: icon {{ "chat/input_autodelete", historyComposeIconFg }};
+		iconOver: icon {{ "chat/input_autodelete", historyComposeIconFgOver }};
+	}
+	textFg: historyComposeIconFg;
+	textFgOver: historyComposeIconFgOver;
+	textPadding: margins(21px, 20px, 3px, 7px);
+	textAlign: align(left);
+
+	font: font(10px semibold);
+}
+historyReplaceMedia: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_replace", windowBgActive }};
+	iconOver: icon {{ "chat/input_replace", windowBgActive }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgOver;
+	}
+}
+
+historyAttachEmojiActive: icon {{ "chat/input_smile_face", windowBgActive }};
+historyEmojiCircle: size(20px, 20px);
+historyEmojiCircleLine: 1.5;
+historyEmojiCircleFg: historyComposeIconFg;
+historyEmojiCircleFgOver: historyComposeIconFgOver;
+historyBotKeyboardShow: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_bot_keyboard", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_bot_keyboard", historyComposeIconFgOver }};
+}
+historyBotKeyboardHide: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_bot_keyboard_hide", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_bot_keyboard_hide", historyComposeIconFgOver }};
+}
+historyBotCommandStart: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_bot_command", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_bot_command", historyComposeIconFgOver }};
+}
+historyScheduledToggle: IconButton(historyAttach) {
+	icon: icon {
+		{ "chat/input_scheduled", historyComposeIconFg },
+		{ "chat/input_scheduled_dot", attentionButtonFg }
+	};
+	iconOver: icon {
+		{ "chat/input_scheduled", historyComposeIconFgOver },
+		{ "chat/input_scheduled_dot", attentionButtonFg }
+	};
+}
+
+historyAttachEmojiInner: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_smile_face", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_smile_face", historyComposeIconFgOver }};
+}
+historyAttachEmoji: EmojiButton {
+	inner: historyAttachEmojiInner;
+	bg: historyComposeAreaBg;
+	lineFg: historyEmojiCircleFg;
+	lineFgOver: historyEmojiCircleFgOver;
+}
+boxAttachEmoji: EmojiButton(historyAttachEmoji) {
+	inner: IconButton(historyAttachEmojiInner) {
+		width: 30px;
+		height: 30px;
+		rippleAreaSize: 0px;
+	}
+}
+boxAttachEmojiTop: 20px;
+
+historySendIcon: icon {{ "chat/input_send", historySendIconFg }};
+historySendIconOver: icon {{ "chat/input_send", historySendIconFgOver }};
+historySendIconPosition: point(10px, 11px);
+historySendSize: size(44px, 46px);
+historyScheduleIcon: icon {{ "chat/input_schedule", historyComposeAreaBg }};
+historyScheduleIconPosition: point(7px, 8px);
+historyEditSaveIcon: icon {{ "chat/input_save", historySendIconFg }};
+historyEditSaveIconOver: icon {{ "chat/input_save", historySendIconFgOver }};
+
+historyEditMediaBg: videoPlayIconBg;
+historyEditMedia: icon{{ "chat/input_draw", videoPlayIconFg }};
+historyMessagesTTLPickerHeight: 200px;
+historyMessagesTTLPickerItemHeight: 40px;
+historyMessagesTTLLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 200px;
+	align: align(topleft);
+	textFg: windowSubTextFg;
+}
+
+historyRecordVoiceFg: historyComposeIconFg;
+historyRecordVoiceFgOver: historyComposeIconFgOver;
+historyRecordVoiceFgInactive: attentionButtonFg;
+historyRecordVoiceFgActive: windowBgActive;
+historyRecordVoiceFgActiveIcon: windowFgActive;
+historyRecordVoiceShowDuration: 120;
+historyRecordVoiceDuration: 120;
+historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }};
+historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }};
+historyRecordVoiceActive: icon {{ "chat/input_record_filled", historyRecordVoiceFgActiveIcon }};
+historyRecordSendIconPosition: point(2px, 0px);
+historyRecordVoiceRippleBgActive: lightButtonBgOver;
+historyRecordSignalRadius: 5px;
+historyRecordCancel: windowSubTextFg;
+historyRecordCancelActive: windowActiveTextFg;
+historyRecordFont: font(13px);
+historyRecordDurationSkip: 12px;
+historyRecordDurationFg: historyComposeAreaFg;
+
+historyRecordMainBlobMinRadius: 23px;
+historyRecordMainBlobMaxRadius: 37px;
+historyRecordMinorBlobMinRadius: 40px;
+historyRecordMinorBlobMaxRadius: 47px;
+historyRecordMajorBlobMinRadius: 43px;
+historyRecordMajorBlobMaxRadius: 50px;
+
+historyRecordTextStyle: TextStyle(defaultTextStyle) {
+	font: historyRecordFont;
+}
+
+historyRecordTextWidthForWrap: 210px;
+historyRecordTextLeft: 15px;
+historyRecordTextRight: 25px;
+
+historyRecordLockShowDuration: historyToDownDuration;
+historyRecordLockSize: size(75px, 133px);
+
+historyRecordLockIconFg: historyToDownFg;
+historyRecordLockIconSize: size(14px, 17px);
+historyRecordLockIconBottomHeight: 9px;
+historyRecordLockIconLineHeight: 2px;
+historyRecordLockIconLineSkip: 3px;
+historyRecordLockIconLineWidth: 2px;
+historyRecordLockIconArcHeight: 4px;
+historyRecordStopIconWidth: 12px;
+
+historyRecordLockTopShadow: icon {{ "voice_lock/record_lock_top_shadow", historyToDownShadow }};
+historyRecordLockTop: icon {{ "voice_lock/record_lock_top", historyToDownBg }};
+historyRecordLockBottomShadow: icon {{ "voice_lock/record_lock_bottom_shadow", historyToDownShadow }};
+historyRecordLockBottom: icon {{ "voice_lock/record_lock_bottom", historyToDownBg }};
+historyRecordLockBodyShadow: icon {{ "voice_lock/record_lock_body_shadow", historyToDownShadow }};
+historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }};
+historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
+historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
+historyRecordLockRippleMargin: margins(6px, 6px, 6px, 6px);
+
+historyRecordDelete: IconButton(historyAttach) {
+	icon: icon {{ "info/info_media_delete", historyComposeIconFg }};
+	iconOver: icon {{ "info/info_media_delete", historyComposeIconFgOver }};
+	iconPosition: point(10px, 11px);
+}
+historyRecordWaveformRightSkip: 10px;
+historyRecordWaveformBgMargins: margins(5px, 7px, 5px, 7px);
+
+historyRecordWaveformBar: 3px;
+
+historyRecordLockPosition: point(1px, 35px);
+
+historyRecordCancelButtonWidth: 100px;
+historyRecordCancelButtonFg: lightButtonFg;
+
+historySilentToggle: IconButton(historyBotKeyboardShow) {
+	icon: icon {{ "chat/input_silent", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_silent", historyComposeIconFgOver }};
+}
+historySilentToggleOn: icon {{ "chat/input_silent_on", historyComposeIconFg }};
+historySilentToggleOnOver: icon {{ "chat/input_silent_on", historyComposeIconFgOver }};
+
+historySend: SendButton {
+	inner: IconButton(historyAttach) {
+		icon: historySendIcon;
+		iconOver: historySendIconOver;
+	}
+	record: historyRecordVoice;
+	recordOver: historyRecordVoiceOver;
+	sendDisabledFg: historyComposeIconFg;
+}
+
+defaultComposeControls: ComposeControls {
+	bg: historyComposeAreaBg;
+	radius: 0px;
+
+	field: historyComposeField;
+	send: historySend;
+	attach: historyAttach;
+	emoji: historyAttachEmoji;
+	tabbed: defaultEmojiPan;
+}
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 19dd9c827..a6ff9af75 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -56,7 +56,7 @@ using Core::RecentEmojiDocument;
 
 class EmojiColorPicker final : public Ui::RpWidget {
 public:
-	EmojiColorPicker(QWidget *parent);
+	EmojiColorPicker(QWidget *parent, const style::EmojiPan &st);
 
 	void showEmoji(EmojiPtr emoji);
 
@@ -87,6 +87,8 @@ private:
 	void updateSelected();
 	void setSelected(int newSelected);
 
+	const style::EmojiPan &_st;
+
 	bool _ignoreShow = false;
 
 	QVector<EmojiPtr> _variants;
@@ -118,9 +120,12 @@ struct EmojiListWidget::RecentOne {
 	RecentEmojiId id;
 };
 
-EmojiColorPicker::EmojiColorPicker(QWidget *parent)
+EmojiColorPicker::EmojiColorPicker(
+	QWidget *parent,
+	const style::EmojiPan &st)
 : RpWidget(parent)
-, _overBg(st::emojiPanRadius, st::emojiPanHover) {
+, _st(st)
+, _overBg(st::emojiPanRadius, _st.overBg) {
 	setMouseTracking(true);
 }
 
@@ -398,7 +403,7 @@ EmojiListWidget::EmojiListWidget(
 , _customRecentFactory(std::move(descriptor.customRecentFactory))
 , _overBg(st::emojiPanRadius, st().overBg)
 , _collapsedBg(st::emojiPanExpand.height / 2, st::emojiPanHeaderFg)
-, _picker(this)
+, _picker(this, st())
 , _showPickerTimer([=] { showPicker(); }) {
 	setMouseTracking(true);
 	if (st().bg->c.alpha() > 0) {
@@ -1006,7 +1011,7 @@ void EmojiListWidget::validateEmojiPaintContext(
 				st::stickerPanPremium1,
 				st::stickerPanPremium2,
 				0.5)
-			: st::windowFg->c),
+			: st().textFg->c),
 		.size = QSize(_customSingleSize, _customSingleSize),
 		.now = crl::now(),
 		.scale = context.progress,
@@ -1178,7 +1183,7 @@ void EmojiListWidget::drawCollapsedBadge(
 	const auto buttonx = position.x() + (_singleSize.width() - buttonw) / 2;
 	const auto buttony = position.y() + (_singleSize.height() - buttonh) / 2;
 	_collapsedBg.paint(p, QRect(buttonx, buttony, buttonw, buttonh));
-	p.setPen(st::emojiPanBg);
+	p.setPen(this->st().bg);
 	p.setFont(st.font);
 	p.drawText(
 		buttonx + (buttonw - textWidth) / 2,
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 8b24df18a..b78615721 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -69,6 +69,7 @@ public:
 
 	Inner(
 		std::shared_ptr<ChatHelpers::Show> show,
+		const style::EmojiPan &st,
 		not_null<FieldAutocomplete*> parent,
 		not_null<MentionRows*> mrows,
 		not_null<HashtagRows*> hrows,
@@ -126,11 +127,13 @@ private:
 
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
+	const style::EmojiPan &_st;
 	const not_null<FieldAutocomplete*> _parent;
 	const not_null<MentionRows*> _mrows;
 	const not_null<HashtagRows*> _hrows;
 	const not_null<BotCommandRows*> _brows;
 	const not_null<StickerRows*> _srows;
+	Ui::RoundRect _overBg;
 	rpl::lifetime _stickersLifetime;
 	std::weak_ptr<Lottie::FrameRenderer> _lottieRenderer;
 	base::unique_qptr<Ui::PopupMenu> _menu;
@@ -192,10 +195,12 @@ FieldAutocomplete::FieldAutocomplete(
 
 FieldAutocomplete::FieldAutocomplete(
 	QWidget *parent,
-	std::shared_ptr<ChatHelpers::Show> show)
+	std::shared_ptr<ChatHelpers::Show> show,
+	const style::EmojiPan *stOverride)
 : RpWidget(parent)
 , _show(std::move(show))
 , _session(&_show->session())
+, _st(stOverride ? *stOverride : st::defaultEmojiPan)
 , _scroll(this) {
 	hide();
 
@@ -204,6 +209,7 @@ FieldAutocomplete::FieldAutocomplete(
 	_inner = _scroll->setOwnedWidget(
 		object_ptr<Inner>(
 			_show,
+			_st,
 			this,
 			&_mrows,
 			&_hrows,
@@ -285,7 +291,7 @@ void FieldAutocomplete::paintEvent(QPaintEvent *e) {
 		return;
 	}
 
-	p.fillRect(rect(), st::mentionBg);
+	p.fillRect(rect(), _st.bg);
 }
 
 void FieldAutocomplete::showFiltered(
@@ -817,6 +823,7 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
 
 FieldAutocomplete::Inner::Inner(
 	std::shared_ptr<ChatHelpers::Show> show,
+	const style::EmojiPan &st,
 	not_null<FieldAutocomplete*> parent,
 	not_null<MentionRows*> mrows,
 	not_null<HashtagRows*> hrows,
@@ -824,14 +831,16 @@ FieldAutocomplete::Inner::Inner(
 	not_null<StickerRows*> srows)
 : _show(std::move(show))
 , _session(&_show->session())
+, _st(st)
 , _parent(parent)
 , _mrows(mrows)
 , _hrows(hrows)
 , _brows(brows)
 , _srows(srows)
+, _overBg(st::roundRadiusSmall, _st.overBg)
 , _pathGradient(std::make_unique<Ui::PathShiftGradient>(
-	st::windowBgRipple,
-	st::windowBgOver,
+	_st.pathBg,
+	_st.pathFg,
 	[=] { update(); }))
 , _premiumMark(_session)
 , _previewTimer([=] { showPreview(); }) {
@@ -900,7 +909,7 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 				if (_sel == index) {
 					QPoint tl(pos);
 					if (rtl()) tl.setX(width() - tl.x() - st::stickerPanSize.width());
-					Ui::FillRoundRect(p, QRect(tl, st::stickerPanSize), st::emojiPanHover, Ui::StickerHoverCorners);
+					_overBg.paint(p, QRect(tl, st::stickerPanSize));
 				}
 
 				media->checkStickerSmall();
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
index 1bb75f122..2606dc1f2 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
@@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/object_ptr.h"
 
+namespace style {
+struct EmojiPan;
+} // namespace style
+
 namespace Ui {
 class PopupMenu;
 class ScrollArea;
@@ -53,7 +57,8 @@ public:
 		not_null<Window::SessionController*> controller);
 	FieldAutocomplete(
 		QWidget *parent,
-		std::shared_ptr<ChatHelpers::Show> show);
+		std::shared_ptr<ChatHelpers::Show> show,
+		const style::EmojiPan *stOverride = nullptr);
 	~FieldAutocomplete();
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
@@ -153,6 +158,7 @@ private:
 
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
+	const style::EmojiPan &_st;
 	QPixmap _cache;
 	MentionRows _mrows;
 	HashtagRows _hrows;
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index d8ba04cf5..9ff10845d 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -98,7 +98,7 @@ GifsListWidget::GifsListWidget(
 	GifsListDescriptor &&descriptor)
 : Inner(
 	parent,
-	st::defaultEmojiPan,
+	descriptor.st ? *descriptor.st : st::defaultEmojiPan,
 	descriptor.show,
 	descriptor.paused)
 , _show(std::move(descriptor.show))
@@ -332,7 +332,7 @@ void GifsListWidget::inlineResultsDone(const MTPmessages_BotResults &result) {
 void GifsListWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	auto clip = e->rect();
-	p.fillRect(clip, st::emojiPanBg);
+	p.fillRect(clip, st().bg);
 
 	paintInlineItems(p, clip);
 }
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 36696ccab..03430e3ab 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -36,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "base/qt/qt_common_adapters.h"
 
 #include <QtCore/QMimeData>
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index a846b5362..a9aa598d6 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -1351,7 +1351,7 @@ void StickersListFooter::paintSetIconToCache(
 		const auto y = (st().footer - icon.pixh) / 2;
 		if (icon.custom) {
 			icon.custom->paint(p, Ui::Text::CustomEmoji::Context{
-				.textColor = st::windowFg->c,
+				.textColor = st().textFg->c,
 				.size = QSize(icon.pixw, icon.pixh),
 				.now = now,
 				.scale = context.progress,
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 349980b6c..40aae70eb 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -179,15 +179,17 @@ StickersListWidget::StickersListWidget(
 	StickersListDescriptor &&descriptor)
 : Inner(
 	parent,
-	st::defaultEmojiPan,
+	descriptor.st ? *descriptor.st : st::defaultEmojiPan,
 	descriptor.show,
 	descriptor.paused)
 , _mode(descriptor.mode)
 , _show(std::move(descriptor.show))
+, _overBg(st::roundRadiusSmall, st().overBg)
 , _api(&session().mtp())
 , _localSetsManager(std::make_unique<LocalStickersManager>(&session()))
 , _section(Section::Stickers)
 , _isMasks(_mode == Mode::Masks)
+, _settingsHidden(descriptor.settingsHidden)
 , _updateItemsTimer([=] { updateItems(); })
 , _updateSetsTimer([=] { updateSets(); })
 , _trendingAddBgOver(
@@ -201,8 +203,8 @@ StickersListWidget::StickersListWidget(
 	ImageRoundRadius::Small,
 	st::stickerGroupCategoryAdd.textBg)
 , _pathGradient(std::make_unique<Ui::PathShiftGradient>(
-	st::windowBgRipple,
-	st::windowBgOver,
+	st().pathBg,
+	st().pathFg,
 	[=] { update(); }))
 , _megagroupSetAbout(st::columnMinimalWidthThird - st::emojiScroll.width - st().headerLeft)
 , _addText(tr::lng_stickers_featured_add(tr::now).toUpper())
@@ -284,7 +286,8 @@ object_ptr<TabbedSelector::InnerFooter> StickersListWidget::createFooter() {
 		.session = &session(),
 		.paused = footerPaused,
 		.parent = this,
-		.settingsButtonVisible = true,
+		.settingsButtonVisible = !_settingsHidden,
+		.st = &st(),
 	});
 	_footer = result;
 
@@ -844,7 +847,7 @@ QRect StickersListWidget::stickerRect(int section, int sel) {
 void StickersListWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	auto clip = e->rect();
-	p.fillRect(clip, st::emojiPanBg);
+	p.fillRect(clip, st().bg);
 
 	paintStickers(p, clip);
 }
@@ -1342,7 +1345,7 @@ void StickersListWidget::paintSticker(
 	if (selected) {
 		auto tl = pos;
 		if (rtl()) tl.setX(width() - tl.x() - _singleSize.width());
-		Ui::FillRoundRect(p, QRect(tl, _singleSize), st::emojiPanHover, Ui::StickerHoverCorners);
+		_overBg.paint(p, QRect(tl, _singleSize));
 	}
 
 	media->checkStickerSmall();
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index afde28b81..dc4e7dc44 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -70,6 +70,7 @@ struct StickersListDescriptor {
 	StickersListMode mode = StickersListMode::Full;
 	Fn<bool()> paused;
 	const style::EmojiPan *st = nullptr;
+	bool settingsHidden = false;
 };
 
 class StickersListWidget final : public TabbedSelector::Inner {
@@ -351,6 +352,7 @@ private:
 
 	const Mode _mode;
 	const std::shared_ptr<Show> _show;
+	Ui::RoundRect _overBg;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	MTP::Sender _api;
 	std::unique_ptr<LocalStickersManager> _localSetsManager;
@@ -373,6 +375,7 @@ private:
 
 	Section _section = Section::Stickers;
 	const bool _isMasks;
+	bool _settingsHidden = false;
 
 	base::Timer _updateItemsTimer;
 	base::Timer _updateSetsTimer;
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 463b35f16..5131c9f9b 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -50,7 +50,7 @@ public:
 	void setFinalImages(Direction direction, QImage &&left, QImage &&right, QRect inner, bool wasSectionIcons);
 
 	void start();
-	void paintFrame(QPainter &p, float64 dt, float64 opacity);
+	void paintFrame(QPainter &p, const style::EmojiPan &st, float64 dt, float64 opacity);
 
 private:
 	Direction _direction = Direction::LeftToRight;
@@ -131,7 +131,11 @@ void TabbedSelector::SlideAnimation::start() {
 	_frameIntsPerLineAdd = (_width - _innerWidth) + _frameIntsPerLineAdded;
 }
 
-void TabbedSelector::SlideAnimation::paintFrame(QPainter &p, float64 dt, float64 opacity) {
+void TabbedSelector::SlideAnimation::paintFrame(
+		QPainter &p,
+		const style::EmojiPan &st,
+		float64 dt,
+		float64 opacity) {
 	Expects(started());
 	Expects(dt >= 0.);
 
@@ -168,8 +172,8 @@ void TabbedSelector::SlideAnimation::paintFrame(QPainter &p, float64 dt, float64
 	{
 		auto p = QPainter(&_frame);
 		p.setOpacity(opacity);
-		p.fillRect(_painterInnerLeft, _painterInnerTop, _painterInnerWidth, _painterCategoriesTop - _painterInnerTop, st::emojiPanBg);
-		p.fillRect(_painterInnerLeft, _painterCategoriesTop, _painterInnerWidth, _painterInnerBottom - _painterCategoriesTop, _wasSectionIcons ? st::emojiPanCategories : st::emojiPanBg);
+		p.fillRect(_painterInnerLeft, _painterInnerTop, _painterInnerWidth, _painterCategoriesTop - _painterInnerTop, st.bg);
+		p.fillRect(_painterInnerLeft, _painterCategoriesTop, _painterInnerWidth, _painterInnerBottom - _painterCategoriesTop, _wasSectionIcons ? st.categoriesBg : st.bg);
 		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
 		if (leftTo > _innerLeft) {
 			p.setOpacity(opacity * leftAlpha);
@@ -325,11 +329,24 @@ TabbedSelector::TabbedSelector(
 	std::shared_ptr<Show> show,
 	PauseReason level,
 	Mode mode)
+: TabbedSelector(parent, {
+	.show = std::move(show),
+	.st = (mode == Mode::EmojiStatus
+		? st::statusEmojiPan
+		: st::defaultEmojiPan),
+	.level = level,
+	.mode = mode,
+}) {
+}
+
+TabbedSelector::TabbedSelector(
+	QWidget *parent,
+	TabbedSelectorDescriptor &&descriptor)
 : RpWidget(parent)
-, _st((mode == Mode::EmojiStatus) ? st::statusEmojiPan : st::defaultEmojiPan)
-, _show(std::move(show))
-, _level(level)
-, _mode(mode)
+, _st(descriptor.st)
+, _show(std::move(descriptor.show))
+, _level(descriptor.level)
+, _mode(descriptor.mode)
 , _panelRounding(Ui::PrepareCornerPixmaps(st::emojiPanRadius, _st.bg))
 , _categoriesRounding(
 	Ui::PrepareCornerPixmaps(st::emojiPanRadius, _st.categoriesBg))
@@ -360,6 +377,7 @@ TabbedSelector::TabbedSelector(
 		: SelectorTab::Emoji)
 , _hasEmojiTab(ranges::contains(_tabs, SelectorTab::Emoji, &Tab::type))
 , _hasStickersTab(ranges::contains(_tabs, SelectorTab::Stickers, &Tab::type))
+, _stickersSettingsHidden(descriptor.stickersSettingsHidden)
 , _hasGifsTab(ranges::contains(_tabs, SelectorTab::Gifs, &Tab::type))
 , _hasMasksTab(ranges::contains(_tabs, SelectorTab::Masks, &Tab::type))
 , _tabbed(_tabs.size() > 1) {
@@ -445,10 +463,10 @@ TabbedSelector::TabbedSelector(
 	) | rpl::start_with_next([=] {
 		_panelRounding = Ui::PrepareCornerPixmaps(
 			st::emojiPanRadius,
-			st::emojiPanBg);
+			_st.bg);
 		_categoriesRounding = Ui::PrepareCornerPixmaps(
 			st::emojiPanRadius,
-			st::emojiPanCategories);
+			_st.categoriesBg);
 	}, lifetime());
 
 	if (hasEmojiTab()) {
@@ -503,6 +521,7 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 				.mode = StickersMode::Full,
 				.paused = paused,
 				.st = &_st,
+				.settingsHidden = _stickersSettingsHidden,
 			});
 		}
 		case SelectorTab::Gifs: {
@@ -704,10 +723,10 @@ void TabbedSelector::paintSlideFrame(QPainter &p) {
 	if (_roundRadius > 0) {
 		paintBgRoundedPart(p);
 	} else if (_tabsSlider) {
-		p.fillRect(0, 0, width(), _tabsSlider->height(), st::emojiPanBg);
+		p.fillRect(0, 0, width(), _tabsSlider->height(), _st.bg);
 	}
 	auto slideDt = _a_slide.value(1.);
-	_slideAnimation->paintFrame(p, slideDt, 1.);
+	_slideAnimation->paintFrame(p, _st, slideDt, 1.);
 }
 
 void TabbedSelector::paintBgRoundedPart(QPainter &p) {
@@ -716,7 +735,7 @@ void TabbedSelector::paintBgRoundedPart(QPainter &p) {
 		: _tabsSlider
 		? QRect(0, 0, width(), _tabsSlider->height())
 		: QRect(0, 0, width(), _roundRadius);
-	Ui::FillRoundRect(p, fill, st::emojiPanBg, {
+	Ui::FillRoundRect(p, fill, _st.bg, {
 		.p = {
 			_dropDown ? QPixmap() : _panelRounding.p[0],
 			_dropDown ? QPixmap() : _panelRounding.p[1],
@@ -765,10 +784,10 @@ void TabbedSelector::paintContent(QPainter &p) {
 				sidesTop,
 				st::emojiScroll.width,
 				sidesHeight),
-			st::emojiPanBg);
+			_st.bg);
 		p.fillRect(
 			myrtlrect(0, sidesTop, st::emojiPanRadius, sidesHeight),
-			st::emojiPanBg);
+			_st.bg);
 	}
 }
 
@@ -1030,7 +1049,7 @@ void TabbedSelector::setAllowEmojiWithoutPremium(bool allow) {
 }
 
 void TabbedSelector::createTabsSlider() {
-	_tabsSlider.create(this, st::emojiTabs);
+	_tabsSlider.create(this, _st.tabs);
 
 	fillTabsSliderSections();
 
@@ -1324,7 +1343,7 @@ void TabbedSelector::Inner::paintEmptySearchResults(
 		iconTop + icon.height() - st::normalFont->height,
 		height() - 2 * st::normalFont->height);
 	p.setFont(st::normalFont);
-	p.setPen(st::windowSubTextFg);
+	p.setPen(_st.tabs.labelFg);
 	p.drawTextLeft(
 		(width() - textWidth) / 2,
 		textTop,
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index f7f65811a..bcaa4fdee 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -75,6 +75,21 @@ struct EmojiChosen {
 
 using InlineChosen = InlineBots::ResultSelected;
 
+enum class TabbedSelectorMode {
+	Full,
+	EmojiOnly,
+	MediaEditor,
+	EmojiStatus,
+};
+
+struct TabbedSelectorDescriptor {
+	std::shared_ptr<Show> show;
+	const style::EmojiPan &st;
+	PauseReason level = {};
+	TabbedSelectorMode mode = TabbedSelectorMode::Full;
+	bool stickersSettingsHidden = false;
+};
+
 [[nodiscard]] std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 	not_null<Ui::RpWidget*> parent,
 	const style::EmojiPan &st,
@@ -86,12 +101,7 @@ using InlineChosen = InlineBots::ResultSelected;
 class TabbedSelector : public Ui::RpWidget {
 public:
 	static constexpr auto kPickCustomTimeId = -1;
-	enum class Mode {
-		Full,
-		EmojiOnly,
-		MediaEditor,
-		EmojiStatus,
-	};
+	using Mode = TabbedSelectorMode;
 	enum class Action {
 		Update,
 		Cancel,
@@ -102,6 +112,9 @@ public:
 		std::shared_ptr<Show> show,
 		PauseReason level,
 		Mode mode = Mode::Full);
+	TabbedSelector(
+		QWidget *parent,
+		TabbedSelectorDescriptor &&descriptor);
 	~TabbedSelector();
 
 	[[nodiscard]] Main::Session &session() const;
@@ -278,6 +291,7 @@ private:
 
 	const bool _hasEmojiTab;
 	const bool _hasStickersTab;
+	const bool _stickersSettingsHidden;
 	const bool _hasGifsTab;
 	const bool _hasMasksTab;
 	const bool _tabbed;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 86e37617c..87da53703 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -229,7 +229,7 @@ HistoryWidget::HistoryWidget(
 , _supportAutocomplete(session().supportMode()
 	? object_ptr<Support::Autocomplete>(this, &session())
 	: nullptr)
-, _send(std::make_shared<Ui::SendButton>(this))
+, _send(std::make_shared<Ui::SendButton>(this, st::historySend))
 , _unblock(this, tr::lng_unblock_button(tr::now).toUpper(), st::historyUnblock)
 , _botStart(this, tr::lng_bot_start(tr::now).toUpper(), st::historyComposeButton)
 , _joinChannel(
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 a4edc44cd..a3fd8b3c8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -58,7 +58,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/session/send_as_peers.h"
 #include "media/audio/media_audio_capture.h"
 #include "media/audio/media_audio.h"
-#include "styles/style_chat.h"
 #include "ui/text/text_options.h"
 #include "ui/ui_utility.h"
 #include "ui/widgets/input_fields.h"
@@ -72,6 +71,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_adaptive.h"
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView {
 namespace {
@@ -938,7 +939,11 @@ ComposeControls::ComposeControls(
 ComposeControls::ComposeControls(
 	not_null<Ui::RpWidget*> parent,
 	ComposeControlsDescriptor descriptor)
-: _parent(parent)
+: _st(descriptor.stOverride
+	? *descriptor.stOverride
+	: st::defaultComposeControls)
+, _features(descriptor.features)
+, _parent(parent)
 , _show(std::move(descriptor.show))
 , _session(&_show->session())
 , _regularWindow(descriptor.regularWindow)
@@ -946,30 +951,37 @@ ComposeControls::ComposeControls(
 	? nullptr
 	: std::make_unique<ChatHelpers::TabbedSelector>(
 		_parent,
-		_show,
-		Window::GifPauseReason::TabbedPanel))
+		ChatHelpers::TabbedSelectorDescriptor{
+			.show = _show,
+			.st = _st.tabbed,
+			.level = Window::GifPauseReason::TabbedPanel,
+			.mode = ChatHelpers::TabbedSelector::Mode::Full,
+			.stickersSettingsHidden = !_features.stickersSettings,
+		}))
 , _selector(_regularWindow
 	? _regularWindow->tabbedSelector()
 	: not_null(_ownedSelector.get()))
 , _mode(descriptor.mode)
 , _wrap(std::make_unique<Ui::RpWidget>(parent))
 , _writeRestricted(std::make_unique<Ui::RpWidget>(parent))
-, _send(std::make_shared<Ui::SendButton>(_wrap.get()))
+, _send(std::make_shared<Ui::SendButton>(_wrap.get(), _st.send))
 , _attachToggle(Ui::CreateChild<Ui::IconButton>(
 	_wrap.get(),
-	st::historyAttach))
+	_st.attach))
 , _tabbedSelectorToggle(Ui::CreateChild<Ui::EmojiButton>(
 	_wrap.get(),
-	st::historyAttachEmoji))
+	_st.emoji))
 , _field(
 	Ui::CreateChild<Ui::InputField>(
 		_wrap.get(),
-		st::historyComposeField,
+		_st.field,
 		Ui::InputField::Mode::MultiLine,
 		tr::lng_message_ph()))
-, _botCommandStart(Ui::CreateChild<Ui::IconButton>(
-	_wrap.get(),
-	st::historyBotCommandStart))
+, _botCommandStart(_features.botCommandSend
+	? Ui::CreateChild<Ui::IconButton>(
+		_wrap.get(),
+		st::historyBotCommandStart)
+	: nullptr)
 , _autocomplete(std::make_unique<FieldAutocomplete>(parent, _show))
 , _header(std::make_unique<FieldHeader>(_wrap.get(), _show))
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
@@ -982,6 +994,9 @@ ComposeControls::ComposeControls(
 , _unavailableEmojiPasted(std::move(descriptor.unavailableEmojiPasted))
 , _saveDraftTimer([=] { saveDraft(); })
 , _saveCloudDraftTimer([=] { saveCloudDraft(); }) {
+	if (_st.radius > 0) {
+		_backgroundRect.emplace(_st.radius, _st.bg);
+	}
 	if (descriptor.stickerOrEmojiChosen) {
 		std::move(
 			descriptor.stickerOrEmojiChosen
@@ -1421,7 +1436,9 @@ void ComposeControls::init() {
 		updateWrappingVisibility();
 	}, _wrap->lifetime());
 
-	_botCommandStart->setClickedCallback([=] { setText({ "/" }); });
+	if (_botCommandStart) {
+		_botCommandStart->setClickedCallback([=] { setText({ "/" }); });
+	}
 
 	_wrap->sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
@@ -2382,9 +2399,11 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 	right += _send->width();
 	_tabbedSelectorToggle->moveToRight(right, buttonsTop);
 	right += _tabbedSelectorToggle->width();
-	_botCommandStart->moveToRight(right, buttonsTop);
-	if (_botCommandShown) {
-		right += _botCommandStart->width();
+	if (_botCommandStart) {
+		_botCommandStart->moveToRight(right, buttonsTop);
+		if (_botCommandShown) {
+			right += _botCommandStart->width();
+		}
 	}
 	if (_silent) {
 		_silent->moveToRight(right, buttonsTop);
@@ -2401,7 +2420,9 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 }
 
 void ComposeControls::updateControlsVisibility() {
-	_botCommandStart->setVisible(_botCommandShown);
+	if (_botCommandStart) {
+		_botCommandStart->setVisible(_botCommandShown);
+	}
 	if (_ttlInfo) {
 		_ttlInfo->show();
 	}
@@ -2419,7 +2440,8 @@ void ComposeControls::updateControlsVisibility() {
 bool ComposeControls::updateBotCommandShown() {
 	auto shown = false;
 	const auto peer = _history ? _history->peer.get() : nullptr;
-	if (peer
+	if (_botCommandStart
+		&& peer
 		&& ((peer->isChat() && peer->asChat()->botStatus > 0)
 			|| (peer->isMegagroup() && peer->asChannel()->mgInfo->botStatus > 0)
 			|| (peer->isUser() && peer->asUser()->isBot()))) {
@@ -2449,7 +2471,9 @@ void ComposeControls::updateOuterGeometry(QRect rect) {
 
 void ComposeControls::updateMessagesTTLShown() {
 	const auto peer = _history ? _history->peer.get() : nullptr;
-	const auto shown = peer && (peer->messagesTTL() > 0);
+	const auto shown = _features.ttlInfo
+		&& peer
+		&& (peer->messagesTTL() > 0);
 	if (!shown && _ttlInfo) {
 		_ttlInfo = nullptr;
 		updateControlsVisibility();
@@ -2467,7 +2491,8 @@ void ComposeControls::updateMessagesTTLShown() {
 
 bool ComposeControls::updateSendAsButton() {
 	const auto peer = _history ? _history->peer.get() : nullptr;
-	if (!peer
+	if (!_features.sendAs
+		|| !peer
 		|| !_regularWindow
 		|| isEditingMessage()
 		|| !session().sendAsPeers().shouldChoose(peer)) {
@@ -2491,7 +2516,10 @@ bool ComposeControls::updateSendAsButton() {
 
 void ComposeControls::updateAttachBotsMenu() {
 	_attachBotsMenu = nullptr;
-	if (!_history || !_sendActionFactory || !_regularWindow) {
+	if (!_features.attachBotsMenu
+		|| !_history
+		|| !_sendActionFactory
+		|| !_regularWindow) {
 		return;
 	}
 	_attachBotsMenu = InlineBots::MakeAttachBotsMenu(
@@ -2515,7 +2543,18 @@ void ComposeControls::updateAttachBotsMenu() {
 void ComposeControls::paintBackground(QRect clip) {
 	Painter p(_wrap.get());
 
-	p.fillRect(clip, st::historyComposeAreaBg);
+	if (_backgroundRect) {
+		//p.setCompositionMode(QPainter::CompositionMode_Source);
+		//p.fillRect(clip, Qt::transparent);
+		//p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		//_backgroundRect->paint(p, _wrap->rect());
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(_st.bg);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(_wrap->rect(), _st.radius, _st.radius);
+	} else {
+		p.fillRect(clip, _st.bg);
+	}
 }
 
 void ComposeControls::escape() {
@@ -2913,7 +2952,7 @@ bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
 }
 
 bool ComposeControls::hasSilentBroadcastToggle() const {
-	if (!_history) {
+	if (!_features.silentBroadcastToggle || !_history) {
 		return false;
 	}
 	const auto &peer = _history->peer;
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 16a114ec8..d5749bfcb 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "dialogs/dialogs_key.h"
 #include "history/view/controls/compose_controls_common.h"
+#include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/input_fields.h"
@@ -21,6 +22,10 @@ class History;
 class DocumentData;
 class FieldAutocomplete;
 
+namespace style {
+struct ComposeControls;
+} // namespace style
+
 namespace SendMenu {
 enum class Type;
 } // namespace SendMenu
@@ -88,13 +93,25 @@ enum class ComposeControlsMode {
 	Scheduled,
 };
 
+struct ComposeControlsFeatures {
+	bool sendAs = true;
+	bool ttlInfo = true;
+	bool botCommandSend = true;
+	bool silentBroadcastToggle = true;
+	bool attachBotsMenu = true;
+	bool inlineBots = true;
+	bool stickersSettings = true;
+};
+
 struct ComposeControlsDescriptor {
+	const style::ComposeControls *stOverride = nullptr;
 	std::shared_ptr<ChatHelpers::Show> show;
 	Fn<void(not_null<DocumentData*>)> unavailableEmojiPasted;
 	ComposeControlsMode mode = ComposeControlsMode::Normal;
 	SendMenu::Type sendMenuType = {};
 	Window::SessionController *regularWindow = nullptr;
 	rpl::producer<ChatHelpers::FileChosen> stickerOrEmojiChosen;
+	ComposeControlsFeatures features;
 };
 
 class ComposeControls final {
@@ -311,6 +328,8 @@ private:
 	void registerDraftSource();
 	void changeFocusedControl();
 
+	const style::ComposeControls &_st;
+	const ComposeControlsFeatures _features;
 	const not_null<QWidget*> _parent;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
@@ -332,12 +351,14 @@ private:
 	const std::unique_ptr<Ui::RpWidget> _wrap;
 	const std::unique_ptr<Ui::RpWidget> _writeRestricted;
 
+	std::optional<Ui::RoundRect> _backgroundRect;
+
 	const std::shared_ptr<Ui::SendButton> _send;
 	const not_null<Ui::IconButton*> _attachToggle;
 	std::unique_ptr<Ui::IconButton> _replaceMedia;
 	const not_null<Ui::EmojiButton*> _tabbedSelectorToggle;
 	const not_null<Ui::InputField*> _field;
-	const not_null<Ui::IconButton*> _botCommandStart;
+	Ui::IconButton * const _botCommandStart = nullptr;
 	std::unique_ptr<Ui::SendAsButton> _sendAs;
 	std::unique_ptr<Ui::SilentToggle> _silent;
 	std::unique_ptr<Controls::TTLButton> _ttlInfo;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 000635db6..f800f192c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -26,6 +26,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 , _controls(std::make_unique<HistoryView::ComposeControls>(
 	_controller->wrap(),
 	HistoryView::ComposeControlsDescriptor{
+		.stOverride = &st::storiesComposeControls,
 		.show = _controller->uiShow(),
 		.unavailableEmojiPasted = [=](not_null<DocumentData*> emoji) {
 			showPremiumToast(emoji);
@@ -33,6 +34,14 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 		.mode = HistoryView::ComposeControlsMode::Normal,
 		.sendMenuType = SendMenu::Type::SilentOnly,
 		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
+		.features = {
+			.sendAs = false,
+			.ttlInfo = false,
+			.botCommandSend = false,
+			.silentBroadcastToggle = false,
+			.attachBotsMenu = false,
+			.inlineBots = false,
+		},
 	}
 )) {
 	initGeometry();
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 3cd675b90..7e01278eb 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -11,6 +11,7 @@ using "ui/widgets/widgets.style";
 using "ui/menu_icons.style";
 using "media/player/media_player.style";
 using "boxes/boxes.style";
+using "chat_helpers/chat_helpers.style";
 
 mediaviewOverDuration: 150;
 
@@ -434,22 +435,106 @@ storiesShadowTop: icon{{ "mediaview/shadow_bottom-flip_vertical", windowShadowFg
 storiesShadowBottom: mediaviewShadowBottom;
 storiesControlsMinWidth: 200px;
 storiesFieldMargin: margins(0px, 14px, 0px, 16px);
-storiesAttach: IconButton(defaultIconButton) {
-	width: 44px;
-	height: 46px;
-
-	icon: icon {{ "chat/input_attach", historyComposeIconFg }};
-	iconOver: icon {{ "chat/input_attach", historyComposeIconFgOver }};
-
-	rippleAreaPosition: point(2px, 3px);
-	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
-}
 storiesSideSkip: 145px;
 storiesCaptionFull: FlatLabel(defaultFlatLabel) {
 	style: mediaviewCaptionStyle;
 	textFg: mediaviewCaptionFg;
 	minWidth: 360px;
 }
+storiesComposeBg: groupCallMembersBg;
+storiesComposeBgOver: groupCallMembersBgOver;
+storiesComposeBgRipple: groupCallMembersBgRipple;
+storiesComposeWhiteText: groupCallMembersFg;
+storiesComposeGrayText: groupCallMemberNotJoinedStatus;
+storiesComposeGrayIcon: groupCallMemberInactiveIcon;
+storiesComposeBlue: groupCallActiveFg;
+storiesComposeRipple: RippleAnimation(defaultRippleAnimation) {
+	color: groupCallMembersBgRipple;
+}
+storiesAttach: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_attach", storiesComposeGrayIcon }};
+	iconOver: icon {{ "chat/input_attach", storiesComposeGrayIcon }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: storiesComposeBgOver;
+	}
+}
+storiesRecordVoice: icon {{ "chat/input_record", storiesComposeGrayIcon }};
+storiesRecordVoiceOver: icon {{ "chat/input_record", storiesComposeGrayIcon }};
+storiesComposeControls: ComposeControls(defaultComposeControls) {
+	bg: storiesComposeBg;
+	radius: storiesRadius;
+	field: InputField(historyComposeField) {
+		textFg: storiesComposeWhiteText;
+		textBg: storiesComposeBg;
+		placeholderFg: storiesComposeGrayText;
+		placeholderFgActive: storiesComposeGrayText;
+		placeholderFgError: storiesComposeGrayText;
+	}
+	send: SendButton(historySend) {
+		inner: IconButton(storiesAttach) {
+			icon: icon {{ "chat/input_send", storiesComposeBlue }};
+			iconOver: icon {{ "chat/input_send", storiesComposeBlue }};
+		}
+		record: storiesRecordVoice;
+		recordOver: storiesRecordVoiceOver;
+		sendDisabledFg: storiesComposeGrayText;
+	}
+	attach: storiesAttach;
+	emoji: EmojiButton(historyAttachEmoji) {
+		inner: IconButton(storiesAttach) {
+			icon: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
+			iconOver: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
+		}
+		bg: storiesComposeBg;
+		lineFg: storiesComposeGrayIcon;
+		lineFgOver: storiesComposeGrayIcon;
+	}
+	tabbed: EmojiPan(defaultEmojiPan) {
+		bg: storiesComposeBg;
+		overBg: storiesComposeBgOver;
+		expandBg: storiesComposeGrayText;
+		pathBg: storiesComposeBgRipple;
+		pathFg: storiesComposeBgOver;
+		textFg: storiesComposeWhiteText;
+		categoriesBg: storiesComposeBg;
+		categoriesBgOver: storiesComposeBgOver;
+		fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
+		fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
+		tabs: SettingsSlider(emojiTabs) {
+			barFgActive: storiesComposeBlue;
+			labelFg: storiesComposeGrayText;
+			labelFgActive: storiesComposeBlue;
+			rippleBg: storiesComposeBgOver;
+			rippleBgActive: storiesComposeBgOver;
+		}
+		search: TabbedSearch(defaultTabbedSearch) {
+			outer: storiesComposeBg;
+			bg: storiesComposeBgOver;
+			bgActive: storiesComposeBgRipple;
+			fg: storiesComposeGrayIcon;
+			fgActive: storiesComposeWhiteText;
+			fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBgOver }};
+			fadeRight: icon {{ "fade_horizontal", storiesComposeBgOver }};
+			field: InputField(defaultTabbedSearchField) {
+				placeholderFg: storiesComposeGrayText;
+				placeholderFgActive: storiesComposeGrayText;
+				placeholderFgError: storiesComposeGrayText;
+			}
+			search: IconButton(defaultTabbedSearchButton) {
+				icon: icon{{ "emoji/emoji_search_input", storiesComposeGrayIcon }};
+				iconOver: icon{{ "emoji/emoji_search_input", storiesComposeGrayIcon }};
+				ripple: storiesComposeRipple;
+			}
+			back: IconButton(defaultTabbedSearchBack) {
+				icon: icon{{ "emoji/emoji_back", storiesComposeGrayIcon }};
+				iconOver: icon{{ "emoji/emoji_back", storiesComposeGrayIcon }};
+				ripple: storiesComposeRipple;
+			}
+			cancel: CrossButton(defaultTabbedSearchCancel) {
+				crossFg: storiesComposeGrayIcon;
+				crossFgOver: storiesComposeGrayIcon;
+				ripple: emptyRippleAnimation;
+			}
+		}
+	}
+}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 2d7da4d8b..8ff30f817 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -89,6 +89,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_account.h"
 #include "calls/calls_instance.h"
 #include "styles/style_media_view.h"
+#include "styles/style_calls.h"
 #include "styles/style_chat.h"
 #include "styles/style_menu_icons.h"
 
@@ -336,6 +337,8 @@ OverlayWidget::OverlayWidget()
 , _lastAction(-st::mediaviewDeltaFromLastAction, -st::mediaviewDeltaFromLastAction)
 , _stateAnimation([=](crl::time now) { return stateAnimationCallback(now); })
 , _dropdown(_body, st::mediaviewDropdownMenu) {
+	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
+
 	CrashReports::SetAnnotation("OpenGL Renderer", "[not-initialized]");
 
 	Lang::Updated(
diff --git a/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp b/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
index 746fbd4e2..0cf0d5121 100644
--- a/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animation_value.h"
 #include "ui/ui_utility.h"
 #include "ui/widgets/vertical_drum_picker.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 
 namespace Ui {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
index f6e8ee28e..60cc5ae68 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "base/timer_rpl.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_boxes.h"
 
 namespace Ui {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 56e4bdcb7..2e71553ab 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/power_saving.h"
 #include "base/call_delayed.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_boxes.h"
 
 #include <QtCore/QFileInfo>
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 7e6b3dfcd..d4b66ab07 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -9,22 +9,7 @@ using "ui/basic.style";
 using "dialogs/dialogs.style";
 using "ui/widgets/widgets.style";
 using "ui/menu_icons.style";
-
-MessageBar {
-	title: TextStyle;
-	titleFg: color;
-	text: TextStyle;
-	textFg: color;
-	textPalette: TextPalette;
-	duration: int;
-}
-
-GroupCallUserpics {
-	size: pixels;
-	shift: pixels;
-	stroke: pixels;
-	align: align;
-}
+using "chat_helpers/chat_helpers.style"; // GroupCallUserpics
 
 msgMaxWidth: 430px;
 msgFont: font(fsize);
@@ -145,9 +130,6 @@ outSemiboldPalette: TextPalette(outTextPalette) {
 	selectFg: msgOutServiceFgSelected;
 	selectLinkFg: msgOutServiceFgSelected;
 }
-historyComposeAreaPalette: TextPalette(defaultTextPalette) {
-	linkFg: historyComposeAreaFgService;
-}
 
 mediaCaptionSkip: 5px;
 mediaInBubbleSkip: 5px;
@@ -162,15 +144,6 @@ mediaInPaletteSelected: TextPalette(defaultTextPalette) {
 	linkFg: mediaInFgSelected;
 }
 
-defaultMessageBar: MessageBar {
-	title: semiboldTextStyle;
-	titleFg: windowActiveTextFg;
-	text: messageTextStyle;
-	textFg: historyComposeAreaFg;
-	textPalette: historyComposeAreaPalette;
-	duration: 160;
-}
-
 minPhotoSize: 100px;
 maxMediaSize: 430px;
 maxStickerSize: 224px;
@@ -229,58 +202,6 @@ historyPremiumViewSet: RoundButton(defaultActiveButton) {
 	ripple: emptyRippleAnimation;
 }
 
-historyToDownPosition: point(12px, 10px);
-historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg }};
-historyToDownAboveOver: icon {{ "history_down_arrow", historyToDownFgOver }};
-historyToDownPaddingTop: 10px;
-historyToDownBelow: icon {
-	{ "history_down_shadow", historyToDownShadow },
-	{ "history_down_circle", historyToDownBg },
-};
-historyToDownBelowOver: icon {
-	{ "history_down_shadow", historyToDownShadow },
-	{ "history_down_circle", historyToDownBgOver },
-};
-historyToDown: TwoIconButton {
-	width: 52px;
-	height: 62px;
-
-	iconBelow: historyToDownBelow;
-	iconBelowOver: historyToDownBelowOver;
-	iconAbove: historyToDownAbove;
-	iconAboveOver: historyToDownAboveOver;
-	iconPosition: point(0px, historyToDownPaddingTop);
-
-	rippleAreaPosition: point(5px, 15px);
-	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: historyToDownBgRipple;
-	}
-}
-historyToDownBadgeFont: semiboldFont;
-historyToDownBadgeSize: 22px;
-
-historyToDownShownAfter: 480px;
-historyToDownDuration: 150;
-
-dialogsToUpAbove: icon {{ "history_down_arrow-flip_vertical", historyToDownFg, point(0px, 1px) }};
-dialogsToUpAboveOver: icon {{ "history_down_arrow-flip_vertical", historyToDownFgOver, point(0px, 1px) }};
-
-dialogsToUp: TwoIconButton(historyToDown) {
-	iconAbove: dialogsToUpAbove;
-	iconAboveOver: dialogsToUpAboveOver;
-}
-
-historyUnreadMentions: TwoIconButton(historyToDown) {
-	iconAbove: icon {{ "history_unread_mention", historyToDownFg }};
-	iconAboveOver: icon {{ "history_unread_mention", historyToDownFgOver }};
-}
-historyUnreadReactions: TwoIconButton(historyToDown) {
-	iconAbove: icon {{ "history_unread_reaction", historyToDownFg }};
-	iconAboveOver: icon {{ "history_unread_reaction", historyToDownFgOver }};
-}
-historyUnreadThingsSkip: 4px;
-
 membersInnerWidth: 310px;
 membersInnerHeightMax: 360px;
 membersInnerDropdown: InnerDropdown(defaultInnerDropdown) {
@@ -366,29 +287,6 @@ historyPinOutIcon: icon {{ "history_pin", historyOutIconFg }};
 historyPinOutSelectedIcon: icon {{ "history_pin", historyOutIconFgSelected }};
 historyPinInvertedIcon: icon {{ "history_pin", historySendingInvertedIconFg }};
 
-historyComposeField: InputField(defaultInputField) {
-	font: msgFont;
-	textMargins: margins(0px, 0px, 0px, 0px);
-	textAlign: align(left);
-	textFg: historyComposeAreaFg;
-	textBg: historyComposeAreaBg;
-	heightMin: 36px;
-	heightMax: 72px;
-	placeholderFg: placeholderFg;
-	placeholderFgActive: placeholderFgActive;
-	placeholderFgError: placeholderFgActive;
-	placeholderMargins: margins(7px, 5px, 7px, 5px);
-	placeholderAlign: align(topleft);
-	placeholderScale: 0.;
-	placeholderFont: normalFont;
-	placeholderShift: -50px;
-	border: 0px;
-	borderActive: 0px;
-	duration: 100;
-}
-historyComposeFieldMaxHeight: 224px;
-// historyMinHeight: 56px;
-
 historySendPadding: 9px;
 historySendRight: 2px;
 historyBotMenuSkip: 8px;
@@ -399,245 +297,6 @@ historyBotMenuButton: RoundButton(defaultActiveButton) {
 	textTop: 6px;
 }
 
-historyComposeButton: FlatButton {
-	color: windowActiveTextFg;
-	overColor: windowActiveTextFg;
-
-	bgColor: historyComposeButtonBg;
-	overBgColor: historyComposeButtonBgOver;
-
-	width: -32px;
-	height: 46px;
-
-	textTop: 14px;
-
-	font: semiboldFont;
-	overFont: semiboldFont;
-
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: historyComposeButtonBgRipple;
-	}
-}
-historyUnblock: FlatButton(historyComposeButton) {
-	color: attentionButtonFg;
-	overColor: attentionButtonFgOver;
-}
-historyContactStatusButton: FlatButton(historyComposeButton) {
-	height: 49px;
-	textTop: 16px;
-	overBgColor: historyComposeButtonBg;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: historyComposeButtonBgOver;
-	}
-}
-historyContactStatusBlock: FlatButton(historyContactStatusButton) {
-	color: attentionButtonFg;
-	overColor: attentionButtonFg;
-}
-historyContactStatusLabel: FlatLabel(defaultFlatLabel) {
-	minWidth: 240px;
-}
-historyEmojiStatusInfoLabel: FlatLabel(historyContactStatusLabel) {
-	align: align(top);
-	textFg: windowSubTextFg;
-}
-historyContactStatusMinSkip: 16px;
-
-historySendIcon: icon {{ "chat/input_send", historySendIconFg }};
-historySendIconOver: icon {{ "chat/input_send", historySendIconFgOver }};
-historySendIconPosition: point(10px, 11px);
-historySendSize: size(44px, 46px);
-historyScheduleIcon: icon {{ "chat/input_schedule", historyComposeAreaBg }};
-historyScheduleIconPosition: point(7px, 8px);
-historyEditSaveIcon: icon {{ "chat/input_save", historySendIconFg }};
-historyEditSaveIconOver: icon {{ "chat/input_save", historySendIconFgOver }};
-
-historyAttach: IconButton(defaultIconButton) {
-	width: 44px;
-	height: 46px;
-
-	icon: icon {{ "chat/input_attach", historyComposeIconFg }};
-	iconOver: icon {{ "chat/input_attach", historyComposeIconFgOver }};
-
-	rippleAreaPosition: point(2px, 3px);
-	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
-}
-
-historyAttachEmoji: IconButton(historyAttach) {
-	icon: icon {{ "chat/input_smile_face", historyComposeIconFg }};
-	iconOver: icon {{ "chat/input_smile_face", historyComposeIconFgOver }};
-}
-historyMessagesTTL: IconButtonWithText {
-	iconButton: IconButton(historyAttach) {
-		icon: icon {{ "chat/input_autodelete", historyComposeIconFg }};
-		iconOver: icon {{ "chat/input_autodelete", historyComposeIconFgOver }};
-	}
-	textFg: historyComposeIconFg;
-	textFgOver: historyComposeIconFgOver;
-	textPadding: margins(21px, 20px, 3px, 7px);
-	textAlign: align(left);
-
-	font: font(10px semibold);
-}
-historyReplaceMedia: IconButton(historyAttach) {
-	icon: icon {{ "chat/input_replace", windowBgActive }};
-	iconOver: icon {{ "chat/input_replace", windowBgActive }};
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: lightButtonBgOver;
-	}
-}
-historyEditMediaBg: videoPlayIconBg;
-historyEditMedia: icon{{ "chat/input_draw", videoPlayIconFg }};
-historyMessagesTTLPickerHeight: 200px;
-historyMessagesTTLPickerItemHeight: 40px;
-historyMessagesTTLLabel: FlatLabel(defaultFlatLabel) {
-	minWidth: 200px;
-	align: align(topleft);
-	textFg: windowSubTextFg;
-}
-
-historyAttachEmojiActive: icon {{ "chat/input_smile_face", windowBgActive }};
-historyEmojiCircle: size(20px, 20px);
-historyEmojiCircleLine: 1.5;
-historyEmojiCircleFg: historyComposeIconFg;
-historyEmojiCircleFgOver: historyComposeIconFgOver;
-historyBotKeyboardShow: IconButton(historyAttach) {
-	icon: icon {{ "chat/input_bot_keyboard", historyComposeIconFg }};
-	iconOver: icon {{ "chat/input_bot_keyboard", historyComposeIconFgOver }};
-}
-historyBotKeyboardHide: IconButton(historyAttach) {
-	icon: icon {{ "chat/input_bot_keyboard_hide", historyComposeIconFg }};
-	iconOver: icon {{ "chat/input_bot_keyboard_hide", historyComposeIconFgOver }};
-}
-historyBotCommandStart: IconButton(historyAttach) {
-	icon: icon {{ "chat/input_bot_command", historyComposeIconFg }};
-	iconOver: icon {{ "chat/input_bot_command", historyComposeIconFgOver }};
-}
-historyScheduledToggle: IconButton(historyAttach) {
-	icon: icon {
-		{ "chat/input_scheduled", historyComposeIconFg },
-		{ "chat/input_scheduled_dot", attentionButtonFg }
-	};
-	iconOver: icon {
-		{ "chat/input_scheduled", historyComposeIconFgOver },
-		{ "chat/input_scheduled_dot", attentionButtonFg }
-	};
-}
-
-historyRecordVoiceFg: historyComposeIconFg;
-historyRecordVoiceFgOver: historyComposeIconFgOver;
-historyRecordVoiceFgInactive: attentionButtonFg;
-historyRecordVoiceFgActive: windowBgActive;
-historyRecordVoiceFgActiveIcon: windowFgActive;
-historyRecordVoiceShowDuration: 120;
-historyRecordVoiceDuration: 120;
-historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }};
-historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }};
-historyRecordVoiceActive: icon {{ "chat/input_record_filled", historyRecordVoiceFgActiveIcon }};
-historyRecordSendIconPosition: point(2px, 0px);
-historyRecordVoiceRippleBgActive: lightButtonBgOver;
-historyRecordSignalRadius: 5px;
-historyRecordCancel: windowSubTextFg;
-historyRecordCancelActive: windowActiveTextFg;
-historyRecordFont: font(13px);
-historyRecordDurationSkip: 12px;
-historyRecordDurationFg: historyComposeAreaFg;
-
-historyRecordMainBlobMinRadius: 23px;
-historyRecordMainBlobMaxRadius: 37px;
-historyRecordMinorBlobMinRadius: 40px;
-historyRecordMinorBlobMaxRadius: 47px;
-historyRecordMajorBlobMinRadius: 43px;
-historyRecordMajorBlobMaxRadius: 50px;
-
-historyRecordTextStyle: TextStyle(defaultTextStyle) {
-	font: historyRecordFont;
-}
-
-historyRecordTextWidthForWrap: 210px;
-historyRecordTextLeft: 15px;
-historyRecordTextRight: 25px;
-
-historyRecordLockShowDuration: historyToDownDuration;
-historyRecordLockSize: size(75px, 133px);
-
-historyRecordLockIconFg: historyToDownFg;
-historyRecordLockIconSize: size(14px, 17px);
-historyRecordLockIconBottomHeight: 9px;
-historyRecordLockIconLineHeight: 2px;
-historyRecordLockIconLineSkip: 3px;
-historyRecordLockIconLineWidth: 2px;
-historyRecordLockIconArcHeight: 4px;
-historyRecordStopIconWidth: 12px;
-
-historyRecordLockTopShadow: icon {{ "voice_lock/record_lock_top_shadow", historyToDownShadow }};
-historyRecordLockTop: icon {{ "voice_lock/record_lock_top", historyToDownBg }};
-historyRecordLockBottomShadow: icon {{ "voice_lock/record_lock_bottom_shadow", historyToDownShadow }};
-historyRecordLockBottom: icon {{ "voice_lock/record_lock_bottom", historyToDownBg }};
-historyRecordLockBodyShadow: icon {{ "voice_lock/record_lock_body_shadow", historyToDownShadow }};
-historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }};
-historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
-historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
-historyRecordLockRippleMargin: margins(6px, 6px, 6px, 6px);
-
-historyRecordDelete: IconButton(historyAttach) {
-	icon: icon {{ "info/info_media_delete", historyComposeIconFg }};
-	iconOver: icon {{ "info/info_media_delete", historyComposeIconFgOver }};
-	iconPosition: point(10px, 11px);
-}
-historyRecordWaveformRightSkip: 10px;
-historyRecordWaveformBgMargins: margins(5px, 7px, 5px, 7px);
-
-historyRecordWaveformBar: 3px;
-
-historyRecordLockPosition: point(1px, 35px);
-
-historyRecordCancelButtonWidth: 100px;
-historyRecordCancelButtonFg: lightButtonFg;
-
-historySilentToggle: IconButton(historyBotKeyboardShow) {
-	icon: icon {{ "chat/input_silent", historyComposeIconFg }};
-	iconOver: icon {{ "chat/input_silent", historyComposeIconFgOver }};
-}
-historySilentToggleOn: icon {{ "chat/input_silent_on", historyComposeIconFg }};
-historySilentToggleOnOver: icon {{ "chat/input_silent_on", historyComposeIconFgOver }};
-
-historyReplySkip: 51px;
-historyReplyNameFg: windowActiveTextFg;
-historyReplyHeight: 49px;
-historyReplyIconPosition: point(5px, 5px);
-historyReplyIcon: icon {{ "chat/input_reply", historyReplyIconFg }};
-historyForwardIcon: icon {{ "chat/input_forward", historyReplyIconFg }};
-historyEditIcon: icon {{ "chat/input_edit", historyReplyIconFg }};
-historyReplyCancel: IconButton {
-	width: 49px;
-	height: 49px;
-
-	icon: historyReplyCancelIcon;
-	iconOver: historyReplyCancelIconOver;
-	iconPosition: point(-1px, -1px);
-
-	rippleAreaPosition: point(4px, 4px);
-	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
-}
-historyPinnedShowAll: IconButton(historyReplyCancel) {
-	icon: icon {{ "pinned_show_all", historyReplyCancelFg }};
-	iconOver: icon {{ "pinned_show_all", historyReplyCancelFgOver }};
-}
-historyPinnedBotButton: RoundButton(defaultActiveButton) {
-	width: -34px;
-	height: 30px;
-	textTop: 6px;
-	padding: margins(2px, 10px, 10px, 9px);
-}
-historyPinnedBotButtonMaxWidth: 150px;
-
 topicButtonSkip: 3px;
 topicButtonPadding: margins(6px, 3px, 8px, 3px);
 topicButtonArrowSkip: 8px;
@@ -960,13 +619,6 @@ historyCommentsUserpics: GroupCallUserpics {
 	align: align(left);
 }
 
-boxAttachEmoji: IconButton(historyAttachEmoji) {
-	width: 30px;
-	height: 30px;
-	rippleAreaSize: 0px;
-}
-boxAttachEmojiTop: 20px;
-
 historyGroupAboutMargin: 16px;
 historyGroupAboutPadding: margins(24px, 16px, 24px, 16px);
 historyGroupAboutBulletSkip: 16px;
@@ -1012,8 +664,6 @@ historyCommentsOpenInSelected: icon {{ "history_comments_open", msgFileThumbLink
 historyCommentsOpenOut: icon {{ "history_comments_open", msgFileThumbLinkOutFg }};
 historyCommentsOpenOutSelected: icon {{ "history_comments_open", msgFileThumbLinkOutFgSelected }};
 
-historySlowmodeCounterMargins: margins(0px, 0px, 10px, 0px);
-
 historyGroupCallUserpics: GroupCallUserpics {
 	size: 32px;
 	shift: 12px;
@@ -1137,13 +787,6 @@ reactionsTabs: MultiSelect(defaultMultiSelect) {
 	padding: margins(12px, 10px, 12px, 10px);
 }
 reactionsTabIconSkip: 3px;
-historyRequestsUserpics: GroupCallUserpics {
-	size: 22px;
-	shift: 8px;
-	stroke: 4px;
-	align: align(left);
-}
-historyRequestsHeight: 33px;
 
 SendAsButton {
 	width: pixels;
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 868d7a615..722e8322a 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/palette.h"
 
 namespace Ui {
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
index fddd61fe4..dcd4133c0 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/fade_wrap.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/palette.h"
 
 #include <QtGui/QtEvents>
diff --git a/Telegram/SourceFiles/ui/chat/requests_bar.cpp b/Telegram/SourceFiles/ui/chat/requests_bar.cpp
index 9636e02ce..c8841f579 100644
--- a/Telegram/SourceFiles/ui/chat/requests_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/requests_bar.cpp
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_options.h"
 #include "ui/painter.h"
 #include "lang/lang_keys.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_calls.h"
 #include "styles/style_info.h" // st::topBarArrowPadding, like TopBarWidget.
 #include "styles/style_window.h" // st::columnMinimalWidthLeft
@@ -145,7 +145,7 @@ void RequestsBar::paint(Painter &p) {
 	const auto userpicsLeft = userpicsTop * 2;
 	const auto textTop = st::lineWidth + (st::historyRequestsHeight
 		- st::lineWidth
-		- st::msgServiceNameFont->height) / 2;
+		- st::semiboldFont->height) / 2;
 	const auto width = _inner->width();
 	const auto &font = st::defaultMessageBar.title.font;
 	p.setPen(st::defaultMessageBar.titleFg);
diff --git a/Telegram/SourceFiles/ui/controls/emoji_button.cpp b/Telegram/SourceFiles/ui/controls/emoji_button.cpp
index 06775e2a0..b2656f584 100644
--- a/Telegram/SourceFiles/ui/controls/emoji_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/emoji_button.cpp
@@ -10,29 +10,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/radial_animation.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Ui {
 
-EmojiButton::EmojiButton(QWidget *parent, const style::IconButton &st)
-: RippleButton(parent, st.ripple)
+EmojiButton::EmojiButton(QWidget *parent, const style::EmojiButton &st)
+: RippleButton(parent, st.inner.ripple)
 , _st(st) {
-	resize(_st.width, _st.height);
+	resize(_st.inner.width, _st.inner.height);
 	setCursor(style::cur_pointer);
 }
 
 void EmojiButton::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
-	p.fillRect(e->rect(), st::historyComposeAreaBg);
-	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), _rippleOverride ? &(*_rippleOverride)->c : nullptr);
+	p.fillRect(e->rect(), _st.bg);
+	const auto &st = _st.inner;
+	paintRipple(p, st.rippleAreaPosition.x(), st.rippleAreaPosition.y(), _rippleOverride ? &(*_rippleOverride)->c : nullptr);
 
 	const auto over = isOver();
 	const auto loadingState = _loading
 		? _loading->computeState()
 		: RadialState{ 0., 0, RadialState::kFull };
-	const auto icon = _iconOverride ? _iconOverride : &(over ? _st.iconOver : _st.icon);
-	auto position = _st.iconPosition;
+	const auto icon = _iconOverride ? _iconOverride : &(over ? st.iconOver : st.icon);
+	auto position = st.iconPosition;
 	if (position.x() < 0) {
 		position.setX((width() - icon->width()) / 2);
 	}
@@ -53,9 +54,7 @@ void EmojiButton::paintEvent(QPaintEvent *e) {
 
 	const auto color = (_colorOverride
 		? *_colorOverride
-		: (over
-			? st::historyEmojiCircleFgOver
-			: st::historyEmojiCircleFg));
+		: (over ? _st.lineFgOver : _st.lineFg));
 	const auto line = style::ConvertScaleExact(st::historyEmojiCircleLine);
 	if (anim::Disabled() && _loading && _loading->animating()) {
 		anim::DrawStaticLoading(p, inner, line, color);
@@ -112,14 +111,15 @@ void EmojiButton::onStateChanged(State was, StateChangeSource source) {
 }
 
 QPoint EmojiButton::prepareRippleStartPosition() const {
-	if (!_st.rippleAreaSize) {
+	if (!_st.inner.rippleAreaSize) {
 		return DisabledRippleStartPosition();
 	}
-	return mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition;
+	return mapFromGlobal(QCursor::pos()) - _st.inner.rippleAreaPosition;
 }
 
 QImage EmojiButton::prepareRippleMask() const {
-	return RippleAnimation::EllipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
+	const auto size = _st.inner.rippleAreaSize;
+	return RippleAnimation::EllipseMask(QSize(size, size));
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/emoji_button.h b/Telegram/SourceFiles/ui/controls/emoji_button.h
index a39d40c9c..bee3b68f6 100644
--- a/Telegram/SourceFiles/ui/controls/emoji_button.h
+++ b/Telegram/SourceFiles/ui/controls/emoji_button.h
@@ -9,13 +9,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/widgets/buttons.h"
 
+namespace style {
+struct EmojiButton;
+} // namespace style
+
 namespace Ui {
 
 class InfiniteRadialAnimation;
 
 class EmojiButton final : public RippleButton {
 public:
-	EmojiButton(QWidget *parent, const style::IconButton &st);
+	EmojiButton(QWidget *parent, const style::EmojiButton &st);
 
 	void setLoading(bool loading);
 	void setColorOverrides(
@@ -33,7 +37,7 @@ protected:
 private:
 	void loadingAnimationCallback();
 
-	const style::IconButton &_st;
+	const style::EmojiButton &_st;
 
 	std::unique_ptr<Ui::InfiniteRadialAnimation> _loading;
 
diff --git a/Telegram/SourceFiles/ui/controls/jump_down_button.cpp b/Telegram/SourceFiles/ui/controls/jump_down_button.cpp
index 24c54d8d6..aded3fc78 100644
--- a/Telegram/SourceFiles/ui/controls/jump_down_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/jump_down_button.cpp
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/ripple_animation.h"
 #include "ui/unread_badge_paint.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Ui {
 
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index fe9f6b115..2e83de2fc 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Ui {
 namespace {
@@ -18,9 +18,10 @@ constexpr int kWideScale = 5;
 
 } // namespace
 
-SendButton::SendButton(QWidget *parent)
-: RippleButton(parent, st::historyReplyCancel.ripple) {
-	resize(st::historySendSize);
+SendButton::SendButton(QWidget *parent, const style::SendButton &st)
+: RippleButton(parent, st.inner.ripple)
+, _st(st) {
+	resize(_st.inner.width, _st.inner.height);
 }
 
 void SendButton::setType(Type type) {
@@ -93,35 +94,17 @@ void SendButton::paintEvent(QPaintEvent *e) {
 }
 
 void SendButton::paintRecord(QPainter &p, bool over) {
-	const auto recordActive = 0.;
 	if (!isDisabled()) {
-		auto rippleColor = anim::color(
-			st::historyAttachEmoji.ripple.color,
-			st::historyRecordVoiceRippleBgActive,
-			recordActive);
 		paintRipple(
 			p,
-			(width() - st::historyAttachEmoji.rippleAreaSize) / 2,
-			st::historyAttachEmoji.rippleAreaPosition.y(),
-			&rippleColor);
+			(width() - _st.inner.rippleAreaSize) / 2,
+			_st.inner.rippleAreaPosition.y());
 	}
 
-	auto fastIcon = [&] {
-		if (isDisabled()) {
-			return &st::historyRecordVoice;
-		} else if (recordActive == 1.) {
-			return &st::historyRecordVoiceActive;
-		} else if (over) {
-			return &st::historyRecordVoiceOver;
-		}
-		return &st::historyRecordVoice;
-	};
-	fastIcon()->paintInCenter(p, rect());
-	if (!isDisabled() && recordActive > 0. && recordActive < 1.) {
-		p.setOpacity(recordActive);
-		st::historyRecordVoiceActive.paintInCenter(p, rect());
-		p.setOpacity(1.);
-	}
+	const auto &icon = (isDisabled() || !over)
+		? _st.record
+		: _st.recordOver;
+	icon.paintInCenter(p, rect());
 }
 
 void SendButton::paintSave(QPainter &p, bool over) {
@@ -132,7 +115,10 @@ void SendButton::paintSave(QPainter &p, bool over) {
 }
 
 void SendButton::paintCancel(QPainter &p, bool over) {
-	paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2, st::historyAttachEmoji.rippleAreaPosition.y());
+	paintRipple(
+		p,
+		(width() - _st.inner.rippleAreaSize) / 2,
+		_st.inner.rippleAreaPosition.y());
 
 	const auto &cancelIcon = over
 		? st::historyReplyCancelIconOver
@@ -141,9 +127,7 @@ void SendButton::paintCancel(QPainter &p, bool over) {
 }
 
 void SendButton::paintSend(QPainter &p, bool over) {
-	const auto &sendIcon = over
-		? st::historySendIconOver
-		: st::historySendIcon;
+	const auto &sendIcon = over ? _st.inner.iconOver : _st.inner.icon;
 	if (isDisabled()) {
 		const auto color = st::historyRecordVoiceFg->c;
 		sendIcon.paint(p, st::historySendIconPosition, width(), color);
@@ -199,20 +183,14 @@ QPixmap SendButton::grabContent() {
 }
 
 QImage SendButton::prepareRippleMask() const {
-	auto size = (_type == Type::Record)
-		? st::historyAttachEmoji.rippleAreaSize
-		: st::historyReplyCancel.rippleAreaSize;
+	const auto size = _st.inner.rippleAreaSize;
 	return RippleAnimation::EllipseMask(QSize(size, size));
 }
 
 QPoint SendButton::prepareRippleStartPosition() const {
-	auto real = mapFromGlobal(QCursor::pos());
-	auto size = (_type == Type::Record)
-		? st::historyAttachEmoji.rippleAreaSize
-		: st::historyReplyCancel.rippleAreaSize;
-	auto y = (_type == Type::Record)
-		? st::historyAttachEmoji.rippleAreaPosition.y()
-		: (height() - st::historyReplyCancel.rippleAreaSize) / 2;
+	const auto real = mapFromGlobal(QCursor::pos());
+	const auto size = _st.inner.rippleAreaSize;
+	const auto y = (height() - _st.inner.rippleAreaSize) / 2;
 	return real - QPoint((width() - size) / 2, y);
 }
 
diff --git a/Telegram/SourceFiles/ui/controls/send_button.h b/Telegram/SourceFiles/ui/controls/send_button.h
index 02ac3c093..5b3cc104d 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.h
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -9,11 +9,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/widgets/buttons.h"
 
+namespace style {
+struct SendButton;
+} // namespace style
+
 namespace Ui {
 
 class SendButton final : public RippleButton {
 public:
-	explicit SendButton(QWidget *parent);
+	SendButton(QWidget *parent, const style::SendButton &st);
 
 	static constexpr auto kSlowmodeDelayLimit = 100 * 60;
 
@@ -49,6 +53,8 @@ private:
 	void paintSchedule(QPainter &p, bool over);
 	void paintSlowmode(QPainter &p);
 
+	const style::SendButton &_st;
+
 	Type _type = Type::Send;
 	Type _afterSlowmodeType = Type::Send;
 	QPixmap _contentFrom, _contentTo;
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
index cb28ea643..a4bf604a5 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
@@ -181,7 +181,7 @@ void GroupsStrip::paintEvent(QPaintEvent *e) {
 		const auto size = SearchWithGroups::IconSizeOverride();
 		if (_chosen == index) {
 			p.setPen(Qt::NoPen);
-			p.setBrush(st::windowBgRipple);
+			p.setBrush(_st.bgActive);
 			p.drawEllipse(
 				left + skip,
 				top + (height - single) / 2 + skip,
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index f30c88d8f..8db74f0f2 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_window.h"
 #include "styles/style_media_view.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_info.h"
 
@@ -561,16 +562,17 @@ void Generator::paintComposeArea() {
 	auto right = st::historySendRight + st::historySendSize.width();
 	st::historyRecordVoice[_palette].paintInCenter(*_p, QRect(_composeArea.x() + _composeArea.width() - right, controlsTop, st::historySendSize.width(), st::historySendSize.height()));
 
-	const auto emojiIconLeft = (st::historyAttachEmoji.iconPosition.x() < 0)
-		? ((st::historyAttachEmoji.width - st::historyAttachEmoji.icon.width()) / 2)
-		: st::historyAttachEmoji.iconPosition.x();
-	const auto emojiIconTop = (st::historyAttachEmoji.iconPosition.y() < 0)
-		? ((st::historyAttachEmoji.height - st::historyAttachEmoji.icon.height()) / 2)
-		: st::historyAttachEmoji.iconPosition.y();
-	const auto &emojiIcon = st::historyAttachEmoji.icon[_palette];
-	right += st::historyAttachEmoji.width;
+	const auto &emojiButton = st::historyAttachEmoji.inner;
+	const auto emojiIconLeft = (emojiButton.iconPosition.x() < 0)
+		? ((emojiButton.width - emojiButton.icon.width()) / 2)
+		: emojiButton.iconPosition.x();
+	const auto emojiIconTop = (emojiButton.iconPosition.y() < 0)
+		? ((emojiButton.height - emojiButton.icon.height()) / 2)
+		: emojiButton.iconPosition.y();
+	const auto &emojiIcon = emojiButton.icon[_palette];
+	right += emojiButton.width;
 	auto attachEmojiLeft = _composeArea.x() + _composeArea.width() - right;
-	_p->fillRect(attachEmojiLeft, controlsTop, st::historyAttachEmoji.width, st::historyAttachEmoji.height, st::historyComposeAreaBg[_palette]);
+	_p->fillRect(attachEmojiLeft, controlsTop, emojiButton.width, emojiButton.height, st::historyComposeAreaBg[_palette]);
 	emojiIcon.paint(*_p, attachEmojiLeft + emojiIconLeft, controlsTop + emojiIconTop, _rect.width());
 
 	auto pen = st::historyEmojiCircleFg[_palette]->p;
@@ -591,7 +593,7 @@ void Generator::paintComposeArea() {
 
 	auto fieldLeft = _composeArea.x() + st::historyAttach.width;
 	auto fieldTop = _composeArea.y() + _composeArea.height() - st::historyAttach.height + st::historySendPadding;
-	auto fieldWidth = _composeArea.width() - st::historyAttach.width - st::historySendSize.width() - st::historySendRight - st::historyAttachEmoji.width;
+	auto fieldWidth = _composeArea.width() - st::historyAttach.width - st::historySendSize.width() - st::historySendRight - emojiButton.width;
 	auto fieldHeight = st::historySendSize.height() - 2 * st::historySendPadding;
 	auto field = QRect(fieldLeft, fieldTop, fieldWidth, fieldHeight);
 	_p->fillRect(field, st::historyComposeField.textBg[_palette]);
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 3f079cacb..b2acd7367 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 using "ui/basic.style";
 using "ui/widgets/widgets.style";
-using "ui/chat/chat.style";
+using "chat_helpers/chat_helpers.style";
 using "boxes/boxes.style"; // UserpicButton
 
 windowMinWidth: 380px;

From a02876562a0d96f4d36f2960a4e7cb87f5071ef1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 May 2023 15:51:04 +0400
Subject: [PATCH 243/676] Finish improved stories reply area theming.

---
 Telegram/CMakeLists.txt                       |   1 +
 .../Resources/icons/emoji/stickers_add.png    | Bin 470 -> 0 bytes
 .../Resources/icons/emoji/stickers_add@2x.png | Bin 899 -> 0 bytes
 .../Resources/icons/emoji/stickers_add@3x.png | Bin 1345 -> 0 bytes
 .../icons/emoji/stickers_add_dot.png          | Bin 255 -> 0 bytes
 .../icons/emoji/stickers_add_dot@2x.png       | Bin 312 -> 0 bytes
 .../icons/emoji/stickers_add_dot@3x.png       | Bin 494 -> 0 bytes
 .../icons/emoji/stickers_add_unread.png       | Bin 527 -> 0 bytes
 .../icons/emoji/stickers_add_unread@2x.png    | Bin 1007 -> 0 bytes
 .../icons/emoji/stickers_add_unread@3x.png    | Bin 1430 -> 0 bytes
 .../SourceFiles/boxes/sticker_set_box.cpp     |   1 +
 Telegram/SourceFiles/boxes/translate_box.cpp  |   4 +-
 .../chat_helpers/chat_helpers.style           | 198 ++++++++++++------
 .../chat_helpers/compose/compose_features.h   |  27 +++
 .../chat_helpers/emoji_list_widget.cpp        |  47 +++--
 .../chat_helpers/emoji_list_widget.h          |   3 +
 .../chat_helpers/emoji_suggestions_widget.cpp | 149 +++++++++++--
 .../chat_helpers/emoji_suggestions_widget.h   | 119 +----------
 .../chat_helpers/field_autocomplete.cpp       |   7 +-
 .../chat_helpers/gifs_list_widget.cpp         |  18 +-
 .../chat_helpers/gifs_list_widget.h           |   7 +-
 .../chat_helpers/message_field.cpp            |  12 +-
 .../SourceFiles/chat_helpers/message_field.h  |   4 +-
 .../chat_helpers/stickers_list_footer.cpp     |  63 +++---
 .../chat_helpers/stickers_list_footer.h       |   8 +-
 .../chat_helpers/stickers_list_widget.cpp     |  87 ++++----
 .../chat_helpers/stickers_list_widget.h       |   7 +-
 .../SourceFiles/chat_helpers/tabbed_panel.cpp |   8 +-
 .../chat_helpers/tabbed_selector.cpp          |  10 +-
 .../chat_helpers/tabbed_selector.h            |   6 +-
 .../SourceFiles/history/history_widget.cpp    |   2 +-
 .../history_view_compose_controls.cpp         |  15 +-
 .../controls/history_view_compose_controls.h  |  17 +-
 .../info_userpic_emoji_builder_widget.cpp     |   2 +-
 .../media/stories/media_stories_reply.cpp     |  35 +++-
 .../SourceFiles/media/view/media_view.style   | 110 +++++++++-
 Telegram/SourceFiles/menu/menu_send.cpp       |  13 +-
 Telegram/SourceFiles/menu/menu_send.h         |   7 +-
 38 files changed, 638 insertions(+), 349 deletions(-)
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add@2x.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add@3x.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add_dot.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add_dot@2x.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add_dot@3x.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add_unread.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add_unread@2x.png
 delete mode 100644 Telegram/Resources/icons/emoji/stickers_add_unread@3x.png
 create mode 100644 Telegram/SourceFiles/chat_helpers/compose/compose_features.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 5c559e8a5..3ed0b31c8 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -348,6 +348,7 @@ PRIVATE
     calls/calls_video_bubble.h
     calls/calls_video_incoming.cpp
     calls/calls_video_incoming.h
+    chat_helpers/compose/compose_features.h
     chat_helpers/compose/compose_show.cpp
     chat_helpers/compose/compose_show.h
     chat_helpers/bot_command.cpp
diff --git a/Telegram/Resources/icons/emoji/stickers_add.png b/Telegram/Resources/icons/emoji/stickers_add.png
deleted file mode 100644
index d4c77a202c4fe31fcf48f38f030c8f0df0d2be25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 470
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%)!&eF~maf
z?i9nURtJH$_@uss<-O_w0;?Mm-m>m#*}h@>3E8IQ7ra>39$~(*V(QkZM}I$R3$1bU
zFmT;;)adj1?VC4mUbp@Bep!EYbz|SlpKW5VC+=EzdefS9uZ909Jo#OB+2pg0xa-G#
zJUlTjPVC%rs;+^LEaolK>{1F1-Oiw=q{y%#_r(D=skVdL-ZtM*5@cfd&GqAg=4@X7
zO&v!W64KL`u!`)z{i;;bT9Btgy>8dE)Qjh0<2&~1CU0lsnUOv9*XAudUaneotZ>Sy
zPDZvfLMQilcwgSKEqCeZ#wLXWrLogzZkjP!<>coWg9DF*h2KR@{7`SRUi53Nzo?O*
zb@y3U-9(8~6AX9`Yn%@1%6841W!3ljMowoQuR(&`*|3<m+3V)lOs}2rWY@FK2`@Ie
rYfBxIe0hC)o$~%a$-<?7KmO$Fd~}?va^3cOpfL4x^>bP0l+XkK$!@e|

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

literal 899
zcmV-}1AP36P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NE?MXyIR9Fe^n7@i5K@i5(UDiaw
zR1-B=A3+QS1<^pC!w2vg6!s1DDOB)JU}R=ys4T1pi{@%%a`(F{wpX@$#%X80n*%41
zw&ts^zNzZ2?wL^Ne%&*0&%kXn5cW?Wi^Wo@6g=DQ_INz{C$we=hr@+Jq1|pTm&^Tr
z|MTqPFGg+w0A@{X>+tya*laf6-`~$PI1YgU#>Fa%#Y5EV^_Q2ITrMX84u`{dJYFmo
zRBE@|VN52I)GnXTSF6={JT9>HdfjTZ27`f>tP9{sB+}`0R4V54IU%2(o}Apc1pt_G
z!5tDOyq%pnI~)#$`t|jdJbCvAjEnd}0+n}PGm^(rYNpd^B9SoToUORvs5JS_ld4p=
z+kJR=aE|MC2ghEoCz>F1gSy`%;ljcrUadw#;I8syRrF7VEZ5a)g&-!u6_xrV`WQhX
z^9fqpUhtcP79#2K@<7pO)Me3qND8TxL#~XT1~ggeek|RK4oLa&=klUSdI98ieVoQG
z>7kum6hx~Ou<DsEE)WWs5Js4}Sv49B(DdTjY-V)3+6W=ExJw9~$1JE;s{v(aIGs+q
zj~@$!(83@gbSkr;Y&Hv&eM)!mZxLDvp|csbVj8?`jqIAb0~Xd)I-ORx6m=$(QAP%v
z&BmBup(O-?Je{A^BrO(;=K*9aYf2`j`!6fcxbC2JSp?>i={o+J#ZWR;Db6>#4yy3{
z{Cr*=N;a8HKvpUh%A{PJN~UO4AmzfqAc(rMGO4kgl+V#JMia*_-HrmI{R>iP31OT-
z=90a=y}`oS?+e$r{1sXWp%a<~jYcD&?#Du%%Zr6+F5O>3=q_eK{eB-PRV$TBx{n`A
zxm=c>A|bp|1#WXixYhB4LU3Jt-0P1YPzUaSh9>nufjGiS{)2VMM^oTlgU}SL7ey%?
zc~Z4wqrT~@^#A#>LGr{ey@397)6X#~mc@WRe!CA=7A13%%&h;%pY)uR-R<`b+%sUx
Zz%Qq1$)w8hFSq~z002ovPDHLkV1nQ&jgbHV

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

literal 1345
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz_QxY#W5s<
z_3bQMeUm_u<K^c5E=?WNyAF9fdOq^LAkg{2^vfav{kcv~A8S~gTvWB@`Z=w1T>ept
zOZ0rd^l?LL>+kR0%#A(&#P8ru>*s&Y|DR)79KSq(Bm9H|GTdtvaOOnd$`C18Sy@R*
zNjW(=8JV2?{QT_f!`DB5{(SlJ<)=@d9zA;W=g*%vZ{ECpJK9aA=8&1W`T29_-o1T$
z_x}C;)-fv<_Hee@RaP8%G;__`wYGM4RxQGdn-rflR4fV64hasv{O8Y~w{LTK?ypzV
znsDo}(~qp~pZpvF4A)MrEc?B3rDoiWqQ2|buS-iyKYsjpPx7<3Lh*l=OpMl85SGWS
zuwhYr{=x_yJzZVb3|kwUHEY&f$lbBoQBs)4RK%9+!H$CC9~a-ebm@@y`jvb3?OV5g
zeR)~gvf>7y?HN8X4>V*Gq*mX%7q=_(Y(jng{`Kqid9V3PJ2YH6VR7iL|Jt0oiB7Vj
zrki){cyV2{;ec1gj?;g327cMa6dxD2Z29uPZmAa<SYwh7XKs5x`<-rqjhWdr*AO=0
z0$J&Gn?JdV>u4?sF{%oiWvjPDP0&b^S;FLN#nZogFMZ6Abf4tQ@k4(1Oo0w&E4{bY
z*^%ETU-<B{Pjk+h84_80zPx$&r$GI&v`Ni5^_lZdJx-D+eXcU=?%lif_WCTDCE^8I
zEDDeFW-K|`<n-)~PtB#Xx*VqroIQ%d9?JQpo@14qZtAy^=}P(MCr_5x{5^ZtH!R@(
z_c=@d{i|E7-L&~-yOQ7bZQFV{Qx>F{Zf6HZmbwPd6s7BtH}2jQ?VmNtBust7q3K%<
zyn9~tO#OE8;zUhXma8#yHL_(i9CdEqD4K2R>h9j&XklUDaqQHubpj2ON>fw#eO>_5
zM%NtyN8uHw2Ge#4F*EN!!7FIO=&LiW=V>P|4^PL<vuAr@LTBdR2+N$(H?Py|x4|Vj
zZG#`{)~!2M_F@yCL&sbD7ZPG(VlyI+D9v``a9F%`>(u#9I*#@)ubn*E`SR?I1g}fK
z_oy%4a7JjAP|UHs3<;kO)z2HJByIYbzb{+URdfHmd2-njSA?vldTm_2x_ftddHM3?
z%bx};6FGfbS=Y(A!&M}v{@t559+s}#*kcv#zV6|<ARu5Q;H{RR>3a9D*S1N5n|H6~
z%t+cOr`!0_?(nU{$E-fwSOF5y(`hWcq?{%!EUaYia)HHUqe)7UHD_A>iyuF3ENM~Q
zRoXU9tuoJS$246|P*9x<>XHCv749Qv&h(rp72A^St7+T&za;yB=7XBNX98Bn=W6oy
z3r5?S`*7-PkG^x{*vtkyr4uI?vNRSx{VdUWps4zTd(KarRev>(J1Nd@f30RVZ?;`e
z+TZEz=M{Z&_T+z2z2rY@t8Ti|>C>k}&rS_|#w=!e!O-FW)4aEhyEqqLia*96ws}*M
zc%v=P=aUyNTnI?<Z=7%P@1B33O31OiXR1ceC*9a`;2w8&oF2<vxrvO7r~W%`F7Q<}
zn4hvvX5|Ww_bu}!lHy*QWpLf=Q(IG5cd~s(WNloU-Q1<g556?`O31ZVUe<86o4a?{
vu0=XOr*)j(C02GOGk{x?0|{nCu>E6Pby>nF!|clyQ1RvI>gTe~DWM4fuGm(L

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

literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfUWqP_ehFAzD
zCrE5-m>Dwv<jIq&Dk>gcUiWqsHizux`05aBSM%e8JkPIRzXXJqZ2I*1v*I#_li%Op
zSI$m%dM1!!U-Ls?9otM^ag}KYPn_WRB6vYpTrbAJ#6%_R_KIB>1tfSIFA6M3=U`xv
WbkX?w=dQy|kma7PelF{r5}E)nyGHQ<

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

literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GvA7J0fjhD30_
zy>gnjK|#PZP}w$E#P<RNZvZ>%i|8GSGb1PPOgx&J_{FpB;g6kqY)l*q0@@RTPFZfh
zc1*(RRgC8wA?~YN%GQ3J**@uh)uiKh&Xg~$NsMj`{@Qb<Z3_FkO#xo-dv8uCT7T;8
zU5=C0@6%-UuRqz#J2mJ`+nzgfWF+OjPt7cT^>V@gfF)*I1soU{S<r|wjy+r0C;UsR
Ro#zB{wWq6}%Q~loCIFR5UvU5c

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

literal 494
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}7UAjQ7?Q#I
z_L^Z<i-X9qkG?r9wv83+*{u1STBm;y+a~AAeXzJAA}euY>)feo{VZjw2Y+mvc=N+{
zsSk#q_szF@{Pa*O0~3cr1CW@b`l0Na)A_Z@kzpdPjsg~a#yrlk*B@KhnYT7xO_bP{
z`+MWgX{jeSo!OSly!-05Da%$KxzSR^Gke)b8-MGGfu*0;d<&|5uHAKLMO*0E6XjnY
z^VZm`Is2k&@2X|S%QgBQ`~KhUeAC0kc7Jx)xs?-b12#|CbY?-qy4P7vCm9!L8f!${
z|30hlX~g9zk|I8K^Gaj+XRllJYQwP|OqQ+X=Dq8sFPr?_mmhP#o%iJa);WjjQ@kfV
zDG+kzesX`2&guI%pG590SY^F!&Y@2y@8)f<oVR=3>Cb;u?;og^V}p1P>_=jV5Av*b
Yj0WeW+@f@u!$4u}>FVdQ&MBb@0G5=r5C8xG

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

literal 527
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgftkToPF~maf
zZpg;2W(R?@vG0V}m~ez?^0KUM?%0;8`a}3%>)xY(oj+)AndIQa#ko?nC(Kh?vE$Be
zoi)c|g&*$n*?4A8t+BPS_3p(NZ=X6o`BX@#sc-P4CA-#b)`?z!efsI8{r^wijnJFk
zemHUe{q<qmfg-7q+jO$6<`$i-DX@{No>#s%F7~=8OQXM3lag1U$mgFm96P5scTG55
zzgWTMS5ueO^P2lhnGd-<j`+Yo^K4pZ=*HTgJGoyM@4kC$r}_3YiDP-&t>>R#!!Pc6
zIplijuCK19XS^q=Tyb&SmU}oxM=WBZSlIpVi#3$yJpO1g)2E|v>&Xr$=Bb->3|CCK
zlQQMG<)#JF7Bgl1iV9`g^8{T3r@SrmKB%@>fy2Z%dA9G$Tvn3_hYfO?d+q-GGE`MC
zpC_C9z~Rv~!|e*?cjV7Z_h$+G(B@EGkld@@FIMa5dV)33A-UF)<ENX!i`i${?hCMR
x`FvTrev!Dm^s%`<cVCtql08~@#`4?Uh4DA;t&Q)WH$4^<8J@0wF6*2UngG>#%i#b3

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

literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFSxH1eR9Fe^m_17~K@i6^hNLl~
z=?wUiLb0;2kTilMg0JZ3$OrH<DEJMuw^u<;ARwd*X;MZ66?_39jfoZ_KF^N~Y))@4
z*}F|hlPkjR?96}vnc110yP=`MGw{H`1HJXYh&}x1=;-Y1?8L;x=jZ45_qRQuZ-n9D
z;Z!PhaBxtmRNmj;|2dwwx3_Y+ytA|88#I_fI2_JqvrkV?4i1`OKA#VUk5$;*a(8$4
z=;&yEeqK!K_4?J-RjE{Zd3kw#eZ_6l)6-K^Q)6Rer>Cdput79Kq0r&sp>jpBSlry)
zj6@<qu<UI(vlkZ^!shPo4nNsr21md*icKz;8y_DJj@1=Q6{+Ln<B^dr)Cen9L`Ncp
zZ~D)M46jzJ5aQhQKT<fBdL!;JImOXvw6{q|QIYCLhIfoQR34j;A*ZFKrHze^j<CNJ
zxEaJf)SF)mx(TIHlvT~tX|-e@A0OziuCBI3j#0=lZVmVL_LxwM3xz^U+NBY9Fi6|m
z+gdz5p{=bgw7D6+zP_|(Ho}{m8_d(`v=&59D49&6%{`^Hu@uU=TwGk_q`ILrmn(Ng
zEEYqRThncTgq)h0nNdr^o+(|C5;Ayrc+fid`T3bu%1S&QuhnW!6a82nQti2uoRU-A
z{+G<t=H1H5iWn{|EVvoyL*~}&qC^$_pPwH$tR`eCQj?RDZUdq)H#g^u4k5d~zD9F>
zeVs5V6R(gdShbNdVW1(@Xf#N8j!`0!aH^^?oNjM#)l>~&pp`2H83-&}u+g6-ruvZG
z-`}&gyu9o-u$Ks|Y~e=J6S};-M70-fA;(;*zieSj=<MtaRic*3WZX73lC`xpsVTCB
zDOB$+SE?d8&&{o^itYIMYCi}BPdm8gn(Fuf@2LD&q3aDAT^_w2?xF7k{O^7ybM=Sp
zTUd%AAX1=BIzCT&U1{=Rb8>PbYykA!%w)m-HHb(l-|$8Spvk`NbZlM}iH@8b+yfh+
z+U;b%=J!>ajHCKVhO0;!`bN_tc@gFBw)xnA6}Kk$6gLBGr1~M`cH7_IKR-YBg0+&9
zt|p&j#4A)klmlkCFPaotuMbvyzv3$v-?C8fU5lF}e1y!4G)GlB3i=yuN8x2SkPkdC
d@IYTY@E<*jYW#(_g^K_H002ovPDHLkV1fgd%1HnK

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

literal 1430
zcmV;H1!?+;P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=07*naRA>e5n!7JOK@`W`OGF|f
zo&||#LP?@j2o;405nBHNy(q+^Qz(CbfPzFsB^nZiLLwm~qVZ}Z;!UB!?-LW}PWIlr
zb9c?|`u(!E;Oy+oIp1^U%$YN1HZL#!#TJMy5L+O&Kx~270<i_cvOpprLCIvYy}iAy
zt*y1SwW+D8w6wIOq~!DS^Xcj7`T6<s^78oj_~_{9@bHkvfH2r(TU1muGBUEdx_W<q
z4`SnQXJ;orKi?(->%5qg`T6<B$48?wjt(6i9oE6vVOUsLI59DCdwc6ZtUtcIyqun%
z;(k|GSJ3k6`uZ9dwS&Vhmw|zSv$Hb+D#XRb#p2>(Z*MPaEFF4nZ7r|H#>Q%DYV6{%
zz%7wTOixdXCW?4?c$l4?C2Uv_5DAOo;$k9%uGQPy+rq*^d3kvxc<czpkq!<HbgkCb
z*6Qo)?QoBZ3v;Dw_3`mBH8m9#7;AD_SGotjzP=6)4qD?LAtOCnpw;i)f;`!X$S&&&
z5ByK&id|UWul|R1rDm1fLZ*ut=xM5dZ)fsA$(Y!${`tr*mL|KE>0%d__S}ie%E~`q
zKZx8%1>2L8h~(^KO#X5Ulv1XF@C~=KvvX-_X?%Q~UB@?*)IiQxGF>w>GpQF|sLjny
z#RS63xKv;4%OO=U85$Z&y~si(v$Ut0M@L8Hf!$f?kO{)FoD%x``;F2KigCj4?(SAx
zIM0(z894^jfr0|ZImNuEr^hJ8pcn^`va&M8Wqp0!$S%+h+uPfUe_dT&b91x1EVE)V
zeq&=p=tzjItu2w;)zu|*M#7*N=U*8{<{@+>#NOVX$TjYz2E`g18-*A3385n)Zf<Uf
zib`~Kb+tQ&0{7SC9I6AkJVhAy&TPJOb8`(14e8zF8~~9q;!`7;oSY=TNgpdM@9*za
z^(rbVXsN2Il6F7D?(VMII;b%j$IC9PhIsv(%ieu*a-!H$kaWjma7FjQ;lE}3Q9=s}
z48CS~E$){~oeW<>YBpC?E_8Qyx4*xiZV}~*>Ftgdfg!*g9ddnKSy>T}l8ryt!CJqc
zr&KTlfPev*#y$gSa78`Di?uSa38hH~paaV&+@P2qGxX4(kyp@-IshG5M!5#XxaN^z
zeSLjGM?&ZTbYOnK5QXGIi1qD<#n%`sYYYHtjR8r*V>U>J8KW8{sV7-XghhEoOBw|v
zfMrujwHp+p)AI7Nuoxa57CK}?7p+6`592qK2B=3+l~8_2odQVy_0dO0Ud*9_Bs&;j
zbZkGOqb<L&w5a(h#mJH+FaMEBGC0D5DfL;IE?@{GJ493^ZffbG71;(b?C7I&;ZlMi
ztHgwJDZ#ymE)f7a9-DNS*GL>mIo-;1A=;)U4ql;M{4rO$R@5`?RDT`%=#L>>)v~U{
z1DP?3nF!S}1VsmTxlUx)W1!LsaY1R4&e!_q5abr@!m?kfrG*EEG*`NYI6Vtm_ZiTT
z_;7LIDOaX5-@M3$j#3G>Fb{lP>H0Wm<0nTgEiI0k0*^HE$r0Zq$w@@%qyDmA1sK^K
z3b;J7Y3BHm7{^}y3o%_8MUyeXDv({+MFIC$q;UQ|>r*P>iVU}$2f8En^p*pKrw=hX
z3lkw2V(ldI4L9*kSpLt^ov6T%YYmDpOodu$xFQ#m=jZ3RB^wk!;)G?{F}v6Tu?1oa
k#1@Dx5L+O&K*$#O3zAGWa{bB&;{X5v07*qoM6N<$f?oQH@c;k-

diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 0f661181a..82e4e3deb 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -606,6 +606,7 @@ void StickerSetBox::updateButtons() {
 					const auto session = &_show->session();
 					auto box = ChatHelpers::MakeConfirmRemoveSetBox(
 						session,
+						st::boxLabel,
 						_inner->setId());
 					if (box) {
 						_show->showBox(std::move(box));
diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index 662cf51e5..066ba855b 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -63,7 +63,7 @@ ShowButton::ShowButton(not_null<Ui::RpWidget*> parent)
 	_button.sizeValue(
 	) | rpl::start_with_next([=](const QSize &s) {
 		resize(
-			s.width() + st::emojiSuggestionsFadeRight.width(),
+			s.width() + st::defaultEmojiSuggestions.fadeRight.width(),
 			s.height());
 		_button.moveToRight(0, 0);
 	}, lifetime());
@@ -74,7 +74,7 @@ void ShowButton::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 	const auto clip = e->rect();
 
-	const auto &icon = st::emojiSuggestionsFadeRight;
+	const auto &icon = st::defaultEmojiSuggestions.fadeRight;
 	const auto fade = QRect(0, 0, icon.width(), height());
 	if (fade.intersects(clip)) {
 		icon.fill(p, fade);
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index ceec7e3ec..ba786876f 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -10,6 +10,7 @@ using "ui/basic.style";
 using "boxes/boxes.style";
 using "ui/layers/layers.style";
 using "ui/widgets/widgets.style";
+using "ui/menu_icons.style";
 
 GroupCallUserpics {
 	size: pixels;
@@ -36,9 +37,50 @@ TabbedSearch {
 	height: pixels;
 }
 
+ComposeIcons {
+	settings: icon;
+
+	recent: icon;
+	recentActive: icon;
+	people: icon;
+	peopleActive: icon;
+	nature: icon;
+	natureActive: icon;
+	food: icon;
+	foodActive: icon;
+	activity: icon;
+	activityActive: icon;
+	travel: icon;
+	travelActive: icon;
+	objects: icon;
+	objectsActive: icon;
+	symbols: icon;
+	symbolsActive: icon;
+
+	menuFave: icon;
+	menuUnfave: icon;
+	menuStickerSet: icon;
+	menuRecentRemove: icon;
+	menuGifAdd: icon;
+	menuGifRemove: icon;
+	menuMute: icon;
+	menuSchedule: icon;
+	menuWhenOnline: icon;
+}
+
+EmojiSuggestions {
+	dropdown: InnerDropdown;
+	bg: color;
+	overBg: color;
+	textFg: color;
+	fadeLeft: icon;
+	fadeRight: icon;
+}
+
 EmojiPan {
 	margin: margins;
 	padding: margins;
+	showAnimation: PanelAnimation;
 	desiredSize: pixels;
 	verticalSizeSub: pixels;
 	header: pixels;
@@ -51,8 +93,12 @@ EmojiPan {
 	iconWidth: pixels;
 	iconArea: pixels;
 	bg: color;
+	headerFg: color;
+	trendingHeaderFg: color;
+	trendingSubheaderFg: color;
+	trendingUnreadFg: color;
+	trendingInstalled: icon;
 	overBg: color;
-	expandBg: color;
 	pathBg: color;
 	pathFg: color;
 	textFg: color;
@@ -60,9 +106,14 @@ EmojiPan {
 	categoriesBgOver: color;
 	fadeLeft: icon;
 	fadeRight: icon;
+	menu: PopupMenu;
 	tabs: SettingsSlider;
 	search: TabbedSearch;
 	searchMargin: margins;
+	removeSet: IconButton;
+	boxLabel: FlatLabel;
+	icons: ComposeIcons;
+	autocompleteBottomSkip: pixels;
 }
 
 MessageBar {
@@ -96,6 +147,7 @@ ComposeControls {
 	send: SendButton;
 	attach: IconButton;
 	emoji: EmojiButton;
+	suggestions: EmojiSuggestions;
 	tabbed: EmojiPan;
 }
 
@@ -191,12 +243,6 @@ stickersScroll: ScrollArea(boxScroll) {
 stickersRowDisabledOpacity: 0.4;
 stickersRowDuration: 200;
 
-stickersSettings: icon {{ "emoji/emoji_settings", emojiIconFg }};
-stickersTrending: icon {{ "emoji/stickers_add", emojiIconFg }};
-stickersTrendingUnread: icon {
-	{ "emoji/stickers_add_unread", emojiIconFg },
-	{ "emoji/stickers_add_dot", dialogsUnreadBg }
-};
 emojiStatusDefault: icon {{ "emoji/stickers_premium", emojiIconFg }};
 
 filtersRemove: IconButton(stickersRemove) {
@@ -210,22 +256,6 @@ emojiTabs: SettingsSlider(defaultTabsSlider) {
 	barTop: 40px;
 	labelTop: 12px;
 }
-emojiRecent: icon {{ "emoji/emoji_recent", emojiIconFg }};
-emojiRecentActive: icon {{ "emoji/emoji_recent", emojiSubIconFgActive }};
-emojiPeople: icon {{ "emoji/emoji_smile", emojiIconFg }};
-emojiPeopleActive: icon {{ "emoji/emoji_smile", emojiSubIconFgActive }};
-emojiNature: icon {{ "emoji/emoji_nature", emojiIconFg }};
-emojiNatureActive: icon {{ "emoji/emoji_nature", emojiSubIconFgActive }};
-emojiFood: icon {{ "emoji/emoji_food", emojiIconFg }};
-emojiFoodActive: icon {{ "emoji/emoji_food", emojiSubIconFgActive }};
-emojiActivity: icon {{ "emoji/emoji_activities", emojiIconFg }};
-emojiActivityActive: icon {{ "emoji/emoji_activities", emojiSubIconFgActive }};
-emojiTravel: icon {{ "emoji/emoji_travel", emojiIconFg }};
-emojiTravelActive: icon {{ "emoji/emoji_travel", emojiSubIconFgActive }};
-emojiObjects: icon {{ "emoji/emoji_objects", emojiIconFg }};
-emojiObjectsActive: icon {{ "emoji/emoji_objects", emojiSubIconFgActive }};
-emojiSymbols: icon {{ "emoji/emoji_love", emojiIconFg }};
-emojiSymbolsActive: icon {{ "emoji/emoji_love", emojiSubIconFgActive }};
 
 emojiCategoryIconTop: 6px;
 emojiPanAnimation: PanelAnimation(defaultPanelAnimation) {
@@ -297,40 +327,6 @@ defaultTabbedSearch: TabbedSearch {
 	groupSkip: 2px;
 	height: 33px;
 }
-defaultEmojiPan: EmojiPan {
-	margin: margins(7px, 0px, 7px, 0px);
-	padding: margins(7px, 0px, 4px, 7px);
-	desiredSize: 37px;
-	verticalSizeSub: 1px;
-	header: 33px;
-	headerLeft: 14px;
-	headerLockLeft: 7px;
-	headerLockedLeft: 26px;
-	headerTop: 10px;
-	footer: 36px;
-	iconSkip: 3px;
-	iconWidth: 30px;
-	iconArea: 28px;
-	bg: emojiPanBg;
-	overBg: emojiPanHover;
-	expandBg: emojiPanHeaderFg;
-	pathBg: windowBgRipple;
-	pathFg: windowBgOver;
-	textFg: windowFg;
-	categoriesBg: emojiPanCategories;
-	categoriesBgOver: windowBgRipple;
-	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
-	fadeRight: icon {{ "fade_horizontal", emojiPanCategories }};
-	tabs: emojiTabs;
-	search: defaultTabbedSearch;
-	searchMargin: margins(1px, 11px, 2px, 5px);
-}
-statusEmojiPan: EmojiPan(defaultEmojiPan) {
-	categoriesBg: windowBg;
-	categoriesBgOver: windowBgOver;
-	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", windowBg }};
-	fadeRight: icon {{ "fade_horizontal", windowBg }};
-}
 
 inlineResultsMinHeight: 278px;
 inlineResultsMaxHeight: 640px;
@@ -394,6 +390,81 @@ stickersToast: Toast(defaultToast) {
 stickersEmpty: icon {{ "stickers_empty", windowSubTextFg }};
 emojiEmpty: icon {{ "emoji_empty", windowSubTextFg }};
 
+defaultComposeIcons: ComposeIcons {
+	settings: icon {{ "emoji/emoji_settings", emojiIconFg }};
+
+	recent: icon {{ "emoji/emoji_recent", emojiIconFg }};
+	recentActive: icon {{ "emoji/emoji_recent", emojiSubIconFgActive }};
+	people: icon {{ "emoji/emoji_smile", emojiIconFg }};
+	peopleActive: icon {{ "emoji/emoji_smile", emojiSubIconFgActive }};
+	nature: icon {{ "emoji/emoji_nature", emojiIconFg }};
+	natureActive: icon {{ "emoji/emoji_nature", emojiSubIconFgActive }};
+	food: icon {{ "emoji/emoji_food", emojiIconFg }};
+	foodActive: icon {{ "emoji/emoji_food", emojiSubIconFgActive }};
+	activity: icon {{ "emoji/emoji_activities", emojiIconFg }};
+	activityActive: icon {{ "emoji/emoji_activities", emojiSubIconFgActive }};
+	travel: icon {{ "emoji/emoji_travel", emojiIconFg }};
+	travelActive: icon {{ "emoji/emoji_travel", emojiSubIconFgActive }};
+	objects: icon {{ "emoji/emoji_objects", emojiIconFg }};
+	objectsActive: icon {{ "emoji/emoji_objects", emojiSubIconFgActive }};
+	symbols: icon {{ "emoji/emoji_love", emojiIconFg }};
+	symbolsActive: icon {{ "emoji/emoji_love", emojiSubIconFgActive }};
+
+	menuFave: menuIconFave;
+	menuUnfave: menuIconUnfave;
+	menuStickerSet: menuIconStickers;
+	menuRecentRemove: menuIconDelete;
+	menuGifAdd: menuIconGif;
+	menuGifRemove: menuIconDelete;
+	menuMute: menuIconMute;
+	menuSchedule: menuIconSchedule;
+	menuWhenOnline: menuIconWhenOnline;
+}
+defaultEmojiPan: EmojiPan {
+	margin: margins(7px, 0px, 7px, 0px);
+	padding: margins(7px, 0px, 4px, 7px);
+	showAnimation: emojiPanAnimation;
+	desiredSize: 37px;
+	verticalSizeSub: 1px;
+	header: 33px;
+	headerLeft: 14px;
+	headerLockLeft: 7px;
+	headerLockedLeft: 26px;
+	headerTop: 10px;
+	footer: 36px;
+	iconSkip: 3px;
+	iconWidth: 30px;
+	iconArea: 28px;
+	bg: emojiPanBg;
+	headerFg: emojiPanHeaderFg;
+	trendingHeaderFg: stickersTrendingHeaderFg;
+	trendingSubheaderFg: stickersTrendingSubheaderFg;
+	trendingUnreadFg: stickersFeaturedUnreadBg;
+	trendingInstalled: stickersFeaturedInstalled;
+	overBg: emojiPanHover;
+	pathBg: windowBgRipple;
+	pathFg: windowBgOver;
+	textFg: windowFg;
+	categoriesBg: emojiPanCategories;
+	categoriesBgOver: windowBgRipple;
+	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
+	fadeRight: icon {{ "fade_horizontal", emojiPanCategories }};
+	menu: popupMenuWithIcons;
+	tabs: emojiTabs;
+	search: defaultTabbedSearch;
+	searchMargin: margins(1px, 11px, 2px, 5px);
+	removeSet: stickerPanRemoveSet;
+	boxLabel: boxLabel;
+	icons: defaultComposeIcons;
+	autocompleteBottomSkip: 0px;
+}
+statusEmojiPan: EmojiPan(defaultEmojiPan) {
+	categoriesBg: windowBg;
+	categoriesBgOver: windowBgOver;
+	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", windowBg }};
+	fadeRight: icon {{ "fade_horizontal", windowBg }};
+}
+
 inlineBotsScroll: ScrollArea(defaultSolidScroll) {
 	deltat: stickerPanPadding;
 	deltab: stickerPanPadding;
@@ -410,6 +481,15 @@ emojiSuggestionsScrolledWidth: 240px;
 emojiSuggestionsPadding: margins(emojiColorsPadding, 0px, emojiColorsPadding, 0px);
 emojiSuggestionsFadeAfter: 20px;
 
+defaultEmojiSuggestions: EmojiSuggestions {
+	dropdown: emojiSuggestionsDropdown;
+	bg: menuBg;
+	overBg: emojiPanHover;
+	textFg: windowFg;
+	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", boxBg }};
+	fadeRight: icon {{ "fade_horizontal", boxBg }};
+}
+
 mentionHeight: 40px;
 mentionPadding: margins(8px, 5px, 8px, 5px);
 mentionTop: 11px;
@@ -479,9 +559,6 @@ reactPanelScroll: ScrollArea(emojiScroll) {
 	deltab: 7px;
 }
 
-emojiSuggestionsFadeLeft: icon {{ "fade_horizontal-flip_horizontal", boxBg }};
-emojiSuggestionsFadeRight: icon {{ "fade_horizontal", boxBg }};
-
 choosePeerGroupIcon: icon {{ "info/edit/create_group", lightButtonFg }};
 choosePeerChannelIcon: icon {{ "info/edit/create_channel", lightButtonFg }};
 choosePeerCreateIconLeft: 25px;
@@ -857,5 +934,6 @@ defaultComposeControls: ComposeControls {
 	send: historySend;
 	attach: historyAttach;
 	emoji: historyAttachEmoji;
+	suggestions: defaultEmojiSuggestions;
 	tabbed: defaultEmojiPan;
 }
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_features.h b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
new file mode 100644
index 000000000..2f9915679
--- /dev/null
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace ChatHelpers {
+
+struct ComposeFeatures {
+	bool sendAs = true;
+	bool ttlInfo = true;
+	bool botCommandSend = true;
+	bool silentBroadcastToggle = true;
+	bool attachBotsMenu = true;
+	bool inlineBots = true;
+	bool megagroupSet = true;
+	bool stickersSettings = true;
+	bool openStickerSets = true;
+	bool autocompleteHashtags = true;
+	bool autocompleteMentions = true;
+	bool autocompleteCommands = true;
+};
+
+} // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index a6ff9af75..3d5f35c57 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -99,6 +99,7 @@ private:
 	QSize _singleSize;
 	QPoint _areaPosition;
 	QPoint _innerPosition;
+	Ui::RoundRect _backgroundRect;
 	Ui::RoundRect _overBg;
 
 	bool _hiding = false;
@@ -125,6 +126,7 @@ EmojiColorPicker::EmojiColorPicker(
 	const style::EmojiPan &st)
 : RpWidget(parent)
 , _st(st)
+, _backgroundRect(st::emojiPanRadius, _st.bg)
 , _overBg(st::emojiPanRadius, _st.overBg) {
 	setMouseTracking(true);
 }
@@ -181,8 +183,8 @@ void EmojiColorPicker::paintEvent(QPaintEvent *e) {
 		p.drawPixmap(0, 0, _cache);
 		return;
 	}
-	Ui::Shadow::paint(p, inner, width(), st::emojiPanAnimation.shadow);
-	Ui::FillRoundRect(p, inner, st::boxBg, Ui::BoxCorners);
+	Ui::Shadow::paint(p, inner, width(), _st.showAnimation.shadow);
+	_backgroundRect.paint(p, inner);
 
 	auto x = st::emojiPanMargins.left() + 2 * st::emojiColorsPadding + _singleSize.width();
 	if (rtl()) x = width() - x - st::emojiColorsSep;
@@ -393,6 +395,7 @@ EmojiListWidget::EmojiListWidget(
 	descriptor.show,
 	std::move(descriptor.paused))
 , _show(std::move(descriptor.show))
+, _features(descriptor.features)
 , _mode(descriptor.mode)
 , _staticCount(_mode == Mode::Full ? kEmojiSectionCount : 1)
 , _premiumIcon(_mode == Mode::EmojiStatus
@@ -402,7 +405,7 @@ EmojiListWidget::EmojiListWidget(
 	std::make_unique<LocalStickersManager>(&session()))
 , _customRecentFactory(std::move(descriptor.customRecentFactory))
 , _overBg(st::emojiPanRadius, st().overBg)
-, _collapsedBg(st::emojiPanExpand.height / 2, st::emojiPanHeaderFg)
+, _collapsedBg(st::emojiPanExpand.height / 2, st().headerFg)
 , _picker(this, st())
 , _showPickerTimer([=] { showPicker(); }) {
 	setMouseTracking(true);
@@ -1072,7 +1075,7 @@ void EmojiListWidget::paint(
 			- paintButtonGetWidth(p, info, buttonSelected, clip);
 		if (info.section > 0 && clip.top() < info.rowsTop) {
 			p.setFont(st::emojiPanHeaderFont);
-			p.setPen(st::emojiPanHeaderFg);
+			p.setPen(st().headerFg);
 			auto titleText = (info.section < _staticCount)
 				? ChatHelpers::EmojiCategoryTitle(info.section)(tr::now)
 				: _custom[info.section - _staticCount].title;
@@ -1091,7 +1094,7 @@ void EmojiListWidget::paint(
 			}
 			const auto textBaseline = top + st::emojiPanHeaderFont->ascent;
 			p.setFont(st::emojiPanHeaderFont);
-			p.setPen(st::emojiPanHeaderFg);
+			p.setPen(st().headerFg);
 			p.drawText(titleLeft, textBaseline, titleText);
 		}
 		if (clip.top() + clip.height() > info.rowsTop) {
@@ -1459,7 +1462,8 @@ void EmojiListWidget::displaySet(uint64 setId) {
 }
 
 void EmojiListWidget::removeSet(uint64 setId) {
-	if (auto box = MakeConfirmRemoveSetBox(&session(), setId)) {
+	const auto &labelSt = st().boxLabel;
+	if (auto box = MakeConfirmRemoveSetBox(&session(), labelSt, setId)) {
 		checkHideWithBox(std::move(box));
 	}
 }
@@ -1532,9 +1536,10 @@ QRect EmojiListWidget::removeButtonRect(const SectionInfo &info) const {
 	if (_mode != Mode::Full) {
 		return QRect();
 	}
-	const auto buttonw = st::stickerPanRemoveSet.rippleAreaPosition.x()
-		+ st::stickerPanRemoveSet.rippleAreaSize;
-	const auto buttonh = st::stickerPanRemoveSet.height;
+	const auto &removeSt = st().removeSet;
+	const auto buttonw = removeSt.rippleAreaPosition.x()
+		+ removeSt.rippleAreaSize;
+	const auto buttonh = removeSt.height;
 	const auto buttonx = emojiRight() - st::emojiPanRemoveSkip - buttonw;
 	const auto buttony = info.top + st::emojiPanRemoveTop;
 	return QRect(buttonx, buttony, buttonw, buttonh);
@@ -1966,19 +1971,18 @@ int EmojiListWidget::paintButtonGetWidth(
 		if (remove.isEmpty()) {
 			return 0;
 		} else if (remove.intersects(clip)) {
+			const auto &removeSt = st().removeSet;
 			if (custom.ripple) {
 				custom.ripple->paint(
 					p,
-					remove.x() + st::stickerPanRemoveSet.rippleAreaPosition.x(),
-					remove.y() + st::stickerPanRemoveSet.rippleAreaPosition.y(),
+					remove.x() + removeSt.rippleAreaPosition.x(),
+					remove.y() + removeSt.rippleAreaPosition.y(),
 					width());
 				if (custom.ripple->empty()) {
 					custom.ripple.reset();
 				}
 			}
-			const auto &icon = selected
-				? st::stickerPanRemoveSet.iconOver
-				: st::stickerPanRemoveSet.icon;
+			const auto &icon = selected ? removeSt.iconOver : removeSt.icon;
 			icon.paint(
 				p,
 				(remove.topLeft()
@@ -2045,7 +2049,9 @@ void EmojiListWidget::updateSelected() {
 		if (hasButton(section)
 			&& myrtlrect(buttonRect(section)).contains(p.x(), p.y())) {
 			newSelected = OverButton{ section };
-		} else if (section >= _staticCount && _mode == Mode::Full) {
+		} else if (_features.openStickerSets
+			&& section >= _staticCount
+			&& _mode == Mode::Full) {
 			newSelected = OverSet{ section };
 		}
 	} else if (p.y() >= info.rowsTop && p.y() < info.rowsBottom) {
@@ -2159,13 +2165,12 @@ std::unique_ptr<Ui::RippleAnimation> EmojiListWidget::createButtonRipple(
 		&& section < _staticCount + _custom.size());
 
 	const auto remove = hasRemoveButton(section);
-	const auto &st = remove
-		? st::stickerPanRemoveSet.ripple
-		: st::emojiPanButton.ripple;
+	const auto &removeSt = st().removeSet;
+	const auto &st = remove ? removeSt.ripple : st::emojiPanButton.ripple;
 	auto mask = remove
 		? Ui::RippleAnimation::EllipseMask(QSize(
-			st::stickerPanRemoveSet.rippleAreaSize,
-			st::stickerPanRemoveSet.rippleAreaSize))
+			removeSt.rippleAreaSize,
+			removeSt.rippleAreaSize))
 		: rightButton(section).rippleMask;
 	return std::make_unique<Ui::RippleAnimation>(
 		st,
@@ -2179,7 +2184,7 @@ QPoint EmojiListWidget::buttonRippleTopLeft(int section) const {
 
 	return myrtlrect(buttonRect(section)).topLeft()
 		+ (hasRemoveButton(section)
-			? st::stickerPanRemoveSet.rippleAreaPosition
+			? st().removeSet.rippleAreaPosition
 			: QPoint());
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index fd307eda8..cc97d64db 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "chat_helpers/compose/compose_features.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/round_rect.h"
@@ -84,6 +85,7 @@ struct EmojiListDescriptor {
 		DocumentId,
 		Fn<void()>)> customRecentFactory;
 	const style::EmojiPan *st = nullptr;
+	ComposeFeatures features;
 };
 
 class EmojiListWidget final
@@ -345,6 +347,7 @@ private:
 	void applyNextSearchQuery();
 
 	const std::shared_ptr<Show> _show;
+	const ComposeFeatures _features;
 	Mode _mode = Mode::Full;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	const int _staticCount = 0;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index b74e37708..ccd235355 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/emoji_config.h"
 #include "ui/ui_utility.h"
 #include "ui/cached_round_corners.h"
+#include "ui/round_rect.h"
 #include "platform/platform_specific.h"
 #include "core/application.h"
 #include "base/event_filter.h"
@@ -41,15 +42,133 @@ constexpr auto kAnimationDuration = crl::time(120);
 
 } // namespace
 
+class SuggestionsWidget final : public Ui::RpWidget {
+public:
+	SuggestionsWidget(
+		QWidget *parent,
+		const style::EmojiSuggestions &st,
+		not_null<Main::Session*> session,
+		bool suggestCustomEmoji,
+		Fn<bool(not_null<DocumentData*>)> allowCustomWithoutPremium);
+	~SuggestionsWidget();
+
+	void showWithQuery(SuggestionsQuery query, bool force = false);
+	void selectFirstResult();
+	bool handleKeyEvent(int key);
+
+	[[nodiscard]] rpl::producer<bool> toggleAnimated() const;
+
+	struct Chosen {
+		QString emoji;
+		QString customData;
+	};
+	[[nodiscard]] rpl::producer<Chosen> triggered() const;
+
+private:
+	struct Row {
+		Row(not_null<EmojiPtr> emoji, const QString &replacement);
+
+		Ui::Text::CustomEmoji *custom = nullptr;
+		DocumentData *document = nullptr;
+		not_null<EmojiPtr> emoji;
+		QString replacement;
+	};
+	struct Custom {
+		not_null<DocumentData*> document;
+		not_null<EmojiPtr> emoji;
+		QString replacement;
+	};
+
+	bool eventHook(QEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void enterEventHook(QEnterEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
+	void scrollByWheelEvent(not_null<QWheelEvent*> e);
+	void paintFadings(QPainter &p) const;
+
+	[[nodiscard]] std::vector<Row> getRowsByQuery(const QString &text) const;
+	[[nodiscard]] base::flat_multi_map<int, Custom> lookupCustom(
+		const std::vector<Row> &rows) const;
+	[[nodiscard]] std::vector<Row> appendCustom(
+		std::vector<Row> rows);
+	[[nodiscard]] std::vector<Row> appendCustom(
+		std::vector<Row> rows,
+		const base::flat_multi_map<int, Custom> &custom);
+	void resizeToRows();
+	void setSelected(
+		int selected,
+		anim::type animated = anim::type::instant);
+	void setPressed(int pressed);
+	void clearMouseSelection();
+	void clearSelection();
+	void updateSelectedItem();
+	void updateItem(int index);
+	[[nodiscard]] QRect inner() const;
+	[[nodiscard]] QPoint innerShift() const;
+	[[nodiscard]] QPoint mapToInner(QPoint globalPosition) const;
+	void selectByMouse(QPoint globalPosition);
+	bool triggerSelectedRow() const;
+	void triggerRow(const Row &row) const;
+
+	[[nodiscard]] int scrollCurrent() const;
+	void scrollTo(int value, anim::type animated = anim::type::instant);
+	void stopAnimations();
+
+	[[nodiscard]] not_null<Ui::Text::CustomEmoji*> resolveCustomEmoji(
+		not_null<DocumentData*> document);
+	void customEmojiRepaint();
+
+	const style::EmojiSuggestions &_st;
+	const not_null<Main::Session*> _session;
+	SuggestionsQuery _query;
+	std::vector<Row> _rows;
+	bool _suggestCustomEmoji = false;
+	Fn<bool(not_null<DocumentData*>)> _allowCustomWithoutPremium;
+
+	Ui::RoundRect _overRect;
+
+	base::flat_map<
+		not_null<DocumentData*>,
+		std::unique_ptr<Ui::Text::CustomEmoji>> _customEmoji;
+	bool _repaintScheduled = false;
+
+	std::optional<QPoint> _lastMousePosition;
+	bool _mouseSelection = false;
+	int _selected = -1;
+	int _pressed = -1;
+
+	int _scrollValue = 0;
+	Ui::Animations::Simple _scrollAnimation;
+	Ui::Animations::Simple _selectedAnimation;
+	int _scrollMax = 0;
+	int _oneWidth = 0;
+	QMargins _padding;
+
+	QPoint _mousePressPosition;
+	int _dragScrollStart = -1;
+
+	rpl::event_stream<bool> _toggleAnimated;
+	rpl::event_stream<Chosen> _triggered;
+
+};
+
 SuggestionsWidget::SuggestionsWidget(
 	QWidget *parent,
+	const style::EmojiSuggestions &st,
 	not_null<Main::Session*> session,
 	bool suggestCustomEmoji,
 	Fn<bool(not_null<DocumentData*>)> allowCustomWithoutPremium)
 : RpWidget(parent)
+, _st(st)
 , _session(session)
 , _suggestCustomEmoji(suggestCustomEmoji)
 , _allowCustomWithoutPremium(std::move(allowCustomWithoutPremium))
+, _overRect(st::roundRadiusSmall, _st.overBg)
 , _oneWidth(st::emojiSuggestionSize)
 , _padding(st::emojiSuggestionsPadding) {
 	resize(
@@ -284,7 +403,7 @@ void SuggestionsWidget::paintEvent(QPaintEvent *e) {
 	_repaintScheduled = false;
 
 	const auto clip = e->rect();
-	p.fillRect(clip, st::boxBg);
+	p.fillRect(clip, _st.bg);
 
 	const auto shift = innerShift();
 	p.translate(-shift);
@@ -298,15 +417,13 @@ void SuggestionsWidget::paintEvent(QPaintEvent *e) {
 		? _pressed
 		: _selectedAnimation.value(_selected);
 	if (selected > -1.) {
-		Ui::FillRoundRect(
+		_overRect.paint(
 			p,
-			QRect(selected * _oneWidth, 0, _oneWidth, _oneWidth),
-			st::emojiPanHover,
-			Ui::StickerHoverCorners);
+			QRect(selected * _oneWidth, 0, _oneWidth, _oneWidth));
 	}
 
 	auto context = Ui::CustomEmoji::Context{
-		.textColor = st::windowFg->c,
+		.textColor = _st.textFg->c,
 		.now = crl::now(),
 	};
 	for (auto i = from; i != till; ++i) {
@@ -338,9 +455,9 @@ void SuggestionsWidget::paintFadings(QPainter &p) const {
 		const auto rect = myrtlrect(
 			shift.x(),
 			0,
-			st::emojiSuggestionsFadeLeft.width(),
+			_st.fadeLeft.width(),
 			height());
-		st::emojiSuggestionsFadeLeft.fill(p, rect);
+		_st.fadeLeft.fill(p, rect);
 		p.setOpacity(1.);
 	}
 	const auto o_right = std::clamp(
@@ -350,11 +467,11 @@ void SuggestionsWidget::paintFadings(QPainter &p) const {
 	if (o_right > 0.) {
 		p.setOpacity(o_right);
 		const auto rect = myrtlrect(
-			shift.x() + width() - st::emojiSuggestionsFadeRight.width(),
+			shift.x() + width() - _st.fadeRight.width(),
 			0,
-			st::emojiSuggestionsFadeRight.width(),
+			_st.fadeRight.width(),
 			height());
-		st::emojiSuggestionsFadeRight.fill(p, rect);
+		_st.fadeRight.fill(p, rect);
 		p.setOpacity(1.);
 	}
 }
@@ -601,17 +718,17 @@ SuggestionsController::SuggestionsController(
 	not_null<QTextEdit*> field,
 	not_null<Main::Session*> session,
 	const Options &options)
-: _field(field)
+: _st(options.st ? *options.st : st::defaultEmojiSuggestions)
+, _field(field)
 , _session(session)
 , _showExactTimer([=] { showWithQuery(getEmojiQuery()); })
 , _options(options) {
-	_container = base::make_unique_q<InnerDropdown>(
-		outer,
-		st::emojiSuggestionsDropdown);
+	_container = base::make_unique_q<InnerDropdown>(outer, _st.dropdown);
 	_container->setAutoHiding(false);
 	_suggestions = _container->setOwnedWidget(
 		object_ptr<Ui::Emoji::SuggestionsWidget>(
 			_container,
+			_st,
 			session,
 			_options.suggestCustomEmoji,
 			_options.allowCustomWithoutPremium));
@@ -910,7 +1027,7 @@ void SuggestionsController::updateGeometry() {
 	auto boundingRect = _container->parentWidget()->rect();
 	auto origin = rtl() ? PanelAnimation::Origin::BottomRight : PanelAnimation::Origin::BottomLeft;
 	auto point = rtl() ? (aroundRect.topLeft() + QPoint(aroundRect.width(), 0)) : aroundRect.topLeft();
-	const auto padding = st::emojiSuggestionsDropdown.padding;
+	const auto padding = _st.dropdown.padding;
 	const auto shift = std::min(_container->width() - padding.left() - padding.right(), st::emojiSuggestionSize) / 2;
 	point -= rtl() ? QPoint(_container->width() - padding.right() - shift, _container->height()) : QPoint(padding.left() + shift, _container->height());
 	if (rtl()) {
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h
index 513fb518d..b89de0ad9 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h
@@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtWidgets/QTextEdit>
 
+namespace style {
+struct EmojiSuggestions;
+} // namespace style
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -29,125 +33,17 @@ class CustomEmoji;
 
 namespace Ui::Emoji {
 
+class SuggestionsWidget;
+
 using SuggestionsQuery = std::variant<QString, EmojiPtr>;
 
-class SuggestionsWidget final : public Ui::RpWidget {
-public:
-	SuggestionsWidget(
-		QWidget *parent,
-		not_null<Main::Session*> session,
-		bool suggestCustomEmoji,
-		Fn<bool(not_null<DocumentData*>)> allowCustomWithoutPremium);
-	~SuggestionsWidget();
-
-	void showWithQuery(SuggestionsQuery query, bool force = false);
-	void selectFirstResult();
-	bool handleKeyEvent(int key);
-
-	[[nodiscard]] rpl::producer<bool> toggleAnimated() const;
-
-	struct Chosen {
-		QString emoji;
-		QString customData;
-	};
-	[[nodiscard]] rpl::producer<Chosen> triggered() const;
-
-private:
-	struct Row {
-		Row(not_null<EmojiPtr> emoji, const QString &replacement);
-
-		Ui::Text::CustomEmoji *custom = nullptr;
-		DocumentData *document = nullptr;
-		not_null<EmojiPtr> emoji;
-		QString replacement;
-	};
-	struct Custom {
-		not_null<DocumentData*> document;
-		not_null<EmojiPtr> emoji;
-		QString replacement;
-	};
-
-	bool eventHook(QEvent *e) override;
-	void paintEvent(QPaintEvent *e) override;
-	void keyPressEvent(QKeyEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void enterEventHook(QEnterEvent *e) override;
-	void leaveEventHook(QEvent *e) override;
-
-	void scrollByWheelEvent(not_null<QWheelEvent*> e);
-	void paintFadings(QPainter &p) const;
-
-	[[nodiscard]] std::vector<Row> getRowsByQuery(const QString &text) const;
-	[[nodiscard]] base::flat_multi_map<int, Custom> lookupCustom(
-		const std::vector<Row> &rows) const;
-	[[nodiscard]] std::vector<Row> appendCustom(
-		std::vector<Row> rows);
-	[[nodiscard]] std::vector<Row> appendCustom(
-		std::vector<Row> rows,
-		const base::flat_multi_map<int, Custom> &custom);
-	void resizeToRows();
-	void setSelected(
-		int selected,
-		anim::type animated = anim::type::instant);
-	void setPressed(int pressed);
-	void clearMouseSelection();
-	void clearSelection();
-	void updateSelectedItem();
-	void updateItem(int index);
-	[[nodiscard]] QRect inner() const;
-	[[nodiscard]] QPoint innerShift() const;
-	[[nodiscard]] QPoint mapToInner(QPoint globalPosition) const;
-	void selectByMouse(QPoint globalPosition);
-	bool triggerSelectedRow() const;
-	void triggerRow(const Row &row) const;
-
-	[[nodiscard]] int scrollCurrent() const;
-	void scrollTo(int value, anim::type animated = anim::type::instant);
-	void stopAnimations();
-
-	[[nodiscard]] not_null<Ui::Text::CustomEmoji*> resolveCustomEmoji(
-		not_null<DocumentData*> document);
-	void customEmojiRepaint();
-
-	const not_null<Main::Session*> _session;
-	SuggestionsQuery _query;
-	std::vector<Row> _rows;
-	bool _suggestCustomEmoji = false;
-	Fn<bool(not_null<DocumentData*>)> _allowCustomWithoutPremium;
-
-	base::flat_map<
-		not_null<DocumentData*>,
-		std::unique_ptr<Ui::Text::CustomEmoji>> _customEmoji;
-	bool _repaintScheduled = false;
-
-	std::optional<QPoint> _lastMousePosition;
-	bool _mouseSelection = false;
-	int _selected = -1;
-	int _pressed = -1;
-
-	int _scrollValue = 0;
-	Ui::Animations::Simple _scrollAnimation;
-	Ui::Animations::Simple _selectedAnimation;
-	int _scrollMax = 0;
-	int _oneWidth = 0;
-	QMargins _padding;
-
-	QPoint _mousePressPosition;
-	int _dragScrollStart = -1;
-
-	rpl::event_stream<bool> _toggleAnimated;
-	rpl::event_stream<Chosen> _triggered;
-
-};
-
 class SuggestionsController {
 public:
 	struct Options {
 		bool suggestExactFirstWord = true;
 		bool suggestCustomEmoji = false;
 		Fn<bool(not_null<DocumentData*>)> allowCustomWithoutPremium;
+		const style::EmojiSuggestions *st = nullptr;
 	};
 
 	SuggestionsController(
@@ -189,6 +85,7 @@ private:
 	bool fieldFilter(not_null<QEvent*> event);
 	bool outerFilter(not_null<QEvent*> event);
 
+	const style::EmojiSuggestions &_st;
 	bool _shown = false;
 	bool _forceHidden = false;
 	int _queryStartPosition = 0;
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index b78615721..6f312926f 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -685,6 +685,7 @@ void FieldAutocomplete::recount(bool resetScroll) {
 	} else if (!_brows.empty()) {
 		h = _brows.size() * st::mentionHeight;
 	}
+	h += _st.autocompleteBottomSkip;
 
 	if (_inner->width() != _boundings.width() || _inner->height() != h) {
 		_inner->resize(_boundings.width(), h);
@@ -1375,8 +1376,10 @@ void FieldAutocomplete::Inner::setSel(int sel, bool scroll) {
 			int32 row = _sel / _stickersPerRow;
 			const auto padding = st::stickerPanPadding;
 			_scrollToRequested.fire({
-				padding + row * st::stickerPanSize.height(),
-				padding + (row + 1) * st::stickerPanSize.height() });
+				(row ? padding : 0) + row * st::stickerPanSize.height(),
+				(padding
+					+ (row + 1) * st::stickerPanSize.height()
+					+ _st.autocompleteBottomSkip) });
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 9ff10845d..48a0e9800 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -57,7 +57,8 @@ constexpr auto kMinAfterScrollDelay = crl::time(33);
 void AddGifAction(
 		Fn<void(QString, Fn<void()> &&, const style::icon*)> callback,
 		std::shared_ptr<Show> show,
-		not_null<DocumentData*> document) {
+		not_null<DocumentData*> document,
+		const style::ComposeIcons *iconsOverride) {
 	if (!document->isGifv()) {
 		return;
 	}
@@ -67,6 +68,9 @@ void AddGifAction(
 	const auto text = (saved
 		? tr::lng_context_delete_gif
 		: tr::lng_context_save_gif)(tr::now);
+	const auto &icons = iconsOverride
+		? *iconsOverride
+		: st::defaultComposeIcons;
 	callback(text, [=] {
 		Api::ToggleSavedGif(
 			show,
@@ -80,7 +84,7 @@ void AddGifAction(
 			document->session().local().writeSavedGifs();
 		}
 		data.stickers().notifySavedGifsUpdated();
-	}, saved ? &st::menuIconDelete : &st::menuIconGif);
+	}, saved ? &icons.menuGifRemove : &icons.menuGifAdd);
 }
 
 GifsListWidget::GifsListWidget(
@@ -380,18 +384,18 @@ base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
 		return nullptr;
 	}
 
-	auto menu = base::make_unique_q<Ui::PopupMenu>(
-		this,
-		st::popupMenuWithIcons);
+	auto menu = base::make_unique_q<Ui::PopupMenu>(this, st().menu);
 	const auto send = [=, selected = _selected](Api::SendOptions options) {
 		selectInlineResult(selected, options, true);
 	};
+	const auto icons = &st().icons;
 	SendMenu::FillSendMenu(
 		menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
 		SendMenu::DefaultScheduleCallback(this, type, send),
-		SendMenu::DefaultWhenOnlineCallback(send));
+		SendMenu::DefaultWhenOnlineCallback(send),
+		icons);
 
 	if (const auto item = _mosaic.maybeItemAt(_selected)) {
 		const auto document = item->getDocument()
@@ -404,7 +408,7 @@ base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
 					const style::icon *icon) {
 				menu->addAction(text, std::move(done), icon);
 			};
-			AddGifAction(std::move(callback), _show, document);
+			AddGifAction(std::move(callback), _show, document, icons);
 		}
 	}
 	return menu;
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
index d21c8e531..84e20c864 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
@@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QTimer>
 
+namespace style {
+struct ComposeIcons;
+} // namespace style
+
 namespace Api {
 struct SendOptions;
 } // namespace Api
@@ -48,7 +52,8 @@ namespace ChatHelpers {
 void AddGifAction(
 	Fn<void(QString, Fn<void()> &&, const style::icon*)> callback,
 	std::shared_ptr<Show> show,
-	not_null<DocumentData*> document);
+	not_null<DocumentData*> document,
+	const style::ComposeIcons *iconsOverride = nullptr);
 
 class StickersListFooter;
 struct StickerIcon;
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 03430e3ab..b0e263c4a 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -498,7 +498,8 @@ InlineBotQuery ParseInlineBotQuery(
 }
 
 AutocompleteQuery ParseMentionHashtagBotCommandQuery(
-		not_null<const Ui::InputField*> field) {
+		not_null<const Ui::InputField*> field,
+		ChatHelpers::ComposeFeatures features) {
 	auto result = AutocompleteQuery();
 
 	const auto cursor = field->textCursor();
@@ -530,6 +531,9 @@ AutocompleteQuery ParseMentionHashtagBotCommandQuery(
 		const auto text = fragment.text();
 		for (auto i = position - fragmentPosition; i != 0; --i) {
 			if (text[i - 1] == '@') {
+				if (!features.autocompleteMentions) {
+					return {};
+				}
 				if ((position - fragmentPosition - i < 1 || text[i].isLetter()) && (i < 2 || !(text[i - 2].isLetterOrNumber() || text[i - 2] == '_'))) {
 					result.fromStart = (i == 1) && (fragmentPosition == 0);
 					result.query = text.mid(i - 1, position - fragmentPosition - i + 1);
@@ -540,12 +544,18 @@ AutocompleteQuery ParseMentionHashtagBotCommandQuery(
 				}
 				return result;
 			} else if (text[i - 1] == '#') {
+				if (!features.autocompleteHashtags) {
+					return {};
+				}
 				if (i < 2 || !(text[i - 2].isLetterOrNumber() || text[i - 2] == '_')) {
 					result.fromStart = (i == 1) && (fragmentPosition == 0);
 					result.query = text.mid(i - 1, position - fragmentPosition - i + 1);
 				}
 				return result;
 			} else if (text[i - 1] == '/') {
+				if (!features.autocompleteCommands) {
+					return {};
+				}
 				if (i < 2 && !fragmentPosition) {
 					result.fromStart = (i == 1) && (fragmentPosition == 0);
 					result.query = text.mid(i - 1, position - fragmentPosition - i + 1);
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 727e51a5b..13012557b 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "base/timer.h"
 #include "base/qt_connection.h"
+#include "chat_helpers/compose/compose_features.h"
 
 #ifndef TDESKTOP_DISABLE_SPELLCHECK
 #include "boxes/dictionaries_manager.h"
@@ -90,7 +91,8 @@ struct AutocompleteQuery {
 	bool fromStart = false;
 };
 AutocompleteQuery ParseMentionHashtagBotCommandQuery(
-	not_null<const Ui::InputField*> field);
+	not_null<const Ui::InputField*> field,
+	ChatHelpers::ComposeFeatures features);
 
 class MessageLinksParser : private QObject {
 public:
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index a9aa598d6..15e2e8c34 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -292,7 +292,7 @@ StickersListFooter::StickersListFooter(Descriptor &&descriptor)
 	descriptor.st ? *descriptor.st : st::defaultEmojiPan)
 , _session(descriptor.session)
 , _paused(descriptor.paused)
-, _settingsButtonVisible(descriptor.settingsButtonVisible)
+, _features(descriptor.features)
 , _iconState([=] { update(); })
 , _subiconState([=] { update(); })
 , _selectionBg(st::emojiPanRadius, st().categoriesBgOver)
@@ -300,7 +300,7 @@ StickersListFooter::StickersListFooter(Descriptor &&descriptor)
 	setMouseTracking(true);
 
 	_iconsLeft = st().iconSkip
-		+ (_settingsButtonVisible ? st().iconWidth : 0);
+		+ (_features.stickersSettings ? st().iconWidth : 0);
 	_iconsRight = st().iconSkip;
 
 	_session->downloaderTaskFinished(
@@ -618,7 +618,7 @@ void StickersListFooter::paint(
 		return;
 	}
 
-	if (_settingsButtonVisible && !hasOnlyFeaturedSets()) {
+	if (_features.stickersSettings) {
 		paintStickerSettingsIcon(p);
 	}
 
@@ -1012,12 +1012,12 @@ void StickersListFooter::updateSelected() {
 	if (rtl()) x = width() - x;
 	const auto settingsLeft = _iconsLeft - _singleWidth;
 	auto newOver = OverState(SpecialOver::None);
-	if (_settingsButtonVisible
+	if (_features.stickersSettings
 		&& x >= settingsLeft
 		&& x < settingsLeft + _singleWidth
 		&& y >= _iconsTop
 		&& y < _iconsTop + st().footer) {
-		if (!_icons.empty() && !hasOnlyFeaturedSets()) {
+		if (!_icons.empty()) {
 			newOver = SpecialOver::Settings;
 		}
 	} else if (!_icons.empty()) {
@@ -1161,17 +1161,11 @@ void StickersListFooter::refreshSubiconsGeometry() {
 	updateEmojiWidthCallback();
 }
 
-bool StickersListFooter::hasOnlyFeaturedSets() const {
-	return (_icons.size() == 1)
-		&& (_icons[0].setId == Data::Stickers::FeaturedSetId);
-}
-
 void StickersListFooter::paintStickerSettingsIcon(QPainter &p) const {
 	const auto settingsLeft = _iconsLeft - _singleWidth;
-	st::stickersSettings.paint(
+	st().icons.settings.paint(
 		p,
-		settingsLeft
-			+ (_singleWidth - st::stickersSettings.width()) / 2,
+		(settingsLeft + (_singleWidth - st().icons.settings.width()) / 2),
 		_iconsTop + st::emojiCategoryIconTop,
 		width());
 }
@@ -1411,22 +1405,22 @@ void StickersListFooter::paintSetIconToCache(
 		using Section = Ui::Emoji::Section;
 		const auto sectionIcon = [&](Section section, bool active) {
 			const auto icons = std::array{
-				&st::emojiRecent,
-				&st::emojiRecentActive,
-				&st::emojiPeople,
-				&st::emojiPeopleActive,
-				&st::emojiNature,
-				&st::emojiNatureActive,
-				&st::emojiFood,
-				&st::emojiFoodActive,
-				&st::emojiActivity,
-				&st::emojiActivityActive,
-				&st::emojiTravel,
-				&st::emojiTravelActive,
-				&st::emojiObjects,
-				&st::emojiObjectsActive,
-				&st::emojiSymbols,
-				&st::emojiSymbolsActive,
+				&st().icons.recent,
+				&st().icons.recentActive,
+				&st().icons.people,
+				&st().icons.peopleActive,
+				&st().icons.nature,
+				&st().icons.natureActive,
+				&st().icons.food,
+				&st().icons.foodActive,
+				&st().icons.activity,
+				&st().icons.activityActive,
+				&st().icons.travel,
+				&st().icons.travelActive,
+				&st().icons.objects,
+				&st().icons.objectsActive,
+				&st().icons.symbols,
+				&st().icons.symbolsActive,
 			};
 			const auto index = int(section) * 2 + (active ? 1 : 0);
 
@@ -1464,15 +1458,8 @@ void StickersListFooter::paintSetIconToCache(
 		} else {
 			paintOne(0, [&] {
 				const auto selected = (info.index == _iconState.selected);
-				if (icon.setId == Data::Stickers::FeaturedSetId) {
-					const auto &stickers = _session->data().stickers();
-					return stickers.featuredSetsUnreadCount()
-						? &st::stickersTrendingUnread
-						: &st::stickersTrending;
-					//} else if (setId == Stickers::FavedSetId) {
-					//	return &st::stickersFaved;
-				} else if (icon.setId == AllEmojiSectionSetId()) {
-					return &st::emojiPeople;
+				if (icon.setId == AllEmojiSectionSetId()) {
+					return &st().icons.people;
 				} else if (const auto section = SetIdEmojiSection(icon.setId)) {
 					return sectionIcon(*section, selected);
 				}
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h
index 1a08f6853..f7a0afc1d 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h
@@ -7,8 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "media/clip/media_clip_reader.h"
+#include "chat_helpers/compose/compose_features.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "media/clip/media_clip_reader.h"
 #include "mtproto/sender.h"
 #include "ui/dpr/dpr_image.h"
 #include "ui/round_rect.h"
@@ -116,8 +117,8 @@ public:
 		not_null<Main::Session*> session;
 		Fn<bool()> paused;
 		not_null<RpWidget*> parent;
-		bool settingsButtonVisible = false;
 		const style::EmojiPan *st = nullptr;
+		ComposeFeatures features;
 	};
 	explicit StickersListFooter(Descriptor &&descriptor);
 
@@ -130,7 +131,6 @@ public:
 		uint64 activeSetId,
 		Fn<std::shared_ptr<Lottie::FrameRenderer>()> renderer,
 		ValidateIconAnimations animations);
-	[[nodiscard]] bool hasOnlyFeaturedSets() const;
 
 	void leaveToChildEvent(QEvent *e, QWidget *child) override;
 
@@ -270,7 +270,7 @@ private:
 
 	const not_null<Main::Session*> _session;
 	const Fn<bool()> _paused;
-	const bool _settingsButtonVisible = false;
+	const ComposeFeatures _features;
 
 	static constexpr auto kVisibleIconsCount = 8;
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 40aae70eb..cf0dda5eb 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -184,12 +184,12 @@ StickersListWidget::StickersListWidget(
 	descriptor.paused)
 , _mode(descriptor.mode)
 , _show(std::move(descriptor.show))
+, _features(descriptor.features)
 , _overBg(st::roundRadiusSmall, st().overBg)
 , _api(&session().mtp())
 , _localSetsManager(std::make_unique<LocalStickersManager>(&session()))
 , _section(Section::Stickers)
 , _isMasks(_mode == Mode::Masks)
-, _settingsHidden(descriptor.settingsHidden)
 , _updateItemsTimer([=] { updateItems(); })
 , _updateSetsTimer([=] { updateSets(); })
 , _trendingAddBgOver(
@@ -286,8 +286,8 @@ object_ptr<TabbedSelector::InnerFooter> StickersListWidget::createFooter() {
 		.session = &session(),
 		.paused = footerPaused,
 		.parent = this,
-		.settingsButtonVisible = !_settingsHidden,
 		.st = &st(),
+		.features = _features,
 	});
 	_footer = result;
 
@@ -298,7 +298,7 @@ object_ptr<TabbedSelector::InnerFooter> StickersListWidget::createFooter() {
 
 	_footer->openSettingsRequests(
 	) | rpl::start_with_next([=] {
-		const auto onlyFeatured = _footer->hasOnlyFeaturedSets();
+		const auto onlyFeatured = !_isMasks && _mySets.empty();
 		_show->showBox(Box<StickersBox>(
 			_show,
 			(onlyFeatured
@@ -908,7 +908,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				auto add = featuredAddRect(info);
 				int checkx = add.left() + (add.width() - st::stickersFeaturedInstalled.width()) / 2;
 				int checky = add.top() + (add.height() - st::stickersFeaturedInstalled.height()) / 2;
-				st::stickersFeaturedInstalled.paint(p, QPoint(checkx, checky), width());
+				st().trendingInstalled.paint(p, QPoint(checkx, checky), width());
 			}
 			if (set.flags & SetFlag::Unread) {
 				widthForTitle -= st::stickersFeaturedUnreadSize + st::stickersFeaturedUnreadSkip;
@@ -921,12 +921,12 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				titleWidth = st::stickersTrendingHeaderFont->width(titleText);
 			}
 			p.setFont(st::stickersTrendingHeaderFont);
-			p.setPen(st::stickersTrendingHeaderFg);
+			p.setPen(st().trendingHeaderFg);
 			p.drawTextLeft(st().headerLeft - st().margin.left(), info.top + st::stickersTrendingHeaderTop, width(), titleText, titleWidth);
 
 			if (set.flags & SetFlag::Unread) {
 				p.setPen(Qt::NoPen);
-				p.setBrush(st::stickersFeaturedUnreadBg);
+				p.setBrush(st().trendingUnreadFg);
 
 				{
 					PainterHighQualityEnabler hq(p);
@@ -936,7 +936,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 
 			auto statusText = (count > 0) ? tr::lng_stickers_count(tr::now, lt_count, count) : tr::lng_contacts_loading(tr::now);
 			p.setFont(st::stickersTrendingSubheaderFont);
-			p.setPen(st::stickersTrendingSubheaderFg);
+			p.setPen(st().trendingSubheaderFg);
 			p.drawTextLeft(st().headerLeft - st().margin.left(), info.top + st::stickersTrendingSubheaderTop, width(), statusText);
 
 			if (info.rowsTop >= clip.y() + clip.height()) {
@@ -963,13 +963,14 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 			if (hasRemoveButton(info.section)) {
 				auto remove = removeButtonRect(info);
 				auto selected = selectedButton ? (selectedButton->section == info.section) : false;
+				const auto &removeSt = st().removeSet;
 				if (set.ripple) {
-					set.ripple->paint(p, remove.x() + st::stickerPanRemoveSet.rippleAreaPosition.x(), remove.y() + st::stickerPanRemoveSet.rippleAreaPosition.y(), width());
+					set.ripple->paint(p, remove.x() + removeSt.rippleAreaPosition.x(), remove.y() + removeSt.rippleAreaPosition.y(), width());
 					if (set.ripple->empty()) {
 						set.ripple.reset();
 					}
 				}
-				const auto &icon = selected ? st::stickerPanRemoveSet.iconOver : st::stickerPanRemoveSet.icon;
+				const auto &icon = selected ? removeSt.iconOver : removeSt.icon;
 				icon.paint(
 					p,
 					remove.x() + (remove.width() - icon.width()) / 2,
@@ -983,7 +984,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				titleWidth = st::stickersTrendingHeaderFont->width(titleText);
 			}
 			p.setFont(st::emojiPanHeaderFont);
-			p.setPen(st::emojiPanHeaderFg);
+			p.setPen(st().headerFg);
 			p.drawTextLeft(st().headerLeft - st().margin.left(), info.top + st().headerTop, width(), titleText, titleWidth);
 		}
 		if (clip.top() + clip.height() <= info.rowsTop) {
@@ -1108,7 +1109,7 @@ int StickersListWidget::megagroupSetInfoLeft() const {
 }
 
 void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected) {
-	p.setPen(st::emojiPanHeaderFg);
+	p.setPen(st().headerFg);
 
 	auto infoLeft = megagroupSetInfoLeft();
 	_megagroupSetAbout.drawLeft(p, infoLeft, y, width() - infoLeft, width());
@@ -1483,8 +1484,9 @@ QRect StickersListWidget::removeButtonRect(int index) const {
 }
 
 QRect StickersListWidget::removeButtonRect(const SectionInfo &info) const {
-	auto buttonw = st::stickerPanRemoveSet.width;
-	auto buttonh = st::stickerPanRemoveSet.height;
+	const auto &removeSt = st().removeSet;
+	auto buttonw = removeSt.width;
+	auto buttonh = removeSt.height;
 	auto buttonx = stickersRight() - buttonw;
 	auto buttony = info.top + (st().header - buttonh) / 2;
 	return QRect(buttonx, buttony, buttonw, buttonh);
@@ -1561,10 +1563,11 @@ std::unique_ptr<Ui::RippleAnimation> StickersListWidget::createButtonRipple(int
 			std::move(mask),
 			[this, section] { rtlupdate(featuredAddRect(section)); });
 	}
-	auto maskSize = QSize(st::stickerPanRemoveSet.rippleAreaSize, st::stickerPanRemoveSet.rippleAreaSize);
+	const auto &removeSt = st().removeSet;
+	auto maskSize = QSize(removeSt.rippleAreaSize, removeSt.rippleAreaSize);
 	auto mask = Ui::RippleAnimation::EllipseMask(maskSize);
 	return std::make_unique<Ui::RippleAnimation>(
-		st::stickerPanRemoveSet.ripple,
+		removeSt.ripple,
 		std::move(mask),
 		[this, section] { rtlupdate(removeButtonRect(section)); });
 }
@@ -1575,7 +1578,8 @@ QPoint StickersListWidget::buttonRippleTopLeft(int section) const {
 	if (shownSets()[section].externalLayout) {
 		return myrtlrect(featuredAddRect(section)).topLeft();
 	}
-	return myrtlrect(removeButtonRect(section)).topLeft() + st::stickerPanRemoveSet.rippleAreaPosition;
+	return myrtlrect(removeButtonRect(section)).topLeft()
+		+ st().removeSet.rippleAreaPosition;
 }
 
 void StickersListWidget::showStickerSetBox(not_null<DocumentData*> document) {
@@ -1604,9 +1608,7 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 	auto &set = sets[section];
 	Assert(index >= 0 && index < set.stickers.size());
 
-	auto menu = base::make_unique_q<Ui::PopupMenu>(
-		this,
-		st::popupMenuWithIcons);
+	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) {
@@ -1618,12 +1620,14 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 				: messageSentAnimationInfo(section, index, document),
 		});
 	};
+	const auto icons = &st().icons;
 	SendMenu::FillSendMenu(
 		menu,
 		type,
 		SendMenu::DefaultSilentCallback(send),
 		SendMenu::DefaultScheduleCallback(this, type, send),
-		SendMenu::DefaultWhenOnlineCallback(send));
+		SendMenu::DefaultWhenOnlineCallback(send),
+		icons);
 
 	const auto show = _show;
 	const auto toggleFavedSticker = [=] {
@@ -1638,11 +1642,13 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 			? tr::lng_faved_stickers_remove
 			: tr::lng_faved_stickers_add)(tr::now),
 		toggleFavedSticker,
-		isFaved ? &st::menuIconUnfave : &st::menuIconFave);
+		isFaved ? &icons->menuUnfave : &icons->menuFave);
 
-	menu->addAction(tr::lng_context_pack_info(tr::now), [=] {
-		showStickerSetBox(document);
-	}, &st::menuIconStickers);
+	if (_features.openStickerSets) {
+		menu->addAction(tr::lng_context_pack_info(tr::now), [=] {
+			showStickerSetBox(document);
+		}, &icons->menuStickerSet);
+	}
 
 	if (const auto id = set.id; id == Data::Stickers::RecentSetId) {
 		menu->addAction(tr::lng_recent_stickers_remove(tr::now), [=] {
@@ -1650,7 +1656,7 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 				document,
 				Data::FileOriginStickerSet(id, 0),
 				false);
-		}, &st::menuIconDelete);
+		}, &icons->menuRecentRemove);
 	}
 	return menu;
 }
@@ -1708,7 +1714,8 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 				return;
 			}
 			const auto document = set.stickers[sticker->index].document;
-			if (e->modifiers() & Qt::ControlModifier) {
+			if (_features.openStickerSets
+				&& (e->modifiers() & Qt::ControlModifier)) {
 				showStickerSetBox(document);
 			} else {
 				_chosen.fire({
@@ -1859,12 +1866,6 @@ void StickersListWidget::processPanelHideFinished() {
 	if (_footer) {
 		_footer->clearHeavyData();
 	}
-	// Preserve panel state through visibility toggles.
-	//// Reset to the recent stickers section.
-	//if (_section == Section::Featured && (!_footer || !_footer->hasOnlyFeaturedSets())) {
-	//	setSection(Section::Stickers);
-	//	validateSelectedIcon(ValidateIconAnimations::None);
-	//}
 }
 
 void StickersListWidget::setSection(Section section) {
@@ -1994,9 +1995,6 @@ void StickersListWidget::refreshSettingsVisibility() {
 
 void StickersListWidget::refreshFooterIcons() {
 	refreshIcons(ValidateIconAnimations::None);
-	if (_footer->hasOnlyFeaturedSets() && _section != Section::Featured) {
-		showStickerSet(Data::Stickers::FeaturedSetId);
-	}
 }
 
 void StickersListWidget::preloadImages() {
@@ -2064,9 +2062,6 @@ void StickersListWidget::refreshRecent() {
 	if (_section == Section::Stickers) {
 		refreshRecentStickers();
 	}
-	if (_footer && _footer->hasOnlyFeaturedSets() && _section != Section::Featured) {
-		showStickerSet(Data::Stickers::FeaturedSetId);
-	}
 }
 
 auto StickersListWidget::collectRecentStickers() -> std::vector<Sticker> {
@@ -2201,7 +2196,7 @@ void StickersListWidget::refreshFavedStickers() {
 }
 
 void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
-	if (!_megagroupSet || _isMasks) {
+	if (!_features.megagroupSet || !_megagroupSet || _isMasks) {
 		return;
 	}
 	auto canEdit = _megagroupSet->canEditStickers();
@@ -2354,10 +2349,12 @@ void StickersListWidget::updateSelected() {
 				newSelected = OverButton{ section };
 			} else if (featuredHasAddButton(section) && myrtlrect(featuredAddRect(info)).contains(p.x(), p.y())) {
 				newSelected = OverButton{ section };
-			} else if (!(sets[section].flags & SetFlag::Special)) {
+			} else if (_features.openStickerSets
+				&& !(sets[section].flags & SetFlag::Special)) {
 				newSelected = OverSet{ section };
-			} else if (sets[section].id == Data::Stickers::MegagroupSetId
-					&& (_megagroupSet->canEditStickers() || !sets[section].stickers.empty())) {
+			} else if ((sets[section].id == Data::Stickers::MegagroupSetId)
+				&& (_megagroupSet->canEditStickers()
+					|| !sets[section].stickers.empty())) {
 				newSelected = OverSet{ section };
 			}
 		} else if (p.y() >= info.rowsTop && p.y() < info.rowsBottom && sx >= 0) {
@@ -2624,10 +2621,12 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
 			close();
 		}),
 		.cancelled = [](Fn<void()> &&close) { close(); },
+		.labelStyle = &st().boxLabel,
 	}));
 }
 
 void StickersListWidget::removeSet(uint64 setId) {
+	const auto &st = this->st().boxLabel;
 	if (setId == Data::Stickers::MegagroupSetId) {
 		const auto &sets = shownSets();
 		const auto i = ranges::find(sets, setId, &Set::id);
@@ -2635,7 +2634,7 @@ void StickersListWidget::removeSet(uint64 setId) {
 		const auto removeLocally = i->stickers.empty()
 			|| !_megagroupSet->canEditStickers();
 		removeMegagroupSet(removeLocally);
-	} else if (auto box = MakeConfirmRemoveSetBox(&session(), setId)) {
+	} else if (auto box = MakeConfirmRemoveSetBox(&session(), st, setId)) {
 		checkHideWithBox(std::move(box));
 	}
 }
@@ -2660,6 +2659,7 @@ StickersListWidget::~StickersListWidget() = default;
 
 object_ptr<Ui::BoxContent> MakeConfirmRemoveSetBox(
 		not_null<Main::Session*> session,
+		const style::FlatLabel &st,
 		uint64 setId) {
 	const auto &sets = session->data().stickers().sets();
 	const auto it = sets.find(setId);
@@ -2726,6 +2726,7 @@ object_ptr<Ui::BoxContent> MakeConfirmRemoveSetBox(
 			}
 		},
 		.confirmText = tr::lng_stickers_remove_pack_confirm(),
+		.labelStyle = &st,
 	});
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index dc4e7dc44..6e2c2fa04 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "chat_helpers/compose/compose_features.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "data/stickers/data_stickers.h"
 #include "ui/round_rect.h"
@@ -50,6 +51,7 @@ enum class Notification;
 
 namespace style {
 struct EmojiPan;
+struct FlatLabel;
 } // namespace style
 
 namespace ChatHelpers {
@@ -70,7 +72,7 @@ struct StickersListDescriptor {
 	StickersListMode mode = StickersListMode::Full;
 	Fn<bool()> paused;
 	const style::EmojiPan *st = nullptr;
-	bool settingsHidden = false;
+	ComposeFeatures features;
 };
 
 class StickersListWidget final : public TabbedSelector::Inner {
@@ -352,6 +354,7 @@ private:
 
 	const Mode _mode;
 	const std::shared_ptr<Show> _show;
+	const ComposeFeatures _features;
 	Ui::RoundRect _overBg;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	MTP::Sender _api;
@@ -375,7 +378,6 @@ private:
 
 	Section _section = Section::Stickers;
 	const bool _isMasks;
-	bool _settingsHidden = false;
 
 	base::Timer _updateItemsTimer;
 	base::Timer _updateSetsTimer;
@@ -426,6 +428,7 @@ private:
 
 [[nodiscard]] object_ptr<Ui::BoxContent> MakeConfirmRemoveSetBox(
 	not_null<Main::Session*> session,
+	const style::FlatLabel &st,
 	uint64 setId);
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index 5321e649e..e8ec060fb 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -240,7 +240,7 @@ void TabbedPanel::paintEvent(QPaintEvent *e) {
 		hideFinished();
 	} else {
 		if (!_cache.isNull()) _cache = QPixmap();
-		Ui::Shadow::paint(p, innerRect(), width(), st::emojiPanAnimation.shadow);
+		Ui::Shadow::paint(p, innerRect(), width(), _selector->st().showAnimation.shadow);
 	}
 }
 
@@ -362,7 +362,11 @@ void TabbedPanel::startShowAnimation() {
 	if (!_a_show.animating()) {
 		auto image = grabForAnimation();
 
-		_showAnimation = std::make_unique<Ui::PanelAnimation>(st::emojiPanAnimation, _dropDown ? Ui::PanelAnimation::Origin::TopRight : Ui::PanelAnimation::Origin::BottomRight);
+		_showAnimation = std::make_unique<Ui::PanelAnimation>(
+			_selector->st().showAnimation,
+			(_dropDown
+				? Ui::PanelAnimation::Origin::TopRight
+				: Ui::PanelAnimation::Origin::BottomRight));
 		auto inner = rect().marginsRemoved(st::emojiPanMargins);
 		_showAnimation->setFinalImage(std::move(image), QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
 		_showAnimation->setCornerMasks(Images::CornersMask(st::emojiPanRadius));
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 5131c9f9b..43b08c4a4 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -344,6 +344,7 @@ TabbedSelector::TabbedSelector(
 	TabbedSelectorDescriptor &&descriptor)
 : RpWidget(parent)
 , _st(descriptor.st)
+, _features(descriptor.features)
 , _show(std::move(descriptor.show))
 , _level(descriptor.level)
 , _mode(descriptor.mode)
@@ -377,7 +378,6 @@ TabbedSelector::TabbedSelector(
 		: SelectorTab::Emoji)
 , _hasEmojiTab(ranges::contains(_tabs, SelectorTab::Emoji, &Tab::type))
 , _hasStickersTab(ranges::contains(_tabs, SelectorTab::Stickers, &Tab::type))
-, _stickersSettingsHidden(descriptor.stickersSettingsHidden)
 , _hasGifsTab(ranges::contains(_tabs, SelectorTab::Gifs, &Tab::type))
 , _hasMasksTab(ranges::contains(_tabs, SelectorTab::Masks, &Tab::type))
 , _tabbed(_tabs.size() > 1) {
@@ -487,6 +487,10 @@ TabbedSelector::TabbedSelector(
 
 TabbedSelector::~TabbedSelector() = default;
 
+const style::EmojiPan &TabbedSelector::st() const {
+	return _st;
+}
+
 Main::Session &TabbedSelector::session() const {
 	return _show->session();
 }
@@ -511,6 +515,7 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 					: EmojiMode::Full),
 				.paused = paused,
 				.st = &_st,
+				.features = _features,
 			});
 		}
 		case SelectorTab::Stickers: {
@@ -521,7 +526,7 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 				.mode = StickersMode::Full,
 				.paused = paused,
 				.st = &_st,
-				.settingsHidden = _stickersSettingsHidden,
+				.features = _features,
 			});
 		}
 		case SelectorTab::Gifs: {
@@ -540,6 +545,7 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 				.mode = StickersMode::Masks,
 				.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 bcaa4fdee..d41aebb80 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "api/api_common.h"
+#include "chat_helpers/compose/compose_features.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/message_sending_animation_common.h"
@@ -87,7 +88,7 @@ struct TabbedSelectorDescriptor {
 	const style::EmojiPan &st;
 	PauseReason level = {};
 	TabbedSelectorMode mode = TabbedSelectorMode::Full;
-	bool stickersSettingsHidden = false;
+	ComposeFeatures features;
 };
 
 [[nodiscard]] std::unique_ptr<Ui::TabbedSearch> MakeSearch(
@@ -117,6 +118,7 @@ public:
 		TabbedSelectorDescriptor &&descriptor);
 	~TabbedSelector();
 
+	[[nodiscard]] const style::EmojiPan &st() const;
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] PauseReason level() const;
 
@@ -267,6 +269,7 @@ private:
 	not_null<StickersListWidget*> masks() const;
 
 	const style::EmojiPan &_st;
+	const ComposeFeatures _features;
 	const std::shared_ptr<Show> _show;
 	const PauseReason _level = {};
 
@@ -291,7 +294,6 @@ private:
 
 	const bool _hasEmojiTab;
 	const bool _hasStickersTab;
-	const bool _stickersSettingsHidden;
 	const bool _hasGifsTab;
 	const bool _hasMasksTab;
 	const bool _tabbed;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 87da53703..ec4aa4d07 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1388,7 +1388,7 @@ AutocompleteQuery HistoryWidget::parseMentionHashtagBotCommandQuery() const {
 	const auto result = (isChoosingTheme()
 		|| (_inlineBot && !_inlineLookingUpBot))
 		? AutocompleteQuery()
-		: ParseMentionHashtagBotCommandQuery(_field);
+		: ParseMentionHashtagBotCommandQuery(_field, {});
 	if (result.query.isEmpty()) {
 		return result;
 	} else if (result.query[0] == '#'
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index a3fd8b3c8..1f4fb79b0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -956,7 +956,7 @@ ComposeControls::ComposeControls(
 			.st = _st.tabbed,
 			.level = Window::GifPauseReason::TabbedPanel,
 			.mode = ChatHelpers::TabbedSelector::Mode::Full,
-			.stickersSettingsHidden = !_features.stickersSettings,
+			.features = _features,
 		}))
 , _selector(_regularWindow
 	? _regularWindow->tabbedSelector()
@@ -982,7 +982,10 @@ ComposeControls::ComposeControls(
 		_wrap.get(),
 		st::historyBotCommandStart)
 	: nullptr)
-, _autocomplete(std::make_unique<FieldAutocomplete>(parent, _show))
+, _autocomplete(std::make_unique<FieldAutocomplete>(
+	parent,
+	_show,
+	&_st.tabbed))
 , _header(std::make_unique<FieldHeader>(_wrap.get(), _show))
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
 	_wrap.get(),
@@ -1389,7 +1392,7 @@ void ComposeControls::checkAutocomplete() {
 	const auto peer = _history->peer;
 	const auto autocomplete = _isInlineBot
 		? AutocompleteQuery()
-		: ParseMentionHashtagBotCommandQuery(_field);
+		: ParseMentionHashtagBotCommandQuery(_field, _features);
 	if (!autocomplete.query.isEmpty()) {
 		if (autocomplete.query[0] == '#'
 			&& cRecentWriteHashtags().isEmpty()
@@ -1656,7 +1659,11 @@ void ComposeControls::initField() {
 		_parent,
 		_field,
 		_session,
-		{ .suggestCustomEmoji = true, .allowCustomWithoutPremium = allow });
+		{
+			.suggestCustomEmoji = true,
+			.allowCustomWithoutPremium = allow,
+			.st = &_st.suggestions,
+		});
 	_raiseEmojiSuggestions = [=] { suggestions->raise(); };
 
 	const auto rawTextEdit = _field->rawTextEdit().get();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index d5749bfcb..223940671 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -7,10 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/required.h"
 #include "api/api_common.h"
+#include "base/required.h"
 #include "base/unique_qptr.h"
 #include "base/timer.h"
+#include "chat_helpers/compose/compose_features.h"
 #include "dialogs/dialogs_key.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "ui/round_rect.h"
@@ -93,16 +94,6 @@ enum class ComposeControlsMode {
 	Scheduled,
 };
 
-struct ComposeControlsFeatures {
-	bool sendAs = true;
-	bool ttlInfo = true;
-	bool botCommandSend = true;
-	bool silentBroadcastToggle = true;
-	bool attachBotsMenu = true;
-	bool inlineBots = true;
-	bool stickersSettings = true;
-};
-
 struct ComposeControlsDescriptor {
 	const style::ComposeControls *stOverride = nullptr;
 	std::shared_ptr<ChatHelpers::Show> show;
@@ -111,7 +102,7 @@ struct ComposeControlsDescriptor {
 	SendMenu::Type sendMenuType = {};
 	Window::SessionController *regularWindow = nullptr;
 	rpl::producer<ChatHelpers::FileChosen> stickerOrEmojiChosen;
-	ComposeControlsFeatures features;
+	ChatHelpers::ComposeFeatures features;
 };
 
 class ComposeControls final {
@@ -329,7 +320,7 @@ private:
 	void changeFocusedControl();
 
 	const style::ComposeControls &_st;
-	const ComposeControlsFeatures _features;
+	const ChatHelpers::ComposeFeatures _features;
 	const not_null<QWidget*> _parent;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index 6f9186882..3ce74ef55 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -321,7 +321,7 @@ void EmojiSelector::createSelector(Type type) {
 			if (isEmoji) {
 				st::userpicBuilderEmojiToggleStickersIcon.paintInCenter(p, r);
 			} else {
-				st::emojiPeople.paintInCenter(p, r);
+				st::defaultEmojiPan.icons.people.paintInCenter(p, r);
 			}
 		}, toggleButton->lifetime());
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index f800f192c..1b44b8fa2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "inline_bots/inline_bot_result.h"
 #include "media/stories/media_stories_controller.h"
 #include "menu/menu_send.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
 
 namespace Media::Stories {
@@ -41,6 +42,12 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 			.silentBroadcastToggle = false,
 			.attachBotsMenu = false,
 			.inlineBots = false,
+			.megagroupSet = false,
+			.stickersSettings = false,
+			.openStickerSets = false,
+			.autocompleteHashtags = false,
+			.autocompleteMentions = false,
+			.autocompleteCommands = false,
 		},
 	}
 )) {
@@ -52,13 +59,27 @@ ReplyArea::~ReplyArea() {
 }
 
 void ReplyArea::initGeometry() {
-	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
-		_controls->resizeToWidth(layout.content.width());
-		const auto position = layout.controlsBottomPosition
-			- QPoint(0, _controls->heightCurrent());
-		_controls->move(position.x(), position.y());
-		_controls->setAutocompleteBoundingRect(layout.autocompleteRect);
+	rpl::combine(
+		_controller->layoutValue(),
+		_controls->height()
+	) | rpl::start_with_next([=](const Layout &layout, int height) {
+		const auto content = layout.content;
+		_controls->resizeToWidth(content.width());
+		if (_controls->heightCurrent() == height) {
+			const auto position = layout.controlsBottomPosition
+				- QPoint(0, height);
+			_controls->move(position.x(), position.y());
+			const auto &tabbed = st::storiesComposeControls.tabbed;
+			const auto upper = QRect(
+				content.x(),
+				content.y(),
+				content.width(),
+				(position.y()
+					+ tabbed.autocompleteBottomSkip
+					- content.y()));
+			_controls->setAutocompleteBoundingRect(
+				layout.autocompleteRect.intersected(upper));
+		}
 	}, _lifetime);
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 7e01278eb..aa9377f09 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -407,7 +407,7 @@ pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOve
 
 speedSliderDividerSize: size(2px, 8px);
 
-storiesMaxSize: size(405px, 720px);
+storiesMaxSize: size(540px, 960px);
 storiesMaxNameFontSize: 17px;
 storiesRadius: 8px;
 storiesControlSize: 64px;
@@ -460,6 +460,53 @@ storiesAttach: IconButton(historyAttach) {
 }
 storiesRecordVoice: icon {{ "chat/input_record", storiesComposeGrayIcon }};
 storiesRecordVoiceOver: icon {{ "chat/input_record", storiesComposeGrayIcon }};
+storiesRemoveSet: IconButton(stickerPanRemoveSet) {
+	icon: icon {{ "simple_close", storiesComposeGrayIcon }};
+	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: storiesComposeBgOver;
+	}
+}
+storiesMenu: Menu(defaultMenu) {
+	itemBg: groupCallMenuBg;
+	itemBgOver: groupCallMenuBgOver;
+	itemFg: groupCallMembersFg;
+	itemFgOver: groupCallMembersFg;
+	itemFgDisabled: groupCallMemberNotJoinedStatus;
+	itemFgShortcut: groupCallMemberNotJoinedStatus;
+	itemFgShortcutOver: groupCallMemberNotJoinedStatus;
+	itemFgShortcutDisabled: groupCallMemberNotJoinedStatus;
+
+	separator: MenuSeparator(defaultMenuSeparator) {
+		fg: groupCallMenuBgOver;
+	}
+	arrow: icon {{ "menu/submenu_arrow", groupCallMemberNotJoinedStatus }};
+
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: groupCallMenuBgRipple;
+	}
+}
+storiesMenuShadow: Shadow(defaultEmptyShadow) {
+	fallback: groupCallMenuBg;
+}
+storiesMenuAnimation: PanelAnimation(defaultPanelAnimation) {
+	fadeBg: groupCallMenuBg;
+	shadow: storiesMenuShadow;
+}
+storiesPopupMenu: PopupMenu(defaultPopupMenu) {
+	shadow: storiesMenuShadow;
+	menu: storiesMenu;
+	animation: storiesMenuAnimation;
+}
+storiesMenuWithIcons: Menu(storiesMenu) {
+	itemIconPosition: point(15px, 5px);
+	itemPadding: margins(54px, 8px, 17px, 8px);
+}
+storiesPopupMenuWithIcons: PopupMenu(storiesPopupMenu) {
+	scrollPadding: margins(0px, 5px, 0px, 5px);
+	menu: storiesMenuWithIcons;
+}
+
 storiesComposeControls: ComposeControls(defaultComposeControls) {
 	bg: storiesComposeBg;
 	radius: storiesRadius;
@@ -469,6 +516,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		placeholderFg: storiesComposeGrayText;
 		placeholderFgActive: storiesComposeGrayText;
 		placeholderFgError: storiesComposeGrayText;
+		menu: storiesPopupMenu;
 	}
 	send: SendButton(historySend) {
 		inner: IconButton(storiesAttach) {
@@ -489,10 +537,30 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		lineFg: storiesComposeGrayIcon;
 		lineFgOver: storiesComposeGrayIcon;
 	}
-	tabbed: EmojiPan(defaultEmojiPan) {
+	suggestions: EmojiSuggestions(defaultEmojiSuggestions) {
+		dropdown: InnerDropdown(emojiSuggestionsDropdown) {
+			animation: PanelAnimation(defaultPanelAnimation) {
+				fadeBg: storiesComposeBg;
+			}
+			bg: storiesComposeBg;
+		}
 		bg: storiesComposeBg;
 		overBg: storiesComposeBgOver;
-		expandBg: storiesComposeGrayText;
+		textFg: storiesComposeWhiteText;
+		fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
+		fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
+	}
+	tabbed: EmojiPan(defaultEmojiPan) {
+		showAnimation: PanelAnimation(emojiPanAnimation) {
+			fadeBg: storiesComposeBg;
+		}
+		bg: storiesComposeBg;
+		headerFg: storiesComposeGrayText;
+		trendingHeaderFg: storiesComposeWhiteText;
+		trendingSubheaderFg: storiesComposeGrayText;
+		trendingUnreadFg: storiesComposeBlue;
+		trendingInstalled: icon {{ "chat/input_save", storiesComposeBlue }};
+		overBg: storiesComposeBgOver;
 		pathBg: storiesComposeBgRipple;
 		pathFg: storiesComposeBgOver;
 		textFg: storiesComposeWhiteText;
@@ -500,6 +568,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		categoriesBgOver: storiesComposeBgOver;
 		fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
 		fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
+		menu: storiesPopupMenuWithIcons;
 		tabs: SettingsSlider(emojiTabs) {
 			barFgActive: storiesComposeBlue;
 			labelFg: storiesComposeGrayText;
@@ -536,5 +605,40 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 				ripple: emptyRippleAnimation;
 			}
 		}
+		removeSet: storiesRemoveSet;
+		boxLabel: FlatLabel(boxLabel) {
+			textFg: groupCallMembersFg;
+		}
+		icons: ComposeIcons {
+			settings: icon {{ "emoji/emoji_settings", storiesComposeGrayIcon }};
+
+			recent: icon {{ "emoji/emoji_recent", storiesComposeGrayIcon }};
+			recentActive: icon {{ "emoji/emoji_recent", storiesComposeWhiteText }};
+			people: icon {{ "emoji/emoji_smile", storiesComposeGrayIcon }};
+			peopleActive: icon {{ "emoji/emoji_smile", storiesComposeWhiteText }};
+			nature: icon {{ "emoji/emoji_nature", storiesComposeGrayIcon }};
+			natureActive: icon {{ "emoji/emoji_nature", storiesComposeWhiteText }};
+			food: icon {{ "emoji/emoji_food", storiesComposeGrayIcon }};
+			foodActive: icon {{ "emoji/emoji_food", storiesComposeWhiteText }};
+			activity: icon {{ "emoji/emoji_activities", storiesComposeGrayIcon }};
+			activityActive: icon {{ "emoji/emoji_activities", storiesComposeWhiteText }};
+			travel: icon {{ "emoji/emoji_travel", storiesComposeGrayIcon }};
+			travelActive: icon {{ "emoji/emoji_travel", storiesComposeWhiteText }};
+			objects: icon {{ "emoji/emoji_objects", storiesComposeGrayIcon }};
+			objectsActive: icon {{ "emoji/emoji_objects", storiesComposeWhiteText }};
+			symbols: icon {{ "emoji/emoji_love", storiesComposeGrayIcon }};
+			symbolsActive: icon {{ "emoji/emoji_love", storiesComposeWhiteText }};
+
+			menuFave: icon {{ "menu/favorite", storiesComposeWhiteText }};
+			menuUnfave: icon {{ "menu/unfavorite", storiesComposeWhiteText }};
+			menuStickerSet: icon {{ "menu/stickers", storiesComposeWhiteText }};
+			menuRecentRemove: icon {{ "menu/delete", storiesComposeWhiteText }};
+			menuGifAdd: icon {{ "menu/gif", storiesComposeWhiteText }};
+			menuGifRemove: icon {{ "menu/delete", storiesComposeWhiteText }};
+			menuMute: icon {{ "menu/mute", storiesComposeWhiteText }};
+			menuSchedule: icon {{ "menu/calendar", storiesComposeWhiteText }};
+			menuWhenOnline: icon {{ "menu/send_when_online", storiesComposeWhiteText }};
+		}
+		autocompleteBottomSkip: 10px;
 	}
 }
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 2d5ca3194..02ab8ed4b 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_unread_things.h"
 #include "apiwrap.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtWidgets/QApplication>
@@ -56,10 +57,14 @@ FillMenuResult FillSendMenu(
 		Type type,
 		Fn<void()> silent,
 		Fn<void()> schedule,
-		Fn<void()> whenOnline) {
+		Fn<void()> whenOnline,
+		const style::ComposeIcons *iconsOverride) {
 	if (!silent && !schedule) {
 		return FillMenuResult::None;
 	}
+	const auto &icons = iconsOverride
+		? *iconsOverride
+		: st::defaultComposeIcons;
 	const auto now = type;
 	if (now == Type::Disabled
 		|| (!silent && now == Type::SilentOnly)) {
@@ -70,7 +75,7 @@ FillMenuResult FillSendMenu(
 		menu->addAction(
 			tr::lng_send_silent_message(tr::now),
 			silent,
-			&st::menuIconMute);
+			&icons.menuMute);
 	}
 	if (schedule && now != Type::SilentOnly) {
 		menu->addAction(
@@ -78,13 +83,13 @@ FillMenuResult FillSendMenu(
 				? tr::lng_reminder_message(tr::now)
 				: tr::lng_schedule_message(tr::now)),
 			schedule,
-			&st::menuIconSchedule);
+			&icons.menuSchedule);
 	}
 	if (whenOnline && now == Type::ScheduledToUser) {
 		menu->addAction(
 			tr::lng_scheduled_send_until_online(tr::now),
 			whenOnline,
-			&st::menuIconWhenOnline);
+			&icons.menuWhenOnline);
 	}
 	return FillMenuResult::Success;
 }
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index 0676de49e..79edc3840 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace style {
+struct ComposeIcons;
+} // namespace style
+
 namespace Api {
 struct SendOptions;
 } // namespace Api
@@ -47,7 +51,8 @@ FillMenuResult FillSendMenu(
 	Type type,
 	Fn<void()> silent,
 	Fn<void()> schedule,
-	Fn<void()> whenOnline);
+	Fn<void()> whenOnline,
+	const style::ComposeIcons *iconsOverride = nullptr);
 
 void SetupMenuAndShortcuts(
 	not_null<Ui::RpWidget*> button,

From 00b4f7738427c52ed0e85170cdee92178fa87130 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 May 2023 12:56:15 +0400
Subject: [PATCH 244/676] Finish theming for voice recording in stories.

---
 .../chat_helpers/chat_helpers.style           |  49 ++++-
 .../SourceFiles/history/history_widget.cpp    |  12 --
 .../history_view_compose_controls.cpp         |  32 +--
 .../controls/history_view_compose_controls.h  |   1 +
 .../history_view_voice_record_bar.cpp         | 192 ++++++++++++------
 .../controls/history_view_voice_record_bar.h  |  28 ++-
 .../history_view_voice_record_button.cpp      |   5 +-
 .../history_view_voice_record_button.h        |  15 +-
 .../media/stories/media_stories_reply.cpp     |   1 +
 .../SourceFiles/media/view/media_view.style   |  32 ++-
 10 files changed, 244 insertions(+), 123 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index ba786876f..3d40ef02d 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -139,6 +139,29 @@ SendButton {
 	sendDisabledFg: color;
 }
 
+RecordBarLock {
+	ripple: RippleAnimation;
+	originTop: icon;
+	originBottom: icon;
+	originBody: icon;
+	shadowTop: icon;
+	shadowBottom: icon;
+	shadowBody: icon;
+	arrow: icon;
+	fg: color;
+}
+
+RecordBar {
+	radius: pixels;
+	bg: color;
+	durationFg: color;
+	cancel: color;
+	cancelActive: color;
+	cancelRipple: RippleAnimation;
+	lock: RecordBarLock;
+	remove: IconButton;
+}
+
 ComposeControls {
 	bg: color;
 	radius: pixels;
@@ -149,6 +172,7 @@ ComposeControls {
 	emoji: EmojiButton;
 	suggestions: EmojiSuggestions;
 	tabbed: EmojiPan;
+	record: RecordBar;
 }
 
 switchPmButton: RoundButton(defaultBoxButton) {
@@ -875,7 +899,6 @@ historyRecordTextRight: 25px;
 historyRecordLockShowDuration: historyToDownDuration;
 historyRecordLockSize: size(75px, 133px);
 
-historyRecordLockIconFg: historyToDownFg;
 historyRecordLockIconSize: size(14px, 17px);
 historyRecordLockIconBottomHeight: 9px;
 historyRecordLockIconLineHeight: 2px;
@@ -916,6 +939,29 @@ historySilentToggle: IconButton(historyBotKeyboardShow) {
 historySilentToggleOn: icon {{ "chat/input_silent_on", historyComposeIconFg }};
 historySilentToggleOnOver: icon {{ "chat/input_silent_on", historyComposeIconFgOver }};
 
+defaultRecordBarLock: RecordBarLock {
+	ripple: defaultRippleAnimation;
+	originTop: historyRecordLockTop;
+	originBottom: historyRecordLockBottom;
+	originBody: historyRecordLockBody;
+	shadowTop: historyRecordLockTopShadow;
+	shadowBottom: historyRecordLockBottomShadow;
+	shadowBody: historyRecordLockBodyShadow;
+	arrow: historyRecordLockArrow;
+	fg: historyToDownFg;
+}
+defaultRecordBar: RecordBar {
+	bg: historyComposeAreaBg;
+	durationFg: historyRecordDurationFg;
+	cancel: historyRecordCancel;
+	cancelActive: historyRecordCancelActive;
+	cancelRipple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgRipple;
+	}
+	lock: defaultRecordBarLock;
+	remove: historyRecordDelete;
+}
+
 historySend: SendButton {
 	inner: IconButton(historyAttach) {
 		icon: historySendIcon;
@@ -936,4 +982,5 @@ defaultComposeControls: ComposeControls {
 	emoji: historyAttachEmoji;
 	suggestions: defaultEmojiSuggestions;
 	tabbed: defaultEmojiPan;
+	record: defaultRecordBar;
 }
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ec4aa4d07..c6e81a086 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -943,18 +943,6 @@ void HistoryWidget::refreshTabbedPanel() {
 }
 
 void HistoryWidget::initVoiceRecordBar() {
-	{
-		auto scrollHeight = rpl::combine(
-			_scroll->topValue(),
-			_scroll->heightValue()
-		) | rpl::map([](int top, int height) {
-			return top + height - st::historyRecordLockPosition.y();
-		});
-		_voiceRecordBar->setLockBottom(std::move(scrollHeight));
-	}
-
-	_voiceRecordBar->setSendButtonGeometryValue(_send->geometryValue());
-
 	_voiceRecordBar->setStartRecordingFilter([=] {
 		const auto error = [&]() -> std::optional<QString> {
 			if (_peer) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 1f4fb79b0..50fe6c136 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -989,10 +989,14 @@ ComposeControls::ComposeControls(
 , _header(std::make_unique<FieldHeader>(_wrap.get(), _show))
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
 	_wrap.get(),
-	parent,
-	_show,
-	_send,
-	st::historySendSize.height()))
+	Controls::VoiceRecordBarDescriptor{
+		.outerContainer = parent,
+		.show = _show,
+		.send = _send,
+		.stOverride = &_st.record,
+		.recorderHeight = st::historySendSize.height(),
+		.lockFromBottom = descriptor.voiceLockFromBottom,
+	}))
 , _sendMenuType(descriptor.sendMenuType)
 , _unavailableEmojiPasted(std::move(descriptor.unavailableEmojiPasted))
 , _saveDraftTimer([=] { saveDraft(); })
@@ -2278,26 +2282,6 @@ void ComposeControls::initVoiceRecordBar() {
 		return false;
 	});
 
-	{
-		auto geometry = rpl::merge(
-			_wrap->geometryValue(),
-			_send->geometryValue()
-		) | rpl::map([=](QRect geometry) {
-			auto r = _send->geometry();
-			r.setY(r.y() + _wrap->y());
-			return r;
-		});
-		_voiceRecordBar->setSendButtonGeometryValue(std::move(geometry));
-	}
-
-	{
-		auto bottom = _wrap->geometryValue(
-		) | rpl::map([=](QRect geometry) {
-			return geometry.y() - st::historyRecordLockPosition.y();
-		});
-		_voiceRecordBar->setLockBottom(std::move(bottom));
-	}
-
 	_voiceRecordBar->updateSendButtonTypeRequests(
 	) | rpl::start_with_next([=] {
 		updateSendButtonType();
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 223940671..d0696bef6 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -102,6 +102,7 @@ struct ComposeControlsDescriptor {
 	SendMenu::Type sendMenuType = {};
 	Window::SessionController *regularWindow = nullptr;
 	rpl::producer<ChatHelpers::FileChosen> stickerOrEmojiChosen;
+	bool voiceLockFromBottom = false;
 	ChatHelpers::ComposeFeatures features;
 };
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index b80310d3b..63e4f6ee8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -27,17 +27,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio_capture.h"
 #include "media/player/media_player_button.h"
 #include "media/player/media_player_instance.h"
-#include "styles/style_chat.h"
-#include "styles/style_layers.h"
-#include "styles/style_media_player.h"
 #include "ui/controls/send_button.h"
 #include "ui/effects/animation_value.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/format_values.h"
 #include "ui/painter.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+#include "styles/style_media_player.h"
 
 namespace HistoryView::Controls {
-
 namespace {
 
 using SendActionUpdate = VoiceRecordBar::SendActionUpdate;
@@ -206,6 +206,7 @@ class ListenWrap final {
 public:
 	ListenWrap(
 		not_null<Ui::RpWidget*> parent,
+		const style::RecordBar &st,
 		not_null<Main::Session*> session,
 		::Media::Capture::Result &&data,
 		const style::font &font);
@@ -231,12 +232,12 @@ private:
 
 	not_null<Ui::RpWidget*> _parent;
 
+	const style::RecordBar &_st;
 	const not_null<Main::Session*> _session;
 	const not_null<DocumentData*> _document;
 	const std::unique_ptr<VoiceData> _voiceData;
 	const std::shared_ptr<Data::DocumentMedia> _mediaView;
 	const std::unique_ptr<::Media::Capture::Result> _data;
-	const style::IconButton &_stDelete;
 	const base::unique_qptr<Ui::IconButton> _delete;
 	const style::font &_durationFont;
 	const QString _duration;
@@ -264,17 +265,18 @@ private:
 
 ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
+	const style::RecordBar &st,
 	not_null<Main::Session*> session,
 	::Media::Capture::Result &&data,
 	const style::font &font)
 : _parent(parent)
+, _st(st)
 , _session(session)
 , _document(DummyDocument(&session->data()))
 , _voiceData(ProcessCaptureResult(data))
 , _mediaView(_document->createMediaView())
 , _data(std::make_unique<::Media::Capture::Result>(std::move(data)))
-, _stDelete(st::historyRecordDelete)
-, _delete(base::make_unique_q<Ui::IconButton>(parent, _stDelete))
+, _delete(base::make_unique_q<Ui::IconButton>(parent, _st.remove))
 , _durationFont(font)
 , _duration(Ui::FormatDurationText(
 	float64(_data->samples) / ::Media::Player::kDefaultFrequency))
@@ -299,7 +301,7 @@ void ListenWrap::init() {
 		_waveformBgRect = QRect({ 0, 0 }, size)
 			.marginsRemoved(st::historyRecordWaveformBgMargins);
 		{
-			const auto m = _stDelete.width + _waveformBgRect.height() / 2;
+			const auto m = _st.remove.width + _waveformBgRect.height() / 2;
 			_waveformBgFinalCenterRect = _waveformBgRect.marginsRemoved(
 				style::margins(m, 0, m, 0));
 		}
@@ -319,22 +321,23 @@ void ListenWrap::init() {
 		PainterHighQualityEnabler hq(p);
 		const auto progress = _showProgress.current();
 		p.setOpacity(progress);
+		const auto &remove = _st.remove;
 		if (progress > 0. && progress < 1.) {
-			_stDelete.icon.paint(p, _stDelete.iconPosition, _parent->width());
+			remove.icon.paint(p, remove.iconPosition, _parent->width());
 		}
 
 		{
 			const auto hideOffset = _isShowAnimation
 				? 0
 				: anim::interpolate(kHideWaveformBgOffset, 0, progress);
-			const auto deleteIconLeft = _stDelete.iconPosition.x();
+			const auto deleteIconLeft = remove.iconPosition.x();
 			const auto bgRectRight = anim::interpolate(
 				deleteIconLeft,
-				_stDelete.width,
+				remove.width,
 				_isShowAnimation ? progress : 1.);
 			const auto bgRectLeft = anim::interpolate(
 				_parent->width() - deleteIconLeft - _waveformBgRect.height(),
-				_stDelete.width,
+				remove.width,
 				_isShowAnimation ? progress : 1.);
 			const auto bgRectMargins = style::margins(
 				bgRectLeft - hideOffset,
@@ -357,7 +360,7 @@ void ListenWrap::init() {
 				p.setOpacity(progress);
 			}
 			p.setPen(Qt::NoPen);
-			p.setBrush(st::historyRecordCancelActive);
+			p.setBrush(_st.cancelActive);
 			QPainterPath path;
 			path.setFillRule(Qt::WindingFill);
 			path.addEllipse(bgLeftCircleRect);
@@ -605,10 +608,13 @@ rpl::lifetime &ListenWrap::lifetime() {
 
 class RecordLock final : public Ui::RippleButton {
 public:
-	RecordLock(not_null<Ui::RpWidget*> parent);
+	RecordLock(
+		not_null<Ui::RpWidget*> parent,
+		const style::RecordBarLock &st);
 
 	void requestPaintProgress(float64 progress);
 	void requestPaintLockToStopProgress(float64 progress);
+	void setVisibleTopPart(int part);
 
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
@@ -627,6 +633,7 @@ private:
 	void setProgress(float64 progress);
 	void startLockingAnimation(float64 to);
 
+	const style::RecordBarLock &_st;
 	const QRect _rippleRect;
 	const QPen _arcPen;
 
@@ -634,10 +641,15 @@ private:
 
 	float64 _lockToStopProgress = 0.;
 	rpl::variable<float64> _progress = 0.;
+	int _visibleTopPart = -1;
+
 };
 
-RecordLock::RecordLock(not_null<Ui::RpWidget*> parent)
-: RippleButton(parent, st::defaultRippleAnimation)
+RecordLock::RecordLock(
+	not_null<Ui::RpWidget*> parent,
+	const style::RecordBarLock &st)
+: RippleButton(parent, st.ripple)
+, _st(st)
 , _rippleRect(QRect(
 	0,
 	0,
@@ -653,6 +665,10 @@ RecordLock::RecordLock(not_null<Ui::RpWidget*> parent)
 	init();
 }
 
+void RecordLock::setVisibleTopPart(int part) {
+	_visibleTopPart = part;
+}
+
 void RecordLock::init() {
 	shownValue(
 	) | rpl::start_with_next([=](bool shown) {
@@ -670,7 +686,13 @@ void RecordLock::init() {
 
 	paintRequest(
 	) | rpl::start_with_next([=](const QRect &clip) {
+		if (!_visibleTopPart) {
+			return;
+		}
 		Painter p(this);
+		if (_visibleTopPart > 0 && _visibleTopPart < height()) {
+			p.setClipRect(0, 0, width(), _visibleTopPart);
+		}
 		if (isLocked()) {
 			const auto top = anim::interpolate(
 				0,
@@ -687,12 +709,12 @@ void RecordLock::init() {
 void RecordLock::drawProgress(Painter &p) {
 	const auto progress = _progress.current();
 
-	const auto &originTop = st::historyRecordLockTop;
-	const auto &originBottom = st::historyRecordLockBottom;
-	const auto &originBody = st::historyRecordLockBody;
-	const auto &shadowTop = st::historyRecordLockTopShadow;
-	const auto &shadowBottom = st::historyRecordLockBottomShadow;
-	const auto &shadowBody = st::historyRecordLockBodyShadow;
+	const auto &originTop = _st.originTop;
+	const auto &originBottom = _st.originBottom;
+	const auto &originBody = _st.originBody;
+	const auto &shadowTop = _st.shadowTop;
+	const auto &shadowBottom = _st.shadowBottom;
+	const auto &shadowBody = _st.shadowBody;
 	const auto &shadowMargins = st::historyRecordLockMargin;
 
 	const auto bottomMargin = anim::interpolate(
@@ -739,7 +761,7 @@ void RecordLock::drawProgress(Painter &p) {
 		originBody.fill(p, content);
 	}
 	{
-		const auto &arrow = st::historyRecordLockArrow;
+		const auto &arrow = _st.arrow;
 		const auto arrowRect = QRect(
 			inner.x(),
 			content.y() + content.height() - arrow.height() / 2,
@@ -791,7 +813,7 @@ void RecordLock::drawProgress(Painter &p) {
 			PainterHighQualityEnabler hq(p);
 			p.translate(inner.topLeft() + lockTranslation);
 			p.setPen(Qt::NoPen);
-			p.setBrush(st::historyRecordLockIconFg);
+			p.setBrush(_st.fg);
 			p.drawRoundedRect(blockRect, xRadius, 3);
 		} else {
 			// Paint an animation frame.
@@ -844,7 +866,7 @@ void RecordLock::drawProgress(Painter &p) {
 
 			p.drawImage(
 				inner.topLeft(),
-				style::colorizeImage(frame, st::historyRecordLockIconFg));
+				style::colorizeImage(frame, _st.fg));
 		}
 	}
 }
@@ -914,7 +936,10 @@ QPoint RecordLock::prepareRippleStartPosition() const {
 
 class CancelButton final : public Ui::RippleButton {
 public:
-	CancelButton(not_null<Ui::RpWidget*> parent, int height);
+	CancelButton(
+		not_null<Ui::RpWidget*> parent,
+		const style::RecordBar &st,
+		int height);
 
 	void requestPaintProgress(float64 progress);
 
@@ -925,6 +950,7 @@ protected:
 private:
 	void init();
 
+	const style::RecordBar &_st;
 	const int _width;
 	const QRect _rippleRect;
 
@@ -934,8 +960,12 @@ private:
 
 };
 
-CancelButton::CancelButton(not_null<Ui::RpWidget*> parent, int height)
-: Ui::RippleButton(parent, st::defaultLightButton.ripple)
+CancelButton::CancelButton(
+	not_null<Ui::RpWidget*> parent,
+	const style::RecordBar &st,
+	int height)
+: Ui::RippleButton(parent, st.cancelRipple)
+, _st(st)
 , _width(st::historyRecordCancelButtonWidth)
 , _rippleRect(QRect(0, (height - _width) / 2, _width, _width))
 , _text(st::semiboldTextStyle, tr::lng_selected_clear(tr::now)) {
@@ -958,7 +988,7 @@ void CancelButton::init() {
 
 		paintRipple(p, _rippleRect.x(), _rippleRect.y());
 
-		p.setPen(st::historyRecordCancelButtonFg);
+		p.setPen(_st.cancelActive);
 		_text.draw(
 			p,
 			0,
@@ -983,24 +1013,23 @@ void CancelButton::requestPaintProgress(float64 progress) {
 
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
-	not_null<Ui::RpWidget*> sectionWidget,
-	std::shared_ptr<ChatHelpers::Show> show,
-	std::shared_ptr<Ui::SendButton> send,
-	int recorderHeight)
+	VoiceRecordBarDescriptor &&descriptor)
 : RpWidget(parent)
-, _sectionWidget(sectionWidget)
-, _show(std::move(show))
-, _send(send)
-, _lock(std::make_unique<RecordLock>(sectionWidget))
-, _level(std::make_unique<VoiceRecordButton>(sectionWidget))
-, _cancel(std::make_unique<CancelButton>(this, recorderHeight))
+, _st(descriptor.stOverride ? *descriptor.stOverride : st::defaultRecordBar)
+, _outerContainer(descriptor.outerContainer)
+, _show(std::move(descriptor.show))
+, _send(std::move(descriptor.send))
+, _lock(std::make_unique<RecordLock>(_outerContainer, _st.lock))
+, _level(std::make_unique<VoiceRecordButton>(_outerContainer, _st))
+, _cancel(std::make_unique<CancelButton>(this, _st, descriptor.recorderHeight))
 , _startTimer([=] { startRecording(); })
 , _message(
 	st::historyRecordTextStyle,
 	tr::lng_record_cancel(tr::now),
 	TextParseOptions{ TextParseMultiline, 0, 0, Qt::LayoutDirectionAuto })
+, _lockFromBottom(descriptor.lockFromBottom)
 , _cancelFont(st::historyRecordFont) {
-	resize(QSize(parent->width(), recorderHeight));
+	resize(QSize(parent->width(), descriptor.recorderHeight));
 	init();
 	hideFast();
 }
@@ -1010,7 +1039,12 @@ VoiceRecordBar::VoiceRecordBar(
 	std::shared_ptr<ChatHelpers::Show> show,
 	std::shared_ptr<Ui::SendButton> send,
 	int recorderHeight)
-: VoiceRecordBar(parent, parent, std::move(show), send, recorderHeight) {
+: VoiceRecordBar(parent, {
+	.outerContainer = parent,
+	.show = std::move(show),
+	.send = std::move(send),
+	.recorderHeight = recorderHeight,
+}) {
 }
 
 VoiceRecordBar::~VoiceRecordBar() {
@@ -1040,14 +1074,32 @@ void VoiceRecordBar::updateMessageGeometry() {
 }
 
 void VoiceRecordBar::updateLockGeometry() {
-	const auto right = anim::interpolate(
-		-_lock->width(),
-		st::historyRecordLockPosition.x(),
-		_showLockAnimation.value(_lockShowing.current() ? 1. : 0.));
-	_lock->moveToRight(right, _lock->y());
+	const auto parent = parentWidget();
+	const auto me = Ui::MapFrom(_outerContainer, parent, geometry());
+	const auto finalTop = me.y()
+		- st::historyRecordLockPosition.y()
+		- _lock->height();
+	const auto finalRight = _outerContainer->width()
+		- (me.x() + me.width())
+		+ st::historyRecordLockPosition.x();
+	const auto progress = _showLockAnimation.value(
+		_lockShowing.current() ? 1. : 0.);
+	if (_lockFromBottom) {
+		const auto top = anim::interpolate(me.y(), finalTop, progress);
+		_lock->moveToRight(finalRight, top);
+		_lock->setVisibleTopPart(me.y() - top);
+	} else {
+		const auto from = -_lock->width();
+		const auto right = anim::interpolate(from, finalRight, progress);
+		_lock->moveToRight(right, finalTop);
+	}
 }
 
 void VoiceRecordBar::init() {
+	if (_st.radius > 0) {
+		_backgroundRect.emplace(_st.radius, _st.bg);
+	}
+
 	// Keep VoiceRecordBar behind SendButton.
 	rpl::single(
 	) | rpl::then(
@@ -1087,7 +1139,6 @@ void VoiceRecordBar::init() {
 		}
 		_cancel->moveToLeft((size.width() - _cancel->width()) / 2, 0);
 		updateMessageGeometry();
-		updateLockGeometry();
 	}, lifetime());
 
 	paintRequest(
@@ -1096,7 +1147,11 @@ void VoiceRecordBar::init() {
 		if (_showAnimation.animating()) {
 			p.setOpacity(showAnimationRatio());
 		}
-		p.fillRect(clip, st::historyComposeAreaBg);
+		if (_backgroundRect) {
+			_backgroundRect->paint(p, rect());
+		} else {
+			p.fillRect(clip, _st.bg);
+		}
 
 		p.setOpacity(std::min(p.opacity(), 1. - showListenAnimationRatio()));
 		const auto opacity = p.opacity();
@@ -1237,6 +1292,9 @@ void VoiceRecordBar::init() {
 	_cancel->setClickedCallback([=] {
 		hideAnimated();
 	});
+
+	initLockGeometry();
+	initLevelGeometry();
 }
 
 void VoiceRecordBar::activeAnimate(bool active) {
@@ -1278,22 +1336,25 @@ void VoiceRecordBar::setStartRecordingFilter(Fn<bool()> &&callback) {
 	_startRecordingFilter = std::move(callback);
 }
 
-void VoiceRecordBar::setLockBottom(rpl::producer<int> &&bottom) {
+void VoiceRecordBar::initLockGeometry() {
 	rpl::combine(
-		std::move(bottom),
-		_lock->sizeValue() | rpl::map_to(true) // Dummy value.
-	) | rpl::start_with_next([=](int value, bool dummy) {
-		_lock->moveToLeft(_lock->x(), value - _lock->height());
+		_lock->heightValue(),
+		geometryValue(),
+		static_cast<Ui::RpWidget*>(parentWidget())->geometryValue()
+	) | rpl::start_with_next([=] {
+		updateLockGeometry();
 	}, lifetime());
 }
 
-void VoiceRecordBar::setSendButtonGeometryValue(
-		rpl::producer<QRect> &&geometry) {
-	std::move(
-		geometry
-	) | rpl::start_with_next([=](QRect r) {
-		const auto center = (r.width() - _level->width()) / 2;
-		_level->moveToLeft(r.x() + center, r.y() + center);
+void VoiceRecordBar::initLevelGeometry() {
+	rpl::combine(
+		_send->geometryValue(),
+		geometryValue(),
+		static_cast<Ui::RpWidget*>(parentWidget())->geometryValue()
+	) | rpl::start_with_next([=](QRect send, QRect me, QRect parent) {
+		const auto mapped = Ui::MapFrom(_outerContainer, this, send);
+		const auto center = (send.width() - _level->width()) / 2;
+		_level->moveToLeft(mapped.x() + center, mapped.y() + center);
 	}, lifetime());
 }
 
@@ -1431,6 +1492,7 @@ void VoiceRecordBar::stopRecording(StopType type) {
 		} else if (type == StopType::Listen) {
 			_listen = std::make_unique<ListenWrap>(
 				this,
+				_st,
 				&_show->session(),
 				std::move(data),
 				_cancelFont);
@@ -1444,7 +1506,7 @@ void VoiceRecordBar::stopRecording(StopType type) {
 void VoiceRecordBar::drawDuration(Painter &p) {
 	const auto duration = FormatVoiceDuration(_recordingSamples);
 	p.setFont(_cancelFont);
-	p.setPen(st::historyRecordDurationFg);
+	p.setPen(_st.durationFg);
 
 	p.drawText(_durationRect, style::al_left, duration);
 }
@@ -1478,11 +1540,7 @@ void VoiceRecordBar::drawRedCircle(Painter &p) {
 }
 
 void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
-	p.setPen(
-		anim::pen(
-			st::historyRecordCancel,
-			st::historyRecordCancelActive,
-			1. - recordActive));
+	p.setPen(anim::pen(_st.cancel, _st.cancelActive, 1. - recordActive));
 
 	const auto opacity = p.opacity();
 	p.setOpacity(opacity * (1. - _lock->lockToStopProgress()));
@@ -1621,8 +1679,8 @@ void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
 
 void VoiceRecordBar::orderControls() {
 	stackUnder(_send.get());
-	_level->raise();
 	_lock->raise();
+	_level->raise();
 }
 
 void VoiceRecordBar::installListenStateFilter() {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index ea48e887a..97fed00d9 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -11,10 +11,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "ui/effects/animations.h"
+#include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 
 struct VoiceData;
 
+namespace style {
+struct RecordBar;
+} // namespace style
+
 namespace Ui {
 class SendButton;
 } // namespace Ui
@@ -34,6 +39,15 @@ class ListenWrap;
 class RecordLock;
 class CancelButton;
 
+struct VoiceRecordBarDescriptor {
+	not_null<Ui::RpWidget*> outerContainer;
+	std::shared_ptr<ChatHelpers::Show> show;
+	std::shared_ptr<Ui::SendButton> send;
+	const style::RecordBar *stOverride = nullptr;
+	int recorderHeight = 0;
+	bool lockFromBottom = false;
+};
+
 class VoiceRecordBar final : public Ui::RpWidget {
 public:
 	using SendActionUpdate = Controls::SendActionUpdate;
@@ -41,10 +55,7 @@ public:
 
 	VoiceRecordBar(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Ui::RpWidget*> sectionWidget,
-		std::shared_ptr<ChatHelpers::Show> show,
-		std::shared_ptr<Ui::SendButton> send,
-		int recorderHeight);
+		VoiceRecordBarDescriptor &&descriptor);
 	VoiceRecordBar(
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<ChatHelpers::Show> show,
@@ -75,8 +86,6 @@ public:
 
 	void requestToSendWithOptions(Api::SendOptions options);
 
-	void setLockBottom(rpl::producer<int> &&bottom);
-	void setSendButtonGeometryValue(rpl::producer<QRect> &&geometry);
 	void setStartRecordingFilter(Fn<bool()> &&callback);
 
 	[[nodiscard]] bool isRecording() const;
@@ -93,6 +102,8 @@ private:
 	};
 
 	void init();
+	void initLockGeometry();
+	void initLevelGeometry();
 
 	void updateMessageGeometry();
 	void updateLockGeometry();
@@ -125,7 +136,8 @@ private:
 
 	void computeAndSetLockProgress(QPoint globalPos);
 
-	const not_null<Ui::RpWidget*> _sectionWidget;
+	const style::RecordBar &_st;
+	const not_null<Ui::RpWidget*> _outerContainer;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
@@ -159,11 +171,13 @@ private:
 
 	rpl::event_stream<> _recordingTipRequests;
 	bool _recordingTipRequired = false;
+	bool _lockFromBottom = false;
 
 	const style::font &_cancelFont;
 
 	rpl::lifetime _recordingLifetime;
 
+	std::optional<Ui::RoundRect> _backgroundRect;
 	Ui::Animations::Simple _showLockAnimation;
 	Ui::Animations::Simple _lockToStopAnimation;
 	Ui::Animations::Simple _showListenAnimation;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index f05b3ed44..71a652f4d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -47,8 +47,11 @@ auto Blobs() {
 
 } // namespace
 
-VoiceRecordButton::VoiceRecordButton(not_null<Ui::RpWidget*> parent)
+VoiceRecordButton::VoiceRecordButton(
+	not_null<Ui::RpWidget*> parent,
+	const style::RecordBar &st)
 : AbstractButton(parent)
+, _st(st)
 , _blobs(std::make_unique<Ui::Paint::Blobs>(
 	Blobs(),
 	kLevelDuration,
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index 750c8abfb..fc477b485 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -11,17 +11,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
-namespace Ui {
-namespace Paint {
+namespace style {
+struct RecordBar;
+} // namespace style
+
+namespace Ui::Paint {
 class Blobs;
-} // namespace Paint
-} // namespace Ui
+} // namespace Ui::Paint
 
 namespace HistoryView::Controls {
 
 class VoiceRecordButton final : public Ui::AbstractButton {
 public:
-	explicit VoiceRecordButton(not_null<Ui::RpWidget*> parent);
+	VoiceRecordButton(
+		not_null<Ui::RpWidget*> parent,
+		const style::RecordBar &st);
 	~VoiceRecordButton();
 
 	enum class Type {
@@ -43,6 +47,7 @@ public:
 private:
 	void init();
 
+	const style::RecordBar &_st;
 	std::unique_ptr<Ui::Paint::Blobs> _blobs;
 
 	crl::time _lastUpdateTime = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 1b44b8fa2..1f6aca80a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -35,6 +35,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 		.mode = HistoryView::ComposeControlsMode::Normal,
 		.sendMenuType = SendMenu::Type::SilentOnly,
 		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
+		.voiceLockFromBottom = true,
 		.features = {
 			.sendAs = false,
 			.ttlInfo = false,
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index aa9377f09..98ff6dd4f 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -448,24 +448,23 @@ storiesComposeWhiteText: groupCallMembersFg;
 storiesComposeGrayText: groupCallMemberNotJoinedStatus;
 storiesComposeGrayIcon: groupCallMemberInactiveIcon;
 storiesComposeBlue: groupCallActiveFg;
+storiesComposeRippleLight: RippleAnimation(defaultRippleAnimation) {
+	color: storiesComposeBgOver;
+}
 storiesComposeRipple: RippleAnimation(defaultRippleAnimation) {
 	color: groupCallMembersBgRipple;
 }
 storiesAttach: IconButton(historyAttach) {
 	icon: icon {{ "chat/input_attach", storiesComposeGrayIcon }};
 	iconOver: icon {{ "chat/input_attach", storiesComposeGrayIcon }};
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: storiesComposeBgOver;
-	}
+	ripple: storiesComposeRippleLight;
 }
 storiesRecordVoice: icon {{ "chat/input_record", storiesComposeGrayIcon }};
 storiesRecordVoiceOver: icon {{ "chat/input_record", storiesComposeGrayIcon }};
 storiesRemoveSet: IconButton(stickerPanRemoveSet) {
 	icon: icon {{ "simple_close", storiesComposeGrayIcon }};
 	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: storiesComposeBgOver;
-	}
+	ripple: storiesComposeRippleLight;
 }
 storiesMenu: Menu(defaultMenu) {
 	itemBg: groupCallMenuBg;
@@ -641,4 +640,25 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		}
 		autocompleteBottomSkip: 10px;
 	}
+	record: RecordBar(defaultRecordBar) {
+		bg: storiesComposeBg;
+		durationFg: storiesComposeWhiteText;
+		radius: storiesRadius;
+		cancel: storiesComposeGrayText;
+		cancelActive: storiesComposeBlue;
+		cancelRipple: storiesComposeRippleLight;
+		lock: RecordBarLock(defaultRecordBarLock) {
+			ripple: storiesComposeRipple;
+			originTop: icon {{ "voice_lock/record_lock_top", storiesComposeBg }};
+			originBottom: icon {{ "voice_lock/record_lock_bottom", storiesComposeBg }};
+			originBody: icon {{ "voice_lock/record_lock_body", storiesComposeBg }};
+			arrow: icon {{ "voice_lock/voice_arrow", storiesComposeGrayIcon }};
+			fg: storiesComposeGrayIcon;
+		}
+		remove: IconButton(storiesAttach) {
+			icon: icon {{ "info/info_media_delete", storiesComposeGrayIcon }};
+			iconOver: icon {{ "info/info_media_delete", storiesComposeGrayIcon }};
+			iconPosition: point(10px, 11px);
+		}
+	}
 }

From ae4d660c381cc5b3d6a0fb140f0fbdefdeaed112 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 May 2023 14:04:14 +0400
Subject: [PATCH 245/676] Improve stories controls geometry constraints.

---
 .../chat_helpers/chat_helpers.style           |  4 ++
 .../chat_helpers/emoji_suggestions_widget.cpp |  1 +
 .../chat_helpers/field_autocomplete.cpp       |  9 ++++-
 .../history_view_compose_controls.cpp         |  4 ++
 .../stories/media_stories_controller.cpp      | 37 +++++++++++++++----
 .../media/stories/media_stories_reply.cpp     |  6 +--
 .../media/stories/media_stories_sibling.cpp   | 16 ++++----
 .../SourceFiles/media/view/media_view.style   |  5 ++-
 .../media/view/media_view_overlay_widget.cpp  |  1 +
 9 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 3d40ef02d..4e03be93a 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -172,6 +172,8 @@ ComposeControls {
 	emoji: EmojiButton;
 	suggestions: EmojiSuggestions;
 	tabbed: EmojiPan;
+	tabbedHeightMin: pixels;
+	tabbedHeightMax: pixels;
 	record: RecordBar;
 }
 
@@ -982,5 +984,7 @@ defaultComposeControls: ComposeControls {
 	emoji: historyAttachEmoji;
 	suggestions: defaultEmojiSuggestions;
 	tabbed: defaultEmojiPan;
+	tabbedHeightMin: emojiPanMinHeight;
+	tabbedHeightMax: emojiPanMaxHeight;
 	record: defaultRecordBar;
 }
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index ccd235355..7233c5a21 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -866,6 +866,7 @@ void SuggestionsController::showWithQuery(SuggestionsQuery query) {
 	const auto force = base::take(_keywordsRefreshed);
 	_lastShownQuery = query;
 	_suggestions->showWithQuery(_lastShownQuery, force);
+	_container->resizeToContent();
 }
 
 SuggestionsQuery SuggestionsController::getEmojiQuery() {
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 6f312926f..7f5c7a52e 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -693,9 +693,14 @@ void FieldAutocomplete::recount(bool resetScroll) {
 	if (h > _boundings.height()) h = _boundings.height();
 	if (h > maxh) h = maxh;
 	if (width() != _boundings.width() || height() != h) {
-		setGeometry(_boundings.x(), _boundings.y() + _boundings.height() - h, _boundings.width(), h);
+		setGeometry(
+			_boundings.x(),
+			_boundings.y() + _boundings.height() - h,
+			_boundings.width(),
+			h);
 		_scroll->resize(_boundings.width(), h);
-	} else if (y() != _boundings.y() + _boundings.height() - h) {
+	} else if (x() != _boundings.x()
+		|| y() != _boundings.y() + _boundings.height() - h) {
 		move(_boundings.x(), _boundings.y() + _boundings.height() - h);
 	}
 	if (resetScroll) st = 0;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 50fe6c136..29f1736ae 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2596,6 +2596,10 @@ void ComposeControls::createTabbedPanel() {
 	setTabbedPanel(std::make_unique<TabbedPanel>(
 		_parent,
 		std::move(descriptor)));
+	_tabbedPanel->setDesiredHeightValues(
+		st::emojiPanHeightRatio,
+		_st.tabbedHeightMin,
+		_st.tabbedHeightMax);
 }
 
 void ComposeControls::setTabbedPanel(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index a0ff10a86..f46f37304 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -31,7 +31,8 @@ namespace {
 constexpr auto kPhotoProgressInterval = crl::time(100);
 constexpr auto kPhotoDuration = 5 * crl::time(1000);
 constexpr auto kFullContentFade = 0.35;
-constexpr auto kSiblingMultiplier = 0.448;
+constexpr auto kSiblingMultiplierDefault = 0.448;
+constexpr auto kSiblingMultiplierMax = 0.72;
 constexpr auto kSiblingOutsidePart = 0.24;
 constexpr auto kSiblingUserpicSize = 0.3;
 constexpr auto kInnerHeightMultiplier = 1.6;
@@ -217,12 +218,30 @@ void Controller::initLayout() {
 			layout.controlsWidth,
 			layout.controlsBottomPosition.y());
 
-		const auto siblingSize = layout.content.size() * kSiblingMultiplier;
+		const auto sidesAvailable = size.width() - layout.content.width();
+		const auto widthForSiblings = sidesAvailable
+			- 2 * st::storiesFieldMargin.bottom();
+		const auto siblingWidthMax = widthForSiblings
+			/ (2 * (1. - kSiblingOutsidePart));
+		const auto siblingMultiplierMax = std::max(
+			kSiblingMultiplierDefault,
+			st::storiesSiblingWidthMin / float64(layout.content.width()));
+		const auto siblingMultiplier = std::min({
+			siblingMultiplierMax,
+			kSiblingMultiplierMax,
+			siblingWidthMax / layout.content.width(),
+		});
+		const auto siblingSize = layout.content.size() * siblingMultiplier;
 		const auto siblingTop = (size.height() - siblingSize.height()) / 2;
-		const auto outside = int(base::SafeRound(
+		const auto outsideMax = int(base::SafeRound(
 			siblingSize.width() * kSiblingOutsidePart));
-		const auto xLeft = -outside;
-		const auto xRight = size.width() - siblingSize.width() + outside;
+		const auto leftAvailable = layout.content.x() - siblingSize.width();
+		const auto xDesired = leftAvailable / 3;
+		const auto xPossible = std::min(
+			xDesired,
+			(leftAvailable - st::storiesControlSize));
+		const auto xLeft = std::max(xPossible, -outsideMax);
+		const auto xRight = size.width() - siblingSize.width() - xLeft;
 		const auto userpicSize = int(base::SafeRound(
 			siblingSize.width() * kSiblingUserpicSize));
 		const auto innerHeight = userpicSize * kInnerHeightMultiplier;
@@ -234,11 +253,13 @@ void Controller::initLayout() {
 				userpicSize
 			).translated(geometry.topLeft());
 		};
-		const auto nameFontSize = st::storiesMaxNameFontSize * contentHeight
-			/ st::storiesMaxSize.height();
+		const auto nameFontSize = std::max(
+			(st::storiesMaxNameFontSize * contentHeight
+				/ st::storiesMaxSize.height()),
+			st::fsize);
 		const auto nameBoundingRect = [&](QRect geometry, bool left) {
 			const auto skipSmall = nameFontSize;
-			const auto skipBig = skipSmall + outside;
+			const auto skipBig = skipSmall - std::min(xLeft, 0);
 			const auto top = userpic(geometry).y() + innerHeight;
 			return QRect(
 				left ? skipBig : skipSmall,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 1f6aca80a..49b2e70a3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -65,16 +65,16 @@ void ReplyArea::initGeometry() {
 		_controls->height()
 	) | rpl::start_with_next([=](const Layout &layout, int height) {
 		const auto content = layout.content;
-		_controls->resizeToWidth(content.width());
+		_controls->resizeToWidth(layout.controlsWidth);
 		if (_controls->heightCurrent() == height) {
 			const auto position = layout.controlsBottomPosition
 				- QPoint(0, height);
 			_controls->move(position.x(), position.y());
 			const auto &tabbed = st::storiesComposeControls.tabbed;
 			const auto upper = QRect(
-				content.x(),
+				position.x(),
 				content.y(),
-				content.width(),
+				layout.controlsWidth,
 				(position.y()
 					+ tabbed.autocompleteBottomSkip
 					- content.y()));
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 05e66297b..a37b4a472 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -338,18 +338,16 @@ QPoint Sibling::namePosition(
 		const QImage &image) const {
 	const auto size = image.size() / image.devicePixelRatio();
 	const auto width = size.width();
+	const auto bounding = layout.nameBoundingRect;
 	const auto left = layout.geometry.x()
 		+ (layout.geometry.width() - width) / 2;
-	if (left < layout.nameBoundingRect.x()) {
-		return layout.nameBoundingRect.topLeft();
-	} else if (left + width > layout.nameBoundingRect.x() + layout.nameBoundingRect.width()) {
-		return layout.nameBoundingRect.topLeft()
-			+ QPoint(layout.nameBoundingRect.width() - width, 0);
+	const auto top = bounding.y() + bounding.height() - size.height();
+	if (left < bounding.x()) {
+		return { bounding.x(), top };
+	} else if (left + width > bounding.x() + bounding.width()) {
+		return { bounding.x() + bounding.width() - width, top };
 	}
-	const auto top = layout.nameBoundingRect.y()
-		+ layout.nameBoundingRect.height()
-		- size.height();
-	return QPoint(left, top);
+	return { left, top };
 }
 
 void Sibling::check() {
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 98ff6dd4f..c97645659 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -408,6 +408,7 @@ pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOve
 speedSliderDividerSize: size(2px, 8px);
 
 storiesMaxSize: size(540px, 960px);
+storiesSiblingWidthMin: 200px; // Try making sibling not less than this.
 storiesMaxNameFontSize: 17px;
 storiesRadius: 8px;
 storiesControlSize: 64px;
@@ -433,7 +434,7 @@ storiesHeaderDate: FlatLabel(defaultFlatLabel) {
 storiesHeaderDatePosition: point(50px, 17px);
 storiesShadowTop: icon{{ "mediaview/shadow_bottom-flip_vertical", windowShadowFg }};
 storiesShadowBottom: mediaviewShadowBottom;
-storiesControlsMinWidth: 200px;
+storiesControlsMinWidth: 280px;
 storiesFieldMargin: margins(0px, 14px, 0px, 16px);
 storiesSideSkip: 145px;
 storiesCaptionFull: FlatLabel(defaultFlatLabel) {
@@ -640,6 +641,8 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		}
 		autocompleteBottomSkip: 10px;
 	}
+	tabbedHeightMin: 220px;
+	tabbedHeightMax: 480px;
 	record: RecordBar(defaultRecordBar) {
 		bg: storiesComposeBg;
 		durationFg: storiesComposeWhiteText;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 8ff30f817..cd34868a0 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -5025,6 +5025,7 @@ void OverlayWidget::setStoriesUser(UserData *user) {
 			updateControlsGeometry();
 		}, _stories->lifetime());
 		_storiesChanged.fire({});
+		_dropdown->raise();
 	}
 }
 

From 2c5d990e1c1900357b7a03c4c892d0fcc40fc5fe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 May 2023 17:46:24 +0400
Subject: [PATCH 246/676] Implement full theming of attachments in stories.

---
 Telegram/SourceFiles/boxes/boxes.style        |  45 ---
 .../SourceFiles/boxes/edit_caption_box.cpp    |  15 +-
 .../SourceFiles/boxes/premium_limits_box.cpp  |  29 +-
 .../SourceFiles/boxes/premium_limits_box.h    |  13 +-
 .../SourceFiles/boxes/premium_preview_box.cpp | 130 ++++----
 .../SourceFiles/boxes/premium_preview_box.h   |   9 +
 Telegram/SourceFiles/boxes/send_files_box.cpp | 156 ++++++----
 Telegram/SourceFiles/boxes/send_files_box.h   |  50 ++-
 .../calls/group/calls_group_panel.cpp         |   2 +-
 .../chat_helpers/chat_helpers.style           | 103 +++++++
 .../chat_helpers/compose/compose_show.h       |   2 +
 .../chat_helpers/emoji_list_widget.cpp        |   1 +
 .../chat_helpers/gifs_list_widget.cpp         |   1 +
 .../chat_helpers/stickers_list_widget.cpp     |  13 +-
 .../SourceFiles/chat_helpers/tabbed_panel.h   |   2 +-
 .../controllers/stickers_panel_controller.cpp |  24 +-
 .../controllers/stickers_panel_controller.h   |   7 +-
 Telegram/SourceFiles/editor/photo_editor.cpp  |  24 +-
 Telegram/SourceFiles/editor/photo_editor.h    |  12 +
 .../editor/photo_editor_layer_widget.cpp      |   7 +-
 .../editor/photo_editor_layer_widget.h        |  10 +-
 .../SourceFiles/history/history_widget.cpp    |   3 +-
 .../view/history_view_replies_section.cpp     |   3 +-
 .../view/history_view_scheduled_section.cpp   |   3 +-
 .../media/stories/media_stories_reply.cpp     | 290 +++++++++++++++++-
 .../media/stories/media_stories_reply.h       |  48 +++
 .../SourceFiles/media/view/media_view.style   |  87 +++++-
 .../media/view/media_view_overlay_widget.cpp  | 161 +++++-----
 .../media/view/media_view_overlay_widget.h    |   2 +
 .../SourceFiles/settings/settings_premium.cpp |  18 +-
 .../SourceFiles/settings/settings_premium.h   |   7 +-
 .../SourceFiles/storage/localimageloader.cpp  |   2 +-
 .../attach_abstract_single_file_preview.cpp   |  25 +-
 .../attach_abstract_single_file_preview.h     |  10 +-
 .../attach_abstract_single_media_preview.cpp  |  14 +-
 .../attach_abstract_single_media_preview.h    |  10 +-
 .../ui/chat/attach/attach_album_preview.cpp   |   3 +
 .../ui/chat/attach/attach_album_preview.h     |   6 +
 .../ui/chat/attach/attach_album_thumbnail.cpp |  26 +-
 .../ui/chat/attach/attach_album_thumbnail.h   |   6 +
 .../ui/chat/attach/attach_controls.cpp        |   2 +-
 .../attach_item_single_file_preview.cpp       |   3 +-
 .../attach/attach_item_single_file_preview.h  |   1 +
 .../attach_item_single_media_preview.cpp      |   3 +-
 .../attach/attach_item_single_media_preview.h |   1 +
 .../attach/attach_single_file_preview.cpp     |   3 +-
 .../chat/attach/attach_single_file_preview.h  |   1 +
 .../attach/attach_single_media_preview.cpp    |   5 +-
 .../chat/attach/attach_single_media_preview.h |   2 +
 Telegram/SourceFiles/ui/effects/premium.style |  27 +-
 .../ui/effects/premium_graphics.cpp           |  19 +-
 .../SourceFiles/ui/effects/premium_graphics.h |   7 +
 .../window/window_session_controller.cpp      |  13 +-
 53 files changed, 1113 insertions(+), 353 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 54f915a45..fb0a19ef5 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -344,11 +344,6 @@ autoDownloadLimitSlider: MediaSlider(defaultContinuousSlider) {
 }
 autoDownloadLimitPadding: margins(22px, 8px, 22px, 8px);
 
-confirmCaptionArea: InputField(defaultInputField) {
-	textMargins: margins(1px, 26px, 31px, 4px);
-	heightMax: 158px;
-}
-confirmBg: windowBgOver;
 confirmMaxHeight: 245px;
 
 supportInfoField: InputField(defaultInputField) {
@@ -391,51 +386,11 @@ sendMediaPreviewSize: 308px;
 sendMediaPreviewHeightMax: 1280;
 sendMediaRowSkip: 10px;
 
-editMediaButtonSize: 32px;
-
-editMediaButtonIconFile: icon {{ "send_media/send_media_replace", menuIconFg }};
-editMediaButton: IconButton(defaultIconButton) {
-	width: editMediaButtonSize;
-	height: editMediaButtonSize;
-
-	icon: editMediaButtonIconFile;
-
-	rippleAreaSize: editMediaButtonSize;
-	ripple: defaultRippleAnimation;
-}
-
 editMediaHintLabel: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 	minWidth: sendMediaPreviewSize;
 }
 
-// SendFilesBox
-
-sendBoxAlbumGroupEditInternalSkip: 8px;
-sendBoxAlbumGroupSkipRight: 5px;
-sendBoxAlbumGroupSkipTop: 5px;
-sendBoxAlbumGroupRadius: 4px;
-sendBoxAlbumGroupSize: size(62px, 25px);
-sendBoxAlbumSmallGroupSize: size(30px, 25px);
-
-sendBoxFileGroupSkipTop: 2px;
-sendBoxFileGroupSkipRight: 5px;
-sendBoxFileGroupEditInternalSkip: -1px;
-
-sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgRipple;
-	}
-}
-sendBoxAlbumGroupEditButtonIconFile: editMediaButtonIconFile;
-sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "send_media/send_media_delete", menuIconFg }};
-
-sendBoxAlbumButtonMediaEdit: icon {{ "send_media/send_media_replace", roundedFg }};
-sendBoxAlbumGroupButtonMediaEdit: icon {{ "send_media/send_media_replace", roundedFg, point(4px, 1px) }};
-sendBoxAlbumGroupButtonMediaDelete: icon {{ "send_media/send_media_delete", roundedFg }};
-
-// End of SendFilesBox
-
 calendarTitleHeight: boxTitleHeight;
 calendarPrevious: IconButton {
 	width: calendarTitleHeight;
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 41f19a0b8..c9779b1f1 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -246,12 +246,12 @@ EditCaptionBox::EditCaptionBox(
 , _scroll(base::make_unique_q<Ui::ScrollArea>(this, st::boxScroll))
 , _field(base::make_unique_q<Ui::InputField>(
 	this,
-	st::confirmCaptionArea,
+	st::defaultComposeFiles.caption,
 	Ui::InputField::Mode::MultiLine,
 	tr::lng_photo_caption()))
 , _emojiToggle(base::make_unique_q<Ui::EmojiButton>(
 	this,
-	st::boxAttachEmoji))
+	st::defaultComposeFiles.emoji))
 , _initialText(std::move(text))
 , _initialList(std::move(list))
 , _saved(std::move(saved)) {
@@ -402,6 +402,7 @@ void EditCaptionBox::rebuildPreview() {
 		if (photo || document->isVideoFile() || document->isAnimation()) {
 			const auto media = Ui::CreateChild<Ui::ItemSingleMediaPreview>(
 				this,
+				st::defaultComposeControls,
 				gifPaused,
 				_historyItem,
 				Ui::AttachControls::Type::EditOnly);
@@ -410,6 +411,7 @@ void EditCaptionBox::rebuildPreview() {
 		} else {
 			_content.reset(Ui::CreateChild<Ui::ItemSingleFilePreview>(
 				this,
+				st::defaultComposeControls,
 				_historyItem,
 				Ui::AttachControls::Type::EditOnly));
 		}
@@ -418,6 +420,7 @@ void EditCaptionBox::rebuildPreview() {
 
 		const auto media = Ui::SingleMediaPreview::Create(
 			this,
+			st::defaultComposeControls,
 			gifPaused,
 			file,
 			Ui::AttachControls::Type::EditOnly);
@@ -429,6 +432,7 @@ void EditCaptionBox::rebuildPreview() {
 		} else {
 			_content.reset(Ui::CreateChild<Ui::SingleFilePreview>(
 				this,
+				st::defaultComposeControls,
 				file,
 				Ui::AttachControls::Type::EditOnly));
 		}
@@ -482,7 +486,7 @@ void EditCaptionBox::setupField() {
 
 	_field->setSubmitSettings(
 		Core::App().settings().sendSubmitWay());
-	_field->setMaxHeight(st::confirmCaptionArea.heightMax);
+	_field->setMaxHeight(st::defaultComposeFiles.caption.heightMax);
 
 	connect(_field, &Ui::InputField::submitted, [=] { save(); });
 	connect(_field, &Ui::InputField::cancelled, [=] { closeBox(); });
@@ -596,7 +600,7 @@ void EditCaptionBox::setupPhotoEditorEventHandler() {
 		if (!_preparedList.files.empty()) {
 			Editor::OpenWithPreparedFile(
 				this,
-				controller,
+				controller->uiShow(),
 				&_preparedList.files.front(),
 				st::sendMediaPreviewSize,
 				[=] { rebuildPreview(); });
@@ -845,7 +849,8 @@ bool EditCaptionBox::validateLength(const QString &text) const {
 	if (remove <= 0) {
 		return true;
 	}
-	_controller->show(Box(CaptionLimitReachedBox, session, remove));
+	_controller->show(
+		Box(CaptionLimitReachedBox, session, remove, nullptr));
 	return false;
 }
 
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index 55fbe0a35..3fbdc34c1 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -404,6 +404,7 @@ std::unique_ptr<PeerListRow> PublicsController::createRow(
 
 void SimpleLimitBox(
 		not_null<Ui::GenericBox*> box,
+		const style::PremiumLimits *stOverride,
 		not_null<Main::Session*> session,
 		bool premiumPossible,
 		rpl::producer<QString> title,
@@ -411,6 +412,8 @@ void SimpleLimitBox(
 		const QString &refAddition,
 		const InfographicDescriptor &descriptor,
 		bool fixed = false) {
+	const auto &st = stOverride ? *stOverride : st::defaultPremiumLimits;
+
 	box->setWidth(st::boxWideWidth);
 
 	const auto top = fixed
@@ -431,6 +434,7 @@ void SimpleLimitBox(
 	if (premiumPossible) {
 		Ui::Premium::AddLimitRow(
 			top,
+			st,
 			descriptor.premiumLimit,
 			descriptor.phrase,
 			0,
@@ -473,6 +477,7 @@ void SimpleLimitBox(
 
 void SimpleLimitBox(
 		not_null<Ui::GenericBox*> box,
+		const style::PremiumLimits *stOverride,
 		not_null<Main::Session*> session,
 		rpl::producer<QString> title,
 		rpl::producer<TextWithEntities> text,
@@ -481,6 +486,7 @@ void SimpleLimitBox(
 		bool fixed = false) {
 	SimpleLimitBox(
 		box,
+		stOverride,
 		session,
 		session->premiumPossible(),
 		std::move(title),
@@ -524,6 +530,7 @@ void SimplePinsLimitBox(
 	});
 	SimpleLimitBox(
 		box,
+		nullptr,
 		session,
 		tr::lng_filter_pin_limit_title(),
 		std::move(text),
@@ -561,6 +568,7 @@ void ChannelsLimitBox(
 
 	SimpleLimitBox(
 		box,
+		nullptr,
 		session,
 		tr::lng_channels_limit_title(),
 		std::move(text),
@@ -650,6 +658,7 @@ void PublicLinksLimitBox(
 
 	SimpleLimitBox(
 		box,
+		nullptr,
 		session,
 		tr::lng_links_limit_title(),
 		std::move(text),
@@ -716,6 +725,7 @@ void FilterChatsLimitBox(
 
 	SimpleLimitBox(
 		box,
+		nullptr,
 		session,
 		tr::lng_filter_chats_limit_title(),
 		std::move(text),
@@ -753,6 +763,7 @@ void FilterLinksLimitBox(
 
 	SimpleLimitBox(
 		box,
+		nullptr,
 		session,
 		tr::lng_filter_links_limit_title(),
 		std::move(text),
@@ -798,6 +809,7 @@ void FiltersLimitBox(
 	});
 	SimpleLimitBox(
 		box,
+		nullptr,
 		session,
 		tr::lng_filters_limit_title(),
 		std::move(text),
@@ -836,6 +848,7 @@ void ShareableFiltersLimitBox(
 	});
 	SimpleLimitBox(
 		box,
+		nullptr,
 		session,
 		tr::lng_filter_shared_limit_title(),
 		std::move(text),
@@ -900,6 +913,7 @@ void ForumPinsLimitBox(
 		Ui::Text::RichLangValue);
 	SimpleLimitBox(
 		box,
+		nullptr,
 		&forum->session(),
 		false,
 		tr::lng_filter_pin_limit_title(),
@@ -911,7 +925,8 @@ void ForumPinsLimitBox(
 void CaptionLimitBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
-		int remove) {
+		int remove,
+		const style::PremiumLimits *stOverride) {
 	const auto premium = session->premium();
 	const auto premiumPossible = session->premiumPossible();
 
@@ -943,6 +958,7 @@ void CaptionLimitBox(
 
 	SimpleLimitBox(
 		box,
+		stOverride,
 		session,
 		tr::lng_caption_limit_title(),
 		std::move(text),
@@ -953,15 +969,17 @@ void CaptionLimitBox(
 void CaptionLimitReachedBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
-		int remove) {
+		int remove,
+		const style::PremiumLimits *stOverride) {
 	Ui::ConfirmBox(box, Ui::ConfirmBoxArgs{
 		.text = tr::lng_caption_limit_reached(tr::now, lt_count, remove),
+		.labelStyle = stOverride ? &stOverride->boxLabel : nullptr,
 		.inform = true,
 	});
 	if (!session->premium()) {
 		box->addLeftButton(tr::lng_limits_increase(), [=] {
 			box->getDelegate()->showBox(
-				Box(CaptionLimitBox, session, remove),
+				Box(CaptionLimitBox, session, remove, stOverride),
 				Ui::LayerOption::KeepOther,
 				anim::type::normal);
 			box->closeBox();
@@ -972,7 +990,8 @@ void CaptionLimitReachedBox(
 void FileSizeLimitBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
-		uint64 fileSizeBytes) {
+		uint64 fileSizeBytes,
+		const style::PremiumLimits *stOverride) {
 	const auto limits = Data::PremiumLimits(session);
 	const auto defaultLimit = float64(limits.uploadMaxDefault());
 	const auto premiumLimit = float64(limits.uploadMaxPremium());
@@ -1011,6 +1030,7 @@ void FileSizeLimitBox(
 
 	SimpleLimitBox(
 		box,
+		stOverride,
 		session,
 		premiumPossible,
 		tr::lng_file_size_limit_title(),
@@ -1084,6 +1104,7 @@ void AccountsLimitBox(
 	if (premiumPossible) {
 		Ui::Premium::AddLimitRow(
 			top,
+			st::defaultPremiumLimits,
 			(QString::number(std::max(current, defaultLimit) + 1)
 				+ ((current + 1 == premiumLimit) ? "" : "+")),
 			QString::number(defaultLimit));
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.h b/Telegram/SourceFiles/boxes/premium_limits_box.h
index 55be7e40f..bb9115a3e 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.h
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.h
@@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/layers/generic_box.h"
 
+namespace style {
+struct PremiumLimits;
+} // namespace style
+
 namespace Data {
 class Forum;
 } // namespace Data
@@ -57,15 +61,18 @@ void ForumPinsLimitBox(
 void CaptionLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
-	int remove);
+	int remove,
+	const style::PremiumLimits *stOverride = nullptr);
 void CaptionLimitReachedBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
-	int remove);
+	int remove,
+	const style::PremiumLimits *stOverride = nullptr);
 void FileSizeLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
-	uint64 fileSizeBytes);
+	uint64 fileSizeBytes,
+	const style::PremiumLimits *stOverride = nullptr);
 void AccountsLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session);
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index ffc5bc709..d63288a01 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -76,7 +76,7 @@ bool operator==(const Descriptor &a, const Descriptor &b) {
 struct Preload {
 	Descriptor descriptor;
 	std::shared_ptr<Data::DocumentMedia> media;
-	base::weak_ptr<Window::SessionController> controller;
+	std::weak_ptr<ChatHelpers::Show> show;
 };
 
 [[nodiscard]] std::vector<Preload> &Preloads() {
@@ -168,7 +168,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 
 [[nodiscard]] not_null<Ui::RpWidget*> StickerPreview(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const std::shared_ptr<Data::DocumentMedia> &media,
 		Fn<void()> readyCallback = nullptr) {
 	using namespace HistoryView;
@@ -194,6 +194,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	struct State {
 		std::unique_ptr<Lottie::SinglePlayer> lottie;
 		std::unique_ptr<Lottie::SinglePlayer> effect;
+		style::owned_color pathFg = style::owned_color(
+			QColor(255, 255, 255, 64));
 		std::unique_ptr<Ui::PathShiftGradient> pathGradient;
 		bool readyInvoked = false;
 	};
@@ -239,15 +241,17 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	};
 	createLottieIfReady();
 	if (!state->lottie || !state->effect) {
-		controller->session().downloaderTaskFinished(
+		show->session().downloaderTaskFinished(
 		) | rpl::take_while([=] {
 			createLottieIfReady();
 			return !state->lottie || !state->effect;
 		}) | rpl::start(result->lifetime());
 	}
-	state->pathGradient = MakePathShiftGradient(
-		controller->chatStyle(),
-		[=] { result->update(); });
+	state->pathGradient = std::make_unique<Ui::PathShiftGradient>(
+		st::shadowFg,
+		state->pathFg.color(),
+		[=] { result->update(); },
+		rpl::never<>());
 
 	result->paintRequest(
 	) | rpl::start_with_next([=] {
@@ -262,7 +266,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		if (!state->lottie
 			|| !state->lottie->ready()
 			|| !state->effect->ready()) {
-			p.setBrush(controller->chatStyle()->msgServiceBg());
+			p.setBrush(st::shadowFg);
 			ChatHelpers::PaintStickerThumbnailPath(
 				p,
 				media.get(),
@@ -302,7 +306,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 
 [[nodiscard]] not_null<Ui::RpWidget*> StickersPreview(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		Fn<void()> readyCallback) {
 	const auto result = Ui::CreateChild<Ui::RpWidget>(parent.get());
 	result->show();
@@ -327,7 +331,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		bool nextReady = false;
 		int index = 0;
 	};
-	const auto premium = &controller->session().api().premium();
+	const auto premium = &show->session().api().premium();
 	const auto state = lifetime.make_state<State>();
 	const auto create = [=](std::shared_ptr<Data::DocumentMedia> media) {
 		const auto outer = Ui::CreateChild<Ui::RpWidget>(result);
@@ -340,7 +344,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 
 		[[maybe_unused]] const auto sticker = StickerPreview(
 			outer,
-			controller,
+			show,
 			media,
 			state->singleReadyCallback);
 
@@ -520,7 +524,7 @@ struct VideoPreviewDocument {
 
 [[nodiscard]] not_null<Ui::RpWidget*> VideoPreview(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document,
 		bool alignToBottom,
 		Fn<void()> readyCallback) {
@@ -683,7 +687,7 @@ struct VideoPreviewDocument {
 
 [[nodiscard]] not_null<Ui::RpWidget*> GenericPreview(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		PremiumPreview section,
 		Fn<void()> readyCallback) {
 	const auto result = Ui::CreateChild<Ui::RpWidget>(parent.get());
@@ -699,7 +703,7 @@ struct VideoPreviewDocument {
 		std::vector<std::shared_ptr<Data::DocumentMedia>> medias;
 		Ui::RpWidget *single = nullptr;
 	};
-	const auto session = &controller->session();
+	const auto session = &show->session();
 	const auto state = lifetime.make_state<State>();
 	const auto create = [=] {
 		const auto document = LookupVideo(session, section);
@@ -708,7 +712,7 @@ struct VideoPreviewDocument {
 		}
 		state->single = VideoPreview(
 			result,
-			controller,
+			show,
 			document,
 			!VideoAlignToTop(section),
 			readyCallback);
@@ -724,14 +728,18 @@ struct VideoPreviewDocument {
 
 [[nodiscard]] not_null<Ui::RpWidget*> GenerateDefaultPreview(
 		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		PremiumPreview section,
 		Fn<void()> readyCallback) {
 	switch (section) {
 	case PremiumPreview::Stickers:
-		return StickersPreview(parent, controller, readyCallback);
+		return StickersPreview(parent, std::move(show), readyCallback);
 	default:
-		return GenericPreview(parent, controller, section, readyCallback);
+		return GenericPreview(
+			parent,
+			std::move(show),
+			section,
+			readyCallback);
 	}
 }
 
@@ -792,7 +800,7 @@ struct VideoPreviewDocument {
 
 void PreviewBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const Descriptor &descriptor,
 		const std::shared_ptr<Data::DocumentMedia> &media,
 		const QImage &back) {
@@ -825,7 +833,7 @@ void PreviewBox(
 	};
 	const auto state = outer->lifetime().make_state<State>();
 	state->selected = descriptor.section;
-	state->order = Settings::PremiumPreviewOrder(&controller->session());
+	state->order = Settings::PremiumPreviewOrder(&show->session());
 
 	const auto index = [=](PremiumPreview section) {
 		const auto it = ranges::find(state->order, section);
@@ -880,7 +888,7 @@ void PreviewBox(
 			};
 			state->stickersPreload = GenerateDefaultPreview(
 				outer,
-				controller,
+				show,
 				PremiumPreview::Stickers,
 				ready);
 			state->stickersPreload->hide();
@@ -890,13 +898,13 @@ void PreviewBox(
 	switch (descriptor.section) {
 	case PremiumPreview::Stickers:
 		state->content = media
-			? StickerPreview(outer, controller, media, state->preload)
-			: StickersPreview(outer, controller, state->preload);
+			? StickerPreview(outer, show, media, state->preload)
+			: StickersPreview(outer, show, state->preload);
 		break;
 	default:
 		state->content = GenericPreview(
 			outer,
-			controller,
+			show,
 			descriptor.section,
 			state->preload);
 		break;
@@ -955,7 +963,7 @@ void PreviewBox(
 		} else {
 			state->content = GenerateDefaultPreview(
 				outer,
-				controller,
+				show,
 				now,
 				state->preload);
 		}
@@ -1003,7 +1011,7 @@ void PreviewBox(
 			state->preload();
 		}
 	};
-	if (descriptor.fromSettings && controller->session().premium()) {
+	if (descriptor.fromSettings && show->session().premium()) {
 		box->setShowFinishedCallback(showFinished);
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 	} else {
@@ -1030,16 +1038,21 @@ void PreviewBox(
 		auto button = descriptor.fromSettings
 			? object_ptr<Ui::GradientButton>::fromRaw(
 				Settings::CreateSubscribeButton({
-					controller,
-					box,
-					computeRef,
+					.parent = box,
+					.computeRef = computeRef,
+					.show = show,
 				}))
 			: CreateUnlockButton(box, std::move(unlock));
 		button->resizeToWidth(width);
 		if (!descriptor.fromSettings) {
 			button->setClickedCallback([=] {
+				const auto window = show->resolveWindow(
+					ChatHelpers::WindowUsage::PremiumPromo);
+				if (!window) {
+					return;
+				}
 				Settings::ShowPremium(
-					controller,
+					window,
 					Settings::LookupPremiumRef(state->selected.current()));
 			});
 		}
@@ -1052,7 +1065,7 @@ void PreviewBox(
 
 	if (descriptor.fromSettings) {
 		Data::AmPremiumValue(
-			&controller->session()
+			&show->session()
 		) | rpl::skip(1) | rpl::start_with_next([=] {
 			box->closeBox();
 		}, box->lifetime());
@@ -1076,25 +1089,26 @@ void PreviewBox(
 }
 
 void Show(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const Descriptor &descriptor,
 		const std::shared_ptr<Data::DocumentMedia> &media,
 		QImage back) {
-	const auto box = controller->show(
-		Box(PreviewBox, controller, descriptor, media, back));
+	auto box = Box(PreviewBox, show, descriptor, media, back);
+	const auto raw = box.data();
+	show->showBox(std::move(box));
 	if (descriptor.shownCallback) {
-		descriptor.shownCallback(box);
+		descriptor.shownCallback(raw);
 	}
 }
 
-void Show(not_null<Window::SessionController*> controller, QImage back) {
+void Show(std::shared_ptr<ChatHelpers::Show> show, QImage back) {
 	auto &list = Preloads();
 	for (auto i = begin(list); i != end(list);) {
-		const auto already = i->controller.get();
+		const auto already = i->show.lock();
 		if (!already) {
 			i = list.erase(i);
-		} else if (already == controller) {
-			Show(controller, i->descriptor, i->media, back);
+		} else if (already == show) {
+			Show(std::move(show), i->descriptor, i->media, back);
 			i = list.erase(i);
 			return;
 		} else {
@@ -1104,21 +1118,23 @@ void Show(not_null<Window::SessionController*> controller, QImage back) {
 }
 
 void Show(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		Descriptor &&descriptor) {
-	if (!controller->session().premiumPossible()) {
-		const auto box = controller->show(Box(PremiumUnavailableBox));
+	if (!show->session().premiumPossible()) {
+		auto box = Box(PremiumUnavailableBox);
+		const auto raw = box.data();
+		show->showBox(std::move(box));
 		if (descriptor.shownCallback) {
-			descriptor.shownCallback(box);
+			descriptor.shownCallback(raw);
 		}
 		return;
 	}
 	auto &list = Preloads();
 	for (auto i = begin(list); i != end(list);) {
-		const auto already = i->controller.get();
+		const auto already = i->show.lock();
 		if (!already) {
 			i = list.erase(i);
-		} else if (already == controller) {
+		} else if (already == show) {
 			if (i->descriptor == descriptor) {
 				return;
 			}
@@ -1135,13 +1151,13 @@ void Show(
 		}
 	}
 
-	const auto weak = base::make_weak(controller);
+	const auto weak = std::weak_ptr(show);
 	list.push_back({
 		.descriptor = descriptor,
 		.media = (descriptor.requestedSticker
 			? descriptor.requestedSticker->createMediaView()
 			: nullptr),
-		.controller = weak,
+		.show = weak,
 	});
 	if (const auto &media = list.back().media) {
 		PreloadSticker(media);
@@ -1166,8 +1182,8 @@ void Show(
 			Images::CornersMask(st::boxRadius),
 			RectPart::TopLeft | RectPart::TopRight);
 		crl::on_main([=] {
-			if (const auto strong = weak.get()) {
-				Show(strong, result);
+			if (auto strong = weak.lock()) {
+				Show(std::move(strong), result);
 			}
 		});
 	});
@@ -1178,7 +1194,7 @@ void Show(
 void ShowStickerPreviewBox(
 		not_null<Window::SessionController*> controller,
 		not_null<DocumentData*> document) {
-	Show(controller, Descriptor{
+	Show(controller->uiShow(), Descriptor{
 		.section = PremiumPreview::Stickers,
 		.requestedSticker = document,
 	});
@@ -1188,7 +1204,14 @@ void ShowPremiumPreviewBox(
 		not_null<Window::SessionController*> controller,
 		PremiumPreview section,
 		Fn<void(not_null<Ui::BoxContent*>)> shown) {
-	Show(controller, Descriptor{
+	ShowPremiumPreviewBox(controller->uiShow(), section, std::move(shown));
+}
+
+void ShowPremiumPreviewBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		PremiumPreview section,
+		Fn<void(not_null<Ui::BoxContent*>)> shown) {
+	Show(std::move(show), Descriptor{
 		.section = section,
 		.shownCallback = std::move(shown),
 	});
@@ -1198,7 +1221,7 @@ void ShowPremiumPreviewToBuy(
 		not_null<Window::SessionController*> controller,
 		PremiumPreview section,
 		Fn<void()> hiddenCallback) {
-	Show(controller, Descriptor{
+	Show(controller->uiShow(), Descriptor{
 		.section = section,
 		.fromSettings = true,
 		.hiddenCallback = std::move(hiddenCallback),
@@ -1337,7 +1360,10 @@ void DoubledLimitsPreviewBox(
 		Main::Domain::kPremiumMaxAccounts,
 		till,
 	});
-	Ui::Premium::ShowListBox(box, std::move(entries));
+	Ui::Premium::ShowListBox(
+		box,
+		st::defaultPremiumLimits,
+		std::move(entries));
 }
 
 object_ptr<Ui::GradientButton> CreateUnlockButton(
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h
index 0bf439d29..30fb8f866 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.h
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.h
@@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class DocumentData;
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Data {
 struct ReactionId;
 } // namespace Data
@@ -59,6 +63,11 @@ void ShowPremiumPreviewBox(
 	PremiumPreview section,
 	Fn<void(not_null<Ui::BoxContent*>)> shown = nullptr);
 
+void ShowPremiumPreviewBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	PremiumPreview section,
+	Fn<void(not_null<Ui::BoxContent*>)> shown = nullptr);
+
 void ShowPremiumPreviewToBuy(
 	not_null<Window::SessionController*> controller,
 	PremiumPreview section,
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index baceecfe5..335582ceb 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -137,13 +137,19 @@ SendFilesLimits DefaultLimitsForPeer(not_null<PeerData*> peer) {
 SendFilesCheck DefaultCheckForPeer(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
+	return DefaultCheckForPeer(controller->uiShow(), peer);
+}
+
+SendFilesCheck DefaultCheckForPeer(
+		std::shared_ptr<Ui::Show> show,
+		not_null<PeerData*> peer) {
 	return [=](
 			const Ui::PreparedFile &file,
 			bool compress,
 			bool silent) {
 		const auto error = Data::FileRestrictionError(peer, file, compress);
 		if (error && !silent) {
-			controller->showToast(*error);
+			show->showToast(*error);
 		}
 		return !error.has_value();
 	};
@@ -151,6 +157,7 @@ SendFilesCheck DefaultCheckForPeer(
 
 SendFilesBox::Block::Block(
 	not_null<QWidget*> parent,
+	const style::ComposeControls &st,
 	not_null<std::vector<Ui::PreparedFile>*> items,
 	int from,
 	int till,
@@ -170,20 +177,24 @@ SendFilesBox::Block::Block(
 	if (_isAlbum) {
 		const auto preview = Ui::CreateChild<Ui::AlbumPreview>(
 			parent.get(),
+			st,
 			my,
 			way);
 		_preview.reset(preview);
 	} else {
 		const auto media = Ui::SingleMediaPreview::Create(
 			parent,
+			st,
 			gifPaused,
 			first);
 		if (media) {
 			_isSingleMedia = true;
 			_preview.reset(media);
 		} else {
-			_preview.reset(
-				Ui::CreateChild<Ui::SingleFilePreview>(parent.get(), first));
+			_preview.reset(Ui::CreateChild<Ui::SingleFilePreview>(
+				parent.get(),
+				st,
+				first));
 		}
 	}
 	_preview->show();
@@ -328,15 +339,32 @@ SendFilesBox::SendFilesBox(
 	SendFilesCheck check,
 	Api::SendType sendType,
 	SendMenu::Type sendMenuType)
-: _controller(controller)
-, _sendType(sendType)
+: SendFilesBox(nullptr, {
+	.show = controller->uiShow(),
+	.list = std::move(list),
+	.caption = caption,
+	.limits = limits,
+	.check = check,
+	.sendType = sendType,
+	.sendMenuType = sendMenuType,
+}) {
+}
+
+SendFilesBox::SendFilesBox(QWidget*, SendFilesBoxDescriptor &&descriptor)
+: _show(std::move(descriptor.show))
+, _st(descriptor.stOverride
+	? *descriptor.stOverride
+	: st::defaultComposeControls)
+, _sendType(descriptor.sendType)
 , _titleHeight(st::boxTitleHeight)
-, _list(std::move(list))
-, _limits(limits)
-, _sendMenuType(sendMenuType)
-, _check(std::move(check))
-, _caption(this, st::confirmCaptionArea, Ui::InputField::Mode::MultiLine)
-, _prefilledCaptionText(std::move(caption))
+, _list(std::move(descriptor.list))
+, _limits(descriptor.limits)
+, _sendMenuType(descriptor.sendMenuType)
+, _check(std::move(descriptor.check))
+, _confirmedCallback(std::move(descriptor.confirmed))
+, _cancelledCallback(std::move(descriptor.cancelled))
+, _caption(this, _st.files.caption, Ui::InputField::Mode::MultiLine)
+, _prefilledCaptionText(std::move(descriptor.caption))
 , _scroll(this, st::boxScroll)
 , _inner(
 	_scroll->setOwnedWidget(
@@ -431,7 +459,7 @@ void SendFilesBox::setupDragArea() {
 	const auto droppedCallback = [=](bool compress) {
 		return [=](const QMimeData *data) {
 			addFiles(data);
-			Window::ActivateWindow(_controller);
+			_show->activate();
 		};
 	};
 	areas.document->setDroppedCallback(droppedCallback(false));
@@ -479,7 +507,7 @@ void SendFilesBox::openDialogToAddFileToAlbum() {
 		return true;
 	};
 	const auto callback = [=](FileDialog::OpenResult &&result) {
-		const auto premium = _controller->session().premium();
+		const auto premium = _show->session().premium();
 		FileDialogCallback(
 			std::move(result),
 			checkResult,
@@ -563,11 +591,11 @@ void SendFilesBox::addMenuButton() {
 		return;
 	}
 
-	const auto top = addTopButton(st::infoTopBarMenu);
+	const auto top = addTopButton(_st.files.menu);
 	top->setClickedCallback([=] {
-		_menu = base::make_unique_q<Ui::PopupMenu>(
-			top,
-			st::popupMenuExpandedSeparator);
+		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(
@@ -575,9 +603,9 @@ void SendFilesBox::addMenuButton() {
 					? tr::lng_context_disable_spoiler(tr::now)
 					: tr::lng_context_spoiler_effect(tr::now)),
 				[=] { toggleSpoilers(!spoilered); },
-				spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
+				spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
 			if (hasSendMenu()) {
-				_menu->addSeparator();
+				_menu->addSeparator(&tabbed.expandedSeparator);
 			}
 		}
 		if (hasSendMenu()) {
@@ -586,7 +614,8 @@ void SendFilesBox::addMenuButton() {
 				_sendMenuType,
 				[=] { sendSilent(); },
 				[=] { sendScheduled(); },
-				[=] { sendWhenOnline(); });
+				[=] { sendWhenOnline(); },
+				&_st.tabbed.icons);
 		}
 		_menu->popup(QCursor::pos());
 		return true;
@@ -711,12 +740,12 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 }
 
 void SendFilesBox::pushBlock(int from, int till) {
-	const auto gifPaused = [controller = _controller] {
-		return controller->isGifPausedAtLeastFor(
-			Window::GifPauseReason::Layer);
+	const auto gifPaused = [show = _show] {
+		return show->paused(Window::GifPauseReason::Layer);
 	};
 	_blocks.emplace_back(
 		_inner.data(),
+		_st,
 		&_list.files,
 		from,
 		till,
@@ -807,7 +836,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 			return checkSlowmode(list) && checkRights(list);
 		};
 		const auto callback = [=](FileDialog::OpenResult &&result) {
-			const auto premium = _controller->session().premium();
+			const auto premium = _show->session().premium();
 			FileDialogCallback(
 				std::move(result),
 				checkResult,
@@ -825,15 +854,15 @@ void SendFilesBox::pushBlock(int from, int till) {
 
 	const auto openedOnce = widget->lifetime().make_state<bool>(false);
 	block.itemModifyRequest(
-	) | rpl::start_with_next([=, controller = _controller](int index) {
+	) | rpl::start_with_next([=, show = _show](int index) {
 		if (!(*openedOnce)) {
-			controller->session().settings().incrementPhotoEditorHintShown();
-			controller->session().saveSettings();
+			show->session().settings().incrementPhotoEditorHintShown();
+			show->session().saveSettings();
 		}
 		*openedOnce = true;
 		Editor::OpenWithPreparedFile(
 			this,
-			controller,
+			show,
 			&_list.files[index],
 			st::sendMediaPreviewSize,
 			[=] { refreshAllAfterChanges(from); });
@@ -856,12 +885,14 @@ void SendFilesBox::setupSendWayControls() {
 		this,
 		tr::lng_send_grouped(tr::now),
 		groupFilesFirst,
-		st::defaultBoxCheckbox);
+		_st.files.checkbox,
+		_st.files.check);
 	_sendImagesAsPhotos.create(
 		this,
 		tr::lng_send_compressed(tr::now),
 		_sendWay.current().sendImagesAsPhotos(),
-		st::defaultBoxCheckbox);
+		_st.files.checkbox,
+		_st.files.check);
 
 	_sendWay.changes(
 	) | rpl::start_with_next([=](SendFilesWay value) {
@@ -905,7 +936,8 @@ void SendFilesBox::setupSendWayControls() {
 		this,
 		tr::lng_remember(tr::now),
 		false,
-		st::defaultBoxCheckbox);
+		_st.files.checkbox,
+		_st.files.check);
 	_wayRemember->hide();
 	rpl::combine(
 		_groupFiles->checkedValue(),
@@ -953,25 +985,32 @@ void SendFilesBox::updateSendWayControls() {
 		: tr::lng_send_compressed_one(tr::now));
 
 	_hintLabel->setVisible(
-		_controller->session().settings().photoEditorHintShown()
+		_show->session().settings().photoEditorHintShown()
 			? _list.canHaveEditorHintLabel()
 			: false);
 }
 
 void SendFilesBox::setupCaption() {
-	const auto allow = [=](const auto&) {
+	const auto allow = [=](const auto &) {
 		return (_limits & SendFilesAllow::EmojiWithoutPremium);
 	};
+	const auto show = _show;
 	InitMessageFieldHandlers(
-		_controller,
+		&show->session(),
+		show,
 		_caption.data(),
-		Window::GifPauseReason::Layer,
-		allow);
+		[=] { return show->paused(Window::GifPauseReason::Layer); },
+		allow,
+		&_st.files.caption);
 	Ui::Emoji::SuggestionsController::Init(
 		getDelegate()->outerContainer(),
 		_caption,
-		&_controller->session(),
-		{ .suggestCustomEmoji = true, .allowCustomWithoutPremium = allow });
+		&_show->session(),
+		{
+			.suggestCustomEmoji = true,
+			.allowCustomWithoutPremium = allow,
+			.st = &_st.suggestions,
+		});
 
 	if (!_prefilledCaptionText.text.isEmpty()) {
 		_caption->setTextWithTags(
@@ -1019,12 +1058,21 @@ void SendFilesBox::setupEmojiPanel() {
 	using Selector = ChatHelpers::TabbedSelector;
 	_emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
 		container,
-		_controller,
-		object_ptr<Selector>(
-			nullptr,
-			_controller->uiShow(),
-			Window::GifPauseReason::Layer,
-			Selector::Mode::EmojiOnly));
+		ChatHelpers::TabbedPanelDescriptor{
+			.ownedSelector = object_ptr<Selector>(
+				nullptr,
+				ChatHelpers::TabbedSelectorDescriptor{
+					.show = _show,
+					.st = _st.tabbed,
+					.level = Window::GifPauseReason::Layer,
+					.mode = ChatHelpers::TabbedSelector::Mode::EmojiOnly,
+					.features = {
+						.megagroupSet = false,
+						.stickersSettings = false,
+						.openStickerSets = false,
+					},
+				}),
+		});
 	_emojiPanel->setDesiredHeightValues(
 		1.,
 		st::emojiPanMinHeight / 2,
@@ -1041,11 +1089,9 @@ void SendFilesBox::setupEmojiPanel() {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
-			&& !_controller->session().premium()
+			&& !_show->session().premium()
 			&& !(_limits & SendFilesAllow::EmojiWithoutPremium)) {
-			ShowPremiumPreviewBox(
-				_controller,
-				PremiumPreview::AnimatedEmoji);
+			ShowPremiumPreviewBox(_show, PremiumPreview::AnimatedEmoji);
 		} else {
 			Data::InsertCustomEmoji(_caption.data(), data.document);
 		}
@@ -1057,7 +1103,7 @@ void SendFilesBox::setupEmojiPanel() {
 	};
 	_emojiFilter.reset(base::install_event_filter(container, filterCallback));
 
-	_emojiToggle.create(this, st::boxAttachEmoji);
+	_emojiToggle.create(this, _st.files.emoji);
 	_emojiToggle->setVisible(!_caption->isHidden());
 	_emojiToggle->installEventFilter(_emojiPanel);
 	_emojiToggle->addClickHandler([=] {
@@ -1095,7 +1141,7 @@ bool SendFilesBox::canAddFiles(not_null<const QMimeData*> data) const {
 }
 
 bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
-	const auto premium = _controller->session().premium();
+	const auto premium = _show->session().premium();
 	auto list = [&] {
 		const auto urls = Core::ReadMimeUrls(data);
 		auto result = CanAddUrls(urls)
@@ -1242,7 +1288,7 @@ void SendFilesBox::paintEvent(QPaintEvent *e) {
 		Painter p(this);
 
 		p.setFont(st::boxTitleFont);
-		p.setPen(st::boxTitleFg);
+		p.setPen(getDelegate()->style().title.textFg);
 		p.drawTextLeft(
 			st::boxPhotoTitlePosition.x(),
 			st::boxTitlePosition.y() - st::boxTopMargin,
@@ -1318,7 +1364,7 @@ void SendFilesBox::saveSendWaySettings() {
 }
 
 bool SendFilesBox::validateLength(const QString &text) const {
-	const auto session = &_controller->session();
+	const auto session = &_show->session();
 	const auto limit = Data::PremiumLimits(session).captionLengthCurrent();
 	const auto remove = int(text.size()) - limit;
 	const auto way = _sendWay.current();
@@ -1328,7 +1374,8 @@ bool SendFilesBox::validateLength(const QString &text) const {
 			way.sendImagesAsPhotos())) {
 		return true;
 	}
-	_controller->show(Box(CaptionLimitReachedBox, session, remove));
+	_show->showBox(
+		Box(CaptionLimitReachedBox, session, remove, &_st.premium));
 	return false;
 }
 
@@ -1385,8 +1432,7 @@ void SendFilesBox::sendScheduled() {
 		? SendMenu::Type::ScheduledToUser
 		: _sendMenuType;
 	const auto callback = [=](Api::SendOptions options) { send(options); };
-	_controller->show(
-		HistoryView::PrepareScheduleBox(this, type, callback));
+	_show->showBox(HistoryView::PrepareScheduleBox(this, type, callback));
 }
 
 void SendFilesBox::sendWhenOnline() {
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 8e93673f0..6e6c6fa82 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -15,6 +15,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localimageloader.h"
 #include "storage/storage_media_prepare.h"
 
+namespace style {
+struct ComposeControls;
+} // namespace style
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -26,6 +30,7 @@ enum class SendType;
 
 namespace ChatHelpers {
 class TabbedPanel;
+class Show;
 } // namespace ChatHelpers
 
 namespace Ui {
@@ -71,6 +76,29 @@ using SendFilesCheck = Fn<bool(
 [[nodiscard]] SendFilesCheck DefaultCheckForPeer(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
+[[nodiscard]] SendFilesCheck DefaultCheckForPeer(
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> peer);
+
+using SendFilesConfirmed = Fn<void(
+	Ui::PreparedList &&list,
+	Ui::SendFilesWay way,
+	TextWithTags &&caption,
+	Api::SendOptions options,
+	bool ctrlShiftEnter)>;
+
+struct SendFilesBoxDescriptor {
+	std::shared_ptr<ChatHelpers::Show> show;
+	Ui::PreparedList list;
+	TextWithTags caption;
+	SendFilesLimits limits = {};
+	SendFilesCheck check;
+	Api::SendType sendType = {};
+	SendMenu::Type sendMenuType = {};
+	const style::ComposeControls *stOverride = nullptr;
+	SendFilesConfirmed confirmed;
+	Fn<void()> cancelled;
+};
 
 class SendFilesBox : public Ui::BoxContent {
 public:
@@ -87,14 +115,9 @@ public:
 		SendFilesCheck check,
 		Api::SendType sendType,
 		SendMenu::Type sendMenuType);
+	SendFilesBox(QWidget*, SendFilesBoxDescriptor &&descriptor);
 
-	void setConfirmedCallback(
-		Fn<void(
-			Ui::PreparedList &&list,
-			Ui::SendFilesWay way,
-			TextWithTags &&caption,
-			Api::SendOptions options,
-			bool ctrlShiftEnter)> callback) {
+	void setConfirmedCallback(SendFilesConfirmed callback) {
 		_confirmedCallback = std::move(callback);
 	}
 	void setCancelledCallback(Fn<void()> callback) {
@@ -116,6 +139,7 @@ private:
 	public:
 		Block(
 			not_null<QWidget*> parent,
+			const style::ComposeControls &st,
 			not_null<std::vector<Ui::PreparedFile>*> items,
 			int from,
 			int till,
@@ -201,7 +225,8 @@ private:
 	void enqueueNextPrepare();
 	void addPreparedAsyncFile(Ui::PreparedFile &&file);
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const style::ComposeControls &_st;
 	const Api::SendType _sendType = Api::SendType();
 
 	QString _titleText;
@@ -211,15 +236,10 @@ private:
 	std::optional<int> _removingIndex;
 
 	SendFilesLimits _limits = {};
-	SendMenu::Type _sendMenuType = SendMenu::Type();
+	SendMenu::Type _sendMenuType = {};
 
 	SendFilesCheck _check;
-	Fn<void(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter)> _confirmedCallback;
+	SendFilesConfirmed _confirmedCallback;
 	Fn<void()> _cancelledCallback;
 	bool _confirmed = false;
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 454d658ed..8af7d3f0d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -124,7 +124,7 @@ void Show::showOrHideBoxOrLayer(
 	} else if (const auto panel = _panel.get()) {
 		panel->hideLayer(animated);
 	}
- }
+}
 
 not_null<QWidget*> Show::toastParent() const {
 	const auto panel = _panel.get();
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 4e03be93a..8ad939619 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -11,6 +11,7 @@ using "boxes/boxes.style";
 using "ui/layers/layers.style";
 using "ui/widgets/widgets.style";
 using "ui/menu_icons.style";
+using "ui/effects/premium.style";
 
 GroupCallUserpics {
 	size: pixels;
@@ -66,6 +67,8 @@ ComposeIcons {
 	menuMute: icon;
 	menuSchedule: icon;
 	menuWhenOnline: icon;
+	menuSpoiler: icon;
+	menuSpoilerOff: icon;
 }
 
 EmojiSuggestions {
@@ -107,6 +110,7 @@ EmojiPan {
 	fadeLeft: icon;
 	fadeRight: icon;
 	menu: PopupMenu;
+	expandedSeparator: MenuSeparator;
 	tabs: SettingsSlider;
 	search: TabbedSearch;
 	searchMargin: margins;
@@ -162,6 +166,24 @@ RecordBar {
 	remove: IconButton;
 }
 
+ComposeFiles {
+	check: Check;
+	checkbox: Checkbox;
+	menu: IconButton;
+	caption: InputField;
+	emoji: EmojiButton;
+	confirmBg: color;
+	buttonFile: IconButton;
+	buttonFileEdit: icon;
+	buttonFileDelete: icon;
+	iconBg: color;
+	iconPlay: icon;
+	iconImage: icon;
+	iconDocument: icon;
+	nameFg: color;
+	statusFg: color;
+}
+
 ComposeControls {
 	bg: color;
 	radius: pixels;
@@ -175,6 +197,8 @@ ComposeControls {
 	tabbedHeightMin: pixels;
 	tabbedHeightMax: pixels;
 	record: RecordBar;
+	files: ComposeFiles;
+	premium: PremiumLimits;
 }
 
 switchPmButton: RoundButton(defaultBoxButton) {
@@ -416,6 +440,42 @@ stickersToast: Toast(defaultToast) {
 stickersEmpty: icon {{ "stickers_empty", windowSubTextFg }};
 emojiEmpty: icon {{ "emoji_empty", windowSubTextFg }};
 
+editMediaButtonSize: 32px;
+
+editMediaButtonIconFile: icon {{ "send_media/send_media_replace", menuIconFg }};
+editMediaButton: IconButton(defaultIconButton) {
+	width: editMediaButtonSize;
+	height: editMediaButtonSize;
+
+	icon: editMediaButtonIconFile;
+
+	rippleAreaSize: editMediaButtonSize;
+	ripple: defaultRippleAnimation;
+}
+
+sendBoxAlbumGroupEditInternalSkip: 8px;
+sendBoxAlbumGroupSkipRight: 5px;
+sendBoxAlbumGroupSkipTop: 5px;
+sendBoxAlbumGroupRadius: 4px;
+sendBoxAlbumGroupSize: size(62px, 25px);
+sendBoxAlbumSmallGroupSize: size(30px, 25px);
+
+sendBoxFileGroupSkipTop: 2px;
+sendBoxFileGroupSkipRight: 5px;
+sendBoxFileGroupEditInternalSkip: -1px;
+
+sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgRipple;
+	}
+}
+sendBoxAlbumGroupEditButtonIconFile: editMediaButtonIconFile;
+sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "send_media/send_media_delete", menuIconFg }};
+
+sendBoxAlbumButtonMediaEdit: icon {{ "send_media/send_media_replace", roundedFg }};
+sendBoxAlbumGroupButtonMediaEdit: icon {{ "send_media/send_media_replace", roundedFg, point(4px, 1px) }};
+sendBoxAlbumGroupButtonMediaDelete: icon {{ "send_media/send_media_delete", roundedFg }};
+
 defaultComposeIcons: ComposeIcons {
 	settings: icon {{ "emoji/emoji_settings", emojiIconFg }};
 
@@ -445,6 +505,8 @@ defaultComposeIcons: ComposeIcons {
 	menuMute: menuIconMute;
 	menuSchedule: menuIconSchedule;
 	menuWhenOnline: menuIconWhenOnline;
+	menuSpoiler: menuIconSpoiler;
+	menuSpoilerOff: menuIconSpoilerOff;
 }
 defaultEmojiPan: EmojiPan {
 	margin: margins(7px, 0px, 7px, 0px);
@@ -476,6 +538,10 @@ defaultEmojiPan: EmojiPan {
 	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
 	fadeRight: icon {{ "fade_horizontal", emojiPanCategories }};
 	menu: popupMenuWithIcons;
+	expandedSeparator: MenuSeparator(defaultMenuSeparator) {
+		padding: margins(0px, 4px, 0px, 4px);
+		width: 6px;
+	}
 	tabs: emojiTabs;
 	search: defaultTabbedSearch;
 	searchMargin: margins(1px, 11px, 2px, 5px);
@@ -974,6 +1040,41 @@ historySend: SendButton {
 	sendDisabledFg: historyComposeIconFg;
 }
 
+defaultComposeFilesMenu: IconButton(defaultIconButton) {
+	width: 48px;
+	height: 54px;
+
+	icon: icon {{ "title_menu_dots", boxTitleCloseFg }};
+	iconOver: icon {{ "title_menu_dots", boxTitleCloseFgOver }};
+	iconPosition: point(18px, -1px);
+
+	rippleAreaPosition: point(1px, 6px);
+	rippleAreaSize: 42px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
+defaultComposeFilesField: InputField(defaultInputField) {
+	textMargins: margins(1px, 26px, 31px, 4px);
+	heightMax: 158px;
+}
+defaultComposeFiles: ComposeFiles {
+	check: defaultCheck;
+	checkbox: defaultBoxCheckbox;
+	menu: defaultComposeFilesMenu;
+	caption: defaultComposeFilesField;
+	emoji: boxAttachEmoji;
+	confirmBg: windowBgOver;
+	buttonFile: sendBoxAlbumGroupButtonFile;
+	buttonFileEdit: sendBoxAlbumGroupEditButtonIconFile;
+	buttonFileDelete: sendBoxAlbumGroupDeleteButtonIconFile;
+	iconBg: msgFileInBg;
+	iconPlay: icon {{ "history_file_play", historyFileInIconFg }};
+	iconImage: icon {{ "history_file_image", historyFileInIconFg }};
+	iconDocument: icon {{ "history_file_document", historyFileInIconFg }};
+	nameFg: historyFileNameInFg;
+	statusFg: mediaInFg;
+}
 defaultComposeControls: ComposeControls {
 	bg: historyComposeAreaBg;
 	radius: 0px;
@@ -987,4 +1088,6 @@ defaultComposeControls: ComposeControls {
 	tabbedHeightMin: emojiPanMinHeight;
 	tabbedHeightMax: emojiPanMaxHeight;
 	record: defaultRecordBar;
+	files: defaultComposeFiles;
+	premium: defaultPremiumLimits;
 }
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
index a1ad76e6c..4a418c042 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
@@ -46,6 +46,8 @@ enum class WindowUsage {
 
 class Show : public Main::SessionShow {
 public:
+	virtual void activate() = 0;
+
 	[[nodiscard]] virtual bool paused(PauseReason reason) const = 0;
 	[[nodiscard]] virtual rpl::producer<> pauseChanged() const = 0;
 
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 3d5f35c57..9f29463ce 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -726,6 +726,7 @@ object_ptr<TabbedSelector::InnerFooter> EmojiListWidget::createFooter() {
 		.paused = footerPaused,
 		.parent = this,
 		.st = &st(),
+		.features = { .stickersSettings = false },
 	});
 	_footer = result;
 
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 48a0e9800..0ae43c3dd 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -172,6 +172,7 @@ object_ptr<TabbedSelector::InnerFooter> GifsListWidget::createFooter() {
 		.paused = pausedMethod(),
 		.parent = this,
 		.st = &st(),
+		.features = { .stickersSettings = false },
 	});
 	_footer = result;
 	_chosenSetId = Data::Stickers::RecentSetId;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index cf0dda5eb..afee47efd 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "chat_helpers/stickers_list_widget.h"
 
+#include "core/application.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_session.h"
@@ -221,9 +222,15 @@ StickersListWidget::StickersListWidget(
 	}
 
 	_settings->addClickHandler([=] {
-		using Section = StickersBox::Section;
-		_show->showBox(
-			Box<StickersBox>(_show, Section::Installed, _isMasks));
+		if (const auto window = _show->resolveWindow(
+				WindowUsage::PremiumPromo)) {
+			// While media viewer can't show StickersBox.
+			using Section = StickersBox::Section;
+			window->show(
+				Box<StickersBox>(_show, Section::Installed, _isMasks));
+			Core::App().hideMediaView();
+			Window::ActivateWindow(window);
+		}
 	});
 
 	session().downloaderTaskFinished(
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
index 153c19581..fcedb5efc 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
@@ -30,7 +30,7 @@ struct TabbedPanelDescriptor {
 	Window::SessionController *regularWindow = nullptr;
 	object_ptr<TabbedSelector> ownedSelector = { nullptr };
 	TabbedSelector *nonOwnedSelector = nullptr;
-};;
+};
 
 class TabbedPanel : public Ui::RpWidget {
 public:
diff --git a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
index 66fc0f997..2c0482c33 100644
--- a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
+++ b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
@@ -12,21 +12,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h" // Window::GifPauseReason
 
 #include "styles/style_chat_helpers.h"
+#include "styles/style_media_view.h"
 
 namespace Editor {
 
 StickersPanelController::StickersPanelController(
 	not_null<Ui::RpWidget*> panelContainer,
-	not_null<Window::SessionController*> controller)
+	std::shared_ptr<ChatHelpers::Show> show)
 : _stickersPanel(
 	base::make_unique_q<ChatHelpers::TabbedPanel>(
 		panelContainer,
-		controller,
-		object_ptr<ChatHelpers::TabbedSelector>(
-			nullptr,
-			controller->uiShow(),
-			Window::GifPauseReason::Layer,
-			ChatHelpers::TabbedSelector::Mode::MediaEditor))) {
+		ChatHelpers::TabbedPanelDescriptor{
+			.ownedSelector = object_ptr<ChatHelpers::TabbedSelector>(
+				nullptr,
+				ChatHelpers::TabbedSelectorDescriptor{
+					.show = show,
+					.st = st::storiesComposeControls.tabbed,
+					.level = Window::GifPauseReason::Layer,
+					.mode = ChatHelpers::TabbedSelector::Mode::MediaEditor,
+					.features = {
+						.megagroupSet = false,
+						.stickersSettings = false,
+						.openStickerSets = false,
+					},
+				}),
+		})) {
 	_stickersPanel->setDesiredHeightValues(
 		1.,
 		st::emojiPanMinHeight / 2,
diff --git a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.h b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.h
index 5404a8adb..9514ea23b 100644
--- a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.h
+++ b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.h
@@ -11,16 +11,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace ChatHelpers {
 class TabbedPanel;
+class Show;
 } // namespace ChatHelpers
 
 namespace Ui {
 class RpWidget;
 } // namespace Ui
 
-namespace Window {
-class SessionController;
-} // namespace Window
-
 namespace Editor {
 
 class StickersPanelController final {
@@ -34,7 +31,7 @@ public:
 
 	StickersPanelController(
 		not_null<Ui::RpWidget*> panelContainer,
-		not_null<Window::SessionController*> controller);
+		std::shared_ptr<ChatHelpers::Show> show);
 
 	[[nodiscard]] auto stickerChosen() const
 	-> rpl::producer<not_null<DocumentData*>>;
diff --git a/Telegram/SourceFiles/editor/photo_editor.cpp b/Telegram/SourceFiles/editor/photo_editor.cpp
index a11fe9760..801e12258 100644
--- a/Telegram/SourceFiles/editor/photo_editor.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor.cpp
@@ -52,16 +52,34 @@ PhotoEditor::PhotoEditor(
 	std::shared_ptr<Image> photo,
 	PhotoModifications modifications,
 	EditorData data)
+: PhotoEditor(
+	parent,
+	controller->uiShow(),
+	(controller->sessionController()
+		? controller->sessionController()->uiShow()
+		: nullptr),
+	std::move(photo),
+	std::move(modifications),
+	std::move(data)) {
+}
+
+PhotoEditor::PhotoEditor(
+	not_null<QWidget*> parent,
+	std::shared_ptr<Ui::Show> show,
+	std::shared_ptr<ChatHelpers::Show> sessionShow,
+	std::shared_ptr<Image> photo,
+	PhotoModifications modifications,
+	EditorData data)
 : RpWidget(parent)
 , _modifications(std::move(modifications))
 , _controllers(std::make_shared<Controllers>(
-	controller->sessionController()
+	sessionShow
 		? std::make_unique<StickersPanelController>(
 			this,
-			controller->sessionController())
+			std::move(sessionShow))
 		: nullptr,
 	std::make_unique<UndoController>(),
-	controller->uiShow()))
+	std::move(show)))
 , _content(base::make_unique_q<PhotoEditorContent>(
 	this,
 	photo,
diff --git a/Telegram/SourceFiles/editor/photo_editor.h b/Telegram/SourceFiles/editor/photo_editor.h
index e226b1ddb..4169339a6 100644
--- a/Telegram/SourceFiles/editor/photo_editor.h
+++ b/Telegram/SourceFiles/editor/photo_editor.h
@@ -15,8 +15,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 class LayerWidget;
+class Show;
 } // namespace Ui
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Window {
 class Controller;
 } // namespace Window
@@ -36,6 +41,13 @@ public:
 		std::shared_ptr<Image> photo,
 		PhotoModifications modifications,
 		EditorData data = EditorData());
+	PhotoEditor(
+		not_null<QWidget*> parent,
+		std::shared_ptr<Ui::Show> show,
+		std::shared_ptr<ChatHelpers::Show> sessionShow,
+		std::shared_ptr<Image> photo,
+		PhotoModifications modifications,
+		EditorData data = EditorData());
 
 	void save();
 	[[nodiscard]] rpl::producer<PhotoModifications> doneRequests() const;
diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
index c58fb1cc0..daf93c08d 100644
--- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
@@ -22,7 +22,7 @@ namespace Editor {
 
 void OpenWithPreparedFile(
 		not_null<QWidget*> parent,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::PreparedFile*> file,
 		int previewWidth,
 		Fn<void()> &&doneCallback) {
@@ -56,13 +56,14 @@ void OpenWithPreparedFile(
 	const auto fileImage = std::make_shared<Image>(std::move(copy));
 	auto editor = base::make_unique_q<PhotoEditor>(
 		parent,
-		&controller->window(),
+		show,
+		show,
 		fileImage,
 		image->modifications);
 	const auto raw = editor.get();
 	auto layer = std::make_unique<LayerWidget>(parent, std::move(editor));
 	InitEditorLayer(layer.get(), raw, std::move(callback));
-	controller->showLayer(std::move(layer), Ui::LayerOption::KeepOther);
+	show->showLayer(std::move(layer), Ui::LayerOption::KeepOther);
 }
 
 void PrepareProfilePhoto(
diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.h b/Telegram/SourceFiles/editor/photo_editor_layer_widget.h
index d7fd19a75..f1c2fd445 100644
--- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.h
+++ b/Telegram/SourceFiles/editor/photo_editor_layer_widget.h
@@ -6,13 +6,13 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
-//
-//#include "ui/image/image.h"
-//#include "editor/photo_editor_common.h"
-//#include "base/unique_qptr.h"
 
 enum class ImageRoundRadius;
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 class RpWidget;
 struct PreparedFile;
@@ -31,7 +31,7 @@ struct EditorData;
 
 void OpenWithPreparedFile(
 	not_null<QWidget*> parent,
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::PreparedFile*> file,
 	int previewWidth,
 	Fn<void()> &&doneCallback);
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index c6e81a086..99db1769a 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5142,7 +5142,8 @@ bool HistoryWidget::showSendingFilesError(
 		return false;
 	} else if (text == u"(toolarge)"_q) {
 		const auto fileSize = list.files.back().size;
-		controller()->show(Box(FileSizeLimitBox, &session(), fileSize));
+		controller()->show(
+			Box(FileSizeLimitBox, &session(), fileSize, nullptr));
 		return true;
 	}
 	controller()->showToast(text);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 22145b376..f8ddd36e2 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1123,7 +1123,8 @@ bool RepliesWidget::showSendingFilesError(
 		return false;
 	} else if (text == u"(toolarge)"_q) {
 		const auto fileSize = list.files.back().size;
-		controller()->show(Box(FileSizeLimitBox, &session(), fileSize));
+		controller()->show(
+			Box(FileSizeLimitBox, &session(), fileSize, nullptr));
 		return true;
 	}
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 85ce03471..66255b466 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -559,7 +559,8 @@ bool ScheduledWidget::showSendingFilesError(
 		return false;
 	} else if (text == u"(toolarge)"_q) {
 		const auto fileSize = list.files.back().size;
-		controller()->show(Box(FileSizeLimitBox, &session(), fileSize));
+		controller()->show(
+			Box(FileSizeLimitBox, &session(), fileSize, nullptr));
 		return true;
 	}
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 49b2e70a3..bbc28a75d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -7,16 +7,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_reply.h"
 
+#include "api/api_common.h"
+#include "apiwrap.h"
 #include "base/call_delayed.h"
+#include "boxes/premium_limits_box.h"
+#include "boxes/send_files_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "core/file_utilities.h"
+#include "core/mime_type.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "history/view/controls/history_view_compose_controls.h"
+#include "history/history_item_helpers.h"
+#include "history/history.h"
 #include "inline_bots/inline_bot_result.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
 #include "menu/menu_send.h"
+#include "storage/localimageloader.h"
+#include "storage/storage_media_prepare.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "styles/style_boxes.h" // sendMediaPreviewSize.
 #include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
 
@@ -85,15 +99,276 @@ void ReplyArea::initGeometry() {
 }
 
 void ReplyArea::send(Api::SendOptions options) {
-	// #TODO stories
+	const auto webPageId = _controls->webPageId();
+
+	auto message = ApiWrap::MessageToSend(prepareSendAction(options));
+	message.textWithTags = _controls->getTextWithAppliedMarkdown();
+	message.webPageId = webPageId;
+
+	const auto error = GetErrorTextForSending(
+		_data.user,
+		{
+			.topicRootId = MsgId(0),
+			.text = &message.textWithTags,
+			.ignoreSlowmodeCountdown = (options.scheduled != 0),
+		});
+	if (!error.isEmpty()) {
+		_controller->uiShow()->showToast(error);
+	}
+
+	session().api().sendMessage(std::move(message));
+
+	_controls->clear();
+	finishSending();
 }
 
 void ReplyArea::sendVoice(VoiceToSend &&data) {
-	// #TODO stories
+	auto action = prepareSendAction(data.options);
+	session().api().sendVoiceMessage(
+		data.bytes,
+		data.waveform,
+		data.duration,
+		std::move(action));
+
+	_controls->clearListenState();
+	finishSending();
 }
 
-void ReplyArea::chooseAttach(std::optional<bool> overrideCompress) {
-	// #TODO stories
+void ReplyArea::finishSending() {
+	_controls->hidePanelsAnimated();
+	_controller->wrap()->setFocus();
+}
+
+void ReplyArea::uploadFile(
+		const QByteArray &fileContent,
+		SendMediaType type) {
+	session().api().sendFile(fileContent, type, prepareSendAction({}));
+}
+
+bool ReplyArea::showSendingFilesError(
+		const Ui::PreparedList &list) const {
+	return showSendingFilesError(list, std::nullopt);
+}
+
+bool ReplyArea::showSendingFilesError(
+		const Ui::PreparedList &list,
+		std::optional<bool> compress) const {
+	const auto text = [&] {
+		const auto peer = _data.user;
+		const auto error = Data::FileRestrictionError(peer, list, compress);
+		if (error) {
+			return *error;
+		}
+		using Error = Ui::PreparedList::Error;
+		switch (list.error) {
+		case Error::None: return QString();
+		case Error::EmptyFile:
+		case Error::Directory:
+		case Error::NonLocalUrl: return tr::lng_send_image_empty(
+			tr::now,
+			lt_name,
+			list.errorData);
+		case Error::TooLargeFile: return u"(toolarge)"_q;
+		}
+		return tr::lng_forward_send_files_cant(tr::now);
+	}();
+	if (text.isEmpty()) {
+		return false;
+	} else if (text == u"(toolarge)"_q) {
+		const auto fileSize = list.files.back().size;
+		_controller->uiShow()->showBox(Box(
+			FileSizeLimitBox,
+			&session(),
+			fileSize,
+			&st::storiesComposePremium));
+		return true;
+	}
+
+	_controller->uiShow()->showToast(text);
+	return true;
+}
+
+Api::SendAction ReplyArea::prepareSendAction(
+		Api::SendOptions options) const {
+	Expects(_data.user != nullptr);
+
+	const auto history = _data.user->owner().history(_data.user);
+	auto result = Api::SendAction(history, options);
+	result.options.sendAs = _controls->sendAsPeer();
+	return result;
+}
+
+void ReplyArea::chooseAttach(
+		std::optional<bool> overrideSendImagesAsPhotos) {
+	if (!_data.user) {
+		return;
+	}
+	const auto user = not_null(_data.user);
+	_choosingAttach = false;
+	if (const auto error = Data::AnyFileRestrictionError(user)) {
+		_controller->uiShow()->showToast(*error);
+		return;
+	}
+
+	const auto filter = (overrideSendImagesAsPhotos == true)
+		? FileDialog::ImagesOrAllFilter()
+		: FileDialog::AllOrImagesFilter();
+	const auto callback = [=](FileDialog::OpenResult &&result) {
+		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+			return;
+		}
+
+		if (!result.remoteContent.isEmpty()) {
+			auto read = Images::Read({
+				.content = result.remoteContent,
+				});
+			if (!read.image.isNull() && !read.animated) {
+				confirmSendingFiles(
+					std::move(read.image),
+					std::move(result.remoteContent),
+					overrideSendImagesAsPhotos);
+			} else {
+				uploadFile(result.remoteContent, SendMediaType::File);
+			}
+		} else {
+			const auto premium = session().premium();
+			auto list = Storage::PrepareMediaList(
+				result.paths,
+				st::sendMediaPreviewSize,
+				premium);
+			list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+			confirmSendingFiles(std::move(list));
+		}
+	};
+	FileDialog::GetOpenPaths(
+		_controller->wrap().get(),
+		tr::lng_choose_files(tr::now),
+		filter,
+		crl::guard(&_shownUserGuard, callback),
+		nullptr);
+}
+
+bool ReplyArea::confirmSendingFiles(
+		not_null<const QMimeData*> data,
+		std::optional<bool> overrideSendImagesAsPhotos,
+		const QString &insertTextOnCancel) {
+	const auto hasImage = data->hasImage();
+	const auto premium = session().user()->isPremium();
+
+	if (const auto urls = Core::ReadMimeUrls(data); !urls.empty()) {
+		auto list = Storage::PrepareMediaList(
+			urls,
+			st::sendMediaPreviewSize,
+			premium);
+		if (list.error != Ui::PreparedList::Error::NonLocalUrl) {
+			if (list.error == Ui::PreparedList::Error::None
+				|| !hasImage) {
+				const auto emptyTextOnCancel = QString();
+				list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+				confirmSendingFiles(std::move(list), emptyTextOnCancel);
+				return true;
+			}
+		}
+	}
+
+	if (auto read = Core::ReadMimeImage(data)) {
+		confirmSendingFiles(
+			std::move(read.image),
+			std::move(read.content),
+			overrideSendImagesAsPhotos,
+			insertTextOnCancel);
+		return true;
+	}
+	return false;
+}
+
+bool ReplyArea::confirmSendingFiles(
+		Ui::PreparedList &&list,
+		const QString &insertTextOnCancel) {
+	if (_controls->confirmMediaEdit(list)) {
+		return true;
+	} else if (showSendingFilesError(list)) {
+		return false;
+	}
+
+	const auto show = _controller->uiShow();
+	auto confirmed = [=](auto &&...args) {
+		sendingFilesConfirmed(std::forward<decltype(args)>(args)...);
+	};
+	auto box = Box<SendFilesBox>(SendFilesBoxDescriptor{
+		.show = show,
+		.list = std::move(list),
+		.caption = _controls->getTextWithAppliedMarkdown(),
+		.limits = DefaultLimitsForPeer(_data.user),
+		.check = DefaultCheckForPeer(show, _data.user),
+		.sendType = Api::SendType::Normal,
+		.sendMenuType = SendMenu::Type::SilentOnly,
+		.stOverride = &st::storiesComposeControls,
+		.confirmed = crl::guard(this, confirmed),
+		.cancelled = _controls->restoreTextCallback(insertTextOnCancel),
+	});
+	if (const auto shown = show->show(std::move(box))) {
+		shown->setCloseByOutsideClick(false);
+	}
+
+	return true;
+}
+
+void ReplyArea::sendingFilesConfirmed(
+		Ui::PreparedList &&list,
+		Ui::SendFilesWay way,
+		TextWithTags &&caption,
+		Api::SendOptions options,
+		bool ctrlShiftEnter) {
+	Expects(list.filesToProcess.empty());
+
+	if (showSendingFilesError(list, way.sendImagesAsPhotos())) {
+		return;
+	}
+	auto groups = DivideByGroups(
+		std::move(list),
+		way,
+		_data.user->slowmodeApplied());
+	const auto type = way.sendImagesAsPhotos()
+		? SendMediaType::Photo
+		: SendMediaType::File;
+	auto action = prepareSendAction(options);
+	action.clearDraft = false;
+	if ((groups.size() != 1 || !groups.front().sentWithCaption())
+		&& !caption.text.isEmpty()) {
+		auto message = Api::MessageToSend(action);
+		message.textWithTags = base::take(caption);
+		session().api().sendMessage(std::move(message));
+	}
+	for (auto &group : groups) {
+		const auto album = (group.type != Ui::AlbumType::None)
+			? std::make_shared<SendingAlbum>()
+			: nullptr;
+		session().api().sendFiles(
+			std::move(group.list),
+			type,
+			base::take(caption),
+			album,
+			action);
+	}
+	finishSending();
+}
+
+bool ReplyArea::confirmSendingFiles(
+		QImage &&image,
+		QByteArray &&content,
+		std::optional<bool> overrideSendImagesAsPhotos,
+		const QString &insertTextOnCancel) {
+	if (image.isNull()) {
+		return false;
+	}
+
+	auto list = Storage::PrepareMediaFromImage(
+		std::move(image),
+		std::move(content),
+		st::sendMediaPreviewSize);
+	list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+	return confirmSendingFiles(std::move(list), insertTextOnCancel);
 }
 
 void ReplyArea::initActions() {
@@ -180,6 +455,7 @@ void ReplyArea::show(ReplyAreaData data) {
 		}
 		return;
 	}
+	invalidate_weak_ptrs(&_shownUserGuard);
 	const auto user = data.user;
 	const auto history = user ? user->owner().history(user).get() : nullptr;
 	_controls->setHistory({
@@ -188,6 +464,12 @@ void ReplyArea::show(ReplyAreaData data) {
 	_controls->clear();
 }
 
+Main::Session &ReplyArea::session() const {
+	Expects(_data.user != nullptr);
+
+	return _data.user->session();
+}
+
 rpl::producer<bool> ReplyArea::focusedValue() const {
 	return _controls->focusedValue();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 9587e2e07..c7ea6f88c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -9,7 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/weak_ptr.h"
 
+enum class SendMediaType;
+
 namespace Api {
+struct SendAction;
 struct SendOptions;
 } // namespace Api
 
@@ -21,6 +24,15 @@ namespace HistoryView::Controls {
 struct VoiceToSend;
 } // namespace HistoryView::Controls
 
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+struct PreparedList;
+class SendFilesWay;
+} // namespace Ui
+
 namespace Media::Stories {
 
 class Controller;
@@ -45,9 +57,44 @@ public:
 private:
 	using VoiceToSend = HistoryView::Controls::VoiceToSend;
 
+	[[nodiscard]] Main::Session &session() const;
+
+	bool confirmSendingFiles(const QStringList &files);
+	bool confirmSendingFiles(not_null<const QMimeData*> data);
+
+	void uploadFile(const QByteArray &fileContent, SendMediaType type);
+	bool confirmSendingFiles(
+		QImage &&image,
+		QByteArray &&content,
+		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
+		const QString &insertTextOnCancel = QString());
+	bool confirmSendingFiles(
+		const QStringList &files,
+		const QString &insertTextOnCancel);
+	bool confirmSendingFiles(
+		Ui::PreparedList &&list,
+		const QString &insertTextOnCancel = QString());
+	bool confirmSendingFiles(
+		not_null<const QMimeData*> data,
+		std::optional<bool> overrideSendImagesAsPhotos,
+		const QString &insertTextOnCancel = QString());
+	bool showSendingFilesError(const Ui::PreparedList &list) const;
+	bool showSendingFilesError(
+		const Ui::PreparedList &list,
+		std::optional<bool> compress) const;
+	void sendingFilesConfirmed(
+		Ui::PreparedList &&list,
+		Ui::SendFilesWay way,
+		TextWithTags &&caption,
+		Api::SendOptions options,
+		bool ctrlShiftEnter);
+	void finishSending();
+
 	void initGeometry();
 	void initActions();
 
+	[[nodiscard]] Api::SendAction prepareSendAction(
+		Api::SendOptions options) const;
 	void send(Api::SendOptions options);
 	void sendVoice(VoiceToSend &&data);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
@@ -58,6 +105,7 @@ private:
 	const std::unique_ptr<HistoryView::ComposeControls> _controls;
 
 	ReplyAreaData _data;
+	base::has_weak_ptr _shownUserGuard;
 	bool _choosingAttach = false;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index c97645659..c822bcf0d 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -467,6 +467,9 @@ storiesRemoveSet: IconButton(stickerPanRemoveSet) {
 	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};
 	ripple: storiesComposeRippleLight;
 }
+storiesMenuSeparator: MenuSeparator(defaultMenuSeparator) {
+	fg: groupCallMenuBgOver;
+}
 storiesMenu: Menu(defaultMenu) {
 	itemBg: groupCallMenuBg;
 	itemBgOver: groupCallMenuBgOver;
@@ -477,9 +480,7 @@ storiesMenu: Menu(defaultMenu) {
 	itemFgShortcutOver: groupCallMemberNotJoinedStatus;
 	itemFgShortcutDisabled: groupCallMemberNotJoinedStatus;
 
-	separator: MenuSeparator(defaultMenuSeparator) {
-		fg: groupCallMenuBgOver;
-	}
+	separator: storiesMenuSeparator;
 	arrow: icon {{ "menu/submenu_arrow", groupCallMemberNotJoinedStatus }};
 
 	ripple: RippleAnimation(defaultRippleAnimation) {
@@ -507,6 +508,23 @@ storiesPopupMenuWithIcons: PopupMenu(storiesPopupMenu) {
 	menu: storiesMenuWithIcons;
 }
 
+storiesAttachEmojiInner: IconButton(storiesAttach) {
+	icon: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
+	iconOver: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
+}
+storiesAttachEmoji: EmojiButton(historyAttachEmoji) {
+	inner: storiesAttachEmojiInner;
+	bg: storiesComposeBg;
+	lineFg: storiesComposeGrayIcon;
+	lineFgOver: storiesComposeGrayIcon;
+}
+storiesComposePremium: PremiumLimits(defaultPremiumLimits) {
+	boxLabel: FlatLabel(boxLabel) {
+		textFg: groupCallMembersFg;
+	}
+	nonPremiumBg: storiesComposeBgOver;
+	nonPremiumFg: storiesComposeWhiteText;
+}
 storiesComposeControls: ComposeControls(defaultComposeControls) {
 	bg: storiesComposeBg;
 	radius: storiesRadius;
@@ -528,15 +546,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		sendDisabledFg: storiesComposeGrayText;
 	}
 	attach: storiesAttach;
-	emoji: EmojiButton(historyAttachEmoji) {
-		inner: IconButton(storiesAttach) {
-			icon: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
-			iconOver: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
-		}
-		bg: storiesComposeBg;
-		lineFg: storiesComposeGrayIcon;
-		lineFgOver: storiesComposeGrayIcon;
-	}
+	emoji: storiesAttachEmoji;
 	suggestions: EmojiSuggestions(defaultEmojiSuggestions) {
 		dropdown: InnerDropdown(emojiSuggestionsDropdown) {
 			animation: PanelAnimation(defaultPanelAnimation) {
@@ -569,6 +579,10 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
 		fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
 		menu: storiesPopupMenuWithIcons;
+		expandedSeparator: MenuSeparator(storiesMenuSeparator) {
+			padding: margins(0px, 4px, 0px, 4px);
+			width: 6px;
+		}
 		tabs: SettingsSlider(emojiTabs) {
 			barFgActive: storiesComposeBlue;
 			labelFg: storiesComposeGrayText;
@@ -638,6 +652,8 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 			menuMute: icon {{ "menu/mute", storiesComposeWhiteText }};
 			menuSchedule: icon {{ "menu/calendar", storiesComposeWhiteText }};
 			menuWhenOnline: icon {{ "menu/send_when_online", storiesComposeWhiteText }};
+			menuSpoiler: icon {{ "menu/spoiler_on", storiesComposeWhiteText }};
+			menuSpoilerOff: icon {{ "menu/spoiler_off", storiesComposeWhiteText }};
 		}
 		autocompleteBottomSkip: 10px;
 	}
@@ -664,4 +680,51 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 			iconPosition: point(10px, 11px);
 		}
 	}
+	files: ComposeFiles(defaultComposeFiles) {
+		check: Check(defaultCheck) {
+			untoggledFg: groupCallMemberNotJoinedStatus;
+			toggledFg: groupCallActiveFg;
+			icon: icon {{ "default_checkbox_check", groupCallMembersFg, point(4px, 7px) }};
+		}
+		checkbox: Checkbox(defaultBoxCheckbox) {
+			textFg: groupCallMembersFg;
+			textFgActive: groupCallMembersFg;
+			rippleBg: groupCallMembersBgRipple;
+			rippleBgActive: groupCallMembersBgRipple;
+		}
+		menu: IconButton(defaultComposeFilesMenu) {
+			icon: icon {{ "title_menu_dots", storiesComposeGrayIcon }};
+			iconOver: icon {{ "title_menu_dots", storiesComposeGrayIcon }};
+			ripple: storiesComposeRippleLight;
+		}
+		caption: InputField(defaultComposeFilesField) {
+			textFg: storiesComposeWhiteText;
+			textBg: storiesComposeBg;
+			placeholderFg: storiesComposeGrayText;
+			placeholderFgActive: storiesComposeBlue;
+			borderFg: storiesComposeGrayText;
+			borderFgActive: storiesComposeBlue;
+			menu: storiesPopupMenu;
+		}
+		emoji: EmojiButton(storiesAttachEmoji) {
+			inner: IconButton(storiesAttachEmojiInner) {
+				width: 30px;
+				height: 30px;
+				rippleAreaSize: 0px;
+			}
+		}
+		confirmBg: storiesComposeBgOver;
+		buttonFile: IconButton(sendBoxAlbumGroupButtonFile) {
+			ripple: storiesComposeRipple;
+		}
+		buttonFileEdit: icon {{ "send_media/send_media_replace", storiesComposeGrayIcon }};
+		buttonFileDelete: icon {{ "send_media/send_media_delete", storiesComposeGrayIcon }};
+		iconBg: storiesComposeBlue;
+		iconPlay: icon {{ "history_file_play", storiesComposeWhiteText }};
+		iconImage: icon {{ "history_file_image", storiesComposeWhiteText }};
+		iconDocument: icon {{ "history_file_document", storiesComposeWhiteText }};
+		nameFg: storiesComposeWhiteText;
+		statusFg: storiesComposeGrayText;
+	}
+	premium: storiesComposePremium;
 }
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index cd34868a0..01326c842 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -287,6 +287,87 @@ struct OverlayWidget::PipWrap {
 	rpl::lifetime lifetime;
 };
 
+class OverlayWidget::Show final : public ChatHelpers::Show {
+public:
+	explicit Show(not_null<OverlayWidget*> widget) : _widget(widget) {
+	}
+
+	void activate() override {
+		if (!_widget->isHidden()) {
+			_widget->activate();
+		}
+	}
+
+	void showOrHideBoxOrLayer(
+			std::variant<
+				v::null_t,
+				object_ptr<Ui::BoxContent>,
+				std::unique_ptr<Ui::LayerWidget>> &&layer,
+			Ui::LayerOptions options,
+			anim::type animated) const override {
+		_widget->_layerBg->uiShow()->showOrHideBoxOrLayer(
+			std::move(layer),
+			options,
+			anim::type::normal);
+	}
+	not_null<QWidget*> toastParent() const override {
+		return _widget->_body;
+	}
+	bool valid() const override {
+		return _widget->_storiesSession != nullptr;
+	}
+	operator bool() const override {
+		return valid();
+	}
+
+	Main::Session &session() const override {
+		Expects(_widget->_storiesSession != nullptr);
+
+		return *_widget->_storiesSession;
+	}
+	bool paused(ChatHelpers::PauseReason reason) const override {
+		if (_widget->isHidden()
+			|| (!_widget->_fullscreen
+				&& !_widget->_window->isActiveWindow())) {
+			return true;
+		} else if (reason < ChatHelpers::PauseReason::Layer
+			&& _widget->_layerBg->topShownLayer() != nullptr) {
+			return true;
+		}
+		return false;
+	}
+	rpl::producer<> pauseChanged() const override {
+		return rpl::never<>();
+	}
+
+	rpl::producer<bool> adjustShadowLeft() const override {
+		return rpl::single(false);
+	}
+	SendMenu::Type sendMenuType() const override {
+		return SendMenu::Type::SilentOnly;
+	}
+
+	bool showMediaPreview(
+			Data::FileOrigin origin,
+			not_null<DocumentData*> document) const override {
+		return false; // #TODO stories
+	}
+	bool showMediaPreview(
+			Data::FileOrigin origin,
+			not_null<PhotoData*> photo) const override {
+		return false; // #TODO stories
+	}
+
+	void processChosenSticker(
+			ChatHelpers::FileChosen &&chosen) const override {
+		_widget->_storiesStickerOrEmojiChosen.fire(std::move(chosen));
+	}
+
+private:
+	not_null<OverlayWidget*> _widget;
+
+};
+
 OverlayWidget::Streamed::Streamed(
 	not_null<DocumentData*> document,
 	Data::FileOrigin origin,
@@ -3936,81 +4017,10 @@ not_null<Ui::RpWidget*> OverlayWidget::storiesWrap() {
 }
 
 std::shared_ptr<ChatHelpers::Show> OverlayWidget::storiesShow() {
-	class Show final : public ChatHelpers::Show {
-	public:
-		explicit Show(not_null<OverlayWidget*> widget) : _widget(widget) {
-		}
-
-		void showBox(
-			object_ptr<Ui::BoxContent> content,
-			Ui::LayerOptions options
-				= Ui::LayerOption::KeepOther) const override {
-			_widget->_layerBg->showBox(
-				std::move(content),
-				options,
-				anim::type::normal);
-		}
-		void hideLayer() const override {
-			_widget->_layerBg->hideAll(anim::type::normal);
-		}
-		not_null<QWidget*> toastParent() const override {
-			return _widget->_body;
-		}
-		bool valid() const override {
-			return _widget->_storiesSession != nullptr;
-		}
-		operator bool() const override {
-			return valid();
-		}
-
-		Main::Session &session() const override {
-			Expects(_widget->_storiesSession != nullptr);
-
-			return *_widget->_storiesSession;
-		}
-		bool paused(ChatHelpers::PauseReason reason) const override {
-			if (_widget->isHidden()
-				|| (!_widget->_fullscreen
-					&& !_widget->_window->isActiveWindow())) {
-				return true;
-			} else if (reason < ChatHelpers::PauseReason::Layer
-				&& _widget->_layerBg->topShownLayer() != nullptr) {
-				return true;
-			}
-			return false;
-		}
-		rpl::producer<> pauseChanged() const override {
-			return rpl::never<>();
-		}
-
-		rpl::producer<bool> adjustShadowLeft() const override {
-			return rpl::single(false);
-		}
-		SendMenu::Type sendMenuType() const override {
-			return SendMenu::Type::SilentOnly;
-		}
-
-		bool showMediaPreview(
-				Data::FileOrigin origin,
-				not_null<DocumentData*> document) const override {
-			return false; // #TODO stories
-		}
-		bool showMediaPreview(
-				Data::FileOrigin origin,
-				not_null<PhotoData*> photo) const override {
-			return false; // #TODO stories
-		}
-
-		void processChosenSticker(
-				ChatHelpers::FileChosen &&chosen) const override {
-			_widget->_storiesStickerOrEmojiChosen.fire(std::move(chosen));
-		}
-
-	private:
-		not_null<OverlayWidget*> _widget;
-
-	};
-	return std::make_shared<Show>(this);
+	if (!_cachedShow) {
+		_cachedShow = std::make_shared<Show>(this);
+	}
+	return _cachedShow;
 }
 
 auto OverlayWidget::storiesStickerOrEmojiChosen()
@@ -5753,6 +5763,7 @@ void OverlayWidget::clearBeforeHide() {
 	_collageData = std::nullopt;
 	clearStreaming();
 	setStoriesUser(nullptr);
+	_layerBg->hideAll(anim::type::instant);
 	assignMediaPointer(nullptr);
 	_preloadPhotos.clear();
 	_preloadDocuments.clear();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 6007e9fab..43551bf41 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -131,6 +131,7 @@ public:
 	rpl::lifetime &lifetime();
 
 private:
+	class Show;
 	struct Streamed;
 	struct PipWrap;
 	class Renderer;
@@ -600,6 +601,7 @@ private:
 	bool _showAsPip = false;
 
 	std::unique_ptr<Stories::View> _stories;
+	std::shared_ptr<Show> _cachedShow;
 	rpl::event_stream<> _storiesChanged;
 	Main::Session *_storiesSession = nullptr;
 	rpl::event_stream<ChatHelpers::FileChosen> _storiesStickerOrEmojiChosen;
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 2c3f2eecf..055b1296e 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1782,6 +1782,11 @@ QString LookupPremiumRef(PremiumPreview section) {
 
 not_null<Ui::GradientButton*> CreateSubscribeButton(
 		SubscribeButtonArgs &&args) {
+	Expects(args.show || args.controller);
+
+	if (!args.show && args.controller) {
+		args.show = args.controller->uiShow();
+	}
 	const auto result = Ui::CreateChild<Ui::GradientButton>(
 		args.parent.get(),
 		args.gradientStops
@@ -1789,9 +1794,14 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 			: Ui::Premium::ButtonGradientStops());
 
 	result->setClickedCallback([
-			controller = args.controller,
+			show = args.show,
 			computeRef = args.computeRef,
 			computeBotUrl = args.computeBotUrl] {
+		const auto window = show->resolveWindow(
+			ChatHelpers::WindowUsage::PremiumPromo);
+		if (!window) {
+			return;
+		}
 		const auto url = computeBotUrl ? computeBotUrl() : QString();
 		if (!url.isEmpty()) {
 			const auto local = Core::TryConvertUrlToLocal(url);
@@ -1801,12 +1811,12 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 			UrlClickHandler::Open(
 				local,
 				QVariant::fromValue(ClickHandlerContext{
-					.sessionWindow = base::make_weak(controller),
+					.sessionWindow = base::make_weak(window),
 					.botStartAutoSubmit = true,
 				}));
 		} else {
-			SendScreenAccept(controller);
-			StartPremiumPayment(controller, computeRef());
+			SendScreenAccept(window);
+			StartPremiumPayment(window, computeRef());
 		}
 	});
 
diff --git a/Telegram/SourceFiles/settings/settings_premium.h b/Telegram/SourceFiles/settings/settings_premium.h
index 2ce4aba67..0ad7b036c 100644
--- a/Telegram/SourceFiles/settings/settings_premium.h
+++ b/Telegram/SourceFiles/settings/settings_premium.h
@@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 enum class PremiumPreview;
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 class RpWidget;
 class GradientButton;
@@ -48,12 +52,13 @@ void StartPremiumPayment(
 [[nodiscard]] QString LookupPremiumRef(PremiumPreview section);
 
 struct SubscribeButtonArgs final {
-	not_null<Window::SessionController*> controller;
+	Window::SessionController *controller = nullptr;
 	not_null<Ui::RpWidget*> parent;
 	Fn<QString()> computeRef;
 	std::optional<rpl::producer<QString>> text;
 	std::optional<QGradientStops> gradientStops;
 	Fn<QString()> computeBotUrl; // nullable
+	std::shared_ptr<ChatHelpers::Show> show;
 };
 
 [[nodiscard]] not_null<Ui::GradientButton*> CreateSubscribeButton(
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 1e9d03bdb..1386b2a74 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -1101,7 +1101,7 @@ void FileLoadTask::finish() {
 	} else if (_result->filesize > kFileSizePremiumLimit
 		|| (_result->filesize > kFileSizeLimit && !premium)) {
 		Ui::show(
-			Box(FileSizeLimitBox, session, _result->filesize),
+			Box(FileSizeLimitBox, session, _result->filesize, nullptr),
 			Ui::LayerOption::KeepOther);
 		removeFromAlbum();
 	} else {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
index 60cc5ae68..1b7a81beb 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
@@ -20,14 +20,16 @@ namespace Ui {
 
 AbstractSingleFilePreview::AbstractSingleFilePreview(
 	QWidget *parent,
+	const style::ComposeControls &st,
 	AttachControls::Type type)
 : AbstractSinglePreview(parent)
+, _st(st)
 , _type(type)
-, _editMedia(this, st::sendBoxAlbumGroupButtonFile)
-, _deleteMedia(this, st::sendBoxAlbumGroupButtonFile) {
+, _editMedia(this, _st.files.buttonFile)
+, _deleteMedia(this, _st.files.buttonFile) {
 
-	_editMedia->setIconOverride(&st::sendBoxAlbumGroupEditButtonIconFile);
-	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
+	_editMedia->setIconOverride(&_st.files.buttonFileEdit);
+	_deleteMedia->setIconOverride(&_st.files.buttonFileDelete);
 
 	if (type == AttachControls::Type::Full) {
 		_deleteMedia->show();
@@ -100,18 +102,17 @@ void AbstractSingleFilePreview::paintEvent(QPaintEvent *e) {
 		if (_data.fileIsAudio && !_data.fileThumb.isNull()) {
 			p.drawPixmap(inner.topLeft(), _data.fileThumb);
 		} else {
-			p.setBrush(st::msgFileInBg);
+			p.setBrush(_st.files.iconBg);
 			PainterHighQualityEnabler hq(p);
 			p.drawEllipse(inner);
 		}
-
 		auto &icon = _data.fileIsAudio
 			? (_data.fileThumb.isNull()
-				? st::historyFileInPlay
+				? _st.files.iconPlay
 				: st::historyFileThumbPlay)
 			: _data.fileIsImage
-			? st::historyFileInImage
-			: st::historyFileInDocument;
+			? _st.files.iconImage
+			: _st.files.iconDocument;
 		icon.paintInCenter(p, inner);
 	} else {
 		QRect rthumb(
@@ -119,7 +120,7 @@ void AbstractSingleFilePreview::paintEvent(QPaintEvent *e) {
 		p.drawPixmap(rthumb.topLeft(), _data.fileThumb);
 	}
 	p.setFont(st::semiboldFont);
-	p.setPen(st::historyFileNameInFg);
+	p.setPen(_st.files.nameFg);
 	p.drawTextLeft(
 		x + nameleft,
 		y + nametop, width(),
@@ -127,7 +128,7 @@ void AbstractSingleFilePreview::paintEvent(QPaintEvent *e) {
 		_data.nameWidth);
 
 	p.setFont(st::normalFont);
-	p.setPen(st::mediaInFg);
+	p.setPen(_st.files.statusFg);
 	p.drawTextLeft(
 		x + nameleft,
 		y + statustop,
@@ -167,7 +168,7 @@ void AbstractSingleFilePreview::updateTextWidthFor(Data &data) {
 		- st.thumbSize
 		- st.thumbSkip
 		// Right buttons.
-		- st::sendBoxAlbumGroupButtonFile.width * buttonsCount
+		- _st.files.buttonFile.width * buttonsCount
 		- st::sendBoxAlbumGroupEditInternalSkip * buttonsCount
 		- st::sendBoxAlbumGroupSkipRight;
 	data.nameWidth = st::semiboldFont->width(data.name);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h
index cbb0ae30a..f14992142 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h
@@ -11,13 +11,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_controls.h"
 #include "base/object_ptr.h"
 
+namespace style {
+struct ComposeControls;
+} // namespace style
+
 namespace Ui {
 
 class IconButton;
 
 class AbstractSingleFilePreview : public AbstractSinglePreview {
 public:
-	AbstractSingleFilePreview(QWidget *parent, AttachControls::Type type);
+	AbstractSingleFilePreview(
+		QWidget *parent,
+		const style::ComposeControls &st,
+		AttachControls::Type type);
 	~AbstractSingleFilePreview();
 
 	[[nodiscard]] rpl::producer<> deleteRequests() const override;
@@ -46,6 +53,7 @@ private:
 
 	void updateTextWidthFor(Data &data);
 
+	const style::ComposeControls &_st;
 	const AttachControls::Type _type;
 
 	Data _data;
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 59790b5d6..29f38cdde 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
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 
@@ -30,8 +31,10 @@ constexpr auto kMinPreviewWidth = 20;
 
 AbstractSingleMediaPreview::AbstractSingleMediaPreview(
 	QWidget *parent,
+	const style::ComposeControls &st,
 	AttachControls::Type type)
 : AbstractSinglePreview(parent)
+, _st(st)
 , _minThumbH(st::sendBoxAlbumGroupSize.height()
 	+ st::sendBoxAlbumGroupSkipTop * 2)
 , _controls(base::make_unique_q<AttachControlsWidget>(this, type)) {
@@ -173,7 +176,7 @@ void AbstractSingleMediaPreview::paintEvent(QPaintEvent *e) {
 				_previewTop,
 				_previewLeft - padding.left(),
 				_previewHeight,
-				st::confirmBg);
+				_st.files.confirmBg);
 		}
 		if ((_previewLeft + _previewWidth) < (width() - padding.right())) {
 			p.fillRect(
@@ -181,7 +184,7 @@ void AbstractSingleMediaPreview::paintEvent(QPaintEvent *e) {
 				_previewTop,
 				width() - padding.right() - _previewLeft - _previewWidth,
 				_previewHeight,
-				st::confirmBg);
+				_st.files.confirmBg);
 		}
 		if (_previewTop > 0) {
 			p.fillRect(
@@ -189,7 +192,7 @@ void AbstractSingleMediaPreview::paintEvent(QPaintEvent *e) {
 				0,
 				width() - padding.right() - padding.left(),
 				height(),
-				st::confirmBg);
+				_st.files.confirmBg);
 		}
 	}
 
@@ -264,14 +267,15 @@ void AbstractSingleMediaPreview::showContextMenu(QPoint position) {
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
-		st::popupMenuWithIcons);
+		_st.tabbed.menu);
 
+	const auto &icons = _st.tabbed.icons;
 	const auto spoilered = hasSpoiler();
 	_menu->addAction(spoilered
 		? tr::lng_context_disable_spoiler(tr::now)
 		: tr::lng_context_spoiler_effect(tr::now), [=] {
 		setSpoiler(!spoilered);
-	}, spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
+	}, spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
 
 	if (_menu->empty()) {
 		_menu = nullptr;
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 ef85bf0d2..3bacc6e6d 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
@@ -12,13 +12,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/abstract_button.h"
 
+namespace style {
+struct ComposeControls;
+} // namespace style
+
 namespace Ui {
 
 class PopupMenu;
 
 class AbstractSingleMediaPreview : public AbstractSinglePreview {
 public:
-	AbstractSingleMediaPreview(QWidget *parent, AttachControls::Type type);
+	AbstractSingleMediaPreview(
+		QWidget *parent,
+		const style::ComposeControls &st,
+		AttachControls::Type type);
 	~AbstractSingleMediaPreview();
 
 	void setSendWay(SendFilesWay way);
@@ -60,6 +67,7 @@ private:
 	void applyCursor(style::cursor cursor);
 	void showContextMenu(QPoint position);
 
+	const style::ComposeControls &_st;
 	SendFilesWay _sendWay;
 	bool _animated = false;
 	QPixmap _preview;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index 24e46d3d8..d33681b9f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -28,9 +28,11 @@ constexpr auto kDragDuration = crl::time(200);
 
 AlbumPreview::AlbumPreview(
 	QWidget *parent,
+	const style::ComposeControls &st,
 	gsl::span<Ui::PreparedFile> items,
 	SendFilesWay way)
 : RpWidget(parent)
+, _st(st)
 , _sendWay(way)
 , _dragTimer([=] { switchToDrag(); }) {
 	setMouseTracking(true);
@@ -135,6 +137,7 @@ void AlbumPreview::prepareThumbs(gsl::span<Ui::PreparedFile> items) {
 	_thumbs.reserve(count);
 	for (auto i = 0; i != count; ++i) {
 		_thumbs.push_back(std::make_unique<AlbumThumbnail>(
+			_st,
 			items[i],
 			layout[i],
 			this,
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
index ccb64970e..7811910da 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
@@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_send_files_way.h"
 #include "base/timer.h"
 
+namespace style {
+struct ComposeControls;
+} // namespace style
+
 namespace Ui {
 
 struct PreparedFile;
@@ -22,6 +26,7 @@ class AlbumPreview final : public RpWidget {
 public:
 	AlbumPreview(
 		QWidget *parent,
+		const style::ComposeControls &st,
 		gsl::span<Ui::PreparedFile> items,
 		SendFilesWay way);
 	~AlbumPreview();
@@ -86,6 +91,7 @@ private:
 
 	void showContextMenu(not_null<AlbumThumbnail*> thumb, QPoint position);
 
+	const style::ComposeControls &_st;
 	SendFilesWay _sendWay;
 	style::cursor _cursor = style::cur_default;
 	std::vector<int> _order;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 2e71553ab..2f847c7c0 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -26,13 +26,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 
 AlbumThumbnail::AlbumThumbnail(
+	const style::ComposeControls &st,
 	const PreparedFile &file,
 	const GroupMediaLayout &layout,
 	QWidget *parent,
 	Fn<void()> repaint,
 	Fn<void()> editCallback,
 	Fn<void()> deleteCallback)
-: _layout(layout)
+: _st(st)
+, _layout(layout)
 , _fullPreview(file.preview)
 , _shrinkSize(int(std::ceil(st::roundRadiusLarge / 1.4)))
 , _isPhoto(file.type == PreparedFile::Type::Photo)
@@ -60,8 +62,8 @@ AlbumThumbnail::AlbumThumbnail(
 			.outer = { imageWidth, imageHeight },
 		}));
 
-	const auto &st = st::attachPreviewThumbLayout;
-	const auto idealSize = st.thumbSize * style::DevicePixelRatio();
+	const auto &layoutSt = st::attachPreviewThumbLayout;
+	const auto idealSize = layoutSt.thumbSize * style::DevicePixelRatio();
 	const auto fileThumbSize = (previewWidth > previewHeight)
 		? QSize(previewWidth * idealSize / previewHeight, idealSize)
 		: QSize(idealSize, previewHeight * idealSize / previewWidth);
@@ -70,12 +72,12 @@ AlbumThumbnail::AlbumThumbnail(
 		fileThumbSize,
 		{
 			.options = Option::RoundSmall,
-			.outer = { st.thumbSize, st.thumbSize },
+			.outer = { layoutSt.thumbSize, layoutSt.thumbSize },
 		}));
 
 	const auto availableFileWidth = st::sendMediaPreviewSize
-		- st.thumbSize
-		- st.thumbSkip
+		- layoutSt.thumbSize
+		- layoutSt.thumbSkip
 		// Right buttons.
 		- st::sendBoxAlbumGroupButtonFile.width * 2
 		- st::sendBoxAlbumGroupEditInternalSkip * 2
@@ -99,8 +101,8 @@ AlbumThumbnail::AlbumThumbnail(
 	}
 	_statusWidth = st::normalFont->width(_status);
 
-	_editMedia.create(parent, st::sendBoxAlbumGroupButtonFile);
-	_deleteMedia.create(parent, st::sendBoxAlbumGroupButtonFile);
+	_editMedia.create(parent, _st.files.buttonFile);
+	_deleteMedia.create(parent, _st.files.buttonFile);
 
 	const auto duration = st::historyAttach.ripple.hideDuration;
 	_editMedia->setClickedCallback([=] {
@@ -108,8 +110,8 @@ AlbumThumbnail::AlbumThumbnail(
 	});
 	_deleteMedia->setClickedCallback(deleteCallback);
 
-	_editMedia->setIconOverride(&st::sendBoxAlbumGroupEditButtonIconFile);
-	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
+	_editMedia->setIconOverride(&_st.files.buttonFileEdit);
+	_deleteMedia->setIconOverride(&_st.files.buttonFileDelete);
 
 	setSpoiler(file.spoiler);
 	setButtonVisible(false);
@@ -482,7 +484,7 @@ void AlbumThumbnail::paintFile(
 
 	p.drawPixmap(left, top, _fileThumb);
 	p.setFont(st::semiboldFont);
-	p.setPen(st::historyFileNameInFg);
+	p.setPen(_st.files.nameFg);
 	p.drawTextLeft(
 		textLeft,
 		top + st.nameTop,
@@ -490,7 +492,7 @@ void AlbumThumbnail::paintFile(
 		_name,
 		_nameWidth);
 	p.setFont(st::normalFont);
-	p.setPen(st::mediaInFg);
+	p.setPen(_st.files.statusFg);
 	p.drawTextLeft(
 		textLeft,
 		top + st.statusTop,
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
index d85bd9c32..c3ffac584 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
@@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/round_rect.h"
 #include "base/object_ptr.h"
 
+namespace style {
+struct ComposeControls;
+} // namespace style
+
 namespace Ui {
 
 struct PreparedFile;
@@ -23,6 +27,7 @@ class SpoilerAnimation;
 class AlbumThumbnail final {
 public:
 	AlbumThumbnail(
+		const style::ComposeControls &st,
 		const PreparedFile &file,
 		const GroupMediaLayout &layout,
 		QWidget *parent,
@@ -78,6 +83,7 @@ private:
 		float64 shrinkProgress);
 	void paintPlayVideo(QPainter &p, QRect geometry);
 
+	const style::ComposeControls &_st;
 	GroupMediaLayout _layout;
 	std::optional<QRect> _animateFromGeometry;
 	const QImage _fullPreview;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
index addfc3a9a..7ad686350 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/chat/attach/attach_controls.h"
 
-#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Ui {
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
index 7973f0589..1c235c96b 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
@@ -37,9 +37,10 @@ AttachControls::Type CheckControlsType(
 
 ItemSingleFilePreview::ItemSingleFilePreview(
 	QWidget *parent,
+	const style::ComposeControls &st,
 	not_null<HistoryItem*> item,
 	AttachControls::Type type)
-: AbstractSingleFilePreview(parent, CheckControlsType(item, type)) {
+: AbstractSingleFilePreview(parent, st, CheckControlsType(item, type)) {
 	const auto media = item->media();
 	Assert(media != nullptr);
 	const auto document = media->document();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.h
index 8a25457fd..3e8baafcd 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.h
@@ -25,6 +25,7 @@ class ItemSingleFilePreview final : public AbstractSingleFilePreview {
 public:
 	ItemSingleFilePreview(
 		QWidget *parent,
+		const style::ComposeControls &st,
 		not_null<HistoryItem*> item,
 		AttachControls::Type type);
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
index a04d75e4c..eb06d363b 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
@@ -32,10 +32,11 @@ using namespace ::Media::Streaming;
 
 ItemSingleMediaPreview::ItemSingleMediaPreview(
 	QWidget *parent,
+	const style::ComposeControls &st,
 	Fn<bool()> gifPaused,
 	not_null<HistoryItem*> item,
 	AttachControls::Type type)
-: AbstractSingleMediaPreview(parent, type)
+: AbstractSingleMediaPreview(parent, st, type)
 , _gifPaused(std::move(gifPaused))
 , _fullId(item->fullId()) {
 	const auto media = item->media();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h
index 07b93b73b..69c6604a4 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h
@@ -32,6 +32,7 @@ class ItemSingleMediaPreview final : public AbstractSingleMediaPreview {
 public:
 	ItemSingleMediaPreview(
 		QWidget *parent,
+		const style::ComposeControls &st,
 		Fn<bool()> gifPaused,
 		not_null<HistoryItem*> item,
 		AttachControls::Type type);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
index afce50d72..4c50ee2dd 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -19,9 +19,10 @@ namespace Ui {
 
 SingleFilePreview::SingleFilePreview(
 	QWidget *parent,
+	const style::ComposeControls &st,
 	const PreparedFile &file,
 	AttachControls::Type type)
-: AbstractSingleFilePreview(parent, type) {
+: AbstractSingleFilePreview(parent, st, type) {
 	preparePreview(file);
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
index f1b3b94ec..24647c917 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
@@ -17,6 +17,7 @@ class SingleFilePreview final : public AbstractSingleFilePreview {
 public:
 	SingleFilePreview(
 		QWidget *parent,
+		const style::ComposeControls &st,
 		const PreparedFile &file,
 		AttachControls::Type type = AttachControls::Type::Full);
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index 41ee35c87..ed250540c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -16,6 +16,7 @@ namespace Ui {
 
 SingleMediaPreview *SingleMediaPreview::Create(
 		QWidget *parent,
+		const style::ComposeControls &st,
 		Fn<bool()> gifPaused,
 		const PreparedFile &file,
 		AttachControls::Type type) {
@@ -43,6 +44,7 @@ SingleMediaPreview *SingleMediaPreview::Create(
 	}
 	return CreateChild<SingleMediaPreview>(
 		parent,
+		st,
 		std::move(gifPaused),
 		preview,
 		animated,
@@ -54,6 +56,7 @@ SingleMediaPreview *SingleMediaPreview::Create(
 
 SingleMediaPreview::SingleMediaPreview(
 	QWidget *parent,
+	const style::ComposeControls &st,
 	Fn<bool()> gifPaused,
 	QImage preview,
 	bool animated,
@@ -61,7 +64,7 @@ SingleMediaPreview::SingleMediaPreview(
 	bool spoiler,
 	const QString &animatedPreviewPath,
 	AttachControls::Type type)
-: AbstractSingleMediaPreview(parent, type)
+: AbstractSingleMediaPreview(parent, st, type)
 , _gifPaused(std::move(gifPaused))
 , _sticker(sticker) {
 	Expects(!preview.isNull());
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
index 546de452d..ac5d4f84f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
@@ -22,12 +22,14 @@ class SingleMediaPreview final : public AbstractSingleMediaPreview {
 public:
 	static SingleMediaPreview *Create(
 		QWidget *parent,
+		const style::ComposeControls &st,
 		Fn<bool()> gifPaused,
 		const PreparedFile &file,
 		AttachControls::Type type = AttachControls::Type::Full);
 
 	SingleMediaPreview(
 		QWidget *parent,
+		const style::ComposeControls &st,
 		Fn<bool()> gifPaused,
 		QImage preview,
 		bool animated,
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index 557f5ec81..2deb51c8d 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -7,7 +7,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 using "ui/basic.style";
 using "ui/widgets/widgets.style";
-using "settings/settings.style";
+using "ui/layers/layers.style";
+
+PremiumLimits {
+	boxLabel: FlatLabel;
+	nonPremiumBg: color;
+	nonPremiumFg: color;
+}
+
+defaultPremiumBoxLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 220px;
+	align: align(topleft);
+	style: TextStyle(boxTextStyle) {
+		lineHeight: 22px;
+	}
+}
+defaultPremiumLimits: PremiumLimits {
+	boxLabel: defaultPremiumBoxLabel;
+	nonPremiumBg: windowBgOver;
+	nonPremiumFg: windowFg;
+}
 
 // Preview.
 premiumPreviewBox: Box(defaultBox) {
@@ -144,8 +163,10 @@ premiumGiftUserpicPadding: margins(10px, 27px, 18px, 13px);
 premiumGiftTitlePadding: margins(18px, 0px, 18px, 0px);
 premiumGiftAboutPadding: margins(18px, 5px, 18px, 23px);
 premiumGiftTermsPadding: margins(18px, 27px, 18px, 0px);
-
-premiumGiftTerms: FlatLabel(settingLocalPasscodeDescription) {
+premiumGiftTerms: FlatLabel(defaultFlatLabel) {
+	minWidth: 256px;
+	align: align(top);
+	textFg: windowSubTextFg;
 	style: TextStyle(defaultTextStyle) {
 		font: font(11px);
 		linkFont: font(11px);
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 29facc90e..2e9972257 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -596,12 +596,14 @@ class Line final : public Ui::RpWidget {
 public:
 	Line(
 		not_null<Ui::RpWidget*> parent,
+		const style::PremiumLimits &st,
 		int max,
 		TextFactory textFactory,
 		int min,
 		float64 ratio);
 	Line(
 		not_null<Ui::RpWidget*> parent,
+		const style::PremiumLimits &st,
 		QString max,
 		QString min,
 		float64 ratio);
@@ -614,6 +616,8 @@ protected:
 private:
 	void recache(const QSize &s);
 
+	const style::PremiumLimits &_st;
+
 	int _leftWidth = 0;
 	int _rightWidth = 0;
 
@@ -631,12 +635,14 @@ private:
 
 Line::Line(
 	not_null<Ui::RpWidget*> parent,
+	const style::PremiumLimits &st,
 	int max,
 	TextFactory textFactory,
 	int min,
 	float64 ratio)
 : Line(
 	parent,
+	st,
 	max ? textFactory(max) : QString(),
 	min ? textFactory(min) : QString(),
 	ratio) {
@@ -644,10 +650,12 @@ Line::Line(
 
 Line::Line(
 	not_null<Ui::RpWidget*> parent,
+	const style::PremiumLimits &st,
 	QString max,
 	QString min,
 	float64 ratio)
 : Ui::RpWidget(parent)
+, _st(st)
 , _leftText(st::semiboldTextStyle, tr::lng_premium_free(tr::now))
 , _rightText(st::semiboldTextStyle, tr::lng_premium(tr::now))
 , _rightLabel(st::semiboldTextStyle, max)
@@ -689,7 +697,7 @@ void Line::paintEvent(QPaintEvent *event) {
 		+ _leftText.maxWidth()
 		+ 3 * textPadding;
 	if (_leftWidth >= leftMinWidth) {
-		p.setPen(st::windowFg);
+		p.setPen(_st.nonPremiumFg);
 		_leftLabel.drawRight(
 			p,
 			textPadding,
@@ -751,7 +759,7 @@ void Line::recache(const QSize &s) {
 		halfRect.setLeft(halfRect.center().x());
 		pathRect.addRect(halfRect);
 
-		p.fillPath(pathRound(_leftWidth) + pathRect, st::windowBgOver);
+		p.fillPath(pathRound(_leftWidth) + pathRect, _st.nonPremiumBg);
 
 		_leftPixmap = std::move(leftPixmap);
 	}
@@ -811,16 +819,18 @@ void AddBubbleRow(
 
 void AddLimitRow(
 		not_null<Ui::VerticalLayout*> parent,
+		const style::PremiumLimits &st,
 		QString max,
 		QString min,
 		float64 ratio) {
 	parent->add(
-		object_ptr<Line>(parent, max, min, ratio),
+		object_ptr<Line>(parent, st, max, min, ratio),
 		st::boxRowPadding);
 }
 
 void AddLimitRow(
 		not_null<Ui::VerticalLayout*> parent,
+		const style::PremiumLimits &st,
 		int max,
 		std::optional<tr::phrase<lngtag_count>> phrase,
 		int min,
@@ -828,6 +838,7 @@ void AddLimitRow(
 	const auto factory = ProcessTextFactory(phrase);
 	AddLimitRow(
 		parent,
+		st,
 		max ? factory(max) : QString(),
 		min ? factory(min) : QString(),
 		ratio);
@@ -1009,6 +1020,7 @@ QGradientStops GiftGradientStops() {
 
 void ShowListBox(
 		not_null<Ui::GenericBox*> box,
+		const style::PremiumLimits &st,
 		std::vector<ListEntry> entries) {
 
 	const auto &stLabel = st::defaultFlatLabel;
@@ -1036,6 +1048,7 @@ void ShowListBox(
 		const auto limitRow = content->add(
 			object_ptr<Line>(
 				content,
+				st,
 				entry.rightNumber,
 				TextFactory([=, text = ProcessTextFactory(std::nullopt)](
 						int n) {
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.h b/Telegram/SourceFiles/ui/effects/premium_graphics.h
index de8fb6cb1..089758d93 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.h
@@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/round_checkbox.h"
 
+namespace style {
+struct PremiumLimits;
+} // namespace style
+
 namespace tr {
 template <typename ...>
 struct phrase;
@@ -48,12 +52,14 @@ void AddBubbleRow(
 
 void AddLimitRow(
 	not_null<Ui::VerticalLayout*> parent,
+	const style::PremiumLimits &st,
 	QString max,
 	QString min = {},
 	float64 ratio = kLimitRowRatio);
 
 void AddLimitRow(
 	not_null<Ui::VerticalLayout*> parent,
+	const style::PremiumLimits &st,
 	int max,
 	std::optional<tr::phrase<lngtag_count>> phrase,
 	int min = 0,
@@ -90,6 +96,7 @@ struct ListEntry final {
 };
 void ShowListBox(
 	not_null<Ui::GenericBox*> box,
+	const style::PremiumLimits &st,
 	std::vector<ListEntry> entries);
 
 void AddGiftOptions(
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 8ec809049..4e2563f79 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -113,6 +113,8 @@ class MainWindowShow final : public ChatHelpers::Show {
 public:
 	explicit MainWindowShow(not_null<SessionController*> controller);
 
+	void activate() override;
+
 	void showOrHideBoxOrLayer(
 		std::variant<
 			v::null_t,
@@ -151,6 +153,12 @@ MainWindowShow::MainWindowShow(not_null<SessionController*> controller)
 : _window(base::make_weak(controller)) {
 }
 
+void MainWindowShow::activate() {
+	if (const auto window = _window.get()) {
+		Window::ActivateWindow(window);
+	}
+}
+
 void MainWindowShow::showOrHideBoxOrLayer(
 		std::variant<
 			v::null_t,
@@ -244,10 +252,7 @@ void MainWindowShow::processChosenSticker(
 } // namespace
 
 void ActivateWindow(not_null<SessionController*> controller) {
-	const auto window = controller->widget();
-	window->raise();
-	window->activateWindow();
-	Ui::ActivateWindowDelayed(window);
+	Ui::ActivateWindow(controller->widget());
 }
 
 bool IsPaused(

From 1d27c8c940795af5a46aa883b9593626a8fca68c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 May 2023 19:59:16 +0400
Subject: [PATCH 247/676] Paint nice stories userpics in chats list.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/data/data_stories.cpp    |   8 +
 Telegram/SourceFiles/data/data_stories.h      |  10 +-
 Telegram/SourceFiles/dialogs/dialogs.style    |  41 +++
 .../dialogs/dialogs_inner_widget.cpp          |  42 ++-
 .../dialogs/dialogs_inner_widget.h            |   9 +
 .../dialogs/ui/dialogs_stories_content.cpp    | 187 ++++++++++++
 .../dialogs/ui/dialogs_stories_content.h      |  21 ++
 .../dialogs/ui/dialogs_stories_list.cpp       | 283 ++++++++++++++++++
 .../dialogs/ui/dialogs_stories_list.h         |  76 +++++
 Telegram/cmake/td_ui.cmake                    |   3 +
 11 files changed, 675 insertions(+), 7 deletions(-)
 create mode 100644 Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
 create mode 100644 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 3ed0b31c8..a32950631 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -591,6 +591,8 @@ PRIVATE
     dialogs/ui/dialogs_layout.h
     dialogs/ui/dialogs_message_view.cpp
     dialogs/ui/dialogs_message_view.h
+    dialogs/ui/dialogs_stories_content.cpp
+    dialogs/ui/dialogs_stories_content.h
     dialogs/ui/dialogs_topics_view.cpp
     dialogs/ui/dialogs_topics_view.h
     dialogs/ui/dialogs_video_userpic.cpp
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 827ec2e18..2fb2f8c28 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -149,6 +149,10 @@ bool Stories::allLoaded() const {
 	return _allLoaded;
 }
 
+rpl::producer<> Stories::allChanged() const {
+	return _allChanged.events();
+}
+
 // #TODO stories testing
 StoryId Stories::generate(
 	not_null<HistoryItem*> item,
@@ -244,10 +248,14 @@ StoryId Stories::generate(
 void Stories::pushToBack(StoriesList &&list) {
 	const auto i = ranges::find(_all, list.user, &StoriesList::user);
 	if (i != end(_all)) {
+		if (*i == list) {
+			return;
+		}
 		*i = std::move(list);
 	} else {
 		_all.push_back(std::move(list));
 	}
+	_allChanged.fire({});
 }
 
 void Stories::pushToFront(StoriesList &&list) {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 373f90b95..ce8ca4d60 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -30,6 +30,7 @@ struct StoryItem {
 	TextWithEntities caption;
 	TimeId date = 0;
 	StoryPrivacy privacy;
+	bool pinned = false;
 
 	friend inline bool operator==(StoryItem, StoryItem) = default;
 };
@@ -37,8 +38,11 @@ struct StoryItem {
 struct StoriesList {
 	not_null<UserData*> user;
 	std::vector<StoryItem> items;
+	StoryId readTill = 0;
 	int total = 0;
 
+	[[nodiscard]] bool unread() const;
+
 	friend inline bool operator==(StoriesList, StoriesList) = default;
 };
 
@@ -61,11 +65,14 @@ public:
 	explicit Stories(not_null<Session*> owner);
 	~Stories();
 
+	[[nodiscard]] Session &owner() const;
+
 	void loadMore();
 	void apply(const MTPDupdateStories &data);
 
 	[[nodiscard]] const std::vector<StoriesList> &all();
 	[[nodiscard]] bool allLoaded() const;
+	[[nodiscard]] rpl::producer<> allChanged() const;
 
 	// #TODO stories testing
 	[[nodiscard]] StoryId generate(
@@ -76,7 +83,7 @@ public:
 			not_null<DocumentData*>> media);
 
 private:
-	[[nodiscard]] StoriesList parse(const MTPUserStories &data);
+	[[nodiscard]] StoriesList parse(const MTPUserStories &stories);
 	[[nodiscard]] std::optional<StoryItem> parse(const MTPDstoryItem &data);
 
 	void pushToBack(StoriesList &&list);
@@ -85,6 +92,7 @@ private:
 	const not_null<Session*> _owner;
 
 	std::vector<StoriesList> _all;
+	rpl::event_stream<> _allChanged;
 	QString _state;
 	bool _allLoaded = false;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index f1ae4dbaa..c520e9de3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -485,3 +485,44 @@ chooseTopicListItem: PeerListItem(defaultPeerListItem) {
 chooseTopicList: PeerList(defaultPeerList) {
 	item: chooseTopicListItem;
 }
+
+DialogsStories {
+	left: pixels;
+	height: pixels;
+	photo: pixels;
+	photoLeft: pixels;
+	photoTop: pixels;
+	shift: pixels;
+	lineTwice: pixels;
+	lineReadTwice: pixels;
+	nameTop: pixels;
+	nameStyle: TextStyle;
+}
+
+dialogsStories: DialogsStories {
+	left: 4px;
+	height: 35px;
+	photo: 24px;
+	photoLeft: 10px;
+	shift: 16px;
+	lineTwice: 3px;
+	lineReadTwice: 0px;
+	nameTop: 9px;
+	nameStyle: semiboldTextStyle;
+}
+
+dialogsStoriesFull: DialogsStories {
+	left: 4px;
+	height: 77px;
+	photo: 42px;
+	photoLeft: 10px;
+	photoTop: 9px;
+	lineTwice: 4px;
+	lineReadTwice: 2px;
+	nameTop: 58px;
+	nameStyle: TextStyle(defaultTextStyle) {
+		font: font(12px);
+		linkFont: font(12px);
+		linkFontOver: font(12px);
+	}
+}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index b763ca574..5c29a8a36 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -7,9 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/dialogs_inner_widget.h"
 
-#include "dialogs/dialogs_indexed_list.h"
 #include "dialogs/ui/dialogs_layout.h"
+#include "dialogs/ui/dialogs_stories_content.h"
+#include "dialogs/ui/dialogs_stories_list.h"
 #include "dialogs/ui/dialogs_video_userpic.h"
+#include "dialogs/dialogs_indexed_list.h"
 #include "dialogs/dialogs_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
 #include "history/history.h"
@@ -137,6 +139,10 @@ InnerWidget::InnerWidget(
 	rpl::producer<ChildListShown> childListShown)
 : RpWidget(parent)
 , _controller(controller)
+, _stories(std::make_unique<Stories::List>(
+	this,
+	Stories::ContentForSession(&controller->session()),
+	[=] { return st::dialogsStoriesFull.height - _visibleTop; }))
 , _shownList(controller->session().data().chatsList()->indexed())
 , _st(&st::defaultDialogRow)
 , _pinnedShiftAnimation([=](crl::time now) {
@@ -406,8 +412,19 @@ int InnerWidget::skipTopHeight() const {
 		: 0;
 }
 
+bool InnerWidget::storiesShown() const {
+	return (_state == WidgetState::Default)
+		&& !_openedFolder
+		&& !_openedForum;
+}
+
+int InnerWidget::collapsedRowsOffset() const {
+	return storiesShown() ? _stories->height() : 0;
+}
+
 int InnerWidget::dialogsOffset() const {
-	return _collapsedRows.size() * st::dialogsImportantBarHeight
+	return collapsedRowsOffset()
+		+ (_collapsedRows.size() * st::dialogsImportantBarHeight)
 		- skipTopHeight();
 }
 
@@ -493,6 +510,7 @@ void InnerWidget::changeOpenedFolder(Data::Folder *folder) {
 	stopReorderPinned();
 	clearSelection();
 	_openedFolder = folder;
+	_stories->setVisible(storiesShown());
 	refreshShownList();
 	refreshWithCollapsedRows(true);
 	if (_loadMoreCallback) {
@@ -519,6 +537,7 @@ void InnerWidget::changeOpenedForum(Data::Forum *forum) {
 	}
 	_openedForum = forum;
 	_st = forum ? &st::forumTopicRow : &st::defaultDialogRow;
+	_stories->setVisible(storiesShown());
 	refreshShownList();
 
 	_openedForumLifetime.destroy();
@@ -596,7 +615,9 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		Ui::RowPainter::Paint(p, row, validateVideoUserpic(row), context);
 	};
 	if (_state == WidgetState::Default) {
-		paintCollapsedRows(p, r);
+		const auto collapsedSkip = collapsedRowsOffset();
+		p.translate(0, collapsedSkip);
+		paintCollapsedRows(p, r.translated(0, -collapsedSkip));
 
 		const auto &list = _shownList->all();
 		const auto shownBottom = _shownList->height() - skipTopHeight();
@@ -1748,6 +1769,7 @@ void InnerWidget::setSearchedPressed(int pressed) {
 }
 
 void InnerWidget::resizeEvent(QResizeEvent *e) {
+	_stories->resizeToWidth(width());
 	resizeEmptyLabel();
 	moveCancelSearchButtons();
 }
@@ -2255,7 +2277,7 @@ void InnerWidget::applyFilterUpdate(QString newFilter, bool force) {
 		if (_filter.isEmpty() && !_searchFromPeer) {
 			clearFilter();
 		} else {
-			_state = WidgetState::Filtered;
+			setState(WidgetState::Filtered);
 			_waitingForSearch = true;
 			_filterResults.clear();
 			_filterResultsGlobal.clear();
@@ -2506,6 +2528,7 @@ void InnerWidget::visibleTopBottomUpdated(
 		int visibleBottom) {
 	_visibleTop = visibleTop;
 	_visibleBottom = visibleBottom;
+	_stories->update();
 	preloadRowsData();
 	const auto loadTill = _visibleTop
 		+ PreloadHeightsCount * (_visibleBottom - _visibleTop);
@@ -2915,10 +2938,10 @@ void InnerWidget::repaintSearchResult(int index) {
 void InnerWidget::clearFilter() {
 	if (_state == WidgetState::Filtered || _searchInChat) {
 		if (_searchInChat) {
-			_state = WidgetState::Filtered;
+			setState(WidgetState::Filtered);
 			_waitingForSearch = true;
 		} else {
-			_state = WidgetState::Default;
+			setState(WidgetState::Default);
 		}
 		_hashtagResults.clear();
 		_filterResults.clear();
@@ -2930,6 +2953,13 @@ void InnerWidget::clearFilter() {
 	}
 }
 
+void InnerWidget::setState(WidgetState state) {
+	if (_state != state) {
+		_state = state;
+		_stories->setVisible(storiesShown());
+	}
+}
+
 void InnerWidget::selectSkip(int32 direction) {
 	clearMouseSelection();
 	if (_state == WidgetState::Default) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 6b01e940f..56e71ec33 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -52,6 +52,10 @@ struct PaintContext;
 struct TopicJumpCache;
 } // namespace Dialogs::Ui
 
+namespace Dialogs::Stories {
+class List;
+} // namespace Dialogs::Stories
+
 namespace Dialogs {
 
 class Row;
@@ -219,6 +223,7 @@ private:
 
 	void dialogRowReplaced(Row *oldRow, Row *newRow);
 
+	void setState(WidgetState state);
 	void editOpenedFilter();
 	void repaintCollapsedFolderRow(not_null<Data::Folder*> folder);
 	void refreshWithCollapsedRows(bool toTop = false);
@@ -309,7 +314,9 @@ private:
 	void fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu);
 
 	void refreshShownList();
+	[[nodiscard]] bool storiesShown() const;
 	[[nodiscard]] int skipTopHeight() const;
+	[[nodiscard]] int collapsedRowsOffset() const;
 	[[nodiscard]] int dialogsOffset() const;
 	[[nodiscard]] int shownHeight(int till = -1) const;
 	[[nodiscard]] int fixedOnTopCount() const;
@@ -394,6 +401,8 @@ private:
 
 	const not_null<Window::SessionController*> _controller;
 
+	const std::unique_ptr<Stories::List> _stories;
+
 	not_null<IndexedList*> _shownList;
 	FilterId _filterId = 0;
 	bool _mouseSelection = false;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
new file mode 100644
index 000000000..d4844a582
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -0,0 +1,187 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/ui/dialogs_stories_content.h"
+
+#include "data/data_changes.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_user.h"
+#include "dialogs/ui/dialogs_stories_list.h"
+#include "main/main_session.h"
+#include "ui/painter.h"
+
+#include "history/history.h" // #TODO stories testing
+
+namespace Dialogs::Stories {
+namespace {
+
+class PeerUserpic final : public Userpic {
+public:
+	explicit PeerUserpic(not_null<PeerData*> peer);
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	struct Subscribed {
+		explicit Subscribed(Fn<void()> callback)
+		: callback(std::move(callback)) {
+		}
+
+		Ui::PeerUserpicView view;
+		Fn<void()> callback;
+		InMemoryKey key;
+		rpl::lifetime photoLifetime;
+		rpl::lifetime downloadLifetime;
+	};
+
+	[[nodiscard]] bool waitingUserpicLoad() const;
+	void processNewPhoto();
+
+	const not_null<PeerData*> _peer;
+	QImage _frame;
+	std::unique_ptr<Subscribed> _subscribed;
+
+};
+
+class State final {
+public:
+	explicit State(not_null<Data::Stories*> data);
+
+	[[nodiscard]] Content next();
+
+private:
+	const not_null<Data::Stories*> _data;
+	base::flat_map<not_null<UserData*>, std::shared_ptr<Userpic>> _userpics;
+
+};
+
+PeerUserpic::PeerUserpic(not_null<PeerData*> peer)
+: _peer(peer) {
+}
+
+QImage PeerUserpic::image(int size) {
+	Expects(_subscribed != nullptr);
+
+	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
+	const auto key = _peer->userpicUniqueKey(_subscribed->view);
+	if (!good || (_subscribed->key != key && !waitingUserpicLoad())) {
+		_subscribed->key = key;
+		_frame = QImage(
+			QSize(size, size) * style::DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
+		_frame.setDevicePixelRatio(style::DevicePixelRatio());
+		_frame.fill(Qt::transparent);
+
+		auto p = Painter(&_frame);
+		_peer->paintUserpic(p, _subscribed->view, 0, 0, size);
+	}
+	return _frame;
+}
+
+bool PeerUserpic::waitingUserpicLoad() const {
+	return _peer->hasUserpic() && _peer->useEmptyUserpic(_subscribed->view);
+}
+
+void PeerUserpic::subscribeToUpdates(Fn<void()> callback) {
+	if (!callback) {
+		_subscribed = nullptr;
+		return;
+	}
+	_subscribed = std::make_unique<Subscribed>(std::move(callback));
+
+	_peer->session().changes().peerUpdates(
+		_peer,
+		Data::PeerUpdate::Flag::Photo
+	) | rpl::start_with_next([=] {
+		_subscribed->callback();
+		processNewPhoto();
+	}, _subscribed->photoLifetime);
+
+	processNewPhoto();
+}
+
+void PeerUserpic::processNewPhoto() {
+	Expects(_subscribed != nullptr);
+
+	if (!waitingUserpicLoad()) {
+		_subscribed->downloadLifetime.destroy();
+		return;
+	}
+	_peer->session().downloaderTaskFinished(
+	) | rpl::filter([=] {
+		return !waitingUserpicLoad();
+	}) | rpl::start_with_next([=] {
+		_subscribed->callback();
+		_subscribed->downloadLifetime.destroy();
+	}, _subscribed->downloadLifetime);
+}
+
+State::State(not_null<Data::Stories*> data)
+: _data(data) {
+}
+
+Content State::next() {
+	auto result = Content();
+#if 0 // #TODO stories testing
+	const auto &all = _data->all();
+	result.users.reserve(all.size());
+	for (const auto &list : all) {
+		auto userpic = std::shared_ptr<Userpic>();
+		const auto user = list.user;
+#endif
+	const auto list = _data->owner().chatsList();
+	const auto &all = list->indexed()->all();
+	result.users.reserve(all.size());
+	for (const auto &entry : all) {
+		if (const auto history = entry->history()) {
+			if (const auto user = history->peer->asUser(); user && !user->isBot()) {
+				auto userpic = std::shared_ptr<Userpic>();
+		if (const auto i = _userpics.find(user); i != end(_userpics)) {
+			userpic = i->second;
+		} else {
+			userpic = std::make_shared<PeerUserpic>(user);
+			_userpics.emplace(user, userpic);
+		}
+		result.users.push_back({
+			.id = uint64(user->id.value),
+			.name = user->shortName(),
+			.userpic = std::move(userpic),
+			.unread = history->chatListBadgesState().unread// list.unread(),
+		});
+	}
+		}
+	}
+	return result;
+}
+
+} // namespace
+
+rpl::producer<Content> ContentForSession(not_null<Main::Session*> session) {
+	return [=](auto consumer) {
+		auto result = rpl::lifetime();
+		const auto stories = &session->data().stories();
+		const auto state = result.make_state<State>(stories);
+		rpl::single(
+			rpl::empty
+		) | rpl::then(
+#if 0 // #TODO stories testing
+			stories->allChanged()
+#endif
+			session->data().chatsListChanges(
+			) | rpl::filter(
+				rpl::mappers::_1 == nullptr
+			) | rpl::to_empty
+		) | rpl::start_with_next([=] {
+			consumer.put_next(state->next());
+		}, result);
+		return result;
+	};
+}
+
+} // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
new file mode 100644
index 000000000..dc81f2528
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.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 Main {
+class Session;
+} // namespace Main
+
+namespace Dialogs::Stories {
+
+struct Content;
+
+[[nodiscard]] rpl::producer<Content> ContentForSession(
+	not_null<Main::Session*> session);
+
+} // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
new file mode 100644
index 000000000..b87d4b5de
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -0,0 +1,283 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/ui/dialogs_stories_list.h"
+
+#include "ui/painter.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs::Stories {
+namespace {
+
+constexpr auto kSmallUserpicsShown = 3;
+constexpr auto kSmallReadOpacity = 0.6;
+
+} // namespace
+
+List::List(
+	not_null<QWidget*> parent,
+	rpl::producer<Content> content,
+	Fn<int()> shownHeight)
+: RpWidget(parent)
+, _shownHeight(shownHeight) {
+	resize(0, st::dialogsStoriesFull.height);
+
+	std::move(content) | rpl::start_with_next([=](Content &&content) {
+		showContent(std::move(content));
+	}, lifetime());
+}
+
+void List::showContent(Content &&content) {
+	if (_content == content) {
+		return;
+	}
+	_content = std::move(content);
+	auto items = base::take(_items);
+	_items.reserve(_content.users.size());
+	for (const auto &user : _content.users) {
+		const auto i = ranges::find(items, user.id, [](const Item &item) {
+			return item.user.id;
+		});
+		if (i != end(items)) {
+			_items.push_back(std::move(*i));
+			auto &item = _items.back();
+			if (item.user.userpic != user.userpic) {
+				item.user.userpic = user.userpic;
+				item.subscribed = false;
+			}
+			if (item.user.name != user.name) {
+				item.user.name = user.name;
+				item.nameCache = QImage();
+			}
+		} else {
+			_items.emplace_back(Item{ .user = user });
+		}
+	}
+	update();
+}
+
+rpl::producer<uint64> List::clicks() const {
+	return _clicks.events();
+}
+
+rpl::producer<> List::expandRequests() const {
+	return _expandRequests.events();
+}
+
+void List::paintEvent(QPaintEvent *e) {
+	const auto &st = st::dialogsStories;
+	const auto &full = st::dialogsStoriesFull;
+	const auto shownHeight = std::max(_shownHeight(), st.height);
+	const auto ratio = float64(shownHeight - st.height)
+		/ (full.height - st.height);
+	const auto lerp = [=](float64 a, float64 b) {
+		return a + (b - a) * ratio;
+	};
+	const auto photo = lerp(st.photo, full.photo);
+	const auto photoTopSmall = (st.height - st.photo) / 2.;
+	const auto photoTop = lerp(photoTopSmall, full.photoTop);
+	const auto line = lerp(st.lineTwice, full.lineTwice) / 2.;
+	const auto lineRead = lerp(st.lineReadTwice, full.lineReadTwice) / 2.;
+	const auto nameTop = (photoTop + photo)
+		* (full.nameTop / float64(full.photoTop + full.photo));
+	const auto infoTop = st.nameTop
+		- (st.photoTop + (st.photo / 2.))
+		+ (photoTop + (photo / 2.));
+	const auto singleSmall = st.shift;
+	const auto singleFull = full.photoLeft * 2 + full.photo;
+	const auto single = lerp(singleSmall, singleFull);
+	const auto itemsCount = int(_items.size());
+	const auto leftSmall = st.left;
+	const auto leftFull = full.left - _scrollLeft;
+	const auto startIndexFull = std::max(-leftFull, 0) / singleFull;
+	const auto cellLeftFull = leftFull + (startIndexFull * singleFull);
+	const auto endIndexFull = std::min(
+		(width() - cellLeftFull + singleFull - 1) / singleFull,
+		itemsCount);
+	const auto startIndexSmall = 0;
+	const auto endIndexSmall = std::min(kSmallUserpicsShown, itemsCount);
+	const auto cellLeftSmall = leftSmall;
+	const auto userpicLeftFull = cellLeftFull + full.photoLeft;
+	const auto userpicLeftSmall = cellLeftSmall + st.photoLeft;
+	const auto userpicLeft = lerp(userpicLeftSmall, userpicLeftFull);
+	const auto photoLeft = lerp(st.photoLeft, full.photoLeft);
+	const auto left = userpicLeft - photoLeft;
+	const auto readUserpicOpacity = lerp(kSmallReadOpacity, 1.);
+	const auto readUserpicAppearingOpacity = lerp(kSmallReadOpacity, 0.);
+
+	auto p = QPainter(this);
+	p.fillRect(e->rect(), st::dialogsBg);
+	p.translate(0, height() - shownHeight);
+
+	const auto drawSmall = (ratio < 1.);
+	const auto drawFull = (ratio > 0.);
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto subscribe = [&](not_null<Item*> item) {
+		if (!item->subscribed) {
+			item->subscribed = true;
+			//const auto id = item.user.id;
+			item->user.userpic->subscribeToUpdates([=] {
+				update();
+			});
+		}
+	};
+	const auto count = std::max(
+		endIndexFull - startIndexFull,
+		endIndexSmall - startIndexSmall);
+
+	struct Single {
+		float64 x = 0.;
+		int indexSmall = 0;
+		Item *itemSmall = nullptr;
+		int indexFull = 0;
+		Item *itemFull = nullptr;
+
+		explicit operator bool() const {
+			return itemSmall || itemFull;
+		}
+	};
+	const auto lookup = [&](int index) {
+		const auto indexSmall = startIndexSmall + index;
+		const auto indexFull = startIndexFull + index;
+		const auto small = (drawSmall && indexSmall < endIndexSmall)
+			? &_items[indexSmall]
+			: nullptr;
+		const auto full = (drawFull && indexFull < endIndexFull)
+			? &_items[indexFull]
+			: nullptr;
+		const auto x = left + single * index;
+		return Single{ x, indexSmall, small, indexFull, full };
+	};
+	const auto hasUnread = [&](const Single &single) {
+		return (single.itemSmall && single.itemSmall->user.unread)
+			|| (single.itemFull && single.itemFull->user.unread);
+	};
+	const auto enumerate = [&](auto &&paintGradient, auto &&paintOther) {
+		auto nextGradientPainted = false;
+		for (auto i = count; i != 0;) {
+			--i;
+			const auto gradientPainted = nextGradientPainted;
+			nextGradientPainted = false;
+			if (const auto current = lookup(i)) {
+				if (!gradientPainted) {
+					paintGradient(current);
+				}
+				if (i > 0 && hasUnread(current)) {
+					if (const auto next = lookup(i - 1)) {
+						if (current.itemSmall || !next.itemSmall) {
+							nextGradientPainted = true;
+							paintGradient(next);
+						}
+					}
+				}
+				paintOther(current);
+			}
+		}
+	};
+	enumerate([&](Single single) {
+		// Unread gradient.
+		const auto x = single.x;
+		const auto userpic = QRectF(x + photoLeft, photoTop, photo, photo);
+		const auto small = single.itemSmall;
+		const auto itemFull = single.itemFull;
+		const auto smallUnread = small && small->user.unread;
+		const auto fullUnread = itemFull && itemFull->user.unread;
+		const auto unreadOpacity = (smallUnread && fullUnread)
+			? 1.
+			: smallUnread
+			? (1. - ratio)
+			: fullUnread
+			? ratio
+			: 0.;
+		if (unreadOpacity > 0.) {
+			p.setOpacity(unreadOpacity);
+			const auto outerAdd = 2 * line;
+			const auto outer = userpic.marginsAdded(
+				{ outerAdd, outerAdd, outerAdd, outerAdd });
+			p.setPen(Qt::NoPen);
+			auto gradient = QLinearGradient(
+				userpic.topRight(),
+				userpic.bottomLeft());
+			gradient.setStops({
+				{ 0., st::groupCallLive1->c },
+				{ 1., st::groupCallMuted1->c },
+			});
+			p.setBrush(gradient);
+			p.drawEllipse(outer);
+			p.setOpacity(1.);
+		}
+	}, [&](Single single) {
+		Expects(single.itemSmall || single.itemFull);
+
+		const auto x = single.x;
+		const auto userpic = QRectF(x + photoLeft, photoTop, photo, photo);
+		const auto small = single.itemSmall;
+		const auto itemFull = single.itemFull;
+		const auto smallUnread = small && small->user.unread;
+		const auto fullUnread = itemFull && itemFull->user.unread;
+
+		// White circle with possible read gray line.
+		if (itemFull && !fullUnread) {
+			auto color = st::dialogsUnreadBgMuted->c;
+			color.setAlphaF(color.alphaF() * ratio);
+			auto pen = QPen(color);
+			pen.setWidthF(lineRead);
+			p.setPen(pen);
+		} else {
+			p.setPen(Qt::NoPen);
+		}
+		const auto add = line + (itemFull ? (lineRead / 2.) : 0.);
+		const auto rect = userpic.marginsAdded({ add, add, add, add });
+		p.setBrush(st::dialogsBg);
+		p.drawEllipse(rect);
+
+		// Userpic.
+		if (itemFull == small) {
+			p.setOpacity(smallUnread ? 1. : readUserpicOpacity);
+			subscribe(itemFull);
+			const auto size = full.photo;
+			p.drawImage(userpic, itemFull->user.userpic->image(size));
+		} else {
+			if (small) {
+				p.setOpacity(smallUnread
+					? (itemFull ? 1. : (1. - ratio))
+					: (itemFull
+						? kSmallReadOpacity
+						: readUserpicAppearingOpacity));
+				subscribe(small);
+				const auto size = (ratio > 0.) ? full.photo : st.photo;
+				p.drawImage(userpic, small->user.userpic->image(size));
+			}
+			if (itemFull) {
+				p.setOpacity(ratio);
+				subscribe(itemFull);
+				const auto size = full.photo;
+				p.drawImage(userpic, itemFull->user.userpic->image(size));
+			}
+		}
+		p.setOpacity(1.);
+	});
+}
+
+void List::wheelEvent(QWheelEvent *e) {
+
+}
+
+void List::mouseMoveEvent(QMouseEvent *e) {
+
+}
+
+void List::mousePressEvent(QMouseEvent *e) {
+
+}
+
+void List::mouseReleaseEvent(QMouseEvent *e) {
+
+}
+
+} // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
new file mode 100644
index 000000000..c0b80501e
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -0,0 +1,76 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/qt/qt_compare.h"
+#include "ui/rp_widget.h"
+
+class QPainter;
+
+namespace Dialogs::Stories {
+
+class Userpic {
+public:
+	[[nodiscard]] virtual QImage image(int size) = 0;
+	virtual void subscribeToUpdates(Fn<void()> callback) = 0;
+};
+
+struct User {
+	uint64 id = 0;
+	QString name;
+	std::shared_ptr<Userpic> userpic;
+	bool unread = false;
+
+	friend inline bool operator==(const User &a, const User &b) = default;
+};
+
+struct Content {
+	std::vector<User> users;
+
+	friend inline bool operator==(
+		const Content &a,
+		const Content &b) = default;
+};
+
+class List final : public Ui::RpWidget {
+public:
+	List(
+		not_null<QWidget*> parent,
+		rpl::producer<Content> content,
+		Fn<int()> shownHeight);
+
+	[[nodiscard]] rpl::producer<uint64> clicks() const;
+	[[nodiscard]] rpl::producer<> expandRequests() const;
+
+private:
+	struct Item {
+		User user;
+		QImage frameSmall;
+		QImage frameFull;
+		QImage nameCache;
+		QColor nameCacheColor;
+		bool subscribed = false;
+	};
+
+	void showContent(Content &&content);
+	void paintEvent(QPaintEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+	Content _content;
+	std::vector<Item> _items;
+	Fn<int()> _shownHeight = 0;
+	rpl::event_stream<uint64> _clicks;
+	rpl::event_stream<> _expandRequests;
+	int _scrollLeft = 0;
+
+};
+
+} // namespace Dialogs::Stories
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 404f72080..08b9990c4 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -70,6 +70,9 @@ PRIVATE
 
     data/data_subscription_option.h
 
+    dialogs/ui/dialogs_stories_list.cpp
+    dialogs/ui/dialogs_stories_list.h
+
     editor/controllers/undo_controller.cpp
     editor/controllers/undo_controller.h
     editor/editor_crop.cpp

From 16128d61c0fd59f19b3fb00585d7421e40290f03 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 May 2023 20:13:02 +0400
Subject: [PATCH 248/676] Implement nice stories list scrolling.

---
 .../dialogs/dialogs_inner_widget.cpp          |  45 +++++-
 .../dialogs/dialogs_inner_widget.h            |   6 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  43 ++++--
 Telegram/SourceFiles/dialogs/dialogs_widget.h |   3 +-
 .../dialogs/ui/dialogs_stories_content.cpp    |  10 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 142 +++++++++++++++++-
 .../dialogs/ui/dialogs_stories_list.h         |  24 ++-
 .../window/window_session_controller.cpp      |   4 +-
 8 files changed, 248 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 5c29a8a36..a4c0bb267 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -142,7 +142,7 @@ InnerWidget::InnerWidget(
 , _stories(std::make_unique<Stories::List>(
 	this,
 	Stories::ContentForSession(&controller->session()),
-	[=] { return st::dialogsStoriesFull.height - _visibleTop; }))
+	[=] { return _stories->height() - _visibleTop; }))
 , _shownList(controller->session().data().chatsList()->indexed())
 , _st(&st::defaultDialogRow)
 , _pinnedShiftAnimation([=](crl::time now) {
@@ -323,6 +323,18 @@ InnerWidget::InnerWidget(
 		switchToFilter(filterId);
 	}, lifetime());
 
+	_stories->heightValue(
+	) | rpl::filter([=] {
+		return (_viewportHeight > 0) && (defaultScrollTop() > _visibleTop);
+	}) | rpl::start_with_next([=] {
+		jumpToTop();
+	}, lifetime());
+
+	_stories->entered(
+	) | rpl::start_with_next([=] {
+		clearSelection();
+	}, lifetime());
+
 	handleChatListEntryRefreshes();
 
 	refreshWithCollapsedRows(true);
@@ -428,6 +440,16 @@ int InnerWidget::dialogsOffset() const {
 		- skipTopHeight();
 }
 
+rpl::producer<> InnerWidget::scrollToVeryTopRequests() const {
+	return _stories->expandRequests();
+}
+
+int InnerWidget::defaultScrollTop() const {
+	return storiesShown()
+		? std::max(_stories->height() - st::dialogsStories.height, 0)
+		: 0;
+}
+
 int InnerWidget::fixedOnTopCount() const {
 	auto result = 0;
 	for (const auto &row : *_shownList) {
@@ -1699,6 +1721,15 @@ void InnerWidget::mousePressReleased(
 	}
 }
 
+void InnerWidget::setViewportHeight(int viewportHeight) {
+	if (_viewportHeight != viewportHeight) {
+		_viewportHeight = viewportHeight;
+		if (height() < defaultScrollTop() + viewportHeight) {
+			refresh();
+		}
+	}
+}
+
 void InnerWidget::setCollapsedPressed(int pressed) {
 	if (_collapsedPressed != pressed) {
 		if (_collapsedPressed >= 0) {
@@ -2745,10 +2776,13 @@ void InnerWidget::refresh(bool toTop) {
 			h = searchedOffset() + (_searchResults.size() * _st->height);
 		}
 	}
+	if (const auto storiesSkip = defaultScrollTop()) {
+		accumulate_max(h, storiesSkip + _viewportHeight);
+	}
 	resize(width(), h);
 	if (toTop) {
 		stopReorderPinned();
-		_mustScrollTo.fire({ 0, 0 });
+		jumpToTop();
 		preloadRowsData();
 	}
 	_controller->setDialogsListDisplayForced(
@@ -3226,7 +3260,7 @@ void InnerWidget::switchToFilter(FilterId filterId) {
 		filterId = 0;
 	}
 	if (_filterId == filterId) {
-		_mustScrollTo.fire({ 0, 0 });
+		jumpToTop();
 		return;
 	}
 	saveChatsFilterScrollState(_filterId);
@@ -3251,6 +3285,11 @@ void InnerWidget::switchToFilter(FilterId filterId) {
 	}
 }
 
+void InnerWidget::jumpToTop() {
+	const auto to = defaultScrollTop();
+	_mustScrollTo.fire({ to, -1 });
+}
+
 void InnerWidget::saveChatsFilterScrollState(FilterId filterId) {
 	_chatsFilterScrollStates[filterId] = -y();
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 56e71ec33..c7b2d899f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -104,6 +104,10 @@ public:
 		const QVector<MTPPeer> &my,
 		const QVector<MTPPeer> &result);
 
+	[[nodiscard]] rpl::producer<> scrollToVeryTopRequests() const;
+	[[nodiscard]] int defaultScrollTop() const;
+	void setViewportHeight(int viewportHeight);
+
 	[[nodiscard]] FilterId filterId() const;
 
 	void clearSelection();
@@ -279,6 +283,7 @@ private:
 
 	int defaultRowTop(not_null<Row*> row) const;
 	void setupOnlineStatusCheck();
+	void jumpToTop();
 
 	void updateRowCornerStatusShown(not_null<History*> history);
 	void repaintDialogRowCornerStatus(not_null<History*> history);
@@ -402,6 +407,7 @@ private:
 	const not_null<Window::SessionController*> _controller;
 
 	const std::unique_ptr<Stories::List> _stories;
+	int _viewportHeight = 0;
 
 	not_null<IndexedList*> _shownList;
 	FilterId _filterId = 0;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index dc8f3243e..24ff876e9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -260,6 +260,11 @@ Widget::Widget(
 		}
 	}, lifetime());
 
+	_inner->scrollToVeryTopRequests(
+	) | rpl::start_with_next([=] {
+		scrollToDefaultChecked(true);
+	}, lifetime());
+
 	_inner->mustScrollTo(
 	) | rpl::start_with_next([=](const Ui::ScrollToRequest &data) {
 		if (_scroll) {
@@ -527,13 +532,15 @@ void Widget::setGeometryWithTopMoved(
 	_topDelta = 0;
 }
 
+void Widget::scrollToDefaultChecked(bool verytop) {
+	if (_scrollToAnimation.animating()) {
+		return;
+	}
+	scrollToDefault(verytop);
+}
+
 void Widget::setupScrollUpButton() {
-	_scrollToTop->setClickedCallback([=] {
-		if (_scrollToAnimation.animating()) {
-			return;
-		}
-		scrollToTop();
-	});
+	_scrollToTop->setClickedCallback([=] { scrollToDefaultChecked(); });
 	base::install_event_filter(_scrollToTop, [=](not_null<QEvent*> event) {
 		if (event->type() != QEvent::Wheel) {
 			return base::EventFilterResult::Continue;
@@ -1111,10 +1118,13 @@ void Widget::jumpToTop(bool belowPinned) {
 	}
 }
 
-void Widget::scrollToTop() {
+void Widget::scrollToDefault(bool verytop) {
 	_scrollToAnimation.stop();
 	auto scrollTop = _scroll->scrollTop();
-	const auto scrollTo = 0;
+	const auto scrollTo = verytop ? 0 : _inner->defaultScrollTop();
+	if (scrollTop <= scrollTo) {
+		return;
+	}
 	const auto maxAnimatedDelta = _scroll->height();
 	if (scrollTo + maxAnimatedDelta < scrollTop) {
 		scrollTop = scrollTo + maxAnimatedDelta;
@@ -2494,7 +2504,11 @@ void Widget::updateControlsGeometry() {
 	}
 	auto scrollTop = forumReportTop
 		+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
-	auto newScrollTop = _scroll->scrollTop() + _topDelta;
+	const auto wasScrollTop = _scroll->scrollTop();
+	const auto newScrollTop = (_topDelta < 0
+		&& wasScrollTop <= _inner->defaultScrollTop())
+		? wasScrollTop
+		: (wasScrollTop + _topDelta);
 	auto scrollHeight = height() - scrollTop;
 	const auto putBottomButton = [&](auto &button) {
 		if (button && !button->isHidden()) {
@@ -2518,13 +2532,22 @@ void Widget::updateControlsGeometry() {
 
 	const auto scrollw = _childList ? _narrowWidth : barw;
 	const auto wasScrollHeight = _scroll->height();
+	if (scrollHeight >= wasScrollHeight) {
+		_inner->setViewportHeight(scrollHeight);
+	}
 	_scroll->setGeometry(0, scrollTop, scrollw, scrollHeight);
+	if (scrollHeight < wasScrollHeight) {
+		_inner->setViewportHeight(scrollHeight);
+	}
 	_inner->resize(scrollw, _inner->height());
 	_inner->setNarrowRatio(narrowRatio);
 	if (scrollHeight != wasScrollHeight) {
 		controller()->floatPlayerAreaUpdated();
 	}
-	if (_topDelta) {
+	const auto startWithTop = _inner->defaultScrollTop();
+	if (wasScrollHeight < startWithTop && scrollHeight >= startWithTop) {
+		_scroll->scrollToY(startWithTop);
+	} else if (newScrollTop != wasScrollTop) {
 		_scroll->scrollToY(newScrollTop);
 	} else {
 		listScrollUpdated();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 009f6ca3a..891afef3a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -209,7 +209,8 @@ private:
 		mtpRequestId requestId);
 	void peopleFailed(const MTP::Error &error, mtpRequestId requestId);
 
-	void scrollToTop();
+	void scrollToDefault(bool verytop = false);
+	void scrollToDefaultChecked(bool verytop = false);
 	void setupScrollUpButton();
 	void updateScrollUpVisibility();
 	void startScrollUpButtonAnimation(bool shown);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index d4844a582..021d07328 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -173,10 +173,12 @@ rpl::producer<Content> ContentForSession(not_null<Main::Session*> session) {
 #if 0 // #TODO stories testing
 			stories->allChanged()
 #endif
-			session->data().chatsListChanges(
-			) | rpl::filter(
-				rpl::mappers::_1 == nullptr
-			) | rpl::to_empty
+			rpl::merge(
+				session->data().chatsListChanges(
+				) | rpl::filter(
+					rpl::mappers::_1 == nullptr
+				) | rpl::to_empty,
+				session->data().unreadBadgeChanges())
 		) | rpl::start_with_next([=] {
 			consumer.put_next(state->next());
 		}, result);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index b87d4b5de..c4dfbbbd2 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
 
+#include <QtWidgets/QApplication>
+
 namespace Dialogs::Stories {
 namespace {
 
@@ -24,19 +26,31 @@ List::List(
 	Fn<int()> shownHeight)
 : RpWidget(parent)
 , _shownHeight(shownHeight) {
-	resize(0, st::dialogsStoriesFull.height);
+	setCursor(style::cur_default);
 
 	std::move(content) | rpl::start_with_next([=](Content &&content) {
 		showContent(std::move(content));
 	}, lifetime());
+
+	_shownAnimation.stop();
+	resize(0, _items.empty() ? 0 : st::dialogsStoriesFull.height);
 }
 
 void List::showContent(Content &&content) {
 	if (_content == content) {
 		return;
 	}
+	if (content.users.empty()) {
+		_hidingItems = base::take(_items);
+		if (!_hidingItems.empty()) {
+			toggleAnimated(false);
+		}
+		return;
+	}
+	const auto hidden = _content.users.empty();
 	_content = std::move(content);
-	auto items = base::take(_items);
+	auto items = base::take(_items.empty() ? _hidingItems : _items);
+	_hidingItems.clear();
 	_items.reserve(_content.users.size());
 	for (const auto &user : _content.users) {
 		const auto i = ranges::find(items, user.id, [](const Item &item) {
@@ -53,10 +67,39 @@ void List::showContent(Content &&content) {
 				item.user.name = user.name;
 				item.nameCache = QImage();
 			}
+			item.user.unread = user.unread;
 		} else {
 			_items.emplace_back(Item{ .user = user });
 		}
 	}
+	updateScrollMax();
+	update();
+	if (hidden) {
+		toggleAnimated(true);
+	}
+}
+
+void List::toggleAnimated(bool shown) {
+	_shownAnimation.start(
+		[=] { updateHeight(); },
+		shown ? 0. : 1.,
+		shown ? 1. : 0.,
+		st::slideWrapDuration);
+}
+
+void List::updateHeight() {
+	const auto shown = _shownAnimation.value(_items.empty() ? 0. : 1.);
+	resize(
+		width(),
+		anim::interpolate(0, st::dialogsStoriesFull.height, shown));
+}
+
+void List::updateScrollMax() {
+	const auto &full = st::dialogsStoriesFull;
+	const auto singleFull = full.photoLeft * 2 + full.photo;
+	const auto widthFull = full.left + int(_items.size()) * singleFull;
+	_scrollLeftMax = std::max(widthFull - width(), 0);
+	_scrollLeft = std::clamp(_scrollLeft, 0, _scrollLeftMax);
 	update();
 }
 
@@ -68,6 +111,18 @@ rpl::producer<> List::expandRequests() const {
 	return _expandRequests.events();
 }
 
+rpl::producer<> List::entered() const {
+	return _entered.events();
+}
+
+void List::enterEventHook(QEnterEvent *e) {
+	_entered.fire({});
+}
+
+void List::resizeEvent(QResizeEvent *e) {
+	updateScrollMax();
+}
+
 void List::paintEvent(QPaintEvent *e) {
 	const auto &st = st::dialogsStories;
 	const auto &full = st::dialogsStoriesFull;
@@ -96,7 +151,7 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto startIndexFull = std::max(-leftFull, 0) / singleFull;
 	const auto cellLeftFull = leftFull + (startIndexFull * singleFull);
 	const auto endIndexFull = std::min(
-		(width() - cellLeftFull + singleFull - 1) / singleFull,
+		(width() - leftFull + singleFull - 1) / singleFull,
 		itemsCount);
 	const auto startIndexSmall = 0;
 	const auto endIndexSmall = std::min(kSmallUserpicsShown, itemsCount);
@@ -265,19 +320,92 @@ void List::paintEvent(QPaintEvent *e) {
 }
 
 void List::wheelEvent(QWheelEvent *e) {
+	const auto horizontal = (e->angleDelta().x() != 0);
+	if (!horizontal) {
+		e->ignore();
+		return;
+	}
+	auto delta = horizontal
+		? ((style::RightToLeft() ? -1 : 1) * (e->pixelDelta().x()
+			? e->pixelDelta().x()
+			: e->angleDelta().x()))
+		: (e->pixelDelta().y()
+			? e->pixelDelta().y()
+			: e->angleDelta().y());
 
-}
-
-void List::mouseMoveEvent(QMouseEvent *e) {
-
+	const auto now = _scrollLeft;
+	const auto used = now - delta;
+	const auto next = std::clamp(used, 0, _scrollLeftMax);
+	if (next != now) {
+		_expandRequests.fire({});
+		_scrollLeft = next;
+		//updateSelected();
+		update();
+	}
+	e->accept();
 }
 
 void List::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	_mouseDownPosition = _lastMousePosition = e->globalPos();
+	//updateSelected();
+}
 
+void List::mouseMoveEvent(QMouseEvent *e) {
+	_lastMousePosition = e->globalPos();
+	//updateSelected();
+
+	if (!_dragging && _mouseDownPosition) {
+		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
+			>= QApplication::startDragDistance()) {
+			if (_shownHeight() < st::dialogsStoriesFull.height) {
+				_expandRequests.fire({});
+			}
+			_dragging = true;
+			_startDraggingLeft = _scrollLeft;
+		}
+	}
+	checkDragging();
+}
+
+void List::checkDragging() {
+	if (_dragging) {
+		const auto sign = (style::RightToLeft() ? -1 : 1);
+		const auto newLeft = std::clamp(
+			(sign * (_mouseDownPosition->x() - _lastMousePosition.x())
+				+ _startDraggingLeft),
+			0,
+			_scrollLeftMax);
+		if (newLeft != _scrollLeft) {
+			_scrollLeft = newLeft;
+			update();
+		}
+	}
 }
 
 void List::mouseReleaseEvent(QMouseEvent *e) {
+	_lastMousePosition = e->globalPos();
+	const auto guard = gsl::finally([&] {
+		_mouseDownPosition = std::nullopt;
+	});
 
+	//const auto wasDown = std::exchange(_pressed, SpecialOver::None);
+	if (finishDragging()) {
+		return;
+	}
+	//updateSelected();
+}
+
+bool List::finishDragging() {
+	if (!_dragging) {
+		return false;
+	}
+	checkDragging();
+	_dragging = false;
+	//updateSelected();
+	return true;
 }
 
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index c0b80501e..d8b1bdbae 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -46,30 +46,48 @@ public:
 
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] rpl::producer<> expandRequests() const;
+	[[nodiscard]] rpl::producer<> entered() const;
 
 private:
 	struct Item {
 		User user;
-		QImage frameSmall;
-		QImage frameFull;
 		QImage nameCache;
 		QColor nameCacheColor;
 		bool subscribed = false;
 	};
 
 	void showContent(Content &&content);
+	void enterEventHook(QEnterEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	void wheelEvent(QWheelEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
 
+	void updateScrollMax();
+	void checkDragging();
+	bool finishDragging();
+
+	void updateHeight();
+	void toggleAnimated(bool shown);
+
 	Content _content;
 	std::vector<Item> _items;
+	std::vector<Item> _hidingItems;
 	Fn<int()> _shownHeight = 0;
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<> _expandRequests;
+	rpl::event_stream<> _entered;
+
+	Ui::Animations::Simple _shownAnimation;
+
+	QPoint _lastMousePosition;
+	std::optional<QPoint> _mouseDownPosition;
+	int _startDraggingLeft = 0;
 	int _scrollLeft = 0;
+	int _scrollLeftMax = 0;
+	bool _dragging = false;
 
 };
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 4e2563f79..34d9ca1be 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1141,7 +1141,9 @@ void SessionController::openFolder(not_null<Data::Folder*> folder) {
 	if (_openedFolder.current() != folder) {
 		resetFakeUnreadWhileOpened();
 	}
-	setActiveChatsFilter(0);
+	if (activeChatsFilterCurrent() != 0) {
+		setActiveChatsFilter(0);
+	}
 	closeForum();
 	_openedFolder = folder.get();
 }

From 1fc37178b7f0c9d6e768654a0d9ec8e777280849 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 May 2023 21:11:58 +0400
Subject: [PATCH 249/676] Show names for chats list stories.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  8 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 74 +++++++++++++++----
 .../dialogs/ui/dialogs_stories_list.h         |  2 +
 3 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index c520e9de3..52d80079a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -519,10 +519,10 @@ dialogsStoriesFull: DialogsStories {
 	photoTop: 9px;
 	lineTwice: 4px;
 	lineReadTwice: 2px;
-	nameTop: 58px;
+	nameTop: 56px;
 	nameStyle: TextStyle(defaultTextStyle) {
-		font: font(12px);
-		linkFont: font(12px);
-		linkFontOver: font(12px);
+		font: font(11px);
+		linkFont: font(11px);
+		linkFontOver: font(11px);
 	}
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index c4dfbbbd2..c16fe7015 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -18,6 +18,13 @@ namespace {
 constexpr auto kSmallUserpicsShown = 3;
 constexpr auto kSmallReadOpacity = 0.6;
 
+[[nodiscard]] int AvailableNameWidth() {
+	const auto &full = st::dialogsStoriesFull;
+	const auto &font = full.nameStyle.font;
+	const auto skip = font->spacew;
+	return full.photoLeft * 2 + full.photo - 2 * skip;
+}
+
 } // namespace
 
 List::List(
@@ -137,8 +144,6 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto photoTop = lerp(photoTopSmall, full.photoTop);
 	const auto line = lerp(st.lineTwice, full.lineTwice) / 2.;
 	const auto lineRead = lerp(st.lineReadTwice, full.lineReadTwice) / 2.;
-	const auto nameTop = (photoTop + photo)
-		* (full.nameTop / float64(full.photoTop + full.photo));
 	const auto infoTop = st.nameTop
 		- (st.photoTop + (st.photo / 2.))
 		+ (photoTop + (photo / 2.));
@@ -161,6 +166,11 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto userpicLeft = lerp(userpicLeftSmall, userpicLeftFull);
 	const auto photoLeft = lerp(st.photoLeft, full.photoLeft);
 	const auto left = userpicLeft - photoLeft;
+	const auto nameScale = shownHeight / float64(full.height);
+	const auto nameTop = nameScale * full.nameTop;
+	const auto nameWidth = nameScale * AvailableNameWidth();
+	const auto nameHeight = nameScale * full.nameStyle.font->height;
+	const auto nameLeft = photoLeft + (photo - nameWidth) / 2.;
 	const auto readUserpicOpacity = lerp(kSmallReadOpacity, 1.);
 	const auto readUserpicAppearingOpacity = lerp(kSmallReadOpacity, 0.);
 
@@ -172,15 +182,6 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto drawFull = (ratio > 0.);
 	auto hq = PainterHighQualityEnabler(p);
 
-	const auto subscribe = [&](not_null<Item*> item) {
-		if (!item->subscribed) {
-			item->subscribed = true;
-			//const auto id = item.user.id;
-			item->user.userpic->subscribeToUpdates([=] {
-				update();
-			});
-		}
-	};
 	const auto count = std::max(
 		endIndexFull - startIndexFull,
 		endIndexSmall - startIndexSmall);
@@ -235,6 +236,15 @@ void List::paintEvent(QPaintEvent *e) {
 		}
 	};
 	enumerate([&](Single single) {
+		// Name.
+		if (const auto full = single.itemFull) {
+			p.setOpacity(ratio);
+			validateName(full);
+			p.drawImage(
+				QRectF(single.x + nameLeft, nameTop, nameWidth, nameHeight),
+				full->nameCache);
+		}
+
 		// Unread gradient.
 		const auto x = single.x;
 		const auto userpic = QRectF(x + photoLeft, photoTop, photo, photo);
@@ -277,7 +287,8 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto fullUnread = itemFull && itemFull->user.unread;
 
 		// White circle with possible read gray line.
-		if (itemFull && !fullUnread) {
+		const auto hasReadLine = (itemFull && !fullUnread);
+		if (hasReadLine) {
 			auto color = st::dialogsUnreadBgMuted->c;
 			color.setAlphaF(color.alphaF() * ratio);
 			auto pen = QPen(color);
@@ -286,7 +297,7 @@ void List::paintEvent(QPaintEvent *e) {
 		} else {
 			p.setPen(Qt::NoPen);
 		}
-		const auto add = line + (itemFull ? (lineRead / 2.) : 0.);
+		const auto add = line + (hasReadLine ? (lineRead / 2.) : 0.);
 		const auto rect = userpic.marginsAdded({ add, add, add, add });
 		p.setBrush(st::dialogsBg);
 		p.drawEllipse(rect);
@@ -294,7 +305,7 @@ void List::paintEvent(QPaintEvent *e) {
 		// Userpic.
 		if (itemFull == small) {
 			p.setOpacity(smallUnread ? 1. : readUserpicOpacity);
-			subscribe(itemFull);
+			validateUserpic(itemFull);
 			const auto size = full.photo;
 			p.drawImage(userpic, itemFull->user.userpic->image(size));
 		} else {
@@ -304,13 +315,13 @@ void List::paintEvent(QPaintEvent *e) {
 					: (itemFull
 						? kSmallReadOpacity
 						: readUserpicAppearingOpacity));
-				subscribe(small);
+				validateUserpic(small);
 				const auto size = (ratio > 0.) ? full.photo : st.photo;
 				p.drawImage(userpic, small->user.userpic->image(size));
 			}
 			if (itemFull) {
 				p.setOpacity(ratio);
-				subscribe(itemFull);
+				validateUserpic(itemFull);
 				const auto size = full.photo;
 				p.drawImage(userpic, itemFull->user.userpic->image(size));
 			}
@@ -319,6 +330,37 @@ void List::paintEvent(QPaintEvent *e) {
 	});
 }
 
+void List::validateUserpic(not_null<Item*> item) {
+	if (!item->subscribed) {
+		item->subscribed = true;
+		//const auto id = item.user.id;
+		item->user.userpic->subscribeToUpdates([=] {
+			update();
+		});
+	}
+}
+
+void List::validateName(not_null<Item*> item) {
+	const auto &color = st::dialogsNameFg;
+	if (!item->nameCache.isNull() && item->nameCacheColor == color->c) {
+		return;
+	}
+	const auto &full = st::dialogsStoriesFull;
+	const auto &font = full.nameStyle.font;
+	const auto available = AvailableNameWidth();
+	const auto text = Ui::Text::String(full.nameStyle, item->user.name);
+	const auto ratio = style::DevicePixelRatio();
+	item->nameCacheColor = color->c;
+	item->nameCache = QImage(
+		QSize(available, font->height) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	item->nameCache.setDevicePixelRatio(ratio);
+	item->nameCache.fill(Qt::transparent);
+	auto p = Painter(&item->nameCache);
+	p.setPen(color);
+	text.drawElided(p, 0, 0, available, 1, style::al_top);
+}
+
 void List::wheelEvent(QWheelEvent *e) {
 	const auto horizontal = (e->angleDelta().x() != 0);
 	if (!horizontal) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index d8b1bdbae..cbc635482 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -65,6 +65,8 @@ private:
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
 
+	void validateUserpic(not_null<Item*> item);
+	void validateName(not_null<Item*> item);
 	void updateScrollMax();
 	void checkDragging();
 	bool finishDragging();

From d57ada8a6418d435bfd0bccffdd2d2cd762319b7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 May 2023 22:54:13 +0400
Subject: [PATCH 250/676] Show stories summary status in chats list.

---
 Telegram/Resources/langs/lang.strings         |   5 +
 Telegram/SourceFiles/dialogs/dialogs.style    |   8 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 198 ++++++++++++++++--
 .../dialogs/ui/dialogs_stories_list.h         |  47 ++++-
 4 files changed, 240 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 8bfb90dff..54b768de8 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3778,6 +3778,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_userpic_builder_color_subtitle" = "Choose background";
 "lng_userpic_builder_emoji_subtitle" = "Choose sticker or emoji";
 
+"lng_stories_row_count#one" = "{count} Story";
+"lng_stories_row_count#other" = "{count} Stories";
+"lng_stories_row_unread_and_one" = "{accumulated}, {user}";
+"lng_stories_row_unread_and_last" = "{accumulated} and {user}";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 52d80079a..47a025611 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -495,6 +495,8 @@ DialogsStories {
 	shift: pixels;
 	lineTwice: pixels;
 	lineReadTwice: pixels;
+	nameLeft: pixels;
+	nameRight: pixels;
 	nameTop: pixels;
 	nameStyle: TextStyle;
 }
@@ -507,7 +509,9 @@ dialogsStories: DialogsStories {
 	shift: 16px;
 	lineTwice: 3px;
 	lineReadTwice: 0px;
-	nameTop: 9px;
+	nameLeft: 11px;
+	nameRight: 10px;
+	nameTop: 3px;
 	nameStyle: semiboldTextStyle;
 }
 
@@ -519,6 +523,8 @@ dialogsStoriesFull: DialogsStories {
 	photoTop: 9px;
 	lineTwice: 4px;
 	lineReadTwice: 2px;
+	nameLeft: 0px;
+	nameRight: 0px;
 	nameTop: 56px;
 	nameStyle: TextStyle(defaultTextStyle) {
 		font: font(11px);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index c16fe7015..d5d1f3d3c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/dialogs_stories_list.h"
 
+#include "lang/lang_keys.h"
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
 
@@ -17,6 +18,7 @@ namespace {
 
 constexpr auto kSmallUserpicsShown = 3;
 constexpr auto kSmallReadOpacity = 0.6;
+constexpr auto kSummaryExpandLeft = 1.5;
 
 [[nodiscard]] int AvailableNameWidth() {
 	const auto &full = st::dialogsStoriesFull;
@@ -40,7 +42,7 @@ List::List(
 	}, lifetime());
 
 	_shownAnimation.stop();
-	resize(0, _items.empty() ? 0 : st::dialogsStoriesFull.height);
+	resize(0, _data.empty() ? 0 : st::dialogsStoriesFull.height);
 }
 
 void List::showContent(Content &&content) {
@@ -48,24 +50,25 @@ void List::showContent(Content &&content) {
 		return;
 	}
 	if (content.users.empty()) {
-		_hidingItems = base::take(_items);
-		if (!_hidingItems.empty()) {
+		_hidingData = base::take(_data);
+		if (!_hidingData.empty()) {
 			toggleAnimated(false);
 		}
 		return;
 	}
 	const auto hidden = _content.users.empty();
 	_content = std::move(content);
-	auto items = base::take(_items.empty() ? _hidingItems : _items);
-	_hidingItems.clear();
-	_items.reserve(_content.users.size());
+	auto items = base::take(
+		_data.items.empty() ? _hidingData.items : _data.items);
+	_hidingData = {};
+	_data.items.reserve(_content.users.size());
 	for (const auto &user : _content.users) {
 		const auto i = ranges::find(items, user.id, [](const Item &item) {
 			return item.user.id;
 		});
 		if (i != end(items)) {
-			_items.push_back(std::move(*i));
-			auto &item = _items.back();
+			_data.items.push_back(std::move(*i));
+			auto &item = _data.items.back();
 			if (item.user.userpic != user.userpic) {
 				item.user.userpic = user.userpic;
 				item.subscribed = false;
@@ -76,16 +79,94 @@ void List::showContent(Content &&content) {
 			}
 			item.user.unread = user.unread;
 		} else {
-			_items.emplace_back(Item{ .user = user });
+			_data.items.emplace_back(Item{ .user = user });
 		}
 	}
 	updateScrollMax();
+	updateSummary(_data);
 	update();
 	if (hidden) {
 		toggleAnimated(true);
 	}
 }
 
+List::Summaries List::ComposeSummaries(Data &data) {
+	const auto total = int(data.items.size());
+	auto unreadInFirst = 0;
+	auto unreadTotal = 0;
+	for (auto i = 0; i != total; ++i) {
+		if (data.items[i].user.unread) {
+			++unreadTotal;
+			if (i < kSmallUserpicsShown) {
+				++unreadInFirst;
+			}
+		}
+	}
+	auto result = Summaries();
+	result.total.string
+		= tr::lng_stories_row_count(tr::now, lt_count, total);
+	const auto append = [&](QString &to, int index, bool last) {
+		if (to.isEmpty()) {
+			to = data.items[index].user.name;
+		} else {
+			to = (last
+				? tr::lng_stories_row_unread_and_last
+				: tr::lng_stories_row_unread_and_one)(
+					tr::now,
+					lt_accumulated,
+					to,
+					lt_user,
+					data.items[index].user.name);
+		}
+	};
+	if (!total) {
+		return result;
+	} else if (total <= kSmallUserpicsShown) {
+		for (auto i = 0; i != total; ++i) {
+			append(result.allNames.string, i, i == total - 1);
+		}
+	}
+	if (unreadInFirst > 0 && unreadInFirst == unreadTotal) {
+		for (auto i = 0; i != total; ++i) {
+			if (data.items[i].user.unread) {
+				append(result.unreadNames.string, i, !--unreadTotal);
+			}
+		}
+	}
+	return result;
+}
+
+bool List::StringsEqual(const Summaries &a, const Summaries &b) {
+	return (a.total.string == b.total.string)
+		&& (a.allNames.string == b.allNames.string)
+		&& (a.unreadNames.string == b.unreadNames.string);
+}
+
+void List::Populate(Summary &summary) {
+	if (summary.empty()) {
+		return;
+	}
+	summary.cache = QImage();
+	summary.text = Ui::Text::String(
+		st::dialogsStories.nameStyle,
+		summary.string);
+}
+
+void List::Populate(Summaries &summaries) {
+	Populate(summaries.total);
+	Populate(summaries.allNames);
+	Populate(summaries.unreadNames);
+}
+
+void List::updateSummary(Data &data) {
+	auto summaries = ComposeSummaries(data);
+	if (StringsEqual(summaries, data.summaries)) {
+		return;
+	}
+	data.summaries = std::move(summaries);
+	Populate(data.summaries);
+}
+
 void List::toggleAnimated(bool shown) {
 	_shownAnimation.start(
 		[=] { updateHeight(); },
@@ -95,16 +176,19 @@ void List::toggleAnimated(bool shown) {
 }
 
 void List::updateHeight() {
-	const auto shown = _shownAnimation.value(_items.empty() ? 0. : 1.);
+	const auto shown = _shownAnimation.value(_data.empty() ? 0. : 1.);
 	resize(
 		width(),
 		anim::interpolate(0, st::dialogsStoriesFull.height, shown));
+	if (_data.empty() && shown == 0.) {
+		_hidingData = {};
+	}
 }
 
 void List::updateScrollMax() {
 	const auto &full = st::dialogsStoriesFull;
 	const auto singleFull = full.photoLeft * 2 + full.photo;
-	const auto widthFull = full.left + int(_items.size()) * singleFull;
+	const auto widthFull = full.left + int(_data.items.size()) * singleFull;
 	_scrollLeftMax = std::max(widthFull - width(), 0);
 	_scrollLeft = std::clamp(_scrollLeft, 0, _scrollLeftMax);
 	update();
@@ -139,18 +223,19 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto lerp = [=](float64 a, float64 b) {
 		return a + (b - a) * ratio;
 	};
+	auto &rendering = _data.empty() ? _hidingData : _data;
 	const auto photo = lerp(st.photo, full.photo);
 	const auto photoTopSmall = (st.height - st.photo) / 2.;
 	const auto photoTop = lerp(photoTopSmall, full.photoTop);
 	const auto line = lerp(st.lineTwice, full.lineTwice) / 2.;
 	const auto lineRead = lerp(st.lineReadTwice, full.lineReadTwice) / 2.;
-	const auto infoTop = st.nameTop
+	const auto summaryTop = st.nameTop
 		- (st.photoTop + (st.photo / 2.))
 		+ (photoTop + (photo / 2.));
 	const auto singleSmall = st.shift;
 	const auto singleFull = full.photoLeft * 2 + full.photo;
 	const auto single = lerp(singleSmall, singleFull);
-	const auto itemsCount = int(_items.size());
+	const auto itemsCount = int(rendering.items.size());
 	const auto leftSmall = st.left;
 	const auto leftFull = full.left - _scrollLeft;
 	const auto startIndexFull = std::max(-leftFull, 0) / singleFull;
@@ -182,6 +267,8 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto drawFull = (ratio > 0.);
 	auto hq = PainterHighQualityEnabler(p);
 
+	paintSummary(p, rendering, summaryTop, ratio);
+
 	const auto count = std::max(
 		endIndexFull - startIndexFull,
 		endIndexSmall - startIndexSmall);
@@ -201,10 +288,10 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto indexSmall = startIndexSmall + index;
 		const auto indexFull = startIndexFull + index;
 		const auto small = (drawSmall && indexSmall < endIndexSmall)
-			? &_items[indexSmall]
+			? &rendering.items[indexSmall]
 			: nullptr;
 		const auto full = (drawFull && indexFull < endIndexFull)
-			? &_items[indexFull]
+			? &rendering.items[indexFull]
 			: nullptr;
 		const auto x = left + single * index;
 		return Single{ x, indexSmall, small, indexFull, full };
@@ -361,6 +448,87 @@ void List::validateName(not_null<Item*> item) {
 	text.drawElided(p, 0, 0, available, 1, style::al_top);
 }
 
+List::Summary &List::ChooseSummary(
+		Summaries &summaries,
+		int totalItems,
+		int fullWidth) {
+	const auto &st = st::dialogsStories;
+	const auto used = std::min(totalItems, kSmallUserpicsShown);
+	const auto taken = st.left
+		+ st.photoLeft
+		+ st.photo
+		+ (used - 1) * st.shift
+		+ st.nameLeft
+		+ st.nameRight;
+	const auto available = fullWidth - taken;
+	const auto prepare = [&](Summary &summary) {
+		if (!summary.empty() && (summary.text.maxWidth() <= available)) {
+			summary.available = available;
+			return true;
+		}
+		return false;
+	};
+	if (prepare(summaries.unreadNames)) {
+		return summaries.unreadNames;
+	} else if (prepare(summaries.allNames)) {
+		return summaries.allNames;
+	}
+	prepare(summaries.total);
+	return summaries.total;
+}
+
+void List::PrerenderSummary(Summary &summary) {
+	if (!summary.cache.isNull()
+		&& summary.cacheForWidth == summary.available
+		&& summary.cacheColor == st::dialogsNameFg->c) {
+		return;
+	}
+	const auto &st = st::dialogsStories;
+	const auto use = std::min(summary.text.maxWidth(), summary.available);
+	const auto ratio = style::DevicePixelRatio();
+	summary.cache = QImage(
+		QSize(use, st.nameStyle.font->height) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	summary.cache.setDevicePixelRatio(ratio);
+	summary.cache.fill(Qt::transparent);
+	auto p = Painter(&summary.cache);
+	p.setPen(st::dialogsNameFg);
+	summary.text.drawElided(p, 0, 0, summary.available);
+}
+
+void List::paintSummary(
+		QPainter &p,
+		Data &data,
+		float64 summaryTop,
+		float64 hidden) {
+	const auto total = int(data.items.size());
+	auto &summary = ChooseSummary(data.summaries, total, width());
+	PrerenderSummary(summary);
+	const auto lerp = [&](float64 from, float64 to) {
+		return from + (to - from) * hidden;
+	};
+	const auto &st = st::dialogsStories;
+	const auto &full = st::dialogsStoriesFull;
+	const auto used = std::min(total, kSmallUserpicsShown);
+	const auto fullLeft = st.left
+		+ st.photoLeft
+		+ st.photo
+		+ (used - 1) * st.shift
+		+ st.nameLeft;
+	const auto leftFinal = std::min(
+		full.left + (full.photoLeft * 2 + full.photo) * total,
+		width()) * kSummaryExpandLeft;
+	const auto left = lerp(fullLeft, leftFinal);
+	const auto ratio = summary.cache.devicePixelRatio();
+	const auto summaryWidth = lerp(summary.cache.width() / ratio, 0.);
+	const auto summaryHeight = lerp(summary.cache.height() / ratio, 0.);
+	summaryTop += ((summary.cache.height() / ratio) - summaryHeight) / 2.;
+	p.setOpacity(1. - hidden);
+	p.drawImage(
+		QRectF(left, summaryTop, summaryWidth, summaryHeight),
+		summary.cache);
+}
+
 void List::wheelEvent(QWheelEvent *e) {
 	const auto horizontal = (e->angleDelta().x() != 0);
 	if (!horizontal) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index cbc635482..636f855f7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -55,6 +55,43 @@ private:
 		QColor nameCacheColor;
 		bool subscribed = false;
 	};
+	struct Summary {
+		QString string;
+		Ui::Text::String text;
+		int available = 0;
+		QImage cache;
+		QColor cacheColor;
+		int cacheForWidth = 0;
+
+		[[nodiscard]] bool empty() const {
+			return string.isEmpty();
+		}
+	};
+	struct Summaries {
+		Summary total;
+		Summary allNames;
+		Summary unreadNames;
+	};
+	struct Data {
+		std::vector<Item> items;
+		Summaries summaries;
+
+		[[nodiscard]] bool empty() const {
+			return items.empty();
+		}
+	};
+
+	[[nodiscard]] static Summaries ComposeSummaries(Data &data);
+	[[nodiscard]] static bool StringsEqual(
+		const Summaries &a,
+		const Summaries &b);
+	static void Populate(Summary &summary);
+	static void Populate(Summaries &summaries);
+	[[nodiscard]] static Summary &ChooseSummary(
+		Summaries &summaries,
+		int totalItems,
+		int fullWidth);
+	static void PrerenderSummary(Summary &summary);
 
 	void showContent(Content &&content);
 	void enterEventHook(QEnterEvent *e) override;
@@ -68,15 +105,21 @@ private:
 	void validateUserpic(not_null<Item*> item);
 	void validateName(not_null<Item*> item);
 	void updateScrollMax();
+	void updateSummary(Data &data);
 	void checkDragging();
 	bool finishDragging();
 
 	void updateHeight();
 	void toggleAnimated(bool shown);
+	void paintSummary(
+		QPainter &p,
+		Data &data,
+		float64 summaryTop,
+		float64 hidden);
 
 	Content _content;
-	std::vector<Item> _items;
-	std::vector<Item> _hidingItems;
+	Data _data;
+	Data _hidingData;
 	Fn<int()> _shownHeight = 0;
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<> _expandRequests;

From 455cb0d21bd3b72eb8d1c1735bc6e795970dd20a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 May 2023 21:36:54 +0400
Subject: [PATCH 251/676] Fix build with Xcode.

---
 .../history/view/controls/history_view_voice_record_button.cpp  | 1 -
 .../history/view/controls/history_view_voice_record_button.h    | 1 -
 Telegram/SourceFiles/media/stories/media_stories_controller.h   | 2 ++
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 71a652f4d..9bed92be9 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -51,7 +51,6 @@ VoiceRecordButton::VoiceRecordButton(
 	not_null<Ui::RpWidget*> parent,
 	const style::RecordBar &st)
 : AbstractButton(parent)
-, _st(st)
 , _blobs(std::make_unique<Ui::Paint::Blobs>(
 	Blobs(),
 	kLevelDuration,
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index fc477b485..bd3f0150c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -47,7 +47,6 @@ public:
 private:
 	void init();
 
-	const style::RecordBar &_st;
 	std::unique_ptr<Ui::Paint::Blobs> _blobs;
 
 	crl::time _lastUpdateTime = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 88a307dc0..2715ce8f5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -53,6 +53,8 @@ struct SiblingLayout {
 	QRect userpic;
 	QRect nameBoundingRect;
 	int nameFontSize = 0;
+
+	friend inline bool operator==(SiblingLayout, SiblingLayout) = default;
 };
 
 struct Layout {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 01326c842..733c61851 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1568,7 +1568,7 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) {
 		+ (_over == OverRotate ? _rotateNavOver : _rotateNavIcon)
 		+ (_over == OverMore ? _moreNavOver : _moreNavIcon)
 		+ ((_stories
-			&& (_over == OverLeftStories && _over == OverRightStories))
+			&& (_over == OverLeftStories || _over == OverRightStories))
 			? _stories->sibling(siblingType).layout.geometry
 			: QRect())
 		+ _headerNav

From 04e7ce44084727c869bd652c3c99931d64c61397 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 25 May 2023 13:32:13 +0400
Subject: [PATCH 252/676] Update API scheme on layer 160: Replies.

---
 Telegram/Resources/tl/api.tl                  | 37 ++++----
 Telegram/SourceFiles/api/api_bot.cpp          |  6 +-
 Telegram/SourceFiles/api/api_common.cpp       | 10 ++-
 Telegram/SourceFiles/api/api_common.h         |  5 +-
 Telegram/SourceFiles/api/api_peer_photo.cpp   |  3 +-
 Telegram/SourceFiles/api/api_polls.cpp        | 11 +--
 Telegram/SourceFiles/api/api_ringtones.cpp    |  3 +-
 Telegram/SourceFiles/api/api_sending.cpp      | 23 ++---
 Telegram/SourceFiles/apiwrap.cpp              | 84 ++++++++-----------
 .../boxes/background_preview_box.cpp          |  2 +-
 .../boxes/reactions_settings_box.cpp          |  6 +-
 .../chat_helpers/stickers_dice_pack.cpp       |  2 +-
 .../data/data_download_manager.cpp            |  2 +-
 Telegram/SourceFiles/data/data_histories.cpp  | 64 ++++++++++----
 Telegram/SourceFiles/data/data_histories.h    | 35 ++++----
 Telegram/SourceFiles/data/data_msg_id.h       | 31 +++++++
 .../data/data_scheduled_messages.cpp          |  4 +-
 Telegram/SourceFiles/data/data_stories.h      | 14 ----
 Telegram/SourceFiles/data/data_types.h        |  1 -
 .../export/data/export_data_types.cpp         |  4 +
 .../admin_log/history_admin_log_item.cpp      |  2 +-
 Telegram/SourceFiles/history/history.cpp      | 10 ++-
 Telegram/SourceFiles/history/history.h        |  8 +-
 .../history/history_inner_widget.cpp          |  2 +-
 Telegram/SourceFiles/history/history_item.cpp | 48 ++++++++---
 Telegram/SourceFiles/history/history_item.h   | 12 +--
 .../history/history_item_components.h         |  1 +
 .../history/history_item_helpers.cpp          | 13 ++-
 .../SourceFiles/history/history_widget.cpp    |  7 +-
 .../view/history_view_replies_section.cpp     |  5 +-
 .../inline_bots/bot_attach_web_view.cpp       | 19 ++---
 .../inline_bots/inline_bot_result.cpp         |  4 +-
 .../inline_bots/inline_bot_result.h           |  2 +-
 .../inline_bots/inline_bot_send_data.cpp      | 18 ++--
 .../inline_bots/inline_bot_send_data.h        | 10 +--
 .../stories/media_stories_controller.cpp      | 28 ++++---
 .../media/stories/media_stories_controller.h  |  2 +-
 .../media/stories/media_stories_delegate.h    | 11 ++-
 .../media/stories/media_stories_sibling.cpp   | 21 ++---
 .../media/stories/media_stories_sibling.h     |  6 +-
 .../media/view/media_view_overlay_widget.cpp  | 23 ++---
 .../media/view/media_view_overlay_widget.h    |  6 +-
 .../passport/passport_form_controller.cpp     |  2 +-
 .../SourceFiles/storage/localimageloader.cpp  | 56 +------------
 .../SourceFiles/storage/localimageloader.h    | 46 +---------
 .../support/support_autocomplete.cpp          |  4 +-
 .../window/notifications_manager.cpp          |  7 +-
 .../window/themes/window_theme.cpp            |  3 +-
 .../window/themes/window_theme_editor_box.cpp |  3 +-
 .../SourceFiles/window/window_peer_menu.cpp   | 12 +--
 50 files changed, 364 insertions(+), 374 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 4d682710b..d5b1f3652 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -412,6 +412,7 @@ updateAutoSaveSettings#ec05b097 = Update;
 updateGroupInvitePrivacyForbidden#ccf08ad6 user_id:long = Update;
 updateStories#66fad7b5 stories:UserStories = Update;
 updateReadStories#feb5345a user_id:long max_id:int = Update;
+updateStoryID#1bf335b9 id:int random_id:long = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -1280,6 +1281,7 @@ messages.messageViews#b6c4f543 views:Vector<MessageViews> chats:Vector<Chat> use
 messages.discussionMessage#a6341782 flags:# messages:Vector<Message> max_id:flags.0?int read_inbox_max_id:flags.1?int read_outbox_max_id:flags.2?int unread_count:int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
 
 messageReplyHeader#a6d57763 flags:# reply_to_scheduled:flags.2?true forum_topic:flags.3?true reply_to_msg_id:int reply_to_peer_id:flags.0?Peer reply_to_top_id:flags.1?int = MessageReplyHeader;
+messageReplyStoryHeader#9c98bfc1 user_id:long story_id:int = MessageReplyHeader;
 
 messageReplies#83d60fc2 flags:# comments:flags.0?true replies:int replies_pts:int recent_repliers:flags.1?Vector<Peer> channel_id:flags.0?long max_id:flags.2?int read_max_id:flags.3?int = MessageReplies;
 
@@ -1551,25 +1553,30 @@ messagePeerVoteMultiple#4628f6e6 peer:Peer options:Vector<bytes> date:int = Mess
 
 sponsoredWebPage#3db8ec63 flags:# url:string site_name:string photo:flags.0?Photo = SponsoredWebPage;
 
-storyViews#518b47d8 recent_viewers:Vector<long> views_count:int = StoryViews;
+storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long> = StoryViews;
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#a1d8cf8f id:int date:int = StoryItem;
-storyItem#8fcd96ac flags:# pinned:flags.5?true expired:flags.6?true id:int date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItem#8fcd96ac flags:# pinned:flags.5?true expired:flags.6?true public:flags.7?true id:int date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
 stories.allStoriesNotModified#47e0a07e state:string = stories.AllStories;
-stories.allStories#5b1aa68c flags:# has_more:flags.0?true state:string user_stories:Vector<UserStories> users:Vector<User> = stories.AllStories;
+stories.allStories#839e0428 flags:# has_more:flags.0?true count:int state:string user_stories:Vector<UserStories> users:Vector<User> = stories.AllStories;
 
 stories.stories#4fe57df1 count:int stories:Vector<StoryItem> users:Vector<User> = stories.Stories;
 
+stories.userStories#37a6ff5f stories:UserStories users:Vector<User> = stories.UserStories;
+
 storyView#a71aacc2 user_id:long date:int = StoryView;
 
 stories.storyViewsList#fb3f77ac count:int views:Vector<StoryView> users:Vector<User> = stories.StoryViewsList;
 
 stories.storyViews#de9eed1d views:Vector<StoryViews> users:Vector<User> = stories.StoryViews;
 
+inputReplyToMessage#9c5386e4 flags:# reply_to_msg_id:int top_msg_id:flags.0?int = InputReplyTo;
+inputReplyToStory#15b0f283 user_id:InputUser story_id:int = InputReplyTo;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1730,8 +1737,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#1cc20387 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 peer:InputPeer reply_to_msg_id:flags.0?int top_msg_id:flags.9?int 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 = Updates;
-messages.sendMedia#7547c966 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true peer:InputPeer reply_to_msg_id:flags.0?int top_msg_id:flags.9?int 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 = Updates;
+messages.sendMessage#280d096f 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 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 = Updates;
+messages.sendMedia#72ccc23d flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?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 = Updates;
 messages.forwardMessages#c661bbc4 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 = Updates;
 messages.reportSpam#cf1592db peer:InputPeer = Bool;
 messages.getPeerSettings#efd9a6a2 peer:InputPeer = messages.PeerSettings;
@@ -1775,7 +1782,7 @@ messages.getSavedGifs#5cf09635 hash:long = messages.SavedGifs;
 messages.saveGif#327a30cb id:InputDocument unsave:Bool = Bool;
 messages.getInlineBotResults#514e999d flags:# bot:InputUser peer:InputPeer geo_point:flags.0?InputGeoPoint query:string offset:string = messages.BotResults;
 messages.setInlineBotResults#bb12a419 flags:# gallery:flags.0?true private:flags.1?true query_id:long results:Vector<InputBotInlineResult> cache_time:int next_offset:flags.2?string switch_pm:flags.3?InlineBotSwitchPM switch_webview:flags.4?InlineBotWebView = Bool;
-messages.sendInlineBotResult#d3fbdccb flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true hide_via:flags.11?true peer:InputPeer reply_to_msg_id:flags.0?int top_msg_id:flags.9?int random_id:long query_id:long id:string schedule_date:flags.10?int send_as:flags.13?InputPeer = Updates;
+messages.sendInlineBotResult#f7bc68ba flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true hide_via:flags.11?true peer:InputPeer reply_to:flags.0?InputReplyTo random_id:long query_id:long id:string schedule_date:flags.10?int send_as:flags.13?InputPeer = Updates;
 messages.getMessageEditData#fda68d36 peer:InputPeer id:int = messages.MessageEditData;
 messages.editMessage#48f71778 flags:# no_webpage:flags.1?true peer:InputPeer id:int message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.15?int = Updates;
 messages.editInlineBotMessage#83557dba flags:# no_webpage:flags.1?true id:InputBotInlineMessageID message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> = Bool;
@@ -1804,13 +1811,13 @@ messages.getPinnedDialogs#d6b94df2 folder_id:int = messages.PeerDialogs;
 messages.setBotShippingResults#e5f672fa flags:# query_id:long error:flags.0?string shipping_options:flags.1?Vector<ShippingOption> = Bool;
 messages.setBotPrecheckoutResults#9c2dd95 flags:# success:flags.1?true query_id:long error:flags.0?string = Bool;
 messages.uploadMedia#519bc2b1 peer:InputPeer media:InputMedia = MessageMedia;
-messages.sendScreenshotNotification#c97df020 peer:InputPeer reply_to_msg_id:int random_id:long = Updates;
+messages.sendScreenshotNotification#a1405817 peer:InputPeer reply_to:InputReplyTo random_id:long = Updates;
 messages.getFavedStickers#4f1aaa9 hash:long = messages.FavedStickers;
 messages.faveSticker#b9ffc55b id:InputDocument unfave:Bool = Bool;
 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#b6f11a1c flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true peer:InputPeer reply_to_msg_id:flags.0?int top_msg_id:flags.9?int multi_media:Vector<InputSingleMedia> schedule_date:flags.10?int send_as:flags.13?InputPeer = Updates;
+messages.sendMultiMedia#456e8987 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true peer:InputPeer reply_to:flags.0?InputReplyTo multi_media:Vector<InputSingleMedia> schedule_date:flags.10?int send_as:flags.13?InputPeer = 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>;
@@ -1882,8 +1889,8 @@ messages.searchSentMedia#107e31a0 q:string filter:MessagesFilter limit:int = mes
 messages.getAttachMenuBots#16fcc2cb hash:long = AttachMenuBots;
 messages.getAttachMenuBot#77216192 bot:InputUser = AttachMenuBotsBot;
 messages.toggleBotInAttachMenu#69f59d69 flags:# write_allowed:flags.0?true bot:InputUser enabled:Bool = Bool;
-messages.requestWebView#178b480b flags:# from_bot_menu:flags.4?true silent:flags.5?true peer:InputPeer bot:InputUser url:flags.1?string start_param:flags.3?string theme_params:flags.2?DataJSON platform:string reply_to_msg_id:flags.0?int top_msg_id:flags.9?int send_as:flags.13?InputPeer = WebViewResult;
-messages.prolongWebView#7ff34309 flags:# silent:flags.5?true peer:InputPeer bot:InputUser query_id:long reply_to_msg_id:flags.0?int top_msg_id:flags.9?int send_as:flags.13?InputPeer = Bool;
+messages.requestWebView#269dc2c1 flags:# from_bot_menu:flags.4?true silent:flags.5?true peer:InputPeer bot:InputUser url:flags.1?string start_param:flags.3?string theme_params:flags.2?DataJSON platform:string reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = WebViewResult;
+messages.prolongWebView#b0d81a83 flags:# silent:flags.5?true peer:InputPeer bot:InputUser query_id:long reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = Bool;
 messages.requestSimpleWebView#299bec8e flags:# from_switch_webview:flags.1?true bot:InputUser url:string theme_params:flags.0?DataJSON platform:string = SimpleWebViewResult;
 messages.sendWebViewResultMessage#a4314f5 bot_query_id:string result:InputBotInlineResult = WebViewMessageSent;
 messages.sendWebViewData#dc0242c8 bot:InputUser random_id:long button_text:string data:string = Updates;
@@ -2104,15 +2111,17 @@ chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
 chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
-stories.sendStory#8e826f5d flags:# pinned:flags.2?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> = Updates;
+stories.sendStory#8b5c6986 flags:# pinned:flags.2?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long = Updates;
+stories.editStory#2aae7a41 flags:# id:int media:flags.0?InputMedia caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
 stories.deleteStories#b5d501d7 id:Vector<int> = Vector<int>;
-stories.editStoryPrivacy#78981875 id:int privacy_rules:Vector<InputPrivacyRule> = Updates;
 stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
 stories.getAllStories#eeb0d625 flags:# next:flags.1?true state:flags.0?string = stories.AllStories;
-stories.getUserStories#c946f3c0 flags:# pinned:flags.0?true user_id:InputUser offset_id:int limit:int = stories.Stories;
-stories.getStoriesByID#6a15cf46 user_id:InputUser id:Vector<int> = stories.Stories;
+stories.getUserStories#96d528e0 user_id:InputUser = stories.UserStories;
+stories.getPinnedStories#b471137 user_id:InputUser offset_id:int limit:int = stories.Stories;
 stories.getExpiredStories#8f792f2 offset_id:int limit:int = stories.Stories;
+stories.getStoriesByID#6a15cf46 user_id:InputUser id:Vector<int> = stories.Stories;
 stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
+stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
 stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;
 stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
 
diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 165402d7e..65826aa2f 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -375,8 +375,10 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 					ShowAtTheEndMsgId);
 				auto action = Api::SendAction(history);
 				action.clearDraft = false;
-				action.replyTo = itemId;
-				action.topicRootId = topicRootId;
+				action.replyTo = {
+					.msgId = itemId,
+					.topicRootId = topicRootId,
+				};
 				history->session().api().shareContact(
 					history->session().user(),
 					action);
diff --git a/Telegram/SourceFiles/api/api_common.cpp b/Telegram/SourceFiles/api/api_common.cpp
index f4afa97f6..0a44a916f 100644
--- a/Telegram/SourceFiles/api/api_common.cpp
+++ b/Telegram/SourceFiles/api/api_common.cpp
@@ -8,7 +8,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_common.h"
 
 #include "base/qt/qt_key_modifiers.h"
+#include "data/data_histories.h"
 #include "data/data_thread.h"
+#include "history/history.h"
 
 namespace Api {
 
@@ -17,8 +19,8 @@ SendAction::SendAction(
 	SendOptions options)
 : history(thread->owningHistory())
 , options(options)
-, replyTo(thread->topicRootId())
-, topicRootId(replyTo) {
+, replyTo({ .msgId = thread->topicRootId() }) {
+	replyTo.topicRootId = replyTo.msgId;
 }
 
 SendOptions DefaultSendWhenOnlineOptions() {
@@ -28,4 +30,8 @@ SendOptions DefaultSendWhenOnlineOptions() {
 	};
 }
 
+MTPInputReplyTo SendAction::mtpReplyTo() const {
+	return Data::ReplyToForMTP(&history->owner(), replyTo);
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_common.h b/Telegram/SourceFiles/api/api_common.h
index 1bdb97ee5..08ee59ca1 100644
--- a/Telegram/SourceFiles/api/api_common.h
+++ b/Telegram/SourceFiles/api/api_common.h
@@ -40,11 +40,12 @@ struct SendAction {
 
 	not_null<History*> history;
 	SendOptions options;
-	MsgId replyTo = 0;
-	MsgId topicRootId = 0;
+	FullReplyTo replyTo;
 	bool clearDraft = true;
 	bool generateLocal = true;
 	MsgId replaceMediaOf = 0;
+
+	[[nodiscard]] MTPInputReplyTo mtpReplyTo() const;
 };
 
 struct MessageToSend {
diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index a449b2200..71512172b 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -97,8 +97,7 @@ constexpr auto kSharedMediaLimit = 100;
 		photo,
 		photoThumbs,
 		MTP_documentEmpty(MTP_long(0)),
-		jpeg,
-		0);
+		jpeg);
 }
 
 [[nodiscard]] std::optional<MTPVideoSize> PrepareMtpMarkup(
diff --git a/Telegram/SourceFiles/api/api_polls.cpp b/Telegram/SourceFiles/api/api_polls.cpp
index d18c947c1..227b6e9db 100644
--- a/Telegram/SourceFiles/api/api_polls.cpp
+++ b/Telegram/SourceFiles/api/api_polls.cpp
@@ -43,13 +43,12 @@ void Polls::create(
 
 	const auto history = action.history;
 	const auto peer = history->peer;
-	const auto topicRootId = action.replyTo ? action.topicRootId : 0;
+	const auto topicRootId = action.replyTo.msgId
+		? action.replyTo.topicRootId
+		: 0;
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (action.replyTo) {
-		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
-		if (topicRootId) {
-			sendFlags |= MTPmessages_SendMedia::Flag::f_top_msg_id;
-		}
+		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
 	}
 	const auto clearCloudDraft = action.clearDraft;
 	if (clearCloudDraft) {
@@ -74,13 +73,11 @@ void Polls::create(
 	histories.sendPreparedMessage(
 		history,
 		action.replyTo,
-		topicRootId,
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(sendFlags),
 			peer->input,
 			Data::Histories::ReplyToPlaceholder(),
-			Data::Histories::TopicRootPlaceholder(),
 			PollDataToInputMedia(&data),
 			MTP_string(),
 			MTP_long(randomId),
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index 40b07e3f3..d9ad40176 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -60,8 +60,7 @@ SendMediaReady PrepareRingtoneDocument(
 		MTP_photoEmpty(MTP_long(0)),
 		PreparedPhotoThumbs(),
 		document,
-		QByteArray(),
-		0);
+		QByteArray());
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index e8d18c03c..9cfe272f8 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -86,10 +86,7 @@ void SendExistingMedia(
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (message.action.replyTo) {
 		flags |= MessageFlag::HasReplyInfo;
-		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
-		if (message.action.topicRootId) {
-			sendFlags |= MTPmessages_SendMedia::Flag::f_top_msg_id;
-		}
+		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
 	}
 	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = ShouldSendSilent(peer, message.action.options);
@@ -150,13 +147,11 @@ void SendExistingMedia(
 		histories.sendPreparedMessage(
 			history,
 			message.action.replyTo,
-			message.action.topicRootId,
 			randomId,
 			Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 				MTP_flags(sendFlags),
 				peer->input,
 				Data::Histories::ReplyToPlaceholder(),
-				Data::Histories::TopicRootPlaceholder(),
 				inputMedia(),
 				MTP_string(captionText),
 				MTP_long(randomId),
@@ -273,10 +268,7 @@ bool SendDice(MessageToSend &message) {
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (message.action.replyTo) {
 		flags |= MessageFlag::HasReplyInfo;
-		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
-		if (message.action.topicRootId) {
-			sendFlags |= MTPmessages_SendMedia::Flag::f_top_msg_id;
-		}
+		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
 	}
 	const auto replyHeader = NewMessageReplyHeader(message.action);
 	const auto anonymousPost = peer->amAnonymous();
@@ -320,13 +312,11 @@ bool SendDice(MessageToSend &message) {
 	histories.sendPreparedMessage(
 		history,
 		message.action.replyTo,
-		message.action.topicRootId,
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(sendFlags),
 			peer->input,
 			Data::Histories::ReplyToPlaceholder(),
-			Data::Histories::TopicRootPlaceholder(),
 			MTP_inputMediaDice(MTP_string(emoji)),
 			MTP_string(),
 			MTP_long(randomId),
@@ -378,12 +368,12 @@ void SendConfirmedFile(
 
 	if (!isEditing) {
 		const auto histories = &session->data().histories();
-		file->to.replyTo = histories->convertTopicReplyTo(
+		file->to.replyTo.msgId = histories->convertTopicReplyToId(
 			history,
-			file->to.replyTo);
-		file->to.topicRootId = histories->convertTopicReplyTo(
+			file->to.replyTo.msgId);
+		file->to.replyTo.topicRootId = histories->convertTopicReplyToId(
 			history,
-			file->to.topicRootId);
+			file->to.replyTo.topicRootId);
 	}
 
 	session->uploader().upload(newId, file);
@@ -391,7 +381,6 @@ void SendConfirmedFile(
 	auto action = SendAction(history, file->to.options);
 	action.clearDraft = false;
 	action.replyTo = file->to.replyTo;
-	action.topicRootId = file->to.topicRootId;
 	action.generateLocal = true;
 	action.replaceMediaOf = file->to.replaceMediaOf;
 	session->api().sendAction(action);
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index c60f96862..304c609d4 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3091,8 +3091,9 @@ void ApiWrap::sharedMediaDone(
 
 void ApiWrap::sendAction(const SendAction &action) {
 	if (!action.options.scheduled && !action.replaceMediaOf) {
-		const auto topic = action.topicRootId
-			? action.history->peer->forumTopicFor(action.topicRootId)
+		const auto topicRootId = action.replyTo.topicRootId;
+		const auto topic = topicRootId
+			? action.history->peer->forumTopicFor(topicRootId)
 			: nullptr;
 		if (topic) {
 			topic->readTillEnd();
@@ -3106,12 +3107,13 @@ void ApiWrap::sendAction(const SendAction &action) {
 
 void ApiWrap::finishForwarding(const SendAction &action) {
 	const auto history = action.history;
-	auto toForward = history->resolveForwardDraft(action.topicRootId);
+	const auto topicRootId = action.replyTo.topicRootId;
+	auto toForward = history->resolveForwardDraft(topicRootId);
 	if (!toForward.items.empty()) {
 		const auto error = GetErrorTextForSending(
 			history->peer,
 			{
-				.topicRootId = action.topicRootId,
+				.topicRootId = topicRootId,
 				.forward = &toForward.items,
 			});
 		if (!error.isEmpty()) {
@@ -3119,7 +3121,7 @@ void ApiWrap::finishForwarding(const SendAction &action) {
 		}
 
 		forwardMessages(std::move(toForward), action);
-		history->setForwardDraft(action.topicRootId, {});
+		history->setForwardDraft(topicRootId, {});
 	}
 
 	_session->data().sendHistoryChangeNotifications();
@@ -3163,31 +3165,33 @@ void ApiWrap::forwardMessages(
 	const auto silentPost = ShouldSendSilent(peer, action.options);
 	const auto sendAs = action.options.sendAs;
 
+	using SendFlag = MTPmessages_ForwardMessages::Flag;
 	auto flags = MessageFlags();
-	auto sendFlags = MTPmessages_ForwardMessages::Flags(0);
+	auto sendFlags = SendFlag() | SendFlag();
 	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
-		sendFlags |= MTPmessages_ForwardMessages::Flag::f_silent;
+		sendFlags |= SendFlag::f_silent;
 	}
 	if (action.options.scheduled) {
 		flags |= MessageFlag::IsOrWasScheduled;
-		sendFlags |= MTPmessages_ForwardMessages::Flag::f_schedule_date;
+		sendFlags |= SendFlag::f_schedule_date;
 	}
 	if (draft.options != Data::ForwardOptions::PreserveInfo) {
-		sendFlags |= MTPmessages_ForwardMessages::Flag::f_drop_author;
+		sendFlags |= SendFlag::f_drop_author;
 	}
 	if (draft.options == Data::ForwardOptions::NoNamesAndCaptions) {
-		sendFlags |= MTPmessages_ForwardMessages::Flag::f_drop_media_captions;
+		sendFlags |= SendFlag::f_drop_media_captions;
 	}
 	if (sendAs) {
-		sendFlags |= MTPmessages_ForwardMessages::Flag::f_send_as;
+		sendFlags |= SendFlag::f_send_as;
 	}
 	const auto kGeneralId = Data::ForumTopic::kGeneralId;
-	const auto topMsgId = (action.topicRootId == kGeneralId)
+	const auto topicRootId = action.replyTo.topicRootId;
+	const auto topMsgId = (topicRootId == kGeneralId)
 		? MsgId(0)
-		: action.topicRootId;
+		: topicRootId;
 	if (topMsgId) {
-		sendFlags |= MTPmessages_ForwardMessages::Flag::f_top_msg_id;
+		sendFlags |= SendFlag::f_top_msg_id;
 	}
 
 	auto forwardFrom = draft.items.front()->history()->peer;
@@ -3529,14 +3533,14 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 	action.generateLocal = true;
 	sendAction(action);
 
-	const auto replyToId = action.replyTo;
+	const auto replyToId = action.replyTo.msgId;
 	const auto replyTo = replyToId
 		? peer->owner().message(peer, replyToId)
 		: nullptr;
 	const auto topicRootId = replyTo
 		? replyTo->topicRootId()
-		: action.topicRootId
-		? action.topicRootId
+		: action.replyTo.topicRootId
+		? action.replyTo.topicRootId
 		: Data::ForumTopic::kGeneralId;
 	const auto topic = peer->forumTopicFor(topicRootId);
 	if (!(topic ? Data::CanSendTexts(topic) : Data::CanSendTexts(peer))
@@ -3575,10 +3579,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		auto sendFlags = MTPmessages_SendMessage::Flags(0);
 		if (action.replyTo) {
 			flags |= MessageFlag::HasReplyInfo;
-			sendFlags |= MTPmessages_SendMessage::Flag::f_reply_to_msg_id;
-			if (action.topicRootId) {
-				sendFlags |= MTPmessages_SendMessage::Flag::f_top_msg_id;
-			}
+			sendFlags |= MTPmessages_SendMessage::Flag::f_reply_to;
 		}
 		const auto replyHeader = NewMessageReplyHeader(action);
 		MTPMessageMedia media = MTP_messageMediaEmpty();
@@ -3605,7 +3606,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_entities;
 		}
 		const auto clearCloudDraft = action.clearDraft;
-		const auto topicRootId = action.topicRootId;
+		const auto topicRootId = action.replyTo.topicRootId;
 		if (clearCloudDraft) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_clear_draft;
 			history->clearCloudDraft(topicRootId);
@@ -3642,13 +3643,11 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		histories.sendPreparedMessage(
 			history,
 			action.replyTo,
-			topicRootId,
 			randomId,
 			Data::Histories::PrepareMessage<MTPmessages_SendMessage>(
 				MTP_flags(sendFlags),
 				peer->input,
 				Data::Histories::ReplyToPlaceholder(),
-				Data::Histories::TopicRootPlaceholder(),
 				msgText,
 				MTP_long(randomId),
 				MTPReplyMarkup(),
@@ -3737,29 +3736,29 @@ void ApiWrap::sendInlineResult(
 			? (*localMessageId)
 			: _session->data().nextLocalMessageId());
 	const auto randomId = base::RandomValue<uint64>();
-	const auto topicRootId = action.replyTo ? action.topicRootId : 0;
+	const auto topicRootId = action.replyTo.msgId
+		? action.replyTo.topicRootId
+		: 0;
 
+	using SendFlag = MTPmessages_SendInlineBotResult::Flag;
 	auto flags = NewMessageFlags(peer);
-	auto sendFlags = MTPmessages_SendInlineBotResult::Flag::f_clear_draft | 0;
+	auto sendFlags = SendFlag::f_clear_draft | SendFlag();
 	if (action.replyTo) {
 		flags |= MessageFlag::HasReplyInfo;
-		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_reply_to_msg_id;
-		if (topicRootId) {
-			sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_top_msg_id;
-		}
+		sendFlags |= SendFlag::f_reply_to;
 	}
 	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = ShouldSendSilent(peer, action.options);
 	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
-		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_silent;
+		sendFlags |= SendFlag::f_silent;
 	}
 	if (action.options.scheduled) {
 		flags |= MessageFlag::IsOrWasScheduled;
-		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_schedule_date;
+		sendFlags |= SendFlag::f_schedule_date;
 	}
 	if (action.options.hideViaBot) {
-		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_hide_via;
+		sendFlags |= SendFlag::f_hide_via;
 	}
 
 	const auto sendAs = action.options.sendAs;
@@ -3793,13 +3792,11 @@ void ApiWrap::sendInlineResult(
 	histories.sendPreparedMessage(
 		history,
 		action.replyTo,
-		topicRootId,
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendInlineBotResult>(
 			MTP_flags(sendFlags),
 			peer->input,
 			Data::Histories::ReplyToPlaceholder(),
-			Data::Histories::TopicRootPlaceholder(),
 			MTP_long(randomId),
 			MTP_long(data->getQueryId()),
 			MTP_string(data->getId()),
@@ -3912,8 +3909,7 @@ void ApiWrap::sendMediaWithRandomId(
 		Api::SendOptions options,
 		uint64 randomId) {
 	const auto history = item->history();
-	const auto replyTo = item->replyToId();
-	const auto topicRootId = item->topicRootId();
+	const auto replyTo = item->replyTo();
 
 	auto caption = item->originalText();
 	TextUtilities::Trim(caption);
@@ -3926,8 +3922,7 @@ void ApiWrap::sendMediaWithRandomId(
 
 	using Flag = MTPmessages_SendMedia::Flag;
 	const auto flags = Flag(0)
-		| (replyTo ? Flag::f_reply_to_msg_id : Flag(0))
-		| (topicRootId ? Flag::f_top_msg_id : Flag(0))
+		| (replyTo ? Flag::f_reply_to : Flag(0))
 		| (ShouldSendSilent(history->peer, options)
 			? Flag::f_silent
 			: Flag(0))
@@ -3941,13 +3936,11 @@ void ApiWrap::sendMediaWithRandomId(
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
-		topicRootId,
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(flags),
 			peer->input,
 			Data::Histories::ReplyToPlaceholder(),
-			Data::Histories::TopicRootPlaceholder(),
 			media,
 			MTP_string(caption.text),
 			MTP_long(randomId),
@@ -4028,13 +4021,11 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		return;
 	}
 	const auto history = sample->history();
-	const auto replyTo = sample->replyToId();
-	const auto topicRootId = sample->topicRootId();
+	const auto replyTo = sample->replyTo();
 	const auto sendAs = album->options.sendAs;
 	using Flag = MTPmessages_SendMultiMedia::Flag;
 	const auto flags = Flag(0)
-		| (replyTo ? Flag::f_reply_to_msg_id : Flag(0))
-		| (topicRootId ? Flag::f_top_msg_id : Flag(0))
+		| (replyTo ? Flag::f_reply_to : Flag(0))
 		| (ShouldSendSilent(history->peer, album->options)
 			? Flag::f_silent
 			: Flag(0))
@@ -4045,13 +4036,11 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
-		topicRootId,
 		uint64(0), // randomId
 		Data::Histories::PrepareMessage<MTPmessages_SendMultiMedia>(
 			MTP_flags(flags),
 			peer->input,
 			Data::Histories::ReplyToPlaceholder(),
-			Data::Histories::TopicRootPlaceholder(),
 			MTP_vector<MTPInputSingleMedia>(medias),
 			MTP_int(album->options.scheduled),
 			(sendAs ? sendAs->input : MTP_inputPeerEmpty())
@@ -4074,7 +4063,6 @@ FileLoadTo ApiWrap::fileLoadTaskOptions(const SendAction &action) const {
 		peer->id,
 		action.options,
 		action.replyTo,
-		action.topicRootId,
 		action.replaceMediaOf);
 }
 
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 738a88165..c83af953d 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -95,7 +95,7 @@ constexpr auto kDefaultDimming = 50;
 	const auto flags = MessageFlag::FakeHistoryItem
 		| MessageFlag::HasFromId
 		| (out ? MessageFlag::Outgoing : MessageFlag(0));
-	const auto replyTo = MsgId();
+	const auto replyTo = FullReplyTo();
 	const auto viaBotId = UserId();
 	const auto groupedId = uint64();
 	const auto item = history->makeMessage(
diff --git a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
index 8c3845efe..7ddcd57ab 100644
--- a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
@@ -76,11 +76,11 @@ AdminLog::OwnedItem GenerateItem(
 
 	const auto item = history->addNewLocalMessage(
 		history->nextNonHistoryEntryId(),
-		MessageFlag::FakeHistoryItem
+		(MessageFlag::FakeHistoryItem
 			| MessageFlag::HasFromId
-			| MessageFlag::HasReplyInfo,
+			| MessageFlag::HasReplyInfo),
 		UserId(), // via
-		replyTo,
+		FullReplyTo{ .msgId = replyTo },
 		base::unixtime::now(), // date
 		from,
 		QString(), // postAuthor
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
index fed572b75..dcebbfdc4 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
@@ -128,7 +128,7 @@ void DicePack::generateLocal(int index, const QString &name) {
 		QByteArray(),
 		nullptr,
 		SendMediaType::File,
-		FileLoadTo(0, {}, 0, 0, 0),
+		FileLoadTo(0, {}, {}, 0),
 		{},
 		false);
 	task.process({ .generateGoodThumbnail = false });
diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index 05080dfcb..088dc0b92 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -865,7 +865,7 @@ not_null<HistoryItem*> DownloadManager::generateItem(
 		? previousItem->history()
 		: session->data().history(session->user());
 	const auto flags = MessageFlag::FakeHistoryItem;
-	const auto replyTo = MsgId();
+	const auto replyTo = FullReplyTo();
 	const auto viaBotId = UserId();
 	const auto date = base::unixtime::now();
 	const auto postAuthor = QString();
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index 7c80d75ac..d69b11ce4 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_scheduled_messages.h"
+#include "data/data_user.h"
 #include "base/unixtime.h"
 #include "base/random.h"
 #include "main/main_session.h"
@@ -31,6 +32,29 @@ constexpr auto kReadRequestTimeout = 3 * crl::time(1000);
 
 } // namespace
 
+MTPInputReplyTo ReplyToForMTP(
+		not_null<Session*> owner,
+		FullReplyTo replyTo) {
+	if (replyTo.msgId || replyTo.topicRootId) {
+		using Flag = MTPDinputReplyToMessage::Flag;
+		return MTP_inputReplyToMessage(
+			(replyTo.topicRootId
+				? MTP_flags(Flag::f_top_msg_id)
+				: MTP_flags(0)),
+			MTP_int(replyTo.msgId ? replyTo.msgId : replyTo.topicRootId),
+			MTP_int(replyTo.topicRootId));
+	} else if (replyTo.storyId) {
+		if (const auto peer = owner->peerLoaded(replyTo.storyId.peer)) {
+			if (const auto user = peer->asUser()) {
+				return MTP_inputReplyToStory(
+					user->inputUser,
+					MTP_int(replyTo.storyId.story));
+			}
+		}
+	}
+	return MTPInputReplyTo();
+}
+
 Histories::Histories(not_null<Session*> owner)
 : _owner(owner)
 , _readRequestsTimer([=] { sendReadRequests(); }) {
@@ -885,23 +909,24 @@ bool Histories::isCreatingTopic(
 
 int Histories::sendPreparedMessage(
 		not_null<History*> history,
-		MsgId replyTo,
-		MsgId topicRootId,
+		FullReplyTo replyTo,
 		uint64 randomId,
-		Fn<PreparedMessage(MsgId replyTo, MsgId topicRootId)> message,
+		Fn<PreparedMessage(not_null<Session*>, FullReplyTo)> message,
 		Fn<void(const MTPUpdates&, const MTP::Response&)> done,
 		Fn<void(const MTP::Error&, const MTP::Response&)> fail) {
-	if (isCreatingTopic(history, topicRootId)) {
+	if (isCreatingTopic(history, replyTo.topicRootId)) {
 		const auto id = ++_requestAutoincrement;
-		const auto creatingId = FullMsgId(history->peer->id, topicRootId);
+		const auto creatingId = FullMsgId(
+			history->peer->id,
+			replyTo.topicRootId);
 		auto i = _creatingTopics.find(creatingId);
 		if (i == end(_creatingTopics)) {
-			sendCreateTopicRequest(history, topicRootId);
+			sendCreateTopicRequest(history, replyTo.topicRootId);
 			i = _creatingTopics.emplace(creatingId).first;
 		}
 		i->second.push_back({
 			.randomId = randomId,
-			.replyTo = replyTo,
+			.replyTo = replyTo.msgId,
 			.message = std::move(message),
 			.done = std::move(done),
 			.fail = std::move(fail),
@@ -910,9 +935,12 @@ int Histories::sendPreparedMessage(
 		_creatingTopicRequests.emplace(id);
 		return id;
 	}
-	const auto realReply = convertTopicReplyTo(history, replyTo);
-	const auto realRoot = convertTopicReplyTo(history, topicRootId);
-	return v::match(message(realReply, realRoot), [&](const auto &request) {
+	const auto realReplyTo = FullReplyTo{
+		.msgId = convertTopicReplyToId(history, replyTo.msgId),
+		.topicRootId = convertTopicReplyToId(history, replyTo.topicRootId),
+		.storyId = replyTo.storyId,
+	};
+	return v::match(message(_owner, realReplyTo), [&](const auto &request) {
 		const auto type = RequestType::Send;
 		return sendRequest(history, type, [=](Fn<void()> finish) {
 			const auto session = &_owner->session();
@@ -955,8 +983,10 @@ void Histories::checkTopicCreated(FullMsgId rootId, MsgId realRoot) {
 			_creatingTopicRequests.erase(entry.requestId);
 			sendPreparedMessage(
 				history,
-				entry.replyTo,
-				realRoot,
+				FullReplyTo{
+					.msgId = entry.replyTo,
+					.topicRootId = realRoot,
+				},
 				entry.randomId,
 				std::move(entry.message),
 				std::move(entry.done),
@@ -976,14 +1006,14 @@ void Histories::checkTopicCreated(FullMsgId rootId, MsgId realRoot) {
 	}
 }
 
-MsgId Histories::convertTopicReplyTo(
+MsgId Histories::convertTopicReplyToId(
 		not_null<History*> history,
-		MsgId replyTo) const {
-	if (!replyTo) {
+		MsgId replyToId) const {
+	if (!replyToId) {
 		return {};
 	}
-	const auto i = _createdTopicIds.find({ history->peer->id, replyTo });
-	return (i != end(_createdTopicIds)) ? i->second : replyTo;
+	const auto i = _createdTopicIds.find({ history->peer->id, replyToId });
+	return (i != end(_createdTopicIds)) ? i->second : replyToId;
 }
 
 void Histories::checkPostponed(not_null<History*> history, int id) {
diff --git a/Telegram/SourceFiles/data/data_histories.h b/Telegram/SourceFiles/data/data_histories.h
index 05f7534f4..c98dc352c 100644
--- a/Telegram/SourceFiles/data/data_histories.h
+++ b/Telegram/SourceFiles/data/data_histories.h
@@ -26,6 +26,10 @@ namespace Data {
 class Session;
 class Folder;
 
+[[nodiscard]] MTPInputReplyTo ReplyToForMTP(
+	not_null<Session*> owner,
+	FullReplyTo replyTo);
+
 class Histories final {
 public:
 	enum class RequestType : uchar {
@@ -102,29 +106,27 @@ public:
 		MTPmessages_SendMultiMedia>;
 	int sendPreparedMessage(
 		not_null<History*> history,
-		MsgId replyTo,
-		MsgId topicRootId,
+		FullReplyTo replyTo,
 		uint64 randomId,
-		Fn<PreparedMessage(MsgId replyTo, MsgId topicRootId)> message,
+		Fn<PreparedMessage(not_null<Session*>, FullReplyTo)> message,
 		Fn<void(const MTPUpdates&, const MTP::Response&)> done,
 		Fn<void(const MTP::Error&, const MTP::Response&)> fail);
 
 	struct ReplyToPlaceholder {
 	};
-	struct TopicRootPlaceholder {
-	};
 	template <typename RequestType, typename ...Args>
-	static Fn<Histories::PreparedMessage(MsgId, MsgId)> PrepareMessage(
-			const Args &...args) {
-		return [=](MsgId replyTo, MsgId topicRootId) -> RequestType {
-			return { ReplaceReplyIds(args, replyTo, topicRootId)... };
+	static auto PrepareMessage(const Args &...args)
+	-> Fn<Histories::PreparedMessage(not_null<Session*>, FullReplyTo)> {
+		return [=](not_null<Session*> owner, FullReplyTo replyTo)
+		-> RequestType {
+			return { ReplaceReplyIds(owner, args, replyTo)... };
 		};
 	}
 
 	void checkTopicCreated(FullMsgId rootId, MsgId realRoot);
-	[[nodiscard]] MsgId convertTopicReplyTo(
+	[[nodiscard]] MsgId convertTopicReplyToId(
 		not_null<History*> history,
-		MsgId replyTo) const;
+		MsgId replyToId) const;
 
 private:
 	struct PostponedHistoryRequest {
@@ -151,7 +153,7 @@ private:
 	struct DelayedByTopicMessage {
 		uint64 randomId = 0;
 		MsgId replyTo = 0;
-		Fn<PreparedMessage(MsgId replyTo, MsgId topicRootId)> message;
+		Fn<PreparedMessage(not_null<Session*>, FullReplyTo)> message;
 		Fn<void(const MTPUpdates&, const MTP::Response&)> done;
 		Fn<void(const MTP::Error&, const MTP::Response&)> fail;
 		int requestId = 0;
@@ -166,11 +168,12 @@ private:
 	};
 
 	template <typename Arg>
-	static auto ReplaceReplyIds(Arg arg, MsgId replyTo, MsgId topicRootId) {
+	static auto ReplaceReplyIds(
+			not_null<Session*> owner,
+			Arg arg,
+			FullReplyTo replyTo) {
 		if constexpr (std::is_same_v<Arg, ReplyToPlaceholder>) {
-			return MTP_int(replyTo);
-		} else if constexpr (std::is_same_v<Arg, TopicRootPlaceholder>) {
-			return MTP_int(topicRootId);
+			return ReplyToForMTP(owner, replyTo);
 		} else {
 			return arg;
 		}
diff --git a/Telegram/SourceFiles/data/data_msg_id.h b/Telegram/SourceFiles/data/data_msg_id.h
index ac39eddfb..af6b73fcc 100644
--- a/Telegram/SourceFiles/data/data_msg_id.h
+++ b/Telegram/SourceFiles/data/data_msg_id.h
@@ -136,6 +136,37 @@ struct GlobalMsgId {
 	}
 };
 
+using StoryId = int32;
+
+struct FullStoryId {
+	PeerId peer = 0;
+	StoryId story = 0;
+
+	[[nodiscard]] bool valid() const {
+		return peer != 0 && story != 0;
+	}
+	explicit operator bool() const {
+		return valid();
+	}
+	friend inline auto operator<=>(FullStoryId, FullStoryId) = default;
+	friend inline bool operator==(FullStoryId, FullStoryId) = default;
+};
+
+struct FullReplyTo {
+	MsgId msgId = 0;
+	MsgId topicRootId = 0;
+	FullStoryId storyId;
+
+	[[nodiscard]] bool valid() const {
+		return msgId || storyId;
+	}
+	explicit operator bool() const {
+		return valid();
+	}
+	friend inline auto operator<=>(FullReplyTo, FullReplyTo) = default;
+	friend inline bool operator==(FullReplyTo, FullReplyTo) = default;
+};
+
 namespace std {
 
 template <>
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
index 21e0c48b3..820b7c0d2 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
@@ -192,13 +192,13 @@ void ScheduledMessages::sendNowSimpleMessage(
 
 	const auto history = local->history();
 	auto action = Api::SendAction(history);
-	action.replyTo = local->replyToId();
+	action.replyTo = local->replyTo();
 	const auto replyHeader = NewMessageReplyHeader(action);
 	const auto localFlags = NewMessageFlags(history->peer)
 		& ~MessageFlag::BeingSent;
 	const auto flags = MTPDmessage::Flag::f_entities
 		| MTPDmessage::Flag::f_from_id
-		| (local->replyToId()
+		| (action.replyTo
 			? MTPDmessage::Flag::f_reply_to
 			: MTPDmessage::Flag(0))
 		| (update.vttl_period()
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index ce8ca4d60..6c3aaa56d 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -46,20 +46,6 @@ struct StoriesList {
 	friend inline bool operator==(StoriesList, StoriesList) = default;
 };
 
-struct FullStoryId {
-	UserData *user = nullptr;
-	StoryId id = 0;
-
-	[[nodiscard]] bool valid() const {
-		return user != nullptr && id != 0;
-	}
-	explicit operator bool() const {
-		return valid();
-	}
-	friend inline auto operator<=>(FullStoryId, FullStoryId) = default;
-	friend inline bool operator==(FullStoryId, FullStoryId) = default;
-};
-
 class Stories final {
 public:
 	explicit Stories(not_null<Session*> owner);
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index 8f6ee551b..710cc4e1f 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -135,7 +135,6 @@ using PollId = uint64;
 using WallPaperId = uint64;
 using CallId = uint64;
 using BotAppId = uint64;
-using StoryId = int32;
 
 constexpr auto CancelledWebPageId = WebPageId(0xFFFFFFFFFFFFFFFFULL);
 
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index b0bd24268..1b66a550f 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1260,6 +1260,8 @@ Message ParseMessage(
 					if (result.replyToPeerId == result.peerId) {
 						result.replyToPeerId = 0;
 					}
+				}, [&](const MTPDmessageReplyStoryHeader &data) {
+					// #TODO stories export
 				});
 			}
 		}
@@ -1307,6 +1309,8 @@ Message ParseMessage(
 				result.replyToPeerId = data.vreply_to_peer_id()
 					? ParsePeerId(*data.vreply_to_peer_id())
 					: PeerId(0);
+			}, [&](const MTPDmessageReplyStoryHeader &data) {
+				// #TODO stories export
 			});
 		}
 		if (const auto viaBotId = data.vvia_bot_id()) {
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 ba2442308..4e2e3cd41 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -820,7 +820,7 @@ void GenerateItems(
 	const auto makeSimpleTextMessage = [&](TextWithEntities &&text) {
 		const auto bodyFlags = MessageFlag::HasFromId
 			| MessageFlag::AdminLogEntry;
-		const auto bodyReplyTo = MsgId();
+		const auto bodyReplyTo = FullReplyTo();
 		const auto bodyViaBotId = UserId();
 		const auto bodyGroupedId = uint64();
 		return history->makeMessage(
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 262af2bec..5617a0991 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -631,7 +631,7 @@ not_null<HistoryItem*> History::addNewLocalMessage(
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
@@ -679,7 +679,7 @@ not_null<HistoryItem*> History::addNewLocalMessage(
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
@@ -705,7 +705,7 @@ not_null<HistoryItem*> History::addNewLocalMessage(
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
@@ -731,7 +731,7 @@ not_null<HistoryItem*> History::addNewLocalMessage(
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
@@ -1144,6 +1144,8 @@ void History::applyServiceChanges(
 						topic->setHasPinnedMessages(true);
 					}
 				}
+			}, [&](const MTPDmessageReplyStoryHeader &data) {
+				LOG(("API Error: story reply in messageActionPinMessage."));
 			});
 		}
 	}, [&](const MTPDmessageActionGroupCall &data) {
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index d2b80be10..933832d79 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -148,7 +148,7 @@ public:
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
@@ -168,7 +168,7 @@ public:
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
@@ -179,7 +179,7 @@ public:
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
@@ -190,7 +190,7 @@ public:
 		MsgId id,
 		MessageFlags flags,
 		UserId viaBotId,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		TimeId date,
 		PeerId from,
 		const QString &postAuthor,
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index e719d9716..8d0d8b980 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -390,7 +390,7 @@ bool HistoryInner::BotAbout::refresh() {
 		| MessageFlag::Local;
 	const auto postAuthor = QString();
 	const auto date = TimeId(0);
-	const auto replyTo = MsgId(0);
+	const auto replyTo = FullReplyTo();
 	const auto viaBotId = UserId(0);
 	const auto groupedId = uint64(0);
 	const auto textWithEntities = TextUtilities::ParseEntities(
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index b0c2e55f0..cab562735 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -131,6 +131,7 @@ struct HistoryItem::CreateConfig {
 	PeerId replyToPeer = 0;
 	MsgId replyTo = 0;
 	MsgId replyToTop = 0;
+	StoryId replyToStory = 0;
 	bool replyIsTopicPost = false;
 	UserId viaBotId = 0;
 	int viewsCount = -1;
@@ -506,7 +507,7 @@ HistoryItem::HistoryItem(
 	not_null<History*> history,
 	MsgId id,
 	MessageFlags flags,
-	MsgId replyTo,
+	FullReplyTo replyTo,
 	UserId viaBotId,
 	TimeId date,
 	PeerId from,
@@ -541,7 +542,7 @@ HistoryItem::HistoryItem(
 	not_null<History*> history,
 	MsgId id,
 	MessageFlags flags,
-	MsgId replyTo,
+	FullReplyTo replyTo,
 	UserId viaBotId,
 	TimeId date,
 	PeerId from,
@@ -576,7 +577,7 @@ HistoryItem::HistoryItem(
 	not_null<History*> history,
 	MsgId id,
 	MessageFlags flags,
-	MsgId replyTo,
+	FullReplyTo replyTo,
 	UserId viaBotId,
 	TimeId date,
 	PeerId from,
@@ -606,7 +607,7 @@ HistoryItem::HistoryItem(
 	not_null<History*> history,
 	MsgId id,
 	MessageFlags flags,
-	MsgId replyTo,
+	FullReplyTo replyTo,
 	UserId viaBotId,
 	TimeId date,
 	PeerId from,
@@ -648,7 +649,7 @@ HistoryItem::HistoryItem(
 		/*from.peer ? from.peer->id : */PeerId(0)) {
 	createComponentsHelper(
 		_flags,
-		MsgId(0), // replyTo
+		FullReplyTo(),
 		UserId(0), // viaBotId
 		QString(), // postAuthor
 		HistoryMessageMarkupData());
@@ -1542,6 +1543,7 @@ void HistoryItem::applySentMessage(const MTPDmessage &data) {
 				data.vreply_to_top_id().value_or(
 					data.vreply_to_msg_id().v),
 				data.is_forum_topic());
+		}, [](const MTPDmessageReplyStoryHeader &data) {
 		});
 	}
 	setPostAuthor(data.vpost_author().value_or_empty());
@@ -2742,6 +2744,26 @@ MsgId HistoryItem::topicRootId() const {
 	return Data::ForumTopic::kGeneralId;
 }
 
+FullStoryId HistoryItem::replyToStory() const {
+	if (const auto reply = Get<HistoryMessageReply>()) {
+		if (reply->replyToStoryId) {
+			const auto peerId = reply->replyToPeerId
+				? reply->replyToPeerId
+				: _history->peer->id;
+			return { .peer = peerId, .story = reply->replyToStoryId };
+		}
+	}
+	return {};
+}
+
+FullReplyTo HistoryItem::replyTo() const {
+	return {
+		.msgId = replyToId(),
+		.topicRootId = topicRootId(),
+		.storyId = replyToStory(),
+	};
+}
+
 void HistoryItem::setText(const TextWithEntities &textWithEntities) {
 	for (const auto &entity : textWithEntities.entities) {
 		auto type = entity.type();
@@ -2903,7 +2925,7 @@ const std::vector<ClickHandlerPtr> &HistoryItem::customTextLinks() const {
 
 void HistoryItem::createComponents(CreateConfig &&config) {
 	uint64 mask = 0;
-	if (config.replyTo) {
+	if (config.replyTo || config.replyToStory) {
 		mask |= HistoryMessageReply::Bit();
 	}
 	if (config.viaBotId) {
@@ -3125,17 +3147,19 @@ void HistoryItem::setSponsoredFrom(const Data::SponsoredFrom &from) {
 
 void HistoryItem::createComponentsHelper(
 		MessageFlags flags,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		UserId viaBotId,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) {
 	auto config = CreateConfig();
 	config.viaBotId = viaBotId;
 	if (flags & MessageFlag::HasReplyInfo) {
-		config.replyTo = replyTo;
-		const auto to = LookupReplyTo(_history, replyTo);
+		config.replyTo = replyTo.msgId;
+		config.replyToStory = replyTo.storyId.story;
+		config.replyToPeer = replyTo.storyId ? replyTo.storyId.peer : 0;
+		const auto to = LookupReplyTo(_history, replyTo.msgId);
 		const auto replyToTop = LookupReplyToTop(to);
-		config.replyToTop = replyToTop ? replyToTop : replyTo;
+		config.replyToTop = replyToTop ? replyToTop : replyTo.msgId;
 		const auto forum = _history->asForum();
 		config.replyIsTopicPost = LookupReplyIsTopicPost(to)
 			|| (to && to->Has<HistoryServiceTopicInfo>())
@@ -3245,6 +3269,9 @@ void HistoryItem::createComponents(const MTPDmessage &data) {
 				: id;
 			config.replyToTop = data.vreply_to_top_id().value_or(id);
 			config.replyIsTopicPost = data.is_forum_topic();
+		}, [&](const MTPDmessageReplyStoryHeader &data) {
+			config.replyToPeer = peerFromUser(data.vuser_id());
+			config.replyToStory = data.vstory_id().v;
 		});
 	}
 	config.viaBotId = data.vvia_bot_id().value_or_empty();
@@ -3499,6 +3526,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 						dependent->msgId);
 				}
 			}
+		}, [](const MTPDmessageReplyStoryHeader &data) {
 		});
 	}
 	setServiceMessageByAction(action);
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index b26793963..7ef66d7d6 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -117,7 +117,7 @@ public:
 		not_null<History*> history,
 		MsgId id,
 		MessageFlags flags,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		UserId viaBotId,
 		TimeId date,
 		PeerId from,
@@ -147,7 +147,7 @@ public:
 		not_null<History*> history,
 		MsgId id,
 		MessageFlags flags,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		UserId viaBotId,
 		TimeId date,
 		PeerId from,
@@ -159,7 +159,7 @@ public:
 		not_null<History*> history,
 		MsgId id,
 		MessageFlags flags,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		UserId viaBotId,
 		TimeId date,
 		PeerId from,
@@ -171,7 +171,7 @@ public:
 		not_null<History*> history,
 		MsgId id,
 		MessageFlags flags,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		UserId viaBotId,
 		TimeId date,
 		PeerId from,
@@ -458,6 +458,8 @@ public:
 	[[nodiscard]] MsgId replyToId() const;
 	[[nodiscard]] MsgId replyToTop() const;
 	[[nodiscard]] MsgId topicRootId() const;
+	[[nodiscard]] FullStoryId replyToStory() const;
+	[[nodiscard]] FullReplyTo replyTo() const;
 	[[nodiscard]] bool inThread(MsgId rootId) const;
 
 	[[nodiscard]] not_null<PeerData*> author() const;
@@ -518,7 +520,7 @@ private:
 
 	void createComponentsHelper(
 		MessageFlags flags,
-		MsgId replyTo,
+		FullReplyTo replyTo,
 		UserId viaBotId,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup);
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 5b92c6cfc..0545a9760 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -243,6 +243,7 @@ struct HistoryMessageReply
 	PeerId replyToPeerId = 0;
 	MsgId replyToMsgId = 0;
 	MsgId replyToMsgTop = 0;
+	StoryId replyToStoryId = 0;
 	using ColorKey = PeerId;
 	ColorKey replyToColorKey = 0;
 	DocumentId replyToDocumentId = 0;
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 7042cb557..a7def067b 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -309,8 +309,13 @@ MessageFlags FlagsFromMTP(
 }
 
 MTPMessageReplyHeader NewMessageReplyHeader(const Api::SendAction &action) {
-	if (const auto id = action.replyTo) {
-		const auto to = LookupReplyTo(action.history, id);
+	if (const auto replyTo = action.replyTo) {
+		if (replyTo.storyId) {
+			return MTP_messageReplyStoryHeader(
+				MTP_long(peerToUser(replyTo.storyId.peer).bare),
+				MTP_int(replyTo.storyId.story));
+		}
+		const auto to = LookupReplyTo(action.history, replyTo.msgId);
 		if (const auto replyToTop = LookupReplyToTop(to)) {
 			using Flag = MTPDmessageReplyHeader::Flag;
 			return MTP_messageReplyHeader(
@@ -318,13 +323,13 @@ MTPMessageReplyHeader NewMessageReplyHeader(const Api::SendAction &action) {
 					| (LookupReplyIsTopicPost(to)
 						? Flag::f_forum_topic
 						: Flag(0))),
-				MTP_int(id),
+				MTP_int(replyTo.msgId),
 				MTPPeer(),
 				MTP_int(replyToTop));
 		}
 		return MTP_messageReplyHeader(
 			MTP_flags(0),
-			MTP_int(id),
+			MTP_int(replyTo.msgId),
 			MTPPeer(),
 			MTPint());
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 99db1769a..106dce71e 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -853,7 +853,7 @@ HistoryWidget::HistoryWidget(
 	}) | rpl::start_with_next([=](const Api::SendAction &action) {
 		const auto lastKeyboardUsed = lastForceReplyReplied(FullMsgId(
 			action.history->peer->id,
-			action.replyTo));
+			action.replyTo.msgId));
 		if (action.replaceMediaOf) {
 		} else if (action.options.scheduled) {
 			cancelReply(lastKeyboardUsed);
@@ -3841,8 +3841,7 @@ void HistoryWidget::hideSelectorControlsAnimated() {
 Api::SendAction HistoryWidget::prepareSendAction(
 		Api::SendOptions options) const {
 	auto result = Api::SendAction(_history, options);
-	result.replyTo = replyToId();
-	result.topicRootId = 0;
+	result.replyTo = { .msgId = replyToId() };
 	result.options.sendAs = _sendAs
 		? _history->session().sendAsPeers().resolveChosen(
 			_history->peer).get()
@@ -4348,7 +4347,7 @@ void HistoryWidget::sendBotCommand(const Bot::SendCommandRequest &request) {
 
 	auto message = Api::MessageToSend(prepareSendAction({}));
 	message.textWithTags = { toSend, TextWithTags::Tags() };
-	message.action.replyTo = request.replyTo
+	message.action.replyTo.msgId = request.replyTo
 		? ((!_peer->isUser()/* && (botStatus == 0 || botStatus == 2)*/)
 			? request.replyTo
 			: replyToId())
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index f8ddd36e2..aeacfd251 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1012,7 +1012,7 @@ void RepliesWidget::sendingFilesConfirmed(
 			album,
 			action);
 	}
-	if (_composeControls->replyingToMessage().msg == action.replyTo) {
+	if (_composeControls->replyingToMessage().msg == action.replyTo.msgId) {
 		_composeControls->cancelReplyMessage();
 		refreshTopBarActiveChat();
 	}
@@ -1135,8 +1135,7 @@ bool RepliesWidget::showSendingFilesError(
 Api::SendAction RepliesWidget::prepareSendAction(
 		Api::SendOptions options) const {
 	auto result = Api::SendAction(_history, options);
-	result.replyTo = replyToId();
-	result.topicRootId = _rootId;
+	result.replyTo = { .msgId = replyToId(), .topicRootId = _rootId };
 	result.options.sendAs = _composeControls->sendAsPeer();
 	return result;
 }
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 5b4398c9f..e00e50d43 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -481,7 +481,6 @@ bool AttachWebView::IsSame(
 		&& (a->fromSwitch == b.fromSwitch)
 		&& (a->action.history == b.action.history)
 		&& (a->action.replyTo == b.action.replyTo)
-		&& (a->action.topicRootId == b.action.topicRootId)
 		&& (a->action.options.sendAs == b.action.options.sendAs)
 		&& (a->action.options.silent == b.action.options.silent);
 }
@@ -533,8 +532,7 @@ void AttachWebView::request(const WebViewButton &button) {
 	const auto flags = Flag::f_theme_params
 		| (button.url.isEmpty() ? Flag(0) : Flag::f_url)
 		| (_startCommand.isEmpty() ? Flag(0) : Flag::f_start_param)
-		| (action.replyTo ? Flag::f_reply_to_msg_id : Flag(0))
-		| (action.topicRootId ? Flag::f_top_msg_id : Flag(0))
+		| (action.replyTo ? Flag::f_reply_to : Flag(0))
 		| (action.options.sendAs ? Flag::f_send_as : Flag(0))
 		| (action.options.silent ? Flag::f_silent : Flag(0));
 	_requestId = _session->api().request(MTPmessages_RequestWebView(
@@ -545,8 +543,7 @@ void AttachWebView::request(const WebViewButton &button) {
 		MTP_string(_startCommand),
 		MTP_dataJSON(MTP_bytes(Window::Theme::WebViewParams().json)),
 		MTP_string("tdesktop"),
-		MTP_int(action.replyTo.bare),
-		MTP_int(action.topicRootId.bare),
+		action.mtpReplyTo(),
 		(action.options.sendAs
 			? action.options.sendAs->input
 			: MTP_inputPeerEmpty())
@@ -810,8 +807,7 @@ void AttachWebView::requestMenu(
 			MTP_flags(Flag::f_theme_params
 				| Flag::f_url
 				| Flag::f_from_bot_menu
-				| (action.replyTo? Flag::f_reply_to_msg_id : Flag(0))
-				| (action.topicRootId ? Flag::f_top_msg_id : Flag(0))
+				| (action.replyTo? Flag::f_reply_to : Flag(0))
 				| (action.options.sendAs ? Flag::f_send_as : Flag(0))
 				| (action.options.silent ? Flag::f_silent : Flag(0))),
 			action.history->peer->input,
@@ -820,8 +816,7 @@ void AttachWebView::requestMenu(
 			MTPstring(), // start_param
 			MTP_dataJSON(MTP_bytes(Window::Theme::WebViewParams().json)),
 			MTP_string("tdesktop"),
-			MTP_int(action.replyTo.bare),
-			MTP_int(action.topicRootId.bare),
+			action.mtpReplyTo(),
 			(action.options.sendAs
 				? action.options.sendAs->input
 				: MTP_inputPeerEmpty())
@@ -1189,15 +1184,13 @@ void AttachWebView::started(uint64 queryId) {
 		_session->api().request(base::take(_prolongId)).cancel();
 		_prolongId = _session->api().request(MTPmessages_ProlongWebView(
 			MTP_flags(Flag(0)
-				| (action.replyTo ? Flag::f_reply_to_msg_id : Flag(0))
-				| (action.topicRootId ? Flag::f_top_msg_id : Flag(0))
+				| (action.replyTo ? Flag::f_reply_to : Flag(0))
 				| (action.options.sendAs ? Flag::f_send_as : Flag(0))
 				| (action.options.silent ? Flag::f_silent : Flag(0))),
 			action.history->peer->input,
 			_bot->inputUser,
 			MTP_long(queryId),
-			MTP_int(action.replyTo.bare),
-			MTP_int(action.topicRootId.bare),
+			action.mtpReplyTo(),
 			(action.options.sendAs
 				? action.options.sendAs->input
 				: MTP_inputPeerEmpty())
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
index 02de341e6..2c10d887c 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@@ -374,7 +374,7 @@ void Result::addToHistory(
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor) const {
 	flags |= MessageFlag::FromInlineBot;
 
@@ -390,7 +390,7 @@ void Result::addToHistory(
 		fromId,
 		date,
 		viaBotId,
-		replyToId,
+		replyTo,
 		postAuthor,
 		std::move(markup));
 }
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
index 45c8f6b39..296deb613 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
@@ -69,7 +69,7 @@ public:
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor) const;
 	QString getErrorOnSend(not_null<History*> history) const;
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
index c1ec877e8..a2f342d28 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
@@ -36,18 +36,18 @@ void SendDataCommon::addToHistory(
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const {
 	auto fields = getSentMessageFields();
-	if (replyToId) {
+	if (replyTo) {
 		flags |= MessageFlag::HasReplyInfo;
 	}
 	history->addNewLocalMessage(
 		msgId,
 		flags,
 		viaBotId,
-		replyToId,
+		replyTo,
 		date,
 		fromId,
 		postAuthor,
@@ -119,14 +119,14 @@ void SendPhoto::addToHistory(
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const {
 	history->addNewLocalMessage(
 		msgId,
 		flags,
 		viaBotId,
-		replyToId,
+		replyTo,
 		date,
 		fromId,
 		postAuthor,
@@ -150,14 +150,14 @@ void SendFile::addToHistory(
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const {
 	history->addNewLocalMessage(
 		msgId,
 		flags,
 		viaBotId,
-		replyToId,
+		replyTo,
 		date,
 		fromId,
 		postAuthor,
@@ -181,14 +181,14 @@ void SendGame::addToHistory(
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const {
 	history->addNewLocalMessage(
 		msgId,
 		flags,
 		viaBotId,
-		replyToId,
+		replyTo,
 		date,
 		fromId,
 		postAuthor,
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
index bab720f11..84c25624f 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
@@ -48,7 +48,7 @@ public:
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const = 0;
 	virtual QString getErrorOnSend(
@@ -90,7 +90,7 @@ public:
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const override;
 
@@ -258,7 +258,7 @@ public:
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const override;
 
@@ -299,7 +299,7 @@ public:
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const override;
 
@@ -334,7 +334,7 @@ public:
 		PeerId fromId,
 		TimeId date,
 		UserId viaBotId,
-		MsgId replyToId,
+		FullReplyTo replyTo,
 		const QString &postAuthor,
 		HistoryMessageMarkupData &&markup) const override;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index f46f37304..3f1a2871c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -363,9 +363,9 @@ void Controller::show(
 	}
 	_index = subindex;
 
-	const auto id = Data::FullStoryId{
-		.user = list.user,
-		.id = item.id,
+	const auto id = FullStoryId{
+		.peer = list.user->id,
+		.story = item.id,
 	};
 	if (_shown == id) {
 		return;
@@ -425,7 +425,7 @@ void Controller::updatePlayback(const Player::TrackState &state) {
 	updatePowerSaveBlocker(state);
 	if (Player::IsStoppedAtEnd(state.state)) {
 		if (!subjumpFor(1)) {
-			_delegate->storiesJumpTo({});
+			_delegate->storiesClose();
 		}
 	}
 }
@@ -448,9 +448,9 @@ bool Controller::subjumpFor(int delta) {
 		} else if (!_list || _list->items.empty()) {
 			return false;
 		}
-		_delegate->storiesJumpTo({
-			.user = _list->user,
-			.id = _list->items.front().id
+		_delegate->storiesJumpTo(&_list->user->session(), {
+			.peer = _list->user->id,
+			.story = _list->items.front().id
 		});
 		return true;
 	} else if (index >= _list->total) {
@@ -459,9 +459,9 @@ bool Controller::subjumpFor(int delta) {
 			&& jumpFor(1);
 	} else if (index < _list->items.size()) {
 		// #TODO stories load more
-		_delegate->storiesJumpTo({
-			.user = _list->user,
-			.id = _list->items[index].id
+		_delegate->storiesJumpTo(&_list->user->session(), {
+			.peer = _list->user->id,
+			.story = _list->items[index].id
 		});
 	}
 	return true;
@@ -471,12 +471,16 @@ bool Controller::subjumpFor(int delta) {
 bool Controller::jumpFor(int delta) {
 	if (delta == -1) {
 		if (const auto left = _siblingLeft.get()) {
-			_delegate->storiesJumpTo(left->shownId());
+			_delegate->storiesJumpTo(
+				&left->peer()->session(),
+				left->shownId());
 			return true;
 		}
 	} else if (delta == 1) {
 		if (const auto right = _siblingRight.get()) {
-			_delegate->storiesJumpTo(right->shownId());
+			_delegate->storiesJumpTo(
+				&right->peer()->session(),
+				right->shownId());
 			return true;
 		}
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 2715ce8f5..f553f895e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -139,7 +139,7 @@ private:
 	Ui::Animations::Simple _contentFadeAnimation;
 	bool _contentFaded = false;
 
-	Data::FullStoryId _shown;
+	FullStoryId _shown;
 	TextWithEntities _captionText;
 	std::optional<Data::StoriesList> _list;
 	int _index = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index 8a34c47bd..a9c3b0a35 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -12,9 +12,9 @@ class Show;
 struct FileChosen;
 } // namespace ChatHelpers
 
-namespace Data {
-struct FullStoryId;
-} // namespace Data
+namespace Main {
+class Session;
+} // namespace Main
 
 namespace Ui {
 class RpWidget;
@@ -39,7 +39,10 @@ public:
 		-> std::shared_ptr<ChatHelpers::Show> = 0;
 	[[nodiscard]] virtual auto storiesStickerOrEmojiChosen()
 		-> rpl::producer<ChatHelpers::FileChosen> = 0;
-	virtual void storiesJumpTo(Data::FullStoryId id) = 0;
+	virtual void storiesJumpTo(
+		not_null<Main::Session*> session,
+		FullStoryId id) = 0;
+	virtual void storiesClose() = 0;
 	[[nodiscard]] virtual bool storiesPaused() = 0;
 	[[nodiscard]] virtual float64 storiesSiblingOver(SiblingType type) = 0;
 	virtual void storiesTogglePaused(bool paused) = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index a37b4a472..4b5e09bde 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -217,7 +217,8 @@ Sibling::Sibling(
 	not_null<Controller*> controller,
 	const Data::StoriesList &list)
 : _controller(controller)
-, _id{ list.user, list.items.front().id } {
+, _id{ list.user->id, list.items.front().id }
+, _peer(list.user) {
 	const auto &item = list.items.front();
 	const auto &data = item.media.data;
 	const auto origin = Data::FileOrigin();
@@ -239,14 +240,18 @@ Sibling::Sibling(
 
 Sibling::~Sibling() = default;
 
-Data::FullStoryId Sibling::shownId() const {
+FullStoryId Sibling::shownId() const {
 	return _id;
 }
 
+not_null<PeerData*> Sibling::peer() const {
+	return _peer;
+}
+
 bool Sibling::shows(const Data::StoriesList &list) const {
 	Expects(!list.items.empty());
 
-	return _id == Data::FullStoryId{ list.user, list.items.front().id };
+	return _id == FullStoryId{ list.user->id, list.items.front().id };
 }
 
 SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
@@ -268,22 +273,18 @@ SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
 }
 
 QImage Sibling::userpicImage(const SiblingLayout &layout) {
-	Expects(_id.user != nullptr);
-
 	const auto ratio = style::DevicePixelRatio();
 	const auto size = layout.userpic.width() * ratio;
-	const auto key = _id.user->userpicUniqueKey(_userpicView);
+	const auto key = _peer->userpicUniqueKey(_userpicView);
 	if (_userpicImage.width() != size || _userpicKey != key) {
 		_userpicKey = key;
-		_userpicImage = _id.user->generateUserpicImage(_userpicView, size);
+		_userpicImage = _peer->generateUserpicImage(_userpicView, size);
 		_userpicImage.setDevicePixelRatio(ratio);
 	}
 	return _userpicImage;
 }
 
 QImage Sibling::nameImage(const SiblingLayout &layout) {
-	Expects(_id.user != nullptr);
-
 	if (_nameFontSize != layout.nameFontSize) {
 		_nameFontSize = layout.nameFontSize;
 
@@ -299,7 +300,7 @@ QImage Sibling::nameImage(const SiblingLayout &layout) {
 			.linkFontOver = font,
 		});
 	};
-	const auto text = _id.user->shortName();
+	const auto text = _peer->shortName();
 	if (_nameText != text) {
 		_name.reset();
 		_nameText = text;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.h b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
index ecbd89de7..dc355fec6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
@@ -29,7 +29,8 @@ public:
 		const Data::StoriesList &list);
 	~Sibling();
 
-	[[nodiscard]] Data::FullStoryId shownId() const;
+	[[nodiscard]] FullStoryId shownId() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
 	[[nodiscard]] bool shows(const Data::StoriesList &list) const;
 
 	[[nodiscard]] SiblingView view(
@@ -51,7 +52,8 @@ private:
 
 	const not_null<Controller*> _controller;
 
-	Data::FullStoryId _id;
+	FullStoryId _id;
+	not_null<PeerData*> _peer;
 	QImage _blurred;
 	QImage _good;
 	Ui::Animations::Simple _goodShown;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 733c61851..1bd915558 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4028,28 +4028,27 @@ auto OverlayWidget::storiesStickerOrEmojiChosen()
 	return _storiesStickerOrEmojiChosen.events();
 }
 
-void OverlayWidget::storiesJumpTo(Data::FullStoryId id) {
+void OverlayWidget::storiesJumpTo(
+		not_null<Main::Session*> session,
+		FullStoryId id) {
 	Expects(_stories != nullptr);
+	Expects(id.valid());
 
-	if (!id) {
-		close();
-		return;
-	}
-	const auto &all = id.user->owner().stories().all();
+	const auto &all = session->data().stories().all();
 	const auto i = ranges::find(
 		all,
-		not_null(id.user),
-		&Data::StoriesList::user);
+		id.peer,
+		[](const Data::StoriesList &list) { return list.user->id; });
 	if (i == end(all)) {
 		close();
 		return;
 	}
-	const auto j = ranges::find(i->items, id.id, &Data::StoryItem::id);
+	const auto j = ranges::find(i->items, id.story, &Data::StoryItem::id);
 	if (j == end(i->items)) {
 		close();
 		return;
 	}
-	setContext(StoriesContext{ i->user, id.id });
+	setContext(StoriesContext{ i->user, id.story });
 	clearStreaming();
 	_streamingStartPaused = false;
 	const auto &data = j->media.data;
@@ -4061,6 +4060,10 @@ void OverlayWidget::storiesJumpTo(Data::FullStoryId id) {
 	}
 }
 
+void OverlayWidget::storiesClose() {
+	close();
+}
+
 bool OverlayWidget::storiesPaused() {
 	return _streamed
 		&& !_streamed->instance.player().failed()
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 43551bf41..a82aa1f3c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -30,7 +30,6 @@ enum class activation : uchar;
 namespace Data {
 class PhotoMedia;
 class DocumentMedia;
-struct FullStoryId;
 } // namespace Data
 
 namespace Ui {
@@ -243,7 +242,10 @@ private:
 	std::shared_ptr<ChatHelpers::Show> storiesShow() override;
 	auto storiesStickerOrEmojiChosen()
 		-> rpl::producer<ChatHelpers::FileChosen> override;
-	void storiesJumpTo(Data::FullStoryId id) override;
+	void storiesJumpTo(
+		not_null<Main::Session*> session,
+		FullStoryId id) override;
+	void storiesClose() override;
 	bool storiesPaused() override;
 	void storiesTogglePaused(bool paused) override;
 	float64 storiesSiblingOver(Stories::SiblingType type) override;
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index f1961f042..cf9f4c775 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -1584,7 +1584,7 @@ void FormController::uploadEncryptedFile(
 	auto prepared = std::make_shared<FileLoadResult>(
 		TaskId(),
 		file.uploadData->fileId,
-		FileLoadTo(PeerId(), Api::SendOptions(), MsgId(), MsgId(), MsgId()),
+		FileLoadTo(PeerId(), Api::SendOptions(), FullReplyTo(), MsgId()),
 		TextWithTags(),
 		false,
 		std::shared_ptr<SendingAlbum>(nullptr));
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 1386b2a74..1516594a9 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -221,56 +221,6 @@ int PhotoSideLimit() {
 	return PhotoSideLimit(SendLargePhotos.value());
 }
 
-SendMediaPrepare::SendMediaPrepare(
-	const QString &file,
-	const PeerId &peer,
-	SendMediaType type,
-	MsgId replyTo)
-: id(base::RandomValue<PhotoId>())
-, file(file)
-, peer(peer)
-, type(type)
-, replyTo(replyTo) {
-}
-
-SendMediaPrepare::SendMediaPrepare(
-	const QImage &img,
-	const PeerId &peer,
-	SendMediaType type,
-	MsgId replyTo)
-: id(base::RandomValue<PhotoId>())
-, img(img)
-, peer(peer)
-, type(type)
-, replyTo(replyTo) {
-}
-
-SendMediaPrepare::SendMediaPrepare(
-	const QByteArray &data,
-	const PeerId &peer,
-	SendMediaType type,
-	MsgId replyTo)
-: id(base::RandomValue<PhotoId>())
-, data(data)
-, peer(peer)
-, type(type)
-, replyTo(replyTo) {
-}
-
-SendMediaPrepare::SendMediaPrepare(
-	const QByteArray &data,
-	int duration,
-	const PeerId &peer,
-	SendMediaType type,
-	MsgId replyTo)
-: id(base::RandomValue<PhotoId>())
-, data(data)
-, peer(peer)
-, type(type)
-, duration(duration)
-, replyTo(replyTo) {
-}
-
 SendMediaReady::SendMediaReady(
 	SendMediaType type,
 	const QString &file,
@@ -284,10 +234,8 @@ SendMediaReady::SendMediaReady(
 	const MTPPhoto &photo,
 	const PreparedPhotoThumbs &photoThumbs,
 	const MTPDocument &document,
-	const QByteArray &jpeg,
-	MsgId replyTo)
-: replyTo(replyTo)
-, type(type)
+	const QByteArray &jpeg)
+: type(type)
 , file(file)
 , filename(filename)
 , filesize(filesize)
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 59e3c1325..3d4354623 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -36,41 +36,6 @@ enum class SendMediaType {
 	Secure,
 };
 
-struct SendMediaPrepare {
-	SendMediaPrepare(
-		const QString &file,
-		const PeerId &peer,
-		SendMediaType type,
-		MsgId replyTo);
-	SendMediaPrepare(
-		const QImage &img,
-		const PeerId &peer,
-		SendMediaType type,
-		MsgId replyTo);
-	SendMediaPrepare(
-		const QByteArray &data,
-		const PeerId &peer,
-		SendMediaType type,
-		MsgId replyTo);
-	SendMediaPrepare(
-		const QByteArray &data,
-		int duration,
-		const PeerId &peer,
-		SendMediaType type,
-		MsgId replyTo);
-
-	PhotoId id;
-	QString file;
-	QImage img;
-	QByteArray data;
-	PeerId peer;
-	SendMediaType type;
-	int duration = 0;
-	MsgId replyTo;
-
-};
-using SendMediaPrepareList = QList<SendMediaPrepare>;
-
 using UploadFileParts =  QMap<int, QByteArray>;
 struct SendMediaReady {
 	SendMediaReady() = default; // temp
@@ -87,10 +52,8 @@ struct SendMediaReady {
 		const MTPPhoto &photo,
 		const PreparedPhotoThumbs &photoThumbs,
 		const MTPDocument &document,
-		const QByteArray &jpeg,
-		MsgId replyTo);
+		const QByteArray &jpeg);
 
-	MsgId replyTo;
 	SendMediaType type;
 	QString file, filename;
 	int64 filesize = 0;
@@ -206,19 +169,16 @@ struct FileLoadTo {
 	FileLoadTo(
 		PeerId peer,
 		Api::SendOptions options,
-		MsgId replyTo,
-		MsgId topicRootId,
+		FullReplyTo replyTo,
 		MsgId replaceMediaOf)
 	: peer(peer)
 	, options(options)
 	, replyTo(replyTo)
-	, topicRootId(topicRootId)
 	, replaceMediaOf(replaceMediaOf) {
 	}
 	PeerId peer;
 	Api::SendOptions options;
-	MsgId replyTo;
-	MsgId topicRootId;
+	FullReplyTo replyTo;
 	MsgId replaceMediaOf;
 };
 
diff --git a/Telegram/SourceFiles/support/support_autocomplete.cpp b/Telegram/SourceFiles/support/support_autocomplete.cpp
index 3ebec4074..aba4ee89a 100644
--- a/Telegram/SourceFiles/support/support_autocomplete.cpp
+++ b/Telegram/SourceFiles/support/support_autocomplete.cpp
@@ -276,7 +276,7 @@ AdminLog::OwnedItem GenerateCommentItem(
 	const auto flags = MessageFlag::HasFromId
 		| MessageFlag::Outgoing
 		| MessageFlag::FakeHistoryItem;
-	const auto replyTo = MsgId();
+	const auto replyTo = FullReplyTo();
 	const auto viaBotId = UserId();
 	const auto groupedId = uint64();
 	const auto item = history->makeMessage(
@@ -298,7 +298,7 @@ AdminLog::OwnedItem GenerateContactItem(
 		not_null<HistoryView::ElementDelegate*> delegate,
 		not_null<History*> history,
 		const Contact &data) {
-	const auto replyTo = MsgId();
+	const auto replyTo = FullReplyTo();
 	const auto viaBotId = UserId();
 	const auto postAuthor = QString();
 	const auto groupedId = uint64();
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index da8bc9a1f..2049d28d1 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -1113,13 +1113,16 @@ void Manager::notificationReplied(
 
 	auto message = Api::MessageToSend(Api::SendAction(history));
 	message.textWithTags = reply;
-	message.action.replyTo = (id.msgId > 0 && !history->peer->isUser()
+	const auto replyToId = (id.msgId > 0 && !history->peer->isUser()
 		&& id.msgId != topicRootId)
 		? id.msgId
 		: history->peer->isForum()
 		? topicRootId
 		: MsgId(0);
-	message.action.topicRootId = topic ? topic->rootId() : 0;
+	message.action.replyTo = {
+		.msgId = replyToId,
+		.topicRootId = topic ? topic->rootId() : 0,
+	};
 	message.action.clearDraft = false;
 	history->session().api().sendMessage(std::move(message));
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 64850eaef..c43996e6a 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -1581,8 +1581,7 @@ SendMediaReady PrepareWallPaper(MTP::DcId dcId, const QImage &image) {
 		MTP_photoEmpty(MTP_long(0)),
 		thumbnails,
 		document,
-		QByteArray(),
-		0);
+		QByteArray());
 }
 
 } // namespace Theme
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index b045fb2de..46b5cf5fb 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -451,8 +451,7 @@ SendMediaReady PrepareThemeMedia(
 		MTP_photoEmpty(MTP_long(0)),
 		thumbnails,
 		document,
-		thumbnailBytes,
-		0);
+		thumbnailBytes);
 }
 
 Fn<void()> SavePreparedTheme(
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 3921a21cb..7b908dc47 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -108,21 +108,16 @@ void ShareBotGame(
 	const auto topicRootId = replyTo;
 	auto flags = MTPmessages_SendMedia::Flags(0);
 	if (replyTo) {
-		flags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
-		if (topicRootId) {
-			flags |= MTPmessages_SendMedia::Flag::f_top_msg_id;
-		}
+		flags |= MTPmessages_SendMedia::Flag::f_reply_to;
 	}
 	histories.sendPreparedMessage(
 		history,
-		replyTo,
-		topicRootId,
+		FullReplyTo{ .msgId = replyTo, .topicRootId = topicRootId },
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(flags),
 			history->peer->input,
 			Data::Histories::ReplyToPlaceholder(),
-			Data::Histories::TopicRootPlaceholder(),
 			MTP_inputMediaGame(
 				MTP_inputGameShortName(
 					bot->inputUser,
@@ -1447,8 +1442,7 @@ void PeerMenuCreatePoll(
 			peer->owner().history(peer),
 			result.options);
 		action.clearDraft = false;
-		action.replyTo = replyToId;
-		action.topicRootId = topicRootId;
+		action.replyTo = { .msgId = replyToId, .topicRootId = topicRootId };
 		if (const auto local = action.history->localDraft(topicRootId)) {
 			action.clearDraft = local->textWithTags.text.isEmpty();
 		}

From ff902f2a1f30fb3aa938395211b709acddf4a25c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 25 May 2023 14:56:32 +0400
Subject: [PATCH 253/676] Send StoryReply info correctly.

---
 Telegram/SourceFiles/media/stories/media_stories_controller.cpp | 2 +-
 Telegram/SourceFiles/media/stories/media_stories_reply.cpp      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 3f1a2871c..82d1696e1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -376,7 +376,7 @@ void Controller::show(
 
 	_header->show({ .user = list.user, .date = item.date });
 	_slider->show({ .index = _index, .total = list.total });
-	_replyArea->show({ .user = list.user });
+	_replyArea->show({ .user = list.user, .id = id.story });
 
 	if (_contentFaded) {
 		togglePaused(true);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index bbc28a75d..b11228f46 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -195,6 +195,7 @@ Api::SendAction ReplyArea::prepareSendAction(
 	const auto history = _data.user->owner().history(_data.user);
 	auto result = Api::SendAction(history, options);
 	result.options.sendAs = _controls->sendAsPeer();
+	result.replyTo.storyId = { .peer = _data.user->id, .story = _data.id };
 	return result;
 }
 

From 7a042c23e960d882a2942029b2b9ec5c1f826dfb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 May 2023 11:21:19 +0400
Subject: [PATCH 254/676] Use real stories data, open from chats list.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 228 +++++++++---------
 Telegram/SourceFiles/data/data_stories.h      |  76 ++++--
 .../dialogs/dialogs_inner_widget.cpp          |  11 +
 .../dialogs/ui/dialogs_stories_content.cpp    |  18 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 179 +++++++++++---
 .../dialogs/ui/dialogs_stories_list.h         |   7 +
 .../stories/media_stories_controller.cpp      |  45 ++--
 .../media/stories/media_stories_sibling.cpp   |  56 +++--
 .../media/stories/media_stories_sibling.h     |   5 +-
 .../media/view/media_view_open_common.h       |  20 ++
 .../media/view/media_view_overlay_widget.cpp  |  92 +++----
 .../media/view/media_view_overlay_widget.h    |   4 +-
 .../window/window_session_controller.cpp      |  17 ++
 .../window/window_session_controller.h        |   2 +
 14 files changed, 482 insertions(+), 278 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 2fb2f8c28..dbddd0da0 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -26,7 +26,78 @@ namespace {
 } // namespace
 
 bool StoriesList::unread() const {
-	return !items.empty() && readTill < items.front().id;
+	return !ids.empty() && readTill < ids.front();
+}
+
+Story::Story(
+	StoryId id,
+	not_null<PeerData*> peer,
+	StoryMedia media,
+	TimeId date)
+: _id(id)
+, _peer(peer)
+, _media(std::move(media))
+, _date(date) {
+}
+
+Session &Story::owner() const {
+	return _peer->owner();
+}
+
+Main::Session &Story::session() const {
+	return _peer->session();
+}
+
+not_null<PeerData*> Story::peer() const {
+	return _peer;
+}
+
+StoryId Story::id() const {
+	return _id;
+}
+
+TimeId Story::date() const {
+	return _date;
+}
+
+const StoryMedia &Story::media() const {
+	return _media;
+}
+
+PhotoData *Story::photo() const {
+	const auto result = std::get_if<not_null<PhotoData*>>(&_media.data);
+	return result ? result->get() : nullptr;
+}
+
+DocumentData *Story::document() const {
+	const auto result = std::get_if<not_null<DocumentData*>>(&_media.data);
+	return result ? result->get() : nullptr;
+}
+
+void Story::setPinned(bool pinned) {
+	_pinned = pinned;
+}
+
+bool Story::pinned() const {
+	return _pinned;
+}
+
+void Story::setCaption(TextWithEntities &&caption) {
+	_caption = std::move(caption);
+}
+
+const TextWithEntities &Story::caption() const {
+	return _caption;
+}
+
+void Story::apply(const MTPDstoryItem &data) {
+	_pinned = data.is_pinned();
+	_caption = TextWithEntities{
+		data.vcaption().value_or_empty(),
+		Api::EntitiesFromMTP(
+			&owner().session(),
+			data.ventities().value_or_empty()),
+	};
 }
 
 Stories::Stories(not_null<Session*> owner) : _owner(owner) {
@@ -41,6 +112,7 @@ Session &Stories::owner() const {
 
 void Stories::apply(const MTPDupdateStories &data) {
 	pushToFront(parse(data.vstories()));
+	_allChanged.fire({});
 }
 
 StoriesList Stories::parse(const MTPUserStories &stories) {
@@ -54,25 +126,36 @@ StoriesList Stories::parse(const MTPUserStories &stories) {
 		.total = count,
 	};
 	const auto &list = data.vstories().v;
-	result.items.reserve(list.size());
+	result.ids.reserve(list.size());
 	for (const auto &story : list) {
 		story.match([&](const MTPDstoryItem &data) {
-			if (auto entry = parse(data)) {
-				result.items.push_back(std::move(*entry));
+			if (const auto story = parse(result.user, data)) {
+				result.ids.push_back(story->id());
 			} else {
 				--result.total;
 			}
-		}, [&](const MTPDstoryItemSkipped &) {
-		}, [&](const MTPDstoryItemDeleted &) {
+		}, [&](const MTPDstoryItemSkipped &data) {
+			result.ids.push_back(data.vid().v);
+		}, [&](const MTPDstoryItemDeleted &data) {
+			_deleted.emplace(FullStoryId{
+				.peer = peerFromUser(userId),
+				.story = data.vid().v,
+			});
 			--result.total;
 		});
 	}
-	result.total = std::min(result.total, int(result.items.size()));
+	result.total = std::max(result.total, int(result.ids.size()));
 	return result;
 }
 
-std::optional<StoryItem> Stories::parse(const MTPDstoryItem &data) {
+Story *Stories::parse(not_null<PeerData*> peer, const MTPDstoryItem &data) {
 	const auto id = data.vid().v;
+	auto &stories = _stories[peer->id];
+	const auto i = stories.find(id);
+	if (i != end(stories)) {
+		i->second->apply(data);
+		return i->second.get();
+	}
 	using MaybeMedia = std::optional<
 		std::variant<not_null<PhotoData*>, not_null<DocumentData*>>>;
 	const auto media = data.vmedia().match([&](
@@ -95,24 +178,15 @@ std::optional<StoryItem> Stories::parse(const MTPDstoryItem &data) {
 		return {};
 	}, [](const auto &) { return MaybeMedia(); });
 	if (!media) {
-		return {};
+		return nullptr;
 	}
-	auto caption = TextWithEntities{
-		data.vcaption().value_or_empty(),
-		Api::EntitiesFromMTP(
-			&_owner->session(),
-			data.ventities().value_or_empty()),
-	};
-	auto privacy = StoryPrivacy();
-
-	const auto date = data.vdate().v;
-	return StoryItem{
-		.id = data.vid().v,
-		.media = { *media },
-		.caption = std::move(caption),
-		.date = date,
-		.privacy = privacy,
-	};
+	const auto result = stories.emplace(id, std::make_unique<Story>(
+		id,
+		peer,
+		StoryMedia{ *media },
+		data.vdate().v)).first->second.get();
+	result->apply(data);
+	return result;
 }
 
 void Stories::loadMore() {
@@ -134,6 +208,7 @@ void Stories::loadMore() {
 			for (const auto &single : data.vuser_stories().v) {
 				pushToBack(parse(single));
 			}
+			_allChanged.fire({});
 		}, [](const MTPDstories_allStoriesNotModified &) {
 		});
 	}).fail([=] {
@@ -153,96 +228,20 @@ rpl::producer<> Stories::allChanged() const {
 	return _allChanged.events();
 }
 
-// #TODO stories testing
-StoryId Stories::generate(
-	not_null<HistoryItem*> item,
-	std::variant<
-		v::null_t,
-		not_null<PhotoData*>,
-		not_null<DocumentData*>> media) {
-	if (v::is_null(media)
-		|| !item->from()->isUser()
-		|| !item->isRegular()) {
-		return {};
+base::expected<not_null<Story*>, NoStory> Stories::lookup(
+		FullStoryId id) const {
+	const auto i = _stories.find(id.peer);
+	if (i != end(_stories)) {
+		const auto j = i->second.find(id.story);
+		if (j != end(i->second)) {
+			return j->second.get();
+		}
 	}
-	const auto document = v::is<not_null<DocumentData*>>(media)
-		? v::get<not_null<DocumentData*>>(media).get()
-		: nullptr;
-	if (document && !document->isVideoFile()) {
-		return {};
-	}
-	using namespace Storage;
-	auto resultId = StoryId();
-	const auto listType = SharedMediaType::PhotoVideo;
-	const auto itemId = item->id;
-	const auto peer = item->history()->peer;
-	const auto session = &peer->session();
-	auto full = std::vector<StoriesList>();
-	const auto lifetime = session->storage().query(SharedMediaQuery(
-		SharedMediaKey(peer->id, MsgId(0), listType, itemId),
-		32,
-		32
-	)) | rpl::start_with_next([&](SharedMediaResult &&result) {
-		if (!result.messageIds.contains(itemId)) {
-			result.messageIds.emplace(itemId);
-		}
-		auto index = StoryId();
-		const auto owner = &peer->owner();
-		for (const auto id : result.messageIds) {
-			if (const auto item = owner->message(peer, id)) {
-				const auto user = item->from()->asUser();
-				if (!user) {
-					continue;
-				}
-				const auto i = ranges::find(
-					full,
-					not_null(user),
-					&StoriesList::user);
-				auto &stories = (i == end(full))
-					? full.emplace_back(StoriesList{ .user = user })
-					: *i;
-				if (id == itemId) {
-					resultId = ++index;
-					stories.items.push_back({
-						.id = resultId,
-						.media = (document
-							? StoryMedia{ not_null(document) }
-							: StoryMedia{
-								v::get<not_null<PhotoData*>>(media) }),
-						.caption = item->originalText(),
-						.date = item->date(),
-					});
-					++stories.total;
-				} else if (const auto media = item->media()) {
-					const auto photo = media->photo();
-					const auto document = media->document();
-					if (photo || (document && document->isVideoFile())) {
-						stories.items.push_back({
-							.id = ++index,
-							.media = (document
-								? StoryMedia{ not_null(document) }
-								: StoryMedia{ not_null(photo) }),
-							.caption = item->originalText(),
-							.date = item->date(),
-						});
-						++stories.total;
-					}
-				}
-			}
-		}
-		for (auto &stories : full) {
-			const auto i = ranges::find(
-				_all,
-				stories.user,
-				&StoriesList::user);
-			if (i != end(_all)) {
-				*i = std::move(stories);
-			} else {
-				_all.push_back(std::move(stories));
-			}
-		}
-	});
-	return resultId;
+	return base::make_unexpected(
+		_deleted.contains(id) ? NoStory::Deleted : NoStory::Unknown);
+}
+
+void Stories::resolve(FullStoryId id, Fn<void()> done) {
 }
 
 void Stories::pushToBack(StoriesList &&list) {
@@ -255,7 +254,6 @@ void Stories::pushToBack(StoriesList &&list) {
 	} else {
 		_all.push_back(std::move(list));
 	}
-	_allChanged.fire({});
 }
 
 void Stories::pushToFront(StoriesList &&list) {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 6c3aaa56d..e5f3b49db 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -7,37 +7,64 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/expected.h"
+
 class PhotoData;
 class DocumentData;
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Data {
 
 class Session;
 
-struct StoryPrivacy {
-	friend inline bool operator==(StoryPrivacy, StoryPrivacy) = default;
-};
-
 struct StoryMedia {
 	std::variant<not_null<PhotoData*>, not_null<DocumentData*>> data;
 
 	friend inline bool operator==(StoryMedia, StoryMedia) = default;
 };
 
-struct StoryItem {
-	StoryId id = 0;
-	StoryMedia media;
-	TextWithEntities caption;
-	TimeId date = 0;
-	StoryPrivacy privacy;
-	bool pinned = false;
+class Story {
+public:
+	Story(
+		StoryId id,
+		not_null<PeerData*> peer,
+		StoryMedia media,
+		TimeId date);
+
+	[[nodiscard]] Session &owner() const;
+	[[nodiscard]] Main::Session &session() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
+
+	[[nodiscard]] StoryId id() const;
+	[[nodiscard]] TimeId date() const;
+	[[nodiscard]] const StoryMedia &media() const;
+	[[nodiscard]] PhotoData *photo() const;
+	[[nodiscard]] DocumentData *document() const;
+
+	void setPinned(bool pinned);
+	[[nodiscard]] bool pinned() const;
+
+	void setCaption(TextWithEntities &&caption);
+	[[nodiscard]] const TextWithEntities &caption() const;
+
+	void apply(const MTPDstoryItem &data);
+
+private:
+	const StoryId _id = 0;
+	const not_null<PeerData*> _peer;
+	const StoryMedia _media;
+	TextWithEntities _caption;
+	const TimeId _date = 0;
+	bool _pinned = false;
 
-	friend inline bool operator==(StoryItem, StoryItem) = default;
 };
 
 struct StoriesList {
 	not_null<UserData*> user;
-	std::vector<StoryItem> items;
+	std::vector<StoryId> ids;
 	StoryId readTill = 0;
 	int total = 0;
 
@@ -46,6 +73,11 @@ struct StoriesList {
 	friend inline bool operator==(StoriesList, StoriesList) = default;
 };
 
+enum class NoStory : uchar {
+	Unknown,
+	Deleted,
+};
+
 class Stories final {
 public:
 	explicit Stories(not_null<Session*> owner);
@@ -60,22 +92,24 @@ public:
 	[[nodiscard]] bool allLoaded() const;
 	[[nodiscard]] rpl::producer<> allChanged() const;
 
-	// #TODO stories testing
-	[[nodiscard]] StoryId generate(
-		not_null<HistoryItem*> item,
-		std::variant<
-			v::null_t,
-			not_null<PhotoData*>,
-			not_null<DocumentData*>> media);
+	[[nodiscard]] base::expected<not_null<Story*>, NoStory> lookup(
+		FullStoryId id) const;
+	void resolve(FullStoryId id, Fn<void()> done);
 
 private:
 	[[nodiscard]] StoriesList parse(const MTPUserStories &stories);
-	[[nodiscard]] std::optional<StoryItem> parse(const MTPDstoryItem &data);
+	[[nodiscard]] Story *parse(
+		not_null<PeerData*> peer,
+		const MTPDstoryItem &data);
 
 	void pushToBack(StoriesList &&list);
 	void pushToFront(StoriesList &&list);
 
 	const not_null<Session*> _owner;
+	base::flat_map<
+		PeerId,
+		base::flat_map<StoryId, std::unique_ptr<Story>>> _stories;
+	base::flat_set<FullStoryId> _deleted;
 
 	std::vector<StoriesList> _all;
 	rpl::event_stream<> _allChanged;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index a4c0bb267..33a2a93cd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat_filters.h"
 #include "data/data_cloud_file.h"
 #include "data/data_changes.h"
+#include "data/data_stories.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_send_action.h"
 #include "base/unixtime.h"
@@ -335,6 +336,11 @@ InnerWidget::InnerWidget(
 		clearSelection();
 	}, lifetime());
 
+	_stories->clicks(
+	) | rpl::start_with_next([=](uint64 id) {
+		_controller->openPeerStories(PeerId(int64(id)));
+	}, lifetime());
+
 	handleChatListEntryRefreshes();
 
 	refreshWithCollapsedRows(true);
@@ -590,6 +596,11 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 	if (_controller->contentOverlapped(this, e)) {
 		return;
 	}
+	const auto fillGuard = gsl::finally([&] {
+		// We translate painter down, but it'll be cropped below rect.
+		p.fillRect(rect(), st::dialogsBg);
+	});
+
 	const auto activeEntry = _controller->activeChatEntryCurrent();
 	const auto videoPaused = _controller->isGifPausedAtLeastFor(
 		Window::GifPauseReason::Any);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 021d07328..b1262388f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -128,13 +128,13 @@ State::State(not_null<Data::Stories*> data)
 
 Content State::next() {
 	auto result = Content();
-#if 0 // #TODO stories testing
+#if 1 // #TODO stories testing
 	const auto &all = _data->all();
 	result.users.reserve(all.size());
 	for (const auto &list : all) {
 		auto userpic = std::shared_ptr<Userpic>();
 		const auto user = list.user;
-#endif
+#else
 	const auto list = _data->owner().chatsList();
 	const auto &all = list->indexed()->all();
 	result.users.reserve(all.size());
@@ -142,6 +142,7 @@ Content State::next() {
 		if (const auto history = entry->history()) {
 			if (const auto user = history->peer->asUser(); user && !user->isBot()) {
 				auto userpic = std::shared_ptr<Userpic>();
+#endif
 		if (const auto i = _userpics.find(user); i != end(_userpics)) {
 			userpic = i->second;
 		} else {
@@ -152,10 +153,14 @@ Content State::next() {
 			.id = uint64(user->id.value),
 			.name = user->shortName(),
 			.userpic = std::move(userpic),
-			.unread = history->chatListBadgesState().unread// list.unread(),
+#if 1 // #TODO stories testing
+			.unread = list.unread(),
+#else
+			.unread = history->chatListBadgesState().unread
 		});
 	}
-		}
+#endif
+		});
 	}
 	return result;
 }
@@ -170,15 +175,16 @@ rpl::producer<Content> ContentForSession(not_null<Main::Session*> session) {
 		rpl::single(
 			rpl::empty
 		) | rpl::then(
-#if 0 // #TODO stories testing
+#if 1 // #TODO stories testing
 			stories->allChanged()
-#endif
+#else
 			rpl::merge(
 				session->data().chatsListChanges(
 				) | rpl::filter(
 					rpl::mappers::_1 == nullptr
 				) | rpl::to_empty,
 				session->data().unreadBadgeChanges())
+#endif
 		) | rpl::start_with_next([=] {
 			consumer.put_next(state->next());
 		}, result);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index d5d1f3d3c..3a8cdfd0a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -29,6 +29,20 @@ constexpr auto kSummaryExpandLeft = 1.5;
 
 } // namespace
 
+struct List::Layout {
+	int itemsCount = 0;
+	int shownHeight = 0;
+	float64 ratio = 0.;
+	float64 userpicLeft = 0.;
+	float64 photoLeft = 0.;
+	float64 left = 0.;
+	int startIndexSmall = 0;
+	int endIndexSmall = 0;
+	int startIndexFull = 0;
+	int endIndexFull = 0;
+	int singleFull = 0;
+};
+
 List::List(
 	not_null<QWidget*> parent,
 	rpl::producer<Content> content,
@@ -42,6 +56,7 @@ List::List(
 	}, lifetime());
 
 	_shownAnimation.stop();
+	setMouseTracking(true);
 	resize(0, _data.empty() ? 0 : st::dialogsStoriesFull.height);
 }
 
@@ -214,30 +229,29 @@ void List::resizeEvent(QResizeEvent *e) {
 	updateScrollMax();
 }
 
-void List::paintEvent(QPaintEvent *e) {
+List::Layout List::computeLayout() const {
 	const auto &st = st::dialogsStories;
 	const auto &full = st::dialogsStoriesFull;
 	const auto shownHeight = std::max(_shownHeight(), st.height);
 	const auto ratio = float64(shownHeight - st.height)
 		/ (full.height - st.height);
-	const auto lerp = [=](float64 a, float64 b) {
+	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * ratio;
 	};
 	auto &rendering = _data.empty() ? _hidingData : _data;
-	const auto photo = lerp(st.photo, full.photo);
-	const auto photoTopSmall = (st.height - st.photo) / 2.;
-	const auto photoTop = lerp(photoTopSmall, full.photoTop);
-	const auto line = lerp(st.lineTwice, full.lineTwice) / 2.;
-	const auto lineRead = lerp(st.lineReadTwice, full.lineReadTwice) / 2.;
-	const auto summaryTop = st.nameTop
-		- (st.photoTop + (st.photo / 2.))
-		+ (photoTop + (photo / 2.));
-	const auto singleSmall = st.shift;
 	const auto singleFull = full.photoLeft * 2 + full.photo;
-	const auto single = lerp(singleSmall, singleFull);
 	const auto itemsCount = int(rendering.items.size());
-	const auto leftSmall = st.left;
-	const auto leftFull = full.left - _scrollLeft;
+	const auto narrowWidth = st::defaultDialogRow.padding.left()
+		+ st::defaultDialogRow.photoSize
+		+ st::defaultDialogRow.padding.left();
+	const auto narrow = (width() <= narrowWidth);
+	const auto smallWidth = st.photo + (itemsCount - 1) * st.shift;
+	const auto leftSmall = narrow
+		? ((narrowWidth - smallWidth) / 2 - st.photoLeft)
+		: st.left;
+	const auto leftFull = (narrow
+		? ((narrowWidth - full.photo) / 2 - full.photoLeft)
+		: full.left) - _scrollLeft;
 	const auto startIndexFull = std::max(-leftFull, 0) / singleFull;
 	const auto cellLeftFull = leftFull + (startIndexFull * singleFull);
 	const auto endIndexFull = std::min(
@@ -250,18 +264,51 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto userpicLeftSmall = cellLeftSmall + st.photoLeft;
 	const auto userpicLeft = lerp(userpicLeftSmall, userpicLeftFull);
 	const auto photoLeft = lerp(st.photoLeft, full.photoLeft);
-	const auto left = userpicLeft - photoLeft;
-	const auto nameScale = shownHeight / float64(full.height);
+	return Layout{
+		.itemsCount = itemsCount,
+		.shownHeight = shownHeight,
+		.ratio = ratio,
+		.userpicLeft = userpicLeft,
+		.photoLeft = photoLeft,
+		.left = userpicLeft - photoLeft,
+		.startIndexSmall = startIndexSmall,
+		.endIndexSmall = endIndexSmall,
+		.startIndexFull = startIndexFull,
+		.endIndexFull = endIndexFull,
+		.singleFull = singleFull,
+	};
+}
+
+void List::paintEvent(QPaintEvent *e) {
+	const auto &st = st::dialogsStories;
+	const auto &full = st::dialogsStoriesFull;
+	const auto layout = computeLayout();
+	const auto ratio = layout.ratio;
+	const auto lerp = [&](float64 a, float64 b) {
+		return a + (b - a) * ratio;
+	};
+	auto &rendering = _data.empty() ? _hidingData : _data;
+	const auto line = lerp(st.lineTwice, full.lineTwice) / 2.;
+	const auto lineRead = lerp(st.lineReadTwice, full.lineReadTwice) / 2.;
+	const auto singleSmall = st.shift;
+	const auto single = lerp(singleSmall, layout.singleFull);
+	const auto photoTopSmall = (st.height - st.photo) / 2.;
+	const auto photoTop = lerp(photoTopSmall, full.photoTop);
+	const auto photo = lerp(st.photo, full.photo);
+	const auto summaryTop = st.nameTop
+		- (st.photoTop + (st.photo / 2.))
+		+ (photoTop + (photo / 2.));
+	const auto nameScale = layout.shownHeight / float64(full.height);
 	const auto nameTop = nameScale * full.nameTop;
 	const auto nameWidth = nameScale * AvailableNameWidth();
 	const auto nameHeight = nameScale * full.nameStyle.font->height;
-	const auto nameLeft = photoLeft + (photo - nameWidth) / 2.;
+	const auto nameLeft = layout.photoLeft + (photo - nameWidth) / 2.;
 	const auto readUserpicOpacity = lerp(kSmallReadOpacity, 1.);
 	const auto readUserpicAppearingOpacity = lerp(kSmallReadOpacity, 0.);
 
 	auto p = QPainter(this);
 	p.fillRect(e->rect(), st::dialogsBg);
-	p.translate(0, height() - shownHeight);
+	p.translate(0, height() - layout.shownHeight);
 
 	const auto drawSmall = (ratio < 1.);
 	const auto drawFull = (ratio > 0.);
@@ -270,8 +317,8 @@ void List::paintEvent(QPaintEvent *e) {
 	paintSummary(p, rendering, summaryTop, ratio);
 
 	const auto count = std::max(
-		endIndexFull - startIndexFull,
-		endIndexSmall - startIndexSmall);
+		layout.endIndexFull - layout.startIndexFull,
+		layout.endIndexSmall - layout.startIndexSmall);
 
 	struct Single {
 		float64 x = 0.;
@@ -285,15 +332,15 @@ void List::paintEvent(QPaintEvent *e) {
 		}
 	};
 	const auto lookup = [&](int index) {
-		const auto indexSmall = startIndexSmall + index;
-		const auto indexFull = startIndexFull + index;
-		const auto small = (drawSmall && indexSmall < endIndexSmall)
+		const auto indexSmall = layout.startIndexSmall + index;
+		const auto indexFull = layout.startIndexFull + index;
+		const auto small = (drawSmall && indexSmall < layout.endIndexSmall)
 			? &rendering.items[indexSmall]
 			: nullptr;
-		const auto full = (drawFull && indexFull < endIndexFull)
+		const auto full = (drawFull && indexFull < layout.endIndexFull)
 			? &rendering.items[indexFull]
 			: nullptr;
-		const auto x = left + single * index;
+		const auto x = layout.left + single * index;
 		return Single{ x, indexSmall, small, indexFull, full };
 	};
 	const auto hasUnread = [&](const Single &single) {
@@ -334,7 +381,7 @@ void List::paintEvent(QPaintEvent *e) {
 
 		// Unread gradient.
 		const auto x = single.x;
-		const auto userpic = QRectF(x + photoLeft, photoTop, photo, photo);
+		const auto userpic = QRectF(x + layout.photoLeft, photoTop, photo, photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
 		const auto smallUnread = small && small->user.unread;
@@ -367,7 +414,7 @@ void List::paintEvent(QPaintEvent *e) {
 		Expects(single.itemSmall || single.itemFull);
 
 		const auto x = single.x;
-		const auto userpic = QRectF(x + photoLeft, photoTop, photo, photo);
+		const auto userpic = QRectF(x + layout.photoLeft, photoTop, photo, photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
 		const auto smallUnread = small && small->user.unread;
@@ -549,7 +596,7 @@ void List::wheelEvent(QWheelEvent *e) {
 	if (next != now) {
 		_expandRequests.fire({});
 		_scrollLeft = next;
-		//updateSelected();
+		updateSelected();
 		update();
 	}
 	e->accept();
@@ -559,13 +606,16 @@ void List::mousePressEvent(QMouseEvent *e) {
 	if (e->button() != Qt::LeftButton) {
 		return;
 	}
-	_mouseDownPosition = _lastMousePosition = e->globalPos();
-	//updateSelected();
+	_lastMousePosition = e->globalPos();
+	updateSelected();
+
+	_mouseDownPosition = _lastMousePosition;
+	_pressed = _selected;
 }
 
 void List::mouseMoveEvent(QMouseEvent *e) {
 	_lastMousePosition = e->globalPos();
-	//updateSelected();
+	updateSelected();
 
 	if (!_dragging && _mouseDownPosition) {
 		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
@@ -601,11 +651,18 @@ void List::mouseReleaseEvent(QMouseEvent *e) {
 		_mouseDownPosition = std::nullopt;
 	});
 
-	//const auto wasDown = std::exchange(_pressed, SpecialOver::None);
+	const auto pressed = std::exchange(_pressed, -1);
 	if (finishDragging()) {
 		return;
 	}
-	//updateSelected();
+	updateSelected();
+	if (_selected == pressed) {
+		if (_selected < 0) {
+			_expandRequests.fire({});
+		} else if (_selected < _data.items.size()) {
+			_clicks.fire_copy(_data.items[_selected].user.id);
+		}
+	}
 }
 
 bool List::finishDragging() {
@@ -614,8 +671,62 @@ bool List::finishDragging() {
 	}
 	checkDragging();
 	_dragging = false;
-	//updateSelected();
+	updateSelected();
 	return true;
 }
 
+void List::updateSelected() {
+	if (_pressed >= 0) {
+		return;
+	}
+	const auto &st = st::dialogsStories;
+	const auto &full = st::dialogsStoriesFull;
+	const auto p = mapFromGlobal(_lastMousePosition);
+	const auto layout = computeLayout();
+	const auto firstRightFull = full.left + layout.singleFull;
+	const auto firstRightSmall = st.left
+		+ st.photoLeft
+		+ st.photo;
+	const auto stepFull = layout.singleFull;
+	const auto stepSmall = st.shift;
+	const auto lastRightAddFull = 0;
+	const auto lastRightAddSmall = st.photoLeft;
+	const auto lerp = [&](float64 a, float64 b) {
+		return a + (b - a) * layout.ratio;
+	};
+	const auto firstRight = lerp(firstRightSmall, firstRightFull);
+	const auto step = lerp(stepSmall, stepFull);
+	const auto lastRightAdd = lerp(lastRightAddSmall, lastRightAddFull);
+	const auto activateFull = (layout.ratio >= 0.5);
+	const auto startIndex = activateFull
+		? layout.startIndexFull
+		: layout.startIndexSmall;
+	const auto endIndex = activateFull
+		? layout.endIndexFull
+		: layout.endIndexSmall;
+	const auto x = p.x();
+	const auto infiniteIndex = (x < firstRight)
+		? 0
+		: int(std::floor(((x - firstRight) / step) + 1));
+	const auto index = (endIndex == startIndex)
+		? -1
+		: (infiniteIndex == endIndex - startIndex
+			&& x < firstRight
+				+ (endIndex - startIndex - 1) * step
+				+ lastRightAdd)
+		? (infiniteIndex - 1) // Last small part should still be clickable.
+		: infiniteIndex;
+	const auto selected = (index < 0
+		|| startIndex + index >= layout.itemsCount)
+		? -1
+		: (startIndex + index);
+	if (_selected != selected) {
+		const auto over = (selected >= 0);
+		if (over != (_selected >= 0)) {
+			setCursor(over ? style::cur_pointer : style::cur_default);
+		}
+		_selected = selected;
+	}
+}
+
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 636f855f7..1286db93e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -49,6 +49,7 @@ public:
 	[[nodiscard]] rpl::producer<> entered() const;
 
 private:
+	struct Layout;
 	struct Item {
 		User user;
 		QImage nameCache;
@@ -106,6 +107,7 @@ private:
 	void validateName(not_null<Item*> item);
 	void updateScrollMax();
 	void updateSummary(Data &data);
+	void updateSelected();
 	void checkDragging();
 	bool finishDragging();
 
@@ -117,6 +119,8 @@ private:
 		float64 summaryTop,
 		float64 hidden);
 
+	[[nodiscard]] Layout computeLayout() const;
+
 	Content _content;
 	Data _data;
 	Data _hidingData;
@@ -134,6 +138,9 @@ private:
 	int _scrollLeftMax = 0;
 	bool _dragging = false;
 
+	int _selected = -1;
+	int _pressed = -1;
+
 };
 
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 82d1696e1..f68680c43 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
 #include "media/stories/media_stories_caption_full_view.h"
@@ -127,7 +128,9 @@ Controller::Controller(not_null<Delegate*> delegate)
 			focused ? 0. : 1.,
 			focused ? 1. : 0.,
 			st::fadeWrapDuration);
-		togglePaused(focused);
+		if (_started) {
+			togglePaused(focused);
+		}
 	}, _lifetime);
 
 	_contentFadeAnimation.stop();
@@ -344,15 +347,23 @@ void Controller::show(
 		int index,
 		int subindex) {
 	Expects(index >= 0 && index < lists.size());
-	Expects(subindex >= 0 && subindex < lists[index].items.size());
+	Expects(subindex >= 0 && subindex < lists[index].ids.size());
 
 	showSiblings(lists, index);
 
 	const auto &list = lists[index];
-	const auto &item = list.items[subindex];
+	const auto id = list.ids[subindex];
+	const auto maybeStory = list.user->owner().stories().lookup({
+		.peer = list.user->id,
+		.story = id,
+	});
+	if (!maybeStory) {
+		return;
+	}
+	const auto story = *maybeStory;
 	const auto guard = gsl::finally([&] {
 		_started = false;
-		if (v::is<not_null<PhotoData*>>(item.media.data)) {
+		if (story->photo()) {
 			_photoPlayback = std::make_unique<PhotoPlayback>(this);
 		} else {
 			_photoPlayback = nullptr;
@@ -363,20 +374,20 @@ void Controller::show(
 	}
 	_index = subindex;
 
-	const auto id = FullStoryId{
+	const auto storyId = FullStoryId{
 		.peer = list.user->id,
-		.story = item.id,
+		.story = id,
 	};
-	if (_shown == id) {
+	if (_shown == storyId) {
 		return;
 	}
-	_shown = id;
-	_captionText = item.caption;
+	_shown = storyId;
+	_captionText = story->caption();
 	_captionFullView = nullptr;
 
-	_header->show({ .user = list.user, .date = item.date });
+	_header->show({ .user = list.user, .date = story->date() });
 	_slider->show({ .index = _index, .total = list.total });
-	_replyArea->show({ .user = list.user, .id = id.story });
+	_replyArea->show({ .user = list.user, .id = id });
 
 	if (_contentFaded) {
 		togglePaused(true);
@@ -395,7 +406,7 @@ void Controller::showSiblings(
 void Controller::showSibling(
 		std::unique_ptr<Sibling> &sibling,
 		const Data::StoriesList *list) {
-	if (!list || list->items.empty()) {
+	if (!list || list->ids.empty()) {
 		sibling = nullptr;
 	} else if (!sibling || !sibling->shows(*list)) {
 		sibling = std::make_unique<Sibling>(this, *list);
@@ -407,7 +418,7 @@ void Controller::ready() {
 		return;
 	}
 	_started = true;
-	if (_photoPlayback) {
+	if (!_contentFaded && _photoPlayback) {
 		_photoPlayback->togglePaused(false);
 	}
 }
@@ -445,23 +456,23 @@ bool Controller::subjumpFor(int delta) {
 	if (index < 0) {
 		if (_siblingLeft && _siblingLeft->shownId().valid()) {
 			return jumpFor(-1);
-		} else if (!_list || _list->items.empty()) {
+		} else if (!_list || _list->ids.empty()) {
 			return false;
 		}
 		_delegate->storiesJumpTo(&_list->user->session(), {
 			.peer = _list->user->id,
-			.story = _list->items.front().id
+			.story = _list->ids.front()
 		});
 		return true;
 	} else if (index >= _list->total) {
 		return _siblingRight
 			&& _siblingRight->shownId().valid()
 			&& jumpFor(1);
-	} else if (index < _list->items.size()) {
+	} else if (index < _list->ids.size()) {
 		// #TODO stories load more
 		_delegate->storiesJumpTo(&_list->user->session(), {
 			.peer = _list->user->id,
-			.story = _list->items[index].id
+			.story = _list->ids[index]
 		});
 	}
 	return true;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 4b5e09bde..ac3c43258 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -217,29 +217,47 @@ Sibling::Sibling(
 	not_null<Controller*> controller,
 	const Data::StoriesList &list)
 : _controller(controller)
-, _id{ list.user->id, list.items.front().id }
+, _id{ list.user->id, list.ids.front() }
 , _peer(list.user) {
-	const auto &item = list.items.front();
-	const auto &data = item.media.data;
-	const auto origin = Data::FileOrigin();
-	if (const auto video = std::get_if<not_null<DocumentData*>>(&data)) {
-		_loader = std::make_unique<LoaderVideo>((*video), origin, [=] {
-			check();
-		});
-	} else if (const auto photo = std::get_if<not_null<PhotoData*>>(&data)) {
-		_loader = std::make_unique<LoaderPhoto>((*photo), origin, [=] {
-			check();
-		});
-	} else {
-		Unexpected("Media type in stories list.");
-	}
-	_blurred = _loader->blurred();
-	check();
+	checkStory();
 	_goodShown.stop();
 }
 
 Sibling::~Sibling() = default;
 
+void Sibling::checkStory() {
+	const auto maybeStory = _peer->owner().stories().lookup(_id);
+	if (!maybeStory) {
+		if (_blurred.isNull()) {
+			_blurred = QImage(
+				st::storiesMaxSize,
+				QImage::Format_ARGB32_Premultiplied);
+			_blurred.fill(Qt::black);
+
+			if (maybeStory.error() == Data::NoStory::Unknown) {
+				_peer->owner().stories().resolve(_id, crl::guard(this, [=] {
+					checkStory();
+				}));
+			}
+		}
+		return;
+	}
+	const auto story = *maybeStory;
+	const auto &data = story->media().data;
+	const auto origin = Data::FileOrigin();
+	v::match(story->media().data, [&](not_null<PhotoData*> photo) {
+		_loader = std::make_unique<LoaderPhoto>(photo, origin, [=] {
+			check();
+		});
+	}, [&](not_null<DocumentData*> document) {
+		_loader = std::make_unique<LoaderVideo>(document, origin, [=] {
+			check();
+		});
+	});
+	_blurred = _loader->blurred();
+	check();
+}
+
 FullStoryId Sibling::shownId() const {
 	return _id;
 }
@@ -249,9 +267,9 @@ not_null<PeerData*> Sibling::peer() const {
 }
 
 bool Sibling::shows(const Data::StoriesList &list) const {
-	Expects(!list.items.empty());
+	Expects(!list.ids.empty());
 
-	return _id == FullStoryId{ list.user->id, list.items.front().id };
+	return _id == FullStoryId{ list.user->id, list.ids.front() };
 }
 
 SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.h b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
index dc355fec6..f6eb4edc7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
@@ -7,8 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/weak_ptr.h"
 #include "data/data_stories.h"
-
 #include "ui/effects/animations.h"
 #include "ui/userpic_view.h"
 
@@ -22,7 +22,7 @@ class Controller;
 struct SiblingView;
 struct SiblingLayout;
 
-class Sibling final {
+class Sibling final : public base::has_weak_ptr {
 public:
 	Sibling(
 		not_null<Controller*> controller,
@@ -42,6 +42,7 @@ private:
 	class LoaderPhoto;
 	class LoaderVideo;
 
+	void checkStory();
 	void check();
 
 	[[nodiscard]] QImage userpicImage(const SiblingLayout &layout);
diff --git a/Telegram/SourceFiles/media/view/media_view_open_common.h b/Telegram/SourceFiles/media/view/media_view_open_common.h
index ad9101976..79b835461 100644
--- a/Telegram/SourceFiles/media/view/media_view_open_common.h
+++ b/Telegram/SourceFiles/media/view/media_view_open_common.h
@@ -14,6 +14,10 @@ class PeerData;
 class PhotoData;
 class HistoryItem;
 
+namespace Data {
+class Story;
+} // namespace Data
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -67,6 +71,17 @@ public:
 	, _cloudTheme(cloudTheme) {
 	}
 
+	OpenRequest(
+		Window::SessionController *controller,
+		not_null<Data::Story*> story,
+		bool continueStreaming = false,
+		crl::time startTime = 0)
+	: _controller(controller)
+	, _story(story)
+	, _continueStreaming(continueStreaming)
+	, _startTime(startTime) {
+	}
+
 	[[nodiscard]] PeerData *peer() const {
 		return _peer;
 	}
@@ -87,6 +102,10 @@ public:
 		return _document;
 	}
 
+	[[nodiscard]] Data::Story *story() const {
+		return _story;
+	}
+
 	[[nodiscard]] std::optional<Data::CloudTheme> cloudTheme() const {
 		return _cloudTheme;
 	}
@@ -107,6 +126,7 @@ private:
 	Window::SessionController *_controller = nullptr;
 	DocumentData *_document = nullptr;
 	PhotoData *_photo = nullptr;
+	Data::Story *_story = nullptr;
 	PeerData *_peer = nullptr;
 	HistoryItem *_item = nullptr;
 	MsgId _topicRootId = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1bd915558..c80d42841 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3036,8 +3036,9 @@ void OverlayWidget::activate() {
 }
 
 void OverlayWidget::show(OpenRequest request) {
-	const auto document = request.document();
-	const auto photo = request.photo();
+	const auto story = request.story();
+	const auto document = story ? story->document() : request.document();
+	const auto photo = story ? story->photo() : request.photo();
 	const auto contextItem = request.item();
 	const auto contextPeer = request.peer();
 	const auto contextTopicRootId = request.topicRootId();
@@ -3057,15 +3058,9 @@ void OverlayWidget::show(OpenRequest request) {
 		}
 		setSession(&photo->session());
 
-		// #TODO stories testing
-		if (const auto storyId = (!contextPeer && contextItem)
-			? contextItem->history()->owner().stories().generate(
-				contextItem,
-				photo)
-			: StoryId()) {
-			setContext(StoriesContext{ contextItem->from()->asUser(), storyId });
-		} else
-		if (contextPeer) {
+		if (story) {
+			setContext(StoriesContext{ story->peer(), story->id() });
+		} else if (contextPeer) {
 			setContext(contextPeer);
 		} else if (contextItem) {
 			setContext(ItemContext{ contextItem, contextTopicRootId });
@@ -3083,15 +3078,9 @@ void OverlayWidget::show(OpenRequest request) {
 	} else if (document) {
 		setSession(&document->session());
 
-		// #TODO stories testing
-		if (const auto storyId = contextItem
-			? contextItem->history()->owner().stories().generate(
-				contextItem,
-				document)
-			: StoryId()) {
-			setContext(StoriesContext{ contextItem->from()->asUser(), storyId });
-		} else
-		if (contextItem) {
+		if (story) {
+			setContext(StoriesContext{ story->peer(), story->id() });
+		} else if (contextItem) {
 			setContext(ItemContext{ contextItem, contextTopicRootId });
 		} else {
 			setContext(v::null);
@@ -4034,30 +4023,20 @@ void OverlayWidget::storiesJumpTo(
 	Expects(_stories != nullptr);
 	Expects(id.valid());
 
-	const auto &all = session->data().stories().all();
-	const auto i = ranges::find(
-		all,
-		id.peer,
-		[](const Data::StoriesList &list) { return list.user->id; });
-	if (i == end(all)) {
+	const auto maybeStory = session->data().stories().lookup(id);
+	if (!maybeStory) {
 		close();
 		return;
 	}
-	const auto j = ranges::find(i->items, id.story, &Data::StoryItem::id);
-	if (j == end(i->items)) {
-		close();
-		return;
-	}
-	setContext(StoriesContext{ i->user, id.story });
+	const auto story = *maybeStory;
+	setContext(StoriesContext{ story->peer(), story->id() });
 	clearStreaming();
 	_streamingStartPaused = false;
-	const auto &data = j->media.data;
-	const auto activation = anim::activation::background;
-	if (const auto photo = std::get_if<not_null<PhotoData*>>(&data)) {
-		displayPhoto(*photo, activation);
-	} else {
-		displayDocument(v::get<not_null<DocumentData*>>(data), activation);
-	}
+	v::match(story->media().data, [&](not_null<PhotoData*> photo) {
+		displayPhoto(photo, anim::activation::background);
+	}, [&](not_null<DocumentData*> document) {
+		displayDocument(document, anim::activation::background);
+	});
 }
 
 void OverlayWidget::storiesClose() {
@@ -4976,36 +4955,33 @@ void OverlayWidget::setContext(
 		_history = _message->history();
 		_peer = _history->peer;
 		_topicRootId = _peer->isForum() ? item->topicRootId : MsgId();
-		setStoriesUser(nullptr);
+		setStoriesPeer(nullptr);
 	} else if (const auto peer = std::get_if<not_null<PeerData*>>(&context)) {
 		_peer = *peer;
 		_history = _peer->owner().history(_peer);
 		_message = nullptr;
 		_topicRootId = MsgId();
-		setStoriesUser(nullptr);
+		setStoriesPeer(nullptr);
 	} else if (const auto story = std::get_if<StoriesContext>(&context)) {
 		_message = nullptr;
 		_topicRootId = MsgId();
 		_history = nullptr;
 		_peer = nullptr;
-		const auto &all = story->user->owner().stories().all();
+		const auto &all = story->peer->owner().stories().all();
 		const auto i = ranges::find(
 			all,
-			story->user,
+			story->peer,
 			&Data::StoriesList::user);
 		Assert(i != end(all));
-		const auto j = ranges::find(
-			i->items,
-			story->id,
-			&Data::StoryItem::id);
-		setStoriesUser(story->user);
-		_stories->show(all, (i - begin(all)), j - begin(i->items));
+		const auto j = ranges::find(i->ids, story->id);
+		setStoriesPeer(story->peer);
+		_stories->show(all, (i - begin(all)), j - begin(i->ids));
 	} else {
 		_message = nullptr;
 		_topicRootId = MsgId();
 		_history = nullptr;
 		_peer = nullptr;
-		setStoriesUser(nullptr);
+		setStoriesPeer(nullptr);
 	}
 	_migrated = nullptr;
 	if (_history) {
@@ -5020,11 +4996,11 @@ void OverlayWidget::setContext(
 	_user = _peer ? _peer->asUser() : nullptr;
 }
 
-void OverlayWidget::setStoriesUser(UserData *user) {
-	const auto session = user ? &user->session() : nullptr;
+void OverlayWidget::setStoriesPeer(PeerData *peer) {
+	const auto session = peer ? &peer->session() : nullptr;
 	if (!session && !_storiesSession) {
 		Assert(!_stories);
-	} else if (!user) {
+	} else if (!peer) {
 		_stories = nullptr;
 		_storiesSession = nullptr;
 		_storiesChanged.fire({});
@@ -5099,14 +5075,6 @@ bool OverlayWidget::moveToEntity(const Entity &entity, int preloadDelta) {
 	if (v::is_null(entity.data) && !entity.item) {
 		return false;
 	}
-	// #TODO stories testing
-	if (const auto storyId = entity.item
-		? entity.item->history()->owner().stories().generate(
-			entity.item,
-			entity.data)
-		: StoryId()) {
-		setContext(StoriesContext{ entity.item->from()->asUser(), storyId });
-	} else
 	if (const auto item = entity.item) {
 		setContext(ItemContext{ item, entity.topicRootId });
 	} else if (_peer) {
@@ -5765,7 +5733,7 @@ void OverlayWidget::clearBeforeHide() {
 	_collage = nullptr;
 	_collageData = std::nullopt;
 	clearStreaming();
-	setStoriesUser(nullptr);
+	setStoriesPeer(nullptr);
 	_layerBg->hideAll(anim::type::instant);
 	assignMediaPointer(nullptr);
 	_preloadPhotos.clear();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index a82aa1f3c..2bc572a91 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -303,7 +303,7 @@ private:
 		MsgId topicRootId = 0;
 	};
 	struct StoriesContext {
-		not_null<UserData*> user;
+		not_null<PeerData*> peer;
 		StoryId id = 0;
 	};
 	void setContext(std::variant<
@@ -311,7 +311,7 @@ private:
 		ItemContext,
 		not_null<PeerData*>,
 		StoriesContext> context);
-	void setStoriesUser(UserData *user);
+	void setStoriesPeer(PeerData *peer);
 
 	void refreshLang();
 	void showSaveMsgFile();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 34d9ca1be..7ca01634e 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -45,6 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat_filters.h"
 #include "data/data_replies_list.h"
 #include "data/data_peer_values.h"
+#include "data/data_stories.h"
 #include "passport/passport_form_controller.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "chat_helpers/emoji_interactions.h"
@@ -2463,6 +2464,22 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 	};
 }
 
+void SessionController::openPeerStories(PeerId peerId) {
+	using namespace Media::View;
+	using namespace Data;
+
+	auto &stories = session().data().stories();
+	const auto &all = stories.all();
+	const auto i = ranges::find(all, peerId, [](const StoriesList &list) {
+		return list.user->id;
+	});
+	if (i != end(all) && !i->ids.empty()) {
+		if (const auto from = stories.lookup({ peerId, i->ids.front() })) {
+			window().openInMediaView(OpenRequest(this, *from));
+		}
+	}
+}
+
 HistoryView::PaintContext SessionController::preparePaintContext(
 		PaintContextArgs &&args) {
 	const auto visibleAreaTopLocal = content()->mapFromGlobal(
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 5258e7b8e..8f6ed90ec 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -564,6 +564,8 @@ public:
 		return _peerThemeOverride.value();
 	}
 
+	void openPeerStories(PeerId peerId);
+
 	struct PaintContextArgs {
 		not_null<Ui::ChatTheme*> theme;
 		int visibleAreaTop = 0;

From b195ec4fd5832a6bf57aef33915c78ff0da52d51 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 May 2023 12:45:50 +0400
Subject: [PATCH 255/676] Support stories file reference refreshing.

---
 Telegram/SourceFiles/apiwrap.cpp              |  9 +++++
 .../SourceFiles/data/data_file_origin.cpp     | 36 ++++++++++---------
 Telegram/SourceFiles/data/data_file_origin.h  | 20 ++++++++++-
 .../stories/media_stories_controller.cpp      |  5 +++
 .../media/stories/media_stories_controller.h  |  2 ++
 .../media/stories/media_stories_view.cpp      |  5 +++
 .../media/stories/media_stories_view.h        |  2 ++
 .../media/view/media_view_overlay_widget.cpp  | 10 +++---
 8 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 304c609d4..7840bdcfa 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -2509,6 +2509,15 @@ void ApiWrap::refreshFileReference(
 		request(MTPaccount_GetSavedRingtones(MTP_long(0)));
 	}, [&](Data::FileOriginPremiumPreviews data) {
 		request(MTPhelp_GetPremiumPromo());
+	}, [&](Data::FileOriginStory data) {
+		const auto user = _session->data().peer(data.peerId)->asUser();
+		if (user) {
+			request(MTPstories_GetStoriesByID(
+				user->inputUser,
+				MTP_vector<MTPint>(1, MTP_int(data.storyId))));
+		} else {
+			fail();
+		}
 	}, [&](v::null_t) {
 		fail();
 	});
diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index 92750b49f..ead9b1729 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -40,10 +40,8 @@ struct FileReferenceAccumulator {
 		});
 	}
 	void push(const MTPPage &data) {
-		data.match([&](const auto &data) {
-			push(data.vphotos());
-			push(data.vdocuments());
-		});
+		push(data.data().vphotos());
+		push(data.data().vdocuments());
 	}
 	void push(const MTPWallPaper &data) {
 		data.match([&](const MTPDwallPaper &data) {
@@ -52,14 +50,10 @@ struct FileReferenceAccumulator {
 		});
 	}
 	void push(const MTPTheme &data) {
-		data.match([&](const MTPDtheme &data) {
-			push(data.vdocument());
-		});
+		push(data.data().vdocument());
 	}
 	void push(const MTPWebPageAttribute &data) {
-		data.match([&](const MTPDwebPageAttributeTheme &data) {
-			push(data.vdocuments());
-		});
+		push(data.data().vdocuments());
 	}
 	void push(const MTPWebPage &data) {
 		data.match([&](const MTPDwebPage &data) {
@@ -104,6 +98,13 @@ struct FileReferenceAccumulator {
 		}, [](const MTPDmessageEmpty &data) {
 		});
 	}
+	void push(const MTPStoryItem &data) {
+		data.match([&](const MTPDstoryItem &data) {
+			push(data.vmedia());
+		}, [](const MTPDstoryItemDeleted &) {
+		}, [](const MTPDstoryItemSkipped &) {
+		});
+	}
 	void push(const MTPmessages_Messages &data) {
 		data.match([](const MTPDmessages_messagesNotModified &) {
 		}, [&](const auto &data) {
@@ -116,9 +117,7 @@ struct FileReferenceAccumulator {
 		});
 	}
 	void push(const MTPusers_UserFull &data) {
-		data.match([&](const auto &data) {
-			push(data.vfull_user().data().vpersonal_photo());
-		});
+		push(data.data().vfull_user().data().vpersonal_photo());
 	}
 	void push(const MTPmessages_RecentStickers &data) {
 		data.match([&](const MTPDmessages_recentStickers &data) {
@@ -151,9 +150,10 @@ struct FileReferenceAccumulator {
 		});
 	}
 	void push(const MTPhelp_PremiumPromo &data) {
-		data.match([&](const MTPDhelp_premiumPromo &data) {
-			push(data.vvideos());
-		});
+		push(data.data().vvideos());
+	}
+	void push(const MTPstories_Stories &data) {
+		push(data.data().vstories());
 	}
 
 	UpdatedFileReferences result;
@@ -216,6 +216,10 @@ UpdatedFileReferences GetFileReferences(const MTPhelp_PremiumPromo &data) {
 	return GetFileReferencesHelper(data);
 }
 
+UpdatedFileReferences GetFileReferences(const MTPstories_Stories &data) {
+	return GetFileReferencesHelper(data);
+}
+
 UpdatedFileReferences GetFileReferences(const MTPMessageMedia &data) {
 	return GetFileReferencesHelper(data);
 }
diff --git a/Telegram/SourceFiles/data/data_file_origin.h b/Telegram/SourceFiles/data/data_file_origin.h
index 195ae9188..b3185d2df 100644
--- a/Telegram/SourceFiles/data/data_file_origin.h
+++ b/Telegram/SourceFiles/data/data_file_origin.h
@@ -120,6 +120,20 @@ struct FileOriginPremiumPreviews {
 	}
 };
 
+struct FileOriginStory {
+	FileOriginStory(PeerId peerId, StoryId storyId)
+	: peerId(peerId)
+	, storyId(storyId) {
+	}
+
+	PeerId peerId = 0;
+	StoryId storyId = 0;
+
+	friend inline auto operator<=>(
+		FileOriginStory,
+		FileOriginStory) = default;
+};
+
 struct FileOrigin {
 	using Variant = std::variant<
 		v::null_t,
@@ -132,7 +146,8 @@ struct FileOrigin {
 		FileOriginWallpaper,
 		FileOriginTheme,
 		FileOriginRingtones,
-		FileOriginPremiumPreviews>;
+		FileOriginPremiumPreviews,
+		FileOriginStory>;
 
 	FileOrigin() = default;
 	FileOrigin(FileOriginMessage data) : data(data) {
@@ -155,6 +170,8 @@ struct FileOrigin {
 	}
 	FileOrigin(FileOriginPremiumPreviews data) : data(data) {
 	}
+	FileOrigin(FileOriginStory data) : data(data) {
+	}
 
 	explicit operator bool() const {
 		return !v::is_null(data);
@@ -204,6 +221,7 @@ UpdatedFileReferences GetFileReferences(const MTPTheme &data);
 UpdatedFileReferences GetFileReferences(
 	const MTPaccount_SavedRingtones &data);
 UpdatedFileReferences GetFileReferences(const MTPhelp_PremiumPromo &data);
+UpdatedFileReferences GetFileReferences(const MTPstories_Stories &data);
 
 // Admin Log Event.
 UpdatedFileReferences GetFileReferences(const MTPMessageMedia &data);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index f68680c43..02b8282d4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "data/data_file_origin.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
@@ -317,6 +318,10 @@ ContentLayout Controller::contentLayout() const {
 	};
 }
 
+Data::FileOrigin Controller::fileOrigin() const {
+	return Data::FileOriginStory(_shown.peer, _shown.story);
+}
+
 TextWithEntities Controller::captionText() const {
 	return _captionText;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index f553f895e..ebc4a0d47 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -21,6 +21,7 @@ struct FileChosen;
 
 namespace Data {
 struct StoriesList;
+struct FileOrigin;
 } // namespace Data
 
 namespace Ui {
@@ -80,6 +81,7 @@ public:
 	[[nodiscard]] Layout layout() const;
 	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
+	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
 	void showFullCaption();
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 82c4388d2..18a4bb499 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_view.h"
 
+#include "data/data_file_origin.h"
 #include "media/stories/media_stories_controller.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
@@ -79,6 +80,10 @@ SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
 
+Data::FileOrigin View::fileOrigin() const {
+	return _controller->fileOrigin();
+}
+
 TextWithEntities View::captionText() const {
 	return _controller->captionText();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index f36b65cf1..d01bd3d61 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Data {
 struct StoriesList;
+struct FileOrigin;
 } // namespace Data
 
 namespace Media::Player {
@@ -62,6 +63,7 @@ public:
 	[[nodiscard]] rpl::producer<QRect> finalShownGeometryValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
+	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
 	void showFullCaption();
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index c80d42841..f2efd4578 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2584,7 +2584,9 @@ auto OverlayWidget::sharedMediaKey() const -> std::optional<SharedMediaKey> {
 }
 
 Data::FileOrigin OverlayWidget::fileOrigin() const {
-	if (_message) {
+	if (_stories) {
+		return _stories->fileOrigin();
+	} else if (_message) {
 		return _message->fullId();
 	} else if (_photo && _user) {
 		return Data::FileOriginUserPhoto(peerToUser(_user->id), _photo->id);
@@ -2828,15 +2830,15 @@ void OverlayWidget::refreshFromLabel() {
 void OverlayWidget::refreshCaption() {
 	_caption = Ui::Text::String();
 	const auto caption = [&] {
-		if (_message) {
+		if (_stories) {
+			return _stories->captionText();
+		} else if (_message) {
 			if (const auto media = _message->media()) {
 				if (media->webpage()) {
 					return TextWithEntities();
 				}
 			}
 			return _message->translatedText();
-		} else if (_stories) {
-			return _stories->captionText();
 		}
 		return TextWithEntities();
 	}();

From 2e6790c45c44ed0372946cd866fbdea790a06bcd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 May 2023 13:27:34 +0400
Subject: [PATCH 256/676] Support replies to stories layout in messages.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/data/data_changes.cpp    |  33 +++
 Telegram/SourceFiles/data/data_changes.h      |  34 +++
 Telegram/SourceFiles/data/data_stories.cpp    | 219 +++++++++++++++++-
 Telegram/SourceFiles/data/data_stories.h      |  32 ++-
 Telegram/SourceFiles/history/history_item.cpp |  21 +-
 .../history/history_item_components.cpp       |  88 +++++--
 .../history/history_item_components.h         |  42 ++++
 .../history/history_item_helpers.cpp          |  38 ++-
 .../history/history_item_helpers.h            |  12 +-
 .../history/view/history_view_message.cpp     |   3 +-
 .../stories/media_stories_controller.cpp      |  14 ++
 .../media/stories/media_stories_controller.h  |   7 +
 .../window/window_session_controller.cpp      |  16 +-
 .../window/window_session_controller.h        |   1 +
 15 files changed, 522 insertions(+), 39 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 54b768de8..1b1d41d18 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -285,6 +285,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_message_text" = "New message text...";
 "lng_deleted" = "Deleted Account";
 "lng_deleted_message" = "Deleted message";
+"lng_deleted_story" = "Deleted story";
 "lng_pinned_message" = "Pinned message";
 "lng_pinned_previous" = "Previous message";
 "lng_pinned_unpin_sure" = "Would you like to unpin this message?";
diff --git a/Telegram/SourceFiles/data/data_changes.cpp b/Telegram/SourceFiles/data/data_changes.cpp
index 9f28a7af0..f20041565 100644
--- a/Telegram/SourceFiles/data/data_changes.cpp
+++ b/Telegram/SourceFiles/data/data_changes.cpp
@@ -272,6 +272,38 @@ void Changes::entryRemoved(not_null<Dialogs::Entry*> entry) {
 	_entryChanges.drop(entry);
 }
 
+void Changes::storyUpdated(
+		not_null<Story*> story,
+		StoryUpdate::Flags flags) {
+	const auto drop = (flags & StoryUpdate::Flag::Destroyed);
+	_storyChanges.updated(story, flags, drop);
+	if (!drop) {
+		scheduleNotifications();
+	}
+}
+
+rpl::producer<StoryUpdate> Changes::storyUpdates(
+		StoryUpdate::Flags flags) const {
+	return _storyChanges.updates(flags);
+}
+
+rpl::producer<StoryUpdate> Changes::storyUpdates(
+		not_null<Story*> story,
+		StoryUpdate::Flags flags) const {
+	return _storyChanges.updates(story, flags);
+}
+
+rpl::producer<StoryUpdate> Changes::storyFlagsValue(
+		not_null<Story*> story,
+		StoryUpdate::Flags flags) const {
+	return _storyChanges.flagsValue(story, flags);
+}
+
+rpl::producer<StoryUpdate> Changes::realtimeStoryUpdates(
+		StoryUpdate::Flag flag) const {
+	return _storyChanges.realtimeUpdates(flag);
+}
+
 void Changes::scheduleNotifications() {
 	if (!_notify) {
 		_notify = true;
@@ -291,6 +323,7 @@ void Changes::sendNotifications() {
 	_messageChanges.sendNotifications();
 	_entryChanges.sendNotifications();
 	_topicChanges.sendNotifications();
+	_storyChanges.sendNotifications();
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index e5bbc48e4..ee8ff6075 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -38,6 +38,7 @@ inline constexpr int CountBit(Flag Last = Flag::LastUsedBit) {
 namespace Data {
 
 class ForumTopic;
+class Story;
 
 struct NameUpdate {
 	NameUpdate(
@@ -215,6 +216,24 @@ struct EntryUpdate {
 
 };
 
+struct StoryUpdate {
+	enum class Flag : uint32 {
+		None = 0,
+
+		Edited = (1U << 0),
+		Destroyed = (1U << 1),
+		NewAdded = (1U << 2),
+
+		LastUsedBit = (1U << 2),
+	};
+	using Flags = base::flags<Flag>;
+	friend inline constexpr auto is_flag_type(Flag) { return true; }
+
+	not_null<Story*> story;
+	Flags flags = 0;
+
+};
+
 class Changes final {
 public:
 	explicit Changes(not_null<Main::Session*> session);
@@ -298,6 +317,20 @@ public:
 		EntryUpdate::Flag flag) const;
 	void entryRemoved(not_null<Dialogs::Entry*> entry);
 
+	void storyUpdated(
+		not_null<Story*> story,
+		StoryUpdate::Flags flags);
+	[[nodiscard]] rpl::producer<StoryUpdate> storyUpdates(
+		StoryUpdate::Flags flags) const;
+	[[nodiscard]] rpl::producer<StoryUpdate> storyUpdates(
+		not_null<Story*> story,
+		StoryUpdate::Flags flags) const;
+	[[nodiscard]] rpl::producer<StoryUpdate> storyFlagsValue(
+		not_null<Story*> story,
+		StoryUpdate::Flags flags) const;
+	[[nodiscard]] rpl::producer<StoryUpdate> realtimeStoryUpdates(
+		StoryUpdate::Flag flag) const;
+
 	void sendNotifications();
 
 private:
@@ -348,6 +381,7 @@ private:
 	Manager<ForumTopic, TopicUpdate> _topicChanges;
 	Manager<HistoryItem, MessageUpdate> _messageChanges;
 	Manager<Dialogs::Entry, EntryUpdate> _entryChanges;
+	Manager<Story, StoryUpdate> _storyChanges;
 
 	bool _notify = false;
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index dbddd0da0..2ee3be031 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -8,11 +8,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_stories.h"
 
 #include "api/api_text_entities.h"
+#include "apiwrap.h"
+#include "data/data_changes.h"
 #include "data/data_document.h"
+#include "data/data_file_origin.h"
 #include "data/data_photo.h"
 #include "data/data_session.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "apiwrap.h"
+#include "ui/text/text_utilities.h"
 
 // #TODO stories testing
 #include "data/data_user.h"
@@ -23,6 +27,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Data {
 namespace {
 
+constexpr auto kMaxResolveTogether = 100;
+
+using UpdateFlag = StoryUpdate::Flag;
+
 } // namespace
 
 bool StoriesList::unread() const {
@@ -56,6 +64,10 @@ StoryId Story::id() const {
 	return _id;
 }
 
+FullStoryId Story::fullId() const {
+	return { _peer->id, _id };
+}
+
 TimeId Story::date() const {
 	return _date;
 }
@@ -74,6 +86,45 @@ DocumentData *Story::document() const {
 	return result ? result->get() : nullptr;
 }
 
+bool Story::hasReplyPreview() const {
+	return v::match(_media.data, [](not_null<PhotoData*> photo) {
+		return !photo->isNull();
+	}, [](not_null<DocumentData*> document) {
+		return document->hasThumbnail();
+	});
+}
+
+Image *Story::replyPreview() const {
+	return v::match(_media.data, [&](not_null<PhotoData*> photo) {
+		return photo->getReplyPreview(
+			Data::FileOriginStory(_peer->id, _id),
+			_peer,
+			false);
+	}, [&](not_null<DocumentData*> document) {
+		return document->getReplyPreview(
+			Data::FileOriginStory(_peer->id, _id),
+			_peer,
+			false);
+	});
+}
+
+TextWithEntities Story::inReplyText() const {
+	const auto type = u"Story"_q;
+	return _caption.text.isEmpty()
+		? Ui::Text::PlainLink(type)
+		: tr::lng_dialogs_text_media(
+			tr::now,
+			lt_media_part,
+			tr::lng_dialogs_text_media_wrapped(
+				tr::now,
+				lt_media,
+				Ui::Text::PlainLink(type),
+				Ui::Text::WithEntities),
+			lt_caption,
+			_caption,
+			Ui::Text::WithEntities);
+}
+
 void Story::setPinned(bool pinned) {
 	_pinned = pinned;
 }
@@ -110,6 +161,10 @@ Session &Stories::owner() const {
 	return *_owner;
 }
 
+Main::Session &Stories::session() const {
+	return _owner->session();
+}
+
 void Stories::apply(const MTPDupdateStories &data) {
 	pushToFront(parse(data.vstories()));
 	_allChanged.fire({});
@@ -137,10 +192,7 @@ StoriesList Stories::parse(const MTPUserStories &stories) {
 		}, [&](const MTPDstoryItemSkipped &data) {
 			result.ids.push_back(data.vid().v);
 		}, [&](const MTPDstoryItemDeleted &data) {
-			_deleted.emplace(FullStoryId{
-				.peer = peerFromUser(userId),
-				.story = data.vid().v,
-			});
+			applyDeleted({ peerFromUser(userId), data.vid().v });
 			--result.total;
 		});
 	}
@@ -189,6 +241,35 @@ Story *Stories::parse(not_null<PeerData*> peer, const MTPDstoryItem &data) {
 	return result;
 }
 
+void Stories::updateDependentMessages(not_null<Data::Story*> story) {
+	const auto i = _dependentMessages.find(story);
+	if (i != end(_dependentMessages)) {
+		for (const auto &dependent : i->second) {
+			dependent->updateDependencyItem();
+		}
+	}
+	session().changes().storyUpdated(
+		story,
+		Data::StoryUpdate::Flag::Edited);
+}
+
+void Stories::registerDependentMessage(
+		not_null<HistoryItem*> dependent,
+		not_null<Data::Story*> dependency) {
+	_dependentMessages[dependency].emplace(dependent);
+}
+
+void Stories::unregisterDependentMessage(
+		not_null<HistoryItem*> dependent,
+		not_null<Data::Story*> dependency) {
+	const auto i = _dependentMessages.find(dependency);
+	if (i != end(_dependentMessages)) {
+		if (i->second.remove(dependent) && i->second.empty()) {
+			_dependentMessages.erase(i);
+		}
+	}
+}
+
 void Stories::loadMore() {
 	if (_loadMoreRequestId || _allLoaded) {
 		return;
@@ -216,6 +297,119 @@ void Stories::loadMore() {
 	}).send();
 }
 
+void Stories::sendResolveRequests() {
+	if (!_resolveRequests.empty()) {
+		return;
+	}
+	struct Prepared {
+		QVector<MTPint> ids;
+		std::vector<Fn<void()>> callbacks;
+	};
+	auto leftToSend = kMaxResolveTogether;
+	auto byPeer = base::flat_map<PeerId, Prepared>();
+	for (auto i = begin(_resolves); i != end(_resolves);) {
+		auto &[peerId, ids] = *i;
+		auto &prepared = byPeer[peerId];
+		for (auto &[storyId, callbacks] : ids) {
+			prepared.ids.push_back(MTP_int(storyId));
+			prepared.callbacks.insert(
+				end(prepared.callbacks),
+				std::make_move_iterator(begin(callbacks)),
+				std::make_move_iterator(end(callbacks)));
+			if (!--leftToSend) {
+				break;
+			}
+		}
+		const auto sending = int(prepared.ids.size());
+		if (sending == ids.size()) {
+			i = _resolves.erase(i);
+			if (!leftToSend) {
+				break;
+			}
+		} else {
+			ids.erase(begin(ids), begin(ids) + sending);
+			break;
+		}
+	}
+	const auto api = &_owner->session().api();
+	for (auto &entry : byPeer) {
+		const auto peerId = entry.first;
+		auto &prepared = entry.second;
+		const auto finish = [=, ids = prepared.ids](mtpRequestId id) {
+			for (const auto &id : ids) {
+				finalizeResolve({ peerId, id.v });
+			}
+			if (auto callbacks = _resolveRequests.take(id)) {
+				for (const auto &callback : *callbacks) {
+					callback();
+				}
+			}
+			if (_resolveRequests.empty() && !_resolves.empty()) {
+				crl::on_main(&session(), [=] { sendResolveRequests(); });
+			}
+		};
+		const auto user = _owner->session().data().peer(peerId)->asUser();
+		if (!user) {
+			_resolveRequests[0] = std::move(prepared.callbacks);
+			finish(0);
+			continue;
+		}
+		const auto requestId = api->request(MTPstories_GetStoriesByID(
+			user->inputUser,
+			MTP_vector<MTPint>(std::move(prepared.ids))
+		)).done([=](const MTPstories_Stories &result, mtpRequestId id) {
+			owner().processUsers(result.data().vusers());
+			processResolvedStories(user, result.data().vstories().v);
+			finish(id);
+		}).fail([=](const MTP::Error &error, mtpRequestId id) {
+			finish(id);
+		}).send();
+		_resolveRequests.emplace(requestId, std::move(prepared.callbacks));
+	 }
+}
+
+void Stories::processResolvedStories(
+		not_null<PeerData*> peer,
+		const QVector<MTPStoryItem> &list) {
+	for (const auto &item : list) {
+		item.match([&](const MTPDstoryItem &data) {
+			[[maybe_unused]] const auto story = parse(peer, data);
+		}, [&](const MTPDstoryItemSkipped &data) {
+			LOG(("API Error: Unexpected storyItemSkipped in resolve."));
+		}, [&](const MTPDstoryItemDeleted &data) {
+			applyDeleted({ peer->id, data.vid().v });
+		});
+	}
+}
+
+void Stories::finalizeResolve(FullStoryId id) {
+	const auto already = lookup(id);
+	if (!already.has_value() && already.error() == NoStory::Unknown) {
+		LOG(("API Error: Could not resolve story %1_%2"
+			).arg(id.peer.value
+			).arg(id.story));
+		applyDeleted(id);
+	}
+}
+
+void Stories::applyDeleted(FullStoryId id) {
+	const auto i = _stories.find(id.peer);
+	if (i != end(_stories)) {
+		const auto j = i->second.find(id.story);
+		if (j != end(i->second)) {
+			auto story = std::move(j->second);
+			i->second.erase(j);
+			session().changes().storyUpdated(
+				story.get(),
+				UpdateFlag::Destroyed);
+			if (i->second.empty()) {
+				_stories.erase(i);
+			}
+		}
+	}
+	_deleted.emplace(id);
+}
+
 const std::vector<StoriesList> &Stories::all() {
 	return _all;
 }
@@ -242,6 +436,21 @@ base::expected<not_null<Story*>, NoStory> Stories::lookup(
 }
 
 void Stories::resolve(FullStoryId id, Fn<void()> done) {
+	const auto already = lookup(id);
+	if (already.has_value() || already.error() != NoStory::Unknown) {
+		done();
+		return;
+	}
+	auto &ids = _resolves[id.peer];
+	if (ids.empty()) {
+		crl::on_main(&session(), [=] {
+			sendResolveRequests();
+		});
+	}
+	auto &callbacks = ids[id.story];
+	if (done) {
+		callbacks.push_back(std::move(done));
+	}
 }
 
 void Stories::pushToBack(StoriesList &&list) {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index e5f3b49db..641e26edf 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/expected.h"
 
+class Image;
 class PhotoData;
 class DocumentData;
 
@@ -39,11 +40,16 @@ public:
 	[[nodiscard]] not_null<PeerData*> peer() const;
 
 	[[nodiscard]] StoryId id() const;
+	[[nodiscard]] FullStoryId fullId() const;
 	[[nodiscard]] TimeId date() const;
 	[[nodiscard]] const StoryMedia &media() const;
 	[[nodiscard]] PhotoData *photo() const;
 	[[nodiscard]] DocumentData *document() const;
 
+	[[nodiscard]] bool hasReplyPreview() const;
+	[[nodiscard]] Image *replyPreview() const;
+	[[nodiscard]] TextWithEntities inReplyText() const;
+
 	void setPinned(bool pinned);
 	[[nodiscard]] bool pinned() const;
 
@@ -55,7 +61,7 @@ public:
 private:
 	const StoryId _id = 0;
 	const not_null<PeerData*> _peer;
-	const StoryMedia _media;
+	StoryMedia _media;
 	TextWithEntities _caption;
 	const TimeId _date = 0;
 	bool _pinned = false;
@@ -84,6 +90,15 @@ public:
 	~Stories();
 
 	[[nodiscard]] Session &owner() const;
+	[[nodiscard]] Main::Session &session() const;
+
+	void updateDependentMessages(not_null<Data::Story*> story);
+	void registerDependentMessage(
+		not_null<HistoryItem*> dependent,
+		not_null<Data::Story*> dependency);
+	void unregisterDependentMessage(
+		not_null<HistoryItem*> dependent,
+		not_null<Data::Story*> dependency);
 
 	void loadMore();
 	void apply(const MTPDupdateStories &data);
@@ -101,9 +116,15 @@ private:
 	[[nodiscard]] Story *parse(
 		not_null<PeerData*> peer,
 		const MTPDstoryItem &data);
+	void processResolvedStories(
+		not_null<PeerData*> peer,
+		const QVector<MTPStoryItem> &list);
+	void sendResolveRequests();
+	void finalizeResolve(FullStoryId id);
 
 	void pushToBack(StoriesList &&list);
 	void pushToFront(StoriesList &&list);
+	void applyDeleted(FullStoryId id);
 
 	const not_null<Session*> _owner;
 	base::flat_map<
@@ -111,6 +132,15 @@ private:
 		base::flat_map<StoryId, std::unique_ptr<Story>>> _stories;
 	base::flat_set<FullStoryId> _deleted;
 
+	base::flat_map<
+		PeerId,
+		base::flat_map<StoryId, std::vector<Fn<void()>>>> _resolves;
+	base::flat_map<mtpRequestId, std::vector<Fn<void()>>> _resolveRequests;
+
+	std::map<
+		not_null<Data::Story*>,
+		base::flat_set<not_null<HistoryItem*>>> _dependentMessages;
+
 	std::vector<StoriesList> _all;
 	rpl::event_stream<> _allChanged;
 	QString _state;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index cab562735..c0e60d38b 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -2544,7 +2544,7 @@ void HistoryItem::setReplyFields(
 			&& !IsServerMsgId(reply->replyToMsgId)) {
 			reply->replyToMsgId = replyTo;
 			if (!reply->updateData(this)) {
-				RequestDependentMessageData(
+				RequestDependentMessageItem(
 					this,
 					reply->replyToPeerId,
 					reply->replyToMsgId);
@@ -2966,12 +2966,21 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 		reply->replyToPeerId = config.replyToPeer;
 		reply->replyToMsgId = config.replyTo;
 		reply->replyToMsgTop = isScheduled() ? 0 : config.replyToTop;
+		reply->replyToStoryId = config.replyToStory;
+		reply->storyReply = (config.replyToStory != 0);
 		reply->topicPost = config.replyIsTopicPost;
 		if (!reply->updateData(this)) {
-			RequestDependentMessageData(
-				this,
-				reply->replyToPeerId,
-				reply->replyToMsgId);
+			if (reply->replyToMsgId) {
+				RequestDependentMessageItem(
+					this,
+					reply->replyToPeerId,
+					reply->replyToMsgId);
+			} else if (reply->replyToStoryId) {
+				RequestDependentMessageStory(
+					this,
+					reply->replyToPeerId,
+					reply->replyToStoryId);
+			}
 		}
 	}
 	if (const auto via = Get<HistoryMessageVia>()) {
@@ -3518,7 +3527,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 				dependent->topicPost = data.is_forum_topic()
 					|| Has<HistoryServiceTopicInfo>();
 				if (!updateServiceDependent()) {
-					RequestDependentMessageData(
+					RequestDependentMessageItem(
 						this,
 						(dependent->peerId
 							? dependent->peerId
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 0cecbe2fe..4b5284555 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_web_page.h"
 #include "data/data_file_click_handler.h"
+#include "data/data_stories.h"
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "api/api_bot.h"
@@ -257,15 +258,17 @@ bool HistoryMessageReply::updateData(
 		bool force) {
 	const auto guard = gsl::finally([&] { refreshReplyToMedia(); });
 	if (!force) {
-		if (replyToMsg || !replyToMsgId) {
+		if ((replyToMsg || !replyToMsgId)
+			&& (replyToStory || !replyToStoryId)) {
 			return true;
 		}
 	}
-	if (!replyToMsg) {
+	const auto peerId = replyToPeerId
+		? replyToPeerId
+		: holder->history()->peer->id;
+	if (!replyToMsg && replyToMsgId) {
 		replyToMsg = holder->history()->owner().message(
-			(replyToPeerId
-				? replyToPeerId
-				: holder->history()->peer->id),
+			peerId,
 			replyToMsgId);
 		if (replyToMsg) {
 			if (replyToMsg->isEmpty()) {
@@ -279,8 +282,22 @@ bool HistoryMessageReply::updateData(
 			}
 		}
 	}
+	if (!replyToStory && replyToStoryId) {
+		const auto maybe = holder->history()->owner().stories().lookup({
+			peerId,
+			replyToStoryId,
+		});
+		if (maybe) {
+			replyToStory = *maybe;
+			holder->history()->owner().stories().registerDependentMessage(
+				holder,
+				replyToStory.get());
+		} else if (maybe.error() == Data::NoStory::Deleted) {
+			force = true;
+		}
+	}
 
-	if (replyToMsg) {
+	if (replyToMsg || replyToStory) {
 		const auto repaint = [=] { holder->customEmojiRepaint(); };
 		const auto context = Core::MarkedTextContext{
 			.session = &holder->history()->session(),
@@ -288,14 +305,16 @@ bool HistoryMessageReply::updateData(
 		};
 		replyToText.setMarkedText(
 			st::messageTextStyle,
-			replyToMsg->inReplyText(),
+			(replyToMsg
+				? replyToMsg->inReplyText()
+				: replyToStory->inReplyText()),
 			Ui::DialogTextOptions(),
 			context);
 
 		updateName(holder);
 
 		setReplyToLinkFrom(holder);
-		if (!replyToMsg->Has<HistoryMessageForwarded>()) {
+		if (replyToMsg && !replyToMsg->Has<HistoryMessageForwarded>()) {
 			if (auto bot = replyToMsg->viaBot()) {
 				replyToVia = std::make_unique<HistoryMessageVia>();
 				replyToVia->create(
@@ -304,15 +323,17 @@ bool HistoryMessageReply::updateData(
 			}
 		}
 
-		{
+		if (replyToMsg) {
 			const auto peer = replyToMsg->history()->peer;
 			replyToColorKey = (!holder->out()
 					&& (peer->isMegagroup() || peer->isChat()))
 				? replyToMsg->from()->id
 				: PeerId(0);
+		} else {
+			replyToColorKey = PeerId(0);
 		}
 
-		const auto media = replyToMsg->media();
+		const auto media = replyToMsg ? replyToMsg->media() : nullptr;
 		if (!media || !media->hasReplyPreview() || !media->hasSpoiler()) {
 			spoiler = nullptr;
 		} else if (!spoiler) {
@@ -320,19 +341,23 @@ bool HistoryMessageReply::updateData(
 		}
 	} else if (force) {
 		replyToMsgId = 0;
+		replyToStoryId = 0;
 		replyToColorKey = PeerId(0);
 		spoiler = nullptr;
 	}
 	if (force) {
 		holder->history()->owner().requestItemResize(holder);
 	}
-	return (replyToMsg || !replyToMsgId);
+	return (replyToMsg || !replyToMsgId)
+		&& (replyToStory || !replyToStoryId);
 }
 
 void HistoryMessageReply::setReplyToLinkFrom(
 		not_null<HistoryItem*> holder) {
 	replyToLnk = replyToMsg
 		? JumpToMessageClickHandler(replyToMsg.get(), holder->fullId())
+		: replyToStory
+		? JumpToStoryClickHandler(replyToStory.get())
 		: nullptr;
 }
 
@@ -365,7 +390,9 @@ PeerData *HistoryMessageReply::replyToFrom(
 
 QString HistoryMessageReply::replyToFromName(
 		not_null<HistoryItem*> holder) const {
-	if (!replyToMsg) {
+	if (replyToStory) {
+		return replyToFromName(replyToStory->peer());
+	} else if (!replyToMsg) {
 		return QString();
 	} else if (holder->Has<HistoryMessageForwarded>()) {
 		if (const auto fwd = replyToMsg->Get<HistoryMessageForwarded>()) {
@@ -405,10 +432,15 @@ void HistoryMessageReply::updateName(
 		replyToName.setText(st::fwdTextStyle, name, Ui::NameTextOptions());
 		if (const auto from = replyToFrom(holder)) {
 			replyToVersion = from->nameVersion();
-		} else {
+		} else if (replyToMsg) {
 			replyToVersion = replyToMsg->author()->nameVersion();
+		} else {
+			replyToVersion = replyToStory->peer()->nameVersion();
 		}
-		bool hasPreview = replyToMsg->media() ? replyToMsg->media()->hasReplyPreview() : false;
+		bool hasPreview = (replyToStory && replyToStory->hasReplyPreview())
+			|| (replyToMsg
+				&& replyToMsg->media()
+				&& replyToMsg->media()->hasReplyPreview());
 		int32 previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
 		int32 w = replyToName.maxWidth();
 		if (replyToVia) {
@@ -417,14 +449,17 @@ void HistoryMessageReply::updateName(
 
 		maxReplyWidth = previewSkip + qMax(w, qMin(replyToText.maxWidth(), int32(st::maxSignatureSize)));
 	} else {
-		maxReplyWidth = st::msgDateFont->width(replyToMsgId ? tr::lng_profile_loading(tr::now) : tr::lng_deleted_message(tr::now));
+		maxReplyWidth = st::msgDateFont->width(statePhrase());
 	}
 	maxReplyWidth = st::msgReplyPadding.left() + st::msgReplyBarSkip + maxReplyWidth + st::msgReplyPadding.right();
 }
 
 void HistoryMessageReply::resize(int width) const {
 	if (replyToVia) {
-		bool hasPreview = replyToMsg->media() ? replyToMsg->media()->hasReplyPreview() : false;
+		bool hasPreview = (replyToStory && replyToStory->hasReplyPreview())
+			|| (replyToMsg
+				&& replyToMsg->media()
+				&& replyToMsg->media()->hasReplyPreview());
 		int previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
 		replyToVia->resize(width - st::msgReplyBarSkip - previewSkip - replyToName.maxWidth() - st::msgServiceFont->spacew);
 	}
@@ -471,16 +506,19 @@ void HistoryMessageReply::paint(
 	const auto pausedSpoiler = context.paused
 		|| On(PowerSaving::kChatSpoiler);
 	if (w > st::msgReplyBarSkip) {
-		if (replyToMsg) {
-			const auto media = replyToMsg->media();
-			auto hasPreview = media && media->hasReplyPreview();
+		if (replyToMsg || replyToStory) {
+			const auto media = replyToMsg ? replyToMsg->media() : nullptr;
+			auto hasPreview = (replyToStory && replyToStory->hasReplyPreview()) || (media && media->hasReplyPreview());
 			if (hasPreview && w < st::msgReplyBarSkip + st::msgReplyBarSize.height()) {
 				hasPreview = false;
 			}
 			auto previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
 
 			if (hasPreview) {
-				if (const auto image = media->replyPreview()) {
+				const auto image = media
+					? media->replyPreview()
+					: replyToStory->replyPreview();
+				if (image) {
 					auto to = style::rtlrect(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + st::msgReplyBarPos.y(), st::msgReplyBarSize.height(), st::msgReplyBarSize.height(), w + 2 * x);
 					const auto preview = image->pixSingle(
 						image->size() / style::DevicePixelRatio(),
@@ -542,11 +580,19 @@ void HistoryMessageReply::paint(
 			p.setPen(inBubble
 				? stm->msgDateFg
 				: st->msgDateImgFg());
-			p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided(replyToMsgId ? tr::lng_profile_loading(tr::now) : tr::lng_deleted_message(tr::now), w - st::msgReplyBarSkip));
+			p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided(statePhrase(), w - st::msgReplyBarSkip));
 		}
 	}
 }
 
+QString HistoryMessageReply::statePhrase() const {
+	return (replyToMsgId || replyToStoryId)
+		? tr::lng_profile_loading(tr::now)
+		: storyReply
+		? tr::lng_deleted_story(tr::now)
+		: tr::lng_deleted_message(tr::now);
+}
+
 void HistoryMessageReply::refreshReplyToMedia() {
 	replyToDocumentId = 0;
 	replyToWebPageId = 0;
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 0545a9760..32d1d43f9 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -25,6 +25,7 @@ struct PeerUserpicView;
 
 namespace Data {
 class Session;
+class Story;
 } // namespace Data
 
 namespace Media::Player {
@@ -182,6 +183,44 @@ private:
 
 };
 
+class ReplyToStoryPointer final {
+public:
+	ReplyToStoryPointer(Data::Story *story = nullptr) : _data(story) {
+	}
+	ReplyToStoryPointer(ReplyToStoryPointer &&other)
+	: _data(base::take(other._data)) {
+	}
+	ReplyToStoryPointer &operator=(ReplyToStoryPointer &&other) {
+		_data = base::take(other._data);
+		return *this;
+	}
+	ReplyToStoryPointer &operator=(Data::Story *item) {
+		_data = item;
+		return *this;
+	}
+
+	[[nodiscard]] bool empty() const {
+		return !_data;
+	}
+	[[nodiscard]] Data::Story *get() const {
+		return _data;
+	}
+	explicit operator bool() const {
+		return !empty();
+	}
+
+	[[nodiscard]] Data::Story *operator->() const {
+		return _data;
+	}
+	[[nodiscard]] Data::Story &operator*() const {
+		return *_data;
+	}
+
+private:
+	Data::Story *_data = nullptr;
+
+};
+
 struct HistoryMessageReply
 	: public RuntimeComponent<HistoryMessageReply, HistoryItem> {
 	HistoryMessageReply() = default;
@@ -236,6 +275,7 @@ struct HistoryMessageReply
 	[[nodiscard]] ClickHandlerPtr replyToLink() const {
 		return replyToLnk;
 	}
+	[[nodiscard]] QString statePhrase() const;
 	void setReplyToLinkFrom(not_null<HistoryItem*> holder);
 
 	void refreshReplyToMedia();
@@ -249,6 +289,7 @@ struct HistoryMessageReply
 	DocumentId replyToDocumentId = 0;
 	WebPageId replyToWebPageId = 0;
 	ReplyToMessagePointer replyToMsg;
+	ReplyToStoryPointer replyToStory;
 	std::unique_ptr<HistoryMessageVia> replyToVia;
 	std::unique_ptr<Ui::SpoilerAnimation> spoiler;
 	ClickHandlerPtr replyToLnk;
@@ -257,6 +298,7 @@ struct HistoryMessageReply
 	mutable int maxReplyWidth = 0;
 	int toWidth = 0;
 	bool topicPost = false;
+	bool storyReply = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index a7def067b..68eaa0d1e 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_media_types.h"
 #include "data/data_message_reactions.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_user.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -132,7 +133,7 @@ QString GetErrorTextForSending(
 	return GetErrorTextForSending(thread->peer(), std::move(request));
 }
 
-void RequestDependentMessageData(
+void RequestDependentMessageItem(
 		not_null<HistoryItem*> item,
 		PeerId peerId,
 		MsgId msgId) {
@@ -153,6 +154,23 @@ void RequestDependentMessageData(
 		done);
 }
 
+void RequestDependentMessageStory(
+		not_null<HistoryItem*> item,
+		PeerId peerId,
+		StoryId storyId) {
+	const auto fullId = item->fullId();
+	const auto history = item->history();
+	const auto session = &history->session();
+	const auto done = [=] {
+		if (const auto item = session->data().message(fullId)) {
+			item->updateDependencyItem();
+		}
+	};
+	history->owner().stories().resolve(
+		{ peerId ? peerId : history->peer->id, storyId },
+		done);
+}
+
 MessageFlags NewMessageFlags(not_null<PeerData*> peer) {
 	return MessageFlag::BeingSent
 		| (peer->isSelf() ? MessageFlag() : MessageFlag::Outgoing);
@@ -266,6 +284,24 @@ ClickHandlerPtr JumpToMessageClickHandler(
 	});
 }
 
+ClickHandlerPtr JumpToStoryClickHandler(not_null<Data::Story*> story) {
+	return JumpToStoryClickHandler(story->peer(), story->id());
+}
+
+ClickHandlerPtr JumpToStoryClickHandler(
+		not_null<PeerData*> peer,
+		StoryId storyId) {
+	return std::make_shared<LambdaClickHandler>([=] {
+		const auto separate = Core::App().separateWindowForPeer(peer);
+		const auto controller = separate
+			? separate->sessionController()
+			: peer->session().tryResolveWindow();
+		if (controller) {
+			controller->openPeerStory(peer, storyId);
+		}
+	});
+}
+
 MessageFlags FlagsFromMTP(
 		MsgId id,
 		MTPDmessage::Flags flags,
diff --git a/Telegram/SourceFiles/history/history_item_helpers.h b/Telegram/SourceFiles/history/history_item_helpers.h
index 46b772517..f9f45d029 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.h
+++ b/Telegram/SourceFiles/history/history_item_helpers.h
@@ -15,6 +15,7 @@ struct SendAction;
 } // namespace Api
 
 namespace Data {
+class Story;
 class Thread;
 } // namespace Data
 
@@ -69,10 +70,14 @@ void CheckReactionNotificationSchedule(
 	const TextWithEntities &text = TextWithEntities());
 [[nodiscard]] TextWithEntities UnsupportedMessageText();
 
-void RequestDependentMessageData(
+void RequestDependentMessageItem(
 	not_null<HistoryItem*> item,
 	PeerId peerId,
 	MsgId msgId);
+void RequestDependentMessageStory(
+	not_null<HistoryItem*> item,
+	PeerId peerId,
+	StoryId storyId);
 [[nodiscard]] MessageFlags NewMessageFlags(not_null<PeerData*> peer);
 [[nodiscard]] bool ShouldSendSilent(
 	not_null<PeerData*> peer,
@@ -115,6 +120,11 @@ struct SendingErrorRequest {
 [[nodiscard]] ClickHandlerPtr JumpToMessageClickHandler(
 	not_null<HistoryItem*> item,
 	FullMsgId returnToId = FullMsgId());
+[[nodiscard]] ClickHandlerPtr JumpToStoryClickHandler(
+	not_null<Data::Story*> story);
+ClickHandlerPtr JumpToStoryClickHandler(
+	not_null<PeerData*> peer,
+	StoryId storyId);
 
 [[nodiscard]] not_null<HistoryItem*> GenerateJoinedMessage(
 	not_null<History*> history,
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 5e0f36ddf..18f699b21 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2268,7 +2268,8 @@ bool Message::getStateReplyInfo(
 	if (auto reply = displayedReply()) {
 		int32 h = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
 		if (point.y() >= trect.top() && point.y() < trect.top() + h) {
-			if (reply->replyToMsg && QRect(trect.x(), trect.y() + st::msgReplyPadding.top(), trect.width(), st::msgReplyBarSize.height()).contains(point)) {
+			if ((reply->replyToMsg || reply->replyToStory)
+				&& QRect(trect.x(), trect.y() + st::msgReplyPadding.top(), trect.width(), st::msgReplyBarSize.height()).contains(point)) {
 				outResult->link = reply->replyToLink();
 			}
 			return true;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 02b8282d4..bbd787d91 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -10,10 +10,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "data/data_changes.h"
 #include "data/data_file_origin.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
+#include "main/main_session.h"
 #include "media/stories/media_stories_caption_full_view.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
@@ -394,6 +396,18 @@ void Controller::show(
 	_slider->show({ .index = _index, .total = list.total });
 	_replyArea->show({ .user = list.user, .id = id });
 
+	const auto session = &list.user->session();
+	if (_session != session) {
+		_session = session;
+		_sessionLifetime = session->changes().storyUpdates(
+			Data::StoryUpdate::Flag::Destroyed
+		) | rpl::start_with_next([=](Data::StoryUpdate update) {
+			if (update.story->fullId() == _shown) {
+				_delegate->storiesClose();
+			}
+		});
+	}
+
 	if (_contentFaded) {
 		togglePaused(true);
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index ebc4a0d47..6619e64a6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -28,6 +28,10 @@ namespace Ui {
 class RpWidget;
 } // namespace Ui
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Media::Player {
 struct TrackState;
 } // namespace Media::Player
@@ -152,6 +156,9 @@ private:
 
 	std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
 
+	Main::Session *_session = nullptr;
+	rpl::lifetime _sessionLifetime;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 7ca01634e..81cb18923 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2464,6 +2464,18 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 	};
 }
 
+void SessionController::openPeerStory(
+		not_null<PeerData*> peer,
+		StoryId storyId) {
+	using namespace Media::View;
+	using namespace Data;
+
+	auto &stories = session().data().stories();
+	if (const auto from = stories.lookup({ peer->id, storyId })) {
+		window().openInMediaView(OpenRequest(this, *from));
+	}
+}
+
 void SessionController::openPeerStories(PeerId peerId) {
 	using namespace Media::View;
 	using namespace Data;
@@ -2474,9 +2486,7 @@ void SessionController::openPeerStories(PeerId peerId) {
 		return list.user->id;
 	});
 	if (i != end(all) && !i->ids.empty()) {
-		if (const auto from = stories.lookup({ peerId, i->ids.front() })) {
-			window().openInMediaView(OpenRequest(this, *from));
-		}
+		openPeerStory(i->user, i->ids.front());
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 8f6ed90ec..07f763ca8 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -564,6 +564,7 @@ public:
 		return _peerThemeOverride.value();
 	}
 
+	void openPeerStory(not_null<PeerData*> peer, StoryId storyId);
 	void openPeerStories(PeerId peerId);
 
 	struct PaintContextArgs {

From 9f548b523e6cb4e52b1bc937bb0fa305a58d048c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 May 2023 18:48:33 +0400
Subject: [PATCH 257/676] Apply updates correctly.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 47 +++++++++++++++++--
 Telegram/SourceFiles/data/data_stories.h      |  3 +-
 Telegram/SourceFiles/history/history_item.cpp | 12 +++++
 Telegram/SourceFiles/history/history_item.h   |  2 +
 .../history/history_item_components.cpp       | 20 +++++++-
 .../history/history_item_components.h         |  7 ++-
 6 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 2ee3be031..3f12fd6fe 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -166,7 +166,7 @@ Main::Session &Stories::session() const {
 }
 
 void Stories::apply(const MTPDupdateStories &data) {
-	pushToFront(parse(data.vstories()));
+	applyChanges(parse(data.vstories()));
 	_allChanged.fire({});
 }
 
@@ -402,14 +402,42 @@ void Stories::applyDeleted(FullStoryId id) {
 			session().changes().storyUpdated(
 				story.get(),
 				UpdateFlag::Destroyed);
+			removeDependencyStory(story.get());
 			if (i->second.empty()) {
 				_stories.erase(i);
 			}
 		}
 	}
+	const auto j = ranges::find(_all, id.peer, [](const StoriesList &list) {
+		return list.user->id;
+	});
+	if (j != end(_all)) {
+		const auto till = ranges::remove(j->ids, id.story);
+		const auto removed = int(std::distance(till, end(j->ids)));
+		if (till != end(j->ids)) {
+			j->ids.erase(till, end(j->ids));
+			j->total = std::max(j->total - removed, 0);
+			if (j->ids.empty()) {
+				_all.erase(j);
+			}
+			_allChanged.fire({});
+		}
+	}
 	_deleted.emplace(id);
 }
 
+void Stories::removeDependencyStory(not_null<Story*> story) {
+	const auto i = _dependentMessages.find(story);
+	if (i != end(_dependentMessages)) {
+		const auto items = std::move(i->second);
+		_dependentMessages.erase(i);
+
+		for (const auto &dependent : items) {
+			dependent->dependencyStoryRemoved(story);
+		}
+	}
+}
+
 const std::vector<StoriesList> &Stories::all() {
 	return _all;
 }
@@ -465,12 +493,21 @@ void Stories::pushToBack(StoriesList &&list) {
 	}
 }
 
-void Stories::pushToFront(StoriesList &&list) {
+void Stories::applyChanges(StoriesList &&list) {
 	const auto i = ranges::find(_all, list.user, &StoriesList::user);
 	if (i != end(_all)) {
-		*i = std::move(list);
-		ranges::rotate(begin(_all), i, i + 1);
-	} else {
+		auto added = false;
+		for (const auto id : list.ids) {
+			if (!ranges::contains(i->ids, id)) {
+				i->ids.insert(begin(i->ids), id);
+				++i->total;
+				added = true;
+			}
+		}
+		if (added) {
+			ranges::rotate(begin(_all), i, i + 1);
+		}
+	} else if (!list.ids.empty()) {
 		_all.insert(begin(_all), std::move(list));
 	}
 }
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 641e26edf..979cba19b 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -123,8 +123,9 @@ private:
 	void finalizeResolve(FullStoryId id);
 
 	void pushToBack(StoriesList &&list);
-	void pushToFront(StoriesList &&list);
+	void applyChanges(StoriesList &&list);
 	void applyDeleted(FullStoryId id);
+	void removeDependencyStory(not_null<Story*> story);
 
 	const not_null<Session*> _owner;
 	base::flat_map<
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index c0e60d38b..1a99b7024 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -725,6 +725,18 @@ void HistoryItem::dependencyItemRemoved(not_null<HistoryItem*> dependency) {
 	}
 }
 
+void HistoryItem::dependencyStoryRemoved(
+		not_null<Data::Story*> dependency) {
+	if (const auto reply = Get<HistoryMessageReply>()) {
+		const auto documentId = reply->replyToDocumentId;
+		reply->storyRemoved(this, dependency);
+		if (documentId != reply->replyToDocumentId
+			&& generateLocalEntitiesByReply()) {
+			_history->owner().requestItemTextRefresh(this);
+		}
+	}
+}
+
 void HistoryItem::updateDependencyItem() {
 	if (const auto reply = Get<HistoryMessageReply>()) {
 		const auto documentId = reply->replyToDocumentId;
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 7ef66d7d6..bbc074879 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -57,6 +57,7 @@ class MessageReactions;
 class ForumTopic;
 class Thread;
 struct SponsoredFrom;
+class Story;
 } // namespace Data
 
 namespace Main {
@@ -185,6 +186,7 @@ public:
 	};
 
 	void dependencyItemRemoved(not_null<HistoryItem*> dependency);
+	void dependencyStoryRemoved(not_null<Data::Story*> dependency);
 	void updateDependencyItem();
 	[[nodiscard]] MsgId dependencyMsgId() const;
 	[[nodiscard]] bool notificationReady() const;
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 4b5284555..ce9a8edf2 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -369,7 +369,14 @@ void HistoryMessageReply::clearData(not_null<HistoryItem*> holder) {
 			replyToMsg.get());
 		replyToMsg = nullptr;
 	}
+	if (replyToStory) {
+		holder->history()->owner().stories().unregisterDependentMessage(
+			holder,
+			replyToStory.get());
+		replyToStory = nullptr;
+	}
 	replyToMsgId = 0;
+	replyToStoryId = 0;
 	refreshReplyToMedia();
 }
 
@@ -466,14 +473,23 @@ void HistoryMessageReply::resize(int width) const {
 }
 
 void HistoryMessageReply::itemRemoved(
-		HistoryItem *holder,
-		HistoryItem *removed) {
+		not_null<HistoryItem*> holder,
+		not_null<HistoryItem*> removed) {
 	if (replyToMsg.get() == removed) {
 		clearData(holder);
 		holder->history()->owner().requestItemResize(holder);
 	}
 }
 
+void HistoryMessageReply::storyRemoved(
+		not_null<HistoryItem*> holder,
+		not_null<Data::Story*> removed) {
+	if (replyToStory.get() == removed) {
+		clearData(holder);
+		holder->history()->owner().requestItemResize(holder);
+	}
+}
+
 void HistoryMessageReply::paint(
 		Painter &p,
 		not_null<const HistoryView::Element*> holder,
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 32d1d43f9..99100f6b0 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -249,7 +249,12 @@ struct HistoryMessageReply
 	[[nodiscard]] bool isNameUpdated(not_null<HistoryItem*> holder) const;
 	void updateName(not_null<HistoryItem*> holder) const;
 	void resize(int width) const;
-	void itemRemoved(HistoryItem *holder, HistoryItem *removed);
+	void itemRemoved(
+		not_null<HistoryItem*> holder,
+		not_null<HistoryItem*> removed);
+	void storyRemoved(
+		not_null<HistoryItem*> holder,
+		not_null<Data::Story*> removed);
 
 	void paint(
 		Painter &p,

From 0edbb91b72b056dca43517677fa5f4d46b1998a7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 May 2023 19:18:10 +0400
Subject: [PATCH 258/676] Process media edition updates from API.

---
 Telegram/Resources/langs/lang.strings      |  1 +
 Telegram/SourceFiles/data/data_stories.cpp | 90 ++++++++++++++--------
 Telegram/SourceFiles/data/data_stories.h   |  4 +-
 3 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1b1d41d18..7fa025d38 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1962,6 +1962,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_in_dlg_sticker" = "Sticker";
 "lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
 "lng_in_dlg_poll" = "Poll";
+"lng_in_dlg_story" = "Story";
 "lng_in_dlg_media_count#one" = "{count} media";
 "lng_in_dlg_media_count#other" = "{count} media";
 "lng_in_dlg_photo_count#one" = "{count} photo";
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 3f12fd6fe..149125377 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -31,6 +31,31 @@ constexpr auto kMaxResolveTogether = 100;
 
 using UpdateFlag = StoryUpdate::Flag;
 
+std::optional<StoryMedia> ParseMedia(
+		not_null<Session*> owner,
+		const MTPMessageMedia &media) {
+	return media.match([&](const MTPDmessageMediaPhoto &data)
+	-> std::optional<StoryMedia> {
+		if (const auto photo = data.vphoto()) {
+			const auto result = owner->processPhoto(*photo);
+			if (!result->isNull()) {
+				return StoryMedia{ result };
+			}
+		}
+		return {};
+	}, [&](const MTPDmessageMediaDocument &data)
+	-> std::optional<StoryMedia> {
+		if (const auto document = data.vdocument()) {
+			const auto result = owner->processDocument(*document);
+			if (!result->isNull()
+				&& (result->isGifv() || result->isVideoFile())) {
+				return StoryMedia{ result };
+			}
+		}
+		return {};
+	}, [](const auto &) { return std::optional<StoryMedia>(); });
+}
+
 } // namespace
 
 bool StoriesList::unread() const {
@@ -109,7 +134,7 @@ Image *Story::replyPreview() const {
 }
 
 TextWithEntities Story::inReplyText() const {
-	const auto type = u"Story"_q;
+	const auto type = tr::lng_in_dlg_story(tr::now);
 	return _caption.text.isEmpty()
 		? Ui::Text::PlainLink(type)
 		: tr::lng_dialogs_text_media(
@@ -141,14 +166,24 @@ const TextWithEntities &Story::caption() const {
 	return _caption;
 }
 
-void Story::apply(const MTPDstoryItem &data) {
-	_pinned = data.is_pinned();
-	_caption = TextWithEntities{
+bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
+	const auto pinned = data.is_pinned();
+	auto caption = TextWithEntities{
 		data.vcaption().value_or_empty(),
 		Api::EntitiesFromMTP(
 			&owner().session(),
 			data.ventities().value_or_empty()),
 	};
+	const auto changed = (_media != media)
+		|| (_pinned != pinned)
+		|| (_caption != caption);
+	if (!changed) {
+		return false;
+	}
+	_media = std::move(media);
+	_pinned = pinned;
+	_caption = std::move(caption);
+	return true;
 }
 
 Stories::Stories(not_null<Session*> owner) : _owner(owner) {
@@ -184,9 +219,10 @@ StoriesList Stories::parse(const MTPUserStories &stories) {
 	result.ids.reserve(list.size());
 	for (const auto &story : list) {
 		story.match([&](const MTPDstoryItem &data) {
-			if (const auto story = parse(result.user, data)) {
+			if (const auto story = parseAndApply(result.user, data)) {
 				result.ids.push_back(story->id());
 			} else {
+				applyDeleted({ peerFromUser(userId), data.vid().v });
 				--result.total;
 			}
 		}, [&](const MTPDstoryItemSkipped &data) {
@@ -200,44 +236,30 @@ StoriesList Stories::parse(const MTPUserStories &stories) {
 	return result;
 }
 
-Story *Stories::parse(not_null<PeerData*> peer, const MTPDstoryItem &data) {
+Story *Stories::parseAndApply(
+		not_null<PeerData*> peer,
+		const MTPDstoryItem &data) {
+	const auto media = ParseMedia(_owner, data.vmedia());
+	if (!media) {
+		return nullptr;
+	}
 	const auto id = data.vid().v;
 	auto &stories = _stories[peer->id];
 	const auto i = stories.find(id);
 	if (i != end(stories)) {
-		i->second->apply(data);
+		if (i->second->applyChanges(*media, data)) {
+			session().changes().storyUpdated(
+				i->second.get(),
+				UpdateFlag::Edited);
+		}
 		return i->second.get();
 	}
-	using MaybeMedia = std::optional<
-		std::variant<not_null<PhotoData*>, not_null<DocumentData*>>>;
-	const auto media = data.vmedia().match([&](
-			const MTPDmessageMediaPhoto &data) -> MaybeMedia {
-		if (const auto photo = data.vphoto()) {
-			const auto result = _owner->processPhoto(*photo);
-			if (!result->isNull()) {
-				return result;
-			}
-		}
-		return {};
-	}, [&](const MTPDmessageMediaDocument &data) -> MaybeMedia {
-		if (const auto document = data.vdocument()) {
-			const auto result = _owner->processDocument(*document);
-			if (!result->isNull()
-				&& (result->isGifv() || result->isVideoFile())) {
-				return result;
-			}
-		}
-		return {};
-	}, [](const auto &) { return MaybeMedia(); });
-	if (!media) {
-		return nullptr;
-	}
 	const auto result = stories.emplace(id, std::make_unique<Story>(
 		id,
 		peer,
 		StoryMedia{ *media },
 		data.vdate().v)).first->second.get();
-	result->apply(data);
+	result->applyChanges(*media, data);
 	return result;
 }
 
@@ -373,7 +395,9 @@ void Stories::processResolvedStories(
 		const QVector<MTPStoryItem> &list) {
 	for (const auto &item : list) {
 		item.match([&](const MTPDstoryItem &data) {
-			[[maybe_unused]] const auto story = parse(peer, data);
+			if (!parseAndApply(peer, data)) {
+				applyDeleted({ peer->id, data.vid().v });
+			}
 		}, [&](const MTPDstoryItemSkipped &data) {
 			LOG(("API Error: Unexpected storyItemSkipped in resolve."));
 		}, [&](const MTPDstoryItemDeleted &data) {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 979cba19b..c669fe47c 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -56,7 +56,7 @@ public:
 	void setCaption(TextWithEntities &&caption);
 	[[nodiscard]] const TextWithEntities &caption() const;
 
-	void apply(const MTPDstoryItem &data);
+	bool applyChanges(StoryMedia media, const MTPDstoryItem &data);
 
 private:
 	const StoryId _id = 0;
@@ -113,7 +113,7 @@ public:
 
 private:
 	[[nodiscard]] StoriesList parse(const MTPUserStories &stories);
-	[[nodiscard]] Story *parse(
+	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPDstoryItem &data);
 	void processResolvedStories(

From cdd4774bb8761b1d35c9c628f64760e73ba0ba37 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 May 2023 19:51:56 +0400
Subject: [PATCH 259/676] Fix initial stories collapsing in chats list.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 11 ++++++++---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.h   |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 33a2a93cd..484b840bc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -328,6 +328,7 @@ InnerWidget::InnerWidget(
 	) | rpl::filter([=] {
 		return (_viewportHeight > 0) && (defaultScrollTop() > _visibleTop);
 	}) | rpl::start_with_next([=] {
+		refreshForDefaultScroll();
 		jumpToTop();
 	}, lifetime());
 
@@ -1735,9 +1736,7 @@ void InnerWidget::mousePressReleased(
 void InnerWidget::setViewportHeight(int viewportHeight) {
 	if (_viewportHeight != viewportHeight) {
 		_viewportHeight = viewportHeight;
-		if (height() < defaultScrollTop() + viewportHeight) {
-			refresh();
-		}
+		refreshForDefaultScroll();
 	}
 }
 
@@ -2766,6 +2765,12 @@ void InnerWidget::editOpenedFilter() {
 	}
 }
 
+void InnerWidget::refreshForDefaultScroll() {
+	if (height() < defaultScrollTop() + _viewportHeight) {
+		refresh();
+	}
+}
+
 void InnerWidget::refresh(bool toTop) {
 	if (!_geometryInited) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index c7b2d899f..1dcaf68fe 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -122,6 +122,7 @@ public:
 
 	void clearFilter();
 	void refresh(bool toTop = false);
+	void refreshForDefaultScroll();
 	void refreshEmptyLabel();
 	void resizeEmptyLabel();
 

From d82381881a2619c497034ed6d7c5278fd39a0bf7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 May 2023 20:30:02 +0400
Subject: [PATCH 260/676] Allow sending stickers / GIFs in story replies.

---
 .../SourceFiles/boxes/premium_preview_box.cpp |   4 +-
 .../SourceFiles/boxes/premium_preview_box.h   |   2 +-
 .../stories/media_stories_controller.cpp      |   2 +-
 .../media/stories/media_stories_reply.cpp     | 116 ++++++++++++++++--
 .../media/stories/media_stories_reply.h       |  24 ++++
 .../SourceFiles/window/section_widget.cpp     |   8 +-
 Telegram/SourceFiles/window/section_widget.h  |   7 ++
 7 files changed, 147 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index d63288a01..20581a726 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -1192,9 +1192,9 @@ void Show(
 } // namespace
 
 void ShowStickerPreviewBox(
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document) {
-	Show(controller->uiShow(), Descriptor{
+	Show(std::move(show), Descriptor{
 		.section = PremiumPreview::Stickers,
 		.requestedSticker = document,
 	});
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h
index 30fb8f866..51f9bcfbd 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.h
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.h
@@ -34,7 +34,7 @@ class Session;
 } // namespace Main
 
 void ShowStickerPreviewBox(
-	not_null<Window::SessionController*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<DocumentData*> document);
 
 void DoubledLimitsPreviewBox(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index bbd787d91..0edb1baec 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -345,7 +345,7 @@ std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
 }
 
 auto Controller::stickerOrEmojiChosen() const
-->rpl::producer<ChatHelpers::FileChosen> {
+-> rpl::producer<ChatHelpers::FileChosen> {
 	return _delegate->storiesStickerOrEmojiChosen();
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index b11228f46..105f61def 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_reply.h"
 
 #include "api/api_common.h"
+#include "api/api_sending.h"
 #include "apiwrap.h"
 #include "base/call_delayed.h"
 #include "boxes/premium_limits_box.h"
@@ -28,8 +29,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_controller.h"
 #include "menu/menu_send.h"
 #include "storage/localimageloader.h"
+#include "storage/storage_account.h"
 #include "storage/storage_media_prepare.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "window/section_widget.h"
 #include "styles/style_boxes.h" // sendMediaPreviewSize.
 #include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
@@ -134,6 +137,96 @@ void ReplyArea::sendVoice(VoiceToSend &&data) {
 	finishSending();
 }
 
+bool ReplyArea::sendExistingDocument(
+		not_null<DocumentData*> document,
+		Api::SendOptions options,
+		std::optional<MsgId> localId) {
+	Expects(_data.user != nullptr);
+
+	const auto show = _controller->uiShow();
+	const auto error = Data::RestrictionError(
+		_data.user,
+		ChatRestriction::SendStickers);
+	if (error) {
+		show->showToast(*error);
+		return false;
+	} else if (Window::ShowSendPremiumError(show, document)) {
+		return false;
+	}
+
+	Api::SendExistingDocument(
+		Api::MessageToSend(prepareSendAction(options)),
+		document,
+		localId);
+
+	_controls->cancelReplyMessage();
+	finishSending();
+	return true;
+}
+
+void ReplyArea::sendExistingPhoto(not_null<PhotoData*> photo) {
+	sendExistingPhoto(photo, {});
+}
+
+bool ReplyArea::sendExistingPhoto(
+		not_null<PhotoData*> photo,
+		Api::SendOptions options) {
+	Expects(_data.user != nullptr);
+
+	const auto show = _controller->uiShow();
+	const auto error = Data::RestrictionError(
+		_data.user,
+		ChatRestriction::SendPhotos);
+	if (error) {
+		show->showToast(*error);
+		return false;
+	}
+
+	Api::SendExistingPhoto(
+		Api::MessageToSend(prepareSendAction(options)),
+		photo);
+
+	_controls->cancelReplyMessage();
+	finishSending();
+	return true;
+}
+
+void ReplyArea::sendInlineResult(
+		not_null<InlineBots::Result*> result,
+		not_null<UserData*> bot) {
+	const auto errorText = result->getErrorOnSend(history());
+	if (!errorText.isEmpty()) {
+		_controller->uiShow()->showToast(errorText);
+		return;
+	}
+	sendInlineResult(result, bot, {}, std::nullopt);
+}
+
+void ReplyArea::sendInlineResult(
+		not_null<InlineBots::Result*> result,
+		not_null<UserData*> bot,
+		Api::SendOptions options,
+		std::optional<MsgId> localMessageId) {
+	auto action = prepareSendAction(options);
+	action.generateLocal = true;
+	session().api().sendInlineResult(bot, result, action, localMessageId);
+
+	_controls->clear();
+
+	auto &bots = cRefRecentInlineBots();
+	const auto index = bots.indexOf(bot);
+	if (index) {
+		if (index > 0) {
+			bots.removeAt(index);
+		} else if (bots.size() >= RecentInlineBotsLimit) {
+			bots.resize(RecentInlineBotsLimit - 1);
+		}
+		bots.push_front(bot);
+		bot->session().local().writeRecentHashtagsAndBots();
+	}
+	finishSending();
+}
+
 void ReplyArea::finishSending() {
 	_controls->hidePanelsAnimated();
 	_controller->wrap()->setFocus();
@@ -188,12 +281,17 @@ bool ReplyArea::showSendingFilesError(
 	return true;
 }
 
+not_null<History*> ReplyArea::history() const {
+	Expects(_data.user != nullptr);
+
+	return _data.user->owner().history(_data.user);
+}
+
 Api::SendAction ReplyArea::prepareSendAction(
 		Api::SendOptions options) const {
 	Expects(_data.user != nullptr);
 
-	const auto history = _data.user->owner().history(_data.user);
-	auto result = Api::SendAction(history, options);
+	auto result = Api::SendAction(history(), options);
 	result.options.sendAs = _controls->sendAsPeer();
 	result.replyTo.storyId = { .peer = _data.user->id, .story = _data.id };
 	return result;
@@ -402,23 +500,19 @@ void ReplyArea::initActions() {
 	_controls->fileChosen(
 	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
 		_controller->uiShow()->hideLayer();
-		//controller()->sendingAnimation().appendSending(
-		//	data.messageSendingFrom);
-		//const auto localId = data.messageSendingFrom.localId;
-		//sendExistingDocument(data.document, data.options, localId);
+		const auto localId = data.messageSendingFrom.localId;
+		sendExistingDocument(data.document, data.options, localId);
 	}, _lifetime);
 
 	_controls->photoChosen(
 	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
-		//sendExistingPhoto(chosen.photo, chosen.options);
+		sendExistingPhoto(chosen.photo, chosen.options);
 	}, _lifetime);
 
 	_controls->inlineResultChosen(
 	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
-		//controller()->sendingAnimation().appendSending(
-		//	chosen.messageSendingFrom);
-		//const auto localId = chosen.messageSendingFrom.localId;
-		//sendInlineResult(chosen.result, chosen.bot, chosen.options, localId);
+		const auto localId = chosen.messageSendingFrom.localId;
+		sendInlineResult(chosen.result, chosen.bot, chosen.options, localId);
 	}, _lifetime);
 
 	_controls->setMimeDataHook([=](
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index c7ea6f88c..d9683521e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/weak_ptr.h"
 
+class History;
 enum class SendMediaType;
 
 namespace Api {
@@ -24,6 +25,10 @@ namespace HistoryView::Controls {
 struct VoiceToSend;
 } // namespace HistoryView::Controls
 
+namespace InlineBots {
+class Result;
+} // namespace InlineBots
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -58,6 +63,7 @@ private:
 	using VoiceToSend = HistoryView::Controls::VoiceToSend;
 
 	[[nodiscard]] Main::Session &session() const;
+	[[nodiscard]] not_null<History*> history() const;
 
 	bool confirmSendingFiles(const QStringList &files);
 	bool confirmSendingFiles(not_null<const QMimeData*> data);
@@ -90,6 +96,24 @@ private:
 		bool ctrlShiftEnter);
 	void finishSending();
 
+	void sendExistingDocument(not_null<DocumentData*> document);
+	bool sendExistingDocument(
+		not_null<DocumentData*> document,
+		Api::SendOptions options,
+		std::optional<MsgId> localId);
+	void sendExistingPhoto(not_null<PhotoData*> photo);
+	bool sendExistingPhoto(
+		not_null<PhotoData*> photo,
+		Api::SendOptions options);
+	void sendInlineResult(
+		not_null<InlineBots::Result*> result,
+		not_null<UserData*> bot);
+	void sendInlineResult(
+		not_null<InlineBots::Result*> result,
+		not_null<UserData*> bot,
+		Api::SendOptions options,
+		std::optional<MsgId> localMessageId);
+
 	void initGeometry();
 	void initActions();
 
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index bdc5fc849..d08a28c59 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -457,11 +457,17 @@ auto ChatThemeValueFromPeer(
 bool ShowSendPremiumError(
 		not_null<SessionController*> controller,
 		not_null<DocumentData*> document) {
+	return ShowSendPremiumError(controller->uiShow(), document);
+}
+
+bool ShowSendPremiumError(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document) {
 	if (!document->isPremiumSticker()
 		|| document->session().premium()) {
 		return false;
 	}
-	ShowStickerPreviewBox(controller, document);
+	ShowStickerPreviewBox(std::move(show), document);
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index 89be8819c..d8cfda814 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -16,6 +16,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class PeerData;
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Data {
 struct ReactionId;
 class ForumTopic;
@@ -238,6 +242,9 @@ private:
 [[nodiscard]] bool ShowSendPremiumError(
 	not_null<SessionController*> controller,
 	not_null<DocumentData*> document);
+[[nodiscard]] bool ShowSendPremiumError(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<DocumentData*> document);
 
 [[nodiscard]] bool ShowReactPremiumError(
 	not_null<SessionController*> controller,

From 4e165a2107d133e6346b27ff3bba72e91b814e8c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 29 May 2023 11:45:04 +0400
Subject: [PATCH 261/676] Sort chats list stories by unread state.

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

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index b1262388f..7b127cd3c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -162,6 +162,9 @@ Content State::next() {
 #endif
 		});
 	}
+	ranges::stable_partition(result.users, [](const User &user) {
+		return user.unread;
+	});
 	return result;
 }
 

From 4a676414605bb9861908e65034b97f8d90397d9a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 29 May 2023 12:06:21 +0400
Subject: [PATCH 262/676] Load more story users on demand.

---
 Telegram/SourceFiles/data/data_stories.cpp         |  4 +++-
 .../SourceFiles/dialogs/dialogs_inner_widget.cpp   |  5 +++++
 .../dialogs/ui/dialogs_stories_list.cpp            | 14 ++++++++++++++
 .../SourceFiles/dialogs/ui/dialogs_stories_list.h  |  3 +++
 .../media/stories/media_stories_controller.cpp     |  5 +++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 149125377..e86c395f3 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -299,7 +299,9 @@ void Stories::loadMore() {
 	const auto api = &_owner->session().api();
 	using Flag = MTPstories_GetAllStories::Flag;
 	_loadMoreRequestId = api->request(MTPstories_GetAllStories(
-		MTP_flags(_state.isEmpty() ? Flag(0) : Flag::f_next),
+		MTP_flags(_state.isEmpty()
+			? Flag(0)
+			: (Flag::f_next | Flag::f_state)),
 		MTP_string(_state)
 	)).done([=](const MTPstories_AllStories &result) {
 		_loadMoreRequestId = 0;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 484b840bc..1b354b377 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -342,6 +342,11 @@ InnerWidget::InnerWidget(
 		_controller->openPeerStories(PeerId(int64(id)));
 	}, lifetime());
 
+	_stories->loadMoreRequests(
+	) | rpl::start_with_next([=] {
+		session().data().stories().loadMore();
+	}, lifetime());
+
 	handleChatListEntryRefreshes();
 
 	refreshWithCollapsedRows(true);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 3a8cdfd0a..9e7370466 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -19,6 +19,7 @@ namespace {
 constexpr auto kSmallUserpicsShown = 3;
 constexpr auto kSmallReadOpacity = 0.6;
 constexpr auto kSummaryExpandLeft = 1.5;
+constexpr auto kPreloadPages = 2;
 
 [[nodiscard]] int AvailableNameWidth() {
 	const auto &full = st::dialogsStoriesFull;
@@ -206,6 +207,7 @@ void List::updateScrollMax() {
 	const auto widthFull = full.left + int(_data.items.size()) * singleFull;
 	_scrollLeftMax = std::max(widthFull - width(), 0);
 	_scrollLeft = std::clamp(_scrollLeft, 0, _scrollLeftMax);
+	checkLoadMore();
 	update();
 }
 
@@ -221,6 +223,10 @@ rpl::producer<> List::entered() const {
 	return _entered.events();
 }
 
+rpl::producer<> List::loadMoreRequests() const {
+	return _loadMoreRequests.events();
+}
+
 void List::enterEventHook(QEnterEvent *e) {
 	_entered.fire({});
 }
@@ -597,6 +603,7 @@ void List::wheelEvent(QWheelEvent *e) {
 		_expandRequests.fire({});
 		_scrollLeft = next;
 		updateSelected();
+		checkLoadMore();
 		update();
 	}
 	e->accept();
@@ -640,11 +647,18 @@ void List::checkDragging() {
 			_scrollLeftMax);
 		if (newLeft != _scrollLeft) {
 			_scrollLeft = newLeft;
+			checkLoadMore();
 			update();
 		}
 	}
 }
 
+void List::checkLoadMore() {
+	if (_scrollLeftMax - _scrollLeft < width() * kPreloadPages) {
+		_loadMoreRequests.fire({});
+	}
+}
+
 void List::mouseReleaseEvent(QMouseEvent *e) {
 	_lastMousePosition = e->globalPos();
 	const auto guard = gsl::finally([&] {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 1286db93e..06a0fc286 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -47,6 +47,7 @@ public:
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] rpl::producer<> expandRequests() const;
 	[[nodiscard]] rpl::producer<> entered() const;
+	[[nodiscard]] rpl::producer<> loadMoreRequests() const;
 
 private:
 	struct Layout;
@@ -110,6 +111,7 @@ private:
 	void updateSelected();
 	void checkDragging();
 	bool finishDragging();
+	void checkLoadMore();
 
 	void updateHeight();
 	void toggleAnimated(bool shown);
@@ -128,6 +130,7 @@ private:
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<> _expandRequests;
 	rpl::event_stream<> _entered;
+	rpl::event_stream<> _loadMoreRequests;
 
 	Ui::Animations::Simple _shownAnimation;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 0edb1baec..c0eb8153a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -40,6 +40,7 @@ constexpr auto kSiblingMultiplierMax = 0.72;
 constexpr auto kSiblingOutsidePart = 0.24;
 constexpr auto kSiblingUserpicSize = 0.3;
 constexpr auto kInnerHeightMultiplier = 1.6;
+constexpr auto kPreloadUsersCount = 3;
 
 } // namespace
 
@@ -381,6 +382,10 @@ void Controller::show(
 	}
 	_index = subindex;
 
+	if (int(lists.size()) - index < kPreloadUsersCount) {
+		story->peer()->owner().stories().loadMore();
+	}
+
 	const auto storyId = FullStoryId{
 		.peer = list.user->id,
 		.story = id,

From f3233707525f387ba82cc2a664b6e6ee8d8ac608 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 29 May 2023 16:03:23 +0400
Subject: [PATCH 263/676] Preload stories in both directions.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 132 ++++++++++++------
 Telegram/SourceFiles/data/data_stories.h      |   9 +-
 .../stories/media_stories_controller.cpp      |  80 ++++++++---
 .../media/stories/media_stories_controller.h  |   4 +
 4 files changed, 161 insertions(+), 64 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index e86c395f3..6ff76e0f9 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -28,6 +28,8 @@ namespace Data {
 namespace {
 
 constexpr auto kMaxResolveTogether = 100;
+constexpr auto kIgnorePreloadAroundIfLoaded = 15;
+constexpr auto kPreloadAroundCount = 30;
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -322,36 +324,31 @@ void Stories::loadMore() {
 }
 
 void Stories::sendResolveRequests() {
-	if (!_resolveRequests.empty()) {
+	if (!_resolveSent.empty()) {
 		return;
 	}
-	struct Prepared {
-		QVector<MTPint> ids;
-		std::vector<Fn<void()>> callbacks;
-	};
 	auto leftToSend = kMaxResolveTogether;
-	auto byPeer = base::flat_map<PeerId, Prepared>();
-	for (auto i = begin(_resolves); i != end(_resolves);) {
+	auto byPeer = base::flat_map<PeerId, QVector<MTPint>>();
+	for (auto i = begin(_resolvePending); i != end(_resolvePending);) {
 		auto &[peerId, ids] = *i;
-		auto &prepared = byPeer[peerId];
-		for (auto &[storyId, callbacks] : ids) {
-			prepared.ids.push_back(MTP_int(storyId));
-			prepared.callbacks.insert(
-				end(prepared.callbacks),
-				std::make_move_iterator(begin(callbacks)),
-				std::make_move_iterator(end(callbacks)));
-			if (!--leftToSend) {
-				break;
-			}
-		}
-		const auto sending = int(prepared.ids.size());
-		if (sending == ids.size()) {
-			i = _resolves.erase(i);
-			if (!leftToSend) {
-				break;
-			}
+		auto &sent = _resolveSent[peerId];
+		if (ids.size() <= leftToSend) {
+			sent = base::take(ids);
+			i = _resolvePending.erase(i);
+			leftToSend -= int(sent.size());
 		} else {
-			ids.erase(begin(ids), begin(ids) + sending);
+			sent = {
+				std::make_move_iterator(begin(ids)),
+				std::make_move_iterator(begin(ids) + leftToSend)
+			};
+			ids.erase(begin(ids), begin(ids) + leftToSend);
+			leftToSend = 0;
+		}
+		auto &prepared = byPeer[peerId];
+		for (auto &[storyId, callbacks] : sent) {
+			prepared.push_back(MTP_int(storyId));
+		}
+		if (!leftToSend) {
 			break;
 		}
 	}
@@ -359,36 +356,35 @@ void Stories::sendResolveRequests() {
 	for (auto &entry : byPeer) {
 		const auto peerId = entry.first;
 		auto &prepared = entry.second;
-		const auto finish = [=, ids = prepared.ids](mtpRequestId id) {
-			for (const auto &id : ids) {
-				finalizeResolve({ peerId, id.v });
-			}
-			if (auto callbacks = _resolveRequests.take(id)) {
-				for (const auto &callback : *callbacks) {
+		const auto finish = [=](PeerId peerId) {
+			const auto sent = _resolveSent.take(peerId);
+			Assert(sent.has_value());
+			for (const auto &[storyId, list] : *sent) {
+				finalizeResolve({ peerId, storyId });
+				for (const auto &callback : list) {
 					callback();
 				}
 			}
-			if (_resolveRequests.empty() && !_resolves.empty()) {
+			_itemsChanged.fire_copy(peerId);
+			if (_resolveSent.empty() && !_resolvePending.empty()) {
 				crl::on_main(&session(), [=] { sendResolveRequests(); });
 			}
 		};
 		const auto user = _owner->session().data().peer(peerId)->asUser();
 		if (!user) {
-			_resolveRequests[0] = std::move(prepared.callbacks);
-			finish(0);
+			finish(peerId);
 			continue;
 		}
 		const auto requestId = api->request(MTPstories_GetStoriesByID(
 			user->inputUser,
-			MTP_vector<MTPint>(std::move(prepared.ids))
-		)).done([=](const MTPstories_Stories &result, mtpRequestId id) {
+			MTP_vector<MTPint>(prepared)
+		)).done([=](const MTPstories_Stories &result) {
 			owner().processUsers(result.data().vusers());
 			processResolvedStories(user, result.data().vstories().v);
-			finish(id);
-		}).fail([=](const MTP::Error &error, mtpRequestId id) {
-			finish(id);
+			finish(user->id);
+		}).fail([=] {
+			finish(peerId);
 		}).send();
-		_resolveRequests.emplace(requestId, std::move(prepared.callbacks));
 	 }
 }
 
@@ -476,6 +472,10 @@ rpl::producer<> Stories::allChanged() const {
 	return _allChanged.events();
 }
 
+rpl::producer<PeerId> Stories::itemsChanged() const {
+	return _itemsChanged.events();
+}
+
 base::expected<not_null<Story*>, NoStory> Stories::lookup(
 		FullStoryId id) const {
 	const auto i = _stories.find(id.peer);
@@ -492,10 +492,20 @@ base::expected<not_null<Story*>, NoStory> Stories::lookup(
 void Stories::resolve(FullStoryId id, Fn<void()> done) {
 	const auto already = lookup(id);
 	if (already.has_value() || already.error() != NoStory::Unknown) {
-		done();
+		if (done) {
+			done();
+		}
 		return;
 	}
-	auto &ids = _resolves[id.peer];
+	if (const auto i = _resolveSent.find(id.peer); i != end(_resolveSent)) {
+		if (const auto j = i->second.find(id.story); j != end(i->second)) {
+			if (done) {
+				j->second.push_back(std::move(done));
+			}
+			return;
+		}
+	}
+	auto &ids = _resolvePending[id.peer];
 	if (ids.empty()) {
 		crl::on_main(&session(), [=] {
 			sendResolveRequests();
@@ -525,7 +535,7 @@ void Stories::applyChanges(StoriesList &&list) {
 		auto added = false;
 		for (const auto id : list.ids) {
 			if (!ranges::contains(i->ids, id)) {
-				i->ids.insert(begin(i->ids), id);
+				i->ids.push_back(id);
 				++i->total;
 				added = true;
 			}
@@ -538,4 +548,40 @@ void Stories::applyChanges(StoriesList &&list) {
 	}
 }
 
+void Stories::loadAround(FullStoryId id) {
+	const auto i = ranges::find(_all, id.peer, [](const StoriesList &list) {
+		return list.user->id;
+	});
+	if (i == end(_all)) {
+		return;
+	}
+	const auto j = ranges::find(i->ids, id.story);
+	if (j == end(i->ids)) {
+		return;
+	}
+	const auto ignore = [&] {
+		const auto side = kIgnorePreloadAroundIfLoaded;
+		const auto left = ranges::min(j - begin(i->ids), side);
+		const auto right = ranges::min(end(i->ids) - j, side);
+		for (auto k = j - left; k != j + right; ++k) {
+			const auto maybeStory = lookup({ id.peer, *k });
+			if (!maybeStory && maybeStory.error() == NoStory::Unknown) {
+				return false;
+			}
+		}
+		return true;
+	}();
+	if (ignore) {
+		return;
+	}
+	const auto side = kPreloadAroundCount;
+	const auto left = ranges::min(j - begin(i->ids), side);
+	const auto right = ranges::min(end(i->ids) - j, side);
+	const auto from = j - left;
+	const auto till = j + right;
+	for (auto k = from; k != till; ++k) {
+		resolve({ id.peer, *k }, nullptr);
+	}
+}
+
 } // namespace Data
\ No newline at end of file
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index c669fe47c..92db99acd 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -102,10 +102,12 @@ public:
 
 	void loadMore();
 	void apply(const MTPDupdateStories &data);
+	void loadAround(FullStoryId id);
 
 	[[nodiscard]] const std::vector<StoriesList> &all();
 	[[nodiscard]] bool allLoaded() const;
 	[[nodiscard]] rpl::producer<> allChanged() const;
+	[[nodiscard]] rpl::producer<PeerId> itemsChanged() const;
 
 	[[nodiscard]] base::expected<not_null<Story*>, NoStory> lookup(
 		FullStoryId id) const;
@@ -135,8 +137,10 @@ private:
 
 	base::flat_map<
 		PeerId,
-		base::flat_map<StoryId, std::vector<Fn<void()>>>> _resolves;
-	base::flat_map<mtpRequestId, std::vector<Fn<void()>>> _resolveRequests;
+		base::flat_map<StoryId, std::vector<Fn<void()>>>> _resolvePending;
+	base::flat_map<
+		PeerId,
+		base::flat_map<StoryId, std::vector<Fn<void()>>>> _resolveSent;
 
 	std::map<
 		not_null<Data::Story*>,
@@ -144,6 +148,7 @@ private:
 
 	std::vector<StoriesList> _all;
 	rpl::event_stream<> _allChanged;
+	rpl::event_stream<PeerId> _itemsChanged;
 	QString _state;
 	bool _allLoaded = false;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index c0eb8153a..83a62b624 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -361,10 +361,11 @@ void Controller::show(
 
 	const auto &list = lists[index];
 	const auto id = list.ids[subindex];
-	const auto maybeStory = list.user->owner().stories().lookup({
+	const auto storyId = FullStoryId{
 		.peer = list.user->id,
 		.story = id,
-	});
+	};
+	const auto maybeStory = list.user->owner().stories().lookup(storyId);
 	if (!maybeStory) {
 		return;
 	}
@@ -381,15 +382,8 @@ void Controller::show(
 		_list = list;
 	}
 	_index = subindex;
+	_waitingForId = {};
 
-	if (int(lists.size()) - index < kPreloadUsersCount) {
-		story->peer()->owner().stories().loadMore();
-	}
-
-	const auto storyId = FullStoryId{
-		.peer = list.user->id,
-		.story = id,
-	};
 	if (_shown == storyId) {
 		return;
 	}
@@ -411,8 +405,20 @@ void Controller::show(
 				_delegate->storiesClose();
 			}
 		});
+		session->data().stories().itemsChanged(
+		) | rpl::start_with_next([=](PeerId peerId) {
+			if (_waitingForId.peer == peerId) {
+				checkWaitingFor();
+			}
+		}, _sessionLifetime);
 	}
 
+	auto &stories = session->data().stories();
+	if (int(lists.size()) - index < kPreloadUsersCount) {
+		stories.loadMore();
+	}
+	stories.loadAround(storyId);
+
 	if (_contentFaded) {
 		togglePaused(true);
 	}
@@ -483,25 +489,61 @@ bool Controller::subjumpFor(int delta) {
 		} else if (!_list || _list->ids.empty()) {
 			return false;
 		}
-		_delegate->storiesJumpTo(&_list->user->session(), {
-			.peer = _list->user->id,
-			.story = _list->ids.front()
-		});
+		subjumpTo(0);
 		return true;
 	} else if (index >= _list->total) {
 		return _siblingRight
 			&& _siblingRight->shownId().valid()
 			&& jumpFor(1);
 	} else if (index < _list->ids.size()) {
-		// #TODO stories load more
-		_delegate->storiesJumpTo(&_list->user->session(), {
-			.peer = _list->user->id,
-			.story = _list->ids[index]
-		});
+		subjumpTo(index);
 	}
 	return true;
 }
 
+void Controller::subjumpTo(int index) {
+	Expects(_list.has_value());
+	Expects(index >= 0 && index < _list->ids.size());
+
+	const auto id = FullStoryId{
+		.peer = _list->user->id,
+		.story = _list->ids[index]
+	};
+	auto &stories = _list->user->owner().stories();
+	if (stories.lookup(id)) {
+		_delegate->storiesJumpTo(&_list->user->session(), id);
+	} else if (_waitingForId != id) {
+		_waitingForId = id;
+		stories.loadAround(id);
+	}
+}
+
+void Controller::checkWaitingFor() {
+	Expects(_waitingForId.valid());
+	Expects(_list.has_value());
+
+	auto &stories = _list->user->owner().stories();
+	const auto &all = stories.all();
+	const auto i = ranges::find_if(all, [&](const Data::StoriesList &data) {
+		return data.user->id == _waitingForId.peer;
+	});
+	if (i == end(all)) {
+		_waitingForId = {};
+		return;
+	}
+	const auto j = ranges::find(i->ids, _waitingForId.story);
+	if (j == end(i->ids)) {
+		_waitingForId = {};
+		return;
+	}
+	const auto maybe = stories.lookup(_waitingForId);
+	if (!maybe) {
+		return;
+	}
+	_delegate->storiesJumpTo(
+		&_list->user->session(),
+		base::take(_waitingForId));
+}
 
 bool Controller::jumpFor(int delta) {
 	if (delta == -1) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 6619e64a6..79bca280e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -131,6 +131,9 @@ private:
 		std::unique_ptr<Sibling> &sibling,
 		const Data::StoriesList *list);
 
+	void subjumpTo(int index);
+	void checkWaitingFor();
+
 	const not_null<Delegate*> _delegate;
 
 	rpl::variable<std::optional<Layout>> _layout;
@@ -148,6 +151,7 @@ private:
 	FullStoryId _shown;
 	TextWithEntities _captionText;
 	std::optional<Data::StoriesList> _list;
+	FullStoryId _waitingForId;
 	int _index = 0;
 	bool _started = false;
 

From f814e401b9a7c5d3311bed76cd8d091f0e0ec24e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 29 May 2023 19:09:36 +0400
Subject: [PATCH 264/676] Mark stories as read.

---
 Telegram/SourceFiles/core/application.cpp     |   4 +
 Telegram/SourceFiles/data/data_stories.cpp    | 100 ++++++++++++++++--
 Telegram/SourceFiles/data/data_stories.h      |  13 ++-
 .../dialogs/ui/dialogs_stories_list.cpp       |  30 +++---
 .../stories/media_stories_controller.cpp      |  33 +++++-
 .../media/stories/media_stories_controller.h  |   2 +
 .../window/window_session_controller.cpp      |   3 +-
 7 files changed, 158 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 4fb01d12b..6ac6a20b8 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_download_manager.h"
@@ -1685,6 +1686,9 @@ bool Application::readyToQuit() {
 				if (session->api().isQuitPrevent()) {
 					prevented = true;
 				}
+				if (session->data().stories().isQuitPrevent()) {
+					prevented = true;
+				}
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 6ff76e0f9..82b6c91b3 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_text_entities.h"
 #include "apiwrap.h"
+#include "core/application.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
@@ -30,6 +31,7 @@ namespace {
 constexpr auto kMaxResolveTogether = 100;
 constexpr auto kIgnorePreloadAroundIfLoaded = 15;
 constexpr auto kPreloadAroundCount = 30;
+constexpr auto kMarkAsReadDelay = 3 * crl::time(1000);
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -61,7 +63,7 @@ std::optional<StoryMedia> ParseMedia(
 } // namespace
 
 bool StoriesList::unread() const {
-	return !ids.empty() && readTill < ids.front();
+	return !ids.empty() && readTill < ids.back();
 }
 
 Story::Story(
@@ -188,7 +190,9 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	return true;
 }
 
-Stories::Stories(not_null<Session*> owner) : _owner(owner) {
+Stories::Stories(not_null<Session*> owner)
+: _owner(owner)
+, _markReadTimer([=] { sendMarkAsReadRequests(); }) {
 }
 
 Stories::~Stories() {
@@ -222,13 +226,13 @@ StoriesList Stories::parse(const MTPUserStories &stories) {
 	for (const auto &story : list) {
 		story.match([&](const MTPDstoryItem &data) {
 			if (const auto story = parseAndApply(result.user, data)) {
-				result.ids.push_back(story->id());
+				result.ids.emplace(story->id());
 			} else {
 				applyDeleted({ peerFromUser(userId), data.vid().v });
 				--result.total;
 			}
 		}, [&](const MTPDstoryItemSkipped &data) {
-			result.ids.push_back(data.vid().v);
+			result.ids.emplace(data.vid().v);
 		}, [&](const MTPDstoryItemDeleted &data) {
 			applyDeleted({ peerFromUser(userId), data.vid().v });
 			--result.total;
@@ -434,13 +438,13 @@ void Stories::applyDeleted(FullStoryId id) {
 		return list.user->id;
 	});
 	if (j != end(_all)) {
-		const auto till = ranges::remove(j->ids, id.story);
-		const auto removed = int(std::distance(till, end(j->ids)));
-		if (till != end(j->ids)) {
-			j->ids.erase(till, end(j->ids));
-			j->total = std::max(j->total - removed, 0);
+		const auto removed = j->ids.remove(id.story);
+		if (removed) {
 			if (j->ids.empty()) {
 				_all.erase(j);
+			} else {
+				Assert(j->total > 0);
+				--j->total;
 			}
 			_allChanged.fire({});
 		}
@@ -534,8 +538,8 @@ void Stories::applyChanges(StoriesList &&list) {
 	if (i != end(_all)) {
 		auto added = false;
 		for (const auto id : list.ids) {
-			if (!ranges::contains(i->ids, id)) {
-				i->ids.push_back(id);
+			if (!i->ids.contains(id)) {
+				i->ids.emplace(id);
 				++i->total;
 				added = true;
 			}
@@ -584,4 +588,78 @@ void Stories::loadAround(FullStoryId id) {
 	}
 }
 
+void Stories::markAsRead(FullStoryId id) {
+	const auto i = ranges::find(_all, id.peer, [](const StoriesList &list) {
+		return list.user->id;
+	});
+	Assert(i != end(_all));
+	if (i->readTill >= id.story) {
+		return;
+	} else if (!_markReadPending.contains(id.peer)) {
+		sendMarkAsReadRequests();
+	}
+	_markReadPending.emplace(id.peer);
+	i->readTill = id.story;
+	_markReadTimer.callOnce(kMarkAsReadDelay);
+	_allChanged.fire({});
+}
+
+void Stories::sendMarkAsReadRequest(
+		not_null<PeerData*> peer,
+		StoryId tillId) {
+	Expects(peer->isUser());
+
+	const auto peerId = peer->id;
+	_markReadRequests.emplace(peerId);
+	const auto finish = [=] {
+		_markReadRequests.remove(peerId);
+		if (!_markReadTimer.isActive()
+			&& _markReadPending.contains(peerId)) {
+			sendMarkAsReadRequests();
+		}
+		if (_markReadRequests.empty()) {
+			if (Core::Quitting()) {
+				LOG(("Stories doesn't prevent quit any more."));
+			}
+			Core::App().quitPreventFinished();
+		}
+	};
+
+	const auto api = &_owner->session().api();
+	api->request(MTPstories_ReadStories(
+		peer->asUser()->inputUser,
+		MTP_int(tillId)
+	)).done(finish).fail(finish).send();
+}
+
+void Stories::sendMarkAsReadRequests() {
+	_markReadTimer.cancel();
+	for (auto i = begin(_markReadPending); i != end(_markReadPending);) {
+		const auto peerId = *i;
+		if (_markReadRequests.contains(peerId)) {
+			++i;
+			continue;
+		}
+		const auto j = ranges::find(_all, peerId, [](
+				const StoriesList &list) {
+			return list.user->id;
+		});
+		if (j != end(_all)) {
+			sendMarkAsReadRequest(j->user, j->readTill);
+		}
+		i = _markReadPending.erase(i);
+	}
+}
+
+bool Stories::isQuitPrevent() {
+	if (!_markReadPending.empty()) {
+		sendMarkAsReadRequests();
+	}
+	if (_markReadRequests.empty()) {
+		return false;
+	}
+	LOG(("Stories prevents quit, marking as read..."));
+	return true;
+}
+
 } // namespace Data
\ No newline at end of file
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 92db99acd..44da5e7e3 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/expected.h"
+#include "base/timer.h"
 
 class Image;
 class PhotoData;
@@ -70,7 +71,7 @@ private:
 
 struct StoriesList {
 	not_null<UserData*> user;
-	std::vector<StoryId> ids;
+	base::flat_set<StoryId> ids;
 	StoryId readTill = 0;
 	int total = 0;
 
@@ -113,6 +114,9 @@ public:
 		FullStoryId id) const;
 	void resolve(FullStoryId id, Fn<void()> done);
 
+	[[nodiscard]] bool isQuitPrevent();
+	void markAsRead(FullStoryId id);
+
 private:
 	[[nodiscard]] StoriesList parse(const MTPUserStories &stories);
 	[[nodiscard]] Story *parseAndApply(
@@ -129,6 +133,9 @@ private:
 	void applyDeleted(FullStoryId id);
 	void removeDependencyStory(not_null<Story*> story);
 
+	void sendMarkAsReadRequests();
+	void sendMarkAsReadRequest(not_null<PeerData*> peer, StoryId tillId);
+
 	const not_null<Session*> _owner;
 	base::flat_map<
 		PeerId,
@@ -154,6 +161,10 @@ private:
 
 	mtpRequestId _loadMoreRequestId = 0;
 
+	base::flat_set<PeerId> _markReadPending;
+	base::Timer _markReadTimer;
+	base::flat_set<PeerId> _markReadRequests;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 9e7370466..58625ddef 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -37,11 +37,15 @@ struct List::Layout {
 	float64 userpicLeft = 0.;
 	float64 photoLeft = 0.;
 	float64 left = 0.;
+	float64 single = 0.;
+	int leftFull = 0;
+	int leftSmall = 0;
+	int singleFull = 0;
+	int singleSmall = 0;
 	int startIndexSmall = 0;
 	int endIndexSmall = 0;
 	int startIndexFull = 0;
 	int endIndexFull = 0;
-	int singleFull = 0;
 };
 
 List::List(
@@ -277,11 +281,15 @@ List::Layout List::computeLayout() const {
 		.userpicLeft = userpicLeft,
 		.photoLeft = photoLeft,
 		.left = userpicLeft - photoLeft,
+		.single = lerp(st.shift, singleFull),
+		.leftFull = leftFull,
+		.leftSmall = leftSmall,
+		.singleFull = singleFull,
+		.singleSmall = st.shift,
 		.startIndexSmall = startIndexSmall,
 		.endIndexSmall = endIndexSmall,
 		.startIndexFull = startIndexFull,
 		.endIndexFull = endIndexFull,
-		.singleFull = singleFull,
 	};
 }
 
@@ -296,8 +304,6 @@ void List::paintEvent(QPaintEvent *e) {
 	auto &rendering = _data.empty() ? _hidingData : _data;
 	const auto line = lerp(st.lineTwice, full.lineTwice) / 2.;
 	const auto lineRead = lerp(st.lineReadTwice, full.lineReadTwice) / 2.;
-	const auto singleSmall = st.shift;
-	const auto single = lerp(singleSmall, layout.singleFull);
 	const auto photoTopSmall = (st.height - st.photo) / 2.;
 	const auto photoTop = lerp(photoTopSmall, full.photoTop);
 	const auto photo = lerp(st.photo, full.photo);
@@ -346,7 +352,7 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto full = (drawFull && indexFull < layout.endIndexFull)
 			? &rendering.items[indexFull]
 			: nullptr;
-		const auto x = layout.left + single * index;
+		const auto x = layout.left + layout.single * index;
 		return Single{ x, indexSmall, small, indexFull, full };
 	};
 	const auto hasUnread = [&](const Single &single) {
@@ -697,19 +703,17 @@ void List::updateSelected() {
 	const auto &full = st::dialogsStoriesFull;
 	const auto p = mapFromGlobal(_lastMousePosition);
 	const auto layout = computeLayout();
-	const auto firstRightFull = full.left + layout.singleFull;
-	const auto firstRightSmall = st.left
+	const auto firstRightFull = layout.leftFull
+		+ (layout.startIndexFull + 1) * layout.singleFull;
+	const auto firstRightSmall = layout.leftSmall
 		+ st.photoLeft
 		+ st.photo;
-	const auto stepFull = layout.singleFull;
-	const auto stepSmall = st.shift;
 	const auto lastRightAddFull = 0;
 	const auto lastRightAddSmall = st.photoLeft;
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * layout.ratio;
 	};
 	const auto firstRight = lerp(firstRightSmall, firstRightFull);
-	const auto step = lerp(stepSmall, stepFull);
 	const auto lastRightAdd = lerp(lastRightAddSmall, lastRightAddFull);
 	const auto activateFull = (layout.ratio >= 0.5);
 	const auto startIndex = activateFull
@@ -721,14 +725,16 @@ void List::updateSelected() {
 	const auto x = p.x();
 	const auto infiniteIndex = (x < firstRight)
 		? 0
-		: int(std::floor(((x - firstRight) / step) + 1));
+		: int(std::floor(((x - firstRight) / layout.single) + 1));
 	const auto index = (endIndex == startIndex)
 		? -1
 		: (infiniteIndex == endIndex - startIndex
 			&& x < firstRight
-				+ (endIndex - startIndex - 1) * step
+				+ (endIndex - startIndex - 1) * layout.single
 				+ lastRightAdd)
 		? (infiniteIndex - 1) // Last small part should still be clickable.
+		: (startIndex + infiniteIndex >= endIndex)
+		? -1
 		: infiniteIndex;
 	const auto selected = (index < 0
 		|| startIndex + index >= layout.itemsCount)
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 83a62b624..650ef7af2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -41,6 +41,8 @@ constexpr auto kSiblingOutsidePart = 0.24;
 constexpr auto kSiblingUserpicSize = 0.3;
 constexpr auto kInnerHeightMultiplier = 1.6;
 constexpr auto kPreloadUsersCount = 3;
+constexpr auto kMarkAsReadAfterSeconds = 1;
+constexpr auto kMarkAsReadAfterProgress = 0.2;
 
 } // namespace
 
@@ -360,7 +362,7 @@ void Controller::show(
 	showSiblings(lists, index);
 
 	const auto &list = lists[index];
-	const auto id = list.ids[subindex];
+	const auto id = *(begin(list.ids) + subindex);
 	const auto storyId = FullStoryId{
 		.peer = list.user->id,
 		.story = id,
@@ -464,6 +466,7 @@ void Controller::updatePhotoPlayback(const Player::TrackState &state) {
 void Controller::updatePlayback(const Player::TrackState &state) {
 	_slider->updatePlayback(state);
 	updatePowerSaveBlocker(state);
+	maybeMarkAsRead(state);
 	if (Player::IsStoppedAtEnd(state.state)) {
 		if (!subjumpFor(1)) {
 			_delegate->storiesClose();
@@ -471,6 +474,26 @@ void Controller::updatePlayback(const Player::TrackState &state) {
 	}
 }
 
+void Controller::maybeMarkAsRead(const Player::TrackState &state) {
+	const auto length = state.length;
+	const auto position = Player::IsStoppedAtEnd(state.state)
+		? state.length
+		: Player::IsStoppedOrStopping(state.state)
+		? 0
+		: state.position;
+	if (position > state.frequency * kMarkAsReadAfterSeconds) {
+		if (position > kMarkAsReadAfterProgress * length) {
+			markAsRead();
+		}
+	}
+}
+
+void Controller::markAsRead() {
+	Expects(_list.has_value());
+
+	_list->user->owner().stories().markAsRead(_shown);
+}
+
 bool Controller::subjumpAvailable(int delta) const {
 	const auto index = _index + delta;
 	if (index < 0) {
@@ -482,6 +505,9 @@ bool Controller::subjumpAvailable(int delta) const {
 }
 
 bool Controller::subjumpFor(int delta) {
+	if (delta > 0) {
+		markAsRead();
+	}
 	const auto index = _index + delta;
 	if (index < 0) {
 		if (_siblingLeft && _siblingLeft->shownId().valid()) {
@@ -507,7 +533,7 @@ void Controller::subjumpTo(int index) {
 
 	const auto id = FullStoryId{
 		.peer = _list->user->id,
-		.story = _list->ids[index]
+		.story = *(begin(_list->ids) + index)
 	};
 	auto &stories = _list->user->owner().stories();
 	if (stories.lookup(id)) {
@@ -554,6 +580,9 @@ bool Controller::jumpFor(int delta) {
 			return true;
 		}
 	} else if (delta == 1) {
+		if (_list && _index + 1 >= _list->total) {
+			markAsRead();
+		}
 		if (const auto right = _siblingRight.get()) {
 			_delegate->storiesJumpTo(
 				&right->peer()->session(),
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 79bca280e..f381e51c1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -123,6 +123,8 @@ private:
 	void updatePhotoPlayback(const Player::TrackState &state);
 	void updatePlayback(const Player::TrackState &state);
 	void updatePowerSaveBlocker(const Player::TrackState &state);
+	void maybeMarkAsRead(const Player::TrackState &state);
+	void markAsRead();
 
 	void showSiblings(
 		const std::vector<Data::StoriesList> &lists,
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 81cb18923..b30e9dd13 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2486,7 +2486,8 @@ void SessionController::openPeerStories(PeerId peerId) {
 		return list.user->id;
 	});
 	if (i != end(all) && !i->ids.empty()) {
-		openPeerStory(i->user, i->ids.front());
+		const auto j = i->ids.lower_bound(i->readTill + 1);
+		openPeerStory(i->user, j != i->ids.end() ? *j : i->ids.front());
 	}
 }
 

From b8cf00a0b2d4086312b7a929b2f2cda57b161697 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 May 2023 09:44:31 +0400
Subject: [PATCH 265/676] Fix replying to stories with voice messages.

---
 Telegram/SourceFiles/data/data_histories.cpp   | 18 +++++++++---------
 .../controls/history_view_compose_controls.cpp |  2 +-
 .../media/stories/media_stories_controller.cpp |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index d69b11ce4..4ca3cb635 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -35,15 +35,7 @@ constexpr auto kReadRequestTimeout = 3 * crl::time(1000);
 MTPInputReplyTo ReplyToForMTP(
 		not_null<Session*> owner,
 		FullReplyTo replyTo) {
-	if (replyTo.msgId || replyTo.topicRootId) {
-		using Flag = MTPDinputReplyToMessage::Flag;
-		return MTP_inputReplyToMessage(
-			(replyTo.topicRootId
-				? MTP_flags(Flag::f_top_msg_id)
-				: MTP_flags(0)),
-			MTP_int(replyTo.msgId ? replyTo.msgId : replyTo.topicRootId),
-			MTP_int(replyTo.topicRootId));
-	} else if (replyTo.storyId) {
+	if (replyTo.storyId) {
 		if (const auto peer = owner->peerLoaded(replyTo.storyId.peer)) {
 			if (const auto user = peer->asUser()) {
 				return MTP_inputReplyToStory(
@@ -51,6 +43,14 @@ MTPInputReplyTo ReplyToForMTP(
 					MTP_int(replyTo.storyId.story));
 			}
 		}
+	} else if (replyTo.msgId || replyTo.topicRootId) {
+		using Flag = MTPDinputReplyToMessage::Flag;
+		return MTP_inputReplyToMessage(
+			(replyTo.topicRootId
+				? MTP_flags(Flag::f_top_msg_id)
+				: MTP_flags(0)),
+			MTP_int(replyTo.msgId ? replyTo.msgId : replyTo.topicRootId),
+			MTP_int(replyTo.topicRootId));
 	}
 	return MTPInputReplyTo();
 }
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 29f1736ae..23a57dc06 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2274,7 +2274,7 @@ void ComposeControls::initVoiceRecordBar() {
 			return std::nullopt;
 		}();
 		if (error) {
-			_show->showBox(Ui::MakeInformBox(*error));
+			_show->showToast(*error);
 			return true;
 		} else if (_showSlowmodeError && _showSlowmodeError()) {
 			return true;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 650ef7af2..35d2f3709 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -421,6 +421,8 @@ void Controller::show(
 	}
 	stories.loadAround(storyId);
 
+	list.user->updateFull();
+
 	if (_contentFaded) {
 		togglePaused(true);
 	}

From 8b22f9dcacd5ab5101a1d869ea69cd0e15f56a04 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 May 2023 17:57:11 +0400
Subject: [PATCH 266/676] Better track paused story state.

---
 Telegram/SourceFiles/data/data_stories.cpp    |   2 +-
 Telegram/SourceFiles/data/data_stories.h      |   2 +-
 .../history_view_compose_controls.cpp         |  19 ++-
 .../controls/history_view_compose_controls.h  |   3 +
 .../stories/media_stories_controller.cpp      | 118 +++++++++++-------
 .../media/stories/media_stories_controller.h  |  10 ++
 .../media/stories/media_stories_delegate.h    |   1 +
 .../media/stories/media_stories_reply.cpp     |  36 ++++--
 .../media/stories/media_stories_reply.h       |   4 +-
 .../SourceFiles/media/view/media_view.style   |   1 +
 .../media/view/media_view_overlay_opengl.cpp  |   7 +-
 .../media/view/media_view_overlay_opengl.h    |   2 +-
 .../media/view/media_view_overlay_widget.cpp  |   4 +
 .../media/view/media_view_overlay_widget.h    |   1 +
 14 files changed, 149 insertions(+), 61 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 82b6c91b3..dd6d80fbb 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -588,7 +588,7 @@ void Stories::loadAround(FullStoryId id) {
 	}
 }
 
-void Stories::markAsRead(FullStoryId id) {
+void Stories::markAsRead(FullStoryId id, bool viewed) {
 	const auto i = ranges::find(_all, id.peer, [](const StoriesList &list) {
 		return list.user->id;
 	});
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 44da5e7e3..7a4546a0b 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -115,7 +115,7 @@ public:
 	void resolve(FullStoryId id, Fn<void()> done);
 
 	[[nodiscard]] bool isQuitPrevent();
-	void markAsRead(FullStoryId id);
+	void markAsRead(FullStoryId id, bool viewed);
 
 private:
 	[[nodiscard]] StoriesList parse(const MTPUserStories &stories);
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 23a57dc06..45c07c9ee 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1135,6 +1135,10 @@ rpl::producer<bool> ComposeControls::focusedValue() const {
 		| rpl::then(_focusChanges.events());
 }
 
+rpl::producer<bool> ComposeControls::tabbedPanelShownValue() const {
+	return _tabbedPanel ? _tabbedPanel->shownValue() : rpl::single(false);
+}
+
 rpl::producer<> ComposeControls::cancelRequests() const {
 	return _cancelRequests.events();
 }
@@ -2013,9 +2017,12 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		updateControlsGeometry(_wrap->size());
 	});
 
+	const auto hadFocus = Ui::InFocusChain(_field);
 	if (!draft) {
 		clearFieldText(0, fieldHistoryAction);
-		_field->setFocus();
+		if (hadFocus) {
+			_field->setFocus();
+		}
 		_header->editMessage({});
 		_header->replyToMessage({});
 		_canReplaceMedia = false;
@@ -2025,7 +2032,9 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 
 	_textUpdateEvents = 0;
 	setFieldText(draft->textWithTags, 0, fieldHistoryAction);
-	_field->setFocus();
+	if (hadFocus) {
+		_field->setFocus();
+	}
 	draft->cursor.applyTo(_field);
 	_textUpdateEvents = TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping;
 	if (_preview) {
@@ -2253,11 +2262,13 @@ void ComposeControls::initVoiceRecordBar() {
 	_voiceRecordBar->recordingStateChanges(
 	) | rpl::start_with_next([=](bool active) {
 		if (active) {
+			_recording = true;
 			changeFocusedControl();
 		}
 		_field->setVisible(!active);
 		if (!active) {
 			changeFocusedControl();
+			_recording = false;
 		}
 	}, _wrap->lifetime());
 
@@ -2938,6 +2949,10 @@ bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
 
+rpl::producer<bool> ComposeControls::recordingValue() const {
+	return _recording.value();
+}
+
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
 	if (_voiceRecordBar->isActive()) {
 		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
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 d0696bef6..11b2efe22 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -146,6 +146,7 @@ public:
 
 	bool focus();
 	[[nodiscard]] rpl::producer<bool> focusedValue() const;
+	[[nodiscard]] rpl::producer<bool> tabbedPanelShownValue() const;
 	[[nodiscard]] rpl::producer<> cancelRequests() const;
 	[[nodiscard]] rpl::producer<Api::SendOptions> sendRequests() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
@@ -213,6 +214,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isRecording() const;
+	[[nodiscard]] rpl::producer<bool> recordingValue() const;
 
 	void applyCloudDraft();
 	void applyDraft(
@@ -379,6 +381,7 @@ private:
 	rpl::event_stream<std::optional<bool>> _attachRequests;
 	rpl::event_stream<ReplyNextRequest> _replyNextRequests;
 	rpl::event_stream<> _focusRequests;
+	rpl::variable<bool> _recording;
 
 	TextUpdateEvents _textUpdateEvents = TextUpdateEvents()
 		| TextUpdateEvent::SaveDraft
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 35d2f3709..6921f7b80 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
+#include "base/qt_signal_producer.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "data/data_changes.h"
 #include "data/data_file_origin.h"
@@ -29,6 +30,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_widgets.h"
 #include "styles/style_boxes.h" // UserpicButton
 
+#include <QtGui/QWindow>
+
 namespace Media::Stories {
 namespace {
 
@@ -123,27 +126,52 @@ Controller::Controller(not_null<Delegate*> delegate)
 , _replyArea(std::make_unique<ReplyArea>(this)) {
 	initLayout();
 
-	_replyArea->focusedValue(
-	) | rpl::start_with_next([=](bool focused) {
-		if (focused) {
+	_replyArea->activeValue(
+	) | rpl::start_with_next([=](bool active) {
+		if (active) {
 			_captionFullView = nullptr;
 		}
-		_contentFaded = focused;
-		_contentFadeAnimation.start(
-			[=] { _delegate->storiesRepaint(); },
-			focused ? 0. : 1.,
-			focused ? 1. : 0.,
-			st::fadeWrapDuration);
-		if (_started) {
-			togglePaused(focused);
-		}
+		_replyActive = active;
+		updateContentFaded();
 	}, _lifetime);
 
+	_replyArea->focusedValue(
+	) | rpl::start_with_next([=](bool focused) {
+		_replyFocused = focused;
+	}, _lifetime);
+
+	_delegate->storiesLayerShown(
+	) | rpl::start_with_next([=](bool shown) {
+		_layerShown = shown;
+		updatePlayingAllowed();
+	}, _lifetime);
+
+	const auto window = _wrap->window()->windowHandle();
+	Assert(window != nullptr);
+	base::qt_signal_producer(
+		window,
+		&QWindow::activeChanged
+	) | rpl::start_with_next([=] {
+		_windowActive = window->isActive();
+		updatePlayingAllowed();
+	}, _lifetime);
+	_windowActive = window->isActive();
+
 	_contentFadeAnimation.stop();
 }
 
 Controller::~Controller() = default;
 
+void Controller::updateContentFaded() {
+	_contentFaded = _replyActive;
+	_contentFadeAnimation.start(
+		[=] { _delegate->storiesRepaint(); },
+		_contentFaded ? 0. : 1.,
+		_contentFaded ? 1. : 0.,
+		st::fadeWrapDuration);
+	updatePlayingAllowed();
+}
+
 void Controller::initLayout() {
 	const auto headerHeight = st::storiesHeaderMargin.top()
 		+ st::storiesHeaderPhoto.photoSize
@@ -373,6 +401,7 @@ void Controller::show(
 	}
 	const auto story = *maybeStory;
 	const auto guard = gsl::finally([&] {
+		_paused = false;
 		_started = false;
 		if (story->photo()) {
 			_photoPlayback = std::make_unique<PhotoPlayback>(this);
@@ -421,10 +450,33 @@ void Controller::show(
 	}
 	stories.loadAround(storyId);
 
-	list.user->updateFull();
+	if (_replyFocused) {
+		unfocusReply();
+	}
+	updatePlayingAllowed();
 
-	if (_contentFaded) {
-		togglePaused(true);
+	list.user->updateFull();
+}
+
+void Controller::updatePlayingAllowed() {
+	if (!_shown) {
+		return;
+	}
+	setPlayingAllowed(_started
+		&& _windowActive
+		&& !_paused
+		&& !_replyActive
+		&& !_layerShown);
+}
+
+void Controller::setPlayingAllowed(bool allowed) {
+	if (allowed) {
+		_captionFullView = nullptr;
+	}
+	if (_photoPlayback) {
+		_photoPlayback->togglePaused(!allowed);
+	} else {
+		_delegate->storiesTogglePaused(!allowed);
 	}
 }
 
@@ -452,9 +504,7 @@ void Controller::ready() {
 		return;
 	}
 	_started = true;
-	if (!_contentFaded && _photoPlayback) {
-		_photoPlayback->togglePaused(false);
-	}
+	updatePlayingAllowed();
 }
 
 void Controller::updateVideoPlayback(const Player::TrackState &state) {
@@ -493,7 +543,7 @@ void Controller::maybeMarkAsRead(const Player::TrackState &state) {
 void Controller::markAsRead() {
 	Expects(_list.has_value());
 
-	_list->user->owner().stories().markAsRead(_shown);
+	_list->user->owner().stories().markAsRead(_shown, _started);
 }
 
 bool Controller::subjumpAvailable(int delta) const {
@@ -551,21 +601,11 @@ void Controller::checkWaitingFor() {
 	Expects(_list.has_value());
 
 	auto &stories = _list->user->owner().stories();
-	const auto &all = stories.all();
-	const auto i = ranges::find_if(all, [&](const Data::StoriesList &data) {
-		return data.user->id == _waitingForId.peer;
-	});
-	if (i == end(all)) {
-		_waitingForId = {};
-		return;
-	}
-	const auto j = ranges::find(i->ids, _waitingForId.story);
-	if (j == end(i->ids)) {
-		_waitingForId = {};
-		return;
-	}
 	const auto maybe = stories.lookup(_waitingForId);
 	if (!maybe) {
+		if (maybe.error() == Data::NoStory::Deleted) {
+			_waitingForId = {};
+		}
 		return;
 	}
 	_delegate->storiesJumpTo(
@@ -596,19 +636,13 @@ bool Controller::jumpFor(int delta) {
 }
 
 bool Controller::paused() const {
-	return _photoPlayback
-		? _photoPlayback->paused()
-		: _delegate->storiesPaused();
+	return _paused;
 }
 
 void Controller::togglePaused(bool paused) {
-	if (!paused) {
-		_captionFullView = nullptr;
-	}
-	if (_photoPlayback) {
-		_photoPlayback->togglePaused(paused);
-	} else {
-		_delegate->storiesTogglePaused(paused);
+	if (_paused != paused) {
+		_paused = paused;
+		updatePlayingAllowed();
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index f381e51c1..47adde27e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -126,6 +126,10 @@ private:
 	void maybeMarkAsRead(const Player::TrackState &state);
 	void markAsRead();
 
+	void updateContentFaded();
+	void updatePlayingAllowed();
+	void setPlayingAllowed(bool allowed);
+
 	void showSiblings(
 		const std::vector<Data::StoriesList> &lists,
 		int index);
@@ -150,6 +154,12 @@ private:
 	Ui::Animations::Simple _contentFadeAnimation;
 	bool _contentFaded = false;
 
+	bool _windowActive = false;
+	bool _replyFocused = false;
+	bool _replyActive = false;
+	bool _layerShown = false;
+	bool _paused = false;
+
 	FullStoryId _shown;
 	TextWithEntities _captionText;
 	std::optional<Data::StoriesList> _list;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index a9c3b0a35..549788c84 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -44,6 +44,7 @@ public:
 		FullStoryId id) = 0;
 	virtual void storiesClose() = 0;
 	[[nodiscard]] virtual bool storiesPaused() = 0;
+	[[nodiscard]] virtual rpl::producer<bool> storiesLayerShown() = 0;
 	[[nodiscard]] virtual float64 storiesSiblingOver(SiblingType type) = 0;
 	virtual void storiesTogglePaused(bool paused) = 0;
 	virtual void storiesRepaint() = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 105f61def..92abe1133 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -299,11 +299,11 @@ Api::SendAction ReplyArea::prepareSendAction(
 
 void ReplyArea::chooseAttach(
 		std::optional<bool> overrideSendImagesAsPhotos) {
+	_chooseAttachRequest = false;
 	if (!_data.user) {
 		return;
 	}
 	const auto user = not_null(_data.user);
-	_choosingAttach = false;
 	if (const auto error = Data::AnyFileRestrictionError(user)) {
 		_controller->uiShow()->showToast(*error);
 		return;
@@ -312,15 +312,18 @@ void ReplyArea::chooseAttach(
 	const auto filter = (overrideSendImagesAsPhotos == true)
 		? FileDialog::ImagesOrAllFilter()
 		: FileDialog::AllOrImagesFilter();
+	const auto weak = make_weak(&_shownUserGuard);
 	const auto callback = [=](FileDialog::OpenResult &&result) {
-		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+		const auto guard = gsl::finally([&] {
+			_choosingAttach = false;
+		});
+		if (!weak
+			|| (result.paths.isEmpty() && result.remoteContent.isEmpty())) {
 			return;
-		}
-
-		if (!result.remoteContent.isEmpty()) {
+		} else if (!result.remoteContent.isEmpty()) {
 			auto read = Images::Read({
 				.content = result.remoteContent,
-				});
+			});
 			if (!read.image.isNull() && !read.animated) {
 				confirmSendingFiles(
 					std::move(read.image),
@@ -339,12 +342,14 @@ void ReplyArea::chooseAttach(
 			confirmSendingFiles(std::move(list));
 		}
 	};
+
+	_choosingAttach = true;
 	FileDialog::GetOpenPaths(
 		_controller->wrap().get(),
 		tr::lng_choose_files(tr::now),
 		filter,
-		crl::guard(&_shownUserGuard, callback),
-		nullptr);
+		crl::guard(this, callback),
+		crl::guard(this, [=] { _choosingAttach = false; }));
 }
 
 bool ReplyArea::confirmSendingFiles(
@@ -488,9 +493,9 @@ void ReplyArea::initActions() {
 
 	_controls->attachRequests(
 	) | rpl::filter([=] {
-		return !_choosingAttach;
+		return !_chooseAttachRequest;
 	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
-		_choosingAttach = true;
+		_chooseAttachRequest = true;
 		base::call_delayed(
 			st::storiesAttach.ripple.hideDuration,
 			this,
@@ -569,6 +574,17 @@ rpl::producer<bool> ReplyArea::focusedValue() const {
 	return _controls->focusedValue();
 }
 
+rpl::producer<bool> ReplyArea::activeValue() const {
+	using namespace rpl::mappers;
+	return rpl::combine(
+		_controls->focusedValue(),
+		_controls->recordingValue(),
+		_controls->tabbedPanelShownValue(),
+		_choosingAttach.value(),
+		_1 || _2 || _3 || _4
+	) | rpl::distinct_until_changed();
+}
+
 void ReplyArea::showPremiumToast(not_null<DocumentData*> emoji) {
 	// #TODO stories
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index d9683521e..d0cef32c3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -58,6 +58,7 @@ public:
 	void show(ReplyAreaData data);
 
 	[[nodiscard]] rpl::producer<bool> focusedValue() const;
+	[[nodiscard]] rpl::producer<bool> activeValue() const;
 
 private:
 	using VoiceToSend = HistoryView::Controls::VoiceToSend;
@@ -130,7 +131,8 @@ private:
 
 	ReplyAreaData _data;
 	base::has_weak_ptr _shownUserGuard;
-	bool _choosingAttach = false;
+	bool _chooseAttachRequest = false;
+	rpl::variable<bool> _choosingAttach;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index c822bcf0d..bded9e12e 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -599,6 +599,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 			fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBgOver }};
 			fadeRight: icon {{ "fade_horizontal", storiesComposeBgOver }};
 			field: InputField(defaultTabbedSearchField) {
+				textFg: storiesComposeWhiteText;
 				placeholderFg: storiesComposeGrayText;
 				placeholderFgActive: storiesComposeGrayText;
 				placeholderFgError: storiesComposeGrayText;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index e2f2bff04..a1bdce930 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -431,9 +431,10 @@ void OverlayWidget::RendererGL::paintTransformedStaticContent(
 				Ui::GL::kFormatRGBA,
 				Ui::GL::kFormatRGBA,
 				QSize(2, 2),
-				_rgbaSize,
+				_rgbaSize[index],
 				stride,
 				data);
+			_rgbaSize[index] = QSize(2, 2);
 		} else {
 			const auto stride = image.bytesPerLine() / 4;
 			const auto data = image.constBits();
@@ -441,10 +442,10 @@ void OverlayWidget::RendererGL::paintTransformedStaticContent(
 				Ui::GL::kFormatRGBA,
 				Ui::GL::kFormatRGBA,
 				image.size(),
-				_rgbaSize,
+				_rgbaSize[index],
 				stride,
 				data);
-			_rgbaSize = image.size();
+			_rgbaSize[index] = image.size();
 		}
 	}
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index 95d57ec87..df6f2aa71 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -124,7 +124,7 @@ private:
 	std::optional<QOpenGLShaderProgram> _controlsProgram;
 	std::optional<QOpenGLShaderProgram> _roundedCornersProgram;
 	Ui::GL::Textures<6> _textures; // image, sibling, right sibling, y, u, v
-	QSize _rgbaSize;
+	QSize _rgbaSize[3];
 	QSize _lumaSize;
 	QSize _chromaSize;
 	qint64 _cacheKeys[3] = { 0 }; // image, sibling, right sibling
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index f2efd4578..df290b574 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4053,6 +4053,10 @@ bool OverlayWidget::storiesPaused() {
 		&& _streamed->instance.player().paused();
 }
 
+rpl::producer<bool> OverlayWidget::storiesLayerShown() {
+	return _layerBg->layerShownValue();
+}
+
 void OverlayWidget::storiesTogglePaused(bool paused) {
 	if (!_streamed
 		|| _streamed->instance.player().failed()
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 2bc572a91..a32c0ef59 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -247,6 +247,7 @@ private:
 		FullStoryId id) override;
 	void storiesClose() override;
 	bool storiesPaused() override;
+	rpl::producer<bool> storiesLayerShown() override;
 	void storiesTogglePaused(bool paused) override;
 	float64 storiesSiblingOver(Stories::SiblingType type) override;
 	void storiesRepaint() override;

From e90642f3a0785f14f3e60a73531ccf8636e124ba Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 May 2023 18:41:02 +0400
Subject: [PATCH 267/676] Add bio privacy section.

---
 Telegram/Resources/langs/lang.strings         |  9 +++++
 .../settings/settings_privacy_controllers.cpp | 35 +++++++++++++++++++
 .../settings/settings_privacy_controllers.h   | 17 +++++++++
 .../settings/settings_privacy_security.cpp    |  5 +++
 4 files changed, 66 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 7fa025d38..460d20418 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -584,6 +584,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_forwards_privacy" = "Forwarded messages";
 "lng_settings_profile_photo_privacy" = "Profile photo";
 "lng_settings_voices_privacy" = "Voice messages";
+"lng_settings_bio_privacy" = "Bio";
 "lng_settings_privacy_premium" = "Only subscribers of {link} can restrict receiving voice messages.";
 "lng_settings_privacy_premium_link" = "Telegram Premium";
 "lng_settings_passcode_disable" = "Disable Passcode";
@@ -999,6 +1000,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_groups_always_title" = "Always allow";
 "lng_edit_privacy_groups_never_title" = "Never allow";
 
+"lng_edit_privacy_about_title" = "Bio privacy settings";
+"lng_edit_privacy_about_header" = "Who can see my bio";
+"lng_edit_privacy_about_always_empty" = "Always allow";
+"lng_edit_privacy_about_never_empty" = "Never allow";
+"lng_edit_privacy_about_exceptions" = "These users will or will not be able to see your profile bio regardless of the settings above.";
+"lng_edit_privacy_about_always_title" = "Always allow";
+"lng_edit_privacy_about_never_title" = "Never allow";
+
 "lng_edit_privacy_calls_title" = "Voice calls privacy";
 "lng_edit_privacy_calls_header" = "Who can call you";
 "lng_edit_privacy_calls_always_empty" = "Always allow";
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 9468c13f2..8f6b00900 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -1284,4 +1284,39 @@ auto VoicesPrivacyController::exceptionsDescription() const
 	return tr::lng_edit_privacy_voices_exceptions();
 }
 
+UserPrivacy::Key AboutPrivacyController::key() const {
+	return Key::About;
+}
+
+rpl::producer<QString> AboutPrivacyController::title() const {
+	return tr::lng_edit_privacy_about_title();
+}
+
+rpl::producer<QString> AboutPrivacyController::optionsTitleKey() const {
+	return tr::lng_edit_privacy_about_header();
+}
+
+rpl::producer<QString> AboutPrivacyController::exceptionButtonTextKey(
+		Exception exception) const {
+	switch (exception) {
+	case Exception::Always: return tr::lng_edit_privacy_about_always_empty();
+	case Exception::Never: return tr::lng_edit_privacy_about_never_empty();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+rpl::producer<QString> AboutPrivacyController::exceptionBoxTitle(
+		Exception exception) const {
+	switch (exception) {
+	case Exception::Always: return tr::lng_edit_privacy_about_always_title();
+	case Exception::Never: return tr::lng_edit_privacy_about_never_title();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+auto AboutPrivacyController::exceptionsDescription() const
+-> rpl::producer<QString> {
+	return tr::lng_edit_privacy_about_exceptions();
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index 3aa1e36d2..d6f57b9db 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -270,4 +270,21 @@ private:
 
 };
 
+class AboutPrivacyController final : public EditPrivacyController {
+public:
+	using Option = EditPrivacyBox::Option;
+	using Exception = EditPrivacyBox::Exception;
+
+	Key key() const override;
+
+	rpl::producer<QString> title() const override;
+	rpl::producer<QString> optionsTitleKey() const override;
+	rpl::producer<QString> exceptionButtonTextKey(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionBoxTitle(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionsDescription() const override;
+
+};
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 164bb4443..7b8b3e73c 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -310,6 +310,11 @@ void SetupPrivacy(
 		{ &st::settingsPremiumIconVoice, kIconRed },
 		Key::Voices,
 		[=] { return std::make_unique<VoicesPrivacyController>(session); });
+	add(
+		tr::lng_settings_bio_privacy(),
+		{ &st::settingsIconAccount, kIconDarkOrange },
+		Key::About,
+		[] { return std::make_unique<AboutPrivacyController>(); });
 
 	session->api().userPrivacy().reload(Api::UserPrivacy::Key::AddedByPhone);
 

From d76c80bf0e3099b0d00c2725beeceb228b01f969 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 May 2023 21:12:15 +0400
Subject: [PATCH 268/676] Show recent viewers in self stories.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   3 +
 Telegram/SourceFiles/core/mime_type.cpp       |  11 +
 Telegram/SourceFiles/core/mime_type.h         |   1 +
 Telegram/SourceFiles/data/data_stories.cpp    |  50 ++++-
 Telegram/SourceFiles/data/data_stories.h      |   7 +
 .../view/history_view_replies_section.cpp     |  13 +-
 .../view/history_view_scheduled_section.cpp   |  16 +-
 .../stories/media_stories_controller.cpp      |  20 +-
 .../media/stories/media_stories_controller.h  |   3 +
 .../stories/media_stories_recent_views.cpp    | 188 ++++++++++++++++++
 .../stories/media_stories_recent_views.h      |  53 +++++
 .../media/stories/media_stories_reply.cpp     |  11 +-
 .../media/stories/media_stories_reply.h       |   6 -
 .../SourceFiles/media/view/media_view.style   |   8 +
 15 files changed, 342 insertions(+), 50 deletions(-)
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_recent_views.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a32950631..c02353676 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -973,6 +973,8 @@ PRIVATE
     media/stories/media_stories_delegate.h
     media/stories/media_stories_header.cpp
     media/stories/media_stories_header.h
+    media/stories/media_stories_recent_views.cpp
+    media/stories/media_stories_recent_views.h
     media/stories/media_stories_reply.cpp
     media/stories/media_stories_reply.h
     media/stories/media_stories_sibling.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 460d20418..892983de5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3793,6 +3793,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_row_count#other" = "{count} Stories";
 "lng_stories_row_unread_and_one" = "{accumulated}, {user}";
 "lng_stories_row_unread_and_last" = "{accumulated} and {user}";
+"lng_stories_views#one" = "{count} view";
+"lng_stories_views#other" = "{count} views";
+"lng_stories_no_views" = "No views";
 
 // Wnd specific
 
diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index e75a5fc94..8ba1b6494 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -229,4 +229,15 @@ QList<QUrl> ReadMimeUrls(not_null<const QMimeData*> data) {
 		: QList<QUrl>();
 }
 
+bool CanSendFiles(not_null<const QMimeData*> data) {
+	if (data->hasImage()) {
+		return true;
+	} else if (const auto urls = ReadMimeUrls(data); !urls.empty()) {
+		if (ranges::all_of(urls, &QUrl::isLocalFile)) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/mime_type.h b/Telegram/SourceFiles/core/mime_type.h
index d5aaa9eb0..3271adafe 100644
--- a/Telegram/SourceFiles/core/mime_type.h
+++ b/Telegram/SourceFiles/core/mime_type.h
@@ -67,5 +67,6 @@ struct MimeImageData {
 [[nodiscard]] MimeImageData ReadMimeImage(not_null<const QMimeData*> data);
 [[nodiscard]] QString ReadMimeText(not_null<const QMimeData*> data);
 [[nodiscard]] QList<QUrl> ReadMimeUrls(not_null<const QMimeData*> data);
+[[nodiscard]] bool CanSendFiles(not_null<const QMimeData*> data);
 
 } // namespace Core
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index dd6d80fbb..39c5ae437 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -36,10 +36,10 @@ constexpr auto kMarkAsReadDelay = 3 * crl::time(1000);
 using UpdateFlag = StoryUpdate::Flag;
 
 std::optional<StoryMedia> ParseMedia(
-		not_null<Session*> owner,
-		const MTPMessageMedia &media) {
+	not_null<Session*> owner,
+	const MTPMessageMedia &media) {
 	return media.match([&](const MTPDmessageMediaPhoto &data)
-	-> std::optional<StoryMedia> {
+		-> std::optional<StoryMedia> {
 		if (const auto photo = data.vphoto()) {
 			const auto result = owner->processPhoto(*photo);
 			if (!result->isNull()) {
@@ -48,7 +48,7 @@ std::optional<StoryMedia> ParseMedia(
 		}
 		return {};
 	}, [&](const MTPDmessageMediaDocument &data)
-	-> std::optional<StoryMedia> {
+		-> std::optional<StoryMedia> {
 		if (const auto document = data.vdocument()) {
 			const auto result = owner->processDocument(*document);
 			if (!result->isNull()
@@ -71,10 +71,10 @@ Story::Story(
 	not_null<PeerData*> peer,
 	StoryMedia media,
 	TimeId date)
-: _id(id)
-, _peer(peer)
-, _media(std::move(media))
-, _date(date) {
+	: _id(id)
+	, _peer(peer)
+	, _media(std::move(media))
+	, _date(date) {
 }
 
 Session &Story::owner() const {
@@ -170,6 +170,21 @@ const TextWithEntities &Story::caption() const {
 	return _caption;
 }
 
+void Story::setViewsData(
+		std::vector<not_null<PeerData*>> recent,
+		int total) {
+	_recentViewers = std::move(recent);
+	_views = total;
+}
+
+const std::vector<not_null<PeerData*>> &Story::recentViewers() const {
+	return _recentViewers;
+}
+
+int Story::views() const {
+	return _views;
+}
+
 bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	const auto pinned = data.is_pinned();
 	auto caption = TextWithEntities{
@@ -178,15 +193,32 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 			&owner().session(),
 			data.ventities().value_or_empty()),
 	};
+	auto views = 0;
+	auto recent = std::vector<not_null<PeerData*>>();
+	if (const auto info = data.vviews()) {
+		views = info->data().vviews_count().v;
+		if (const auto list = info->data().vrecent_viewers()) {
+			recent.reserve(list->v.size());
+			auto &owner = _peer->owner();
+			for (const auto &id : list->v) {
+				recent.push_back(owner.peer(peerFromUser(id)));
+			}
+		}
+	}
+
 	const auto changed = (_media != media)
 		|| (_pinned != pinned)
-		|| (_caption != caption);
+		|| (_caption != caption)
+		|| (_views != views)
+		|| (_recentViewers != recent);
 	if (!changed) {
 		return false;
 	}
 	_media = std::move(media);
 	_pinned = pinned;
 	_caption = std::move(caption);
+	_views = views;
+	_recentViewers = std::move(recent);
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 7a4546a0b..d8d7dcee3 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -57,6 +57,11 @@ public:
 	void setCaption(TextWithEntities &&caption);
 	[[nodiscard]] const TextWithEntities &caption() const;
 
+	void setViewsData(std::vector<not_null<PeerData*>> recent, int total);
+	[[nodiscard]] auto recentViewers() const
+		-> const std::vector<not_null<PeerData*>> &;
+	[[nodiscard]] int views() const;
+
 	bool applyChanges(StoryMedia media, const MTPDstoryItem &data);
 
 private:
@@ -64,6 +69,8 @@ private:
 	const not_null<PeerData*> _peer;
 	StoryMedia _media;
 	TextWithEntities _caption;
+	std::vector<not_null<PeerData*>> _recentViewers;
+	int _views = 0;
 	const TimeId _date = 0;
 	bool _pinned = false;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index aeacfd251..0c1b268af 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -97,17 +97,6 @@ namespace {
 
 constexpr auto kRefreshSlowmodeLabelTimeout = crl::time(200);
 
-bool CanSendFiles(not_null<const QMimeData*> data) {
-	if (data->hasImage()) {
-		return true;
-	} else if (const auto urls = Core::ReadMimeUrls(data); !urls.empty()) {
-		if (ranges::all_of(urls, &QUrl::isLocalFile)) {
-			return true;
-		}
-	}
-	return false;
-}
-
 rpl::producer<Ui::MessageBarContent> RootViewContent(
 		not_null<History*> history,
 		MsgId rootId,
@@ -819,7 +808,7 @@ void RepliesWidget::setupComposeControls() {
 			not_null<const QMimeData*> data,
 			Ui::InputField::MimeAction action) {
 		if (action == Ui::InputField::MimeAction::Check) {
-			return CanSendFiles(data);
+			return Core::CanSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
 			return confirmSendingFiles(
 				data,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 66255b466..77922c6c1 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -65,20 +65,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QMimeData>
 
 namespace HistoryView {
-namespace {
-
-bool CanSendFiles(not_null<const QMimeData*> data) {
-	if (data->hasImage()) {
-		return true;
-	} else if (const auto urls = Core::ReadMimeUrls(data); !urls.empty()) {
-		if (ranges::all_of(urls, &QUrl::isLocalFile)) {
-			return true;
-		}
-	}
-	return false;
-}
-
-} // namespace
 
 object_ptr<Window::SectionWidget> ScheduledMemento::createWidget(
 		QWidget *parent,
@@ -308,7 +294,7 @@ void ScheduledWidget::setupComposeControls() {
 			not_null<const QMimeData*> data,
 			Ui::InputField::MimeAction action) {
 		if (action == Ui::InputField::MimeAction::Check) {
-			return CanSendFiles(data);
+			return Core::CanSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
 			return confirmSendingFiles(
 				data,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 6921f7b80..6d11fd247 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_header.h"
 #include "media/stories/media_stories_sibling.h"
 #include "media/stories/media_stories_slider.h"
+#include "media/stories/media_stories_recent_views.h"
 #include "media/stories/media_stories_reply.h"
 #include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
@@ -123,7 +124,8 @@ Controller::Controller(not_null<Delegate*> delegate)
 , _wrap(_delegate->storiesWrap())
 , _header(std::make_unique<Header>(this))
 , _slider(std::make_unique<Slider>(this))
-, _replyArea(std::make_unique<ReplyArea>(this)) {
+, _replyArea(std::make_unique<ReplyArea>(this))
+, _recentViews(std::make_unique<RecentViews>(this)) {
 	initLayout();
 
 	_replyArea->activeValue(
@@ -249,6 +251,9 @@ void Controller::initLayout() {
 				+ layout.content.height()
 				+ fieldMinHeight
 				- st::storiesFieldMargin.bottom()));
+		layout.views = QRect(
+			layout.controlsBottomPosition - QPoint(0, fieldMinHeight),
+			QSize(layout.controlsWidth, fieldMinHeight));
 		layout.autocompleteRect = QRect(
 			layout.controlsBottomPosition.x(),
 			0,
@@ -422,9 +427,18 @@ void Controller::show(
 	_captionText = story->caption();
 	_captionFullView = nullptr;
 
+	if (_replyFocused) {
+		unfocusReply();
+	}
+
 	_header->show({ .user = list.user, .date = story->date() });
 	_slider->show({ .index = _index, .total = list.total });
 	_replyArea->show({ .user = list.user, .id = id });
+	_recentViews->show({
+		.list = story->recentViewers(),
+		.total = story->views(),
+		.valid = list.user->isSelf(),
+	});
 
 	const auto session = &list.user->session();
 	if (_session != session) {
@@ -450,11 +464,7 @@ void Controller::show(
 	}
 	stories.loadAround(storyId);
 
-	if (_replyFocused) {
-		unfocusReply();
-	}
 	updatePlayingAllowed();
-
 	list.user->updateFull();
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 47adde27e..eef7cc1a3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -41,6 +41,7 @@ namespace Media::Stories {
 class Header;
 class Slider;
 class ReplyArea;
+class RecentViews;
 class Sibling;
 class Delegate;
 struct SiblingView;
@@ -68,6 +69,7 @@ struct Layout {
 	QRect slider;
 	int controlsWidth = 0;
 	QPoint controlsBottomPosition;
+	QRect views;
 	QRect autocompleteRect;
 	HeaderLayout headerLayout = HeaderLayout::Normal;
 	SiblingLayout siblingLeft;
@@ -148,6 +150,7 @@ private:
 	const std::unique_ptr<Header> _header;
 	const std::unique_ptr<Slider> _slider;
 	const std::unique_ptr<ReplyArea> _replyArea;
+	const std::unique_ptr<RecentViews> _recentViews;
 	std::unique_ptr<PhotoPlayback> _photoPlayback;
 	std::unique_ptr<CaptionFullView> _captionFullView;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
new file mode 100644
index 000000000..9148e6b6f
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -0,0 +1,188 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_recent_views.h"
+
+#include "data/data_peer.h"
+#include "main/main_session.h"
+#include "media/stories/media_stories_controller.h"
+#include "lang/lang_keys.h"
+#include "ui/chat/group_call_userpics.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "ui/userpic_view.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_media_view.h"
+
+namespace Media::Stories {
+namespace {
+
+[[nodiscard]] rpl::producer<std::vector<Ui::GroupCallUser>> ContentByUsers(
+		const std::vector<not_null<PeerData*>> &list) {
+	struct Userpic {
+		not_null<PeerData*> peer;
+		mutable Ui::PeerUserpicView view;
+		mutable InMemoryKey uniqueKey;
+	};
+
+	struct State {
+		std::vector<Userpic> userpics;
+		std::vector<Ui::GroupCallUser> current;
+		base::has_weak_ptr guard;
+		bool someUserpicsNotLoaded = false;
+		bool scheduled = false;
+	};
+
+	static const auto size = st::storiesRecentViewsUserpics.size;
+
+	static const auto GenerateUserpic = [](Userpic &userpic) {
+		auto result = userpic.peer->generateUserpicImage(
+			userpic.view,
+			size * style::DevicePixelRatio());
+		result.setDevicePixelRatio(style::DevicePixelRatio());
+		return result;
+	};
+
+	static const auto RegenerateUserpics = [](not_null<State*> state) {
+		Expects(state->userpics.size() == state->current.size());
+
+		state->someUserpicsNotLoaded = false;
+		const auto count = int(state->userpics.size());
+		for (auto i = 0; i != count; ++i) {
+			auto &userpic = state->userpics[i];
+			auto &participant = state->current[i];
+			const auto peer = userpic.peer;
+			const auto key = peer->userpicUniqueKey(userpic.view);
+			if (peer->hasUserpic() && peer->useEmptyUserpic(userpic.view)) {
+				state->someUserpicsNotLoaded = true;
+			}
+			if (userpic.uniqueKey == key) {
+				continue;
+			}
+			participant.userpicKey = userpic.uniqueKey = key;
+			participant.userpic = GenerateUserpic(userpic);
+		}
+	};
+
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		const auto state = lifetime.make_state<State>();
+		const auto pushNext = [=] {
+			RegenerateUserpics(state);
+			consumer.put_next_copy(state->current);
+		};
+
+		for (const auto &peer : list) {
+			state->userpics.push_back(Userpic{
+				.peer = peer,
+			});
+			state->current.push_back(Ui::GroupCallUser{
+				.id = uint64(peer->id.value),
+			});
+			peer->loadUserpic();
+		}
+		pushNext();
+
+		if (!list.empty()) {
+			list.front()->session().downloaderTaskFinished(
+			) | rpl::filter([=] {
+				return state->someUserpicsNotLoaded && !state->scheduled;
+			}) | rpl::start_with_next([=] {
+				for (const auto &userpic : state->userpics) {
+					if (userpic.peer->userpicUniqueKey(userpic.view)
+						!= userpic.uniqueKey) {
+						state->scheduled = true;
+						crl::on_main(&state->guard, [=] {
+							state->scheduled = false;
+							pushNext();
+						});
+						return;
+					}
+				}
+			}, lifetime);
+		}
+		return lifetime;
+	};
+}
+
+} // namespace
+
+RecentViews::RecentViews(not_null<Controller*> controller)
+: _controller(controller) {
+}
+
+RecentViews::~RecentViews() = default;
+
+void RecentViews::show(RecentViewsData data) {
+	if (_data == data) {
+		return;
+	}
+	const auto totalChanged = _text.isEmpty() || (_data.total != data.total);
+	const auto usersChanged = !_userpics || (_data.list != data.list);
+	_data = data;
+	if (!_data.valid) {
+		_text = {};
+		_userpics = nullptr;
+		_widget = nullptr;
+		return;
+	}
+	if (!_widget) {
+		const auto parent = _controller->wrap();
+		auto widget = std::make_unique<Ui::RpWidget>(parent);
+		const auto raw = widget.get();
+		raw->show();
+
+		_controller->layoutValue(
+		) | rpl::start_with_next([=](const Layout &layout) {
+			raw->setGeometry(layout.views);
+		}, raw->lifetime());
+
+		raw->paintRequest(
+		) | rpl::start_with_next([=](QRect clip) {
+			auto p = Painter(raw);
+			const auto skip = st::storiesRecentViewsSkip;
+			const auto full = _userpicsWidth + skip + _text.maxWidth();
+			const auto use = std::min(full, raw->width());
+			const auto ux = (raw->width() - use) / 2;
+			const auto height = st::storiesRecentViewsUserpics.size;
+			const auto uy = (raw->height() - height) / 2;
+			const auto tx = ux + _userpicsWidth + skip;
+			const auto ty = (raw->height() - st::normalFont->height) / 2;
+			_userpics->paint(p, ux, uy, height);
+			p.setPen(st::storiesComposeWhiteText);
+			_text.drawElided(p, tx, ty, use - _userpicsWidth - skip);
+		}, raw->lifetime());
+
+		_widget = std::move(widget);
+	}
+	if (totalChanged) {
+		_text.setText(st::defaultTextStyle, data.total
+			? tr::lng_stories_views(tr::now, lt_count, data.total)
+			: tr::lng_stories_no_views(tr::now));
+	}
+	if (!_userpics) {
+		_userpics = std::make_unique<Ui::GroupCallUserpics>(
+			st::storiesRecentViewsUserpics,
+			rpl::single(true),
+			[=] { _widget->update(); });
+
+		_userpics->widthValue() | rpl::start_with_next([=](int width) {
+			_userpicsWidth = width;
+		}, _widget->lifetime());
+	}
+	if (usersChanged) {
+		_userpicsLifetime = ContentByUsers(
+			data.list
+		) | rpl::start_with_next([=](
+				const std::vector<Ui::GroupCallUser> &list) {
+			_userpics->update(list, true);
+		});
+	}
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
new file mode 100644
index 000000000..64a6d4e82
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
@@ -0,0 +1,53 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text.h"
+
+namespace Ui {
+class RpWidget;
+class GroupCallUserpics;
+} // namespace Ui
+
+namespace Media::Stories {
+
+class Controller;
+
+struct RecentViewsData {
+	std::vector<not_null<PeerData*>> list;
+	int total = 0;
+	bool valid = false;
+
+	friend inline auto operator<=>(
+		const RecentViewsData &,
+		const RecentViewsData &) = default;
+	friend inline bool operator==(
+		const RecentViewsData &,
+		const RecentViewsData &) = default;
+};
+
+class RecentViews final {
+public:
+	explicit RecentViews(not_null<Controller*> controller);
+	~RecentViews();
+
+	void show(RecentViewsData data);
+
+private:
+	const not_null<Controller*> _controller;
+
+	std::unique_ptr<Ui::RpWidget> _widget;
+	std::unique_ptr<Ui::GroupCallUserpics> _userpics;
+	Ui::Text::String _text;
+	RecentViewsData _data;
+	rpl::lifetime _userpicsLifetime;
+	int _userpicsWidth = 0;
+
+};
+
+} // namespace Media::Stories
\ No newline at end of file
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 92abe1133..cbff23d73 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -524,12 +524,12 @@ void ReplyArea::initActions() {
 			not_null<const QMimeData*> data,
 			Ui::InputField::MimeAction action) {
 		if (action == Ui::InputField::MimeAction::Check) {
-			return false;// checkSendingFiles(data);
+			return Core::CanSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
-			return false;/* confirmSendingFiles(
+			return confirmSendingFiles(
 				data,
 				std::nullopt,
-				Core::ReadMimeText(data));*/
+				Core::ReadMimeText(data));
 		}
 		Unexpected("action in MimeData hook.");
 	});
@@ -562,6 +562,11 @@ void ReplyArea::show(ReplyAreaData data) {
 		.history = history,
 	});
 	_controls->clear();
+	if (!user || user->isSelf()) {
+		_controls->hide();
+	} else {
+		_controls->show();
+	}
 }
 
 Main::Session &ReplyArea::session() const {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index d0cef32c3..d50496d5d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -66,18 +66,12 @@ private:
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] not_null<History*> history() const;
 
-	bool confirmSendingFiles(const QStringList &files);
-	bool confirmSendingFiles(not_null<const QMimeData*> data);
-
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 	bool confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
 		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
-	bool confirmSendingFiles(
-		const QStringList &files,
-		const QString &insertTextOnCancel);
 	bool confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel = QString());
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index bded9e12e..2a3c3f7b2 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -729,3 +729,11 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 	}
 	premium: storiesComposePremium;
 }
+storiesRecentViewsUserpics: GroupCallUserpics {
+	size: 24px;
+	shift: 9px;
+	stroke: 4px;
+	align: align(left);
+}
+storiesRecentViewsSkip: 8px;
+

From 1f1e543df7ef05e2c9c63815ca358f41dfb1482b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 31 May 2023 10:39:45 +0400
Subject: [PATCH 269/676] Fix good thumbnail generation in sibling stories.

---
 .../media/stories/media_stories_sibling.cpp   | 55 ++++++++++++-------
 .../streaming/media_streaming_document.cpp    |  5 +-
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index ac3c43258..90a393954 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -75,6 +75,7 @@ public:
 private:
 	void waitForGoodThumbnail();
 	bool updateAfterGoodCheck();
+	void createStreamedPlayer();
 	void streamedFailed();
 
 	const not_null<DocumentData*> _video;
@@ -148,38 +149,49 @@ QImage Sibling::LoaderVideo::blurred() {
 QImage Sibling::LoaderVideo::good() {
 	if (const auto image = _media->goodThumbnail()) {
 		return image->original();
-	} else if (!_video->goodThumbnailChecked()) {
+	} else if (!_video->goodThumbnailChecked()
+		&& !_video->goodThumbnailNoData()) {
 		if (!_checkingGoodInCache) {
 			waitForGoodThumbnail();
 		}
 	} else if (_failed) {
 		return QImage();
 	} else if (!_streamed) {
-		_streamed = std::make_unique<Streaming::Instance>(
-			_video,
-			_origin,
-			[] {}); // waitingCallback
-		_streamed->lockPlayer();
-		_streamed->player().updates(
-		) | rpl::start_with_next_error([=](Streaming::Update &&update) {
-			v::match(update.data, [&](Streaming::Information &update) {
-				_update();
-			}, [](const auto &update) {
-			});
-		}, [=](Streaming::Error &&error) {
-			streamedFailed();
-		}, _streamed->lifetime());
-		if (_streamed->ready()) {
-			_update();
-		} else if (!_streamed->valid()) {
-			streamedFailed();
-		}
+		createStreamedPlayer();
 	} else if (_streamed->ready()) {
 		return _streamed->info().video.cover;
 	}
 	return QImage();
 }
 
+void Sibling::LoaderVideo::createStreamedPlayer() {
+	_streamed = std::make_unique<Streaming::Instance>(
+		_video,
+		_origin,
+		[] {}); // waitingCallback
+	_streamed->lockPlayer();
+	_streamed->player().updates(
+	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+		v::match(update.data, [&](Streaming::Information &update) {
+			_update();
+		}, [](const auto &update) {
+		});
+	}, [=](Streaming::Error &&error) {
+		streamedFailed();
+	}, _streamed->lifetime());
+	if (_streamed->ready()) {
+		_update();
+	} else if (!_streamed->valid()) {
+		streamedFailed();
+	} else if (!_streamed->player().active()
+		&& !_streamed->player().finished()) {
+		_streamed->play({
+			.mode = Streaming::Mode::Video,
+		});
+		_streamed->pause();
+	}
+}
+
 void Sibling::LoaderVideo::streamedFailed() {
 	_failed = true;
 	_streamed = nullptr;
@@ -204,7 +216,8 @@ void Sibling::LoaderVideo::waitForGoodThumbnail() {
 }
 
 bool Sibling::LoaderVideo::updateAfterGoodCheck() {
-	if (!_video->goodThumbnailChecked()) {
+	if (!_video->goodThumbnailChecked()
+		&& !_video->goodThumbnailNoData()) {
 		return false;
 	}
 	_checkingGoodInCache = false;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
index 039b76261..27c090443 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
@@ -257,12 +257,15 @@ void Document::validateGoodThumbnail() {
 		const auto length = bytes.size();
 		if (!length || length > Storage::kMaxFileInMemory) {
 			LOG(("App Error: Bad thumbnail data for saving to cache."));
-			bytes = "(failed)";
+			bytes = "(failed)"_q;
 		}
 		crl::on_main(guard, [=] {
 			if (const auto active = document->activeMediaView()) {
 				active->setGoodThumbnail(image);
 			}
+			if (bytes != "(failed)"_q) {
+				document->setGoodThumbnailChecked(true);
+			}
 			document->owner().cache().putIfEmpty(
 				document->goodThumbnailCacheKey(),
 				Storage::Cache::Database::TaggedValue(

From 16069db3e6c5235333ddea15fd6277b43d143c0a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 31 May 2023 21:53:17 +0400
Subject: [PATCH 270/676] Fix build with Xcode.

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

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 39c5ae437..fa2c61664 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -597,8 +597,8 @@ void Stories::loadAround(FullStoryId id) {
 	}
 	const auto ignore = [&] {
 		const auto side = kIgnorePreloadAroundIfLoaded;
-		const auto left = ranges::min(j - begin(i->ids), side);
-		const auto right = ranges::min(end(i->ids) - j, side);
+		const auto left = ranges::min(int(j - begin(i->ids)), side);
+		const auto right = ranges::min(int(end(i->ids) - j), side);
 		for (auto k = j - left; k != j + right; ++k) {
 			const auto maybeStory = lookup({ id.peer, *k });
 			if (!maybeStory && maybeStory.error() == NoStory::Unknown) {
@@ -611,8 +611,8 @@ void Stories::loadAround(FullStoryId id) {
 		return;
 	}
 	const auto side = kPreloadAroundCount;
-	const auto left = ranges::min(j - begin(i->ids), side);
-	const auto right = ranges::min(end(i->ids) - j, side);
+	const auto left = ranges::min(int(j - begin(i->ids)), side);
+	const auto right = ranges::min(int(end(i->ids) - j), side);
 	const auto from = j - left;
 	const auto till = j + right;
 	for (auto k = from; k != till; ++k) {

From d28bd36d223736ca82b6e77cc41a5928390dbf1f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 1 Jun 2023 20:01:29 +0400
Subject: [PATCH 271/676] Load and show list of users who viewed a story.

---
 Telegram/SourceFiles/api/api_who_reacted.cpp  |  63 ++--
 Telegram/SourceFiles/api/api_who_reacted.h    |   1 +
 Telegram/SourceFiles/calls/calls_top_bar.cpp  |   2 +-
 .../chat_helpers/chat_helpers.style           |  43 +++
 Telegram/SourceFiles/data/data_stories.cpp    |  88 +++++
 Telegram/SourceFiles/data/data_stories.h      |  24 ++
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   1 +
 .../admin_log/history_admin_log_section.cpp   |   1 +
 .../controls/history_view_compose_search.cpp  |   1 +
 .../controls/history_view_forward_panel.cpp   |   1 +
 .../view/controls/history_view_ttl_button.cpp |   1 +
 .../history_view_voice_record_button.cpp      |   1 +
 .../view/history_view_contact_status.cpp      |   1 +
 .../view/history_view_context_menu.cpp        |   1 +
 .../view/history_view_corner_buttons.cpp      |   1 +
 .../view/history_view_group_call_bar.cpp      |   1 +
 .../history/view/history_view_message.cpp     |   1 +
 .../history/view/history_view_pinned_bar.cpp  |   1 +
 .../view/history_view_pinned_section.cpp      |   1 +
 .../view/history_view_replies_section.cpp     |   1 +
 .../view/history_view_scheduled_section.cpp   |   1 +
 .../view/history_view_translate_bar.cpp       |   2 +-
 .../view/reactions/history_view_reactions.cpp |   1 +
 .../info/profile/info_profile_phone_menu.cpp  |   1 +
 .../stories/media_stories_controller.cpp      |  92 ++++-
 .../media/stories/media_stories_controller.h  |  17 +
 .../stories/media_stories_recent_views.cpp    | 346 +++++++++++++++---
 .../stories/media_stories_recent_views.h      |  46 +++
 .../SourceFiles/media/view/media_view.style   |  22 +-
 .../win/notifications_manager_win.cpp         |   1 +
 .../settings/settings_privacy_controllers.cpp |   1 +
 Telegram/SourceFiles/ui/chat/chat.style       |  41 ---
 .../SourceFiles/ui/chat/group_call_bar.cpp    |   1 +
 .../ui/chat/group_call_userpics.cpp           |   1 +
 .../SourceFiles/ui/chat/more_chats_bar.cpp    |   2 +-
 .../ui/controls/invite_link_buttons.cpp       |   2 +-
 .../SourceFiles/ui/controls/silent_toggle.cpp |   1 +
 .../controls/who_reacted_context_action.cpp   | 117 +++---
 .../ui/controls/who_reacted_context_action.h  |  54 ++-
 39 files changed, 784 insertions(+), 200 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_who_reacted.cpp b/Telegram/SourceFiles/api/api_who_reacted.cpp
index 6fc8800b9..f32358c06 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.cpp
+++ b/Telegram/SourceFiles/api/api_who_reacted.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/who_reacted_context_action.h"
 #include "apiwrap.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Api {
 namespace {
@@ -357,37 +358,6 @@ struct State {
 	});
 }
 
-[[nodiscard]] QString FormatReadDate(TimeId date, const QDateTime &now) {
-	if (!date) {
-		return {};
-	}
-	const auto parsed = base::unixtime::parse(date);
-	const auto readDate = parsed.date();
-	const auto nowDate = now.date();
-	if (readDate == nowDate) {
-		return tr::lng_mediaview_today(
-			tr::now,
-			lt_time,
-			QLocale().toString(parsed.time(), QLocale::ShortFormat));
-	} else if (readDate.addDays(1) == nowDate) {
-		return tr::lng_mediaview_yesterday(
-			tr::now,
-			lt_time,
-			QLocale().toString(parsed.time(), QLocale::ShortFormat));
-	}
-	return tr::lng_mediaview_date_time(
-		tr::now,
-		lt_date,
-		tr::lng_month_day(
-			tr::now,
-			lt_month,
-			Lang::MonthDay(readDate.month())(tr::now),
-			lt_day,
-			QString::number(readDate.day())),
-		lt_time,
-		QLocale().toString(parsed.time(), QLocale::ShortFormat));
-}
-
 bool UpdateUserpics(
 		not_null<State*> state,
 		not_null<HistoryItem*> item,
@@ -614,6 +584,37 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 
 } // namespace
 
+QString FormatReadDate(TimeId date, const QDateTime &now) {
+	if (!date) {
+		return {};
+	}
+	const auto parsed = base::unixtime::parse(date);
+	const auto readDate = parsed.date();
+	const auto nowDate = now.date();
+	if (readDate == nowDate) {
+		return tr::lng_mediaview_today(
+			tr::now,
+			lt_time,
+			QLocale().toString(parsed.time(), QLocale::ShortFormat));
+	} else if (readDate.addDays(1) == nowDate) {
+		return tr::lng_mediaview_yesterday(
+			tr::now,
+			lt_time,
+			QLocale().toString(parsed.time(), QLocale::ShortFormat));
+	}
+	return tr::lng_mediaview_date_time(
+		tr::now,
+		lt_date,
+		tr::lng_month_day(
+			tr::now,
+			lt_month,
+			Lang::MonthDay(readDate.month())(tr::now),
+			lt_day,
+			QString::number(readDate.day())),
+		lt_time,
+		QLocale().toString(parsed.time(), QLocale::ShortFormat));
+}
+
 bool WhoReadExists(not_null<HistoryItem*> item) {
 	if (!item->out()) {
 		return false;
diff --git a/Telegram/SourceFiles/api/api_who_reacted.h b/Telegram/SourceFiles/api/api_who_reacted.h
index 3fdcd8a56..9a9100535 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.h
+++ b/Telegram/SourceFiles/api/api_who_reacted.h
@@ -29,6 +29,7 @@ enum class WhoReactedList {
 	One,
 };
 
+[[nodiscard]] QString FormatReadDate(TimeId date, const QDateTime &now);
 [[nodiscard]] bool WhoReadExists(not_null<HistoryItem*> item);
 [[nodiscard]] bool WhoReactedExists(
 	not_null<HistoryItem*> item,
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index e43af9373..f06f78cfd 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -34,7 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/abstract_box.h"
 #include "base/timer.h"
 #include "styles/style_calls.h"
-#include "styles/style_chat.h" // style::GroupCallUserpics
+#include "styles/style_chat_helpers.h" // style::GroupCallUserpics
 #include "styles/style_layers.h"
 
 namespace Calls {
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 8ad939619..5b16daf5d 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -201,6 +201,31 @@ ComposeControls {
 	premium: PremiumLimits;
 }
 
+WhoRead {
+	userpics: GroupCallUserpics;
+	photoLeft: pixels;
+	photoSize: pixels;
+	photoSkip: pixels;
+	nameLeft: pixels;
+	iconPosition: point;
+	itemPadding: margins;
+}
+
+defaultWhoRead: WhoRead {
+	userpics: GroupCallUserpics {
+		size: 22px;
+		shift: 8px;
+		stroke: 4px;
+		align: align(right);
+	}
+	photoLeft: 13px;
+	photoSize: 30px;
+	photoSkip: 5px;
+	nameLeft: 57px;
+	iconPosition: point(15px, 7px);
+	itemPadding: margins(44px, 9px, 17px, 7px);
+}
+
 switchPmButton: RoundButton(defaultBoxButton) {
 	width: 320px;
 	height: 34px;
@@ -1091,3 +1116,21 @@ defaultComposeControls: ComposeControls {
 	files: defaultComposeFiles;
 	premium: defaultPremiumLimits;
 }
+
+moreChatsBarHeight: 48px;
+moreChatsBarTextPosition: point(12px, 4px);
+moreChatsBarStatusPosition: point(12px, 24px);
+moreChatsBarClose: IconButton(defaultIconButton) {
+	width: 48px;
+	height: 48px;
+
+	icon: boxTitleCloseIcon;
+	iconOver: boxTitleCloseIconOver;
+	iconPosition: point(12px, -1px);
+
+	rippleAreaPosition: point(0px, 4px);
+	rippleAreaSize: 40px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index fa2c61664..5cc08e8b5 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -181,10 +181,48 @@ const std::vector<not_null<PeerData*>> &Story::recentViewers() const {
 	return _recentViewers;
 }
 
+const std::vector<StoryView> &Story::viewsList() const {
+	return _viewsList;
+}
+
 int Story::views() const {
 	return _views;
 }
 
+void Story::applyViewsSlice(
+		const std::optional<StoryView> &offset,
+		const std::vector<StoryView> &slice,
+		int total) {
+	_views = total;
+	if (!offset) {
+		const auto i = _viewsList.empty()
+			? end(slice)
+			: ranges::find(slice, _viewsList.front());
+		const auto merge = (i != end(slice))
+			&& !ranges::contains(slice, _viewsList.back());
+		if (merge) {
+			_viewsList.insert(begin(_viewsList), begin(slice), i);
+		} else {
+			_viewsList = slice;
+		}
+	} else if (!slice.empty()) {
+		const auto i = ranges::find(_viewsList, *offset);
+		const auto merge = (i != end(_viewsList))
+			&& !ranges::contains(_viewsList, slice.back());
+		if (merge) {
+			const auto after = i + 1;
+			if (after == end(_viewsList)) {
+				_viewsList.insert(after, begin(slice), end(slice));
+			} else {
+				const auto j = ranges::find(slice, _viewsList.back());
+				if (j != end(slice)) {
+					_viewsList.insert(end(_viewsList), j + 1, end(slice));
+				}
+			}
+		}
+	}
+}
+
 bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	const auto pinned = data.is_pinned();
 	auto caption = TextWithEntities{
@@ -683,6 +721,56 @@ void Stories::sendMarkAsReadRequests() {
 	}
 }
 
+void Stories::loadViewsSlice(
+		StoryId id,
+		std::optional<StoryView> offset,
+		Fn<void(std::vector<StoryView>)> done) {
+	_viewsDone = std::move(done);
+	if (_viewsStoryId == id && _viewsOffset == offset) {
+		return;
+	}
+	_viewsStoryId = id;
+	_viewsOffset = offset;
+
+	const auto api = &_owner->session().api();
+	api->request(_viewsRequestId).cancel();
+	_viewsRequestId = api->request(MTPstories_GetStoryViewsList(
+		MTP_int(id),
+		MTP_int(offset ? offset->date : 0),
+		MTP_long(offset ? peerToUser(offset->peer->id).bare : 0),
+		MTP_int(2)
+	)).done([=](const MTPstories_StoryViewsList &result) {
+		_viewsRequestId = 0;
+
+		auto slice = std::vector<StoryView>();
+
+		const auto &data = result.data();
+		_owner->processUsers(data.vusers());
+		slice.reserve(data.vviews().v.size());
+		for (const auto &view : data.vviews().v) {
+			slice.push_back({
+				.peer = _owner->peer(peerFromUser(view.data().vuser_id())),
+				.date = view.data().vdate().v,
+			});
+		}
+		const auto fullId = FullStoryId{
+			.peer = _owner->session().userPeerId(),
+			.story = _viewsStoryId,
+		};
+		if (const auto story = lookup(fullId)) {
+			(*story)->applyViewsSlice(_viewsOffset, slice, data.vcount().v);
+		}
+		if (const auto done = base::take(_viewsDone)) {
+			done(std::move(slice));
+		}
+	}).fail([=] {
+		_viewsRequestId = 0;
+		if (const auto done = base::take(_viewsDone)) {
+			done({});
+		}
+	}).send();
+}
+
 bool Stories::isQuitPrevent() {
 	if (!_markReadPending.empty()) {
 		sendMarkAsReadRequests();
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index d8d7dcee3..b4a53f859 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -28,6 +28,13 @@ struct StoryMedia {
 	friend inline bool operator==(StoryMedia, StoryMedia) = default;
 };
 
+struct StoryView {
+	not_null<PeerData*> peer;
+	TimeId date = 0;
+
+	friend inline bool operator==(StoryView, StoryView) = default;
+};
+
 class Story {
 public:
 	Story(
@@ -60,7 +67,12 @@ public:
 	void setViewsData(std::vector<not_null<PeerData*>> recent, int total);
 	[[nodiscard]] auto recentViewers() const
 		-> const std::vector<not_null<PeerData*>> &;
+	[[nodiscard]] const std::vector<StoryView> &viewsList() const;
 	[[nodiscard]] int views() const;
+	void applyViewsSlice(
+		const std::optional<StoryView> &offset,
+		const std::vector<StoryView> &slice,
+		int total);
 
 	bool applyChanges(StoryMedia media, const MTPDstoryItem &data);
 
@@ -70,6 +82,7 @@ private:
 	StoryMedia _media;
 	TextWithEntities _caption;
 	std::vector<not_null<PeerData*>> _recentViewers;
+	std::vector<StoryView> _viewsList;
 	int _views = 0;
 	const TimeId _date = 0;
 	bool _pinned = false;
@@ -124,6 +137,12 @@ public:
 	[[nodiscard]] bool isQuitPrevent();
 	void markAsRead(FullStoryId id, bool viewed);
 
+	static constexpr auto kViewsPerPage = 50;
+	void loadViewsSlice(
+		StoryId id,
+		std::optional<StoryView> offset,
+		Fn<void(std::vector<StoryView>)> done);
+
 private:
 	[[nodiscard]] StoriesList parse(const MTPUserStories &stories);
 	[[nodiscard]] Story *parseAndApply(
@@ -172,6 +191,11 @@ private:
 	base::Timer _markReadTimer;
 	base::flat_set<PeerId> _markReadRequests;
 
+	StoryId _viewsStoryId = 0;
+	std::optional<StoryView> _viewsOffset;
+	Fn<void(std::vector<StoryView>)> _viewsDone;
+	mtpRequestId _viewsRequestId = 0;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 24ff876e9..008102df0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -67,6 +67,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_memento.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
 #include "styles/style_window.h"
 #include "base/qt/qt_common_adapters.h"
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
index fb504a8b3..a64f98f47 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_window.h"
 #include "styles/style_info.h"
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
index 45ba94da2..0786b0745 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_info.h"
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
index 30e3b26e0..b00624867 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView::Controls {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
index f0b2eda2f..945253ec6 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "menu/menu_ttl_validator.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView::Controls {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 9bed92be9..4dbc3cd10 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/paint/blobs.h"
 #include "ui/painter.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 
 namespace HistoryView::Controls {
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index 6f6e14d4a..dffcdde95 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/peers/edit_contact_box.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_info.h"
 #include "styles/style_menu_icons.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 14f211bac..99ebf2929 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -68,6 +68,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "spellcheck/spellcheck_types.h"
 #include "apiwrap.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtGui/QGuiApplication>
diff --git a/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp b/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
index 5bd763c48..0ea99bc50 100644
--- a/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "ui/toast/toast.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
index bce9881b4..7fc19532a 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h"
 #include "core/application.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 18f699b21..e2892d105 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -45,6 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
 
 namespace HistoryView {
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 7ec3b365c..037819498 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "apiwrap.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 0fc999bec..2a5cd65be 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -46,6 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/platform_specific.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_window.h"
 #include "styles/style_info.h"
 #include "styles/style_boxes.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 0c1b268af..fc94a905c 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -85,6 +85,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_window.h"
 #include "styles/style_info.h"
 #include "styles/style_boxes.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 77922c6c1..998909301 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -58,6 +58,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "inline_bots/inline_bot_result.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_window.h"
 #include "styles/style_info.h"
 #include "styles/style_boxes.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
index 456e5cd87..4207c59ca 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
@@ -284,7 +284,7 @@ void TranslateBar::setup(not_null<History*> history) {
 
 	button->paintRequest(
 	) | rpl::start_with_next([=](QRect clip) {
-		QPainter(button).fillRect(clip, st::historyComposeButton.bgColor);
+		QPainter(button).fillRect(clip, st::historyComposeButtonBg);
 	}, button->lifetime());
 
 	button->setClickedCallback([=] {
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
index 9160e2703..911472560 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView::Reactions {
 namespace {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
index 0fea4cdb6..54bf15735 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/menu/menu_action.h"
 #include "ui/widgets/popup_menu.h"
 #include "styles/style_chat.h" // expandedMenuSeparator.
+#include "styles/style_chat_helpers.h"
 
 namespace Info {
 namespace Profile {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 6d11fd247..3fc642b0a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -426,7 +426,7 @@ void Controller::show(
 	_shown = storyId;
 	_captionText = story->caption();
 	_captionFullView = nullptr;
-
+	invalidate_weak_ptrs(&_viewsLoadGuard);
 	if (_replyFocused) {
 		unfocusReply();
 	}
@@ -680,6 +680,96 @@ SiblingView Controller::sibling(SiblingType type) const {
 	return {};
 }
 
+ViewsSlice Controller::views(PeerId offset) {
+	invalidate_weak_ptrs(&_viewsLoadGuard);
+	if (!offset) {
+		refreshViewsFromData();
+	} else if (!sliceViewsTo(offset)) {
+		return { .left = _viewsSlice.left };
+	}
+	return _viewsSlice;
+}
+
+rpl::producer<> Controller::moreViewsLoaded() const {
+	return _moreViewsLoaded.events();
+}
+
+Fn<void(std::vector<Data::StoryView>)> Controller::viewsGotMoreCallback() {
+	return crl::guard(&_viewsLoadGuard, [=](
+			const std::vector<Data::StoryView> &result) {
+		if (_viewsSlice.list.empty()) {
+			auto &stories = _list->user->owner().stories();
+			if (const auto maybeStory = stories.lookup(_shown)) {
+				_viewsSlice = {
+					.list = result,
+					.left = (*maybeStory)->views() - int(result.size()),
+				};
+			} else {
+				_viewsSlice = {};
+			}
+		} else {
+			_viewsSlice.list.insert(
+				end(_viewsSlice.list),
+				begin(result),
+				end(result));
+			_viewsSlice.left
+				= std::max(_viewsSlice.left - int(result.size()), 0);
+		}
+		_moreViewsLoaded.fire({});
+	});
+}
+
+void Controller::refreshViewsFromData() {
+	Expects(_list.has_value());
+
+	auto &stories = _list->user->owner().stories();
+	const auto maybeStory = stories.lookup(_shown);
+	if (!maybeStory || !_list->user->isSelf()) {
+		_viewsSlice = {};
+		return;
+	}
+	const auto story = *maybeStory;
+	const auto &list = story->viewsList();
+	const auto total = story->views();
+	_viewsSlice.list = list
+		| ranges::views::take(Data::Stories::kViewsPerPage)
+		| ranges::to_vector;
+	_viewsSlice.left = total - int(_viewsSlice.list.size());
+	if (_viewsSlice.list.empty() && _viewsSlice.left > 0) {
+		const auto done = viewsGotMoreCallback();
+		stories.loadViewsSlice(_shown.story, std::nullopt, done);
+	}
+}
+
+bool Controller::sliceViewsTo(PeerId offset) {
+	Expects(_list.has_value());
+
+	auto &stories = _list->user->owner().stories();
+	const auto maybeStory = stories.lookup(_shown);
+	if (!maybeStory || !_list->user->isSelf()) {
+		_viewsSlice = {};
+		return true;
+	}
+	const auto story = *maybeStory;
+	const auto &list = story->viewsList();
+	const auto proj = [&](const Data::StoryView &single) {
+		return single.peer->id;
+	};
+	const auto i = ranges::find(list, _viewsSlice.list.back());
+	const auto add = (i != end(list)) ? int(end(list) - i - 1) : 0;
+	const auto j = ranges::find(_viewsSlice.list, offset, proj);
+	Assert(j != end(_viewsSlice.list));
+	if (!add && (j + 1) == end(_viewsSlice.list)) {
+		const auto done = viewsGotMoreCallback();
+		stories.loadViewsSlice(_shown.story, _viewsSlice.list.back(), done);
+		return false;
+	}
+	_viewsSlice.list.erase(begin(_viewsSlice.list), j + 1);
+	_viewsSlice.list.insert(end(_viewsSlice.list), i + 1, end(list));
+	_viewsSlice.left -= add;
+	return true;
+}
+
 void Controller::unfocusReply() {
 	_wrap->setFocus();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index eef7cc1a3..161a6971e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -78,6 +78,11 @@ struct Layout {
 	friend inline bool operator==(Layout, Layout) = default;
 };
 
+struct ViewsSlice {
+	std::vector<Data::StoryView> list;
+	int left = 0;
+};
+
 class Controller final {
 public:
 	explicit Controller(not_null<Delegate*> delegate);
@@ -114,6 +119,9 @@ public:
 	void repaintSibling(not_null<Sibling*> sibling);
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 
+	[[nodiscard]] ViewsSlice views(PeerId offset);
+	[[nodiscard]] rpl::producer<> moreViewsLoaded() const;
+
 	void unfocusReply();
 
 	[[nodiscard]] rpl::lifetime &lifetime();
@@ -142,6 +150,11 @@ private:
 	void subjumpTo(int index);
 	void checkWaitingFor();
 
+	void refreshViewsFromData();
+	bool sliceViewsTo(PeerId offset);
+	[[nodiscard]] auto viewsGotMoreCallback()
+		-> Fn<void(std::vector<Data::StoryView>)>;
+
 	const not_null<Delegate*> _delegate;
 
 	rpl::variable<std::optional<Layout>> _layout;
@@ -170,6 +183,10 @@ private:
 	int _index = 0;
 	bool _started = false;
 
+	ViewsSlice _viewsSlice;
+	rpl::event_stream<> _moreViewsLoaded;
+	base::has_weak_ptr _viewsLoadGuard;
+
 	std::unique_ptr<Sibling> _siblingLeft;
 	std::unique_ptr<Sibling> _siblingRight;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 9148e6b6f..3703d474f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -7,11 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_recent_views.h"
 
+#include "api/api_who_reacted.h" // FormatReadDate.
 #include "data/data_peer.h"
+#include "data/data_stories.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
 #include "lang/lang_keys.h"
 #include "ui/chat/group_call_userpics.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/controls/who_reacted_context_action.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "ui/userpic_view.h"
@@ -21,6 +25,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media::Stories {
 namespace {
 
+constexpr auto kAddPerPage = 50;
+constexpr auto kLoadViewsPages = 2;
+
 [[nodiscard]] rpl::producer<std::vector<Ui::GroupCallUser>> ContentByUsers(
 		const std::vector<not_null<PeerData*>> &list) {
 	struct Userpic {
@@ -37,7 +44,7 @@ namespace {
 		bool scheduled = false;
 	};
 
-	static const auto size = st::storiesRecentViewsUserpics.size;
+	static const auto size = st::storiesWhoViewed.userpics.size;
 
 	static const auto GenerateUserpic = [](Userpic &userpic) {
 		auto result = userpic.peer->generateUserpicImage(
@@ -132,57 +139,302 @@ void RecentViews::show(RecentViewsData data) {
 		return;
 	}
 	if (!_widget) {
-		const auto parent = _controller->wrap();
-		auto widget = std::make_unique<Ui::RpWidget>(parent);
-		const auto raw = widget.get();
-		raw->show();
-
-		_controller->layoutValue(
-		) | rpl::start_with_next([=](const Layout &layout) {
-			raw->setGeometry(layout.views);
-		}, raw->lifetime());
-
-		raw->paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
-			auto p = Painter(raw);
-			const auto skip = st::storiesRecentViewsSkip;
-			const auto full = _userpicsWidth + skip + _text.maxWidth();
-			const auto use = std::min(full, raw->width());
-			const auto ux = (raw->width() - use) / 2;
-			const auto height = st::storiesRecentViewsUserpics.size;
-			const auto uy = (raw->height() - height) / 2;
-			const auto tx = ux + _userpicsWidth + skip;
-			const auto ty = (raw->height() - st::normalFont->height) / 2;
-			_userpics->paint(p, ux, uy, height);
-			p.setPen(st::storiesComposeWhiteText);
-			_text.drawElided(p, tx, ty, use - _userpicsWidth - skip);
-		}, raw->lifetime());
-
-		_widget = std::move(widget);
-	}
-	if (totalChanged) {
-		_text.setText(st::defaultTextStyle, data.total
-			? tr::lng_stories_views(tr::now, lt_count, data.total)
-			: tr::lng_stories_no_views(tr::now));
+		setupWidget();
 	}
 	if (!_userpics) {
-		_userpics = std::make_unique<Ui::GroupCallUserpics>(
-			st::storiesRecentViewsUserpics,
-			rpl::single(true),
-			[=] { _widget->update(); });
-
-		_userpics->widthValue() | rpl::start_with_next([=](int width) {
-			_userpicsWidth = width;
-		}, _widget->lifetime());
+		setupUserpics();
+	}
+	if (totalChanged) {
+		updateText();
 	}
 	if (usersChanged) {
-		_userpicsLifetime = ContentByUsers(
-			data.list
-		) | rpl::start_with_next([=](
-				const std::vector<Ui::GroupCallUser> &list) {
-			_userpics->update(list, true);
-		});
+		updateUserpics();
 	}
 }
 
+void RecentViews::updateUserpics() {
+	_userpicsLifetime = ContentByUsers(
+		_data.list
+	) | rpl::start_with_next([=](
+		const std::vector<Ui::GroupCallUser> &list) {
+		_userpics->update(list, true);
+	});
+}
+
+void RecentViews::setupUserpics() {
+	_userpics = std::make_unique<Ui::GroupCallUserpics>(
+		st::storiesWhoViewed.userpics,
+		rpl::single(true),
+		[=] { _widget->update(); });
+
+	_userpics->widthValue() | rpl::start_with_next([=](int width) {
+		if (_userpicsWidth != width) {
+			_userpicsWidth = width;
+			updatePartsGeometry();
+		}
+	}, _widget->lifetime());
+}
+
+void RecentViews::setupWidget() {
+	_widget = std::make_unique<Ui::RpWidget>(_controller->wrap());
+	const auto raw = _widget.get();
+	raw->show();
+
+	_controller->layoutValue(
+	) | rpl::start_with_next([=](const Layout &layout) {
+		_outer = layout.views;
+		updatePartsGeometry();
+	}, raw->lifetime());
+
+	raw->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = Painter(raw);
+		_userpics->paint(
+			p,
+			_userpicsPosition.x(),
+			_userpicsPosition.y(),
+			st::storiesWhoViewed.userpics.size);
+		p.setPen(st::storiesComposeWhiteText);
+		_text.drawElided(
+			p,
+			_textPosition.x(),
+			_textPosition.y(),
+			raw->width() - _userpicsWidth - st::storiesRecentViewsSkip);
+	}, raw->lifetime());
+
+	raw->events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return (_data.total > 0)
+			&& (e->type() == QEvent::MouseButtonPress)
+			&& (static_cast<QMouseEvent*>(e.get())->button()
+				== Qt::LeftButton);
+	}) | rpl::start_with_next([=] {
+		showMenu();
+	}, raw->lifetime());
+
+	raw->setCursor(style::cur_pointer);
+}
+
+void RecentViews::updatePartsGeometry() {
+	const auto skip = st::storiesRecentViewsSkip;
+	const auto full = _userpicsWidth + skip + _text.maxWidth();
+	const auto use = std::min(full, _outer.width());
+	const auto ux = _outer.x() + (_outer.width() - use) / 2;
+	const auto uheight = st::storiesWhoViewed.userpics.size;
+	const auto uy = _outer.y() + (_outer.height() - uheight) / 2;
+	const auto tx = ux + _userpicsWidth + skip;
+	const auto theight = st::normalFont->height;
+	const auto ty = _outer.y() + (_outer.height() - theight) / 2;
+	const auto my = std::min(uy, ty);
+	const auto mheight = std::max(uheight, theight);
+	const auto padding = skip;
+	_userpicsPosition = QPoint(padding, uy - my);
+	_textPosition = QPoint(tx - ux + padding, ty - my);
+	_widget->setGeometry(ux - padding, my, use + 2 * padding, mheight);
+	_widget->update();
+}
+
+void RecentViews::updateText() {
+	_text.setText(st::defaultTextStyle, _data.total
+		? tr::lng_stories_views(tr::now, lt_count, _data.total)
+		: tr::lng_stories_no_views(tr::now));
+	updatePartsGeometry();
+}
+
+void RecentViews::showMenu() {
+	if (_menu) {
+		return;
+	}
+
+	const auto views = _controller->views(PeerId());
+	if (views.list.empty() && !views.left) {
+		return;
+	}
+
+	using namespace Ui;
+	_menuShortLifetime.destroy();
+	_menu = base::make_unique_q<PopupMenu>(
+		_widget.get(),
+		st::storiesViewsMenu);
+	auto count = 0;
+	const auto added = std::min(int(views.list.size()), kAddPerPage);
+	const auto add = std::min(added + views.left, kAddPerPage);
+	const auto now = QDateTime::currentDateTime();
+	for (const auto &entry  : views.list) {
+		addMenuRow(entry, now);
+		if (++count >= add) {
+			break;
+		}
+	}
+	while (count++ < add) {
+		addMenuRowPlaceholder();
+	}
+	rpl::merge(
+		_controller->moreViewsLoaded(),
+		rpl::combine(
+			_menu->scrollTopValue(),
+			_menuEntriesCount.value()
+		) | rpl::filter([=](int scrollTop, int count) {
+			const auto fullHeight = count
+				* (st::defaultWhoRead.photoSkip * 2
+					+ st::defaultWhoRead.photoSize);
+			return fullHeight
+				< (scrollTop
+					+ st::storiesViewsMenu.maxHeight * kLoadViewsPages);
+		}) | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		rebuildMenuTail();
+	}, _menuShortLifetime);
+
+	_menu->setDestroyedCallback(crl::guard(_widget.get(), [=] {
+		_menuShortLifetime.destroy();
+		_menuEntries.clear();
+		_menuEntriesCount = 0;
+		_menuPlaceholderCount = 0;
+	}));
+
+	const auto size = _menu->size();
+	const auto geometry = _widget->mapToGlobal(_widget->rect());
+	_menu->setForcedVerticalOrigin(PopupMenu::VerticalOrigin::Bottom);
+	_menu->popup(QPoint(
+		geometry.x() + (_widget->width() - size.width()) / 2,
+		geometry.y() + _widget->height()));
+
+	_menuEntriesCount = _menuEntriesCount.current() + added;
+}
+
+void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
+	Expects(_menu != nullptr);
+
+	const auto peer = entry.peer;
+	const auto date = Api::FormatReadDate(entry.date, now);
+	const auto prepare = [&](Ui::PeerUserpicView &view) {
+		const auto size = st::storiesWhoViewed.photoSize;
+		auto userpic = peer->generateUserpicImage(
+			view,
+			size * style::DevicePixelRatio());
+		userpic.setDevicePixelRatio(style::DevicePixelRatio());
+		return Ui::WhoReactedEntryData{
+			.text = peer->name(),
+			.date = date,
+			.userpic = std::move(userpic),
+			.callback = [] {},
+		};
+	};
+	if (_menuPlaceholderCount > 0) {
+		const auto i = _menuEntries.end() - (_menuPlaceholderCount--);
+		i->peer = peer;
+		i->date = date;
+		i->action->setData(prepare(i->view));
+	} else {
+		auto view = Ui::PeerUserpicView();
+		auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
+			_menu->menu(),
+			nullptr,
+			_menu->menu()->st(),
+			prepare(view));
+		const auto raw = action.get();
+		_menu->addAction(std::move(action));
+		_menuEntries.push_back({
+			.action = raw,
+			.peer = peer,
+			.date = date,
+			.view = std::move(view),
+		});
+	}
+	const auto i = end(_menuEntries) - _menuPlaceholderCount - 1;
+	i->key = peer->userpicUniqueKey(i->view);
+	if (peer->hasUserpic() && peer->useEmptyUserpic(i->view)) {
+		if (_waitingForUserpics.emplace(i - begin(_menuEntries)).second
+			&& _waitingForUserpics.size() == 1) {
+			subscribeToMenuUserpicsLoading(&peer->session());
+		}
+	}
+}
+
+void RecentViews::addMenuRowPlaceholder() {
+	auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
+		_menu->menu(),
+		nullptr,
+		_menu->menu()->st(),
+		Ui::WhoReactedEntryData{ .preloader = true });
+	const auto raw = action.get();
+	_menu->addAction(std::move(action));
+	_menuEntries.push_back({ .action = raw });
+	++_menuPlaceholderCount;
+}
+
+void RecentViews::rebuildMenuTail() {
+	const auto offset = (_menuPlaceholderCount < _menuEntries.size())
+		? (end(_menuEntries) - _menuPlaceholderCount - 1)->peer->id
+		: PeerId();
+	const auto views = _controller->views(offset);
+	if (views.list.empty()) {
+		return;
+	}
+	const auto now = QDateTime::currentDateTime();
+	const auto added = std::min(
+		_menuPlaceholderCount + kAddPerPage,
+		int(views.list.size()));
+	auto add = added;
+	for (const auto &entry : views.list) {
+		addMenuRow(entry, now);
+		if (!--add) {
+			break;
+		}
+	}
+	_menuEntriesCount = _menuEntriesCount.current() + added;
+}
+
+void RecentViews::subscribeToMenuUserpicsLoading(
+		not_null<Main::Session*> session) {
+	_shortAnimationPlaying = style::ShortAnimationPlaying();
+	_waitingForUserpicsLifetime = rpl::merge(
+		_shortAnimationPlaying.changes() | rpl::filter([=](bool playing) {
+			return !playing && _waitingUserpicsCheck;
+		}) | rpl::to_empty,
+		session->downloaderTaskFinished(
+		) | rpl::filter([=] {
+			if (_shortAnimationPlaying.current()) {
+				_waitingUserpicsCheck = true;
+				return false;
+			}
+			return true;
+		})
+	) | rpl::start_with_next([=] {
+		_waitingUserpicsCheck = false;
+		for (auto i = begin(_waitingForUserpics)
+			; i != end(_waitingForUserpics)
+			;) {
+			auto &entry = _menuEntries[*i];
+			auto &view = entry.view;
+			const auto peer = entry.peer;
+			const auto key = peer->userpicUniqueKey(view);
+			const auto update = (entry.key != key);
+			if (update) {
+				const auto size = st::storiesWhoViewed.photoSize;
+				auto userpic = peer->generateUserpicImage(
+					view,
+					size * style::DevicePixelRatio());
+				userpic.setDevicePixelRatio(style::DevicePixelRatio());
+				entry.action->setData({
+					.text = peer->name(),
+					.date = entry.date,
+					.userpic = std::move(userpic),
+					.callback = [] {},
+				});
+				entry.key = key;
+				if (!peer->hasUserpic() || !peer->useEmptyUserpic(view)) {
+					i = _waitingForUserpics.erase(i);
+					continue;
+				}
+			}
+			++i;
+		}
+		if (_waitingForUserpics.empty()) {
+			_waitingForUserpicsLifetime.destroy();
+		}
+	});
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
index 64a6d4e82..79b4ee3fc 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
@@ -7,13 +7,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/unique_qptr.h"
 #include "ui/text/text.h"
+#include "ui/userpic_view.h"
+
+namespace Data {
+struct StoryView;
+} // namespace Data
 
 namespace Ui {
 class RpWidget;
 class GroupCallUserpics;
+class PopupMenu;
+class WhoReactedEntryAction;
 } // namespace Ui
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Media::Stories {
 
 class Controller;
@@ -39,6 +51,26 @@ public:
 	void show(RecentViewsData data);
 
 private:
+	struct MenuEntry {
+		not_null<Ui::WhoReactedEntryAction*> action;
+		PeerData *peer = nullptr;
+		QString date;
+		Ui::PeerUserpicView view;
+		InMemoryKey key;
+	};
+
+	void setupWidget();
+	void setupUserpics();
+	void updateUserpics();
+	void updateText();
+	void updatePartsGeometry();
+	void showMenu();
+
+	void addMenuRow(Data::StoryView entry, const QDateTime &now);
+	void addMenuRowPlaceholder();
+	void rebuildMenuTail();
+	void subscribeToMenuUserpicsLoading(not_null<Main::Session*> session);
+
 	const not_null<Controller*> _controller;
 
 	std::unique_ptr<Ui::RpWidget> _widget;
@@ -46,6 +78,20 @@ private:
 	Ui::Text::String _text;
 	RecentViewsData _data;
 	rpl::lifetime _userpicsLifetime;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	rpl::lifetime _menuShortLifetime;
+	std::vector<MenuEntry> _menuEntries;
+	rpl::variable<int> _menuEntriesCount = 0;
+	int _menuPlaceholderCount = 0;
+	base::flat_set<int> _waitingForUserpics;
+	rpl::variable<bool> _shortAnimationPlaying;
+	bool _waitingUserpicsCheck = false;
+	rpl::lifetime _waitingForUserpicsLifetime;
+
+	QRect _outer;
+	QPoint _userpicsPosition;
+	QPoint _textPosition;
 	int _userpicsWidth = 0;
 
 };
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 2a3c3f7b2..b1674e41b 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -729,11 +729,21 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 	}
 	premium: storiesComposePremium;
 }
-storiesRecentViewsUserpics: GroupCallUserpics {
-	size: 24px;
-	shift: 9px;
-	stroke: 4px;
-	align: align(left);
+storiesViewsMenu: PopupMenu(storiesPopupMenuWithIcons) {
+	scrollPadding: margins(0px, 6px, 0px, 4px);
+	maxHeight: 320px;
+	menu: Menu(storiesMenuWithIcons) {
+		widthMin: 215px;
+		widthMax: 215px;
+	}
+	radius: 7px;
 }
 storiesRecentViewsSkip: 8px;
-
+storiesWhoViewed: WhoRead(defaultWhoRead) {
+	userpics: GroupCallUserpics {
+		size: 24px;
+		shift: 9px;
+		stroke: 4px;
+		align: align(left);
+	}
+}
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index 156bef531..83c543fe0 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "windows_quiethours_h.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 #include <QtCore/QOperatingSystemVersion>
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 8f6b00900..5fbb5b4c3 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -54,6 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_settings.h"
 #include "styles/style_info.h"
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index d4b66ab07..6b718137e 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -727,29 +727,6 @@ popupMenuExpandedSeparator: PopupMenu(popupMenuWithIcons) {
 	}
 }
 
-WhoRead {
-	userpics: GroupCallUserpics;
-	photoLeft: pixels;
-	photoSize: pixels;
-	photoSkip: pixels;
-	nameLeft: pixels;
-	iconPosition: point;
-	itemPadding: margins;
-}
-defaultWhoRead: WhoRead {
-	userpics: GroupCallUserpics {
-		size: 22px;
-		shift: 8px;
-		stroke: 4px;
-		align: align(right);
-	}
-	photoLeft: 13px;
-	photoSize: 30px;
-	photoSkip: 5px;
-	nameLeft: 57px;
-	iconPosition: point(15px, 7px);
-	itemPadding: margins(44px, 9px, 17px, 7px);
-}
 whoReadMenu: PopupMenu(popupMenuExpandedSeparator) {
 	scrollPadding: margins(0px, 6px, 0px, 4px);
 	maxHeight: 400px;
@@ -934,24 +911,6 @@ historySendDisabledIcon: icon {{ "emoji/premium_lock", placeholderFgActive }};
 historySendDisabledIconSkip: 20px;
 historySendDisabledPosition: point(0px, 0px);
 
-moreChatsBarHeight: 48px;
-moreChatsBarTextPosition: point(12px, 4px);
-moreChatsBarStatusPosition: point(12px, 24px);
-moreChatsBarClose: IconButton(defaultIconButton) {
-	width: 48px;
-	height: 48px;
-
-	icon: boxTitleCloseIcon;
-	iconOver: boxTitleCloseIconOver;
-	iconPosition: point(12px, -1px);
-
-	rippleAreaPosition: point(0px, 4px);
-	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
-}
-
 backgroundSwitchToDark: IconButton(defaultIconButton) {
 	width: 48px;
 	height: 48px;
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 7087bbbd4..f4da62406 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "base/unixtime.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_calls.h"
 #include "styles/style_info.h" // st::topBarArrowPadding, like TopBarWidget.
 #include "styles/style_window.h" // st::columnMinimalWidthLeft
diff --git a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
index a88f2074d..b5aadd41e 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/power_saving.h"
 #include "base/random.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Ui {
 namespace {
diff --git a/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
index e645801a2..d78a60696 100644
--- a/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_options.h"
 #include "ui/painter.h"
 #include "lang/lang_keys.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_window.h" // st::columnMinimalWidthLeft
 
 namespace Ui {
diff --git a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
index 5d9a4f80d..ac13cab17 100644
--- a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
+++ b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "lang/lang_keys.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
 
 namespace Ui {
diff --git a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
index 393ae3c2d..e583af790 100644
--- a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
+++ b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Ui {
 namespace {
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index f4914b389..ae9acc05d 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
 namespace Lang {
@@ -69,16 +70,9 @@ StringWithReacted ReplaceTag<StringWithReacted>::Call(
 namespace Ui {
 namespace {
 
-using Text::CustomEmojiFactory;
+constexpr auto kPreloaderAlpha = 0.2;
 
-struct EntryData {
-	QString text;
-	QString date;
-	bool dateReacted = false;
-	QString customEntityData;
-	QImage userpic;
-	Fn<void()> callback;
-};
+using Text::CustomEmojiFactory;
 
 class Action final : public Menu::ItemBase {
 public:
@@ -465,44 +459,11 @@ void Action::handleKeyPress(not_null<QKeyEvent*> e) {
 
 } // namespace
 
-class WhoReactedListMenu::EntryAction final : public Menu::ItemBase {
-public:
-	EntryAction(
-		not_null<RpWidget*> parent,
-		CustomEmojiFactory factory,
-		const style::Menu &st,
-		EntryData &&data);
-
-	void setData(EntryData &&data);
-
-	not_null<QAction*> action() const override;
-	bool isEnabled() const override;
-
-private:
-	int contentHeight() const override;
-
-	void paint(Painter &&p);
-
-	const not_null<QAction*> _dummyAction;
-	const CustomEmojiFactory _customEmojiFactory;
-	const style::Menu &_st;
-	const int _height = 0;
-
-	Text::String _text;
-	Text::String _date;
-	std::unique_ptr<Ui::Text::CustomEmoji> _custom;
-	QImage _userpic;
-	int _textWidth = 0;
-	int _customSize = 0;
-	bool _dateReacted = false;
-
-};
-
-WhoReactedListMenu::EntryAction::EntryAction(
+WhoReactedEntryAction::WhoReactedEntryAction(
 	not_null<RpWidget*> parent,
 	CustomEmojiFactory customEmojiFactory,
 	const style::Menu &st,
-	EntryData &&data)
+	Data &&data)
 : ItemBase(parent, st)
 , _dummyAction(CreateChild<QAction>(parent.get()))
 , _customEmojiFactory(std::move(customEmojiFactory))
@@ -521,19 +482,19 @@ WhoReactedListMenu::EntryAction::EntryAction(
 	enableMouseSelecting();
 }
 
-not_null<QAction*> WhoReactedListMenu::EntryAction::action() const {
+not_null<QAction*> WhoReactedEntryAction::action() const {
 	return _dummyAction.get();
 }
 
-bool WhoReactedListMenu::EntryAction::isEnabled() const {
+bool WhoReactedEntryAction::isEnabled() const {
 	return true;
 }
 
-int WhoReactedListMenu::EntryAction::contentHeight() const {
+int WhoReactedEntryAction::contentHeight() const {
 	return _height;
 }
 
-void WhoReactedListMenu::EntryAction::setData(EntryData &&data) {
+void WhoReactedEntryAction::setData(Data &&data) {
 	setClickedCallback(std::move(data.callback));
 	_userpic = std::move(data.userpic);
 	_text.setMarkedText(_st.itemStyle, { data.text }, MenuTextOptions);
@@ -546,7 +507,10 @@ void WhoReactedListMenu::EntryAction::setData(EntryData &&data) {
 			MenuTextOptions);
 	}
 	_dateReacted = data.dateReacted;
-	_custom = _customEmojiFactory(data.customEntityData, [=] { update(); });
+	_preloader = data.preloader;
+	_custom = _customEmojiFactory
+		? _customEmojiFactory(data.customEntityData, [=] { update(); })
+		: nullptr;
 	const auto ratio = style::DevicePixelRatio();
 	const auto size = Emoji::GetSizeNormal() / ratio;
 	_customSize = Text::AdjustCustomEmojiSize(size);
@@ -565,7 +529,7 @@ void WhoReactedListMenu::EntryAction::setData(EntryData &&data) {
 	update();
 }
 
-void WhoReactedListMenu::EntryAction::paint(Painter &&p) {
+void WhoReactedEntryAction::paint(Painter &&p) {
 	const auto enabled = isEnabled();
 	const auto selected = isSelected();
 	if (selected && _st.itemBgOver->c.alpha() < 255) {
@@ -578,7 +542,18 @@ void WhoReactedListMenu::EntryAction::paint(Painter &&p) {
 	const auto photoSize = st::defaultWhoRead.photoSize;
 	const auto photoLeft = st::defaultWhoRead.photoLeft;
 	const auto photoTop = (height() - photoSize) / 2;
-	if (!_userpic.isNull()) {
+	const auto preloaderBrush = _preloader
+		? [&] {
+			auto color = _st.itemFg->c;
+			color.setAlphaF(color.alphaF() * kPreloaderAlpha);
+			return QBrush(color);
+		}() : QBrush();
+	if (_preloader) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(preloaderBrush);
+		p.drawEllipse(photoLeft, photoTop, photoSize, photoSize);
+	} else if (!_userpic.isNull()) {
 		p.drawImage(photoLeft, photoTop, _userpic);
 	} else if (!_custom) {
 		st::menuIconReactions.paintInCenter(
@@ -590,17 +565,31 @@ void WhoReactedListMenu::EntryAction::paint(Painter &&p) {
 	const auto textTop = withDate
 		? st::whoReadNameWithDateTop
 		: (height() - _st.itemStyle.font->height) / 2;
-	p.setPen(selected
-		? _st.itemFgOver
-		: enabled
-		? _st.itemFg
-		: _st.itemFgDisabled);
-	_text.drawLeftElided(
-		p,
-		st::defaultWhoRead.nameLeft,
-		textTop,
-		_textWidth,
-		width());
+	if (_preloader) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(preloaderBrush);
+		const auto height = _st.itemStyle.font->height / 2;
+		p.drawRoundedRect(
+			st::defaultWhoRead.nameLeft,
+			textTop + (_st.itemStyle.font->height - height) / 2,
+			_textWidth,
+			height,
+			height / 2.,
+			height / 2.);
+	} else {
+		p.setPen(selected
+			? _st.itemFgOver
+			: enabled
+			? _st.itemFg
+			: _st.itemFgDisabled);
+		_text.drawLeftElided(
+			p,
+			st::defaultWhoRead.nameLeft,
+			textTop,
+			_textWidth,
+			width());
+	}
 	if (withDate) {
 		const auto iconPosition = QPoint(
 			st::defaultWhoRead.nameLeft,
@@ -690,11 +679,11 @@ void WhoReactedListMenu::populate(
 		addedToBottom = 0;
 	}
 	auto index = 0;
-	const auto append = [&](EntryData &&data) {
+	const auto append = [&](WhoReactedEntryData &&data) {
 		if (index < _actions.size()) {
 			_actions[index]->setData(std::move(data));
 		} else {
-			auto item = base::make_unique_q<EntryAction>(
+			auto item = base::make_unique_q<WhoReactedEntryAction>(
 				menu->menu(),
 				_customEmojiFactory,
 				menu->menu()->st(),
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
index c46f3e804..fa4d3a08f 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
@@ -9,11 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/unique_qptr.h"
 #include "ui/text/text_block.h"
+#include "ui/widgets/menu/menu_item_base.h"
 
 namespace Ui {
-namespace Menu {
-class ItemBase;
-} // namespace Menu
 
 class PopupMenu;
 
@@ -56,6 +54,52 @@ struct WhoReadContent {
 	Fn<void(uint64)> participantChosen,
 	Fn<void()> showAllChosen);
 
+struct WhoReactedEntryData {
+	QString text;
+	QString date;
+	bool dateReacted = false;
+	bool preloader = false;
+	QString customEntityData;
+	QImage userpic;
+	Fn<void()> callback;
+};
+
+class WhoReactedEntryAction final : public Menu::ItemBase {
+public:
+	using Data = WhoReactedEntryData;
+
+	WhoReactedEntryAction(
+		not_null<RpWidget*> parent,
+		Text::CustomEmojiFactory factory,
+		const style::Menu &st,
+		Data &&data);
+
+	void setData(Data &&data);
+
+	not_null<QAction*> action() const override;
+	bool isEnabled() const override;
+
+private:
+	int contentHeight() const override;
+
+	void paint(Painter &&p);
+
+	const not_null<QAction*> _dummyAction;
+	const Text::CustomEmojiFactory _customEmojiFactory;
+	const style::Menu &_st;
+	const int _height = 0;
+
+	Text::String _text;
+	Text::String _date;
+	std::unique_ptr<Ui::Text::CustomEmoji> _custom;
+	QImage _userpic;
+	int _textWidth = 0;
+	int _customSize = 0;
+	bool _dateReacted = false;
+	bool _preloader = false;
+
+};
+
 class WhoReactedListMenu final {
 public:
 	WhoReactedListMenu(
@@ -72,13 +116,11 @@ public:
 		Fn<void()> appendBottomActions = nullptr);
 
 private:
-	class EntryAction;
-
 	const Text::CustomEmojiFactory _customEmojiFactory;
 	const Fn<void(uint64)> _participantChosen;
 	const Fn<void()> _showAllChosen;
 
-	std::vector<not_null<EntryAction*>> _actions;
+	std::vector<not_null<WhoReactedEntryAction*>> _actions;
 
 };
 

From 41edd41b924c38d08a3faef23dea24b96fe635fa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 1 Jun 2023 20:12:42 +0400
Subject: [PATCH 272/676] Pause story while viewing the viewers list.

---
 .../media/stories/media_stories_controller.cpp         | 10 +++++++++-
 .../media/stories/media_stories_controller.h           |  2 ++
 .../media/stories/media_stories_recent_views.cpp       |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 3fc642b0a..55062a7d3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -476,7 +476,8 @@ void Controller::updatePlayingAllowed() {
 		&& _windowActive
 		&& !_paused
 		&& !_replyActive
-		&& !_layerShown);
+		&& !_layerShown
+		&& !_menuShown);
 }
 
 void Controller::setPlayingAllowed(bool allowed) {
@@ -656,6 +657,13 @@ void Controller::togglePaused(bool paused) {
 	}
 }
 
+void Controller::setMenuShown(bool shown) {
+	if (_menuShown != shown) {
+		_menuShown = shown;
+		updatePlayingAllowed();
+	}
+}
+
 bool Controller::canDownload() const {
 	return _list && _list->user->isSelf();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 161a6971e..b8954e9e3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -113,6 +113,7 @@ public:
 	[[nodiscard]] bool jumpFor(int delta);
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
+	void setMenuShown(bool shown);
 
 	[[nodiscard]] bool canDownload() const;
 
@@ -174,6 +175,7 @@ private:
 	bool _replyFocused = false;
 	bool _replyActive = false;
 	bool _layerShown = false;
+	bool _menuShown = false;
 	bool _paused = false;
 
 	FullStoryId _shown;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 3703d474f..98f8ca9a8 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -286,7 +286,9 @@ void RecentViews::showMenu() {
 		rebuildMenuTail();
 	}, _menuShortLifetime);
 
+	_controller->setMenuShown(true);
 	_menu->setDestroyedCallback(crl::guard(_widget.get(), [=] {
+		_controller->setMenuShown(false);
 		_menuShortLifetime.destroy();
 		_menuEntries.clear();
 		_menuEntriesCount = 0;

From 17a5c27658b903ef675024e3524e5caf7c102d2d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 2 Jun 2023 11:46:19 +0400
Subject: [PATCH 273/676] Update API scheme on layer 160.

Leave plain scheme in api.tl.
---
 Telegram/SourceFiles/api/api_updates.cpp      |  4 +-
 Telegram/SourceFiles/data/data_stories.cpp    | 77 +++++++++++--------
 Telegram/SourceFiles/data/data_stories.h      |  6 +-
 .../tl => SourceFiles/mtproto/scheme}/api.tl  | 41 ++--------
 Telegram/SourceFiles/mtproto/scheme/layer.tl  |  1 +
 .../mtproto/scheme}/mtproto.tl                |  0
 Telegram/cmake/td_scheme.cmake                | 12 +--
 7 files changed, 63 insertions(+), 78 deletions(-)
 rename Telegram/{Resources/tl => SourceFiles/mtproto/scheme}/api.tl (98%)
 create mode 100644 Telegram/SourceFiles/mtproto/scheme/layer.tl
 rename Telegram/{Resources/tl => SourceFiles/mtproto/scheme}/mtproto.tl (100%)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 62bf94ba7..55a15d2a7 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -2520,8 +2520,8 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		_session->api().transcribes().apply(data);
 	} break;
 
-	case mtpc_updateStories: {
-		_session->data().stories().apply(update.c_updateStories());
+	case mtpc_updateStory: {
+		_session->data().stories().apply(update.c_updateStory());
 	} break;
 
 	}
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 5cc08e8b5..90d697126 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -276,8 +276,29 @@ Main::Session &Stories::session() const {
 	return _owner->session();
 }
 
-void Stories::apply(const MTPDupdateStories &data) {
-	applyChanges(parse(data.vstories()));
+void Stories::apply(const MTPDupdateStory &data) {
+	const auto peerId = peerFromUser(data.vuser_id());
+	const auto peer = _owner->peer(peerId);
+	const auto i = ranges::find(_all, peer, &StoriesList::user);
+	const auto id = parseAndApply(peer, data.vstory());
+	if (i != end(_all)) {
+		auto added = false;
+		if (id && !i->ids.contains(id)) {
+			i->ids.emplace(id);
+			++i->total;
+			added = true;
+		}
+		if (added) {
+			ranges::rotate(begin(_all), i, i + 1);
+		}
+	} else if (id) {
+		_all.insert(begin(_all), StoriesList{
+			.user = peer->asUser(),
+			.ids = { id },
+			.readTill = 0,
+			.total = 1,
+		});
+	}
 	_allChanged.fire({});
 }
 
@@ -294,19 +315,11 @@ StoriesList Stories::parse(const MTPUserStories &stories) {
 	const auto &list = data.vstories().v;
 	result.ids.reserve(list.size());
 	for (const auto &story : list) {
-		story.match([&](const MTPDstoryItem &data) {
-			if (const auto story = parseAndApply(result.user, data)) {
-				result.ids.emplace(story->id());
-			} else {
-				applyDeleted({ peerFromUser(userId), data.vid().v });
-				--result.total;
-			}
-		}, [&](const MTPDstoryItemSkipped &data) {
-			result.ids.emplace(data.vid().v);
-		}, [&](const MTPDstoryItemDeleted &data) {
-			applyDeleted({ peerFromUser(userId), data.vid().v });
+		if (const auto id = parseAndApply(result.user, story)) {
+			result.ids.emplace(id);
+		} else {
 			--result.total;
-		});
+		}
 	}
 	result.total = std::max(result.total, int(result.ids.size()));
 	return result;
@@ -339,6 +352,23 @@ Story *Stories::parseAndApply(
 	return result;
 }
 
+StoryId Stories::parseAndApply(
+		not_null<PeerData*> peer,
+		const MTPstoryItem &story) {
+	return story.match([&](const MTPDstoryItem &data) {
+		if (const auto story = parseAndApply(peer, data)) {
+			return story->id();
+		}
+		applyDeleted({ peer->id, data.vid().v });
+		return StoryId();
+	}, [&](const MTPDstoryItemSkipped &data) {
+		return StoryId(data.vid().v);
+	}, [&](const MTPDstoryItemDeleted &data) {
+		applyDeleted({ peer->id, data.vid().v });
+		return StoryId();
+	});
+}
+
 void Stories::updateDependentMessages(not_null<Data::Story*> story) {
 	const auto i = _dependentMessages.find(story);
 	if (i != end(_dependentMessages)) {
@@ -603,25 +633,6 @@ void Stories::pushToBack(StoriesList &&list) {
 	}
 }
 
-void Stories::applyChanges(StoriesList &&list) {
-	const auto i = ranges::find(_all, list.user, &StoriesList::user);
-	if (i != end(_all)) {
-		auto added = false;
-		for (const auto id : list.ids) {
-			if (!i->ids.contains(id)) {
-				i->ids.emplace(id);
-				++i->total;
-				added = true;
-			}
-		}
-		if (added) {
-			ranges::rotate(begin(_all), i, i + 1);
-		}
-	} else if (!list.ids.empty()) {
-		_all.insert(begin(_all), std::move(list));
-	}
-}
-
 void Stories::loadAround(FullStoryId id) {
 	const auto i = ranges::find(_all, id.peer, [](const StoriesList &list) {
 		return list.user->id;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index b4a53f859..aa0fcbda5 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -122,7 +122,7 @@ public:
 		not_null<Data::Story*> dependency);
 
 	void loadMore();
-	void apply(const MTPDupdateStories &data);
+	void apply(const MTPDupdateStory &data);
 	void loadAround(FullStoryId id);
 
 	[[nodiscard]] const std::vector<StoriesList> &all();
@@ -148,6 +148,9 @@ private:
 	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPDstoryItem &data);
+	StoryId parseAndApply(
+		not_null<PeerData*> peer,
+		const MTPstoryItem &story);
 	void processResolvedStories(
 		not_null<PeerData*> peer,
 		const QVector<MTPStoryItem> &list);
@@ -155,7 +158,6 @@ private:
 	void finalizeResolve(FullStoryId id);
 
 	void pushToBack(StoriesList &&list);
-	void applyChanges(StoriesList &&list);
 	void applyDeleted(FullStoryId id);
 	void removeDependencyStory(not_null<Story*> story);
 
diff --git a/Telegram/Resources/tl/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
similarity index 98%
rename from Telegram/Resources/tl/api.tl
rename to Telegram/SourceFiles/mtproto/scheme/api.tl
index d5b1f3652..f603e31ae 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1,33 +1,3 @@
-///////////////////////////////
-/////////////////// Layer cons
-///////////////////////////////
-
-//invokeAfterMsg#cb9f372d msg_id:long query:!X = X;
-//invokeAfterMsgs#3dc4b4f0 msg_ids:Vector<long> query:!X = X;
-//invokeWithLayer1#53835315 query:!X = X;
-//invokeWithLayer2#289dd1f6 query:!X = X;
-//invokeWithLayer3#b7475268 query:!X = X;
-//invokeWithLayer4#dea0d430 query:!X = X;
-//invokeWithLayer5#417a57ae query:!X = X;
-//invokeWithLayer6#3a64d54d query:!X = X;
-//invokeWithLayer7#a5be56d3 query:!X = X;
-//invokeWithLayer8#e9abd9fd query:!X = X;
-//invokeWithLayer9#76715a63 query:!X = X;
-//invokeWithLayer10#39620c41 query:!X = X;
-//invokeWithLayer11#a6b88fdf query:!X = X;
-//invokeWithLayer12#dda60d3c query:!X = X;
-//invokeWithLayer13#427c8ea2 query:!X = X;
-//invokeWithLayer14#2b9b08fa query:!X = X;
-//invokeWithLayer15#b4418b64 query:!X = X;
-//invokeWithLayer16#cf5f0987 query:!X = X;
-//invokeWithLayer17#50858a19 query:!X = X;
-//invokeWithLayer18#1c900537 query:!X = X;
-//invokeWithLayer#da9b0d0d layer:int query:!X = X; // after 18 layer
-
-///////////////////////////////
-///////// Main application API
-///////////////////////////////
-
 boolFalse#bc799737 = Bool;
 boolTrue#997275b5 = Bool;
 
@@ -110,7 +80,7 @@ storage.fileMp4#b3cea0e4 = storage.FileType;
 storage.fileWebp#1081464c = storage.FileType;
 
 userEmpty#d3bc4b7a id:long = User;
-user#8f97c628 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_available:flags2.3?true stories_unavailable:flags2.4?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> = User;
+user#8f97c628 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_available:flags2.3?true stories_unavailable:flags2.4?true stories_hidden:flags2.5?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> = User;
 
 userProfilePhotoEmpty#4f11bae1 = UserProfilePhoto;
 userProfilePhoto#82d1f706 flags:# has_video:flags.0?true personal:flags.2?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = UserProfilePhoto;
@@ -410,7 +380,7 @@ updateChannelPinnedTopics#fe198602 flags:# channel_id:long order:flags.0?Vector<
 updateUser#20529438 user_id:long = Update;
 updateAutoSaveSettings#ec05b097 = Update;
 updateGroupInvitePrivacyForbidden#ccf08ad6 user_id:long = Update;
-updateStories#66fad7b5 stories:UserStories = Update;
+updateStory#205a4133 user_id:long story:StoryItem = Update;
 updateReadStories#feb5345a user_id:long max_id:int = Update;
 updateStoryID#1bf335b9 id:int random_id:long = Update;
 
@@ -1557,7 +1527,7 @@ storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long>
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#a1d8cf8f id:int date:int = StoryItem;
-storyItem#8fcd96ac flags:# pinned:flags.5?true expired:flags.6?true public:flags.7?true id:int date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItem#8fcd96ac flags:# pinned:flags.5?true expired:flags.6?true id:int date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
@@ -1727,6 +1697,7 @@ contacts.resolvePhone#8af94344 phone:string = contacts.ResolvedPeer;
 contacts.exportContactToken#f8654027 = ExportedContactToken;
 contacts.importContactToken#13005788 token:string = User;
 contacts.editCloseFriends#ba6705f0 id:Vector<long> = Bool;
+contacts.toggleStoriesHidden#753fb865 id:InputUser hidden:Bool = Bool;
 
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0f4cb4f flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.Dialogs;
@@ -2115,7 +2086,7 @@ stories.sendStory#8b5c6986 flags:# pinned:flags.2?true media:InputMedia caption:
 stories.editStory#2aae7a41 flags:# id:int media:flags.0?InputMedia caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
 stories.deleteStories#b5d501d7 id:Vector<int> = Vector<int>;
 stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
-stories.getAllStories#eeb0d625 flags:# next:flags.1?true state:flags.0?string = stories.AllStories;
+stories.getAllStories#eeb0d625 flags:# next:flags.1?true include_hidden:flags.2?true state:flags.0?string = stories.AllStories;
 stories.getUserStories#96d528e0 user_id:InputUser = stories.UserStories;
 stories.getPinnedStories#b471137 user_id:InputUser offset_id:int limit:int = stories.Stories;
 stories.getExpiredStories#8f792f2 offset_id:int limit:int = stories.Stories;
@@ -2124,5 +2095,3 @@ stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
 stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
 stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;
 stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
-
-// LAYER 160
diff --git a/Telegram/SourceFiles/mtproto/scheme/layer.tl b/Telegram/SourceFiles/mtproto/scheme/layer.tl
new file mode 100644
index 000000000..5e910a52b
--- /dev/null
+++ b/Telegram/SourceFiles/mtproto/scheme/layer.tl
@@ -0,0 +1 @@
+// LAYER 160
diff --git a/Telegram/Resources/tl/mtproto.tl b/Telegram/SourceFiles/mtproto/scheme/mtproto.tl
similarity index 100%
rename from Telegram/Resources/tl/mtproto.tl
rename to Telegram/SourceFiles/mtproto/scheme/mtproto.tl
diff --git a/Telegram/cmake/td_scheme.cmake b/Telegram/cmake/td_scheme.cmake
index 20b956382..11129f20f 100644
--- a/Telegram/cmake/td_scheme.cmake
+++ b/Telegram/cmake/td_scheme.cmake
@@ -11,16 +11,18 @@ add_library(tdesktop::td_scheme ALIAS td_scheme)
 include(cmake/generate_scheme.cmake)
 
 set(scheme_files
-    ${res_loc}/tl/mtproto.tl
-    ${res_loc}/tl/api.tl
+    ${src_loc}/mtproto/scheme/api.tl
+    ${src_loc}/mtproto/scheme/layer.tl
+    ${src_loc}/mtproto/scheme/mtproto.tl
 )
 
 generate_scheme(td_scheme ${src_loc}/codegen/scheme/codegen_scheme.py "${scheme_files}")
 
-nice_target_sources(td_scheme ${res_loc}
+nice_target_sources(td_scheme ${src_loc}/mtproto/scheme
 PRIVATE
-    tl/mtproto.tl
-    tl/api.tl
+    api.tl
+    layer.tl
+    mtproto.tl
 )
 
 target_include_directories(td_scheme

From d0e1ac123879917ee8b9703d6177f146c286a808 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 2 Jun 2023 13:20:27 +0400
Subject: [PATCH 274/676] Start hiding stories from chats list.

---
 Telegram/SourceFiles/data/data_session.cpp    |  2 +
 Telegram/SourceFiles/data/data_stories.cpp    |  8 ++--
 Telegram/SourceFiles/data/data_stories.h      |  1 +
 Telegram/SourceFiles/data/data_user.cpp       |  4 ++
 Telegram/SourceFiles/data/data_user.h         |  2 +
 .../dialogs/dialogs_inner_widget.cpp          | 21 +++++++++
 .../dialogs/ui/dialogs_stories_list.cpp       | 46 +++++++++++++++++++
 .../dialogs/ui/dialogs_stories_list.h         | 17 +++++++
 8 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 42a8644d1..8df77697a 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -522,6 +522,7 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 				? Flag::Contact
 				| Flag::MutualContact
 				| Flag::DiscardMinPhoto
+				| Flag::StoriesHidden
 				: Flag());
 		const auto flagsSet = (data.is_deleted() ? Flag::Deleted : Flag())
 			| (data.is_verified() ? Flag::Verified : Flag())
@@ -534,6 +535,7 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 				? (data.is_contact() ? Flag::Contact : Flag())
 				| (data.is_mutual_contact() ? Flag::MutualContact : Flag())
 				| (data.is_apply_min_photo() ? Flag() : Flag::DiscardMinPhoto)
+				| (data.is_stories_hidden() ? Flag::StoriesHidden : Flag())
 				: Flag());
 		result->setFlags((result->flags() & ~flagsMask) | flagsSet);
 		if (minimal) {
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 90d697126..b9fe9d67e 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -71,10 +71,10 @@ Story::Story(
 	not_null<PeerData*> peer,
 	StoryMedia media,
 	TimeId date)
-	: _id(id)
-	, _peer(peer)
-	, _media(std::move(media))
-	, _date(date) {
+: _id(id)
+, _peer(peer)
+, _media(std::move(media))
+, _date(date) {
 }
 
 Session &Story::owner() const {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index aa0fcbda5..e41312f5e 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -94,6 +94,7 @@ struct StoriesList {
 	base::flat_set<StoryId> ids;
 	StoryId readTill = 0;
 	int total = 0;
+	bool hidden = false;
 
 	[[nodiscard]] bool unread() const;
 
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index a5c6de084..c903008ae 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -321,6 +321,10 @@ bool UserData::hasPersonalPhoto() const {
 	return (flags() & UserDataFlag::PersonalPhoto);
 }
 
+bool UserData::hasStoriesHidden() const {
+	return (flags() & UserDataFlag::StoriesHidden);
+}
+
 bool UserData::canAddContact() const {
 	return canShareThisContact() && !isContact();
 }
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index cc32613f9..ad0dec4d4 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -62,6 +62,7 @@ enum class UserDataFlag {
 	CanReceiveGifts = (1 << 15),
 	VoiceMessagesForbidden = (1 << 16),
 	PersonalPhoto = (1 << 17),
+	StoriesHidden = (1 << 18),
 };
 inline constexpr bool is_flag_type(UserDataFlag) { return true; };
 using UserDataFlags = base::flags<UserDataFlag>;
@@ -119,6 +120,7 @@ public:
 	[[nodiscard]] bool isInaccessible() const;
 	[[nodiscard]] bool applyMinPhoto() const;
 	[[nodiscard]] bool hasPersonalPhoto() const;
+	[[nodiscard]] bool hasStoriesHidden() const;
 
 	[[nodiscard]] bool canShareThisContact() const;
 	[[nodiscard]] bool canAddContact() const;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 1b354b377..bbc9a2c49 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -342,6 +342,27 @@ InnerWidget::InnerWidget(
 		_controller->openPeerStories(PeerId(int64(id)));
 	}, lifetime());
 
+	_stories->showProfileRequests(
+	) | rpl::start_with_next([=](uint64 id) {
+		_controller->showPeerInfo(PeerId(int64(id)));
+	}, lifetime());
+
+	_stories->toggleShown(
+	) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
+		const auto peerId = PeerId(int64(request.id));
+		const auto user = session().data().peer(peerId)->asUser();
+		Assert(user != nullptr);
+		if (user->hasStoriesHidden() == request.shown) {
+			user->setFlags(request.shown
+				? (user->flags() & ~UserDataFlag::StoriesHidden)
+				: (user->flags() | UserDataFlag::StoriesHidden));
+			session().api().request(MTPcontacts_ToggleStoriesHidden(
+				user->inputUser,
+				MTP_bool(!request.shown)
+			)).send();
+		}
+	}, lifetime());
+
 	_stories->loadMoreRequests(
 	) | rpl::start_with_next([=] {
 		session().data().stories().loadMore();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 58625ddef..5b2e24b08 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_stories_list.h"
 
 #include "lang/lang_keys.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
 
@@ -219,6 +220,14 @@ rpl::producer<uint64> List::clicks() const {
 	return _clicks.events();
 }
 
+rpl::producer<uint64> List::showProfileRequests() const {
+	return _showProfileRequests.events();
+}
+
+rpl::producer<ToggleShownRequest> List::toggleShown() const {
+	return _toggleShown.events();
+}
+
 rpl::producer<> List::expandRequests() const {
 	return _expandRequests.events();
 }
@@ -685,6 +694,43 @@ void List::mouseReleaseEvent(QMouseEvent *e) {
 	}
 }
 
+void List::contextMenuEvent(QContextMenuEvent *e) {
+	_menu = nullptr;
+
+	if (e->reason() == QContextMenuEvent::Mouse) {
+		_lastMousePosition = e->globalPos();
+		updateSelected();
+	}
+	if (_selected < 0 || _data.empty()) {
+		return;
+	}
+
+	auto &item = _data.items[_selected];
+	_menu = base::make_unique_q<Ui::PopupMenu>(this);
+
+	const auto id = item.user.id;
+	const auto hidden = item.user.hidden;
+	_menu->addAction(u"View Profile"_q, [=] {
+		_showProfileRequests.fire_copy(id);
+	});
+	_menu->addAction(hidden ? u"Show in Chats"_q : u"Hide"_q, [=] {
+		_toggleShown.fire({ .id = id, .shown = hidden });
+	});
+	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
+		const auto globalPosition = QCursor::pos();
+		if (rect().contains(mapFromGlobal(globalPosition))) {
+			_lastMousePosition = globalPosition;
+			updateSelected();
+		}
+	});
+	if (_menu->empty()) {
+		_menu = nullptr;
+	} else {
+		_menu->popup(e->globalPos());
+		e->accept();
+	}
+}
+
 bool List::finishDragging() {
 	if (!_dragging) {
 		return false;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 06a0fc286..fd1dc3d5b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -12,6 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class QPainter;
 
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
 namespace Dialogs::Stories {
 
 class Userpic {
@@ -25,6 +29,7 @@ struct User {
 	QString name;
 	std::shared_ptr<Userpic> userpic;
 	bool unread = false;
+	bool hidden = false;
 
 	friend inline bool operator==(const User &a, const User &b) = default;
 };
@@ -37,6 +42,11 @@ struct Content {
 		const Content &b) = default;
 };
 
+struct ToggleShownRequest {
+	uint64 id = 0;
+	bool shown = false;
+};
+
 class List final : public Ui::RpWidget {
 public:
 	List(
@@ -45,6 +55,8 @@ public:
 		Fn<int()> shownHeight);
 
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
+	[[nodiscard]] rpl::producer<uint64> showProfileRequests() const;
+	[[nodiscard]] rpl::producer<ToggleShownRequest> toggleShown() const;
 	[[nodiscard]] rpl::producer<> expandRequests() const;
 	[[nodiscard]] rpl::producer<> entered() const;
 	[[nodiscard]] rpl::producer<> loadMoreRequests() const;
@@ -103,6 +115,7 @@ private:
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
 
 	void validateUserpic(not_null<Item*> item);
 	void validateName(not_null<Item*> item);
@@ -128,6 +141,8 @@ private:
 	Data _hidingData;
 	Fn<int()> _shownHeight = 0;
 	rpl::event_stream<uint64> _clicks;
+	rpl::event_stream<uint64> _showProfileRequests;
+	rpl::event_stream<ToggleShownRequest> _toggleShown;
 	rpl::event_stream<> _expandRequests;
 	rpl::event_stream<> _entered;
 	rpl::event_stream<> _loadMoreRequests;
@@ -144,6 +159,8 @@ private:
 	int _selected = -1;
 	int _pressed = -1;
 
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
 };
 
 } // namespace Dialogs::Stories

From f40391b4f0a5fc503d50647acfe17052213169fb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 2 Jun 2023 18:26:39 +0400
Subject: [PATCH 275/676] Support two lists of stories sources.

---
 Telegram/SourceFiles/data/data_session.cpp    |   2 +-
 Telegram/SourceFiles/data/data_stories.cpp    | 342 ++++++++++++------
 Telegram/SourceFiles/data/data_stories.h      |  84 ++++-
 .../dialogs/dialogs_inner_widget.cpp          |   9 +-
 .../dialogs/ui/dialogs_stories_content.cpp    |  59 +--
 .../dialogs/ui/dialogs_stories_content.h      |   7 +-
 .../history/history_item_helpers.cpp          |   3 +-
 .../stories/media_stories_controller.cpp      | 138 +++----
 .../media/stories/media_stories_controller.h  |  14 +-
 .../media/stories/media_stories_sibling.cpp   |  12 +-
 .../media/stories/media_stories_sibling.h     |   4 +-
 .../media/stories/media_stories_view.cpp      |   7 +-
 .../media/stories/media_stories_view.h        |   8 +-
 .../media/view/media_view_open_common.h       |   7 +
 .../media/view/media_view_overlay_widget.cpp  |  14 +-
 .../media/view/media_view_overlay_widget.h    |   2 +
 .../window/window_session_controller.cpp      |  23 +-
 .../window/window_session_controller.h        |  11 +-
 18 files changed, 462 insertions(+), 284 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 8df77697a..952f1e0fe 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -314,7 +314,7 @@ Session::Session(not_null<Main::Session*> session)
 			}
 		}, _lifetime);
 
-		_stories->loadMore();
+		_stories->loadMore(Data::StorySourcesList::NotHidden);
 	});
 }
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index b9fe9d67e..a3f17a0da 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -35,7 +35,7 @@ constexpr auto kMarkAsReadDelay = 3 * crl::time(1000);
 
 using UpdateFlag = StoryUpdate::Flag;
 
-std::optional<StoryMedia> ParseMedia(
+[[nodiscard]] std::optional<StoryMedia> ParseMedia(
 	not_null<Session*> owner,
 	const MTPMessageMedia &media) {
 	return media.match([&](const MTPDmessageMediaPhoto &data)
@@ -62,8 +62,18 @@ std::optional<StoryMedia> ParseMedia(
 
 } // namespace
 
-bool StoriesList::unread() const {
-	return !ids.empty() && readTill < ids.back();
+StoriesSourceInfo StoriesSource::info() const {
+	return {
+		.id = user->id,
+		.last = ids.empty() ? 0 : ids.back().date,
+		.unread = unread(),
+		.premium = user->isPremium(),
+		.hidden = hidden,
+	};
+}
+
+bool StoriesSource::unread() const {
+	return !ids.empty() && readTill < ids.back().id;
 }
 
 Story::Story(
@@ -93,6 +103,10 @@ StoryId Story::id() const {
 	return _id;
 }
 
+StoryIdDate Story::idDate() const {
+	return { _id, _date };
+}
+
 FullStoryId Story::fullId() const {
 	return { _peer->id, _id };
 }
@@ -278,51 +292,109 @@ Main::Session &Stories::session() const {
 
 void Stories::apply(const MTPDupdateStory &data) {
 	const auto peerId = peerFromUser(data.vuser_id());
-	const auto peer = _owner->peer(peerId);
-	const auto i = ranges::find(_all, peer, &StoriesList::user);
-	const auto id = parseAndApply(peer, data.vstory());
-	if (i != end(_all)) {
-		auto added = false;
-		if (id && !i->ids.contains(id)) {
-			i->ids.emplace(id);
-			++i->total;
-			added = true;
-		}
-		if (added) {
-			ranges::rotate(begin(_all), i, i + 1);
-		}
-	} else if (id) {
-		_all.insert(begin(_all), StoriesList{
-			.user = peer->asUser(),
-			.ids = { id },
-			.readTill = 0,
-			.total = 1,
-		});
+	const auto user = not_null(_owner->peer(peerId)->asUser());
+	const auto idDate = parseAndApply(user, data.vstory());
+	if (!idDate) {
+		return;
+	}
+	const auto i = _all.find(peerId);
+	if (i == end(_all)) {
+		requestUserStories(user);
+		return;
+	} else if (i->second.ids.contains(idDate)) {
+		return;
+	}
+	const auto was = i->second.info();
+	i->second.ids.emplace(idDate);
+	const auto now = i->second.info();
+	if (was == now) {
+		return;
+	}
+	const auto refreshInList = [&](StorySourcesList list) {
+		auto &sources = _sources[static_cast<int>(list)];
+		const auto i = ranges::find(
+			sources,
+			peerId,
+			&StoriesSourceInfo::id);
+		if (i != end(sources)) {
+			*i = now;
+			sort(list);
+		}
+	};
+	refreshInList(StorySourcesList::All);
+	if (!user->hasStoriesHidden()) {
+		refreshInList(StorySourcesList::NotHidden);
 	}
-	_allChanged.fire({});
 }
 
-StoriesList Stories::parse(const MTPUserStories &stories) {
+void Stories::requestUserStories(not_null<UserData*> user) {
+	if (!_requestingUserStories.emplace(user).second) {
+		return;
+	}
+	_owner->session().api().request(MTPstories_GetUserStories(
+		user->inputUser
+	)).done([=](const MTPstories_UserStories &result) {
+		_requestingUserStories.remove(user);
+		const auto &data = result.data();
+		_owner->processUsers(data.vusers());
+		parseAndApply(data.vstories());
+	}).fail([=] {
+		_requestingUserStories.remove(user);
+		applyDeletedFromSources(user->id, StorySourcesList::All);
+	}).send();
+
+}
+
+void Stories::parseAndApply(const MTPUserStories &stories) {
 	const auto &data = stories.data();
-	const auto userId = UserId(data.vuser_id());
+	const auto peerId = peerFromUser(data.vuser_id());
 	const auto readTill = data.vmax_read_id().value_or_empty();
 	const auto count = int(data.vstories().v.size());
-	auto result = StoriesList{
-		.user = _owner->user(userId),
+	auto result = StoriesSource{
+		.user = _owner->peer(peerId)->asUser(),
 		.readTill = readTill,
-		.total = count,
 	};
 	const auto &list = data.vstories().v;
 	result.ids.reserve(list.size());
 	for (const auto &story : list) {
 		if (const auto id = parseAndApply(result.user, story)) {
 			result.ids.emplace(id);
-		} else {
-			--result.total;
 		}
 	}
-	result.total = std::max(result.total, int(result.ids.size()));
-	return result;
+	if (result.ids.empty()) {
+		applyDeletedFromSources(peerId, StorySourcesList::All);
+		return;
+	}
+	const auto info = result.info();
+	const auto i = _all.find(peerId);
+	if (i != end(_all)) {
+		if (i->second != result) {
+			i->second = std::move(result);
+		}
+	} else {
+		_all.emplace(peerId, std::move(result)).first;
+	}
+	const auto add = [&](StorySourcesList list) {
+		auto &sources = _sources[static_cast<int>(list)];
+		const auto i = ranges::find(
+			sources,
+			peerId,
+			&StoriesSourceInfo::id);
+		if (i == end(sources)) {
+			sources.push_back(info);
+		} else if (*i == info) {
+			return;
+		} else {
+			*i = info;
+		}
+		sort(list);
+	};
+	add(StorySourcesList::All);
+	if (result.user->hasStoriesHidden()) {
+		applyDeletedFromSources(peerId, StorySourcesList::NotHidden);
+	} else {
+		add(StorySourcesList::NotHidden);
+	}
 }
 
 Story *Stories::parseAndApply(
@@ -352,20 +424,20 @@ Story *Stories::parseAndApply(
 	return result;
 }
 
-StoryId Stories::parseAndApply(
+StoryIdDate Stories::parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPstoryItem &story) {
 	return story.match([&](const MTPDstoryItem &data) {
 		if (const auto story = parseAndApply(peer, data)) {
-			return story->id();
+			return story->idDate();
 		}
 		applyDeleted({ peer->id, data.vid().v });
-		return StoryId();
+		return StoryIdDate();
 	}, [&](const MTPDstoryItemSkipped &data) {
-		return StoryId(data.vid().v);
+		return StoryIdDate{ data.vid().v, data.vdate().v };
 	}, [&](const MTPDstoryItemDeleted &data) {
 		applyDeleted({ peer->id, data.vid().v });
-		return StoryId();
+		return StoryIdDate();
 	});
 }
 
@@ -398,32 +470,34 @@ void Stories::unregisterDependentMessage(
 	}
 }
 
-void Stories::loadMore() {
-	if (_loadMoreRequestId || _allLoaded) {
+void Stories::loadMore(StorySourcesList list) {
+	const auto index = static_cast<int>(list);
+	if (_loadMoreRequestId[index] || _sourcesLoaded[index]) {
 		return;
 	}
+	const auto all = (list == StorySourcesList::All);
 	const auto api = &_owner->session().api();
 	using Flag = MTPstories_GetAllStories::Flag;
-	_loadMoreRequestId = api->request(MTPstories_GetAllStories(
-		MTP_flags(_state.isEmpty()
-			? Flag(0)
-			: (Flag::f_next | Flag::f_state)),
-		MTP_string(_state)
+	_loadMoreRequestId[index] = api->request(MTPstories_GetAllStories(
+		MTP_flags((all ? Flag::f_include_hidden : Flag())
+			| (_sourcesStates[index].isEmpty()
+				? Flag(0)
+				: (Flag::f_next | Flag::f_state))),
+		MTP_string(_sourcesStates[index])
 	)).done([=](const MTPstories_AllStories &result) {
-		_loadMoreRequestId = 0;
+		_loadMoreRequestId[index] = 0;
 
 		result.match([&](const MTPDstories_allStories &data) {
 			_owner->processUsers(data.vusers());
-			_state = qs(data.vstate());
-			_allLoaded = !data.is_has_more();
+			_sourcesStates[index] = qs(data.vstate());
+			_sourcesLoaded[index] = !data.is_has_more();
 			for (const auto &single : data.vuser_stories().v) {
-				pushToBack(parse(single));
+				parseAndApply(single);
 			}
-			_allChanged.fire({});
 		}, [](const MTPDstories_allStoriesNotModified &) {
 		});
 	}).fail([=] {
-		_loadMoreRequestId = 0;
+		_loadMoreRequestId[index] = 0;
 	}).send();
 }
 
@@ -519,37 +593,64 @@ void Stories::finalizeResolve(FullStoryId id) {
 }
 
 void Stories::applyDeleted(FullStoryId id) {
-	const auto i = _stories.find(id.peer);
-	if (i != end(_stories)) {
-		const auto j = i->second.find(id.story);
-		if (j != end(i->second)) {
-			auto story = std::move(j->second);
-			i->second.erase(j);
+	const auto removeFromList = [&](StorySourcesList list) {
+		const auto index = static_cast<int>(list);
+		auto &sources = _sources[index];
+		const auto i = ranges::find(
+			sources,
+			id.peer,
+			&StoriesSourceInfo::id);
+		if (i != end(sources)) {
+			sources.erase(i);
+			_sourcesChanged[index].fire({});
+		}
+	};
+	const auto i = _all.find(id.peer);
+	if (i != end(_all)) {
+		const auto j = i->second.ids.lower_bound(StoryIdDate{ id.story });
+		if (j != end(i->second.ids) && j->id == id.story) {
+			i->second.ids.erase(j);
+			if (i->second.ids.empty()) {
+				_all.erase(i);
+				removeFromList(StorySourcesList::NotHidden);
+				removeFromList(StorySourcesList::All);
+			}
+		}
+	}
+	_deleted.emplace(id);
+	const auto j = _stories.find(id.peer);
+	if (j != end(_stories)) {
+		const auto k = j->second.find(id.story);
+		if (k != end(j->second)) {
+			auto story = std::move(k->second);
+			j->second.erase(k);
 			session().changes().storyUpdated(
 				story.get(),
 				UpdateFlag::Destroyed);
 			removeDependencyStory(story.get());
-			if (i->second.empty()) {
-				_stories.erase(i);
+			if (j->second.empty()) {
+				_stories.erase(j);
 			}
 		}
 	}
-	const auto j = ranges::find(_all, id.peer, [](const StoriesList &list) {
-		return list.user->id;
-	});
-	if (j != end(_all)) {
-		const auto removed = j->ids.remove(id.story);
-		if (removed) {
-			if (j->ids.empty()) {
-				_all.erase(j);
-			} else {
-				Assert(j->total > 0);
-				--j->total;
-			}
-			_allChanged.fire({});
+}
+
+void Stories::applyDeletedFromSources(PeerId id, StorySourcesList list) {
+	const auto removeFromList = [&](StorySourcesList from) {
+		auto &sources = _sources[static_cast<int>(from)];
+		const auto i = ranges::find(
+			sources,
+			id,
+			&StoriesSourceInfo::id);
+		if (i != end(sources)) {
+			sources.erase(i);
 		}
+		_sourcesChanged[static_cast<int>(from)].fire({});
+	};
+	removeFromList(StorySourcesList::NotHidden);
+	if (list == StorySourcesList::All) {
+		removeFromList(StorySourcesList::All);
 	}
-	_deleted.emplace(id);
 }
 
 void Stories::removeDependencyStory(not_null<Story*> story) {
@@ -564,16 +665,36 @@ void Stories::removeDependencyStory(not_null<Story*> story) {
 	}
 }
 
-const std::vector<StoriesList> &Stories::all() {
+void Stories::sort(StorySourcesList list) {
+	const auto index = static_cast<int>(list);
+	auto &sources = _sources[index];
+	const auto self = _owner->session().user()->id;
+	const auto proj = [&](const StoriesSourceInfo &info) {
+		const auto key = int64(info.last)
+			+ (info.premium ? (int64(1) << 48) : 0)
+			+ (info.unread ? (int64(1) << 49) : 0)
+			+ ((info.id == self) ? (int64(1) << 50) : 0);
+		return std::make_pair(key, info.id);
+	};
+	ranges::sort(sources, ranges::greater(), proj);
+	_sourcesChanged[index].fire({});
+}
+
+const base::flat_map<PeerId, StoriesSource> &Stories::all() const {
 	return _all;
 }
 
-bool Stories::allLoaded() const {
-	return _allLoaded;
+const std::vector<StoriesSourceInfo> &Stories::sources(
+		StorySourcesList list) const {
+	return _sources[static_cast<int>(list)];
 }
 
-rpl::producer<> Stories::allChanged() const {
-	return _allChanged.events();
+bool Stories::sourcesLoaded(StorySourcesList list) const {
+	return _sourcesLoaded[static_cast<int>(list)];
+}
+
+rpl::producer<> Stories::sourcesChanged(StorySourcesList list) const {
+	return _sourcesChanged[static_cast<int>(list)].events();
 }
 
 rpl::producer<PeerId> Stories::itemsChanged() const {
@@ -621,35 +742,21 @@ void Stories::resolve(FullStoryId id, Fn<void()> done) {
 	}
 }
 
-void Stories::pushToBack(StoriesList &&list) {
-	const auto i = ranges::find(_all, list.user, &StoriesList::user);
-	if (i != end(_all)) {
-		if (*i == list) {
-			return;
-		}
-		*i = std::move(list);
-	} else {
-		_all.push_back(std::move(list));
-	}
-}
-
 void Stories::loadAround(FullStoryId id) {
-	const auto i = ranges::find(_all, id.peer, [](const StoriesList &list) {
-		return list.user->id;
-	});
+	const auto i = _all.find(id.peer);
 	if (i == end(_all)) {
 		return;
 	}
-	const auto j = ranges::find(i->ids, id.story);
-	if (j == end(i->ids)) {
+	const auto j = i->second.ids.lower_bound(StoryIdDate{ id.story });
+	if (j == end(i->second.ids) || j->id != id.story) {
 		return;
 	}
 	const auto ignore = [&] {
 		const auto side = kIgnorePreloadAroundIfLoaded;
-		const auto left = ranges::min(int(j - begin(i->ids)), side);
-		const auto right = ranges::min(int(end(i->ids) - j), side);
+		const auto left = ranges::min(int(j - begin(i->second.ids)), side);
+		const auto right = ranges::min(int(end(i->second.ids) - j), side);
 		for (auto k = j - left; k != j + right; ++k) {
-			const auto maybeStory = lookup({ id.peer, *k });
+			const auto maybeStory = lookup({ id.peer, k->id });
 			if (!maybeStory && maybeStory.error() == NoStory::Unknown) {
 				return false;
 			}
@@ -660,29 +767,43 @@ void Stories::loadAround(FullStoryId id) {
 		return;
 	}
 	const auto side = kPreloadAroundCount;
-	const auto left = ranges::min(int(j - begin(i->ids)), side);
-	const auto right = ranges::min(int(end(i->ids) - j), side);
+	const auto left = ranges::min(int(j - begin(i->second.ids)), side);
+	const auto right = ranges::min(int(end(i->second.ids) - j), side);
 	const auto from = j - left;
 	const auto till = j + right;
 	for (auto k = from; k != till; ++k) {
-		resolve({ id.peer, *k }, nullptr);
+		resolve({ id.peer, k->id }, nullptr);
 	}
 }
 
 void Stories::markAsRead(FullStoryId id, bool viewed) {
-	const auto i = ranges::find(_all, id.peer, [](const StoriesList &list) {
-		return list.user->id;
-	});
+	const auto i = _all.find(id.peer);
 	Assert(i != end(_all));
-	if (i->readTill >= id.story) {
+	if (i->second.readTill >= id.story) {
 		return;
 	} else if (!_markReadPending.contains(id.peer)) {
 		sendMarkAsReadRequests();
 	}
 	_markReadPending.emplace(id.peer);
-	i->readTill = id.story;
+	const auto wasUnread = i->second.unread();
+	i->second.readTill = id.story;
+	const auto nowUnread = i->second.unread();
+	if (wasUnread != nowUnread) {
+		const auto refreshInList = [&](StorySourcesList list) {
+			auto &sources = _sources[static_cast<int>(list)];
+			const auto i = ranges::find(
+				sources,
+				id.peer,
+				&StoriesSourceInfo::id);
+			if (i != end(sources)) {
+				i->unread = nowUnread;
+				sort(list);
+			}
+		};
+		refreshInList(StorySourcesList::All);
+		refreshInList(StorySourcesList::NotHidden);
+	}
 	_markReadTimer.callOnce(kMarkAsReadDelay);
-	_allChanged.fire({});
 }
 
 void Stories::sendMarkAsReadRequest(
@@ -721,12 +842,9 @@ void Stories::sendMarkAsReadRequests() {
 			++i;
 			continue;
 		}
-		const auto j = ranges::find(_all, peerId, [](
-				const StoriesList &list) {
-			return list.user->id;
-		});
+		const auto j = _all.find(peerId);
 		if (j != end(_all)) {
-			sendMarkAsReadRequest(j->user, j->readTill);
+			sendMarkAsReadRequest(j->second.user, j->second.readTill);
 		}
 		i = _markReadPending.erase(i);
 	}
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index e41312f5e..dc7b99141 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -22,6 +22,21 @@ namespace Data {
 
 class Session;
 
+struct StoryIdDate {
+	StoryId id = 0;
+	TimeId date = 0;
+
+	[[nodiscard]] bool valid() const {
+		return id != 0;
+	}
+	explicit operator bool() const {
+		return valid();
+	}
+
+	friend inline auto operator<=>(StoryIdDate, StoryIdDate) = default;
+	friend inline bool operator==(StoryIdDate, StoryIdDate) = default;
+};
+
 struct StoryMedia {
 	std::variant<not_null<PhotoData*>, not_null<DocumentData*>> data;
 
@@ -35,7 +50,7 @@ struct StoryView {
 	friend inline bool operator==(StoryView, StoryView) = default;
 };
 
-class Story {
+class Story final {
 public:
 	Story(
 		StoryId id,
@@ -48,6 +63,7 @@ public:
 	[[nodiscard]] not_null<PeerData*> peer() const;
 
 	[[nodiscard]] StoryId id() const;
+	[[nodiscard]] StoryIdDate idDate() const;
 	[[nodiscard]] FullStoryId fullId() const;
 	[[nodiscard]] TimeId date() const;
 	[[nodiscard]] const StoryMedia &media() const;
@@ -89,16 +105,28 @@ private:
 
 };
 
-struct StoriesList {
-	not_null<UserData*> user;
-	base::flat_set<StoryId> ids;
-	StoryId readTill = 0;
-	int total = 0;
+struct StoriesSourceInfo {
+	PeerId id = 0;
+	TimeId last = 0;
+	bool unread = false;
+	bool premium = false;
 	bool hidden = false;
 
+	friend inline bool operator==(
+		StoriesSourceInfo,
+		StoriesSourceInfo) = default;
+};
+
+struct StoriesSource {
+	not_null<UserData*> user;
+	base::flat_set<StoryIdDate> ids;
+	StoryId readTill = 0;
+	bool hidden = false;
+
+	[[nodiscard]] StoriesSourceInfo info() const;
 	[[nodiscard]] bool unread() const;
 
-	friend inline bool operator==(StoriesList, StoriesList) = default;
+	friend inline bool operator==(StoriesSource, StoriesSource) = default;
 };
 
 enum class NoStory : uchar {
@@ -106,6 +134,13 @@ enum class NoStory : uchar {
 	Deleted,
 };
 
+enum class StorySourcesList : uchar {
+	NotHidden,
+	All,
+};
+
+inline constexpr auto kStorySourcesListCount = 2;
+
 class Stories final {
 public:
 	explicit Stories(not_null<Session*> owner);
@@ -122,13 +157,16 @@ public:
 		not_null<HistoryItem*> dependent,
 		not_null<Data::Story*> dependency);
 
-	void loadMore();
+	void loadMore(StorySourcesList list);
 	void apply(const MTPDupdateStory &data);
 	void loadAround(FullStoryId id);
 
-	[[nodiscard]] const std::vector<StoriesList> &all();
-	[[nodiscard]] bool allLoaded() const;
-	[[nodiscard]] rpl::producer<> allChanged() const;
+	[[nodiscard]] const base::flat_map<PeerId, StoriesSource> &all() const;
+	[[nodiscard]] const std::vector<StoriesSourceInfo> &sources(
+		StorySourcesList list) const;
+	[[nodiscard]] bool sourcesLoaded(StorySourcesList list) const;
+	[[nodiscard]] rpl::producer<> sourcesChanged(
+		StorySourcesList list) const;
 	[[nodiscard]] rpl::producer<PeerId> itemsChanged() const;
 
 	[[nodiscard]] base::expected<not_null<Story*>, NoStory> lookup(
@@ -145,11 +183,11 @@ public:
 		Fn<void(std::vector<StoryView>)> done);
 
 private:
-	[[nodiscard]] StoriesList parse(const MTPUserStories &stories);
+	void parseAndApply(const MTPUserStories &stories);
 	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPDstoryItem &data);
-	StoryId parseAndApply(
+	StoryIdDate parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPstoryItem &story);
 	void processResolvedStories(
@@ -158,13 +196,16 @@ private:
 	void sendResolveRequests();
 	void finalizeResolve(FullStoryId id);
 
-	void pushToBack(StoriesList &&list);
 	void applyDeleted(FullStoryId id);
+	void applyDeletedFromSources(PeerId id, StorySourcesList list);
 	void removeDependencyStory(not_null<Story*> story);
+	void sort(StorySourcesList list);
 
 	void sendMarkAsReadRequests();
 	void sendMarkAsReadRequest(not_null<PeerData*> peer, StoryId tillId);
 
+	void requestUserStories(not_null<UserData*> user);
+
 	const not_null<Session*> _owner;
 	base::flat_map<
 		PeerId,
@@ -182,17 +223,20 @@ private:
 		not_null<Data::Story*>,
 		base::flat_set<not_null<HistoryItem*>>> _dependentMessages;
 
-	std::vector<StoriesList> _all;
-	rpl::event_stream<> _allChanged;
-	rpl::event_stream<PeerId> _itemsChanged;
-	QString _state;
-	bool _allLoaded = false;
+	base::flat_map<PeerId, StoriesSource> _all;
+	std::vector<StoriesSourceInfo> _sources[kStorySourcesListCount];
+	rpl::event_stream<> _sourcesChanged[kStorySourcesListCount];
+	bool _sourcesLoaded[kStorySourcesListCount] = { false };
+	QString _sourcesStates[kStorySourcesListCount];
 
-	mtpRequestId _loadMoreRequestId = 0;
+	mtpRequestId _loadMoreRequestId[kStorySourcesListCount] = { 0 };
+
+	rpl::event_stream<PeerId> _itemsChanged;
 
 	base::flat_set<PeerId> _markReadPending;
 	base::Timer _markReadTimer;
 	base::flat_set<PeerId> _markReadRequests;
+	base::flat_set<not_null<UserData*>> _requestingUserStories;
 
 	StoryId _viewsStoryId = 0;
 	std::optional<StoryView> _viewsOffset;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index bbc9a2c49..fb15560a3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -142,7 +142,9 @@ InnerWidget::InnerWidget(
 , _controller(controller)
 , _stories(std::make_unique<Stories::List>(
 	this,
-	Stories::ContentForSession(&controller->session()),
+	Stories::ContentForSession(
+		&controller->session(),
+		Data::StorySourcesList::NotHidden),
 	[=] { return _stories->height() - _visibleTop; }))
 , _shownList(controller->session().data().chatsList()->indexed())
 , _st(&st::defaultDialogRow)
@@ -339,7 +341,7 @@ InnerWidget::InnerWidget(
 
 	_stories->clicks(
 	) | rpl::start_with_next([=](uint64 id) {
-		_controller->openPeerStories(PeerId(int64(id)));
+		_controller->openPeerStories(PeerId(int64(id)), {});
 	}, lifetime());
 
 	_stories->showProfileRequests(
@@ -365,7 +367,8 @@ InnerWidget::InnerWidget(
 
 	_stories->loadMoreRequests(
 	) | rpl::start_with_next([=] {
-		session().data().stories().loadMore();
+		session().data().stories().loadMore(
+			Data::StorySourcesList::NotHidden);
 	}, lifetime());
 
 	handleChatListEntryRefreshes();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 7b127cd3c..37016cfa5 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -15,8 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "ui/painter.h"
 
-#include "history/history.h" // #TODO stories testing
-
 namespace Dialogs::Stories {
 namespace {
 
@@ -51,12 +49,13 @@ private:
 
 class State final {
 public:
-	explicit State(not_null<Data::Stories*> data);
+	State(not_null<Data::Stories*> data, Data::StorySourcesList list);
 
 	[[nodiscard]] Content next();
 
 private:
 	const not_null<Data::Stories*> _data;
+	const Data::StorySourcesList _list;
 	base::flat_map<not_null<UserData*>, std::shared_ptr<Userpic>> _userpics;
 
 };
@@ -122,27 +121,23 @@ void PeerUserpic::processNewPhoto() {
 	}, _subscribed->downloadLifetime);
 }
 
-State::State(not_null<Data::Stories*> data)
-: _data(data) {
+State::State(not_null<Data::Stories*> data, Data::StorySourcesList list)
+: _data(data)
+, _list(list) {
 }
 
 Content State::next() {
 	auto result = Content();
-#if 1 // #TODO stories testing
 	const auto &all = _data->all();
-	result.users.reserve(all.size());
-	for (const auto &list : all) {
+	const auto &sources = _data->sources(_list);
+	result.users.reserve(sources.size());
+	for (const auto &info : sources) {
+		const auto i = all.find(info.id);
+		Assert(i != end(all));
+		const auto &source = i->second;
+
 		auto userpic = std::shared_ptr<Userpic>();
-		const auto user = list.user;
-#else
-	const auto list = _data->owner().chatsList();
-	const auto &all = list->indexed()->all();
-	result.users.reserve(all.size());
-	for (const auto &entry : all) {
-		if (const auto history = entry->history()) {
-			if (const auto user = history->peer->asUser(); user && !user->isBot()) {
-				auto userpic = std::shared_ptr<Userpic>();
-#endif
+		const auto user = source.user;
 		if (const auto i = _userpics.find(user); i != end(_userpics)) {
 			userpic = i->second;
 		} else {
@@ -153,41 +148,25 @@ Content State::next() {
 			.id = uint64(user->id.value),
 			.name = user->shortName(),
 			.userpic = std::move(userpic),
-#if 1 // #TODO stories testing
-			.unread = list.unread(),
-#else
-			.unread = history->chatListBadgesState().unread
+			.unread = info.unread,
 		});
 	}
-#endif
-		});
-	}
-	ranges::stable_partition(result.users, [](const User &user) {
-		return user.unread;
-	});
 	return result;
 }
 
 } // namespace
 
-rpl::producer<Content> ContentForSession(not_null<Main::Session*> session) {
+rpl::producer<Content> ContentForSession(
+		not_null<Main::Session*> session,
+		Data::StorySourcesList list) {
 	return [=](auto consumer) {
 		auto result = rpl::lifetime();
 		const auto stories = &session->data().stories();
-		const auto state = result.make_state<State>(stories);
+		const auto state = result.make_state<State>(stories, list);
 		rpl::single(
 			rpl::empty
 		) | rpl::then(
-#if 1 // #TODO stories testing
-			stories->allChanged()
-#else
-			rpl::merge(
-				session->data().chatsListChanges(
-				) | rpl::filter(
-					rpl::mappers::_1 == nullptr
-				) | rpl::to_empty,
-				session->data().unreadBadgeChanges())
-#endif
+			stories->sourcesChanged(list)
 		) | rpl::start_with_next([=] {
 			consumer.put_next(state->next());
 		}, result);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
index dc81f2528..1feb6a77a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace Data {
+enum class StorySourcesList : uchar;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -16,6 +20,7 @@ namespace Dialogs::Stories {
 struct Content;
 
 [[nodiscard]] rpl::producer<Content> ContentForSession(
-	not_null<Main::Session*> session);
+	not_null<Main::Session*> session,
+	Data::StorySourcesList list);
 
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 68eaa0d1e..0a1b1a8a0 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -297,7 +297,8 @@ ClickHandlerPtr JumpToStoryClickHandler(
 			? separate->sessionController()
 			: peer->session().tryResolveWindow();
 		if (controller) {
-			controller->openPeerStory(peer, storyId);
+			// #TODO stories decide context
+			controller->openPeerStory(peer, storyId, {});
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 55062a7d3..716da7fee 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -386,25 +386,30 @@ auto Controller::stickerOrEmojiChosen() const
 }
 
 void Controller::show(
-		const std::vector<Data::StoriesList> &lists,
-		int index,
-		int subindex) {
-	Expects(index >= 0 && index < lists.size());
-	Expects(subindex >= 0 && subindex < lists[index].ids.size());
-
-	showSiblings(lists, index);
-
-	const auto &list = lists[index];
-	const auto id = *(begin(list.ids) + subindex);
-	const auto storyId = FullStoryId{
-		.peer = list.user->id,
-		.story = id,
-	};
-	const auto maybeStory = list.user->owner().stories().lookup(storyId);
-	if (!maybeStory) {
+		not_null<Data::Story*> story,
+		Data::StorySourcesList list) {
+	auto &stories = story->owner().stories();
+	const auto &all = stories.all();
+	const auto &sources = stories.sources(list);
+	const auto storyId = story->fullId();
+	const auto id = storyId.story;
+	const auto i = ranges::find(
+		sources,
+		storyId.peer,
+		&Data::StoriesSourceInfo::id);
+	if (i == end(sources)) {
 		return;
 	}
-	const auto story = *maybeStory;
+	const auto j = all.find(storyId.peer);
+	if (j == end(all)) {
+		return;
+	}
+	const auto &source = j->second;
+	const auto k = source.ids.lower_bound(Data::StoryIdDate{ id });
+	if (k == end(source.ids) || k->id != id) {
+		return;
+	}
+	showSiblings(&story->session(), sources, (i - begin(sources)));
 	const auto guard = gsl::finally([&] {
 		_paused = false;
 		_started = false;
@@ -414,10 +419,10 @@ void Controller::show(
 			_photoPlayback = nullptr;
 		}
 	});
-	if (_list != list) {
-		_list = list;
+	if (_source != source) {
+		_source = source;
 	}
-	_index = subindex;
+	_index = (k - begin(source.ids));
 	_waitingForId = {};
 
 	if (_shown == storyId) {
@@ -431,16 +436,16 @@ void Controller::show(
 		unfocusReply();
 	}
 
-	_header->show({ .user = list.user, .date = story->date() });
-	_slider->show({ .index = _index, .total = list.total });
-	_replyArea->show({ .user = list.user, .id = id });
+	_header->show({ .user = source.user, .date = story->date() });
+	_slider->show({ .index = _index, .total = int(source.ids.size()) });
+	_replyArea->show({ .user = source.user, .id = id });
 	_recentViews->show({
 		.list = story->recentViewers(),
 		.total = story->views(),
-		.valid = list.user->isSelf(),
+		.valid = source.user->isSelf(),
 	});
 
-	const auto session = &list.user->session();
+	const auto session = &story->session();
 	if (_session != session) {
 		_session = session;
 		_sessionLifetime = session->changes().storyUpdates(
@@ -458,14 +463,13 @@ void Controller::show(
 		}, _sessionLifetime);
 	}
 
-	auto &stories = session->data().stories();
-	if (int(lists.size()) - index < kPreloadUsersCount) {
-		stories.loadMore();
+	if (int(sources.end() - i) < kPreloadUsersCount) {
+		stories.loadMore(list);
 	}
 	stories.loadAround(storyId);
 
 	updatePlayingAllowed();
-	list.user->updateFull();
+	source.user->updateFull();
 }
 
 void Controller::updatePlayingAllowed() {
@@ -492,21 +496,33 @@ void Controller::setPlayingAllowed(bool allowed) {
 }
 
 void Controller::showSiblings(
-		const std::vector<Data::StoriesList> &lists,
+		not_null<Main::Session*> session,
+		const std::vector<Data::StoriesSourceInfo> &sources,
 		int index) {
-	showSibling(_siblingLeft, (index > 0) ? &lists[index - 1] : nullptr);
+	showSibling(
+		_siblingLeft,
+		session,
+		(index > 0) ? sources[index - 1].id : PeerId());
 	showSibling(
 		_siblingRight,
-		(index + 1 < lists.size()) ? &lists[index + 1] : nullptr);
+		session,
+		(index + 1 < sources.size()) ? sources[index + 1].id : PeerId());
 }
 
 void Controller::showSibling(
 		std::unique_ptr<Sibling> &sibling,
-		const Data::StoriesList *list) {
-	if (!list || list->ids.empty()) {
+		not_null<Main::Session*> session,
+		PeerId peerId) {
+	if (!peerId) {
 		sibling = nullptr;
-	} else if (!sibling || !sibling->shows(*list)) {
-		sibling = std::make_unique<Sibling>(this, *list);
+		return;
+	}
+	const auto &all = session->data().stories().all();
+	const auto i = all.find(peerId);
+	if (i == end(all)) {
+		sibling = nullptr;
+	} else if (!sibling || !sibling->shows(i->second)) {
+		sibling = std::make_unique<Sibling>(this, i->second);
 	}
 }
 
@@ -552,19 +568,19 @@ void Controller::maybeMarkAsRead(const Player::TrackState &state) {
 }
 
 void Controller::markAsRead() {
-	Expects(_list.has_value());
+	Expects(_source.has_value());
 
-	_list->user->owner().stories().markAsRead(_shown, _started);
+	_source->user->owner().stories().markAsRead(_shown, _started);
 }
 
 bool Controller::subjumpAvailable(int delta) const {
 	const auto index = _index + delta;
 	if (index < 0) {
 		return _siblingLeft && _siblingLeft->shownId().valid();
-	} else if (index >= _list->total) {
+	} else if (index >= int(_source->ids.size())) {
 		return _siblingRight && _siblingRight->shownId().valid();
 	}
-	return index >= 0 && index < _list->total;
+	return index >= 0 && index < int(_source->ids.size());
 }
 
 bool Controller::subjumpFor(int delta) {
@@ -575,32 +591,32 @@ bool Controller::subjumpFor(int delta) {
 	if (index < 0) {
 		if (_siblingLeft && _siblingLeft->shownId().valid()) {
 			return jumpFor(-1);
-		} else if (!_list || _list->ids.empty()) {
+		} else if (!_source || _source->ids.empty()) {
 			return false;
 		}
 		subjumpTo(0);
 		return true;
-	} else if (index >= _list->total) {
+	} else if (index >= int(_source->ids.size())) {
 		return _siblingRight
 			&& _siblingRight->shownId().valid()
 			&& jumpFor(1);
-	} else if (index < _list->ids.size()) {
+	} else {
 		subjumpTo(index);
 	}
 	return true;
 }
 
 void Controller::subjumpTo(int index) {
-	Expects(_list.has_value());
-	Expects(index >= 0 && index < _list->ids.size());
+	Expects(_source.has_value());
+	Expects(index >= 0 && index < _source->ids.size());
 
 	const auto id = FullStoryId{
-		.peer = _list->user->id,
-		.story = *(begin(_list->ids) + index)
+		.peer = _source->user->id,
+		.story = (begin(_source->ids) + index)->id,
 	};
-	auto &stories = _list->user->owner().stories();
+	auto &stories = _source->user->owner().stories();
 	if (stories.lookup(id)) {
-		_delegate->storiesJumpTo(&_list->user->session(), id);
+		_delegate->storiesJumpTo(&_source->user->session(), id);
 	} else if (_waitingForId != id) {
 		_waitingForId = id;
 		stories.loadAround(id);
@@ -609,9 +625,9 @@ void Controller::subjumpTo(int index) {
 
 void Controller::checkWaitingFor() {
 	Expects(_waitingForId.valid());
-	Expects(_list.has_value());
+	Expects(_source.has_value());
 
-	auto &stories = _list->user->owner().stories();
+	auto &stories = _source->user->owner().stories();
 	const auto maybe = stories.lookup(_waitingForId);
 	if (!maybe) {
 		if (maybe.error() == Data::NoStory::Deleted) {
@@ -620,7 +636,7 @@ void Controller::checkWaitingFor() {
 		return;
 	}
 	_delegate->storiesJumpTo(
-		&_list->user->session(),
+		&_source->user->session(),
 		base::take(_waitingForId));
 }
 
@@ -633,7 +649,7 @@ bool Controller::jumpFor(int delta) {
 			return true;
 		}
 	} else if (delta == 1) {
-		if (_list && _index + 1 >= _list->total) {
+		if (_source && _index + 1 >= int(_source->ids.size())) {
 			markAsRead();
 		}
 		if (const auto right = _siblingRight.get()) {
@@ -665,7 +681,7 @@ void Controller::setMenuShown(bool shown) {
 }
 
 bool Controller::canDownload() const {
-	return _list && _list->user->isSelf();
+	return _source && _source->user->isSelf();
 }
 
 void Controller::repaintSibling(not_null<Sibling*> sibling) {
@@ -706,7 +722,7 @@ Fn<void(std::vector<Data::StoryView>)> Controller::viewsGotMoreCallback() {
 	return crl::guard(&_viewsLoadGuard, [=](
 			const std::vector<Data::StoryView> &result) {
 		if (_viewsSlice.list.empty()) {
-			auto &stories = _list->user->owner().stories();
+			auto &stories = _source->user->owner().stories();
 			if (const auto maybeStory = stories.lookup(_shown)) {
 				_viewsSlice = {
 					.list = result,
@@ -728,11 +744,11 @@ Fn<void(std::vector<Data::StoryView>)> Controller::viewsGotMoreCallback() {
 }
 
 void Controller::refreshViewsFromData() {
-	Expects(_list.has_value());
+	Expects(_source.has_value());
 
-	auto &stories = _list->user->owner().stories();
+	auto &stories = _source->user->owner().stories();
 	const auto maybeStory = stories.lookup(_shown);
-	if (!maybeStory || !_list->user->isSelf()) {
+	if (!maybeStory || !_source->user->isSelf()) {
 		_viewsSlice = {};
 		return;
 	}
@@ -750,11 +766,11 @@ void Controller::refreshViewsFromData() {
 }
 
 bool Controller::sliceViewsTo(PeerId offset) {
-	Expects(_list.has_value());
+	Expects(_source.has_value());
 
-	auto &stories = _list->user->owner().stories();
+	auto &stories = _source->user->owner().stories();
 	const auto maybeStory = stories.lookup(_shown);
-	if (!maybeStory || !_list->user->isSelf()) {
+	if (!maybeStory || !_source->user->isSelf()) {
 		_viewsSlice = {};
 		return true;
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index b8954e9e3..d6081d84b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -20,7 +20,6 @@ struct FileChosen;
 } // namespace ChatHelpers
 
 namespace Data {
-struct StoriesList;
 struct FileOrigin;
 } // namespace Data
 
@@ -100,10 +99,7 @@ public:
 	[[nodiscard]] auto stickerOrEmojiChosen() const
 	-> rpl::producer<ChatHelpers::FileChosen>;
 
-	void show(
-		const std::vector<Data::StoriesList> &lists,
-		int index,
-		int subindex);
+	void show(not_null<Data::Story*> story, Data::StorySourcesList list);
 	void ready();
 
 	void updateVideoPlayback(const Player::TrackState &state);
@@ -142,11 +138,13 @@ private:
 	void setPlayingAllowed(bool allowed);
 
 	void showSiblings(
-		const std::vector<Data::StoriesList> &lists,
+		not_null<Main::Session*> session,
+		const std::vector<Data::StoriesSourceInfo> &lists,
 		int index);
 	void showSibling(
 		std::unique_ptr<Sibling> &sibling,
-		const Data::StoriesList *list);
+		not_null<Main::Session*> session,
+		PeerId peerId);
 
 	void subjumpTo(int index);
 	void checkWaitingFor();
@@ -180,7 +178,7 @@ private:
 
 	FullStoryId _shown;
 	TextWithEntities _captionText;
-	std::optional<Data::StoriesList> _list;
+	std::optional<Data::StoriesSource> _source;
 	FullStoryId _waitingForId;
 	int _index = 0;
 	bool _started = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 90a393954..375bf1f23 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -228,10 +228,10 @@ bool Sibling::LoaderVideo::updateAfterGoodCheck() {
 
 Sibling::Sibling(
 	not_null<Controller*> controller,
-	const Data::StoriesList &list)
+	const Data::StoriesSource &source)
 : _controller(controller)
-, _id{ list.user->id, list.ids.front() }
-, _peer(list.user) {
+, _id{ source.user->id, source.ids.front().id }
+, _peer(source.user) {
 	checkStory();
 	_goodShown.stop();
 }
@@ -279,10 +279,10 @@ not_null<PeerData*> Sibling::peer() const {
 	return _peer;
 }
 
-bool Sibling::shows(const Data::StoriesList &list) const {
-	Expects(!list.ids.empty());
+bool Sibling::shows(const Data::StoriesSource &source) const {
+	Expects(!source.ids.empty());
 
-	return _id == FullStoryId{ list.user->id, list.ids.front() };
+	return _id == FullStoryId{ source.user->id, source.ids.front().id };
 }
 
 SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.h b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
index f6eb4edc7..ed4b8789c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
@@ -26,12 +26,12 @@ class Sibling final : public base::has_weak_ptr {
 public:
 	Sibling(
 		not_null<Controller*> controller,
-		const Data::StoriesList &list);
+		const Data::StoriesSource &source);
 	~Sibling();
 
 	[[nodiscard]] FullStoryId shownId() const;
 	[[nodiscard]] not_null<PeerData*> peer() const;
-	[[nodiscard]] bool shows(const Data::StoriesList &list) const;
+	[[nodiscard]] bool shows(const Data::StoriesSource &source) const;
 
 	[[nodiscard]] SiblingView view(
 		const SiblingLayout &layout,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 18a4bb499..0fbc38721 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -22,11 +22,8 @@ View::View(not_null<Delegate*> delegate)
 
 View::~View() = default;
 
-void View::show(
-		const std::vector<Data::StoriesList> &lists,
-		int index,
-		int subindex) {
-	_controller->show(lists, index, subindex);
+void View::show(not_null<Data::Story*> story, Data::StorySourcesList list) {
+	_controller->show(story, list);
 }
 
 void View::ready() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index d01bd3d61..a671bdbde 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -8,7 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 namespace Data {
-struct StoriesList;
+class Story;
+enum class StorySourcesList : uchar;
 struct FileOrigin;
 } // namespace Data
 
@@ -52,10 +53,7 @@ public:
 	explicit View(not_null<Delegate*> delegate);
 	~View();
 
-	void show(
-		const std::vector<Data::StoriesList> &lists,
-		int index,
-		int subindex);
+	void show(not_null<Data::Story*> story, Data::StorySourcesList list);
 	void ready();
 
 	[[nodiscard]] bool canDownload() const;
diff --git a/Telegram/SourceFiles/media/view/media_view_open_common.h b/Telegram/SourceFiles/media/view/media_view_open_common.h
index 79b835461..aed2fde58 100644
--- a/Telegram/SourceFiles/media/view/media_view_open_common.h
+++ b/Telegram/SourceFiles/media/view/media_view_open_common.h
@@ -16,6 +16,7 @@ class HistoryItem;
 
 namespace Data {
 class Story;
+enum class StorySourcesList : uchar;
 } // namespace Data
 
 namespace Window {
@@ -74,10 +75,12 @@ public:
 	OpenRequest(
 		Window::SessionController *controller,
 		not_null<Data::Story*> story,
+		Data::StorySourcesList list,
 		bool continueStreaming = false,
 		crl::time startTime = 0)
 	: _controller(controller)
 	, _story(story)
+	, _storiesList(list)
 	, _continueStreaming(continueStreaming)
 	, _startTime(startTime) {
 	}
@@ -105,6 +108,9 @@ public:
 	[[nodiscard]] Data::Story *story() const {
 		return _story;
 	}
+	[[nodiscard]] Data::StorySourcesList storiesList() const {
+		return _storiesList;
+	}
 
 	[[nodiscard]] std::optional<Data::CloudTheme> cloudTheme() const {
 		return _cloudTheme;
@@ -127,6 +133,7 @@ private:
 	DocumentData *_document = nullptr;
 	PhotoData *_photo = nullptr;
 	Data::Story *_story = nullptr;
+	Data::StorySourcesList _storiesList = {};
 	PeerData *_peer = nullptr;
 	HistoryItem *_item = nullptr;
 	MsgId _topicRootId = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index df290b574..00bb0f645 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4973,15 +4973,13 @@ void OverlayWidget::setContext(
 		_topicRootId = MsgId();
 		_history = nullptr;
 		_peer = nullptr;
-		const auto &all = story->peer->owner().stories().all();
-		const auto i = ranges::find(
-			all,
-			story->peer,
-			&Data::StoriesList::user);
-		Assert(i != end(all));
-		const auto j = ranges::find(i->ids, story->id);
 		setStoriesPeer(story->peer);
-		_stories->show(all, (i - begin(all)), j - begin(i->ids));
+		auto &stories = story->peer->owner().stories();
+		const auto maybeStory = stories.lookup(
+			{ story->peer->id, story->id });
+		if (maybeStory) {
+			_stories->show(*maybeStory, story->list);
+		}
 	} else {
 		_message = nullptr;
 		_topicRootId = MsgId();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index a32c0ef59..837678675 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -30,6 +30,7 @@ enum class activation : uchar;
 namespace Data {
 class PhotoMedia;
 class DocumentMedia;
+enum class StorySourcesList : uchar;
 } // namespace Data
 
 namespace Ui {
@@ -306,6 +307,7 @@ private:
 	struct StoriesContext {
 		not_null<PeerData*> peer;
 		StoryId id = 0;
+		Data::StorySourcesList list = {};
 	};
 	void setContext(std::variant<
 		v::null_t,
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index b30e9dd13..793964d9e 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2466,28 +2466,33 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 
 void SessionController::openPeerStory(
 		not_null<PeerData*> peer,
-		StoryId storyId) {
+		StoryId storyId,
+		Data::StorySourcesList list) {
 	using namespace Media::View;
 	using namespace Data;
 
 	auto &stories = session().data().stories();
 	if (const auto from = stories.lookup({ peer->id, storyId })) {
-		window().openInMediaView(OpenRequest(this, *from));
+		window().openInMediaView(OpenRequest(this, *from, list));
 	}
 }
 
-void SessionController::openPeerStories(PeerId peerId) {
+void SessionController::openPeerStories(
+		PeerId peerId,
+		Data::StorySourcesList list) {
 	using namespace Media::View;
 	using namespace Data;
 
 	auto &stories = session().data().stories();
 	const auto &all = stories.all();
-	const auto i = ranges::find(all, peerId, [](const StoriesList &list) {
-		return list.user->id;
-	});
-	if (i != end(all) && !i->ids.empty()) {
-		const auto j = i->ids.lower_bound(i->readTill + 1);
-		openPeerStory(i->user, j != i->ids.end() ? *j : i->ids.front());
+	const auto i = all.find(peerId);
+	if (i != end(all)) {
+		const auto j = i->second.ids.lower_bound(
+			StoryIdDate{ i->second.readTill + 1 });
+		openPeerStory(
+			i->second.user,
+			j != i->second.ids.end() ? j->id : i->second.ids.front().id,
+			list);
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 07f763ca8..589169655 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -29,6 +29,10 @@ namespace Adaptive {
 enum class WindowLayout;
 } // namespace Adaptive
 
+namespace Data {
+enum class StorySourcesList : uchar;
+} // namespace Data
+
 namespace ChatHelpers {
 class TabbedSelector;
 class EmojiInteractions;
@@ -564,8 +568,11 @@ public:
 		return _peerThemeOverride.value();
 	}
 
-	void openPeerStory(not_null<PeerData*> peer, StoryId storyId);
-	void openPeerStories(PeerId peerId);
+	void openPeerStory(
+		not_null<PeerData*> peer,
+		StoryId storyId,
+		Data::StorySourcesList list);
+	void openPeerStories(PeerId peerId, Data::StorySourcesList list);
 
 	struct PaintContextArgs {
 		not_null<Ui::ChatTheme*> theme;

From e7c0385aea8ddaca856a16b18e6958b0d021e586 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 2 Jun 2023 21:14:15 +0400
Subject: [PATCH 276/676] Show hidden stories above contacts list.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 .../boxes/peer_list_controllers.cpp           | 48 +++++++++++++++-
 Telegram/SourceFiles/data/data_stories.cpp    | 56 ++++++++++++++++++-
 Telegram/SourceFiles/data/data_stories.h      |  2 +
 .../dialogs/dialogs_inner_widget.cpp          | 15 +----
 .../dialogs/ui/dialogs_stories_content.cpp    |  1 +
 .../dialogs/ui/dialogs_stories_list.cpp       | 20 ++++---
 .../dialogs/ui/dialogs_stories_list.h         |  2 +
 .../media/view/media_view_overlay_widget.cpp  |  6 +-
 9 files changed, 130 insertions(+), 22 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 892983de5..220683f8e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3789,6 +3789,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_userpic_builder_color_subtitle" = "Choose background";
 "lng_userpic_builder_emoji_subtitle" = "Choose sticker or emoji";
 
+"lng_stories_hide_to_contacts" = "Archive";
+"lng_stories_show_in_chats" = "Unarchive";
 "lng_stories_row_count#one" = "{count} Story";
 "lng_stories_row_count#other" = "{count} Stories";
 "lng_stories_row_unread_and_one" = "{accumulated}, {user}";
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 0679d4dc9..dc757dc81 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -37,6 +37,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_profile.h"
 #include "styles/style_dialogs.h"
 
+#include "data/data_stories.h"
+#include "dialogs/ui/dialogs_stories_content.h"
+#include "dialogs/ui/dialogs_stories_list.h"
+
+
 namespace {
 
 constexpr auto kSortByOnlineThrottle = 3 * crl::time(1000);
@@ -51,10 +56,14 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		&sessionController->session());
 	const auto raw = controller.get();
 	auto init = [=](not_null<PeerListBox*> box) {
+		using namespace Dialogs;
+
 		struct State {
-			QPointer<Ui::IconButton> toggleSort;
+			Stories::List *stories = nullptr;
+			QPointer<::Ui::IconButton> toggleSort;
 			Mode mode = ContactsBoxController::SortMode::Online;
 		};
+
 		const auto state = box->lifetime().make_state<State>();
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 		box->addLeftButton(
@@ -69,6 +78,43 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 				online ? &st::contactsSortOnlineIconOver : nullptr);
 		});
 		raw->setSortMode(Mode::Online);
+
+		auto stories = object_ptr<Stories::List>(
+			box,
+			Stories::ContentForSession(
+				&sessionController->session(),
+				Data::StorySourcesList::All),
+			[=] { return state->stories->height() - box->scrollTop(); });
+		const auto raw = state->stories = stories.data();
+		box->peerListSetAboveWidget(std::move(stories));
+
+		raw->entered(
+		) | rpl::start_with_next([=] {
+			//clearSelection();
+		}, raw->lifetime());
+
+		raw->clicks(
+		) | rpl::start_with_next([=](uint64 id) {
+			sessionController->openPeerStories(PeerId(int64(id)), {});
+		}, raw->lifetime());
+
+		raw->showProfileRequests(
+		) | rpl::start_with_next([=](uint64 id) {
+			sessionController->showPeerInfo(PeerId(int64(id)));
+		}, raw->lifetime());
+
+		raw->toggleShown(
+		) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
+			sessionController->session().data().stories().toggleHidden(
+				PeerId(int64(request.id)),
+				!request.shown);
+		}, raw->lifetime());
+
+		raw->loadMoreRequests(
+		) | rpl::start_with_next([=] {
+			sessionController->session().data().stories().loadMore(
+				Data::StorySourcesList::All);
+		}, raw->lifetime());
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(init));
 }
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index a3f17a0da..b801dad8d 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -350,9 +350,11 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 	const auto peerId = peerFromUser(data.vuser_id());
 	const auto readTill = data.vmax_read_id().value_or_empty();
 	const auto count = int(data.vstories().v.size());
+	const auto user = _owner->peer(peerId)->asUser();
 	auto result = StoriesSource{
-		.user = _owner->peer(peerId)->asUser(),
+		.user = user,
 		.readTill = readTill,
+		.hidden = user->hasStoriesHidden(),
 	};
 	const auto &list = data.vstories().v;
 	result.ids.reserve(list.size());
@@ -806,6 +808,58 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 	_markReadTimer.callOnce(kMarkAsReadDelay);
 }
 
+void Stories::toggleHidden(PeerId peerId, bool hidden) {
+	const auto user = _owner->peer(peerId)->asUser();
+	Assert(user != nullptr);
+	if (user->hasStoriesHidden() != hidden) {
+		user->setFlags(hidden
+			? (user->flags() | UserDataFlag::StoriesHidden)
+			: (user->flags() & ~UserDataFlag::StoriesHidden));
+		session().api().request(MTPcontacts_ToggleStoriesHidden(
+			user->inputUser,
+			MTP_bool(hidden)
+		)).send();
+	}
+
+	const auto i = _all.find(peerId);
+	if (i == end(_all)) {
+		return;
+	}
+	i->second.hidden = hidden;
+	const auto main = static_cast<int>(StorySourcesList::NotHidden);
+	const auto all = static_cast<int>(StorySourcesList::All);
+	if (hidden) {
+		const auto i = ranges::find(
+			_sources[main],
+			peerId,
+			&StoriesSourceInfo::id);
+		if (i != end(_sources[main])) {
+			_sources[main].erase(i);
+			_sourcesChanged[main].fire({});
+		}
+		const auto j = ranges::find(_sources[all], peerId, &StoriesSourceInfo::id);
+		if (j != end(_sources[all])) {
+			j->hidden = hidden;
+			_sourcesChanged[all].fire({});
+		}
+	} else {
+		const auto i = ranges::find(
+			_sources[all],
+			peerId,
+			&StoriesSourceInfo::id);
+		if (i != end(_sources[all])) {
+			i->hidden = hidden;
+			_sourcesChanged[all].fire({});
+
+			auto &sources = _sources[main];
+			if (!ranges::contains(sources, peerId, &StoriesSourceInfo::id)) {
+				sources.push_back(*i);
+				sort(StorySourcesList::NotHidden);
+			}
+		}
+	}
+}
+
 void Stories::sendMarkAsReadRequest(
 		not_null<PeerData*> peer,
 		StoryId tillId) {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index dc7b99141..ded86dce3 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -176,6 +176,8 @@ public:
 	[[nodiscard]] bool isQuitPrevent();
 	void markAsRead(FullStoryId id, bool viewed);
 
+	void toggleHidden(PeerId peerId, bool hidden);
+
 	static constexpr auto kViewsPerPage = 50;
 	void loadViewsSlice(
 		StoryId id,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index fb15560a3..cb559842e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -351,18 +351,9 @@ InnerWidget::InnerWidget(
 
 	_stories->toggleShown(
 	) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
-		const auto peerId = PeerId(int64(request.id));
-		const auto user = session().data().peer(peerId)->asUser();
-		Assert(user != nullptr);
-		if (user->hasStoriesHidden() == request.shown) {
-			user->setFlags(request.shown
-				? (user->flags() & ~UserDataFlag::StoriesHidden)
-				: (user->flags() | UserDataFlag::StoriesHidden));
-			session().api().request(MTPcontacts_ToggleStoriesHidden(
-				user->inputUser,
-				MTP_bool(!request.shown)
-			)).send();
-		}
+		session().data().stories().toggleHidden(
+			PeerId(int64(request.id)),
+			!request.shown);
 	}, lifetime());
 
 	_stories->loadMoreRequests(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 37016cfa5..bb9fd7578 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -149,6 +149,7 @@ Content State::next() {
 			.name = user->shortName(),
 			.userpic = std::move(userpic),
 			.unread = info.unread,
+			.hidden = info.hidden,
 		});
 	}
 	return result;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 5b2e24b08..78a3dc3a3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -99,6 +99,7 @@ void List::showContent(Content &&content) {
 				item.nameCache = QImage();
 			}
 			item.user.unread = user.unread;
+			item.user.hidden = user.hidden;
 		} else {
 			_data.items.emplace_back(Item{ .user = user });
 		}
@@ -429,8 +430,8 @@ void List::paintEvent(QPaintEvent *e) {
 			});
 			p.setBrush(gradient);
 			p.drawEllipse(outer);
-			p.setOpacity(1.);
 		}
+		p.setOpacity(1.);
 	}, [&](Single single) {
 		Expects(single.itemSmall || single.itemFull);
 
@@ -710,19 +711,24 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 
 	const auto id = item.user.id;
 	const auto hidden = item.user.hidden;
-	_menu->addAction(u"View Profile"_q, [=] {
+	_menu->addAction(tr::lng_context_view_profile(tr::now), [=] {
 		_showProfileRequests.fire_copy(id);
 	});
-	_menu->addAction(hidden ? u"Show in Chats"_q : u"Hide"_q, [=] {
-		_toggleShown.fire({ .id = id, .shown = hidden });
-	});
-	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
+	_menu->addAction(hidden
+		? tr::lng_stories_show_in_chats(tr::now)
+		: tr::lng_stories_hide_to_contacts(tr::now),
+		[=] { _toggleShown.fire({ .id = id, .shown = hidden }); });
+	const auto updateAfterMenuDestroyed = [=] {
 		const auto globalPosition = QCursor::pos();
 		if (rect().contains(mapFromGlobal(globalPosition))) {
 			_lastMousePosition = globalPosition;
 			updateSelected();
 		}
-	});
+	};
+	QObject::connect(
+		_menu.get(),
+		&QObject::destroyed,
+		crl::guard(&_menuGuard, updateAfterMenuDestroyed));
 	if (_menu->empty()) {
 		_menu = nullptr;
 	} else {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index fd1dc3d5b..6789765db 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/qt/qt_compare.h"
+#include "base/weak_ptr.h"
 #include "ui/rp_widget.h"
 
 class QPainter;
@@ -160,6 +161,7 @@ private:
 	int _pressed = -1;
 
 	base::unique_qptr<Ui::PopupMenu> _menu;
+	base::has_weak_ptr _menuGuard;
 
 };
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 00bb0f645..75c7a43bb 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3061,7 +3061,11 @@ void OverlayWidget::show(OpenRequest request) {
 		setSession(&photo->session());
 
 		if (story) {
-			setContext(StoriesContext{ story->peer(), story->id() });
+			setContext(StoriesContext{
+				story->peer(),
+				story->id(),
+				request.storiesList(),
+			});
 		} else if (contextPeer) {
 			setContext(contextPeer);
 		} else if (contextItem) {

From b71d72ca7c028e0cf5a7c34f481c515c480f03da Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 5 Jun 2023 16:10:34 +0400
Subject: [PATCH 277/676] Allow showing stories in different contexts.

---
 .../boxes/peer_list_controllers.cpp           |   4 +-
 Telegram/SourceFiles/data/data_stories.cpp    |   8 +-
 Telegram/SourceFiles/data/data_stories.h      |  28 ++++-
 .../dialogs/ui/dialogs_stories_content.cpp    |   2 +-
 .../dialogs/ui/dialogs_stories_list.cpp       |  15 +--
 .../dialogs/ui/dialogs_stories_list.h         |   1 +
 .../SourceFiles/ffmpeg/ffmpeg_utility.cpp     |   5 +-
 .../stories/media_stories_controller.cpp      | 101 +++++++++++-------
 .../media/stories/media_stories_controller.h  |   4 +-
 .../media/stories/media_stories_delegate.h    |   7 +-
 .../media/stories/media_stories_view.cpp      |   6 +-
 .../media/stories/media_stories_view.h        |   4 +-
 .../media/streaming/media_streaming_common.h  |   2 +
 .../media/streaming/media_streaming_file.cpp  |  42 +++++---
 .../media/streaming/media_streaming_file.h    |  16 +--
 .../streaming/media_streaming_player.cpp      |  10 +-
 .../media/view/media_view_open_common.h       |  20 ++--
 .../media/view/media_view_overlay_widget.cpp  |  43 ++++++--
 .../media/view/media_view_overlay_widget.h    |  16 +--
 .../window/window_session_controller.cpp      |   6 +-
 .../window/window_session_controller.h        |   3 +-
 21 files changed, 231 insertions(+), 112 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index dc757dc81..7fa6e5384 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -95,7 +95,9 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 
 		raw->clicks(
 		) | rpl::start_with_next([=](uint64 id) {
-			sessionController->openPeerStories(PeerId(int64(id)), {});
+			sessionController->openPeerStories(
+				PeerId(int64(id)),
+				Data::StorySourcesList::All);
 		}, raw->lifetime());
 
 		raw->showProfileRequests(
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index b801dad8d..69b14f0a7 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -744,7 +744,13 @@ void Stories::resolve(FullStoryId id, Fn<void()> done) {
 	}
 }
 
-void Stories::loadAround(FullStoryId id) {
+void Stories::loadAround(FullStoryId id, StoriesContext context) {
+	if (v::is<StoriesContextSingle>(context.data)) {
+		return;
+	} else if (v::is<StoriesContextSaved>(context.data)
+		|| v::is<StoriesContextArchive>(context.data)) {
+		return;
+	}
 	const auto i = _all.find(id.peer);
 	if (i == end(_all)) {
 		return;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index ded86dce3..f8f152b77 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -139,6 +139,32 @@ enum class StorySourcesList : uchar {
 	All,
 };
 
+struct StoriesContextSingle {
+};
+
+struct StoriesContextPeer {
+};
+
+struct StoriesContextSaved {
+};
+
+struct StoriesContextArchive {
+};
+
+struct StoriesContext {
+	std::variant<
+		StoriesContextSingle,
+		StoriesContextPeer,
+		StoriesContextSaved,
+		StoriesContextArchive,
+		StorySourcesList> data;
+
+	friend inline auto operator<=>(
+		StoriesContext,
+		StoriesContext) = default;
+	friend inline bool operator==(StoriesContext, StoriesContext) = default;
+};
+
 inline constexpr auto kStorySourcesListCount = 2;
 
 class Stories final {
@@ -159,7 +185,7 @@ public:
 
 	void loadMore(StorySourcesList list);
 	void apply(const MTPDupdateStory &data);
-	void loadAround(FullStoryId id);
+	void loadAround(FullStoryId id, StoriesContext context);
 
 	[[nodiscard]] const base::flat_map<PeerId, StoriesSource> &all() const;
 	[[nodiscard]] const std::vector<StoriesSourceInfo> &sources(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index bb9fd7578..830950416 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -127,7 +127,7 @@ State::State(not_null<Data::Stories*> data, Data::StorySourcesList list)
 }
 
 Content State::next() {
-	auto result = Content();
+	auto result = Content{ .full = (_list == Data::StorySourcesList::All) };
 	const auto &all = _data->all();
 	const auto &sources = _data->sources(_list);
 	result.users.reserve(sources.size());
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 78a3dc3a3..ec470a92d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -265,7 +265,8 @@ List::Layout List::computeLayout() const {
 		+ st::defaultDialogRow.photoSize
 		+ st::defaultDialogRow.padding.left();
 	const auto narrow = (width() <= narrowWidth);
-	const auto smallWidth = st.photo + (itemsCount - 1) * st.shift;
+	const auto smallCount = std::min(kSmallUserpicsShown, itemsCount);
+	const auto smallWidth = st.photo + (smallCount - 1) * st.shift;
 	const auto leftSmall = narrow
 		? ((narrowWidth - smallWidth) / 2 - st.photoLeft)
 		: st.left;
@@ -278,7 +279,7 @@ List::Layout List::computeLayout() const {
 		(width() - leftFull + singleFull - 1) / singleFull,
 		itemsCount);
 	const auto startIndexSmall = 0;
-	const auto endIndexSmall = std::min(kSmallUserpicsShown, itemsCount);
+	const auto endIndexSmall = smallCount;
 	const auto cellLeftSmall = leftSmall;
 	const auto userpicLeftFull = cellLeftFull + full.photoLeft;
 	const auto userpicLeftSmall = cellLeftSmall + st.photoLeft;
@@ -714,10 +715,12 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 	_menu->addAction(tr::lng_context_view_profile(tr::now), [=] {
 		_showProfileRequests.fire_copy(id);
 	});
-	_menu->addAction(hidden
-		? tr::lng_stories_show_in_chats(tr::now)
-		: tr::lng_stories_hide_to_contacts(tr::now),
-		[=] { _toggleShown.fire({ .id = id, .shown = hidden }); });
+	if (!_content.full || hidden) {
+		_menu->addAction(hidden
+			? tr::lng_stories_show_in_chats(tr::now)
+			: tr::lng_stories_hide_to_contacts(tr::now),
+			[=] { _toggleShown.fire({ .id = id, .shown = hidden }); });
+	}
 	const auto updateAfterMenuDestroyed = [=] {
 		const auto globalPosition = QCursor::pos();
 		if (rect().contains(mapFromGlobal(globalPosition))) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 6789765db..4221dcbc3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -37,6 +37,7 @@ struct User {
 
 struct Content {
 	std::vector<User> users;
+	bool full = false;
 
 	friend inline bool operator==(
 		const Content &a,
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index a674a4b82..d1642c0d4 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -230,6 +230,7 @@ FormatPointer MakeFormatPointer(
 	if (!io) {
 		return {};
 	}
+	io->seekable = (seek != nullptr);
 	auto result = avformat_alloc_context();
 	if (!result) {
 		LogError(u"avformat_alloc_context"_q);
@@ -250,7 +251,9 @@ FormatPointer MakeFormatPointer(
 		LogError(u"avformat_open_input"_q, error);
 		return {};
 	}
-	result->flags |= AVFMT_FLAG_FAST_SEEK;
+	if (seek) {
+		result->flags |= AVFMT_FLAG_FAST_SEEK;
+	}
 
 	// Now FormatPointer will own and free the IO context.
 	io.release();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 716da7fee..c343a6214 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -387,29 +387,54 @@ auto Controller::stickerOrEmojiChosen() const
 
 void Controller::show(
 		not_null<Data::Story*> story,
-		Data::StorySourcesList list) {
+		Data::StoriesContext context) {
+	using namespace Data;
+
 	auto &stories = story->owner().stories();
-	const auto &all = stories.all();
-	const auto &sources = stories.sources(list);
 	const auto storyId = story->fullId();
 	const auto id = storyId.story;
-	const auto i = ranges::find(
-		sources,
-		storyId.peer,
-		&Data::StoriesSourceInfo::id);
-	if (i == end(sources)) {
+	const auto &all = stories.all();
+	const auto inAll = all.find(storyId.peer);
+	auto source = (inAll != end(all)) ? &inAll->second : nullptr;
+	auto single = StoriesSource{ story->peer()->asUser() };
+	v::match(context.data, [&](StoriesContextSingle) {
+		source = &single;
+		hideSiblings();
+	}, [&](StoriesContextPeer) {
+		hideSiblings();
+	}, [&](StoriesContextSaved) {
+		hideSiblings();
+	}, [&](StoriesContextArchive) {
+		hideSiblings();
+	}, [&](StorySourcesList list) {
+		const auto &sources = stories.sources(list);
+		const auto i = ranges::find(
+			sources,
+			storyId.peer,
+			&StoriesSourceInfo::id);
+		if (i == end(sources)) {
+			source = nullptr;
+			return;
+		}
+		showSiblings(&story->session(), sources, (i - begin(sources)));
+
+		if (int(sources.end() - i) < kPreloadUsersCount) {
+			stories.loadMore(list);
+		}
+	});
+	const auto idDate = story->idDate();
+	if (!source) {
 		return;
+	} else if (source == &single) {
+		single.ids.emplace(idDate);
+		_index = 0;
+	} else {
+		const auto k = source->ids.find(idDate);
+		if (k == end(source->ids)) {
+			return;
+		}
+		_index = (k - begin(source->ids));
 	}
-	const auto j = all.find(storyId.peer);
-	if (j == end(all)) {
-		return;
-	}
-	const auto &source = j->second;
-	const auto k = source.ids.lower_bound(Data::StoryIdDate{ id });
-	if (k == end(source.ids) || k->id != id) {
-		return;
-	}
-	showSiblings(&story->session(), sources, (i - begin(sources)));
 	const auto guard = gsl::finally([&] {
 		_paused = false;
 		_started = false;
@@ -419,12 +444,11 @@ void Controller::show(
 			_photoPlayback = nullptr;
 		}
 	});
-	if (_source != source) {
-		_source = source;
+	if (_source != *source) {
+		_source = *source;
 	}
-	_index = (k - begin(source.ids));
+	_context = context;
 	_waitingForId = {};
-
 	if (_shown == storyId) {
 		return;
 	}
@@ -436,13 +460,13 @@ void Controller::show(
 		unfocusReply();
 	}
 
-	_header->show({ .user = source.user, .date = story->date() });
-	_slider->show({ .index = _index, .total = int(source.ids.size()) });
-	_replyArea->show({ .user = source.user, .id = id });
+	_header->show({ .user = source->user, .date = story->date() });
+	_slider->show({ .index = _index, .total = int(source->ids.size()) });
+	_replyArea->show({ .user = source->user, .id = id });
 	_recentViews->show({
 		.list = story->recentViewers(),
 		.total = story->views(),
-		.valid = source.user->isSelf(),
+		.valid = source->user->isSelf(),
 	});
 
 	const auto session = &story->session();
@@ -463,13 +487,10 @@ void Controller::show(
 		}, _sessionLifetime);
 	}
 
-	if (int(sources.end() - i) < kPreloadUsersCount) {
-		stories.loadMore(list);
-	}
-	stories.loadAround(storyId);
+	stories.loadAround(storyId, context);
 
 	updatePlayingAllowed();
-	source.user->updateFull();
+	source->user->updateFull();
 }
 
 void Controller::updatePlayingAllowed() {
@@ -509,6 +530,11 @@ void Controller::showSiblings(
 		(index + 1 < sources.size()) ? sources[index + 1].id : PeerId());
 }
 
+void Controller::hideSiblings() {
+	_siblingLeft = nullptr;
+	_siblingRight = nullptr;
+}
+
 void Controller::showSibling(
 		std::unique_ptr<Sibling> &sibling,
 		not_null<Main::Session*> session,
@@ -616,10 +642,10 @@ void Controller::subjumpTo(int index) {
 	};
 	auto &stories = _source->user->owner().stories();
 	if (stories.lookup(id)) {
-		_delegate->storiesJumpTo(&_source->user->session(), id);
+		_delegate->storiesJumpTo(&_source->user->session(), id, _context);
 	} else if (_waitingForId != id) {
 		_waitingForId = id;
-		stories.loadAround(id);
+		stories.loadAround(id, _context);
 	}
 }
 
@@ -637,7 +663,8 @@ void Controller::checkWaitingFor() {
 	}
 	_delegate->storiesJumpTo(
 		&_source->user->session(),
-		base::take(_waitingForId));
+		base::take(_waitingForId),
+		_context);
 }
 
 bool Controller::jumpFor(int delta) {
@@ -645,7 +672,8 @@ bool Controller::jumpFor(int delta) {
 		if (const auto left = _siblingLeft.get()) {
 			_delegate->storiesJumpTo(
 				&left->peer()->session(),
-				left->shownId());
+				left->shownId(),
+				_context);
 			return true;
 		}
 	} else if (delta == 1) {
@@ -655,7 +683,8 @@ bool Controller::jumpFor(int delta) {
 		if (const auto right = _siblingRight.get()) {
 			_delegate->storiesJumpTo(
 				&right->peer()->session(),
-				right->shownId());
+				right->shownId(),
+				_context);
 			return true;
 		}
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index d6081d84b..4fd02ac39 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -99,7 +99,7 @@ public:
 	[[nodiscard]] auto stickerOrEmojiChosen() const
 	-> rpl::producer<ChatHelpers::FileChosen>;
 
-	void show(not_null<Data::Story*> story, Data::StorySourcesList list);
+	void show(not_null<Data::Story*> story, Data::StoriesContext context);
 	void ready();
 
 	void updateVideoPlayback(const Player::TrackState &state);
@@ -137,6 +137,7 @@ private:
 	void updatePlayingAllowed();
 	void setPlayingAllowed(bool allowed);
 
+	void hideSiblings();
 	void showSiblings(
 		not_null<Main::Session*> session,
 		const std::vector<Data::StoriesSourceInfo> &lists,
@@ -178,6 +179,7 @@ private:
 
 	FullStoryId _shown;
 	TextWithEntities _captionText;
+	Data::StoriesContext _context;
 	std::optional<Data::StoriesSource> _source;
 	FullStoryId _waitingForId;
 	int _index = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index 549788c84..9f8d7ce4d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -12,6 +12,10 @@ class Show;
 struct FileChosen;
 } // namespace ChatHelpers
 
+namespace Data {
+struct StoriesContext;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -41,7 +45,8 @@ public:
 		-> rpl::producer<ChatHelpers::FileChosen> = 0;
 	virtual void storiesJumpTo(
 		not_null<Main::Session*> session,
-		FullStoryId id) = 0;
+		FullStoryId id,
+		Data::StoriesContext context) = 0;
 	virtual void storiesClose() = 0;
 	[[nodiscard]] virtual bool storiesPaused() = 0;
 	[[nodiscard]] virtual rpl::producer<bool> storiesLayerShown() = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 0fbc38721..de254b870 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -22,8 +22,10 @@ View::View(not_null<Delegate*> delegate)
 
 View::~View() = default;
 
-void View::show(not_null<Data::Story*> story, Data::StorySourcesList list) {
-	_controller->show(story, list);
+void View::show(
+		not_null<Data::Story*> story,
+		Data::StoriesContext context) {
+	_controller->show(story, context);
 }
 
 void View::ready() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index a671bdbde..b25011de5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Data {
 class Story;
-enum class StorySourcesList : uchar;
+struct StoriesContext;
 struct FileOrigin;
 } // namespace Data
 
@@ -53,7 +53,7 @@ public:
 	explicit View(not_null<Delegate*> delegate);
 	~View();
 
-	void show(not_null<Data::Story*> story, Data::StorySourcesList list);
+	void show(not_null<Data::Story*> story, Data::StoriesContext context);
 	void ready();
 
 	[[nodiscard]] bool canDownload() const;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_common.h b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
index d1abf2011..f91afead2 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_common.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
@@ -40,11 +40,13 @@ enum class Mode {
 struct PlaybackOptions {
 	Mode mode = Mode::Both;
 	crl::time position = 0;
+	crl::time durationOverride = 0;
 	float64 speed = 1.; // Valid values between 0.5 and 2.
 	AudioMsgId audioId;
 	bool syncVideoByAudio = true;
 	bool waitForMarkAsShown = false;
 	bool hwAllowed = false;
+	bool seekable = true;
 	bool loop = false;
 };
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
index 6a815e888..22427c2ff 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
@@ -150,7 +150,7 @@ Stream File::Context::initStream(
 		not_null<AVFormatContext*> format,
 		AVMediaType type,
 		Mode mode,
-		bool hwAllowed) {
+		StartOptions options) {
 	auto result = Stream();
 	const auto index = result.index = av_find_best_stream(
 		format,
@@ -171,7 +171,7 @@ Stream File::Context::initStream(
 		}
 		result.codec = FFmpeg::MakeCodecPointer({
 			.stream = info,
-			.hwAllowed = hwAllowed,
+			.hwAllowed = options.hwAllow,
 		});
 		if (!result.codec) {
 			return result;
@@ -196,7 +196,9 @@ Stream File::Context::initStream(
 		return result;
 	}
 	result.timeBase = info->time_base;
-	result.duration = (info->duration != AV_NOPTS_VALUE)
+	result.duration = options.durationOverride
+		? options.durationOverride
+		: (info->duration != AV_NOPTS_VALUE)
 		? FFmpeg::PtsToTime(info->duration, result.timeBase)
 		: UnreliableFormatDuration(format, info, mode)
 		? kTimeUnknown
@@ -269,17 +271,19 @@ std::variant<FFmpeg::Packet, FFmpeg::AvErrorWrap> File::Context::readPacket() {
 	return error;
 }
 
-void File::Context::start(crl::time position, bool hwAllow) {
+void File::Context::start(StartOptions options) {
+	Expects(options.seekable || !options.position);
+
 	auto error = FFmpeg::AvErrorWrap();
 
 	if (unroll()) {
 		return;
 	}
 	auto format = FFmpeg::MakeFormatPointer(
-		static_cast<void *>(this),
+		static_cast<void*>(this),
 		&Context::Read,
 		nullptr,
-		&Context::Seek);
+		options.seekable ? &Context::Seek : nullptr);
 	if (!format) {
 		return fail(Error::OpenFailed);
 	}
@@ -289,12 +293,20 @@ void File::Context::start(crl::time position, bool hwAllow) {
 	}
 
 	const auto mode = _delegate->fileOpenMode();
-	auto video = initStream(format.get(), AVMEDIA_TYPE_VIDEO, mode, hwAllow);
+	auto video = initStream(
+		format.get(),
+		AVMEDIA_TYPE_VIDEO,
+		mode,
+		options);
 	if (unroll()) {
 		return;
 	}
 
-	auto audio = initStream(format.get(), AVMEDIA_TYPE_AUDIO, mode, false);
+	auto audio = initStream(
+		format.get(),
+		AVMEDIA_TYPE_AUDIO,
+		mode,
+		options);
 	if (unroll()) {
 		return;
 	}
@@ -303,8 +315,11 @@ void File::Context::start(crl::time position, bool hwAllow) {
 	if (_reader->isRemoteLoader()) {
 		sendFullInCache(true);
 	}
-	if (video.codec || audio.codec) {
-		seekToPosition(format.get(), video.codec ? video : audio, position);
+	if (options.seekable && (video.codec || audio.codec)) {
+		seekToPosition(
+			format.get(),
+			video.codec ? video : audio,
+			options.position);
 	}
 	if (unroll()) {
 		return;
@@ -434,10 +449,7 @@ File::File(std::shared_ptr<Reader> reader)
 : _reader(std::move(reader)) {
 }
 
-void File::start(
-		not_null<FileDelegate*> delegate,
-		crl::time position,
-		bool hwAllow) {
+void File::start(not_null<FileDelegate*> delegate, StartOptions options) {
 	stop(true);
 
 	_reader->startStreaming();
@@ -445,7 +457,7 @@ void File::start(
 
 	_thread = std::thread([=, context = &*_context] {
 		crl::toggle_fp_exceptions(true);
-		context->start(position, hwAllow);
+		context->start(options);
 		while (!context->finished()) {
 			context->readNextPacket();
 		}
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.h b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
index 8ffea9430..38af45537 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
@@ -21,6 +21,13 @@ namespace Streaming {
 
 class FileDelegate;
 
+struct StartOptions {
+	crl::time position = 0;
+	crl::time durationOverride = 0;
+	bool seekable = true;
+	bool hwAllow = false;
+};
+
 class File final {
 public:
 	explicit File(std::shared_ptr<Reader> reader);
@@ -28,10 +35,7 @@ public:
 	File(const File &other) = delete;
 	File &operator=(const File &other) = delete;
 
-	void start(
-		not_null<FileDelegate*> delegate,
-		crl::time position,
-		bool hwAllow);
+	void start(not_null<FileDelegate*> delegate, StartOptions options);
 	void wake();
 	void stop(bool stillActive = false);
 
@@ -46,7 +50,7 @@ private:
 		Context(not_null<FileDelegate*> delegate, not_null<Reader*> reader);
 		~Context();
 
-		void start(crl::time position, bool hwAllow);
+		void start(StartOptions options);
 		void readNextPacket();
 
 		void interrupt();
@@ -79,7 +83,7 @@ private:
 			not_null<AVFormatContext *> format,
 			AVMediaType type,
 			Mode mode,
-			bool hwAllowed);
+			StartOptions options);
 		void seekToPosition(
 			not_null<AVFormatContext *> format,
 			const Stream &stream,
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index 6662ec862..d30566072 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -544,8 +544,16 @@ void Player::play(const PlaybackOptions &options) {
 	if (!Media::Audio::SupportsSpeedControl()) {
 		_options.speed = 1.;
 	}
+	if (!_options.seekable) {
+		_options.position = 0;
+	}
 	_stage = Stage::Initializing;
-	_file->start(delegate(), _options.position, _options.hwAllowed);
+	_file->start(delegate(), {
+		.position = _options.position,
+		.durationOverride = options.durationOverride,
+		.seekable = _options.seekable,
+		.hwAllow = _options.hwAllowed,
+	});
 }
 
 void Player::savePreviousReceivedTill(
diff --git a/Telegram/SourceFiles/media/view/media_view_open_common.h b/Telegram/SourceFiles/media/view/media_view_open_common.h
index aed2fde58..ff56af25d 100644
--- a/Telegram/SourceFiles/media/view/media_view_open_common.h
+++ b/Telegram/SourceFiles/media/view/media_view_open_common.h
@@ -8,17 +8,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_cloud_themes.h"
+#include "data/data_stories.h"
 
 class DocumentData;
 class PeerData;
 class PhotoData;
 class HistoryItem;
 
-namespace Data {
-class Story;
-enum class StorySourcesList : uchar;
-} // namespace Data
-
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -75,14 +71,10 @@ public:
 	OpenRequest(
 		Window::SessionController *controller,
 		not_null<Data::Story*> story,
-		Data::StorySourcesList list,
-		bool continueStreaming = false,
-		crl::time startTime = 0)
+		Data::StoriesContext context)
 	: _controller(controller)
 	, _story(story)
-	, _storiesList(list)
-	, _continueStreaming(continueStreaming)
-	, _startTime(startTime) {
+	, _storiesContext(context) {
 	}
 
 	[[nodiscard]] PeerData *peer() const {
@@ -108,8 +100,8 @@ public:
 	[[nodiscard]] Data::Story *story() const {
 		return _story;
 	}
-	[[nodiscard]] Data::StorySourcesList storiesList() const {
-		return _storiesList;
+	[[nodiscard]] Data::StoriesContext storiesContext() const {
+		return _storiesContext;
 	}
 
 	[[nodiscard]] std::optional<Data::CloudTheme> cloudTheme() const {
@@ -133,7 +125,7 @@ private:
 	DocumentData *_document = nullptr;
 	PhotoData *_photo = nullptr;
 	Data::Story *_story = nullptr;
-	Data::StorySourcesList _storiesList = {};
+	Data::StoriesContext _storiesContext;
 	PeerData *_peer = nullptr;
 	HistoryItem *_item = nullptr;
 	MsgId _topicRootId = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 75c7a43bb..2bbda9a43 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -287,6 +287,17 @@ struct OverlayWidget::PipWrap {
 	rpl::lifetime lifetime;
 };
 
+struct OverlayWidget::ItemContext {
+	not_null<HistoryItem*> item;
+	MsgId topicRootId = 0;
+};
+
+struct OverlayWidget::StoriesContext {
+	not_null<PeerData*> peer;
+	StoryId id = 0;
+	Data::StoriesContext within;
+};
+
 class OverlayWidget::Show final : public ChatHelpers::Show {
 public:
 	explicit Show(not_null<OverlayWidget*> widget) : _widget(widget) {
@@ -3064,7 +3075,7 @@ void OverlayWidget::show(OpenRequest request) {
 			setContext(StoriesContext{
 				story->peer(),
 				story->id(),
-				request.storiesList(),
+				request.storiesContext(),
 			});
 		} else if (contextPeer) {
 			setContext(contextPeer);
@@ -3085,7 +3096,11 @@ void OverlayWidget::show(OpenRequest request) {
 		setSession(&document->session());
 
 		if (story) {
-			setContext(StoriesContext{ story->peer(), story->id() });
+			setContext(StoriesContext{
+				story->peer(),
+				story->id(),
+				request.storiesContext(),
+			});
 		} else if (contextItem) {
 			setContext(ItemContext{ contextItem, contextTopicRootId });
 		} else {
@@ -3868,9 +3883,16 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 		_rotation = saved;
 		updateContentRect();
 	}
-	auto options = Streaming::PlaybackOptions();
-	options.position = position;
-	options.hwAllowed = Core::App().settings().hardwareAcceleratedVideo();
+	auto options = Streaming::PlaybackOptions{
+		.position = position,
+		.durationOverride = ((_stories
+			&& _document
+			&& _document->getDuration() > 0)
+			? (_document->getDuration() * crl::time(1000) + crl::time(999))
+			: crl::time(0)),
+		.hwAllowed = Core::App().settings().hardwareAcceleratedVideo(),
+		.seekable = !_stories,
+	};
 	if (!_streamed->withSound) {
 		options.mode = Streaming::Mode::Video;
 		options.loop = true;
@@ -4025,7 +4047,8 @@ auto OverlayWidget::storiesStickerOrEmojiChosen()
 
 void OverlayWidget::storiesJumpTo(
 		not_null<Main::Session*> session,
-		FullStoryId id) {
+		FullStoryId id,
+		Data::StoriesContext context) {
 	Expects(_stories != nullptr);
 	Expects(id.valid());
 
@@ -4035,7 +4058,11 @@ void OverlayWidget::storiesJumpTo(
 		return;
 	}
 	const auto story = *maybeStory;
-	setContext(StoriesContext{ story->peer(), story->id() });
+	setContext(StoriesContext{
+		story->peer(),
+		story->id(),
+		context,
+	});
 	clearStreaming();
 	_streamingStartPaused = false;
 	v::match(story->media().data, [&](not_null<PhotoData*> photo) {
@@ -4982,7 +5009,7 @@ void OverlayWidget::setContext(
 		const auto maybeStory = stories.lookup(
 			{ story->peer->id, story->id });
 		if (maybeStory) {
-			_stories->show(*maybeStory, story->list);
+			_stories->show(*maybeStory, story->within);
 		}
 	} else {
 		_message = nullptr;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 837678675..2085fef99 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -30,7 +30,7 @@ enum class activation : uchar;
 namespace Data {
 class PhotoMedia;
 class DocumentMedia;
-enum class StorySourcesList : uchar;
+struct StoriesContext;
 } // namespace Data
 
 namespace Ui {
@@ -134,6 +134,8 @@ private:
 	class Show;
 	struct Streamed;
 	struct PipWrap;
+	struct ItemContext;
+	struct StoriesContext;
 	class Renderer;
 	class RendererSW;
 	class RendererGL;
@@ -245,7 +247,8 @@ private:
 		-> rpl::producer<ChatHelpers::FileChosen> override;
 	void storiesJumpTo(
 		not_null<Main::Session*> session,
-		FullStoryId id) override;
+		FullStoryId id,
+		Data::StoriesContext context) override;
 	void storiesClose() override;
 	bool storiesPaused() override;
 	rpl::producer<bool> storiesLayerShown() override;
@@ -300,15 +303,6 @@ private:
 	Entity entityForItemId(const FullMsgId &itemId) const;
 	bool moveToEntity(const Entity &entity, int preloadDelta = 0);
 
-	struct ItemContext {
-		not_null<HistoryItem*> item;
-		MsgId topicRootId = 0;
-	};
-	struct StoriesContext {
-		not_null<PeerData*> peer;
-		StoryId id = 0;
-		Data::StorySourcesList list = {};
-	};
 	void setContext(std::variant<
 		v::null_t,
 		ItemContext,
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 793964d9e..fd26e5e28 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2467,13 +2467,13 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 void SessionController::openPeerStory(
 		not_null<PeerData*> peer,
 		StoryId storyId,
-		Data::StorySourcesList list) {
+		Data::StoriesContext context) {
 	using namespace Media::View;
 	using namespace Data;
 
 	auto &stories = session().data().stories();
 	if (const auto from = stories.lookup({ peer->id, storyId })) {
-		window().openInMediaView(OpenRequest(this, *from, list));
+		window().openInMediaView(OpenRequest(this, *from, context));
 	}
 }
 
@@ -2492,7 +2492,7 @@ void SessionController::openPeerStories(
 		openPeerStory(
 			i->second.user,
 			j != i->second.ids.end() ? j->id : i->second.ids.front().id,
-			list);
+			{ list });
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 589169655..5e1139ad1 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -30,6 +30,7 @@ enum class WindowLayout;
 } // namespace Adaptive
 
 namespace Data {
+struct StoriesContext;
 enum class StorySourcesList : uchar;
 } // namespace Data
 
@@ -571,7 +572,7 @@ public:
 	void openPeerStory(
 		not_null<PeerData*> peer,
 		StoryId storyId,
-		Data::StorySourcesList list);
+		Data::StoriesContext context);
 	void openPeerStories(PeerId peerId, Data::StorySourcesList list);
 
 	struct PaintContextArgs {

From aba84a6010690bf4d87f2441a75f09dd8c0841dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 5 Jun 2023 16:50:43 +0400
Subject: [PATCH 278/676] Update API scheme on layer 160: Duration.

---
 Telegram/SourceFiles/api/api_media.cpp        |  9 +++---
 Telegram/SourceFiles/api/api_ringtones.cpp    |  4 +--
 Telegram/SourceFiles/api/api_ringtones.h      |  2 +-
 .../SourceFiles/data/data_audio_msg_id.cpp    |  2 +-
 Telegram/SourceFiles/data/data_document.cpp   | 28 ++++++++-----------
 Telegram/SourceFiles/data/data_document.h     |  7 ++---
 .../export/data/export_data_types.cpp         |  2 +-
 .../history_view_voice_record_bar.cpp         |  1 -
 .../view/history_view_context_menu.cpp        |  4 +--
 .../view/media/history_view_document.cpp      | 20 +++++++------
 .../history/view/media/history_view_gif.cpp   |  6 ++--
 .../history/view/media/history_view_media.cpp |  2 +-
 .../inline_bot_layout_internal.cpp            | 14 ++++------
 .../media/clip/media_clip_reader.cpp          |  4 +--
 .../media/player/media_player_widget.cpp      |  2 +-
 .../streaming/media_streaming_player.cpp      |  4 +--
 .../media/view/media_view_overlay_widget.cpp  |  4 +--
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 11 +++++---
 .../SourceFiles/overview/overview_layout.cpp  | 14 ++++------
 .../SourceFiles/overview/overview_layout.h    |  3 +-
 .../SourceFiles/storage/localimageloader.cpp  |  2 +-
 .../storage/serialize_document.cpp            | 28 +++++++++++++------
 .../ui/chat/attach/attach_prepare.h           |  2 +-
 23 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_media.cpp b/Telegram/SourceFiles/api/api_media.cpp
index 72af0ba66..ec8c1e4b2 100644
--- a/Telegram/SourceFiles/api/api_media.cpp
+++ b/Telegram/SourceFiles/api/api_media.cpp
@@ -22,8 +22,7 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 	const auto dimensions = document->dimensions;
 	auto attributes = QVector<MTPDocumentAttribute>(1, filenameAttribute);
 	if (dimensions.width() > 0 && dimensions.height() > 0) {
-		const auto duration = document->getDuration();
-		if (duration >= 0 && !document->hasMimeType(u"image/gif"_q)) {
+		if (document->hasDuration() && !document->hasMimeType(u"image/gif"_q)) {
 			auto flags = MTPDdocumentAttributeVideo::Flags(0);
 			using VideoFlag = MTPDdocumentAttributeVideo::Flag;
 			if (document->isVideoMessage()) {
@@ -34,7 +33,7 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 			}
 			attributes.push_back(MTP_documentAttributeVideo(
 				MTP_flags(flags),
-				MTP_int(duration),
+				MTP_double(document->duration() / 1000.),
 				MTP_int(dimensions.width()),
 				MTP_int(dimensions.height()),
 				MTPint())); // preload_prefix_size
@@ -57,7 +56,7 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 			| MTPDdocumentAttributeAudio::Flag::f_performer;
 		attributes.push_back(MTP_documentAttributeAudio(
 			MTP_flags(flags),
-			MTP_int(song->duration),
+			MTP_int(document->duration() / 1000),
 			MTP_string(song->title),
 			MTP_string(song->performer),
 			MTPstring()));
@@ -66,7 +65,7 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 			| MTPDdocumentAttributeAudio::Flag::f_waveform;
 		attributes.push_back(MTP_documentAttributeAudio(
 			MTP_flags(flags),
-			MTP_int(voice->duration),
+			MTP_int(document->duration() / 1000),
 			MTPstring(),
 			MTPstring(),
 			MTP_bytes(documentWaveformEncode5bit(voice->waveform))));
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index d9ad40176..5b471851e 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -202,8 +202,8 @@ int Ringtones::maxSavedCount() const {
 		100);
 }
 
-int Ringtones::maxDuration() const {
-	return _session->account().appConfig().get<int>(
+crl::time Ringtones::maxDuration() const {
+	return crl::time(1000) * _session->account().appConfig().get<int>(
 		"ringtone_duration_max",
 		5);
 }
diff --git a/Telegram/SourceFiles/api/api_ringtones.h b/Telegram/SourceFiles/api/api_ringtones.h
index 08918a89e..ea97db349 100644
--- a/Telegram/SourceFiles/api/api_ringtones.h
+++ b/Telegram/SourceFiles/api/api_ringtones.h
@@ -40,7 +40,7 @@ public:
 
 	[[nodiscard]] int64 maxSize() const;
 	[[nodiscard]] int maxSavedCount() const;
-	[[nodiscard]] int maxDuration() const;
+	[[nodiscard]] crl::time maxDuration() const;
 
 private:
 	struct UploadedData {
diff --git a/Telegram/SourceFiles/data/data_audio_msg_id.cpp b/Telegram/SourceFiles/data/data_audio_msg_id.cpp
index 4c95989ac..d8365bee2 100644
--- a/Telegram/SourceFiles/data/data_audio_msg_id.cpp
+++ b/Telegram/SourceFiles/data/data_audio_msg_id.cpp
@@ -27,7 +27,7 @@ AudioMsgId::AudioMsgId(
 , _externalPlayId(externalPlayId)
 , _changeablePlaybackSpeed(_audio->isVoiceMessage()
 	|| _audio->isVideoMessage()
-	|| (_audio->getDuration() >= kMinLengthForChangeablePlaybackSpeed)) {
+	|| (_audio->duration() >= kMinLengthForChangeablePlaybackSpeed)) {
 	setTypeFromAudio();
 }
 
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 2adfe69e4..7af141841 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -326,6 +326,7 @@ Main::Session &DocumentData::session() const {
 
 void DocumentData::setattributes(
 		const QVector<MTPDocumentAttribute> &attributes) {
+	_duration = -1;
 	_flags &= ~(Flag::ImageType
 		| Flag::HasAttachedStickers
 		| Flag::UseTextColor
@@ -389,12 +390,12 @@ void DocumentData::setattributes(
 					: VideoDocument;
 				if (data.is_round_message()) {
 					_additional = std::make_unique<RoundData>();
-					round()->duration = data.vduration().v;
 				}
 			} else if (const auto info = sticker()) {
 				info->type = StickerType::Webm;
 			}
-			_duration = data.vduration().v;
+			_duration = crl::time(
+				base::SafeRound(data.vduration().v * 1000));
 			setMaybeSupportsStreaming(data.is_supports_streaming());
 			dimensions = QSize(data.vw().v, data.vh().v);
 		}, [&](const MTPDdocumentAttributeAudio &data) {
@@ -408,14 +409,14 @@ void DocumentData::setattributes(
 				}
 			}
 			if (const auto voiceData = voice() ? voice() : round()) {
-				voiceData->duration = data.vduration().v;
+				_duration = data.vduration().v * crl::time(1000);
 				voiceData->waveform = documentWaveformDecode(
 					data.vwaveform().value_or_empty());
 				voiceData->wavemax = voiceData->waveform.empty()
 					? uchar(0)
 					: *ranges::max_element(voiceData->waveform);
 			} else if (const auto songData = song()) {
-				songData->duration = data.vduration().v;
+				_duration = data.vduration().v * crl::time(1000);
 				songData->title = qs(data.vtitle().value_or_empty());
 				songData->performer = qs(data.vperformer().value_or_empty());
 				refreshPossibleCoverThumbnail();
@@ -1516,19 +1517,12 @@ bool DocumentData::isVideoFile() const {
 	return (type == VideoDocument);
 }
 
-TimeId DocumentData::getDuration() const {
-	if (const auto song = this->song()) {
-		return std::max(song->duration, 0);
-	} else if (const auto voice = this->voice()) {
-		return std::max(voice->duration, 0);
-	} else if (isAnimation() || isVideoFile()) {
-		return std::max(_duration, 0);
-	} else if (const auto sticker = this->sticker()) {
-		if (sticker->isWebm()) {
-			return std::max(_duration, 0);
-		}
-	}
-	return -1;
+crl::time DocumentData::duration() const {
+	return std::max(_duration, crl::time());
+}
+
+bool DocumentData::hasDuration() const {
+	return _duration >= 0;
 }
 
 bool DocumentData::isImage() const {
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index 42d49058d..b4bc0cad3 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -79,14 +79,12 @@ struct StickerData : public DocumentAdditionalData {
 };
 
 struct SongData : public DocumentAdditionalData {
-	int32 duration = 0;
 	QString title, performer;
 };
 
 struct VoiceData : public DocumentAdditionalData {
 	~VoiceData();
 
-	int duration = 0;
 	VoiceWaveform waveform;
 	char wavemax = 0;
 };
@@ -172,7 +170,8 @@ public:
 	[[nodiscard]] bool isGifv() const;
 	[[nodiscard]] bool isTheme() const;
 	[[nodiscard]] bool isSharedMediaMusic() const;
-	[[nodiscard]] TimeId getDuration() const;
+	[[nodiscard]] crl::time duration() const;
+	[[nodiscard]] bool hasDuration() const;
 	[[nodiscard]] bool isImage() const;
 	void recountIsImage();
 	[[nodiscard]] bool supportsStreaming() const;
@@ -356,10 +355,10 @@ private:
 	std::unique_ptr<Data::ReplyPreview> _replyPreview;
 	std::weak_ptr<Data::DocumentMedia> _media;
 	PhotoData *_goodThumbnailPhoto = nullptr;
+	crl::time _duration = -1;
 
 	Core::FileLocation _location;
 	std::unique_ptr<DocumentAdditionalData> _additional;
-	int32 _duration = -1;
 	mutable Flags _flags = kStreamingSupportedUnknown;
 	GoodThumbnailState _goodThumbnailState = GoodThumbnailState();
 	std::unique_ptr<FileLoader> _loader;
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 1b66a550f..7e0612860 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -295,7 +295,7 @@ void ParseAttributes(
 			}
 			result.width = data.vw().v;
 			result.height = data.vh().v;
-			result.duration = data.vduration().v;
+			result.duration = int(data.vduration().v);
 		}, [&](const MTPDdocumentAttributeAudio &data) {
 			if (data.is_voice()) {
 				result.isVoiceMessage = true;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 63e4f6ee8..c49495542 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -90,7 +90,6 @@ enum class FilterType {
 [[nodiscard]] std::unique_ptr<VoiceData> ProcessCaptureResult(
 		const ::Media::Capture::Result &data) {
 	auto voiceData = std::make_unique<VoiceData>();
-	voiceData->duration = Duration(data.samples);
 	voiceData->waveform = data.waveform;
 	voiceData->wavemax = voiceData->waveform.empty()
 		? uchar(0)
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 99ebf2929..2fd7c2ca8 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1199,11 +1199,11 @@ void AddSaveSoundForNotifications(
 	} else if (int(ringtones.list().size()) >= ringtones.maxSavedCount()) {
 		return;
 	} else if (const auto song = document->song()) {
-		if (song->duration > ringtones.maxDuration()) {
+		if (document->duration() > ringtones.maxDuration()) {
 			return;
 		}
 	} else if (const auto voice = document->voice()) {
-		if (voice->duration > ringtones.maxDuration()) {
+		if (document->duration() > ringtones.maxDuration()) {
 			return;
 		}
 	} else {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 19832fc23..d1ddb2b96 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -172,7 +172,7 @@ void PaintWaveform(
 		accumulate_max(result, st::normalFont->width(text));
 	};
 	add(FormatDownloadText(document->size, document->size));
-	const auto duration = document->getDuration();
+	const auto duration = document->duration() / 1000;
 	if (const auto song = document->song()) {
 		add(FormatPlayedText(duration, duration));
 		add(FormatDurationAndSizeText(duration, document->size));
@@ -1212,14 +1212,16 @@ bool Document::uploading() const {
 }
 
 void Document::setStatusSize(int64 newSize, TimeId realDuration) const {
-	TimeId duration = _data->isSong()
-		? _data->song()->duration
-		: (_data->isVoiceMessage()
-			? _data->voice()->duration
-			: _transcribedRound
-			? _data->round()->duration
-			: -1);
-	File::setStatusSize(newSize, _data->size, duration, realDuration);
+	const auto duration = (_data->isSong()
+		|| _data->isVoiceMessage()
+		|| _transcribedRound)
+		? _data->duration()
+		: -1;
+	File::setStatusSize(
+		newSize,
+		_data->size,
+		(duration >= 0) ? duration / 1000 : -1,
+		realDuration);
 	if (auto thumbed = Get<HistoryDocumentThumbed>()) {
 		if (_statusSize == Ui::FileStatusSizeReady) {
 			thumbed->link = tr::lng_media_download(tr::now).toUpper();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index a395f8f09..67e4c8f3f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -1600,12 +1600,12 @@ void Gif::setStatusSize(int64 newSize) const {
 		_statusText = Ui::FormatDurationText(-newSize - 1);
 	} else if (_data->isVideoMessage()) {
 		_statusSize = newSize;
-		_statusText = Ui::FormatDurationText(_data->getDuration());
+		_statusText = Ui::FormatDurationText(_data->duration() / 1000);
 	} else {
 		File::setStatusSize(
 			newSize,
 			_data->size,
-			_data->isVideoFile() ? _data->getDuration() : -2,
+			_data->isVideoFile() ? (_data->duration() / 1000) : -2,
 			0);
 	}
 }
@@ -1638,7 +1638,7 @@ void Gif::updateStatusText() const {
 			}
 			statusSize = -1 - int((state.length - position) / state.frequency + 1);
 		} else {
-			statusSize = -1 - _data->getDuration();
+			statusSize = -1 - (_data->duration() / 1000);
 		}
 	}
 	if (statusSize != _statusSize) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index da0f56871..22b5ef296 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -56,7 +56,7 @@ TimeId DurationForTimestampLinks(not_null<DocumentData*> document) {
 		&& !document->isVoiceMessage()) {
 		return TimeId(0);
 	}
-	return std::max(document->getDuration(), TimeId(0));
+	return std::max(document->duration(), crl::time(0)) / 1000;
 }
 
 QString TimestampLinkBase(
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index 2d77babdb..9cf84d338 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -88,8 +88,8 @@ int FileBase::content_height() const {
 
 int FileBase::content_duration() const {
 	if (const auto document = getShownDocument()) {
-		if (document->getDuration() > 0) {
-			return document->getDuration();
+		if (document->hasDuration()) {
+			return document->duration() / 1000;
 		}
 	}
 	return getResultDuration();
@@ -1143,12 +1143,10 @@ bool File::updateStatusText() const {
 	}
 
 	if (statusSize != _statusSize) {
-		TimeId duration = _document->isSong()
-			? _document->song()->duration
-			: (_document->isVoiceMessage()
-				? _document->voice()->duration
-				: -1);
-		setStatusSize(statusSize, _document->size, duration, realDuration);
+		const auto duration = _document->isSong()
+			? _document->duration()
+			: (_document->isVoiceMessage() ? _document->duration() : -1);
+		setStatusSize(statusSize, _document->size, (duration >= 0) ? (duration / 1000) : -1, realDuration);
 	}
 	return showPause;
 }
diff --git a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
index b7c429114..7227ef7bc 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
@@ -974,7 +974,7 @@ Ui::PreparedFileInformation PrepareForSending(
 	auto seekPositionMs = crl::time(0);
 	auto reader = std::make_unique<internal::FFMpegReaderImplementation>(&localLocation, &localData);
 	if (reader->start(internal::ReaderImplementation::Mode::Inspecting, seekPositionMs)) {
-		auto durationMs = reader->durationMs();
+		const auto durationMs = reader->durationMs();
 		if (durationMs > 0) {
 			result.isGifv = reader->isGifv();
 			result.isWebmSticker = reader->isWebmSticker();
@@ -994,7 +994,7 @@ Ui::PreparedFileInformation PrepareForSending(
 				if (hasAlpha && !result.isWebmSticker) {
 					result.thumbnail = Images::Opaque(std::move(result.thumbnail));
 				}
-				result.duration = static_cast<int>(durationMs / 1000);
+				result.duration = durationMs;
 			}
 
 			result.supportsStreaming = CheckStreamingSupport(
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index 0d375b603..d9be06b6d 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -632,7 +632,7 @@ void Widget::updateTimeText(const TrackState &state) {
 	} else if (state.length) {
 		display = state.length;
 	} else if (const auto song = document->song()) {
-		display = (song->duration * frequency);
+		display = (document->duration() * frequency) / 1000;
 	}
 
 	_lastDurationMs = (state.length * 1000LL) / frequency;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index d30566072..699cbdf58 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -954,9 +954,9 @@ Media::Player::TrackState Player::prepareLegacyState() const {
 
 	if (result.length == kTimeUnknown) {
 		const auto document = _options.audioId.audio();
-		const auto duration = document ? document->getDuration() : 0;
+		const auto duration = document ? document->duration() : 0;
 		if (duration > 0) {
-			result.length = duration * crl::time(1000);
+			result.length = duration;
 		} else {
 			result.length = std::max(crl::time(result.position), crl::time(0));
 		}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 2bbda9a43..1d1880c83 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3887,8 +3887,8 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 		.position = position,
 		.durationOverride = ((_stories
 			&& _document
-			&& _document->getDuration() > 0)
-			? (_document->getDuration() * crl::time(1000) + crl::time(999))
+			&& _document->hasDuration())
+			? _document->duration()
 			: crl::time(0)),
 		.hwAllowed = Core::App().settings().hardwareAcceleratedVideo(),
 		.seekable = !_stories,
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index f603e31ae..9e3340c1c 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -527,7 +527,7 @@ accountDaysTTL#b8d0afdf days:int = AccountDaysTTL;
 documentAttributeImageSize#6c37c15c w:int h:int = DocumentAttribute;
 documentAttributeAnimated#11b58939 = DocumentAttribute;
 documentAttributeSticker#6319d612 flags:# mask:flags.1?true alt:string stickerset:InputStickerSet mask_coords:flags.0?MaskCoords = DocumentAttribute;
-documentAttributeVideo#e9407793 flags:# round_message:flags.0?true supports_streaming:flags.1?true duration:int w:int h:int preload_prefix_size:flags.2?int = DocumentAttribute;
+documentAttributeVideo#d38ff1c2 flags:# round_message:flags.0?true supports_streaming:flags.1?true duration:double w:int h:int preload_prefix_size:flags.2?int = DocumentAttribute;
 documentAttributeAudio#9852f9c6 flags:# voice:flags.10?true duration:int title:flags.0?string performer:flags.1?string waveform:flags.2?bytes = DocumentAttribute;
 documentAttributeFilename#15590068 file_name:string = DocumentAttribute;
 documentAttributeHasStickers#9801d2f7 = DocumentAttribute;
@@ -1526,8 +1526,8 @@ sponsoredWebPage#3db8ec63 flags:# url:string site_name:string photo:flags.0?Phot
 storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long> = StoryViews;
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
-storyItemSkipped#a1d8cf8f id:int date:int = StoryItem;
-storyItem#8fcd96ac flags:# pinned:flags.5?true expired:flags.6?true id:int date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItemSkipped#693206a2 id:int date:int expire_date:int = StoryItem;
+storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
@@ -1547,6 +1547,8 @@ stories.storyViews#de9eed1d views:Vector<StoryViews> users:Vector<User> = storie
 inputReplyToMessage#9c5386e4 flags:# reply_to_msg_id:int top_msg_id:flags.0?int = InputReplyTo;
 inputReplyToStory#15b0f283 user_id:InputUser story_id:int = InputReplyTo;
 
+exportedStoryLink#3fc9053b link:string = ExportedStoryLink;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2082,7 +2084,7 @@ chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
 chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
-stories.sendStory#8b5c6986 flags:# pinned:flags.2?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long = Updates;
+stories.sendStory#424cd47a flags:# pinned:flags.2?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int = Updates;
 stories.editStory#2aae7a41 flags:# id:int media:flags.0?InputMedia caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
 stories.deleteStories#b5d501d7 id:Vector<int> = Vector<int>;
 stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
@@ -2095,3 +2097,4 @@ stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
 stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
 stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;
 stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
+stories.exportStoryLink#16e443ce user_id:InputUser id:int = ExportedStoryLink;
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 369a6ff5d..599dd8f1b 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -448,7 +448,7 @@ Video::Video(
 	bool spoiler)
 : RadialProgressItem(delegate, parent)
 , _data(video)
-, _duration(Ui::FormatDurationText(_data->getDuration()))
+, _duration(Ui::FormatDurationText(_data->duration() / 1000))
 , _spoiler(spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
 	delegate->repaintItem(this);
 }) : nullptr) {
@@ -693,7 +693,7 @@ Voice::Voice(
 			lt_date,
 			dateText,
 			lt_duration,
-			{ .text = Ui::FormatDurationText(duration()) },
+			{ .text = Ui::FormatDurationText(_data->duration() / 1000) },
 			Ui::Text::WithEntities));
 	_details.setLink(1, JumpToMessageClickHandler(parent));
 }
@@ -958,10 +958,6 @@ void Voice::updateName() {
 	_nameVersion = parent()->fromOriginal()->nameVersion();
 }
 
-int Voice::duration() const {
-	return std::max(_data->getDuration(), 0);
-}
-
 bool Voice::updateStatusText() {
 	auto showPause = false;
 	auto statusSize = int64();
@@ -983,7 +979,7 @@ bool Voice::updateStatusText() {
 	}
 
 	if (statusSize != _status.size()) {
-		_status.update(statusSize, _data->size, duration(), realDuration);
+		_status.update(statusSize, _data->size, _data->duration() / 1000, realDuration);
 	}
 	return showPause;
 }
@@ -1026,7 +1022,7 @@ Document::Document(
 	_status.update(
 		Ui::FileStatusSizeReady,
 		_data->size,
-		songLayout() ? _data->song()->duration : -1,
+		songLayout() ? (_data->duration() / 1000) : -1,
 		0);
 
 	if (withThumb()) {
@@ -1541,7 +1537,7 @@ bool Document::updateStatusText() {
 		_status.update(
 			statusSize,
 			_data->size,
-			isSong ? _data->song()->duration : -1,
+			isSong ? (_data->duration() / 1000) : -1,
 			realDuration);
 	}
 	return showPause;
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index e49dcc813..53dc9bdb0 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -339,9 +339,8 @@ protected:
 
 private:
 	void ensureDataMediaCreated() const;
-	int duration() const;
 
-	not_null<DocumentData*> _data;
+	const not_null<DocumentData*> _data;
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
 	StatusText _status;
 	ClickHandlerPtr _namel;
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 1516594a9..20a911d2e 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -868,7 +868,7 @@ void FileLoadTask::process(Args &&args) {
 			}
 			attributes.push_back(MTP_documentAttributeVideo(
 				MTP_flags(flags),
-				MTP_int(video->duration),
+				MTP_double(video->duration / 1000.),
 				MTP_int(coverWidth),
 				MTP_int(coverHeight),
 				MTPint())); // preload_prefix_size
diff --git a/Telegram/SourceFiles/storage/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp
index 04d8936e7..dd87b0c5f 100644
--- a/Telegram/SourceFiles/storage/serialize_document.cpp
+++ b/Telegram/SourceFiles/storage/serialize_document.cpp
@@ -18,7 +18,7 @@ namespace Serialize {
 namespace {
 
 constexpr auto kVersionTag = int32(0x7FFFFFFF);
-constexpr auto kVersion = 5;
+constexpr auto kVersion = 6;
 
 enum StickerSetType {
 	StickerSetTypeEmpty = 0,
@@ -58,7 +58,7 @@ void Document::writeToStream(QDataStream &stream, DocumentData *document) {
 			stream << qint32(StickerSetTypeEmpty);
 		}
 	}
-	stream << qint32(document->getDuration());
+	stream << qint64(document->hasDuration() ? document->duration() : -1);
 	if (document->type == StickerDocument) {
 		const auto premium = document->isPremiumSticker()
 			|| document->isPremiumEmoji();
@@ -110,15 +110,19 @@ DocumentData *Document::readFromStreamHelper(
 		attributes.push_back(MTP_documentAttributeFilename(MTP_string(name)));
 	}
 
-	qint32 duration = -1;
+	qint64 duration = -1;
 	qint32 isPremiumSticker = 0;
 	qint32 useTextColor = 0;
 	if (type == StickerDocument) {
 		QString alt;
 		qint32 typeOfSet;
 		stream >> alt >> typeOfSet;
-		if (version >= 3) {
-			stream >> duration;
+		if (version >= 6) {
+			stream >> duration >> isPremiumSticker >> useTextColor;
+		} else if (version >= 3) {
+			qint32 oldDuration = -1;
+			stream >> oldDuration;
+			duration = (oldDuration < 0) ? oldDuration : oldDuration * 1000;
 			if (version >= 4) {
 				stream >> isPremiumSticker;
 				if (version >= 5) {
@@ -166,7 +170,13 @@ DocumentData *Document::readFromStreamHelper(
 			}
 		}
 	} else {
-		stream >> duration;
+		if (version >= 6) {
+			stream >> duration;
+		} else {
+			qint32 oldDuration = -1;
+			stream >> oldDuration;
+			duration = (oldDuration < 0) ? oldDuration : oldDuration * 1000;
+		}
 		if (type == AnimatedDocument) {
 			attributes.push_back(MTP_documentAttributeAnimated());
 		}
@@ -194,12 +204,14 @@ DocumentData *Document::readFromStreamHelper(
 			}
 			attributes.push_back(MTP_documentAttributeVideo(
 				MTP_flags(flags),
-				MTP_int(duration),
+				MTP_double(duration / 1000.),
 				MTP_int(width),
 				MTP_int(height),
 				MTPint())); // preload_prefix_size
 		} else {
-			attributes.push_back(MTP_documentAttributeImageSize(MTP_int(width), MTP_int(height)));
+			attributes.push_back(MTP_documentAttributeImageSize(
+				MTP_int(width),
+				MTP_int(height)));
 		}
 	}
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index 727258f85..f78655c66 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -36,7 +36,7 @@ struct PreparedFileInformation {
 		bool isGifv = false;
 		bool isWebmSticker = false;
 		bool supportsStreaming = false;
-		int duration = -1;
+		crl::time duration = -1;
 		QImage thumbnail;
 	};
 

From 8eac04cb90b2b3e141d6e8047f163dc3f9f51d84 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 5 Jun 2023 19:23:49 +0400
Subject: [PATCH 279/676] Track and load ids of expired mine stories.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 293 +++++++++++++++---
 Telegram/SourceFiles/data/data_stories.h      |  53 +++-
 .../history/history_item_helpers.cpp          |   6 +-
 .../stories/media_stories_controller.cpp      |   6 +-
 .../SourceFiles/window/window_main_menu.cpp   |  32 ++
 .../window/window_session_controller.cpp      |   2 +-
 6 files changed, 331 insertions(+), 61 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 69b14f0a7..5eef52f69 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_stories.h"
 
+#include "base/unixtime.h"
 #include "api/api_text_entities.h"
 #include "apiwrap.h"
 #include "core/application.h"
@@ -32,6 +33,8 @@ constexpr auto kMaxResolveTogether = 100;
 constexpr auto kIgnorePreloadAroundIfLoaded = 15;
 constexpr auto kPreloadAroundCount = 30;
 constexpr auto kMarkAsReadDelay = 3 * crl::time(1000);
+constexpr auto kExpiredMineFirstPerPage = 30;
+constexpr auto kExpiredMinePerPage = 100;
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -80,11 +83,13 @@ Story::Story(
 	StoryId id,
 	not_null<PeerData*> peer,
 	StoryMedia media,
-	TimeId date)
+	TimeId date,
+	TimeId expires)
 : _id(id)
 , _peer(peer)
 , _media(std::move(media))
-, _date(date) {
+, _date(date)
+, _expires(expires) {
 }
 
 Session &Story::owner() const {
@@ -103,8 +108,12 @@ StoryId Story::id() const {
 	return _id;
 }
 
-StoryIdDate Story::idDate() const {
-	return { _id, _date };
+bool Story::mine() const {
+	return _peer->isSelf();
+}
+
+StoryIdDates Story::idDates() const {
+	return { _id, _date, _expires };
 }
 
 FullStoryId Story::fullId() const {
@@ -115,6 +124,14 @@ TimeId Story::date() const {
 	return _date;
 }
 
+TimeId Story::expires() const {
+	return _expires;
+}
+
+bool Story::expired(TimeId now) const {
+	return _expires <= (now ? now : base::unixtime::now());
+}
+
 const StoryMedia &Story::media() const {
 	return _media;
 }
@@ -276,6 +293,7 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 
 Stories::Stories(not_null<Session*> owner)
 : _owner(owner)
+, _expireTimer([=] { processExpired(); })
 , _markReadTimer([=] { sendMarkAsReadRequests(); }) {
 }
 
@@ -293,21 +311,27 @@ Main::Session &Stories::session() const {
 void Stories::apply(const MTPDupdateStory &data) {
 	const auto peerId = peerFromUser(data.vuser_id());
 	const auto user = not_null(_owner->peer(peerId)->asUser());
-	const auto idDate = parseAndApply(user, data.vstory());
-	if (!idDate) {
+	const auto now = base::unixtime::now();
+	const auto idDates = parseAndApply(user, data.vstory(), now);
+	if (!idDates) {
+		return;
+	}
+	const auto expired = (idDates.expires <= now);
+	if (expired) {
+		applyExpired({ peerId, idDates.id });
 		return;
 	}
 	const auto i = _all.find(peerId);
 	if (i == end(_all)) {
 		requestUserStories(user);
 		return;
-	} else if (i->second.ids.contains(idDate)) {
+	} else if (i->second.ids.contains(idDates)) {
 		return;
 	}
-	const auto was = i->second.info();
-	i->second.ids.emplace(idDate);
-	const auto now = i->second.info();
-	if (was == now) {
+	const auto wasInfo = i->second.info();
+	i->second.ids.emplace(idDates);
+	const auto nowInfo = i->second.info();
+	if (wasInfo == nowInfo) {
 		return;
 	}
 	const auto refreshInList = [&](StorySourcesList list) {
@@ -317,7 +341,7 @@ void Stories::apply(const MTPDupdateStory &data) {
 			peerId,
 			&StoriesSourceInfo::id);
 		if (i != end(sources)) {
-			*i = now;
+			*i = nowInfo;
 			sort(list);
 		}
 	};
@@ -342,7 +366,61 @@ void Stories::requestUserStories(not_null<UserData*> user) {
 		_requestingUserStories.remove(user);
 		applyDeletedFromSources(user->id, StorySourcesList::All);
 	}).send();
+}
 
+void Stories::registerExpiring(TimeId expires, FullStoryId id) {
+	for (auto i = _expiring.findFirst(expires)
+		; (i != end(_expiring)) && (i->first == expires)
+		; ++i) {
+		if (i->second == id) {
+			return;
+		}
+	}
+	const auto reschedule = _expiring.empty()
+		|| (_expiring.front().first > expires);
+	_expiring.emplace(expires, id);
+	if (reschedule) {
+		scheduleExpireTimer();
+	}
+}
+
+void Stories::scheduleExpireTimer() {
+	if (_expireSchedulePosted) {
+		return;
+	}
+	_expireSchedulePosted = true;
+	crl::on_main(this, [=] {
+		if (!_expireSchedulePosted) {
+			return;
+		}
+		_expireSchedulePosted = false;
+		if (_expiring.empty()) {
+			_expireTimer.cancel();
+		} else {
+			const auto nearest = _expiring.front().first;
+			const auto now = base::unixtime::now();
+			const auto delay = (nearest > now)
+				? (nearest - now)
+				: 0;
+			_expireTimer.callOnce(delay * crl::time(1000));
+		}
+	});
+}
+
+void Stories::processExpired() {
+	const auto now = base::unixtime::now();
+	auto expired = base::flat_set<FullStoryId>();
+	auto i = begin(_expiring);
+	for (; i != end(_expiring) && i->first <= now; ++i) {
+		expired.emplace(i->second);
+	}
+	_expiring.erase(begin(_expiring), i);
+	for (const auto &id : expired) {
+		applyExpired(id);
+	}
+	if (!_expiring.empty()) {
+		scheduleExpireTimer();
+	}
 }
 
 void Stories::parseAndApply(const MTPUserStories &stories) {
@@ -357,9 +435,10 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 		.hidden = user->hasStoriesHidden(),
 	};
 	const auto &list = data.vstories().v;
+	const auto now = base::unixtime::now();
 	result.ids.reserve(list.size());
 	for (const auto &story : list) {
-		if (const auto id = parseAndApply(result.user, story)) {
+		if (const auto id = parseAndApply(result.user, story, now)) {
 			result.ids.emplace(id);
 		}
 	}
@@ -391,21 +470,31 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 		}
 		sort(list);
 	};
-	add(StorySourcesList::All);
-	if (result.user->hasStoriesHidden()) {
-		applyDeletedFromSources(peerId, StorySourcesList::NotHidden);
+	if (result.user->isContact()) {
+		add(StorySourcesList::All);
+		if (result.user->hasStoriesHidden()) {
+			applyDeletedFromSources(peerId, StorySourcesList::NotHidden);
+		} else {
+			add(StorySourcesList::NotHidden);
+		}
 	} else {
-		add(StorySourcesList::NotHidden);
+		applyDeletedFromSources(peerId, StorySourcesList::All);
 	}
 }
 
 Story *Stories::parseAndApply(
 		not_null<PeerData*> peer,
-		const MTPDstoryItem &data) {
+		const MTPDstoryItem &data,
+		TimeId now) {
 	const auto media = ParseMedia(_owner, data.vmedia());
 	if (!media) {
 		return nullptr;
 	}
+	const auto expires = data.vexpire_date().v;
+	const auto expired = (expires >= now);
+	if (expired && !data.is_pinned() && !peer->isSelf()) {
+		return nullptr;
+	}
 	const auto id = data.vid().v;
 	auto &stories = _stories[peer->id];
 	const auto i = stories.find(id);
@@ -421,25 +510,51 @@ Story *Stories::parseAndApply(
 		id,
 		peer,
 		StoryMedia{ *media },
-		data.vdate().v)).first->second.get();
+		data.vdate().v,
+		data.vexpire_date().v)).first->second.get();
 	result->applyChanges(*media, data);
+
+	if (expired) {
+		_expiring.remove(expires, result->fullId());
+		applyExpired(result->fullId());
+	} else {
+		registerExpiring(expires, result->fullId());
+	}
+
 	return result;
 }
 
-StoryIdDate Stories::parseAndApply(
+StoryIdDates Stories::parseAndApply(
 		not_null<PeerData*> peer,
-		const MTPstoryItem &story) {
+		const MTPstoryItem &story,
+		TimeId now) {
 	return story.match([&](const MTPDstoryItem &data) {
-		if (const auto story = parseAndApply(peer, data)) {
-			return story->idDate();
+		if (const auto story = parseAndApply(peer, data, now)) {
+			return story->idDates();
 		}
 		applyDeleted({ peer->id, data.vid().v });
-		return StoryIdDate();
+		return StoryIdDates();
 	}, [&](const MTPDstoryItemSkipped &data) {
-		return StoryIdDate{ data.vid().v, data.vdate().v };
+		const auto expires = data.vexpire_date().v;
+		const auto expired = (expires >= now);
+		const auto fullId = FullStoryId{ peer->id, data.vid().v };
+		if (!expired) {
+			registerExpiring(expires, fullId);
+		} else if (!peer->isSelf()) {
+			applyDeleted(fullId);
+			return StoryIdDates();
+		} else {
+			_expiring.remove(expires, fullId);
+			applyExpired(fullId);
+		}
+		return StoryIdDates{
+			data.vid().v,
+			data.vdate().v,
+			data.vexpire_date().v,
+		};
 	}, [&](const MTPDstoryItemDeleted &data) {
 		applyDeleted({ peer->id, data.vid().v });
-		return StoryIdDate();
+		return StoryIdDates();
 	});
 }
 
@@ -571,9 +686,10 @@ void Stories::sendResolveRequests() {
 void Stories::processResolvedStories(
 		not_null<PeerData*> peer,
 		const QVector<MTPStoryItem> &list) {
+	const auto now = base::unixtime::now();
 	for (const auto &item : list) {
 		item.match([&](const MTPDstoryItem &data) {
-			if (!parseAndApply(peer, data)) {
+			if (!parseAndApply(peer, data, now)) {
 				applyDeleted({ peer->id, data.vid().v });
 			}
 		}, [&](const MTPDstoryItemSkipped &data) {
@@ -595,6 +711,48 @@ void Stories::finalizeResolve(FullStoryId id) {
 }
 
 void Stories::applyDeleted(FullStoryId id) {
+	applyRemovedFromActive(id);
+
+	_deleted.emplace(id);
+	const auto j = _stories.find(id.peer);
+	if (j != end(_stories)) {
+		const auto k = j->second.find(id.story);
+		if (k != end(j->second)) {
+			auto story = std::move(k->second);
+			_expiring.remove(story->expires(), story->fullId());
+			j->second.erase(k);
+			session().changes().storyUpdated(
+				story.get(),
+				UpdateFlag::Destroyed);
+			removeDependencyStory(story.get());
+			if (j->second.empty()) {
+				_stories.erase(j);
+			}
+		}
+	}
+}
+
+void Stories::applyExpired(FullStoryId id) {
+	if (const auto maybeStory = lookup(id)) {
+		const auto story = *maybeStory;
+		if (story->peer()->isSelf()) {
+			addToExpiredMine(story);
+		} else if (!story->pinned()) {
+			applyDeleted(id);
+			return;
+		}
+	}
+	applyRemovedFromActive(id);
+}
+
+void Stories::addToExpiredMine(not_null<Story*> story) {
+	const auto added = _expiredMine.emplace(story->id()).second;
+	if (added && _expiredMineTotal >= 0) {
+		++_expiredMineTotal;
+	}
+}
+
+void Stories::applyRemovedFromActive(FullStoryId id) {
 	const auto removeFromList = [&](StorySourcesList list) {
 		const auto index = static_cast<int>(list);
 		auto &sources = _sources[index];
@@ -609,7 +767,7 @@ void Stories::applyDeleted(FullStoryId id) {
 	};
 	const auto i = _all.find(id.peer);
 	if (i != end(_all)) {
-		const auto j = i->second.ids.lower_bound(StoryIdDate{ id.story });
+		const auto j = i->second.ids.lower_bound(StoryIdDates{ id.story });
 		if (j != end(i->second.ids) && j->id == id.story) {
 			i->second.ids.erase(j);
 			if (i->second.ids.empty()) {
@@ -619,22 +777,6 @@ void Stories::applyDeleted(FullStoryId id) {
 			}
 		}
 	}
-	_deleted.emplace(id);
-	const auto j = _stories.find(id.peer);
-	if (j != end(_stories)) {
-		const auto k = j->second.find(id.story);
-		if (k != end(j->second)) {
-			auto story = std::move(k->second);
-			j->second.erase(k);
-			session().changes().storyUpdated(
-				story.get(),
-				UpdateFlag::Destroyed);
-			removeDependencyStory(story.get());
-			if (j->second.empty()) {
-				_stories.erase(j);
-			}
-		}
-	}
 }
 
 void Stories::applyDeletedFromSources(PeerId id, StorySourcesList list) {
@@ -755,7 +897,7 @@ void Stories::loadAround(FullStoryId id, StoriesContext context) {
 	if (i == end(_all)) {
 		return;
 	}
-	const auto j = i->second.ids.lower_bound(StoryIdDate{ id.story });
+	const auto j = i->second.ids.lower_bound(StoryIdDates{ id.story });
 	if (j == end(i->second.ids) || j->id != id.story) {
 		return;
 	}
@@ -960,6 +1102,67 @@ void Stories::loadViewsSlice(
 	}).send();
 }
 
+const base::flat_set<StoryId> &Stories::expiredMine() const {
+	return _expiredMine;
+}
+
+rpl::producer<> Stories::expiredMineChanged() const {
+	return _expiredMineChanged.events();
+}
+
+int Stories::expiredMineCount() const {
+	return std::max(_expiredMineTotal, 0);
+}
+
+bool Stories::expiredMineCountKnown() const {
+	return _expiredMineTotal >= 0;
+}
+
+bool Stories::expiredMineLoaded() const {
+	return _expiredMineLoaded;
+}
+
+void Stories::expiredMineLoadMore() {
+	if (_expiredMineRequestId) {
+		return;
+	}
+	const auto api = &_owner->session().api();
+	_expiredMineRequestId = api->request(MTPstories_GetExpiredStories(
+		MTP_int(_expiredMineLastId),
+		MTP_int(_expiredMineLastId
+			? kExpiredMinePerPage
+			: kExpiredMineFirstPerPage)
+	)).done([=](const MTPstories_Stories &result) {
+		_expiredMineRequestId = 0;
+
+		const auto &data = result.data();
+		_expiredMineTotal = std::max(
+			data.vcount().v,
+			int(_expiredMine.size()));
+		_expiredMineLoaded = data.vstories().v.empty();
+		const auto self = _owner->session().user();
+		const auto now = base::unixtime::now();
+		for (const auto &story : data.vstories().v) {
+			const auto id = story.match([&](const auto &id) {
+				return id.vid().v;
+			});
+			_expiredMine.emplace(id);
+			_expiredMineLastId = id;
+			if (!parseAndApply(self, story, now)) {
+				_expiredMine.remove(id);
+				if (_expiredMineTotal > 0) {
+					--_expiredMineTotal;
+				}
+			}
+		}
+		_expiredMineChanged.fire({});
+	}).fail([=] {
+		_expiredMineRequestId = 0;
+		_expiredMineLoaded = true;
+		_expiredMineTotal = int(_expiredMine.size());
+	}).send();
+}
+
 bool Stories::isQuitPrevent() {
 	if (!_markReadPending.empty()) {
 		sendMarkAsReadRequests();
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index f8f152b77..a05a1de67 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/expected.h"
 #include "base/timer.h"
+#include "base/weak_ptr.h"
 
 class Image;
 class PhotoData;
@@ -22,9 +23,10 @@ namespace Data {
 
 class Session;
 
-struct StoryIdDate {
+struct StoryIdDates {
 	StoryId id = 0;
 	TimeId date = 0;
+	TimeId expires = 0;
 
 	[[nodiscard]] bool valid() const {
 		return id != 0;
@@ -33,8 +35,8 @@ struct StoryIdDate {
 		return valid();
 	}
 
-	friend inline auto operator<=>(StoryIdDate, StoryIdDate) = default;
-	friend inline bool operator==(StoryIdDate, StoryIdDate) = default;
+	friend inline auto operator<=>(StoryIdDates, StoryIdDates) = default;
+	friend inline bool operator==(StoryIdDates, StoryIdDates) = default;
 };
 
 struct StoryMedia {
@@ -56,16 +58,20 @@ public:
 		StoryId id,
 		not_null<PeerData*> peer,
 		StoryMedia media,
-		TimeId date);
+		TimeId date,
+		TimeId expires);
 
 	[[nodiscard]] Session &owner() const;
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] not_null<PeerData*> peer() const;
 
 	[[nodiscard]] StoryId id() const;
-	[[nodiscard]] StoryIdDate idDate() const;
+	[[nodiscard]] bool mine() const;
+	[[nodiscard]] StoryIdDates idDates() const;
 	[[nodiscard]] FullStoryId fullId() const;
 	[[nodiscard]] TimeId date() const;
+	[[nodiscard]] TimeId expires() const;
+	[[nodiscard]] bool expired(TimeId now = 0) const;
 	[[nodiscard]] const StoryMedia &media() const;
 	[[nodiscard]] PhotoData *photo() const;
 	[[nodiscard]] DocumentData *document() const;
@@ -101,6 +107,7 @@ private:
 	std::vector<StoryView> _viewsList;
 	int _views = 0;
 	const TimeId _date = 0;
+	const TimeId _expires = 0;
 	bool _pinned = false;
 
 };
@@ -119,7 +126,7 @@ struct StoriesSourceInfo {
 
 struct StoriesSource {
 	not_null<UserData*> user;
-	base::flat_set<StoryIdDate> ids;
+	base::flat_set<StoryIdDates> ids;
 	StoryId readTill = 0;
 	bool hidden = false;
 
@@ -167,7 +174,7 @@ struct StoriesContext {
 
 inline constexpr auto kStorySourcesListCount = 2;
 
-class Stories final {
+class Stories final : public base::has_weak_ptr {
 public:
 	explicit Stories(not_null<Session*> owner);
 	~Stories();
@@ -210,14 +217,23 @@ public:
 		std::optional<StoryView> offset,
 		Fn<void(std::vector<StoryView>)> done);
 
+	[[nodiscard]] const base::flat_set<StoryId> &expiredMine() const;
+	[[nodiscard]] rpl::producer<> expiredMineChanged() const;
+	[[nodiscard]] int expiredMineCount() const;
+	[[nodiscard]] bool expiredMineCountKnown() const;
+	[[nodiscard]] bool expiredMineLoaded() const;
+	[[nodiscard]] void expiredMineLoadMore();
+
 private:
 	void parseAndApply(const MTPUserStories &stories);
 	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
-		const MTPDstoryItem &data);
-	StoryIdDate parseAndApply(
+		const MTPDstoryItem &data,
+		TimeId now);
+	StoryIdDates parseAndApply(
 		not_null<PeerData*> peer,
-		const MTPstoryItem &story);
+		const MTPstoryItem &story,
+		TimeId now);
 	void processResolvedStories(
 		not_null<PeerData*> peer,
 		const QVector<MTPStoryItem> &list);
@@ -225,20 +241,30 @@ private:
 	void finalizeResolve(FullStoryId id);
 
 	void applyDeleted(FullStoryId id);
+	void applyExpired(FullStoryId id);
+	void applyRemovedFromActive(FullStoryId id);
 	void applyDeletedFromSources(PeerId id, StorySourcesList list);
 	void removeDependencyStory(not_null<Story*> story);
 	void sort(StorySourcesList list);
 
+	void addToExpiredMine(not_null<Story*> story);
+
 	void sendMarkAsReadRequests();
 	void sendMarkAsReadRequest(not_null<PeerData*> peer, StoryId tillId);
 
 	void requestUserStories(not_null<UserData*> user);
+	void registerExpiring(TimeId expires, FullStoryId id);
+	void scheduleExpireTimer();
+	void processExpired();
 
 	const not_null<Session*> _owner;
 	base::flat_map<
 		PeerId,
 		base::flat_map<StoryId, std::unique_ptr<Story>>> _stories;
+	base::flat_multi_map<TimeId, FullStoryId> _expiring;
 	base::flat_set<FullStoryId> _deleted;
+	base::Timer _expireTimer;
+	bool _expireSchedulePosted = false;
 
 	base::flat_map<
 		PeerId,
@@ -261,6 +287,13 @@ private:
 
 	rpl::event_stream<PeerId> _itemsChanged;
 
+	base::flat_set<StoryId> _expiredMine;
+	int _expiredMineTotal = -1;
+	StoryId _expiredMineLastId = 0;
+	bool _expiredMineLoaded = false;
+	rpl::event_stream<> _expiredMineChanged;
+	mtpRequestId _expiredMineRequestId = 0;
+
 	base::flat_set<PeerId> _markReadPending;
 	base::Timer _markReadTimer;
 	base::flat_set<PeerId> _markReadRequests;
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 0a1b1a8a0..31c73afa8 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -297,8 +297,10 @@ ClickHandlerPtr JumpToStoryClickHandler(
 			? separate->sessionController()
 			: peer->session().tryResolveWindow();
 		if (controller) {
-			// #TODO stories decide context
-			controller->openPeerStory(peer, storyId, {});
+			controller->openPeerStory(
+				peer,
+				storyId,
+				{ Data::StoriesContextSingle() });
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index c343a6214..bb7337650 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -422,14 +422,14 @@ void Controller::show(
 			stories.loadMore(list);
 		}
 	});
-	const auto idDate = story->idDate();
+	const auto idDates = story->idDates();
 	if (!source) {
 		return;
 	} else if (source == &single) {
-		single.ids.emplace(idDate);
+		single.ids.emplace(idDates);
 		_index = 0;
 	} else {
-		const auto k = source->ids.find(idDate);
+		const auto k = source->ids.find(idDates);
 		if (k == end(source->ids)) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 305b88329..1a03e874f 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -59,6 +59,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_changes.h"
+#include "data/data_stories.h"
 #include "mainwidget.h"
 #include "styles/style_window.h"
 #include "styles/style_widgets.h"
@@ -759,6 +760,37 @@ void MainMenu::setupMenu() {
 		)->setClickedCallback([=] {
 			controller->showPeerHistory(controller->session().user());
 		});
+
+		const auto wrap = _menu->add(
+			object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+				_menu,
+				CreateButton(
+					_menu,
+					rpl::single(u"My Stories"_q),
+					st::mainMenuButton,
+					IconDescriptor{
+						&st::settingsIconSavedMessages,
+						kIconLightOrange
+					})));
+		const auto stories = &controller->session().data().stories();
+		const auto &all = stories->all();
+		const auto mine = all.find(controller->session().userPeerId());
+		if ((mine != end(all) && !mine->second.ids.empty())
+			|| stories->expiredMineCount() > 0) {
+			wrap->toggle(true, anim::type::instant);
+		} else {
+			wrap->toggle(false, anim::type::instant);
+			if (!stories->expiredMineCountKnown()) {
+				stories->expiredMineLoadMore();
+				wrap->toggleOn(stories->expiredMineChanged(
+				) | rpl::map([=] {
+					return stories->expiredMineCount() > 0;
+				}) | rpl::filter(rpl::mappers::_1) | rpl::take(1));
+			}
+		}
+		wrap->entity()->setClickedCallback([=] {
+			controller->showToast(u"My Stories"_q);
+		});
 	} else {
 		addAction(
 			tr::lng_profile_add_contact(),
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index fd26e5e28..a39f552d2 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2488,7 +2488,7 @@ void SessionController::openPeerStories(
 	const auto i = all.find(peerId);
 	if (i != end(all)) {
 		const auto j = i->second.ids.lower_bound(
-			StoryIdDate{ i->second.readTill + 1 });
+			StoryIdDates{ i->second.readTill + 1 });
 		openPeerStory(
 			i->second.user,
 			j != i->second.ids.end() ? j->id : i->second.ids.front().id,

From 7f8a985067dc0e6a38c423527089e739869f1f9e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 5 Jun 2023 20:31:15 +0400
Subject: [PATCH 280/676] Start stories overview in profile / My Stories.

---
 Telegram/CMakeLists.txt                       |   8 +
 Telegram/Resources/langs/lang.strings         |   1 +
 .../data/data_abstract_sparse_ids.h           |   6 +-
 Telegram/SourceFiles/data/data_msg_id.h       |  82 ++--
 Telegram/SourceFiles/data/data_stories.cpp    | 164 ++++++-
 Telegram/SourceFiles/data/data_stories.h      |  53 ++-
 .../SourceFiles/data/data_stories_ids.cpp     | 142 ++++++
 Telegram/SourceFiles/data/data_stories_ids.h  |  32 ++
 Telegram/SourceFiles/data/data_types.h        |   2 +
 Telegram/SourceFiles/data/data_user.cpp       |   3 +
 .../dialogs/ui/dialogs_stories_content.cpp    |   8 +-
 .../export/data/export_data_types.cpp         |   2 +
 Telegram/SourceFiles/history/history_item.cpp |  39 ++
 Telegram/SourceFiles/history/history_item.h   |   3 +
 .../history/history_item_helpers.cpp          |   2 +
 .../info/downloads/info_downloads_widget.cpp  |   2 +-
 .../SourceFiles/info/info_content_widget.cpp  |   7 +
 .../SourceFiles/info/info_content_widget.h    |  25 +-
 Telegram/SourceFiles/info/info_controller.cpp |  17 +
 Telegram/SourceFiles/info/info_controller.h   |  50 ++-
 .../info/media/info_media_buttons.h           |  27 ++
 .../info/media/info_media_list_section.cpp    |   2 +
 .../info/media/info_media_list_widget.cpp     |   7 +
 .../info/media/info_media_list_widget.h       |   1 -
 .../info/media/info_media_widget.cpp          |   4 +
 .../profile/info_profile_inner_widget.cpp     |  16 +
 .../stories/info_stories_inner_widget.cpp     | 191 ++++++++
 .../info/stories/info_stories_inner_widget.h  |  78 ++++
 .../info/stories/info_stories_provider.cpp    | 407 ++++++++++++++++++
 .../info/stories/info_stories_provider.h      | 132 ++++++
 .../info/stories/info_stories_widget.cpp      | 112 +++++
 .../info/stories/info_stories_widget.h        |  70 +++
 .../stories/media_stories_controller.cpp      |  27 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   2 +
 .../SourceFiles/window/window_main_menu.cpp   |  13 +-
 .../window/window_session_controller.cpp      |  44 +-
 .../window/window_session_controller.h        |   1 +
 37 files changed, 1677 insertions(+), 105 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_stories_ids.cpp
 create mode 100644 Telegram/SourceFiles/data/data_stories_ids.h
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_provider.cpp
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_provider.h
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_widget.cpp
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_widget.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c02353676..c42e141da 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -551,6 +551,8 @@ PRIVATE
     data/data_sponsored_messages.h
     data/data_stories.cpp
     data/data_stories.h
+    data/data_stories_ids.cpp
+    data/data_stories_ids.h
     data/data_streaming.cpp
     data/data_streaming.h
     data/data_thread.cpp
@@ -871,6 +873,12 @@ PRIVATE
     info/profile/info_profile_widget.h
     info/settings/info_settings_widget.cpp
     info/settings/info_settings_widget.h
+    info/stories/info_stories_inner_widget.cpp
+    info/stories/info_stories_inner_widget.h
+    info/stories/info_stories_provider.cpp
+    info/stories/info_stories_provider.h
+    info/stories/info_stories_widget.cpp
+    info/stories/info_stories_widget.h
     info/userpic/info_userpic_colors_editor.cpp
     info/userpic/info_userpic_colors_editor.h
     info/userpic/info_userpic_emoji_builder.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 220683f8e..40783dbab 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_menu_activate" = "Activate";
 "lng_menu_set_status" = "Set Emoji Status";
 "lng_menu_change_status" = "Change Emoji Status";
+"lng_menu_my_stories" = "My Stories";
 
 "lng_disable_notifications_from_tray" = "Disable notifications";
 "lng_enable_notifications_from_tray" = "Enable notifications";
diff --git a/Telegram/SourceFiles/data/data_abstract_sparse_ids.h b/Telegram/SourceFiles/data/data_abstract_sparse_ids.h
index d48542d19..4a4d62d17 100644
--- a/Telegram/SourceFiles/data/data_abstract_sparse_ids.h
+++ b/Telegram/SourceFiles/data/data_abstract_sparse_ids.h
@@ -57,7 +57,7 @@ public:
 		return std::nullopt;
 	}
 	[[nodiscard]] std::optional<Id> nearest(Id id) const {
-		static_assert(std::is_same_v<IdsContainer, base::flat_set<MsgId>>);
+		static_assert(std::is_same_v<IdsContainer, base::flat_set<Id>>);
 		if (const auto it = ranges::lower_bound(_ids, id); it != _ids.end()) {
 			return *it;
 		} else if (_ids.empty()) {
@@ -70,6 +70,10 @@ public:
 		std::swap(_skippedBefore, _skippedAfter);
 	}
 
+	friend inline bool operator==(
+		const AbstractSparseIds&,
+		const AbstractSparseIds&) = default;
+
 private:
 	IdsContainer _ids;
 	std::optional<int> _fullCount;
diff --git a/Telegram/SourceFiles/data/data_msg_id.h b/Telegram/SourceFiles/data/data_msg_id.h
index af6b73fcc..aa3bf1785 100644
--- a/Telegram/SourceFiles/data/data_msg_id.h
+++ b/Telegram/SourceFiles/data/data_msg_id.h
@@ -51,14 +51,49 @@ Q_DECLARE_METATYPE(MsgId);
 	return MsgId(a.bare - b.bare);
 }
 
+using StoryId = int32;
+
+struct FullStoryId {
+	PeerId peer = 0;
+	StoryId story = 0;
+
+	[[nodiscard]] bool valid() const {
+		return peer != 0 && story != 0;
+	}
+	explicit operator bool() const {
+		return valid();
+	}
+	friend inline auto operator<=>(FullStoryId, FullStoryId) = default;
+	friend inline bool operator==(FullStoryId, FullStoryId) = default;
+};
+
+struct FullReplyTo {
+	MsgId msgId = 0;
+	MsgId topicRootId = 0;
+	FullStoryId storyId;
+
+	[[nodiscard]] bool valid() const {
+		return msgId || storyId;
+	}
+	explicit operator bool() const {
+		return valid();
+	}
+	friend inline auto operator<=>(FullReplyTo, FullReplyTo) = default;
+	friend inline bool operator==(FullReplyTo, FullReplyTo) = default;
+};
+
 constexpr auto StartClientMsgId = MsgId(0x01 - (1LL << 58));
 constexpr auto ClientMsgIds = (1LL << 31);
 constexpr auto EndClientMsgId = MsgId(StartClientMsgId.bare + ClientMsgIds);
+constexpr auto StartStoryMsgId = MsgId(EndClientMsgId.bare + 1);
+constexpr auto ServerMaxStoryId = StoryId(1 << 30);
+constexpr auto StoryMsgIds = int64(ServerMaxStoryId);
+constexpr auto EndStoryMsgId = MsgId(StartStoryMsgId.bare + StoryMsgIds);
 constexpr auto ServerMaxMsgId = MsgId(1LL << 56);
 constexpr auto ScheduledMsgIdsRange = (1LL << 32);
 constexpr auto ShowAtUnreadMsgId = MsgId(0);
 
-constexpr auto SpecialMsgIdShift = EndClientMsgId.bare;
+constexpr auto SpecialMsgIdShift = EndStoryMsgId.bare;
 constexpr auto ShowAtTheEndMsgId = MsgId(SpecialMsgIdShift + 1);
 constexpr auto SwitchAtTopMsgId = MsgId(SpecialMsgIdShift + 2);
 constexpr auto ShowAndStartBotMsgId = MsgId(SpecialMsgIdShift + 4);
@@ -81,6 +116,20 @@ static_assert(-(SpecialMsgIdShift + 0xFF) > ServerMaxMsgId);
 	return MsgId(StartClientMsgId.bare + index);
 }
 
+[[nodiscrd]] constexpr inline bool IsStoryMsgId(MsgId id) noexcept {
+	return (id >= StartStoryMsgId && id < EndStoryMsgId);
+}
+[[nodiscard]] constexpr inline StoryId StoryIdFromMsgId(MsgId id) noexcept {
+	Expects(IsStoryMsgId(id));
+
+	return StoryId(id.bare - StartStoryMsgId.bare);
+}
+[[nodiscard]] constexpr inline MsgId StoryIdToMsgId(StoryId id) noexcept {
+	Expects(id >= 0);
+
+	return MsgId(StartStoryMsgId.bare + id);
+}
+
 [[nodiscard]] constexpr inline bool IsServerMsgId(MsgId id) noexcept {
 	return (id > 0 && id < ServerMaxMsgId);
 }
@@ -136,37 +185,6 @@ struct GlobalMsgId {
 	}
 };
 
-using StoryId = int32;
-
-struct FullStoryId {
-	PeerId peer = 0;
-	StoryId story = 0;
-
-	[[nodiscard]] bool valid() const {
-		return peer != 0 && story != 0;
-	}
-	explicit operator bool() const {
-		return valid();
-	}
-	friend inline auto operator<=>(FullStoryId, FullStoryId) = default;
-	friend inline bool operator==(FullStoryId, FullStoryId) = default;
-};
-
-struct FullReplyTo {
-	MsgId msgId = 0;
-	MsgId topicRootId = 0;
-	FullStoryId storyId;
-
-	[[nodiscard]] bool valid() const {
-		return msgId || storyId;
-	}
-	explicit operator bool() const {
-		return valid();
-	}
-	friend inline auto operator<=>(FullReplyTo, FullReplyTo) = default;
-	friend inline bool operator==(FullReplyTo, FullReplyTo) = default;
-};
-
 namespace std {
 
 template <>
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 5eef52f69..fc164eb17 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -35,6 +35,8 @@ constexpr auto kPreloadAroundCount = 30;
 constexpr auto kMarkAsReadDelay = 3 * crl::time(1000);
 constexpr auto kExpiredMineFirstPerPage = 30;
 constexpr auto kExpiredMinePerPage = 100;
+constexpr auto kSavedFirstPerPage = 30;
+constexpr auto kSavedPerPage = 100;
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -351,6 +353,30 @@ void Stories::apply(const MTPDupdateStory &data) {
 	}
 }
 
+void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
+	if (!data) {
+		applyDeletedFromSources(peer->id, StorySourcesList::All);
+		_all.erase(peer->id);
+		const auto i = _stories.find(peer->id);
+		if (i != end(_stories)) {
+			auto stories = base::take(i->second);
+			_stories.erase(i);
+			for (const auto &[id, story] : stories) {
+				// Duplicated in Stories::applyDeleted.
+				_deleted.emplace(FullStoryId{ peer->id, id });
+				_expiring.remove(story->expires(), story->fullId());
+				session().changes().storyUpdated(
+					story.get(),
+					UpdateFlag::Destroyed);
+				removeDependencyStory(story.get());
+			}
+		}
+		_sourceChanged.fire_copy(peer->id);
+	} else {
+		parseAndApply(*data);
+	}
+}
+
 void Stories::requestUserStories(not_null<UserData*> user) {
 	if (!_requestingUserStories.emplace(user).second) {
 		return;
@@ -480,6 +506,7 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 	} else {
 		applyDeletedFromSources(peerId, StorySourcesList::All);
 	}
+	_sourceChanged.fire_copy(peerId);
 }
 
 Story *Stories::parseAndApply(
@@ -503,6 +530,9 @@ Story *Stories::parseAndApply(
 			session().changes().storyUpdated(
 				i->second.get(),
 				UpdateFlag::Edited);
+			if (const auto item = lookupItem(i->second.get())) {
+				item->applyChanges(i->second.get());
+			}
 		}
 		return i->second.get();
 	}
@@ -718,6 +748,7 @@ void Stories::applyDeleted(FullStoryId id) {
 	if (j != end(_stories)) {
 		const auto k = j->second.find(id.story);
 		if (k != end(j->second)) {
+			// Duplicated in Stories::apply(peer, const MTPUserStories*).
 			auto story = std::move(k->second);
 			_expiring.remove(story->expires(), story->fullId());
 			j->second.erase(k);
@@ -746,7 +777,7 @@ void Stories::applyExpired(FullStoryId id) {
 }
 
 void Stories::addToExpiredMine(not_null<Story*> story) {
-	const auto added = _expiredMine.emplace(story->id()).second;
+	const auto added = _expiredMine.list.emplace(story->id()).second;
 	if (added && _expiredMineTotal >= 0) {
 		++_expiredMineTotal;
 	}
@@ -775,6 +806,7 @@ void Stories::applyRemovedFromActive(FullStoryId id) {
 				removeFromList(StorySourcesList::NotHidden);
 				removeFromList(StorySourcesList::All);
 			}
+			_sourceChanged.fire_copy(id.peer);
 		}
 	}
 }
@@ -824,8 +856,42 @@ void Stories::sort(StorySourcesList list) {
 	_sourcesChanged[index].fire({});
 }
 
-const base::flat_map<PeerId, StoriesSource> &Stories::all() const {
-	return _all;
+std::shared_ptr<HistoryItem> Stories::lookupItem(not_null<Story*> story) {
+	const auto i = _items.find(story->peer()->id);
+	if (i == end(_items)) {
+		return nullptr;
+	}
+	const auto j = i->second.find(story->id());
+	if (j == end(i->second)) {
+		return nullptr;
+	}
+	return j->second.lock();
+}
+
+std::shared_ptr<HistoryItem> Stories::resolveItem(not_null<Story*> story) {
+	auto &items = _items[story->peer()->id];
+	auto i = items.find(story->id());
+	if (i == end(items)) {
+		i = items.emplace(story->id()).first;
+	} else if (const auto result = i->second.lock()) {
+		return result;
+	}
+	const auto history = _owner->history(story->peer());
+	auto result = std::shared_ptr<HistoryItem>(
+		history->makeMessage(story).get(),
+		HistoryItem::Destroyer());
+	i->second = result;
+	return result;
+}
+
+std::shared_ptr<HistoryItem> Stories::resolveItem(FullStoryId id) {
+	const auto story = lookup(id);
+	return story ? resolveItem(*story) : std::shared_ptr<HistoryItem>();
+}
+
+const StoriesSource *Stories::source(PeerId id) const {
+	const auto i = _all.find(id);
+	return (i != end(_all)) ? &i->second : nullptr;
 }
 
 const std::vector<StoriesSourceInfo> &Stories::sources(
@@ -841,6 +907,10 @@ rpl::producer<> Stories::sourcesChanged(StorySourcesList list) const {
 	return _sourcesChanged[static_cast<int>(list)].events();
 }
 
+rpl::producer<PeerId> Stories::sourceChanged() const {
+	return _sourceChanged.events();
+}
+
 rpl::producer<PeerId> Stories::itemsChanged() const {
 	return _itemsChanged.events();
 }
@@ -1102,7 +1172,7 @@ void Stories::loadViewsSlice(
 	}).send();
 }
 
-const base::flat_set<StoryId> &Stories::expiredMine() const {
+const StoriesIds &Stories::expiredMine() const {
 	return _expiredMine;
 }
 
@@ -1122,6 +1192,30 @@ bool Stories::expiredMineLoaded() const {
 	return _expiredMineLoaded;
 }
 
+const StoriesIds *Stories::saved(PeerId peerId) const {
+	const auto i = _saved.find(peerId);
+	return (i != end(_saved)) ? &i->second.ids : nullptr;
+}
+
+rpl::producer<PeerId> Stories::savedChanged() const {
+	return _savedChanged.events();
+}
+
+int Stories::savedCount(PeerId peerId) const {
+	const auto i = _saved.find(peerId);
+	return (i != end(_saved)) ? i->second.total : 0;
+}
+
+bool Stories::savedCountKnown(PeerId peerId) const {
+	const auto i = _saved.find(peerId);
+	return (i != end(_saved)) && (i->second.total >= 0);
+}
+
+bool Stories::savedLoaded(PeerId peerId) const {
+	const auto i = _saved.find(peerId);
+	return (i != end(_saved)) && i->second.loaded;
+}
+
 void Stories::expiredMineLoadMore() {
 	if (_expiredMineRequestId) {
 		return;
@@ -1136,33 +1230,81 @@ void Stories::expiredMineLoadMore() {
 		_expiredMineRequestId = 0;
 
 		const auto &data = result.data();
-		_expiredMineTotal = std::max(
-			data.vcount().v,
-			int(_expiredMine.size()));
-		_expiredMineLoaded = data.vstories().v.empty();
 		const auto self = _owner->session().user();
 		const auto now = base::unixtime::now();
+		_expiredMineTotal = data.vcount().v;
 		for (const auto &story : data.vstories().v) {
 			const auto id = story.match([&](const auto &id) {
 				return id.vid().v;
 			});
-			_expiredMine.emplace(id);
+			_expiredMine.list.emplace(id);
 			_expiredMineLastId = id;
 			if (!parseAndApply(self, story, now)) {
-				_expiredMine.remove(id);
+				_expiredMine.list.remove(id);
 				if (_expiredMineTotal > 0) {
 					--_expiredMineTotal;
 				}
 			}
 		}
+		_expiredMineTotal = std::max(
+			_expiredMineTotal,
+			int(_expiredMine.list.size()));
+		_expiredMineLoaded = data.vstories().v.empty();
 		_expiredMineChanged.fire({});
 	}).fail([=] {
 		_expiredMineRequestId = 0;
 		_expiredMineLoaded = true;
-		_expiredMineTotal = int(_expiredMine.size());
+		_expiredMineTotal = int(_expiredMine.list.size());
+		_expiredMineChanged.fire({});
 	}).send();
 }
 
+void Stories::savedLoadMore(PeerId peerId) {
+	Expects(peerIsUser(peerId));
+
+	auto &saved = _saved[peerId];
+	if (saved.requestId) {
+		return;
+	}
+	const auto api = &_owner->session().api();
+	const auto peer = _owner->peer(peerId);
+	saved.requestId = api->request(MTPstories_GetPinnedStories(
+		peer->asUser()->inputUser,
+		MTP_int(saved.lastId),
+		MTP_int(saved.lastId ? kSavedPerPage : kSavedFirstPerPage)
+	)).done([=](const MTPstories_Stories &result) {
+		auto &saved = _saved[peerId];
+		saved.requestId = 0;
+
+		const auto &data = result.data();
+		const auto now = base::unixtime::now();
+		saved.total = data.vcount().v;
+		for (const auto &story : data.vstories().v) {
+			const auto id = story.match([&](const auto &id) {
+				return id.vid().v;
+			});
+			saved.ids.list.emplace(id);
+			saved.lastId = id;
+			if (!parseAndApply(peer, story, now)) {
+				saved.ids.list.remove(id);
+				if (saved.total > 0) {
+					--saved.total;
+				}
+			}
+		}
+		saved.total = std::max(saved.total, int(saved.ids.list.size()));
+		saved.loaded = data.vstories().v.empty();
+		_savedChanged.fire_copy(peerId);
+	}).fail([=] {
+		auto &saved = _saved[peerId];
+		saved.requestId = 0;
+		saved.loaded = true;
+		saved.total = int(saved.ids.list.size());
+		_savedChanged.fire_copy(peerId);
+	}).send();
+
+}
+
 bool Stories::isQuitPrevent() {
 	if (!_markReadPending.empty()) {
 		sendMarkAsReadRequests();
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index a05a1de67..5d26f7474 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -39,6 +39,14 @@ struct StoryIdDates {
 	friend inline bool operator==(StoryIdDates, StoryIdDates) = default;
 };
 
+struct StoriesIds {
+	base::flat_set<StoryId, std::greater<>> list;
+
+	friend inline bool operator==(
+		const StoriesIds&,
+		const StoriesIds&) = default;
+};
+
 struct StoryMedia {
 	std::variant<not_null<PhotoData*>, not_null<DocumentData*>> data;
 
@@ -192,19 +200,24 @@ public:
 
 	void loadMore(StorySourcesList list);
 	void apply(const MTPDupdateStory &data);
+	void apply(not_null<PeerData*> peer, const MTPUserStories *data);
 	void loadAround(FullStoryId id, StoriesContext context);
 
-	[[nodiscard]] const base::flat_map<PeerId, StoriesSource> &all() const;
+	const StoriesSource *source(PeerId id) const;
 	[[nodiscard]] const std::vector<StoriesSourceInfo> &sources(
 		StorySourcesList list) const;
 	[[nodiscard]] bool sourcesLoaded(StorySourcesList list) const;
 	[[nodiscard]] rpl::producer<> sourcesChanged(
 		StorySourcesList list) const;
+	[[nodiscard]] rpl::producer<PeerId> sourceChanged() const;
 	[[nodiscard]] rpl::producer<PeerId> itemsChanged() const;
 
 	[[nodiscard]] base::expected<not_null<Story*>, NoStory> lookup(
 		FullStoryId id) const;
 	void resolve(FullStoryId id, Fn<void()> done);
+	[[nodiscard]] std::shared_ptr<HistoryItem> resolveItem(FullStoryId id);
+	[[nodiscard]] std::shared_ptr<HistoryItem> resolveItem(
+		not_null<Story*> story);
 
 	[[nodiscard]] bool isQuitPrevent();
 	void markAsRead(FullStoryId id, bool viewed);
@@ -217,14 +230,29 @@ public:
 		std::optional<StoryView> offset,
 		Fn<void(std::vector<StoryView>)> done);
 
-	[[nodiscard]] const base::flat_set<StoryId> &expiredMine() const;
+	[[nodiscard]] const StoriesIds &expiredMine() const;
 	[[nodiscard]] rpl::producer<> expiredMineChanged() const;
 	[[nodiscard]] int expiredMineCount() const;
 	[[nodiscard]] bool expiredMineCountKnown() const;
 	[[nodiscard]] bool expiredMineLoaded() const;
-	[[nodiscard]] void expiredMineLoadMore();
+	void expiredMineLoadMore();
+
+	[[nodiscard]] const StoriesIds *saved(PeerId peerId) const;
+	[[nodiscard]] rpl::producer<PeerId> savedChanged() const;
+	[[nodiscard]] int savedCount(PeerId peerId) const;
+	[[nodiscard]] bool savedCountKnown(PeerId peerId) const;
+	[[nodiscard]] bool savedLoaded(PeerId peerId) const;
+	void savedLoadMore(PeerId peerId);
 
 private:
+	struct Saved {
+		StoriesIds ids;
+		int total = -1;
+		StoryId lastId = 0;
+		bool loaded = false;
+		mtpRequestId requestId = 0;
+	};
+
 	void parseAndApply(const MTPUserStories &stories);
 	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
@@ -247,20 +275,25 @@ private:
 	void removeDependencyStory(not_null<Story*> story);
 	void sort(StorySourcesList list);
 
-	void addToExpiredMine(not_null<Story*> story);
+	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
+		not_null<Story*> story);
 
 	void sendMarkAsReadRequests();
 	void sendMarkAsReadRequest(not_null<PeerData*> peer, StoryId tillId);
 
 	void requestUserStories(not_null<UserData*> user);
+	void addToExpiredMine(not_null<Story*> story);
 	void registerExpiring(TimeId expires, FullStoryId id);
 	void scheduleExpireTimer();
 	void processExpired();
 
 	const not_null<Session*> _owner;
-	base::flat_map<
+	std::unordered_map<
 		PeerId,
 		base::flat_map<StoryId, std::unique_ptr<Story>>> _stories;
+	std::unordered_map<
+		PeerId,
+		base::flat_map<StoryId, std::weak_ptr<HistoryItem>>> _items;
 	base::flat_multi_map<TimeId, FullStoryId> _expiring;
 	base::flat_set<FullStoryId> _deleted;
 	base::Timer _expireTimer;
@@ -273,11 +306,11 @@ private:
 		PeerId,
 		base::flat_map<StoryId, std::vector<Fn<void()>>>> _resolveSent;
 
-	std::map<
+	std::unordered_map<
 		not_null<Data::Story*>,
 		base::flat_set<not_null<HistoryItem*>>> _dependentMessages;
 
-	base::flat_map<PeerId, StoriesSource> _all;
+	std::unordered_map<PeerId, StoriesSource> _all;
 	std::vector<StoriesSourceInfo> _sources[kStorySourcesListCount];
 	rpl::event_stream<> _sourcesChanged[kStorySourcesListCount];
 	bool _sourcesLoaded[kStorySourcesListCount] = { false };
@@ -285,15 +318,19 @@ private:
 
 	mtpRequestId _loadMoreRequestId[kStorySourcesListCount] = { 0 };
 
+	rpl::event_stream<PeerId> _sourceChanged;
 	rpl::event_stream<PeerId> _itemsChanged;
 
-	base::flat_set<StoryId> _expiredMine;
+	StoriesIds _expiredMine;
 	int _expiredMineTotal = -1;
 	StoryId _expiredMineLastId = 0;
 	bool _expiredMineLoaded = false;
 	rpl::event_stream<> _expiredMineChanged;
 	mtpRequestId _expiredMineRequestId = 0;
 
+	std::unordered_map<PeerId, Saved> _saved;
+	rpl::event_stream<PeerId> _savedChanged;
+
 	base::flat_set<PeerId> _markReadPending;
 	base::Timer _markReadTimer;
 	base::flat_set<PeerId> _markReadRequests;
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
new file mode 100644
index 000000000..610d51c3a
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -0,0 +1,142 @@
+/*
+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_stories_ids.h"
+
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "main/main_session.h"
+
+namespace Data {
+
+rpl::producer<StoriesIdsSlice> SavedStoriesIds(
+		not_null<PeerData*> peer,
+		StoryId aroundId,
+		int limit) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct State {
+			StoriesIdsSlice slice;
+		};
+		const auto state = lifetime.make_state<State>();
+
+		const auto push = [=] {
+			const auto stories = &peer->owner().stories();
+			if (!stories->savedCountKnown(peer->id)) {
+				return;
+			}
+
+			const auto source = stories->source(peer->id);
+			const auto saved = stories->saved(peer->id);
+			const auto count = stories->savedCount(peer->id);
+			Assert(saved != nullptr);
+			auto ids = base::flat_set<StoryId>();
+			ids.reserve(saved->list.size() + 1);
+			auto total = count;
+			if (source && !source->ids.empty()) {
+				++total;
+				const auto current = source->ids.front().id;
+				for (const auto id : ranges::views::reverse(saved->list)) {
+					const auto i = source->ids.lower_bound(
+						StoryIdDates{ id });
+					if (i != end(source->ids) && i->id == id) {
+						--total;
+					} else {
+						ids.emplace(id);
+					}
+				}
+				ids.emplace(current);
+			} else {
+				auto all = saved->list | ranges::views::reverse;
+				ids = { begin(all), end(all) };
+			}
+			const auto added = int(ids.size());
+			state->slice = StoriesIdsSlice(
+				std::move(ids),
+				total,
+				0,
+				total - added);
+			consumer.put_next_copy(state->slice);
+		};
+
+		const auto stories = &peer->owner().stories();
+		stories->sourceChanged(
+		) | rpl::filter(
+			rpl::mappers::_1 == peer->id
+		) | rpl::start_with_next([=] {
+			push();
+		}, lifetime);
+
+		stories->savedChanged(
+		) | rpl::filter(
+			rpl::mappers::_1 == peer->id
+		) | rpl::start_with_next([=] {
+			push();
+		}, lifetime);
+
+		if (!stories->savedCountKnown(peer->id)) {
+			stories->savedLoadMore(peer->id);
+		}
+
+		push();
+
+		return lifetime;
+	};
+}
+
+rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
+		not_null<Main::Session*> session,
+		StoryId aroundId,
+		int limit) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct State {
+			StoriesIdsSlice slice;
+		};
+		const auto state = lifetime.make_state<State>();
+
+		const auto push = [=] {
+			const auto stories = &session->data().stories();
+			if (!stories->expiredMineCountKnown()) {
+				return;
+			}
+
+			const auto expired = stories->expiredMine();
+			const auto count = stories->expiredMineCount();
+			auto ids = base::flat_set<StoryId>();
+			ids.reserve(expired.list.size() + 1);
+			auto all = expired.list | ranges::views::reverse;
+			ids = { begin(all), end(all) };
+			const auto added = int(ids.size());
+			state->slice = StoriesIdsSlice(
+				std::move(ids),
+				count,
+				0,
+				count - added);
+			consumer.put_next_copy(state->slice);
+		};
+
+		const auto stories = &session->data().stories();
+		stories->expiredMineChanged(
+		) | rpl::start_with_next([=] {
+			push();
+		}, lifetime);
+
+		if (!stories->expiredMineCountKnown()) {
+			stories->expiredMineLoadMore();
+		}
+
+		push();
+
+		return lifetime;
+	};
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_stories_ids.h b/Telegram/SourceFiles/data/data_stories_ids.h
new file mode 100644
index 000000000..26f827f96
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_stories_ids.h
@@ -0,0 +1,32 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_abstract_sparse_ids.h"
+
+class PeerData;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+using StoriesIdsSlice = AbstractSparseIds<base::flat_set<StoryId>>;
+
+[[nodiscard]] rpl::producer<StoriesIdsSlice> SavedStoriesIds(
+	not_null<PeerData*> peer,
+	StoryId aroundId,
+	int limit);
+
+[[nodiscard]] rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
+	not_null<Main::Session*> session,
+	StoryId aroundId,
+	int limit);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index 710cc4e1f..a296e6cf4 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -301,6 +301,8 @@ enum class MessageFlag : uint64 {
 
 	// Fake message with bot cover and information.
 	FakeBotAbout          = (1ULL << 36),
+
+	StoryItem             = (1ULL << 37),
 };
 inline constexpr bool is_flag_type(MessageFlag) { return true; }
 using MessageFlags = base::flags<MessageFlag>;
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index c903008ae..148ffb246 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_peer_bot_command.h"
 #include "data/data_photo.h"
+#include "data/data_stories.h"
 #include "data/data_emoji_statuses.h"
 #include "data/data_user_names.h"
 #include "data/data_wall_paper.h"
@@ -474,6 +475,8 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 		user->setWallPaper({});
 	}
 
+	user->owner().stories().apply(user, update.vstories());
+
 	user->fullUpdated();
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 830950416..0e6f05b3e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -128,16 +128,14 @@ State::State(not_null<Data::Stories*> data, Data::StorySourcesList list)
 
 Content State::next() {
 	auto result = Content{ .full = (_list == Data::StorySourcesList::All) };
-	const auto &all = _data->all();
 	const auto &sources = _data->sources(_list);
 	result.users.reserve(sources.size());
 	for (const auto &info : sources) {
-		const auto i = all.find(info.id);
-		Assert(i != end(all));
-		const auto &source = i->second;
+		const auto source = _data->source(info.id);
+		Assert(source != nullptr);
 
 		auto userpic = std::shared_ptr<Userpic>();
-		const auto user = source.user;
+		const auto user = source->user;
 		if (const auto i = _userpics.find(user); i != end(_userpics)) {
 			userpic = i->second;
 		} else {
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 7e0612860..e2840acc4 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -954,6 +954,8 @@ Media ParseMedia(
 		result.content = ParsePoll(data);
 	}, [](const MTPDmessageMediaDice &data) {
 		// #TODO dice
+	}, [](const MTPDmessageMediaStory &data) {
+		// #TODO stories export
 	}, [](const MTPDmessageMediaEmpty &data) {});
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 1a99b7024..e886b7ed7 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -66,6 +66,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "data/data_poll.h" // PollData::publicVotes.
 #include "data/data_sponsored_messages.h"
+#include "data/data_stories.h"
 #include "data/data_wall_paper.h"
 #include "data/data_web_page.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
@@ -289,6 +290,8 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			item,
 			qs(media.vemoticon()),
 			media.vvalue().v);
+	}, [&](const MTPDmessageMediaStory &media) -> Result {
+		return nullptr; // #TODO stories
 	}, [](const MTPDmessageMediaEmpty &) -> Result {
 		return nullptr;
 	}, [](const MTPDmessageMediaUnsupported &) -> Result {
@@ -673,6 +676,17 @@ HistoryItem::HistoryItem(
 	}
 }
 
+HistoryItem::HistoryItem(
+	not_null<History*> history,
+	not_null<Data::Story*> story)
+: id(StoryIdToMsgId(story->id()))
+, _history(history)
+, _from(history->peer)
+, _flags(MessageFlag::Local | MessageFlag::Outgoing | MessageFlag::FakeHistoryItem | MessageFlag::StoryItem)
+, _date(story->date()) {
+	setStoryFields(story);
+}
+
 HistoryItem::~HistoryItem() {
 	_media = nullptr;
 	clearSavedMedia();
@@ -1491,6 +1505,31 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	finishEdition(keyboardTop);
 }
 
+void HistoryItem::applyChanges(not_null<Data::Story*> story) {
+	Expects(_flags & MessageFlag::StoryItem);
+	Expects(StoryIdFromMsgId(id) == story->id());
+
+	_media = nullptr;
+	setStoryFields(story);
+
+	finishEdition(-1);
+}
+
+void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
+	const auto spoiler = false;
+	if (const auto photo = story->photo()) {
+		_media = std::make_unique<Data::MediaPhoto>(this, photo, spoiler);
+	} else {
+		const auto document = story->document();
+		_media = std::make_unique<Data::MediaFile>(
+			this,
+			document,
+			/*skipPremiumEffect=*/false,
+			spoiler);
+	}
+	setText(story->caption());
+}
+
 void HistoryItem::applyEdition(const MTPDmessageService &message) {
 	if (message.vaction().type() == mtpc_messageActionHistoryClear) {
 		const auto wasGrouped = history()->owner().groups().isGrouped(this);
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index bbc074879..c2f26fb44 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -179,6 +179,7 @@ public:
 		const QString &postAuthor,
 		not_null<GameData*> game,
 		HistoryMessageMarkupData &&markup);
+	HistoryItem(not_null<History*> history, not_null<Data::Story*> story);
 	~HistoryItem();
 
 	struct Destroyer {
@@ -332,6 +333,7 @@ public:
 
 	[[nodiscard]] bool isService() const;
 	void applyEdition(HistoryMessageEdition &&edition);
+	void applyChanges(not_null<Data::Story*> story);
 
 	void applyEdition(const MTPDmessageService &message);
 	void applyEdition(const MTPMessageExtendedMedia &media);
@@ -559,6 +561,7 @@ private:
 	bool updateServiceDependent(bool force = false);
 	void setServiceText(PreparedServiceText &&prepared);
 
+	void setStoryFields(not_null<Data::Story*> story);
 	void finishEdition(int oldKeyboardTop);
 	void finishEditionToEmpty();
 
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 31c73afa8..275b6ebcb 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -443,6 +443,8 @@ MediaCheckResult CheckMessageMedia(const MTPMessageMedia &media) {
 		return Result::Good;
 	}, [](const MTPDmessageMediaDice &) {
 		return Result::Good;
+	}, [](const MTPDmessageMediaStory &data) {
+		return Result::Good;
 	}, [](const MTPDmessageMediaUnsupported &) {
 		return Result::Unsupported;
 	});
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
index 26a46d22a..6efd528f6 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
@@ -26,7 +26,7 @@ Memento::Memento(not_null<Controller*> controller)
 }
 
 Memento::Memento(not_null<UserData*> self)
-: ContentMemento(Downloads::Tag{})
+: ContentMemento(Tag{})
 , _media(self, 0, Media::Type::File) {
 }
 
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index fcd405a5e..640c75d67 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -332,6 +332,8 @@ Key ContentMemento::key() const {
 		return Key(poll, pollContextId());
 	} else if (const auto self = settingsSelf()) {
 		return Settings::Tag{ self };
+	} else if (const auto peer = storiesPeer()) {
+		return Stories::Tag{ peer, storiesTab() };
 	} else {
 		return Downloads::Tag();
 	}
@@ -363,4 +365,9 @@ ContentMemento::ContentMemento(Settings::Tag settings)
 ContentMemento::ContentMemento(Downloads::Tag downloads) {
 }
 
+ContentMemento::ContentMemento(Stories::Tag stories)
+: _storiesPeer(stories.peer)
+, _storiesTab(stories.tab) {
+}
+
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 44f4e2d8c..1a54f5fdf 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -24,14 +24,20 @@ template <typename Widget>
 class PaddingWrap;
 } // namespace Ui
 
-namespace Info {
-namespace Settings {
+namespace Info::Settings {
 struct Tag;
-} // namespace Settings
+} // namespace Info::Settings
 
-namespace Downloads {
+namespace Info::Downloads {
 struct Tag;
-} // namespace Downloads
+} // namespace Info::Downloads
+
+namespace Info::Stories {
+struct Tag;
+enum class Tab;
+} // namespace Info::Stories
+
+namespace Info {
 
 class ContentMemento;
 class Controller;
@@ -150,6 +156,7 @@ public:
 		PeerId migratedPeerId);
 	explicit ContentMemento(Settings::Tag settings);
 	explicit ContentMemento(Downloads::Tag downloads);
+	explicit ContentMemento(Stories::Tag stories);
 	ContentMemento(not_null<PollData*> poll, FullMsgId contextId)
 	: _poll(poll)
 	, _pollContextId(contextId) {
@@ -172,6 +179,12 @@ public:
 	UserData *settingsSelf() const {
 		return _settingsSelf;
 	}
+	PeerData *storiesPeer() const {
+		return _storiesPeer;
+	}
+	Stories::Tab storiesTab() const {
+		return _storiesTab;
+	}
 	PollData *poll() const {
 		return _poll;
 	}
@@ -214,6 +227,8 @@ private:
 	const PeerId _migratedPeerId = 0;
 	Data::ForumTopic *_topic = nullptr;
 	UserData * const _settingsSelf = nullptr;
+	PeerData * const _storiesPeer = nullptr;
+	Stories::Tab _storiesTab = {};
 	PollData * const _poll = nullptr;
 	const FullMsgId _pollContextId;
 
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 58dda92fe..a9c57a75f 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -40,6 +40,9 @@ Key::Key(Settings::Tag settings) : _value(settings) {
 Key::Key(Downloads::Tag downloads) : _value(downloads) {
 }
 
+Key::Key(Stories::Tag stories) : _value(stories) {
+}
+
 Key::Key(not_null<PollData*> poll, FullMsgId contextId)
 : _value(PollKey{ poll, contextId }) {
 }
@@ -72,6 +75,20 @@ bool Key::isDownloads() const {
 	return v::is<Downloads::Tag>(_value);
 }
 
+PeerData *Key::storiesPeer() const {
+	if (const auto tag = std::get_if<Stories::Tag>(&_value)) {
+		return tag->peer;
+	}
+	return nullptr;
+}
+
+Stories::Tab Key::storiesTab() const {
+	if (const auto tag = std::get_if<Stories::Tag>(&_value)) {
+		return tag->tab;
+	}
+	return Stories::Tab();
+}
+
 PollData *Key::poll() const {
 	if (const auto data = std::get_if<PollKey>(&_value)) {
 		return data->poll;
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index cdbf53396..82eb6f8eb 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -36,6 +36,25 @@ struct Tag {
 
 } // namespace Info::Downloads
 
+namespace Info::Stories {
+
+enum class Tab {
+	Saved,
+	Archive,
+};
+
+struct Tag {
+	explicit Tag(not_null<PeerData*> peer, Tab tab = {})
+	: peer(peer)
+	, tab(tab) {
+	}
+
+	not_null<PeerData*> peer;
+	Tab tab = {};
+};
+
+} // namespace Info::Stories
+
 namespace Info {
 
 class Key {
@@ -44,12 +63,15 @@ public:
 	explicit Key(not_null<Data::ForumTopic*> topic);
 	Key(Settings::Tag settings);
 	Key(Downloads::Tag downloads);
+	Key(Stories::Tag stories);
 	Key(not_null<PollData*> poll, FullMsgId contextId);
 
 	PeerData *peer() const;
 	Data::ForumTopic *topic() const;
 	UserData *settingsSelf() const;
 	bool isDownloads() const;
+	PeerData *storiesPeer() const;
+	Stories::Tab storiesTab() const;
 	PollData *poll() const;
 	FullMsgId pollContextId() const;
 
@@ -63,6 +85,7 @@ private:
 		not_null<Data::ForumTopic*>,
 		Settings::Tag,
 		Downloads::Tag,
+		Stories::Tag,
 		PollKey> _value;
 
 };
@@ -81,6 +104,7 @@ public:
 		Members,
 		Settings,
 		Downloads,
+		Stories,
 		PollResults,
 	};
 	using SettingsType = ::Settings::Type;
@@ -123,23 +147,29 @@ class AbstractController : public Window::SessionNavigation {
 public:
 	AbstractController(not_null<Window::SessionController*> parent);
 
-	virtual Key key() const = 0;
-	virtual PeerData *migrated() const = 0;
-	virtual Section section() const = 0;
+	[[nodiscard]] virtual Key key() const = 0;
+	[[nodiscard]] virtual PeerData *migrated() const = 0;
+	[[nodiscard]] virtual Section section() const = 0;
 
-	PeerData *peer() const;
-	PeerId migratedPeerId() const;
-	Data::ForumTopic *topic() const {
+	[[nodiscard]] PeerData *peer() const;
+	[[nodiscard]] PeerId migratedPeerId() const;
+	[[nodiscard]] Data::ForumTopic *topic() const {
 		return key().topic();
 	}
-	UserData *settingsSelf() const {
+	[[nodiscard]] UserData *settingsSelf() const {
 		return key().settingsSelf();
 	}
-	bool isDownloads() const {
+	[[nodiscard]] bool isDownloads() const {
 		return key().isDownloads();
 	}
-	PollData *poll() const;
-	FullMsgId pollContextId() const {
+	[[nodiscard]] PeerData *storiesPeer() const {
+		return key().storiesPeer();
+	}
+	[[nodiscard]] Stories::Tab storiesTab() const {
+		return key().storiesTab();
+	}
+	[[nodiscard]] PollData *poll() const;
+	[[nodiscard]] FullMsgId pollContextId() const {
 		return key().pollContextId();
 	}
 
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index 1780d741a..b460edada 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -10,10 +10,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <rpl/mappers.h>
 #include <rpl/map.h>
 #include "lang/lang_keys.h"
+#include "data/data_stories_ids.h"
 #include "storage/storage_shared_media.h"
 #include "info/info_memento.h"
 #include "info/info_controller.h"
 #include "info/profile/info_profile_values.h"
+#include "info/stories/info_stories_widget.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/widgets/buttons.h"
@@ -124,4 +126,29 @@ inline auto AddCommonGroupsButton(
 	return result;
 };
 
+inline auto AddStoriesButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<UserData*> user,
+		Ui::MultiSlideTracker &tracker) {
+	auto count = Data::SavedStoriesIds(
+		user,
+		ServerMaxStoryId - 1,
+		0
+	) | rpl::map([](const Data::StoriesIdsSlice &slice) {
+		return slice.fullCount();
+	}) | rpl::filter_optional();
+	auto result = AddCountedButton(
+		parent,
+		std::move(count),
+		[](int count) {
+			return tr::lng_stories_row_count(tr::now, lt_count, count);
+		},
+		tracker)->entity();
+	result->addClickHandler([=] {
+		navigation->showSection(Info::Stories::Make(user));
+	});
+	return result;
+};
+
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.cpp b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
index d956d4d76..970b63d02 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
@@ -338,6 +338,7 @@ void ListSection::resizeToWidth(int newWidth) {
 	switch (_type) {
 	case Type::Photo:
 	case Type::Video:
+	case Type::PhotoVideo: // #TODO stories
 	case Type::RoundFile: {
 		_itemsLeft = st::infoMediaSkip;
 		_itemsTop = st::infoMediaSkip;
@@ -375,6 +376,7 @@ int ListSection::recountHeight() {
 	switch (_type) {
 	case Type::Photo:
 	case Type::Video:
+	case Type::PhotoVideo: // #TODO stories
 	case Type::RoundFile: {
 		auto itemHeight = _itemWidth + st::infoMediaSkip;
 		auto index = 0;
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 48e00a41b..9909cb23a 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/media/info_media_provider.h"
 #include "info/media/info_media_list_section.h"
 #include "info/downloads/info_downloads_provider.h"
+#include "info/stories/info_stories_provider.h"
 #include "info/info_controller.h"
 #include "layout/layout_mosaic.h"
 #include "layout/layout_selection.h"
@@ -88,6 +89,8 @@ struct ListWidget::DateBadge {
 		not_null<AbstractController*> controller) {
 	if (controller->isDownloads()) {
 		return std::make_unique<Downloads::Provider>(controller);
+	} else if (controller->storiesPeer()) {
+		return std::make_unique<Stories::Provider>(controller);
 	}
 	return std::make_unique<Provider>(controller);
 }
@@ -126,6 +129,7 @@ ListWidget::DateBadge::DateBadge(
 , hideTimer(std::move(hideCallback))
 , goodType(type == Type::Photo
 	|| type == Type::Video
+	|| type == Type::PhotoVideo
 	|| type == Type::GIF) {
 }
 
@@ -171,6 +175,9 @@ void ListWidget::start() {
 		) | rpl::start_with_next([this](QString &&query) {
 			_provider->setSearchQuery(std::move(query));
 		}, lifetime());
+	} else if (_controller->storiesPeer()) {
+		trackSession(&session());
+		restart();
 	} else {
 		trackSession(&session());
 
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index e9149d336..701754c13 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -169,7 +169,6 @@ private:
 	void itemRemoved(not_null<const HistoryItem*> item);
 	void itemLayoutChanged(not_null<const HistoryItem*> item);
 
-	void refreshViewer();
 	void refreshRows();
 	void trackSession(not_null<Main::Session*> session);
 
diff --git a/Telegram/SourceFiles/info/media/info_media_widget.cpp b/Telegram/SourceFiles/info/media/info_media_widget.cpp
index a02453a0e..6a480a6d2 100644
--- a/Telegram/SourceFiles/info/media/info_media_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_widget.cpp
@@ -44,11 +44,15 @@ Memento::Memento(not_null<Controller*> controller)
 : Memento(
 	(controller->peer()
 		? controller->peer()
+		: controller->storiesPeer()
+		? controller->storiesPeer()
 		: controller->parentController()->session().user()),
 	controller->topic(),
 	controller->migratedPeerId(),
 	(controller->section().type() == Section::Type::Downloads
 		? Type::File
+		: controller->section().type() == Section::Type::Stories
+		? Type::PhotoVideo
 		: controller->section().mediaType())) {
 }
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 855a0244c..3b85f8989 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -186,7 +186,23 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 			icon,
 			st::infoSharedMediaButtonIconPosition);
 	};
+	auto addStoriesButton = [&](
+			not_null<UserData*> user,
+			const style::icon &icon) {
+		auto result = Media::AddStoriesButton(
+			content,
+			_controller,
+			user,
+			tracker);
+		object_ptr<Profile::FloatingIcon>(
+			result,
+			icon,
+			st::infoSharedMediaButtonIconPosition);
+	};
 
+	if (auto user = _peer->asUser()) {
+		addStoriesButton(user, st::infoIconMediaGroup);
+	}
 	addMediaButton(MediaType::Photo, st::infoIconMediaPhoto);
 	addMediaButton(MediaType::Video, st::infoIconMediaVideo);
 	addMediaButton(MediaType::File, st::infoIconMediaFile);
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
new file mode 100644
index 000000000..a7739a77b
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -0,0 +1,191 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/stories/info_stories_inner_widget.h"
+
+#include "info/stories/info_stories_widget.h"
+#include "info/media/info_media_list_widget.h"
+#include "info/info_controller.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_info.h"
+
+namespace Info::Stories {
+
+class EmptyWidget : public Ui::RpWidget {
+public:
+	EmptyWidget(QWidget *parent);
+
+	void setFullHeight(rpl::producer<int> fullHeightValue);
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	object_ptr<Ui::FlatLabel> _text;
+	int _height = 0;
+
+};
+
+EmptyWidget::EmptyWidget(QWidget *parent)
+: RpWidget(parent)
+, _text(this, st::infoEmptyLabel) {
+}
+
+void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
+	std::move(
+		fullHeightValue
+	) | rpl::start_with_next([this](int fullHeight) {
+		// Make icon center be on 1/3 height.
+		auto iconCenter = fullHeight / 3;
+		auto iconHeight = st::infoEmptyFile.height();
+		auto iconTop = iconCenter - iconHeight / 2;
+		_height = iconTop + st::infoEmptyIconTop;
+		resizeToWidth(width());
+	}, lifetime());
+}
+
+int EmptyWidget::resizeGetHeight(int newWidth) {
+	auto labelTop = _height - st::infoEmptyLabelTop;
+	auto labelWidth = newWidth - 2 * st::infoEmptyLabelSkip;
+	_text->resizeToNaturalWidth(labelWidth);
+
+	auto labelLeft = (newWidth - _text->width()) / 2;
+	_text->moveToLeft(labelLeft, labelTop, newWidth);
+
+	update();
+	return _height;
+}
+
+void EmptyWidget::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto iconLeft = (width() - st::infoEmptyFile.width()) / 2;
+	const auto iconTop = height() - st::infoEmptyIconTop;
+	st::infoEmptyFile.paint(p, iconLeft, iconTop, width());
+}
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: RpWidget(parent)
+, _controller(controller)
+, _empty(this) {
+	_empty->heightValue(
+	) | rpl::start_with_next(
+		[this] { refreshHeight(); },
+		_empty->lifetime());
+	_list = setupList();
+}
+
+void InnerWidget::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+bool InnerWidget::showInternal(not_null<Memento*> memento) {
+	if (memento->section().type() == Section::Type::Stories) {
+		restoreState(memento);
+		return true;
+	}
+	return false;
+}
+
+object_ptr<Media::ListWidget> InnerWidget::setupList() {
+	auto result = object_ptr<Media::ListWidget>(
+		this,
+		_controller);
+	result->heightValue(
+	) | rpl::start_with_next(
+		[this] { refreshHeight(); },
+		result->lifetime());
+	using namespace rpl::mappers;
+	result->scrollToRequests(
+	) | rpl::map([widget = result.data()](int to) {
+		return Ui::ScrollToRequest {
+			widget->y() + to,
+			-1
+		};
+	}) | rpl::start_to_stream(
+		_scrollToRequests,
+		result->lifetime());
+	_selectedLists.fire(result->selectedListValue());
+	_listTops.fire(result->topValue());
+	return result;
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	_list->saveState(&memento->media());
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	_list->restoreState(&memento->media());
+}
+
+rpl::producer<SelectedItems> InnerWidget::selectedListValue() const {
+	return _selectedLists.events_starting_with(
+		_list->selectedListValue()
+	) | rpl::flatten_latest();
+}
+
+void InnerWidget::selectionAction(SelectionAction action) {
+	_list->selectionAction(action);
+}
+
+InnerWidget::~InnerWidget() = default;
+
+int InnerWidget::resizeGetHeight(int newWidth) {
+	_inResize = true;
+	auto guard = gsl::finally([this] { _inResize = false; });
+
+	_list->resizeToWidth(newWidth);
+	_empty->resizeToWidth(newWidth);
+	return recountHeight();
+}
+
+void InnerWidget::refreshHeight() {
+	if (_inResize) {
+		return;
+	}
+	resize(width(), recountHeight());
+}
+
+int InnerWidget::recountHeight() {
+	auto top = 0;
+	auto listHeight = 0;
+	if (_list) {
+		_list->moveToLeft(0, top);
+		listHeight = _list->heightNoMargins();
+		top += listHeight;
+	}
+	if (listHeight > 0) {
+		_empty->hide();
+	} else {
+		_empty->show();
+		_empty->moveToLeft(0, top);
+		top += _empty->heightNoMargins();
+	}
+	return top;
+}
+
+void InnerWidget::setScrollHeightValue(rpl::producer<int> value) {
+	using namespace rpl::mappers;
+	_empty->setFullHeight(rpl::combine(
+		std::move(value),
+		_listTops.events_starting_with(
+			_list->topValue()
+		) | rpl::flatten_latest(),
+		_1 - _2));
+}
+
+rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
new file mode 100644
index 000000000..f874b00f2
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -0,0 +1,78 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/widgets/scroll_area.h"
+#include "base/unique_qptr.h"
+
+namespace Ui {
+class SettingsSlider;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Info {
+class Controller;
+struct SelectedItems;
+enum class SelectionAction;
+} // namespace Info
+
+namespace Info::Media {
+class ListWidget;
+} // namespace Info::Media
+
+namespace Info::Stories {
+
+class Memento;
+class EmptyWidget;
+
+class InnerWidget final : public Ui::RpWidget {
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller);
+
+	bool showInternal(not_null<Memento*> memento);
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	void setScrollHeightValue(rpl::producer<int> value);
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+	rpl::producer<SelectedItems> selectedListValue() const;
+	void selectionAction(SelectionAction action);
+
+	~InnerWidget();
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	int recountHeight();
+	void refreshHeight();
+
+	object_ptr<Media::ListWidget> setupList();
+
+	const not_null<Controller*> _controller;
+
+	object_ptr<Media::ListWidget> _list = { nullptr };
+	object_ptr<EmptyWidget> _empty;
+
+	bool _inResize = false;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
+	rpl::event_stream<rpl::producer<int>> _listTops;
+
+};
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
new file mode 100644
index 000000000..bd5d88f93
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -0,0 +1,407 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/stories/info_stories_provider.h"
+
+#include "info/media/info_media_widget.h"
+#include "info/media/info_media_list_section.h"
+#include "info/info_controller.h"
+#include "data/data_document.h"
+#include "data/data_media_types.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_stories_ids.h"
+#include "main/main_account.h"
+#include "main/main_session.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "history/history.h"
+#include "core/application.h"
+#include "storage/storage_shared_media.h"
+#include "layout/layout_selection.h"
+#include "styles/style_info.h"
+
+namespace Info::Stories {
+namespace {
+
+using namespace Media;
+
+constexpr auto kPreloadedScreensCount = 4;
+constexpr auto kPreloadedScreensCountFull
+	= kPreloadedScreensCount + 1 + kPreloadedScreensCount;
+
+[[nodiscard]] int MinStoryHeight(int width) {
+	auto itemsLeft = st::infoMediaSkip;
+	auto itemsInRow = (width - itemsLeft)
+		/ (st::infoMediaMinGridSize + st::infoMediaSkip);
+	return (st::infoMediaMinGridSize + st::infoMediaSkip) / itemsInRow;
+}
+
+} // namespace
+
+Provider::Provider(not_null<AbstractController*> controller)
+: _controller(controller)
+, _peer(controller->key().storiesPeer())
+, _history(_peer->owner().history(_peer))
+, _tab(controller->key().storiesTab()) {
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		for (auto &layout : _layouts) {
+			layout.second.item->invalidateCache();
+		}
+	}, _lifetime);
+}
+
+Type Provider::type() {
+	return Type::PhotoVideo;
+}
+
+bool Provider::hasSelectRestriction() {
+	return false;
+}
+
+rpl::producer<bool> Provider::hasSelectRestrictionChanges() {
+	return rpl::never<bool>();
+}
+
+bool Provider::sectionHasFloatingHeader() {
+	return false;
+}
+
+QString Provider::sectionTitle(not_null<const BaseLayout*> item) {
+	return QString();
+}
+
+bool Provider::sectionItemBelongsHere(
+		not_null<const BaseLayout*> item,
+		not_null<const BaseLayout*> previous) {
+	return true;
+}
+
+bool Provider::isPossiblyMyItem(not_null<const HistoryItem*> item) {
+	return true;
+}
+
+std::optional<int> Provider::fullCount() {
+	return _slice.fullCount();
+}
+
+void Provider::restart() {
+	_layouts.clear();
+	_aroundId = kDefaultAroundId;
+	_idsLimit = kMinimalIdsLimit;
+	_slice = Data::StoriesIdsSlice();
+	refreshViewer();
+}
+
+void Provider::checkPreload(
+		QSize viewport,
+		not_null<BaseLayout*> topLayout,
+		not_null<BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) {
+	const auto visibleWidth = viewport.width();
+	const auto visibleHeight = viewport.height();
+	const auto preloadedHeight = kPreloadedScreensCountFull * visibleHeight;
+	const auto minItemHeight = MinStoryHeight(visibleWidth);
+	const auto preloadedCount = preloadedHeight / minItemHeight;
+	const auto preloadIdsLimitMin = (preloadedCount / 2) + 1;
+	const auto preloadIdsLimit = preloadIdsLimitMin
+		+ (visibleHeight / minItemHeight);
+	const auto after = _slice.skippedAfter();
+	const auto topLoaded = after && (*after == 0);
+	const auto before = _slice.skippedBefore();
+	const auto bottomLoaded = before && (*before == 0);
+
+	const auto minScreenDelta = kPreloadedScreensCount
+		- kPreloadIfLessThanScreens;
+	const auto minIdDelta = (minScreenDelta * visibleHeight)
+		/ minItemHeight;
+	const auto preloadAroundItem = [&](not_null<BaseLayout*> layout) {
+		auto preloadRequired = false;
+		const auto id = StoryIdFromMsgId(layout->getItem()->id);
+		if (!preloadRequired) {
+			preloadRequired = (_idsLimit < preloadIdsLimitMin);
+		}
+		if (!preloadRequired) {
+			auto delta = _slice.distance(_aroundId, id);
+			Assert(delta != std::nullopt);
+			preloadRequired = (qAbs(*delta) >= minIdDelta);
+		}
+		if (preloadRequired) {
+			_idsLimit = preloadIdsLimit;
+			_aroundId = id;
+			refreshViewer();
+		}
+	};
+
+	if (preloadTop && !topLoaded) {
+		preloadAroundItem(topLayout);
+	} else if (preloadBottom && !bottomLoaded) {
+		preloadAroundItem(bottomLayout);
+	}
+}
+
+void Provider::setSearchQuery(QString query) {
+}
+
+void Provider::refreshViewer() {
+	_viewerLifetime.destroy();
+	const auto idForViewer = _aroundId;
+	const auto session = &_peer->session();
+	auto ids = (_tab == Tab::Saved)
+		? Data::SavedStoriesIds(_peer, idForViewer, _idsLimit)
+		: Data::ArchiveStoriesIds(session, idForViewer, _idsLimit);
+	std::move(
+		ids
+	) | rpl::start_with_next([=](Data::StoriesIdsSlice &&slice) {
+		if (!slice.fullCount()) {
+			// Don't display anything while full count is unknown.
+			return;
+		}
+		_slice = std::move(slice);
+		if (const auto nearest = _slice.nearest(idForViewer)) {
+			_aroundId = *nearest;
+		}
+		_refreshed.fire({});
+	}, _viewerLifetime);
+}
+
+rpl::producer<> Provider::refreshed() {
+	return _refreshed.events();
+}
+
+std::vector<ListSection> Provider::fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) {
+	markLayoutsStale();
+	const auto guard = gsl::finally([&] { clearStaleLayouts(); });
+
+	auto result = std::vector<ListSection>();
+	auto section = ListSection(Type::PhotoVideo, sectionDelegate());
+	auto count = _slice.size();
+	for (auto i = count; i != 0;) {
+		const auto storyId = _slice[--i];
+		if (const auto layout = getLayout(storyId, delegate)) {
+			if (!section.addItem(layout)) {
+				section.finishSection();
+				result.push_back(std::move(section));
+				section = ListSection(Type::PhotoVideo, sectionDelegate());
+				section.addItem(layout);
+			}
+		}
+	}
+	if (!section.empty()) {
+		section.finishSection();
+		result.push_back(std::move(section));
+	}
+	return result;
+}
+
+void Provider::markLayoutsStale() {
+	for (auto &layout : _layouts) {
+		layout.second.stale = true;
+	}
+}
+
+void Provider::clearStaleLayouts() {
+	for (auto i = _layouts.begin(); i != _layouts.end();) {
+		if (i->second.stale) {
+			_layoutRemoved.fire(i->second.item.get());
+			const auto taken = _items.take(i->first);
+			i = _layouts.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+rpl::producer<not_null<BaseLayout*>> Provider::layoutRemoved() {
+	return _layoutRemoved.events();
+}
+
+BaseLayout *Provider::lookupLayout(const HistoryItem *item) {
+	return nullptr;
+}
+
+bool Provider::isMyItem(not_null<const HistoryItem*> item) {
+	return IsStoryMsgId(item->id) && (item->history()->peer == _peer);
+}
+
+bool Provider::isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) {
+	return (a->id < b->id);
+}
+
+void Provider::itemRemoved(not_null<const HistoryItem*> item) {
+	const auto id = StoryIdFromMsgId(item->id);
+	if (const auto i = _layouts.find(id); i != end(_layouts)) {
+		_layoutRemoved.fire(i->second.item.get());
+		_layouts.erase(i);
+	}
+}
+
+BaseLayout *Provider::getLayout(
+		StoryId id,
+		not_null<Overview::Layout::Delegate*> delegate) {
+	auto it = _layouts.find(id);
+	if (it == _layouts.end()) {
+		if (auto layout = createLayout(id, delegate)) {
+			layout->initDimensions();
+			it = _layouts.emplace(id, std::move(layout)).first;
+		} else {
+			return nullptr;
+		}
+	}
+	it->second.stale = false;
+	return it->second.item.get();
+}
+
+HistoryItem *Provider::ensureItem(StoryId id) {
+	const auto i = _items.find(id);
+	if (i != end(_items)) {
+		return i->second.get();
+	}
+	auto item = _peer->owner().stories().resolveItem({ _peer->id, id });
+	if (!item) {
+		return nullptr;
+	}
+	return _items.emplace(id, std::move(item)).first->second.get();
+}
+
+std::unique_ptr<BaseLayout> Provider::createLayout(
+		StoryId id,
+		not_null<Overview::Layout::Delegate*> delegate) {
+	const auto item = ensureItem(id);
+	if (!item) {
+		return nullptr;
+	}
+	const auto getPhoto = [&]() -> PhotoData* {
+		if (const auto media = item->media()) {
+			return media->photo();
+		}
+		return nullptr;
+	};
+	const auto getFile = [&]() -> DocumentData* {
+		if (const auto media = item->media()) {
+			return media->document();
+		}
+		return nullptr;
+	};
+	// #TODO stories
+	const auto maybeStory = item->history()->owner().stories().lookup(
+		{ item->history()->peer->id, StoryIdFromMsgId(item->id) });
+	const auto spoiler = maybeStory && !(*maybeStory)->expired();
+
+	using namespace Overview::Layout;
+	if (const auto photo = getPhoto()) {
+		return std::make_unique<Photo>(delegate, item, photo, spoiler);
+	} else if (const auto file = getFile()) {
+		return std::make_unique<Video>(delegate, item, file, spoiler);
+	}
+	return nullptr;
+}
+
+ListItemSelectionData Provider::computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) {
+	auto result = ListItemSelectionData(selection);
+	result.canDelete = true;
+	result.canForward = item->allowsForward()
+		&& (&item->history()->session() == &_controller->session());
+	return result;
+}
+
+void Provider::applyDragSelection(
+		ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) {
+	const auto fromId = fromItem->id - (skipFrom ? 1 : 0);
+	const auto tillId = tillItem->id - (skipTill ? 0 : 1);
+	for (auto i = selected.begin(); i != selected.end();) {
+		const auto itemId = i->first->id;
+		if (itemId > fromId || itemId <= tillId) {
+			i = selected.erase(i);
+		} else {
+			++i;
+		}
+	}
+	for (auto &layoutItem : _layouts) {
+		const auto id = StoryIdToMsgId(layoutItem.first);
+		if (id <= fromId && id > tillId) {
+			const auto i = _items.find(id);
+			Assert(i != end(_items));
+			const auto item = i->second.get();
+			ChangeItemSelection(
+				selected,
+				item,
+				computeSelectionData(item, FullSelection));
+		}
+	}
+}
+
+bool Provider::allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return false;
+}
+
+QString Provider::showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return QString();
+}
+
+int64 Provider::scrollTopStatePosition(not_null<HistoryItem*> item) {
+	return StoryIdFromMsgId(item->id);
+}
+
+HistoryItem *Provider::scrollTopStateItem(ListScrollTopState state) {
+	if (state.item && _slice.indexOf(StoryIdFromMsgId(state.item->id))) {
+		return state.item;
+	} else if (const auto id = _slice.nearest(state.position)) {
+		const auto full = FullMsgId(_peer->id, StoryIdToMsgId(*id));
+		if (const auto item = _controller->session().data().message(full)) {
+			return item;
+		}
+	}
+	return state.item;
+}
+
+void Provider::saveState(
+		not_null<Media::Memento*> memento,
+		ListScrollTopState scrollState) {
+	if (_aroundId != kDefaultAroundId && scrollState.item) {
+		memento->setAroundId({ _peer->id, _aroundId });
+		memento->setIdsLimit(_idsLimit);
+		memento->setScrollTopItem(scrollState.item->globalId());
+		memento->setScrollTopItemPosition(scrollState.position);
+		memento->setScrollTopShift(scrollState.shift);
+	}
+}
+
+void Provider::restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(ListScrollTopState)> restoreScrollState) {
+	if (const auto limit = memento->idsLimit()) {
+		const auto wasAroundId = memento->aroundId();
+		if (wasAroundId.peer == _peer->id) {
+			_idsLimit = limit;
+			_aroundId = StoryIdFromMsgId(wasAroundId.msg);
+			restoreScrollState({
+				.position = memento->scrollTopItemPosition(),
+				.item = MessageByGlobalId(memento->scrollTopItem()),
+				.shift = memento->scrollTopShift(),
+			});
+			refreshViewer();
+		}
+	}
+}
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.h b/Telegram/SourceFiles/info/stories/info_stories_provider.h
new file mode 100644
index 000000000..f1fb535d3
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.h
@@ -0,0 +1,132 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+#include "data/data_stories_ids.h"
+#include "info/media/info_media_common.h"
+
+class DocumentData;
+class HistoryItem;
+class PeerData;
+class History;
+
+namespace Info {
+class AbstractController;
+} // namespace Info
+
+namespace Info::Stories {
+
+enum class Tab;
+
+class Provider final
+	: public Media::ListProvider
+	, private Media::ListSectionDelegate
+	, public base::has_weak_ptr {
+public:
+	explicit Provider(not_null<AbstractController*> controller);
+
+	Media::Type type() override;
+	bool hasSelectRestriction() override;
+	rpl::producer<bool> hasSelectRestrictionChanges() override;
+	bool isPossiblyMyItem(not_null<const HistoryItem*> item) override;
+
+	std::optional<int> fullCount() override;
+
+	void restart() override;
+	void checkPreload(
+		QSize viewport,
+		not_null<Media::BaseLayout*> topLayout,
+		not_null<Media::BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) override;
+	void refreshViewer() override;
+	rpl::producer<> refreshed() override;
+
+	void setSearchQuery(QString query) override;
+
+	std::vector<Media::ListSection> fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) override;
+	rpl::producer<not_null<Media::BaseLayout*>> layoutRemoved() override;
+	Media::BaseLayout *lookupLayout(const HistoryItem *item) override;
+	bool isMyItem(not_null<const HistoryItem*> item) override;
+	bool isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) override;
+
+	Media::ListItemSelectionData computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) override;
+	void applyDragSelection(
+		Media::ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) override;
+
+	bool allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+	QString showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+
+	int64 scrollTopStatePosition(not_null<HistoryItem*> item) override;
+	HistoryItem *scrollTopStateItem(
+		Media::ListScrollTopState state) override;
+	void saveState(
+		not_null<Media::Memento*> memento,
+		Media::ListScrollTopState scrollState) override;
+	void restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(Media::ListScrollTopState)> restoreScrollState) override;
+
+private:
+	static constexpr auto kMinimalIdsLimit = 16;
+	static constexpr auto kDefaultAroundId = ServerMaxStoryId - 1;
+
+	bool sectionHasFloatingHeader() override;
+	QString sectionTitle(not_null<const Media::BaseLayout*> item) override;
+	bool sectionItemBelongsHere(
+		not_null<const Media::BaseLayout*> item,
+		not_null<const Media::BaseLayout*> previous) override;
+
+	void itemRemoved(not_null<const HistoryItem*> item);
+	void markLayoutsStale();
+	void clearStaleLayouts();
+
+	[[nodiscard]] HistoryItem *ensureItem(StoryId id);
+	[[nodiscard]] Media::BaseLayout *getLayout(
+		StoryId id,
+		not_null<Overview::Layout::Delegate*> delegate);
+	[[nodiscard]] std::unique_ptr<Media::BaseLayout> createLayout(
+		StoryId id,
+		not_null<Overview::Layout::Delegate*> delegate);
+
+	const not_null<AbstractController*> _controller;
+	const not_null<PeerData*> _peer;
+	const not_null<History*> _history;
+	const Tab _tab;
+
+	StoryId _aroundId = kDefaultAroundId;
+	int _idsLimit = kMinimalIdsLimit;
+	Data::StoriesIdsSlice _slice;
+
+	base::flat_map<StoryId, std::shared_ptr<HistoryItem>> _items;
+	std::unordered_map<StoryId, Media::CachedItem> _layouts;
+	rpl::event_stream<not_null<Media::BaseLayout*>> _layoutRemoved;
+	rpl::event_stream<> _refreshed;
+
+	bool _started = false;
+
+	rpl::lifetime _lifetime;
+	rpl::lifetime _viewerLifetime;
+
+};
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
new file mode 100644
index 000000000..67b8f602b
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -0,0 +1,112 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/stories/info_stories_widget.h"
+
+#include "info/stories/info_stories_inner_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "ui/widgets/scroll_area.h"
+#include "lang/lang_keys.h"
+
+namespace Info::Stories {
+
+Memento::Memento(not_null<Controller*> controller)
+: ContentMemento(Tag{ controller->storiesPeer(), controller->storiesTab() })
+, _media(controller) {
+}
+
+Memento::Memento(not_null<PeerData*> peer)
+: ContentMemento(Tag{ peer })
+, _media(peer, 0, Media::Type::PhotoVideo) {
+}
+
+Memento::~Memento() = default;
+
+Section Memento::section() const {
+	return Section(Section::Type::Stories);
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: ContentWidget(parent, controller) {
+	_inner = setInnerWidget(object_ptr<InnerWidget>(
+		this,
+		controller));
+	_inner->setScrollHeightValue(scrollHeightValue());
+	_inner->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		scrollTo(request);
+	}, _inner->lifetime());
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	if (!controller()->validateMementoPeer(memento)) {
+		return false;
+	}
+	if (auto storiesMemento = dynamic_cast<Memento*>(memento.get())) {
+		restoreState(storiesMemento);
+		return true;
+	}
+	return false;
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+		setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
+	saveState(result.get());
+	return result;
+}
+
+void Widget::saveState(not_null<Memento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+rpl::producer<SelectedItems> Widget::selectedListValue() const {
+	return _inner->selectedListValue();
+}
+
+void Widget::selectionAction(SelectionAction action) {
+	_inner->selectionAction(action);
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_menu_my_stories(); // #TODO stories
+}
+
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(peer)));
+}
+
+} // namespace Info::Stories
+
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
new file mode 100644
index 000000000..17e96a1d6
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+#include "info/media/info_media_widget.h"
+
+namespace Info::Stories {
+
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	Memento(not_null<Controller*> controller);
+	Memento(not_null<PeerData*> peer);
+	~Memento();
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	[[nodiscard]] Media::Memento &media() {
+		return _media;
+	}
+	[[nodiscard]] const Media::Memento &media() const {
+		return _media;
+	}
+
+private:
+	Media::Memento _media;
+
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(QWidget *parent, not_null<Controller*> controller);
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+	rpl::producer<SelectedItems> selectedListValue() const override;
+	void selectionAction(SelectionAction action) override;
+
+	rpl::producer<QString> title() override;
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	InnerWidget *_inner = nullptr;
+
+};
+
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer);
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index bb7337650..76f04f871 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -393,12 +393,10 @@ void Controller::show(
 	auto &stories = story->owner().stories();
 	const auto storyId = story->fullId();
 	const auto id = storyId.story;
-	const auto &all = stories.all();
-	const auto inAll = all.find(storyId.peer);
-	auto source = (inAll != end(all)) ? &inAll->second : nullptr;
+	auto source = stories.source(storyId.peer);
 	auto single = StoriesSource{ story->peer()->asUser() };
 	v::match(context.data, [&](StoriesContextSingle) {
-		source = &single;
+		source = nullptr;
 		hideSiblings();
 	}, [&](StoriesContextPeer) {
 		hideSiblings();
@@ -423,17 +421,11 @@ void Controller::show(
 		}
 	});
 	const auto idDates = story->idDates();
-	if (!source) {
-		return;
-	} else if (source == &single) {
+	_index = source ? (source->ids.find(idDates) - begin(source->ids)) : 0;
+	if (!source || _index == source->ids.size()) {
+		source = &single;
 		single.ids.emplace(idDates);
 		_index = 0;
-	} else {
-		const auto k = source->ids.find(idDates);
-		if (k == end(source->ids)) {
-			return;
-		}
-		_index = (k - begin(source->ids));
 	}
 	const auto guard = gsl::finally([&] {
 		_paused = false;
@@ -543,12 +535,11 @@ void Controller::showSibling(
 		sibling = nullptr;
 		return;
 	}
-	const auto &all = session->data().stories().all();
-	const auto i = all.find(peerId);
-	if (i == end(all)) {
+	const auto source = session->data().stories().source(peerId);
+	if (!source) {
 		sibling = nullptr;
-	} else if (!sibling || !sibling->shows(i->second)) {
-		sibling = std::make_unique<Sibling>(this, i->second);
+	} else if (!sibling || !sibling->shows(*source)) {
+		sibling = std::make_unique<Sibling>(this, *source);
 	}
 }
 
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 9e3340c1c..c51984f6a 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -42,6 +42,7 @@ inputMediaInvoice#8eb5a6d5 flags:# title:string description:string photo:flags.0
 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;
+inputMediaStory#9a86b58f user_id:InputUser id:int = InputMedia;
 
 inputChatPhotoEmpty#1ca48f57 = InputChatPhoto;
 inputChatUploadedPhoto#bdcdaec0 flags:# file:flags.0?InputFile video:flags.1?InputFile video_start_ts:flags.2?double video_emoji_markup:flags.3?VideoSize = InputChatPhoto;
@@ -128,6 +129,7 @@ messageMediaInvoice#f6a548d3 flags:# shipping_address_requested:flags.1?true tes
 messageMediaGeoLive#b940c666 flags:# geo:GeoPoint heading:flags.0?int period:int proximity_notification_radius:flags.1?int = MessageMedia;
 messageMediaPoll#4bd6e798 poll:Poll results:PollResults = MessageMedia;
 messageMediaDice#3f7ee58b value:int emoticon:string = MessageMedia;
+messageMediaStory#c79aee11 user_id:long id:int = MessageMedia;
 
 messageActionEmpty#b6aef7b0 = MessageAction;
 messageActionChatCreate#bd47cbad title:string users:Vector<long> = MessageAction;
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 1a03e874f..b2f213527 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -39,6 +39,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_information.h"
 #include "info/profile/info_profile_badge.h"
 #include "info/profile/info_profile_emoji_status_panel.h"
+#include "info/stories/info_stories_widget.h"
+#include "info/info_memento.h"
 #include "base/qt_signal_producer.h"
 #include "boxes/about_box.h"
 #include "ui/boxes/confirm_box.h"
@@ -766,16 +768,16 @@ void MainMenu::setupMenu() {
 				_menu,
 				CreateButton(
 					_menu,
-					rpl::single(u"My Stories"_q),
+					tr::lng_menu_my_stories(),
 					st::mainMenuButton,
 					IconDescriptor{
 						&st::settingsIconSavedMessages,
 						kIconLightOrange
 					})));
 		const auto stories = &controller->session().data().stories();
-		const auto &all = stories->all();
-		const auto mine = all.find(controller->session().userPeerId());
-		if ((mine != end(all) && !mine->second.ids.empty())
+		const auto mine = stories->source(
+			controller->session().userPeerId());
+		if ((mine && !mine->ids.empty())
 			|| stories->expiredMineCount() > 0) {
 			wrap->toggle(true, anim::type::instant);
 		} else {
@@ -789,7 +791,8 @@ void MainMenu::setupMenu() {
 			}
 		}
 		wrap->entity()->setClickedCallback([=] {
-			controller->showToast(u"My Stories"_q);
+			controller->showSection(
+				Info::Stories::Make(controller->session().user()));
 		});
 	} else {
 		addAction(
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index a39f552d2..d6214affc 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2143,6 +2143,9 @@ void SessionController::openPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId contextId,
 		MsgId topicRootId) {
+	if (openStory(contextId)) {
+		return;
+	}
 	_window->openInMediaView(Media::View::OpenRequest(
 		this,
 		photo,
@@ -2161,7 +2164,9 @@ void SessionController::openDocument(
 		FullMsgId contextId,
 		MsgId topicRootId,
 		bool showInMediaView) {
-	if (showInMediaView) {
+	if (openStory(contextId)) {
+		return;
+	} else if (showInMediaView) {
 		_window->openInMediaView(Media::View::OpenRequest(
 			this,
 			document,
@@ -2176,6 +2181,31 @@ void SessionController::openDocument(
 		topicRootId);
 }
 
+bool SessionController::openStory(
+		FullMsgId fakeItemId,
+		bool forceArchiveContext) {
+	if (!peerIsUser(fakeItemId.peer)
+		|| !IsStoryMsgId(fakeItemId.msg)) {
+		return false;
+	}
+	const auto maybeStory = session().data().stories().lookup({
+		fakeItemId.peer,
+		StoryIdFromMsgId(fakeItemId.msg),
+	});
+	if (maybeStory) {
+		using namespace Data;
+		const auto story = *maybeStory;
+		const auto context = !story->expired()
+			? StoriesContext{ StoriesContextPeer() }
+			: (story->pinned() && !forceArchiveContext)
+			? StoriesContext{ StoriesContextSaved() }
+			: StoriesContext{ StoriesContextArchive() };
+		_window->openInMediaView(
+			::Media::View::OpenRequest(this, *maybeStory, context));
+	}
+	return true;
+}
+
 auto SessionController::cachedChatThemeValue(
 	const Data::CloudTheme &data,
 	const Data::WallPaper &paper,
@@ -2484,14 +2514,12 @@ void SessionController::openPeerStories(
 	using namespace Data;
 
 	auto &stories = session().data().stories();
-	const auto &all = stories.all();
-	const auto i = all.find(peerId);
-	if (i != end(all)) {
-		const auto j = i->second.ids.lower_bound(
-			StoryIdDates{ i->second.readTill + 1 });
+	if (const auto source = stories.source(peerId)) {
+		const auto j = source->ids.lower_bound(
+			StoryIdDates{ source->readTill + 1 });
 		openPeerStory(
-			i->second.user,
-			j != i->second.ids.end() ? j->id : i->second.ids.front().id,
+			source->user,
+			j != source->ids.end() ? j->id : source->ids.front().id,
 			{ list });
 	}
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 5e1139ad1..f92f7d98f 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -491,6 +491,7 @@ public:
 		FullMsgId contextId,
 		MsgId topicRootId,
 		bool showInMediaView = false);
+	bool openStory(FullMsgId fakeItemId, bool forceArchiveContext = false);
 
 	void showChooseReportMessages(
 		not_null<PeerData*> peer,

From 5e5b252f2fb01a34ed9d5ac9024e3329e061bf76 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 7 Jun 2023 19:56:38 +0400
Subject: [PATCH 281/676] Support correct saved stories / archive loading.

---
 Telegram/Resources/langs/lang.strings         |   4 +
 Telegram/SourceFiles/data/data_stories.cpp    | 203 ++++++++++++------
 Telegram/SourceFiles/data/data_stories.h      |  27 +--
 .../SourceFiles/data/data_stories_ids.cpp     | 156 ++++++++++----
 Telegram/SourceFiles/info/info_controller.cpp |   3 +-
 .../info/media/info_media_buttons.h           |   6 +-
 .../info/media/info_media_inner_widget.h      |   7 +-
 .../stories/info_stories_inner_widget.cpp     |  59 ++++-
 .../info/stories/info_stories_inner_widget.h  |   9 +
 .../info/stories/info_stories_widget.cpp      |  24 ++-
 .../info/stories/info_stories_widget.h        |   9 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   2 +-
 Telegram/SourceFiles/settings/settings.style  |   3 -
 .../settings/settings_privacy_security.cpp    |  19 +-
 .../SourceFiles/window/window_main_menu.cpp   |  13 +-
 15 files changed, 382 insertions(+), 162 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 40783dbab..154400cb6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3800,6 +3800,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_views#other" = "{count} views";
 "lng_stories_no_views" = "No views";
 
+"lng_stories_my_title" = "My Stories";
+"lng_stories_archive_button" = "Archive";
+"lng_stories_archive_title" = "Stories Archive";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index fc164eb17..972e3c69a 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -33,8 +33,8 @@ constexpr auto kMaxResolveTogether = 100;
 constexpr auto kIgnorePreloadAroundIfLoaded = 15;
 constexpr auto kPreloadAroundCount = 30;
 constexpr auto kMarkAsReadDelay = 3 * crl::time(1000);
-constexpr auto kExpiredMineFirstPerPage = 30;
-constexpr auto kExpiredMinePerPage = 100;
+constexpr auto kArchiveFirstPerPage = 30;
+constexpr auto kArchivePerPage = 100;
 constexpr auto kSavedFirstPerPage = 30;
 constexpr auto kSavedPerPage = 100;
 
@@ -333,6 +333,9 @@ void Stories::apply(const MTPDupdateStory &data) {
 	const auto wasInfo = i->second.info();
 	i->second.ids.emplace(idDates);
 	const auto nowInfo = i->second.info();
+	if (user->isSelf() && i->second.readTill < idDates.id) {
+		i->second.readTill = idDates.id;
+	}
 	if (wasInfo == nowInfo) {
 		return;
 	}
@@ -361,15 +364,44 @@ void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
 		if (i != end(_stories)) {
 			auto stories = base::take(i->second);
 			_stories.erase(i);
+
+			auto archiveChanged = false;
+			auto savedChanged = false;
+			if (peer->isSelf()) {
+				for (const auto &[id, story] : stories) {
+					if (_archive.list.remove(id)) {
+						archiveChanged = true;
+						if (_archiveTotal > 0) {
+							--_archiveTotal;
+						}
+					}
+				}
+			}
+			const auto j = _saved.find(peer->id);
+			const auto saved = (j != end(_saved)) ? &j->second : nullptr;
 			for (const auto &[id, story] : stories) {
 				// Duplicated in Stories::applyDeleted.
 				_deleted.emplace(FullStoryId{ peer->id, id });
 				_expiring.remove(story->expires(), story->fullId());
+				if (story->pinned() && saved) {
+					if (saved->ids.list.remove(id)) {
+						savedChanged = true;
+						if (saved->total > 0) {
+							--saved->total;
+						}
+					}
+				}
 				session().changes().storyUpdated(
 					story.get(),
 					UpdateFlag::Destroyed);
 				removeDependencyStory(story.get());
 			}
+			if (archiveChanged) {
+				_archiveChanged.fire({});
+			}
+			if (savedChanged) {
+				_savedChanged.fire_copy(peer->id);
+			}
 		}
 		_sourceChanged.fire_copy(peer->id);
 	} else {
@@ -471,6 +503,8 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 	if (result.ids.empty()) {
 		applyDeletedFromSources(peerId, StorySourcesList::All);
 		return;
+	} else if (user->isSelf()) {
+		result.readTill = result.ids.back().id;
 	}
 	const auto info = result.info();
 	const auto i = _all.find(peerId);
@@ -526,15 +560,20 @@ Story *Stories::parseAndApply(
 	auto &stories = _stories[peer->id];
 	const auto i = stories.find(id);
 	if (i != end(stories)) {
-		if (i->second->applyChanges(*media, data)) {
+		const auto result = i->second.get();
+		const auto pinned = result->pinned();
+		if (result->applyChanges(*media, data)) {
+			if (result->pinned() != pinned) {
+				savedStateUpdated(result);
+			}
 			session().changes().storyUpdated(
-				i->second.get(),
+				result,
 				UpdateFlag::Edited);
-			if (const auto item = lookupItem(i->second.get())) {
-				item->applyChanges(i->second.get());
+			if (const auto item = lookupItem(result)) {
+				item->applyChanges(result);
 			}
 		}
-		return i->second.get();
+		return result;
 	}
 	const auto result = stories.emplace(id, std::make_unique<Story>(
 		id,
@@ -543,6 +582,19 @@ Story *Stories::parseAndApply(
 		data.vdate().v,
 		data.vexpire_date().v)).first->second.get();
 	result->applyChanges(*media, data);
+	if (result->pinned()) {
+		savedStateUpdated(result);
+	}
+
+	if (peer->isSelf()) {
+		const auto added = _archive.list.emplace(id).second;
+		if (added) {
+			if (_archiveTotal >= 0 && id > _archiveLastId) {
+				++_archiveTotal;
+			}
+			_archiveChanged.fire({});
+		}
+	}
 
 	if (expired) {
 		_expiring.remove(expires, result->fullId());
@@ -617,6 +669,30 @@ void Stories::unregisterDependentMessage(
 	}
 }
 
+void Stories::savedStateUpdated(not_null<Story*> story) {
+	const auto id = story->id();
+	const auto peer = story->peer()->id;
+	const auto pinned = story->pinned();
+	if (pinned) {
+		auto &saved = _saved[peer];
+		const auto added = saved.ids.list.emplace(id).second;
+		if (added) {
+			if (saved.total >= 0 && id > saved.lastId) {
+				++saved.total;
+			}
+			_savedChanged.fire_copy(peer);
+		}
+	} else if (const auto i = _saved.find(peer); i != end(_saved)) {
+		auto &saved = i->second;
+		if (saved.ids.list.remove(id)) {
+			if (saved.total > 0) {
+				--saved.total;
+			}
+			_savedChanged.fire_copy(peer);
+		}
+	}
+}
+
 void Stories::loadMore(StorySourcesList list) {
 	const auto index = static_cast<int>(list);
 	if (_loadMoreRequestId[index] || _sourcesLoaded[index]) {
@@ -744,20 +820,38 @@ void Stories::applyDeleted(FullStoryId id) {
 	applyRemovedFromActive(id);
 
 	_deleted.emplace(id);
-	const auto j = _stories.find(id.peer);
-	if (j != end(_stories)) {
-		const auto k = j->second.find(id.story);
-		if (k != end(j->second)) {
+	const auto i = _stories.find(id.peer);
+	if (i != end(_stories)) {
+		const auto j = i->second.find(id.story);
+		if (j != end(i->second)) {
 			// Duplicated in Stories::apply(peer, const MTPUserStories*).
-			auto story = std::move(k->second);
+			auto story = std::move(j->second);
 			_expiring.remove(story->expires(), story->fullId());
-			j->second.erase(k);
+			i->second.erase(j);
 			session().changes().storyUpdated(
 				story.get(),
 				UpdateFlag::Destroyed);
 			removeDependencyStory(story.get());
-			if (j->second.empty()) {
-				_stories.erase(j);
+			if (id.peer == session().userPeerId()
+				&& _archive.list.remove(id.story)) {
+				if (_archiveTotal > 0) {
+					--_archiveTotal;
+				}
+				_archiveChanged.fire({});
+			}
+			if (story->pinned()) {
+				if (const auto k = _saved.find(id.peer); k != end(_saved)) {
+					const auto saved = &k->second;
+					if (saved->ids.list.remove(id.story)) {
+						if (saved->total > 0) {
+							--saved->total;
+						}
+						_savedChanged.fire_copy(id.peer);
+					}
+				}
+			}
+			if (i->second.empty()) {
+				_stories.erase(i);
 			}
 		}
 	}
@@ -766,9 +860,7 @@ void Stories::applyDeleted(FullStoryId id) {
 void Stories::applyExpired(FullStoryId id) {
 	if (const auto maybeStory = lookup(id)) {
 		const auto story = *maybeStory;
-		if (story->peer()->isSelf()) {
-			addToExpiredMine(story);
-		} else if (!story->pinned()) {
+		if (!story->peer()->isSelf() && !story->pinned()) {
 			applyDeleted(id);
 			return;
 		}
@@ -776,13 +868,6 @@ void Stories::applyExpired(FullStoryId id) {
 	applyRemovedFromActive(id);
 }
 
-void Stories::addToExpiredMine(not_null<Story*> story) {
-	const auto added = _expiredMine.list.emplace(story->id()).second;
-	if (added && _expiredMineTotal >= 0) {
-		++_expiredMineTotal;
-	}
-}
-
 void Stories::applyRemovedFromActive(FullStoryId id) {
 	const auto removeFromList = [&](StorySourcesList list) {
 		const auto index = static_cast<int>(list);
@@ -1172,24 +1257,24 @@ void Stories::loadViewsSlice(
 	}).send();
 }
 
-const StoriesIds &Stories::expiredMine() const {
-	return _expiredMine;
+const StoriesIds &Stories::archive() const {
+	return _archive;
 }
 
-rpl::producer<> Stories::expiredMineChanged() const {
-	return _expiredMineChanged.events();
+rpl::producer<> Stories::archiveChanged() const {
+	return _archiveChanged.events();
 }
 
-int Stories::expiredMineCount() const {
-	return std::max(_expiredMineTotal, 0);
+int Stories::archiveCount() const {
+	return std::max(_archiveTotal, 0);
 }
 
-bool Stories::expiredMineCountKnown() const {
-	return _expiredMineTotal >= 0;
+bool Stories::archiveCountKnown() const {
+	return _archiveTotal >= 0;
 }
 
-bool Stories::expiredMineLoaded() const {
-	return _expiredMineLoaded;
+bool Stories::archiveLoaded() const {
+	return _archiveLoaded;
 }
 
 const StoriesIds *Stories::saved(PeerId peerId) const {
@@ -1216,46 +1301,43 @@ bool Stories::savedLoaded(PeerId peerId) const {
 	return (i != end(_saved)) && i->second.loaded;
 }
 
-void Stories::expiredMineLoadMore() {
-	if (_expiredMineRequestId) {
+void Stories::archiveLoadMore() {
+	if (_archiveRequestId || _archiveLoaded) {
 		return;
 	}
 	const auto api = &_owner->session().api();
-	_expiredMineRequestId = api->request(MTPstories_GetExpiredStories(
-		MTP_int(_expiredMineLastId),
-		MTP_int(_expiredMineLastId
-			? kExpiredMinePerPage
-			: kExpiredMineFirstPerPage)
+	_archiveRequestId = api->request(MTPstories_GetStoriesArchive(
+		MTP_int(_archiveLastId),
+		MTP_int(_archiveLastId ? kArchivePerPage : kArchiveFirstPerPage)
 	)).done([=](const MTPstories_Stories &result) {
-		_expiredMineRequestId = 0;
+		_archiveRequestId = 0;
 
 		const auto &data = result.data();
 		const auto self = _owner->session().user();
 		const auto now = base::unixtime::now();
-		_expiredMineTotal = data.vcount().v;
+		_archiveTotal = data.vcount().v;
 		for (const auto &story : data.vstories().v) {
 			const auto id = story.match([&](const auto &id) {
 				return id.vid().v;
 			});
-			_expiredMine.list.emplace(id);
-			_expiredMineLastId = id;
+			_archive.list.emplace(id);
+			_archiveLastId = id;
 			if (!parseAndApply(self, story, now)) {
-				_expiredMine.list.remove(id);
-				if (_expiredMineTotal > 0) {
-					--_expiredMineTotal;
+				_archive.list.remove(id);
+				if (_archiveTotal > 0) {
+					--_archiveTotal;
 				}
 			}
 		}
-		_expiredMineTotal = std::max(
-			_expiredMineTotal,
-			int(_expiredMine.list.size()));
-		_expiredMineLoaded = data.vstories().v.empty();
-		_expiredMineChanged.fire({});
+		const auto ids = int(_archive.list.size());
+		_archiveLoaded = data.vstories().v.empty();
+		_archiveTotal = _archiveLoaded ? ids : std::max(_archiveTotal, ids);
+		_archiveChanged.fire({});
 	}).fail([=] {
-		_expiredMineRequestId = 0;
-		_expiredMineLoaded = true;
-		_expiredMineTotal = int(_expiredMine.list.size());
-		_expiredMineChanged.fire({});
+		_archiveRequestId = 0;
+		_archiveLoaded = true;
+		_archiveTotal = int(_archive.list.size());
+		_archiveChanged.fire({});
 	}).send();
 }
 
@@ -1263,7 +1345,7 @@ void Stories::savedLoadMore(PeerId peerId) {
 	Expects(peerIsUser(peerId));
 
 	auto &saved = _saved[peerId];
-	if (saved.requestId) {
+	if (saved.requestId || saved.loaded) {
 		return;
 	}
 	const auto api = &_owner->session().api();
@@ -1292,8 +1374,9 @@ void Stories::savedLoadMore(PeerId peerId) {
 				}
 			}
 		}
-		saved.total = std::max(saved.total, int(saved.ids.list.size()));
+		const auto ids = int(saved.ids.list.size());
 		saved.loaded = data.vstories().v.empty();
+		saved.total = saved.loaded ? ids : std::max(saved.total, ids);
 		_savedChanged.fire_copy(peerId);
 	}).fail([=] {
 		auto &saved = _saved[peerId];
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 5d26f7474..a94b6ef12 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -230,12 +230,12 @@ public:
 		std::optional<StoryView> offset,
 		Fn<void(std::vector<StoryView>)> done);
 
-	[[nodiscard]] const StoriesIds &expiredMine() const;
-	[[nodiscard]] rpl::producer<> expiredMineChanged() const;
-	[[nodiscard]] int expiredMineCount() const;
-	[[nodiscard]] bool expiredMineCountKnown() const;
-	[[nodiscard]] bool expiredMineLoaded() const;
-	void expiredMineLoadMore();
+	[[nodiscard]] const StoriesIds &archive() const;
+	[[nodiscard]] rpl::producer<> archiveChanged() const;
+	[[nodiscard]] int archiveCount() const;
+	[[nodiscard]] bool archiveCountKnown() const;
+	[[nodiscard]] bool archiveLoaded() const;
+	void archiveLoadMore();
 
 	[[nodiscard]] const StoriesIds *saved(PeerId peerId) const;
 	[[nodiscard]] rpl::producer<PeerId> savedChanged() const;
@@ -273,6 +273,7 @@ private:
 	void applyRemovedFromActive(FullStoryId id);
 	void applyDeletedFromSources(PeerId id, StorySourcesList list);
 	void removeDependencyStory(not_null<Story*> story);
+	void savedStateUpdated(not_null<Story*> story);
 	void sort(StorySourcesList list);
 
 	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
@@ -282,7 +283,7 @@ private:
 	void sendMarkAsReadRequest(not_null<PeerData*> peer, StoryId tillId);
 
 	void requestUserStories(not_null<UserData*> user);
-	void addToExpiredMine(not_null<Story*> story);
+	void addToArchive(not_null<Story*> story);
 	void registerExpiring(TimeId expires, FullStoryId id);
 	void scheduleExpireTimer();
 	void processExpired();
@@ -321,12 +322,12 @@ private:
 	rpl::event_stream<PeerId> _sourceChanged;
 	rpl::event_stream<PeerId> _itemsChanged;
 
-	StoriesIds _expiredMine;
-	int _expiredMineTotal = -1;
-	StoryId _expiredMineLastId = 0;
-	bool _expiredMineLoaded = false;
-	rpl::event_stream<> _expiredMineChanged;
-	mtpRequestId _expiredMineRequestId = 0;
+	StoriesIds _archive;
+	int _archiveTotal = -1;
+	StoryId _archiveLastId = 0;
+	bool _archiveLoaded = false;
+	rpl::event_stream<> _archiveChanged;
+	mtpRequestId _archiveRequestId = 0;
 
 	std::unordered_map<PeerId, Saved> _saved;
 	rpl::event_stream<PeerId> _savedChanged;
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index 610d51c3a..21d0878a6 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_stories_ids.h"
 
+#include "data/data_changes.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -23,62 +24,108 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 
 		struct State {
 			StoriesIdsSlice slice;
+			base::has_weak_ptr guard;
+			bool scheduled = false;
 		};
 		const auto state = lifetime.make_state<State>();
 
 		const auto push = [=] {
+			state->scheduled = false;
+
 			const auto stories = &peer->owner().stories();
 			if (!stories->savedCountKnown(peer->id)) {
 				return;
 			}
 
-			const auto source = stories->source(peer->id);
 			const auto saved = stories->saved(peer->id);
 			const auto count = stories->savedCount(peer->id);
+			const auto around = saved->list.lower_bound(aroundId);
 			Assert(saved != nullptr);
-			auto ids = base::flat_set<StoryId>();
-			ids.reserve(saved->list.size() + 1);
-			auto total = count;
-			if (source && !source->ids.empty()) {
-				++total;
-				const auto current = source->ids.front().id;
-				for (const auto id : ranges::views::reverse(saved->list)) {
-					const auto i = source->ids.lower_bound(
-						StoryIdDates{ id });
-					if (i != end(source->ids) && i->id == id) {
-						--total;
-					} else {
+			const auto source = stories->source(peer->id);
+			if (!source || source->ids.empty()) {
+				const auto hasBefore = int(around - begin(saved->list));
+				const auto hasAfter = int(end(saved->list) - around);
+				if (hasAfter < limit) {
+					stories->savedLoadMore(peer->id);
+				}
+				const auto takeBefore = std::min(hasBefore, limit);
+				const auto takeAfter = std::min(hasAfter, limit);
+				auto ids = base::flat_set<StoryId>{
+					std::make_reverse_iterator(around + takeAfter),
+					std::make_reverse_iterator(around - takeBefore)
+				};
+				const auto added = int(ids.size());
+				state->slice = StoriesIdsSlice(
+					std::move(ids),
+					count,
+					(hasBefore - takeBefore),
+					count - hasBefore - added);
+			} else {
+				auto ids = base::flat_set<StoryId>();
+				auto added = 0;
+				auto skipped = 0;
+				auto skippedBefore = (around - begin(saved->list));
+				auto skippedAfter = (end(saved->list) - around);
+				const auto &active = source->ids;
+				const auto process = [&](StoryId id) {
+					const auto i = active.lower_bound(StoryIdDates{ id });
+					if (i == end(active) || i->id != id) {
 						ids.emplace(id);
+						++added;
+					} else {
+						++skipped;
+					}
+					return (added < limit);
+				};
+				ids.reserve(2 * limit + 1);
+				for (auto i = around, b = begin(saved->list); i != b;) {
+					--skippedBefore;
+					if (!process(*--i)) {
+						break;
 					}
 				}
-				ids.emplace(current);
-			} else {
-				auto all = saved->list | ranges::views::reverse;
-				ids = { begin(all), end(all) };
+				if (ids.size() < limit) {
+					ids.emplace(active.back().id); // #TODO stories fake max story id
+				} else {
+					++skippedBefore;
+				}
+				added = 0;
+				for (auto i = around, e = end(saved->list); i != e; ++i) {
+					--skippedAfter;
+					if (!process(*i)) {
+						break;
+					}
+				}
+				state->slice = StoriesIdsSlice(
+					std::move(ids),
+					count - skipped + 1,
+					skippedBefore,
+					skippedAfter);
 			}
-			const auto added = int(ids.size());
-			state->slice = StoriesIdsSlice(
-				std::move(ids),
-				total,
-				0,
-				total - added);
 			consumer.put_next_copy(state->slice);
 		};
+		const auto schedule = [=] {
+			if (state->scheduled) {
+				return;
+			}
+			state->scheduled = true;
+			Ui::PostponeCall(&state->guard, [=] {
+				if (state->scheduled) {
+					push();
+				}
+			});
+		};
 
 		const auto stories = &peer->owner().stories();
 		stories->sourceChanged(
 		) | rpl::filter(
 			rpl::mappers::_1 == peer->id
-		) | rpl::start_with_next([=] {
-			push();
-		}, lifetime);
+		) | rpl::start_with_next(schedule, lifetime);
 
 		stories->savedChanged(
 		) | rpl::filter(
 			rpl::mappers::_1 == peer->id
-		) | rpl::start_with_next([=] {
-			push();
-		}, lifetime);
+		) | rpl::start_with_next(schedule, lifetime);
 
 		if (!stories->savedCountKnown(peer->id)) {
 			stories->savedLoadMore(peer->id);
@@ -99,38 +146,59 @@ rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
 
 		struct State {
 			StoriesIdsSlice slice;
+			base::has_weak_ptr guard;
+			bool scheduled = false;
 		};
 		const auto state = lifetime.make_state<State>();
 
 		const auto push = [=] {
+			state->scheduled = false;
+
 			const auto stories = &session->data().stories();
-			if (!stories->expiredMineCountKnown()) {
+			if (!stories->archiveCountKnown()) {
 				return;
 			}
 
-			const auto expired = stories->expiredMine();
-			const auto count = stories->expiredMineCount();
-			auto ids = base::flat_set<StoryId>();
-			ids.reserve(expired.list.size() + 1);
-			auto all = expired.list | ranges::views::reverse;
-			ids = { begin(all), end(all) };
+			const auto &archive = stories->archive();
+			const auto count = stories->archiveCount();
+			const auto i = archive.list.lower_bound(aroundId);
+			const auto hasBefore = int(i - begin(archive.list));
+			const auto hasAfter = int(end(archive.list) - i);
+			if (hasAfter < limit) {
+				stories->archiveLoadMore();
+			}
+			const auto takeBefore = std::min(hasBefore, limit);
+			const auto takeAfter = std::min(hasAfter, limit);
+			auto ids = base::flat_set<StoryId>{
+				std::make_reverse_iterator(i + takeAfter),
+				std::make_reverse_iterator(i - takeBefore)
+			};
 			const auto added = int(ids.size());
 			state->slice = StoriesIdsSlice(
 				std::move(ids),
 				count,
-				0,
-				count - added);
+				(hasBefore - takeBefore),
+				count - hasBefore - added);
 			consumer.put_next_copy(state->slice);
 		};
+		const auto schedule = [=] {
+			if (state->scheduled) {
+				return;
+			}
+			state->scheduled = true;
+			Ui::PostponeCall(&state->guard, [=] {
+				if (state->scheduled) {
+					push();
+				}
+			});
+		};
 
 		const auto stories = &session->data().stories();
-		stories->expiredMineChanged(
-		) | rpl::start_with_next([=] {
-			push();
-		}, lifetime);
+		stories->archiveChanged(
+		) | rpl::start_with_next(schedule, lifetime);
 
-		if (!stories->expiredMineCountKnown()) {
-			stories->expiredMineLoadMore();
+		if (!stories->archiveCountKnown()) {
+			stories->archiveLoadMore();
 		}
 
 		push();
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index a9c57a75f..d7beb981e 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -266,7 +266,8 @@ bool Controller::validateMementoPeer(
 		not_null<ContentMemento*> memento) const {
 	return memento->peer() == peer()
 		&& memento->migratedPeerId() == migratedPeerId()
-		&& memento->settingsSelf() == settingsSelf();
+		&& memento->settingsSelf() == settingsSelf()
+		&& memento->storiesPeer() == storiesPeer();
 }
 
 void Controller::setSection(not_null<ContentMemento*> memento) {
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index b460edada..8ba60b121 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -131,13 +131,13 @@ inline auto AddStoriesButton(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<UserData*> user,
 		Ui::MultiSlideTracker &tracker) {
-	auto count = Data::SavedStoriesIds(
+	auto count = rpl::single(0) | rpl::then(Data::SavedStoriesIds(
 		user,
 		ServerMaxStoryId - 1,
 		0
 	) | rpl::map([](const Data::StoriesIdsSlice &slice) {
-		return slice.fullCount();
-	}) | rpl::filter_optional();
+		return slice.fullCount().value_or(0);
+	}));
 	auto result = AddCountedButton(
 		parent,
 		std::move(count),
diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.h b/Telegram/SourceFiles/info/media/info_media_inner_widget.h
index a7a2ce61d..4e305de40 100644
--- a/Telegram/SourceFiles/info/media/info_media_inner_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.h
@@ -20,10 +20,10 @@ class SearchFieldController;
 } // namespace Ui
 
 namespace Info {
-
 class Controller;
+} // namespace Info
 
-namespace Media {
+namespace Info::Media {
 
 class Memento;
 class ListWidget;
@@ -86,5 +86,4 @@ private:
 
 };
 
-} // namespace Media
-} // namespace Info
+} // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index a7739a77b..fe32be04d 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -7,10 +7,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/stories/info_stories_inner_widget.h"
 
-#include "info/stories/info_stories_widget.h"
+#include "data/data_peer.h"
 #include "info/media/info_media_list_widget.h"
+#include "info/profile/info_profile_icon.h"
+#include "info/stories/info_stories_widget.h"
 #include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "lang/lang_keys.h"
+#include "settings/settings_common.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
 #include "styles/style_info.h"
 
 namespace Info::Stories {
@@ -83,6 +90,49 @@ InnerWidget::InnerWidget(
 	_list = setupList();
 }
 
+void InnerWidget::setupArchive() {
+	const auto key = _controller->key();
+	const auto peer = key.storiesPeer();
+	if (peer
+		&& peer->isSelf()
+		&& key.storiesTab() == Stories::Tab::Saved
+		&& _isStackBottom) {
+		createArchiveButton();
+	} else {
+		_archive.destroy();
+		refreshHeight();
+	}
+}
+
+void InnerWidget::createArchiveButton() {
+	_archive.create(this);
+	_archive->show();
+
+	const auto button = ::Settings::AddButton(
+		_archive,
+		tr::lng_stories_archive_button(),
+		st::infoSharedMediaButton);
+	button->addClickHandler([=] {
+		_controller->showSection(Info::Stories::Make(
+			_controller->key().storiesPeer(),
+			Stories::Tab::Archive));
+	});
+	object_ptr<Profile::FloatingIcon>(
+		button,
+		st::infoIconMediaGroup,
+		st::infoSharedMediaButtonIconPosition)->show();
+	_archive->add(object_ptr<Ui::FixedHeightWidget>(
+		_archive,
+		st::infoProfileSkip));
+	_archive->add(object_ptr<Ui::BoxContentDivider>(_archive));
+
+	_archive->resizeToWidth(width());
+	_archive->heightValue(
+	) | rpl::start_with_next([=] {
+		refreshHeight();
+	}, _archive->lifetime());
+}
+
 void InnerWidget::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
@@ -144,6 +194,9 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 	_inResize = true;
 	auto guard = gsl::finally([this] { _inResize = false; });
 
+	if (_archive) {
+		_archive->resizeToWidth(newWidth);
+	}
 	_list->resizeToWidth(newWidth);
 	_empty->resizeToWidth(newWidth);
 	return recountHeight();
@@ -158,6 +211,10 @@ void InnerWidget::refreshHeight() {
 
 int InnerWidget::recountHeight() {
 	auto top = 0;
+	if (_archive) {
+		_archive->moveToLeft(0, top);
+		top += _archive->heightNoMargins() - st::lineWidth;
+	}
 	auto listHeight = 0;
 	if (_list) {
 		_list->moveToLeft(0, top);
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index f874b00f2..e683013fe 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -38,6 +38,10 @@ public:
 		not_null<Controller*> controller);
 
 	bool showInternal(not_null<Memento*> memento);
+	void setIsStackBottom(bool isStackBottom) {
+		_isStackBottom = isStackBottom;
+		setupArchive();
+	}
 
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
@@ -60,14 +64,19 @@ private:
 	int recountHeight();
 	void refreshHeight();
 
+	void setupArchive();
+	void createArchiveButton();
+
 	object_ptr<Media::ListWidget> setupList();
 
 	const not_null<Controller*> _controller;
 
+	object_ptr<Ui::VerticalLayout> _archive = { nullptr };
 	object_ptr<Media::ListWidget> _list = { nullptr };
 	object_ptr<EmptyWidget> _empty;
 
 	bool _inResize = false;
+	bool _isStackBottom = false;
 
 	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
 	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index 67b8f602b..bca32b356 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -20,8 +20,8 @@ Memento::Memento(not_null<Controller*> controller)
 , _media(controller) {
 }
 
-Memento::Memento(not_null<PeerData*> peer)
-: ContentMemento(Tag{ peer })
+Memento::Memento(not_null<PeerData*> peer, Tab tab)
+: ContentMemento(Tag{ peer, tab })
 , _media(peer, 0, Media::Type::PhotoVideo) {
 }
 
@@ -54,13 +54,21 @@ Widget::Widget(
 	}, _inner->lifetime());
 }
 
+void Widget::setIsStackBottom(bool isStackBottom) {
+	ContentWidget::setIsStackBottom(isStackBottom);
+	_inner->setIsStackBottom(isStackBottom);
+}
+
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
 	if (!controller()->validateMementoPeer(memento)) {
 		return false;
 	}
 	if (auto storiesMemento = dynamic_cast<Memento*>(memento.get())) {
-		restoreState(storiesMemento);
-		return true;
+		const auto tab = controller()->key().storiesTab();
+		if (storiesMemento->storiesTab() == tab) {
+			restoreState(storiesMemento);
+			return true;
+		}
 	}
 	return false;
 }
@@ -98,14 +106,16 @@ void Widget::selectionAction(SelectionAction action) {
 }
 
 rpl::producer<QString> Widget::title() {
-	return tr::lng_menu_my_stories(); // #TODO stories
+	return (controller()->key().storiesTab() == Tab::Archive)
+		? tr::lng_stories_archive_title()
+		: tr::lng_stories_my_title();
 }
 
-std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer) {
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, Tab tab) {
 	return std::make_shared<Info::Memento>(
 		std::vector<std::shared_ptr<ContentMemento>>(
 			1,
-			std::make_shared<Memento>(peer)));
+			std::make_shared<Memento>(peer, tab)));
 }
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
index 17e96a1d6..45df73f2b 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -13,11 +13,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info::Stories {
 
 class InnerWidget;
+enum class Tab;
 
 class Memento final : public ContentMemento {
 public:
 	Memento(not_null<Controller*> controller);
-	Memento(not_null<PeerData*> peer);
+	Memento(not_null<PeerData*> peer, Tab tab);
 	~Memento();
 
 	object_ptr<ContentWidget> createWidget(
@@ -43,6 +44,8 @@ class Widget final : public ContentWidget {
 public:
 	Widget(QWidget *parent, not_null<Controller*> controller);
 
+	void setIsStackBottom(bool isStackBottom) override;
+
 	bool showInternal(
 		not_null<ContentMemento*> memento) override;
 
@@ -65,6 +68,8 @@ private:
 
 };
 
-[[nodiscard]] std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer);
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(
+	not_null<PeerData*> peer,
+	Tab tab = {});
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index c51984f6a..577a291a1 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -2093,7 +2093,7 @@ stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
 stories.getAllStories#eeb0d625 flags:# next:flags.1?true include_hidden:flags.2?true state:flags.0?string = stories.AllStories;
 stories.getUserStories#96d528e0 user_id:InputUser = stories.UserStories;
 stories.getPinnedStories#b471137 user_id:InputUser offset_id:int limit:int = stories.Stories;
-stories.getExpiredStories#8f792f2 offset_id:int limit:int = stories.Stories;
+stories.getStoriesArchive#1f5bc5d2 offset_id:int limit:int = stories.Stories;
 stories.getStoriesByID#6a15cf46 user_id:InputUser id:Vector<int> = stories.Stories;
 stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
 stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 17aa1c405..bfdc586d6 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -104,10 +104,7 @@ settingsIconMinus: icon {{ "settings/minus", settingsIconFg }};
 settingsIconTimer: icon {{ "settings/timer", settingsIconFg }};
 settingsIconLaptop: icon {{ "settings/laptop", settingsIconFg }};
 settingsIconArrows: icon {{ "settings/arrows", settingsIconFg }};
-settingsIconOnline: icon {{ "settings/online", settingsIconFg }};
-settingsIconVideoCalls: icon {{ "settings/video_calls", settingsIconFg }};
 settingsIconEmail: icon {{ "settings/email", settingsIconFg }};
-settingsIconForward: icon {{ "settings/forward", settingsIconFg }};
 settingsIconSound: icon {{ "settings/sound", settingsIconFg }};
 settingsIconDock: icon {{ "settings/dock", settingsIconFg }};
 settingsIconPin: icon {{ "settings/pin", settingsIconFg }};
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 7b8b3e73c..92f8229fe 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -125,17 +125,15 @@ void AddPremiumPrivacyButton(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> label,
-		IconDescriptor &&descriptor,
 		Privacy::Key key,
 		Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory) {
 	const auto shower = Ui::CreateChild<rpl::lifetime>(container.get());
 	const auto session = &controller->session();
-	const auto &st = st::settingsButton;
+	const auto &st = st::settingsButtonNoIcon;
 	const auto button = AddButton(
 		container,
 		rpl::duplicate(label),
-		st,
-		std::move(descriptor));
+		st);
 	struct State {
 		State(QWidget *parent) : widget(parent) {
 			widget.setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -260,59 +258,50 @@ void SetupPrivacy(
 	using Key = Privacy::Key;
 	const auto add = [&](
 			rpl::producer<QString> label,
-			IconDescriptor &&descriptor,
 			Key key,
 			auto controllerFactory) {
 		AddPrivacyButton(
 			controller,
 			container,
 			std::move(label),
-			std::move(descriptor),
+			{},
 			key,
 			controllerFactory);
 	};
 	add(
 		tr::lng_settings_phone_number_privacy(),
-		{ &st::settingsIconCalls, kIconGreen },
 		Key::PhoneNumber,
 		[=] { return std::make_unique<PhoneNumberPrivacyController>(
 			controller); });
 	add(
 		tr::lng_settings_last_seen(),
-		{ &st::settingsIconOnline, kIconLightBlue },
 		Key::LastSeen,
 		[=] { return std::make_unique<LastSeenPrivacyController>(session); });
 	add(
 		tr::lng_settings_profile_photo_privacy(),
-		{ &st::settingsIconAccount, kIconRed },
 		Key::ProfilePhoto,
 		[] { return std::make_unique<ProfilePhotoPrivacyController>(); });
 	add(
 		tr::lng_settings_forwards_privacy(),
-		{ &st::settingsIconForward, kIconLightOrange },
 		Key::Forwards,
 		[=] { return std::make_unique<ForwardsPrivacyController>(
 			controller); });
 	add(
 		tr::lng_settings_calls(),
-		{ &st::settingsIconVideoCalls, kIconGreen },
 		Key::Calls,
 		[] { return std::make_unique<CallsPrivacyController>(); });
 	add(
 		tr::lng_settings_groups_invite(),
-		{ &st::settingsIconGroup, kIconDarkBlue },
 		Key::Invites,
 		[] { return std::make_unique<GroupsInvitePrivacyController>(); });
 	AddPremiumPrivacyButton(
 		controller,
 		container,
 		tr::lng_settings_voices_privacy(),
-		{ &st::settingsPremiumIconVoice, kIconRed },
 		Key::Voices,
 		[=] { return std::make_unique<VoicesPrivacyController>(session); });
 	add(
 		tr::lng_settings_bio_privacy(),
-		{ &st::settingsIconAccount, kIconDarkOrange },
 		Key::About,
 		[] { return std::make_unique<AboutPrivacyController>(); });
 
@@ -832,7 +821,7 @@ void AddPrivacyButton(
 		container,
 		std::move(label),
 		PrivacyString(session, key),
-		st::settingsButton,
+		st::settingsButtonNoIcon,
 		std::move(descriptor)
 	)->addClickHandler([=] {
 		*shower = session->api().userPrivacy().value(
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index b2f213527..227a00d42 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -775,18 +775,15 @@ void MainMenu::setupMenu() {
 						kIconLightOrange
 					})));
 		const auto stories = &controller->session().data().stories();
-		const auto mine = stories->source(
-			controller->session().userPeerId());
-		if ((mine && !mine->ids.empty())
-			|| stories->expiredMineCount() > 0) {
+		if (stories->archiveCount() > 0) {
 			wrap->toggle(true, anim::type::instant);
 		} else {
 			wrap->toggle(false, anim::type::instant);
-			if (!stories->expiredMineCountKnown()) {
-				stories->expiredMineLoadMore();
-				wrap->toggleOn(stories->expiredMineChanged(
+			if (!stories->archiveCountKnown()) {
+				stories->archiveLoadMore();
+				wrap->toggleOn(stories->archiveChanged(
 				) | rpl::map([=] {
-					return stories->expiredMineCount() > 0;
+					return stories->archiveCount() > 0;
 				}) | rpl::filter(rpl::mappers::_1) | rpl::take(1));
 			}
 		}

From 087c27c5e04ba6a0c6e4aa90684d8e4fdf95a436 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 8 Jun 2023 11:11:07 +0400
Subject: [PATCH 282/676] Fix expire calculations for the stories.

---
 Telegram/SourceFiles/boxes/peer_list_controllers.cpp  | 11 +++++------
 Telegram/SourceFiles/data/data_stories.cpp            |  4 ++--
 .../SourceFiles/dialogs/ui/dialogs_stories_list.cpp   |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 7fa6e5384..86150e820 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/random.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/wrap/padding_wrap.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "main/main_session.h"
@@ -86,12 +87,10 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 				Data::StorySourcesList::All),
 			[=] { return state->stories->height() - box->scrollTop(); });
 		const auto raw = state->stories = stories.data();
-		box->peerListSetAboveWidget(std::move(stories));
-
-		raw->entered(
-		) | rpl::start_with_next([=] {
-			//clearSelection();
-		}, raw->lifetime());
+		box->peerListSetAboveWidget(object_ptr<::Ui::PaddingWrap<>>(
+			box,
+			std::move(stories),
+			style::margins(0, st::membersMarginTop, 0, 0)));
 
 		raw->clicks(
 		) | rpl::start_with_next([=](uint64 id) {
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 972e3c69a..52eb79672 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -552,7 +552,7 @@ Story *Stories::parseAndApply(
 		return nullptr;
 	}
 	const auto expires = data.vexpire_date().v;
-	const auto expired = (expires >= now);
+	const auto expired = (expires <= now);
 	if (expired && !data.is_pinned() && !peer->isSelf()) {
 		return nullptr;
 	}
@@ -618,7 +618,7 @@ StoryIdDates Stories::parseAndApply(
 		return StoryIdDates();
 	}, [&](const MTPDstoryItemSkipped &data) {
 		const auto expires = data.vexpire_date().v;
-		const auto expired = (expires >= now);
+		const auto expired = (expires <= now);
 		const auto fullId = FullStoryId{ peer->id, data.vid().v };
 		if (!expired) {
 			registerExpiring(expires, fullId);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index ec470a92d..213af18b7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -337,8 +337,6 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto drawFull = (ratio > 0.);
 	auto hq = PainterHighQualityEnabler(p);
 
-	paintSummary(p, rendering, summaryTop, ratio);
-
 	const auto count = std::max(
 		layout.endIndexFull - layout.startIndexFull,
 		layout.endIndexSmall - layout.startIndexSmall);
@@ -485,6 +483,8 @@ void List::paintEvent(QPaintEvent *e) {
 		}
 		p.setOpacity(1.);
 	});
+
+	paintSummary(p, rendering, summaryTop, ratio);
 }
 
 void List::validateUserpic(not_null<Item*> item) {

From c1be4d645180980ab15fc4e452b938c3e2dcefc0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 8 Jun 2023 12:20:19 +0400
Subject: [PATCH 283/676] Hide self in small stories userpics.

---
 .../dialogs/ui/dialogs_stories_content.cpp    |  1 +
 .../dialogs/ui/dialogs_stories_list.cpp       | 79 +++++++++++++------
 .../dialogs/ui/dialogs_stories_list.h         |  2 +
 3 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 0e6f05b3e..c47282c26 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -148,6 +148,7 @@ Content State::next() {
 			.userpic = std::move(userpic),
 			.unread = info.unread,
 			.hidden = info.hidden,
+			.self = user->isSelf(),
 		});
 	}
 	return result;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 213af18b7..c53282395 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -39,6 +39,7 @@ struct List::Layout {
 	float64 photoLeft = 0.;
 	float64 left = 0.;
 	float64 single = 0.;
+	int smallSkip = 0;
 	int leftFull = 0;
 	int leftSmall = 0;
 	int singleFull = 0;
@@ -114,17 +115,18 @@ void List::showContent(Content &&content) {
 
 List::Summaries List::ComposeSummaries(Data &data) {
 	const auto total = int(data.items.size());
+	const auto skip = (total > 1 && data.items[0].user.self) ? 1 : 0;
 	auto unreadInFirst = 0;
 	auto unreadTotal = 0;
-	for (auto i = 0; i != total; ++i) {
+	for (auto i = skip; i != total; ++i) {
 		if (data.items[i].user.unread) {
 			++unreadTotal;
-			if (i < kSmallUserpicsShown) {
+			if (i < skip + kSmallUserpicsShown) {
 				++unreadInFirst;
 			}
 		}
 	}
-	auto result = Summaries();
+	auto result = Summaries{ .skipSelf = (skip > 0) };
 	result.total.string
 		= tr::lng_stories_row_count(tr::now, lt_count, total);
 	const auto append = [&](QString &to, int index, bool last) {
@@ -143,13 +145,13 @@ List::Summaries List::ComposeSummaries(Data &data) {
 	};
 	if (!total) {
 		return result;
-	} else if (total <= kSmallUserpicsShown) {
-		for (auto i = 0; i != total; ++i) {
+	} else if (total <= skip + kSmallUserpicsShown) {
+		for (auto i = skip; i != total; ++i) {
 			append(result.allNames.string, i, i == total - 1);
 		}
 	}
 	if (unreadInFirst > 0 && unreadInFirst == unreadTotal) {
-		for (auto i = 0; i != total; ++i) {
+		for (auto i = skip; i != total; ++i) {
 			if (data.items[i].user.unread) {
 				append(result.unreadNames.string, i, !--unreadTotal);
 			}
@@ -265,11 +267,16 @@ List::Layout List::computeLayout() const {
 		+ st::defaultDialogRow.photoSize
 		+ st::defaultDialogRow.padding.left();
 	const auto narrow = (width() <= narrowWidth);
-	const auto smallCount = std::min(kSmallUserpicsShown, itemsCount);
+	const auto smallSkip = (itemsCount > 1 && rendering.items[0].user.self)
+		? 1
+		: 0;
+	const auto smallCount = std::min(
+		kSmallUserpicsShown,
+		itemsCount - smallSkip);
 	const auto smallWidth = st.photo + (smallCount - 1) * st.shift;
-	const auto leftSmall = narrow
+	const auto leftSmall = (narrow
 		? ((narrowWidth - smallWidth) / 2 - st.photoLeft)
-		: st.left;
+		: st.left) - (smallSkip ? st.shift : 0);
 	const auto leftFull = (narrow
 		? ((narrowWidth - full.photo) / 2 - full.photoLeft)
 		: full.left) - _scrollLeft;
@@ -278,9 +285,9 @@ List::Layout List::computeLayout() const {
 	const auto endIndexFull = std::min(
 		(width() - leftFull + singleFull - 1) / singleFull,
 		itemsCount);
-	const auto startIndexSmall = 0;
-	const auto endIndexSmall = smallCount;
-	const auto cellLeftSmall = leftSmall;
+	const auto startIndexSmall = std::min(startIndexFull, smallSkip);
+	const auto endIndexSmall = smallSkip + smallCount;
+	const auto cellLeftSmall = leftSmall + (startIndexSmall * st.shift);
 	const auto userpicLeftFull = cellLeftFull + full.photoLeft;
 	const auto userpicLeftSmall = cellLeftSmall + st.photoLeft;
 	const auto userpicLeft = lerp(userpicLeftSmall, userpicLeftFull);
@@ -293,6 +300,7 @@ List::Layout List::computeLayout() const {
 		.photoLeft = photoLeft,
 		.left = userpicLeft - photoLeft,
 		.single = lerp(st.shift, singleFull),
+		.smallSkip = smallSkip,
 		.leftFull = leftFull,
 		.leftSmall = leftSmall,
 		.singleFull = singleFull,
@@ -355,7 +363,9 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto lookup = [&](int index) {
 		const auto indexSmall = layout.startIndexSmall + index;
 		const auto indexFull = layout.startIndexFull + index;
-		const auto small = (drawSmall && indexSmall < layout.endIndexSmall)
+		const auto small = (drawSmall
+			&& indexSmall < layout.endIndexSmall
+			&& indexSmall >= layout.smallSkip)
 			? &rendering.items[indexSmall]
 			: nullptr;
 		const auto full = (drawFull && indexFull < layout.endIndexFull)
@@ -370,20 +380,33 @@ void List::paintEvent(QPaintEvent *e) {
 	};
 	const auto enumerate = [&](auto &&paintGradient, auto &&paintOther) {
 		auto nextGradientPainted = false;
-		for (auto i = count; i != 0;) {
+		auto skippedPainted = false;
+		const auto first = layout.smallSkip - layout.startIndexSmall;
+		for (auto i = count; i != first;) {
 			--i;
+			const auto next = (i > 0) ? lookup(i - 1) : Single();
 			const auto gradientPainted = nextGradientPainted;
 			nextGradientPainted = false;
 			if (const auto current = lookup(i)) {
+				if (i == first && next && !skippedPainted) {
+					skippedPainted = true;
+					paintGradient(next);
+					paintOther(next);
+				}
 				if (!gradientPainted) {
 					paintGradient(current);
 				}
-				if (i > 0 && hasUnread(current)) {
-					if (const auto next = lookup(i - 1)) {
-						if (current.itemSmall || !next.itemSmall) {
-							nextGradientPainted = true;
-							paintGradient(next);
+				if (i > first && hasUnread(current) && next) {
+					if (current.itemSmall || !next.itemSmall) {
+						if (i - 1 == first && first > 0 && !skippedPainted) {
+							if (const auto skipped = lookup(i - 2)) {
+								skippedPainted = true;
+								paintGradient(skipped);
+								paintOther(skipped);
+							}
 						}
+						nextGradientPainted = true;
+						paintGradient(next);
 					}
 				}
 				paintOther(current);
@@ -523,7 +546,9 @@ List::Summary &List::ChooseSummary(
 		int totalItems,
 		int fullWidth) {
 	const auto &st = st::dialogsStories;
-	const auto used = std::min(totalItems, kSmallUserpicsShown);
+	const auto used = std::min(
+		totalItems - (summaries.skipSelf ? 1 : 0),
+		kSmallUserpicsShown);
 	const auto taken = st.left
 		+ st.photoLeft
 		+ st.photo
@@ -579,7 +604,9 @@ void List::paintSummary(
 	};
 	const auto &st = st::dialogsStories;
 	const auto &full = st::dialogsStoriesFull;
-	const auto used = std::min(total, kSmallUserpicsShown);
+	const auto used = std::min(
+		total - (data.summaries.skipSelf ? 1 : 0),
+		kSmallUserpicsShown);
 	const auto fullLeft = st.left
 		+ st.photoLeft
 		+ st.photo
@@ -760,15 +787,20 @@ void List::updateSelected() {
 	const auto layout = computeLayout();
 	const auto firstRightFull = layout.leftFull
 		+ (layout.startIndexFull + 1) * layout.singleFull;
+	const auto secondLeftFull = firstRightFull;
 	const auto firstRightSmall = layout.leftSmall
 		+ st.photoLeft
 		+ st.photo;
+	const auto secondLeftSmall = layout.smallSkip
+		? (layout.leftSmall + st.photoLeft + st.shift)
+		: firstRightSmall;
 	const auto lastRightAddFull = 0;
 	const auto lastRightAddSmall = st.photoLeft;
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * layout.ratio;
 	};
 	const auto firstRight = lerp(firstRightSmall, firstRightFull);
+	const auto secondLeft = lerp(secondLeftSmall, secondLeftFull);
 	const auto lastRightAdd = lerp(lastRightAddSmall, lastRightAddFull);
 	const auto activateFull = (layout.ratio >= 0.5);
 	const auto startIndex = activateFull
@@ -778,9 +810,10 @@ void List::updateSelected() {
 		? layout.endIndexFull
 		: layout.endIndexSmall;
 	const auto x = p.x();
-	const auto infiniteIndex = (x < firstRight)
+	const auto infiniteIndex = (x < secondLeft)
 		? 0
-		: int(std::floor(((x - firstRight) / layout.single) + 1));
+		: int(
+			std::floor((std::max(x - firstRight, 0.)) / layout.single) + 1);
 	const auto index = (endIndex == startIndex)
 		? -1
 		: (infiniteIndex == endIndex - startIndex
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 4221dcbc3..72fd67a9a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -31,6 +31,7 @@ struct User {
 	std::shared_ptr<Userpic> userpic;
 	bool unread = false;
 	bool hidden = false;
+	bool self = false;
 
 	friend inline bool operator==(const User &a, const User &b) = default;
 };
@@ -87,6 +88,7 @@ private:
 		Summary total;
 		Summary allNames;
 		Summary unreadNames;
+		bool skipSelf = false;
 	};
 	struct Data {
 		std::vector<Item> items;

From 0ed200beee2ff0755ce57e8bfc9feae3f659febf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 8 Jun 2023 19:54:21 +0400
Subject: [PATCH 284/676] Show / expand / collapse / hide reactions strip.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../chat_helpers/emoji_list_widget.cpp        |  11 +-
 .../chat_helpers/emoji_list_widget.h          |   4 +-
 Telegram/SourceFiles/data/data_stories.cpp    |   2 +-
 .../history_view_compose_controls.cpp         |   7 +-
 .../controls/history_view_compose_controls.h  |   2 +
 .../history_view_reactions_selector.cpp       |  69 ++---
 .../history_view_reactions_selector.h         |  27 +-
 .../stories/media_stories_controller.cpp      |  50 +++-
 .../media/stories/media_stories_controller.h  |  11 +
 .../media/stories/media_stories_delegate.h    |   6 +
 .../media/stories/media_stories_reactions.cpp | 239 ++++++++++++++++++
 .../media/stories/media_stories_reactions.h   |  57 +++++
 .../media/stories/media_stories_reply.cpp     |   4 +
 .../media/stories/media_stories_reply.h       |   1 +
 .../media/stories/media_stories_view.cpp      |   4 +
 .../media/stories/media_stories_view.h        |   1 +
 .../SourceFiles/media/view/media_view.style   |   3 +
 .../media/view/media_view_overlay_widget.cpp  |  17 +-
 .../media/view/media_view_overlay_widget.h    |  14 +-
 .../SourceFiles/ui/controls/tabbed_search.cpp |  11 +
 .../SourceFiles/ui/controls/tabbed_search.h   |   2 +
 22 files changed, 490 insertions(+), 54 deletions(-)
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_reactions.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c42e141da..8f6ea9975 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -981,6 +981,8 @@ PRIVATE
     media/stories/media_stories_delegate.h
     media/stories/media_stories_header.cpp
     media/stories/media_stories_header.h
+    media/stories/media_stories_reactions.cpp
+    media/stories/media_stories_reactions.h
     media/stories/media_stories_recent_views.cpp
     media/stories/media_stories_recent_views.h
     media/stories/media_stories_reply.cpp
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 9f29463ce..f41482c19 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -623,6 +623,10 @@ rpl::producer<> EmojiListWidget::jumpedToPremium() const {
 	return _jumpedToPremium.events();
 }
 
+rpl::producer<> EmojiListWidget::escapes() const {
+	return _search ? _search->escapes() : rpl::never<>();
+}
+
 void EmojiListWidget::prepareExpanding() {
 	if (_search) {
 		_searchExpandCache = _search->grab();
@@ -633,13 +637,14 @@ void EmojiListWidget::paintExpanding(
 		Painter &p,
 		QRect clip,
 		int finalBottom,
-		float64 progress,
+		float64 geometryProgress,
+		float64 fullProgress,
 		RectPart origin) {
 	const auto searchShift = _search
 		? anim::interpolate(
 			st().padding.top() - _search->height(),
 			0,
-			progress)
+			geometryProgress)
 		: 0;
 	const auto shift = clip.topLeft() + QPoint(0, searchShift);
 	const auto adjusted = clip.translated(-shift);
@@ -654,7 +659,7 @@ void EmojiListWidget::paintExpanding(
 	p.translate(shift);
 	p.setClipRect(adjusted);
 	paint(p, ExpandingContext{
-		.progress = progress,
+		.progress = fullProgress,
 		.finalHeight = finalHeight,
 		.expanding = true,
 	}, adjusted);
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index cc97d64db..374b6e7b3 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -125,6 +125,7 @@ public:
 	[[nodiscard]] rpl::producer<EmojiChosen> chosen() const;
 	[[nodiscard]] rpl::producer<FileChosen> customChosen() const;
 	[[nodiscard]] rpl::producer<> jumpedToPremium() const;
+	[[nodiscard]] rpl::producer<> escapes() const;
 
 	void provideRecent(const std::vector<DocumentId> &customRecentList);
 
@@ -133,7 +134,8 @@ public:
 		Painter &p,
 		QRect clip,
 		int finalBottom,
-		float64 progress,
+		float64 geometryProgress,
+		float64 fullProgress,
 		RectPart origin);
 
 	base::unique_qptr<Ui::PopupMenu> fillContextMenu(
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 52eb79672..c1b08a657 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1224,7 +1224,7 @@ void Stories::loadViewsSlice(
 		MTP_int(id),
 		MTP_int(offset ? offset->date : 0),
 		MTP_long(offset ? peerToUser(offset->peer->id).bare : 0),
-		MTP_int(2)
+		MTP_int(kViewsPerPage)
 	)).done([=](const MTPstories_StoryViewsList &result) {
 		_viewsRequestId = 0;
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 45c07c9ee..c53650919 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1854,7 +1854,8 @@ void ComposeControls::fieldChanged() {
 		&& !_header->isEditingMessage()
 		&& (_textUpdateEvents & TextUpdateEvent::SendTyping));
 	updateSendButtonType();
-	if (!HasSendText(_field) && _preview) {
+	_hasSendText = HasSendText(_field);
+	if (!_hasSendText.current() && _preview) {
 		_preview->setState(Data::PreviewState::Allowed);
 	}
 	if (updateBotCommandShown()) {
@@ -2953,6 +2954,10 @@ rpl::producer<bool> ComposeControls::recordingValue() const {
 	return _recording.value();
 }
 
+rpl::producer<bool> ComposeControls::hasSendTextValue() const {
+	return _hasSendText.value();
+}
+
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
 	if (_voiceRecordBar->isActive()) {
 		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
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 11b2efe22..f8c887593 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -215,6 +215,7 @@ public:
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] rpl::producer<bool> recordingValue() const;
+	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 
 	void applyCloudDraft();
 	void applyDraft(
@@ -382,6 +383,7 @@ private:
 	rpl::event_stream<ReplyNextRequest> _replyNextRequests;
 	rpl::event_stream<> _focusRequests;
 	rpl::variable<bool> _recording;
+	rpl::variable<bool> _hasSendText;
 
 	TextUpdateEvents _textUpdateEvents = TextUpdateEvents()
 		| TextUpdateEvent::SaveDraft
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 ca6ddf226..502c3d1e5 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -105,48 +105,53 @@ bool StripEmoji::readyInDefaultState() {
 
 Selector::Selector(
 	not_null<QWidget*> parent,
-	not_null<Window::SessionController*> parentController,
+	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	IconFactory iconFactory,
-	Fn<void(bool fast)> close)
+	Fn<void(bool fast)> close,
+	bool child)
 : Selector(
 	parent,
-	parentController,
+	std::move(show),
 	reactions,
 	(reactions.customAllowed
 		? ChatHelpers::EmojiListMode::FullReactions
 		: ChatHelpers::EmojiListMode::RecentReactions),
 	{},
 	iconFactory,
-	close) {
+	close,
+	child) {
 }
 
 Selector::Selector(
 	not_null<QWidget*> parent,
-	not_null<Window::SessionController*> parentController,
+	std::shared_ptr<ChatHelpers::Show> show,
 	ChatHelpers::EmojiListMode mode,
 	std::vector<DocumentId> recent,
-	Fn<void(bool fast)> close)
+	Fn<void(bool fast)> close,
+	bool child)
 : Selector(
 	parent,
-	parentController,
+	std::move(show),
 	{ .customAllowed = true },
 	mode,
 	std::move(recent),
 	nullptr,
-	close) {
+	close,
+	child) {
 }
 
 Selector::Selector(
 	not_null<QWidget*> parent,
-	not_null<Window::SessionController*> parentController,
+	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	ChatHelpers::EmojiListMode mode,
 	std::vector<DocumentId> recent,
 	IconFactory iconFactory,
-	Fn<void(bool fast)> close)
+	Fn<void(bool fast)> close,
+	bool child)
 : RpWidget(parent)
-, _parentController(parentController.get())
+, _show(std::move(show))
 , _reactions(reactions)
 , _recent(std::move(recent))
 , _listMode(mode)
@@ -167,12 +172,7 @@ Selector::Selector(
 , _skipy((st::reactStripHeight - st::reactStripSize) / 2) {
 	setMouseTracking(true);
 
-	_useTransparency = Ui::Platform::TranslucentWindowsSupported();
-
-	parentController->content()->alive(
-	) | rpl::start_with_done([=] {
-		close(true);
-	}, lifetime());
+	_useTransparency = child || Ui::Platform::TranslucentWindowsSupported();
 }
 
 bool Selector::useTransparency() const {
@@ -288,6 +288,10 @@ void Selector::beforeDestroy() {
 	}
 }
 
+rpl::producer<> Selector::escapes() const {
+	return _escapes.events();
+}
+
 void Selector::updateShowState(
 		float64 progress,
 		float64 opacity,
@@ -424,6 +428,7 @@ void Selector::paintExpanding(Painter &p, float64 progress) {
 		p,
 		rects.list.marginsRemoved(st::reactPanelEmojiPan.margin),
 		rects.finalBottom,
+		rects.expanding,
 		progress,
 		RectPart::TopRight);
 	paintFadingExpandIcon(p, progress);
@@ -479,6 +484,7 @@ auto Selector::paintExpandingBg(QPainter &p, float64 progress)
 		.categories = QRect(inner.x(), inner.y(), inner.width(), categories),
 		.list = inner.marginsRemoved({ 0, categories, 0, 0 }),
 		.radius = radius,
+		.expanding = expanding,
 		.finalBottom = height() - extents.bottom(),
 	};
 }
@@ -538,10 +544,7 @@ void Selector::finishExpand() {
 	}
 	_scroll->show();
 	_list->afterShown();
-
-	if (const auto controller = _parentController.get()) {
-		controller->session().api().updateCustomEmoji();
-	}
+	_show->session().api().updateCustomEmoji();
 }
 
 void Selector::paintBubble(QPainter &p, int innerWidth) {
@@ -662,6 +665,7 @@ void Selector::expand() {
 		return;
 	}
 	_expandScheduled = true;
+	_willExpand.fire({});
 	const auto parent = parentWidget()->geometry();
 	const auto extents = extentsForShadow();
 	const auto heightLimit = _reactions.customAllowed
@@ -672,15 +676,14 @@ void Selector::expand() {
 		extents.top() + heightLimit + extents.bottom());
 	const auto additionalBottom = willBeHeight - height();
 	const auto additional = _specialExpandTopSkip + additionalBottom;
-	const auto strong = _parentController.get();
-	if (additionalBottom < 0 || additional <= 0 || !strong) {
+	if (additionalBottom < 0 || additional <= 0) {
 		return;
 	} else if (additionalBottom > 0) {
 		resize(width(), height() + additionalBottom);
 		raise();
 	}
 
-	createList(strong);
+	createList();
 	cacheExpandIcon();
 
 	[[maybe_unused]] const auto grabbed = Ui::GrabWidget(_scroll);
@@ -705,7 +708,7 @@ void Selector::cacheExpandIcon() {
 	_strip->paintOne(q, _strip->count() - 1, { 0, 0 }, 1.);
 }
 
-void Selector::createList(not_null<Window::SessionController*> controller) {
+void Selector::createList() {
 	using namespace ChatHelpers;
 	auto recent = _recent;
 	auto defaultReactionIds = base::flat_map<DocumentId, QString>();
@@ -725,7 +728,7 @@ void Selector::createList(not_null<Window::SessionController*> controller) {
 			}
 		};
 	}
-	const auto manager = &controller->session().data().customEmojiManager();
+	const auto manager = &_show->session().data().customEmojiManager();
 	_stripPaintOneShift = [&] {
 		// See EmojiListWidget custom emoji position resolving.
 		const auto area = st::emojiPanArea;
@@ -777,7 +780,7 @@ void Selector::createList(not_null<Window::SessionController*> controller) {
 	}
 	_list = _scroll->setOwnedWidget(
 		object_ptr<EmojiListWidget>(_scroll, EmojiListDescriptor{
-			.show = controller->uiShow(),
+			.show = _show,
 			.mode = _listMode,
 			.paused = [] { return false; },
 			.customRecentList = std::move(recent),
@@ -786,6 +789,8 @@ void Selector::createList(not_null<Window::SessionController*> controller) {
 		})
 	).data();
 
+	_list->escapes() | rpl::start_to_stream(_escapes, _list->lifetime());
+
 	_list->customChosen(
 	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
 		const auto id = DocumentId{ data.document->id };
@@ -937,10 +942,11 @@ AttachSelectorResult MakeJustSelectorMenu(
 		Fn<void(ChosenReaction)> chosen) {
 	const auto selector = Ui::CreateChild<Selector>(
 		menu.get(),
-		controller,
+		controller->uiShow(),
 		mode,
 		std::move(recent),
-		[=](bool fast) { menu->hideMenu(fast); });
+		[=](bool fast) { menu->hideMenu(fast); },
+		false); // child
 	if (!AdjustMenuGeometryForSelector(menu, desiredPosition, selector)) {
 		return AttachSelectorResult::Failed;
 	}
@@ -1011,10 +1017,11 @@ AttachSelectorResult AttachSelectorToMenu(
 	const auto withSearch = reactions.customAllowed;
 	const auto selector = Ui::CreateChild<Selector>(
 		menu.get(),
-		controller,
+		controller->uiShow(),
 		std::move(reactions),
 		std::move(iconFactory),
-		[=](bool fast) { menu->hideMenu(fast); });
+		[=](bool fast) { menu->hideMenu(fast); },
+		false); // child
 	if (!AdjustMenuGeometryForSelector(menu, desiredPosition, selector)) {
 		return 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 6e6d119cd..5cf7ca294 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -19,6 +19,7 @@ struct ReactionId;
 } // namespace Data
 
 namespace ChatHelpers {
+class Show;
 class TabbedPanel;
 class EmojiListWidget;
 class StickersListFooter;
@@ -41,16 +42,18 @@ class Selector final : public Ui::RpWidget {
 public:
 	Selector(
 		not_null<QWidget*> parent,
-		not_null<Window::SessionController*> parentController,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::PossibleItemReactionsRef &reactions,
 		IconFactory iconFactory,
-		Fn<void(bool fast)> close);
+		Fn<void(bool fast)> close,
+		bool child = false);
 	Selector(
 		not_null<QWidget*> parent,
-		not_null<Window::SessionController*> parentController,
+		std::shared_ptr<ChatHelpers::Show> show,
 		ChatHelpers::EmojiListMode mode,
 		std::vector<DocumentId> recent,
-		Fn<void(bool fast)> close);
+		Fn<void(bool fast)> close,
+		bool child = false);
 
 	[[nodiscard]] bool useTransparency() const;
 
@@ -68,6 +71,10 @@ public:
 	[[nodiscard]] rpl::producer<> premiumPromoChosen() const {
 		return _premiumPromoChosen.events();
 	}
+	[[nodiscard]] rpl::producer<> willExpand() const {
+		return _willExpand.events();
+	}
+	[[nodiscard]] rpl::producer<> escapes() const;
 
 	void updateShowState(
 		float64 progress,
@@ -82,17 +89,19 @@ private:
 		QRect categories;
 		QRect list;
 		float64 radius = 0.;
+		float64 expanding = 0.;
 		int finalBottom = 0;
 	};
 
 	Selector(
 		not_null<QWidget*> parent,
-		not_null<Window::SessionController*> parentController,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::PossibleItemReactionsRef &reactions,
 		ChatHelpers::EmojiListMode mode,
 		std::vector<DocumentId> recent,
 		IconFactory iconFactory,
-		Fn<void(bool fast)> close);
+		Fn<void(bool fast)> close,
+		bool child);
 
 	void paintEvent(QPaintEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
@@ -116,11 +125,11 @@ private:
 
 	void expand();
 	void cacheExpandIcon();
-	void createList(not_null<Window::SessionController*> controller);
+	void createList();
 	void finishExpand();
 	ChosenReaction lookupChosen(const Data::ReactionId &id) const;
 
-	const base::weak_ptr<Window::SessionController> _parentController;
+	const std::shared_ptr<ChatHelpers::Show> _show;
 	const Data::PossibleItemReactions _reactions;
 	const std::vector<DocumentId> _recent;
 	const ChatHelpers::EmojiListMode _listMode;
@@ -133,6 +142,8 @@ private:
 
 	rpl::event_stream<ChosenReaction> _chosen;
 	rpl::event_stream<> _premiumPromoChosen;
+	rpl::event_stream<> _willExpand;
+	rpl::event_stream<> _escapes;
 
 	Ui::ScrollArea *_scroll = nullptr;
 	ChatHelpers::EmojiListWidget *_list = nullptr;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 76f04f871..6ea4a3f82 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_header.h"
 #include "media/stories/media_stories_sibling.h"
 #include "media/stories/media_stories_slider.h"
+#include "media/stories/media_stories_reactions.h"
 #include "media/stories/media_stories_recent_views.h"
 #include "media/stories/media_stories_reply.h"
 #include "media/stories/media_stories_view.h"
@@ -125,10 +126,17 @@ Controller::Controller(not_null<Delegate*> delegate)
 , _header(std::make_unique<Header>(this))
 , _slider(std::make_unique<Slider>(this))
 , _replyArea(std::make_unique<ReplyArea>(this))
+, _reactions(std::make_unique<Reactions>(this))
 , _recentViews(std::make_unique<RecentViews>(this)) {
 	initLayout();
 
-	_replyArea->activeValue(
+	using namespace rpl::mappers;
+
+	rpl::combine(
+		_replyArea->activeValue(),
+		_reactions->expandedValue(),
+		_1 || _2
+	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool active) {
 		if (active) {
 			_captionFullView = nullptr;
@@ -140,6 +148,23 @@ Controller::Controller(not_null<Delegate*> delegate)
 	_replyArea->focusedValue(
 	) | rpl::start_with_next([=](bool focused) {
 		_replyFocused = focused;
+		if (!_replyFocused) {
+			_reactions->hideIfCollapsed();
+		} else if (!_hasSendText) {
+			_reactions->show();
+		}
+	}, _lifetime);
+
+	_replyArea->hasSendTextValue(
+	) | rpl::start_with_next([=](bool has) {
+		_hasSendText = has;
+		if (_replyFocused) {
+			if (_hasSendText) {
+				_reactions->hide();
+			} else {
+				_reactions->show();
+			}
+		}
 	}, _lifetime);
 
 	_delegate->storiesLayerShown(
@@ -165,6 +190,9 @@ Controller::Controller(not_null<Delegate*> delegate)
 Controller::~Controller() = default;
 
 void Controller::updateContentFaded() {
+	if (_contentFaded == _replyActive) {
+		return;
+	}
 	_contentFaded = _replyActive;
 	_contentFadeAnimation.start(
 		[=] { _delegate->storiesRepaint(); },
@@ -227,6 +255,13 @@ void Controller::initLayout() {
 			contentWidth,
 			contentHeight);
 
+		const auto reactionsWidth = st::storiesReactionsWidth;
+		layout.reactions = QRect(
+			(size.width() - reactionsWidth) / 2,
+			layout.content.y(),
+			reactionsWidth,
+			contentHeight);
+
 		if (layout.headerLayout == HeaderLayout::Outside) {
 			layout.header = QRect(
 				layout.content.topLeft() - QPoint(0, outsideHeaderHeight),
@@ -385,6 +420,11 @@ auto Controller::stickerOrEmojiChosen() const
 	return _delegate->storiesStickerOrEmojiChosen();
 }
 
+auto Controller::cachedReactionIconFactory() const
+-> HistoryView::Reactions::CachedIconFactory & {
+	return _delegate->storiesCachedReactionIconFactory();
+}
+
 void Controller::show(
 		not_null<Data::Story*> story,
 		Data::StoriesContext context) {
@@ -448,6 +488,7 @@ void Controller::show(
 	_captionText = story->caption();
 	_captionFullView = nullptr;
 	invalidate_weak_ptrs(&_viewsLoadGuard);
+	_reactions->hide();
 	if (_replyFocused) {
 		unfocusReply();
 	}
@@ -693,6 +734,13 @@ void Controller::togglePaused(bool paused) {
 	}
 }
 
+void Controller::contentPressed(bool pressed) {
+	togglePaused(pressed);
+	if (pressed) {
+		_reactions->collapse();
+	}
+}
+
 void Controller::setMenuShown(bool shown) {
 	if (_menuShown != shown) {
 		_menuShown = shown;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 4fd02ac39..f59cb0f36 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -23,6 +23,10 @@ namespace Data {
 struct FileOrigin;
 } // namespace Data
 
+namespace HistoryView::Reactions {
+class CachedIconFactory;
+} // namespace HistoryView::Reactions
+
 namespace Ui {
 class RpWidget;
 } // namespace Ui
@@ -40,6 +44,7 @@ namespace Media::Stories {
 class Header;
 class Slider;
 class ReplyArea;
+class Reactions;
 class RecentViews;
 class Sibling;
 class Delegate;
@@ -66,6 +71,7 @@ struct Layout {
 	QRect content;
 	QRect header;
 	QRect slider;
+	QRect reactions;
 	int controlsWidth = 0;
 	QPoint controlsBottomPosition;
 	QRect views;
@@ -98,6 +104,8 @@ public:
 	[[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 ready();
@@ -109,6 +117,7 @@ public:
 	[[nodiscard]] bool jumpFor(int delta);
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
+	void contentPressed(bool pressed);
 	void setMenuShown(bool shown);
 
 	[[nodiscard]] bool canDownload() const;
@@ -163,6 +172,7 @@ private:
 	const std::unique_ptr<Header> _header;
 	const std::unique_ptr<Slider> _slider;
 	const std::unique_ptr<ReplyArea> _replyArea;
+	const std::unique_ptr<Reactions> _reactions;
 	const std::unique_ptr<RecentViews> _recentViews;
 	std::unique_ptr<PhotoPlayback> _photoPlayback;
 	std::unique_ptr<CaptionFullView> _captionFullView;
@@ -173,6 +183,7 @@ private:
 	bool _windowActive = false;
 	bool _replyFocused = false;
 	bool _replyActive = false;
+	bool _hasSendText = false;
 	bool _layerShown = false;
 	bool _menuShown = false;
 	bool _paused = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index 9f8d7ce4d..6dfbf3acd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -16,6 +16,10 @@ namespace Data {
 struct StoriesContext;
 } // namespace Data
 
+namespace HistoryView::Reactions {
+class CachedIconFactory;
+} // namespace HistoryView::Reactions
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -43,6 +47,8 @@ public:
 		-> 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 storiesJumpTo(
 		not_null<Main::Session*> session,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
new file mode 100644
index 000000000..446c8f91b
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -0,0 +1,239 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_reactions.h"
+
+#include "boxes/premium_preview_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_message_reactions.h"
+#include "data/data_session.h"
+#include "history/view/reactions/history_view_reactions_selector.h"
+#include "main/main_session.h"
+#include "media/stories/media_stories_controller.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_media_view.h"
+#include "styles/style_widgets.h"
+
+namespace Media::Stories {
+namespace {
+
+[[nodiscard]] Data::PossibleItemReactionsRef LookupPossibleReactions(
+		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
+
+struct Reactions::Hiding {
+	explicit Hiding(not_null<QWidget*> parent) : widget(parent) {
+	}
+
+	Ui::RpWidget widget;
+	Ui::Animations::Simple animation;
+	QImage frame;
+};
+
+Reactions::Reactions(not_null<Controller*> controller)
+: _controller(controller) {
+}
+
+Reactions::~Reactions() = default;
+
+void Reactions::show() {
+	if (_shown) {
+		return;
+	}
+	create();
+	if (!_selector) {
+		return;
+	}
+	const auto duration = st::defaultPanelAnimation.heightDuration
+		* st::defaultPopupMenu.showDuration;
+	_shown = true;
+	_showing.start([=] { updateShowState(); }, 0., 1., duration);
+	updateShowState();
+	_parent->show();
+}
+
+void Reactions::hide() {
+	if (!_selector) {
+		return;
+	}
+	_selector->beforeDestroy();
+	if (!anim::Disabled()) {
+		fadeOutSelector();
+	}
+	_shown = false;
+	_expanded = false;
+	_showing.stop();
+	_selector = nullptr;
+	_parent = nullptr;
+}
+
+void Reactions::hideIfCollapsed() {
+	if (!_expanded.current()) {
+		hide();
+	}
+}
+
+void Reactions::collapse() {
+	if (_expanded.current()) {
+		hide();
+		show();
+	}
+}
+
+void Reactions::create() {
+	auto reactions = LookupPossibleReactions(
+		&_controller->uiShow()->session());
+	if (reactions.recent.empty() && !reactions.morePremiumAvailable) {
+		return;
+	}
+	_parent = std::make_unique<Ui::RpWidget>(_controller->wrap().get());
+	_parent->show();
+
+	_parent->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			const auto event = static_cast<QMouseEvent*>(e.get());
+			if (event->button() == Qt::LeftButton) {
+				if (!_selector
+					|| !_selector->geometry().contains(event->pos())) {
+					collapse();
+				}
+			}
+		}
+	}, _parent->lifetime());
+
+	const auto withSearch = reactions.customAllowed;
+	_selector = std::make_unique<HistoryView::Reactions::Selector>(
+		_parent.get(),
+		_controller->uiShow(),
+		std::move(reactions),
+		_controller->cachedReactionIconFactory().createMethod(),
+		[=](bool fast) { hide(); });
+
+	_selector->chosen(
+	) | rpl::start_with_next([=](
+			HistoryView::Reactions::ChosenReaction reaction) {
+		hide();
+		//reaction.context = itemId;
+		//chosen(std::move(reaction));
+	}, _selector->lifetime());
+
+	_selector->premiumPromoChosen() | rpl::start_with_next([=] {
+		hide();
+		ShowPremiumPreviewBox(
+			_controller->uiShow(),
+			PremiumPreview::InfiniteReactions);
+	}, _selector->lifetime());
+
+	const auto desiredWidth = st::storiesReactionsWidth;
+	const auto maxWidth = desiredWidth * 2;
+	const auto width = _selector->countWidth(desiredWidth, maxWidth);
+	const auto extents = _selector->extentsForShadow();
+	const auto categoriesTop = _selector->extendTopForCategories();
+	const auto full = extents.left() + width + extents.right();
+
+	_shownValue = 0.;
+	rpl::combine(
+		_controller->layoutValue(),
+		_shownValue.value()
+	) | rpl::start_with_next([=](const Layout &layout, float64 shown) {
+		const auto shift = int(base::SafeRound((full / 2.) * shown));
+		_parent->setGeometry(QRect(
+			layout.reactions.x() + layout.reactions.width() / 2 - shift,
+			layout.reactions.y(),
+			full,
+			layout.reactions.height()));
+		const auto innerTop = layout.reactions.height()
+			- st::storiesReactionsBottomSkip
+			- st::reactStripHeight;
+		const auto maxAdded = innerTop - extents.top() - categoriesTop;
+		const auto added = std::min(maxAdded, st::storiesReactionsAddedTop);
+		_selector->setSpecialExpandTopSkip(added);
+		_selector->initGeometry(innerTop);
+	}, _selector->lifetime());
+
+	_selector->willExpand(
+	) | rpl::start_with_next([=] {
+		_expanded = true;
+	}, _selector->lifetime());
+
+	_selector->escapes() | rpl::start_with_next([=] {
+		collapse();
+	}, _selector->lifetime());
+}
+
+void Reactions::fadeOutSelector() {
+	const auto wrap = _controller->wrap().get();
+	const auto geometry = Ui::MapFrom(
+		wrap,
+		_parent.get(),
+		_selector->geometry());
+	_hiding.push_back(std::make_unique<Hiding>(wrap));
+	const auto raw = _hiding.back().get();
+	raw->frame = Ui::GrabWidgetToImage(_selector.get());
+	raw->widget.setGeometry(geometry);
+	raw->widget.show();
+	raw->widget.paintRequest(
+	) | rpl::start_with_next([=] {
+		if (const auto opacity = raw->animation.value(0.)) {
+			auto p = QPainter(&raw->widget);
+			p.setOpacity(opacity);
+			p.drawImage(0, 0, raw->frame);
+		}
+	}, raw->widget.lifetime());
+	Ui::PostponeCall(&raw->widget, [=] {
+		raw->animation.start([=] {
+			if (raw->animation.animating()) {
+				raw->widget.update();
+			} else {
+				const auto i = ranges::find(
+					_hiding,
+					raw,
+					&std::unique_ptr<Hiding>::get);
+				if (i != end(_hiding)) {
+					_hiding.erase(i);
+				}
+			}
+		}, 1., 0., st::slideWrapDuration);
+	});
+}
+
+void Reactions::updateShowState() {
+	const auto progress = _showing.value(_shown ? 1. : 0.);
+	const auto opacity = 1.;
+	const auto appearing = _showing.animating();
+	const auto toggling = false;
+	_shownValue = progress;
+	_selector->updateShowState(progress, opacity, appearing, toggling);
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.h b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
new file mode 100644
index 000000000..e9a89a09c
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
@@ -0,0 +1,57 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+
+namespace HistoryView::Reactions {
+class Selector;
+} // namespace HistoryView::Reactions
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Media::Stories {
+
+class Controller;
+
+class Reactions final {
+public:
+	explicit Reactions(not_null<Controller*> controller);
+	~Reactions();
+
+	[[nodiscard]] rpl::producer<bool> expandedValue() const {
+		return _expanded.value();
+	}
+
+	void show();
+	void hide();
+	void hideIfCollapsed();
+	void collapse();
+
+private:
+	struct Hiding;
+
+	void create();
+	void updateShowState();
+	void fadeOutSelector();
+
+	const not_null<Controller*> _controller;
+
+	std::unique_ptr<Ui::RpWidget> _parent;
+	std::unique_ptr<HistoryView::Reactions::Selector> _selector;
+	std::vector<std::unique_ptr<Hiding>> _hiding;
+	Ui::Animations::Simple _showing;
+	rpl::variable<float64> _shownValue;
+	rpl::variable<bool> _expanded;
+	bool _shown = false;
+
+};
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index cbff23d73..db914d816 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -579,6 +579,10 @@ rpl::producer<bool> ReplyArea::focusedValue() const {
 	return _controls->focusedValue();
 }
 
+rpl::producer<bool> ReplyArea::hasSendTextValue() const {
+	return _controls->hasSendTextValue();
+}
+
 rpl::producer<bool> ReplyArea::activeValue() const {
 	using namespace rpl::mappers;
 	return rpl::combine(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index d50496d5d..30d15cb28 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -59,6 +59,7 @@ public:
 
 	[[nodiscard]] rpl::producer<bool> focusedValue() const;
 	[[nodiscard]] rpl::producer<bool> activeValue() const;
+	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 
 private:
 	using VoiceToSend = HistoryView::Controls::VoiceToSend;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index de254b870..47f967160 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -75,6 +75,10 @@ void View::togglePaused(bool paused) {
 	_controller->togglePaused(paused);
 }
 
+void View::contentPressed(bool pressed) {
+	_controller->contentPressed(pressed);
+}
+
 SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index b25011de5..40ee13c91 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -73,6 +73,7 @@ public:
 
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
+	void contentPressed(bool pressed);
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index b1674e41b..cd88a570f 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -747,3 +747,6 @@ storiesWhoViewed: WhoRead(defaultWhoRead) {
 		align: align(left);
 	}
 }
+storiesReactionsWidth: 210px;
+storiesReactionsBottomSkip: 29px;
+storiesReactionsAddedTop: 200px;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1d1880c83..8aa3612c6 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -54,6 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
 #include "history/view/media/history_view_media.h"
+#include "history/view/reactions/history_view_reactions_strip.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -421,6 +422,7 @@ 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)
@@ -1600,9 +1602,11 @@ void OverlayWidget::waitingAnimationCallback() {
 }
 
 void OverlayWidget::updateCursor() {
-	setCursor(_controlsState == ControlsHidden
+	setCursor((_controlsState == ControlsHidden)
 		? Qt::BlankCursor
-		: (_over == OverNone ? style::cur_default : style::cur_pointer));
+		: (_over == OverNone || (_over == OverVideo && _stories))
+		? style::cur_default
+		: style::cur_pointer);
 }
 
 int OverlayWidget::finalContentRotation() const {
@@ -4045,6 +4049,11 @@ auto OverlayWidget::storiesStickerOrEmojiChosen()
 	return _storiesStickerOrEmojiChosen.events();
 }
 
+auto OverlayWidget::storiesCachedReactionIconFactory()
+-> HistoryView::Reactions::CachedIconFactory & {
+	return *_cachedReactionIconFactory;
+}
+
 void OverlayWidget::storiesJumpTo(
 		not_null<Main::Session*> session,
 		FullStoryId id,
@@ -5192,7 +5201,7 @@ void OverlayWidget::handleMousePress(
 				|| _over == OverVideo) {
 				_down = _over;
 				if (_over == OverVideo && _stories) {
-					_stories->togglePaused(true);
+					_stories->contentPressed(true);
 				}
 			} else if (!_saveMsg.contains(position) || !isSaveMsgShown()) {
 				_pressed = true;
@@ -5491,7 +5500,7 @@ void OverlayWidget::handleMouseRelease(
 		InvokeQueued(_widget, [=] { showDropdown(); });
 	} else if (_over == OverVideo && _down == OverVideo) {
 		if (_stories) {
-			_stories->togglePaused(false);
+			_stories->contentPressed(false);
 		} else if (_streamed) {
 			playbackPauseResume();
 		}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 2085fef99..01cc71f3d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -51,11 +51,13 @@ namespace Platform {
 class OverlayWidgetHelper;
 } // namespace Platform
 
-namespace Window {
-namespace Theme {
+namespace Window::Theme {
 struct Preview;
-} // namespace Theme
-} // namespace Window
+} // namespace Window::Theme
+
+namespace HistoryView::Reactions {
+class CachedIconFactory;
+} // namespace HistoryView::Reactions
 
 namespace Media::Player {
 struct TrackState;
@@ -245,6 +247,8 @@ private:
 	std::shared_ptr<ChatHelpers::Show> storiesShow() override;
 	auto storiesStickerOrEmojiChosen()
 		-> rpl::producer<ChatHelpers::FileChosen> override;
+	auto storiesCachedReactionIconFactory()
+		-> HistoryView::Reactions::CachedIconFactory & override;
 	void storiesJumpTo(
 		not_null<Main::Session*> session,
 		FullStoryId id,
@@ -600,6 +604,8 @@ private:
 	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/ui/controls/tabbed_search.cpp b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
index a4bf604a5..a4022d514 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/controls/tabbed_search.h"
 
+#include "base/qt_signal_producer.h"
 #include "lang/lang_keys.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/wrap/fade_wrap.h"
@@ -517,6 +518,12 @@ void SearchWithGroups::ensureRounding(int size, float64 ratio) {
 	_rounding.setDevicePixelRatio(ratio);
 }
 
+rpl::producer<> SearchWithGroups::escapes() const {
+	return base::qt_signal_producer(
+		_field.get(),
+		&Ui::InputField::cancelled);
+}
+
 rpl::producer<std::vector<QString>> SearchWithGroups::queryValue() const {
 	return _query.value();
 }
@@ -659,6 +666,10 @@ void TabbedSearch::returnFocus() {
 	_search.returnFocus();
 }
 
+rpl::producer<> TabbedSearch::escapes() const {
+	return _search.escapes();
+}
+
 rpl::producer<std::vector<QString>> TabbedSearch::queryValue() const {
 	return _search.queryValue();
 }
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.h b/Telegram/SourceFiles/ui/controls/tabbed_search.h
index ce5bb3e77..000cbccea 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.h
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.h
@@ -50,6 +50,7 @@ class SearchWithGroups final : public RpWidget {
 public:
 	SearchWithGroups(QWidget *parent, SearchDescriptor descriptor);
 
+	[[nodiscard]] rpl::producer<> escapes() const;
 	[[nodiscard]] rpl::producer<std::vector<QString>> queryValue() const;
 	[[nodiscard]] auto debouncedQueryValue() const
 		-> rpl::producer<std::vector<QString>>;
@@ -116,6 +117,7 @@ public:
 	[[nodiscard]] int height() const;
 	[[nodiscard]] QImage grab();
 
+	[[nodiscard]] rpl::producer<> escapes() const;
 	[[nodiscard]] rpl::producer<std::vector<QString>> queryValue() const;
 	[[nodiscard]] auto debouncedQueryValue() const
 		->rpl::producer<std::vector<QString>>;

From 39538e89e0a0fe23060ff168443e95567dc7a76a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Jun 2023 17:02:23 +0400
Subject: [PATCH 285/676] Show stories reactions in dark theme.

---
 .../chat_helpers/chat_helpers.style           |  26 +-
 .../history_view_reactions_button.cpp         |   2 +
 .../history_view_reactions_selector.cpp       |  43 ++--
 .../history_view_reactions_selector.h         |   4 +
 .../history_view_reactions_strip.cpp          |  21 +-
 .../reactions/history_view_reactions_strip.h  |  12 +-
 .../media/stories/media_stories_reactions.cpp |   1 +
 .../SourceFiles/media/view/media_view.style   | 227 ++++++++++--------
 Telegram/SourceFiles/ui/chat/chat.style       |  13 -
 9 files changed, 206 insertions(+), 143 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 5b16daf5d..e5552ead4 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -69,6 +69,11 @@ ComposeIcons {
 	menuWhenOnline: icon;
 	menuSpoiler: icon;
 	menuSpoilerOff: icon;
+
+	stripBubble: icon;
+	stripPremiumLocked: icon;
+	stripExpandPanel: icon;
+	stripExpandDropdown: icon;
 }
 
 EmojiSuggestions {
@@ -532,6 +537,23 @@ defaultComposeIcons: ComposeIcons {
 	menuWhenOnline: menuIconWhenOnline;
 	menuSpoiler: menuIconSpoiler;
 	menuSpoilerOff: menuIconSpoilerOff;
+
+	stripBubble: icon{
+		{ "chat/reactions_bubble_shadow", windowShadowFg },
+		{ "chat/reactions_bubble", windowBg },
+	};
+	stripPremiumLocked: icon{
+		{ "chat/reactions_premium_bg", historyPeerArchiveUserpicBg },
+		{ "chat/reactions_premium_star", historyPeerUserpicFg },
+	};
+	stripExpandPanel: icon{
+		{ "chat/reactions_round_big", windowBgRipple },
+		{ "chat/reactions_expand_panel", windowSubTextFg },
+	};
+	stripExpandDropdown: icon{
+		{ "chat/reactions_round_small", windowBgRipple },
+		{ "chat/reactions_expand_panel", windowSubTextFg },
+	};
 }
 defaultEmojiPan: EmojiPan {
 	margin: margins(7px, 0px, 7px, 0px);
@@ -646,10 +668,6 @@ reactStripSize: 32px;
 reactStripMinWidth: 60px;
 reactStripImage: 26px;
 reactStripSkip: 7px;
-reactStripBubble: icon{
-	{ "chat/reactions_bubble_shadow", windowShadowFg },
-	{ "chat/reactions_bubble", windowBg },
-};
 reactStripBubbleRight: 20px;
 userpicBuilderEmojiPan: EmojiPan(statusEmojiPan) {
 	margin: margins(reactStripSkip, 0px, reactStripSkip, 0px);
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
index 0117ad4a5..345512ea1 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "base/event_filter.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
 namespace HistoryView::Reactions {
@@ -318,6 +319,7 @@ Manager::Manager(
 : _outer(CountOuterSize())
 , _inner(QRect({}, st::reactionCornerSize))
 , _strip(
+	st::reactPanelEmojiPan,
 	_inner,
 	st::reactionCornerImage,
 	crl::guard(this, [=] { updateCurrentButton(); }),
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 502c3d1e5..fa0dec3f9 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -105,6 +105,7 @@ bool StripEmoji::readyInDefaultState() {
 
 Selector::Selector(
 	not_null<QWidget*> parent,
+	const style::EmojiPan &st,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	IconFactory iconFactory,
@@ -112,6 +113,7 @@ Selector::Selector(
 	bool child)
 : Selector(
 	parent,
+	st,
 	std::move(show),
 	reactions,
 	(reactions.customAllowed
@@ -125,6 +127,7 @@ Selector::Selector(
 
 Selector::Selector(
 	not_null<QWidget*> parent,
+	const style::EmojiPan &st,
 	std::shared_ptr<ChatHelpers::Show> show,
 	ChatHelpers::EmojiListMode mode,
 	std::vector<DocumentId> recent,
@@ -132,6 +135,7 @@ Selector::Selector(
 	bool child)
 : Selector(
 	parent,
+	st,
 	std::move(show),
 	{ .customAllowed = true },
 	mode,
@@ -143,6 +147,7 @@ Selector::Selector(
 
 Selector::Selector(
 	not_null<QWidget*> parent,
+	const style::EmojiPan &st,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::PossibleItemReactionsRef &reactions,
 	ChatHelpers::EmojiListMode mode,
@@ -151,6 +156,7 @@ Selector::Selector(
 	Fn<void(bool fast)> close,
 	bool child)
 : RpWidget(parent)
+, _st(st)
 , _show(std::move(show))
 , _reactions(reactions)
 , _recent(std::move(recent))
@@ -162,6 +168,7 @@ Selector::Selector(
 	st::reactStripHeight)
 , _strip(iconFactory
 	? std::make_unique<Strip>(
+		_st,
 		QRect(0, 0, st::reactStripSize, st::reactStripSize),
 		st::reactStripImage,
 		crl::guard(this, [=] { update(_inner); }),
@@ -241,14 +248,14 @@ QMargins Selector::extentsForShadow() const {
 }
 
 int Selector::extendTopForCategories() const {
-	return _reactions.customAllowed ? st::reactPanelEmojiPan.footer : 0;
+	return _reactions.customAllowed ? _st.footer : 0;
 }
 
 int Selector::minimalHeight() const {
 	return _skipy
 		+ (_recentRows * _size)
 		+ st::emojiPanRadius
-		+ st::reactPanelEmojiPan.padding.bottom();
+		+ _st.padding.bottom();
 }
 
 void Selector::setSpecialExpandTopSkip(int skip) {
@@ -269,7 +276,7 @@ void Selector::initGeometry(int innerTop) {
 		? (extendTopForCategories() + _specialExpandTopSkip)
 		: 0;
 	const auto top = innerTop - extents.top() - _collapsedTopSkip;
-	const auto add = st::reactStripBubble.height() - extents.bottom();
+	const auto add = _st.icons.stripBubble.height() - extents.bottom();
 	_outer = QRect(0, _collapsedTopSkip, width, height);
 	_outerWithBubble = _outer.marginsAdded({ 0, 0, 0, add });
 	setGeometry(_outerWithBubble.marginsAdded(
@@ -329,7 +336,7 @@ void Selector::paintAppearing(QPainter &p) {
 	if (_paintBuffer.size() != _outerWithBubble.size() * factor) {
 		_paintBuffer = _cachedRound.PrepareImage(_outerWithBubble.size());
 	}
-	_paintBuffer.fill(st::defaultPopupMenu.menu.itemBg->c);
+	_paintBuffer.fill(_st.bg->c);
 	auto q = QPainter(&_paintBuffer);
 	const auto extents = extentsForShadow();
 	const auto appearedWidth = anim::interpolate(
@@ -348,7 +355,7 @@ void Selector::paintAppearing(QPainter &p) {
 		1.,
 		false);
 
-	_cachedRound.setBackgroundColor(st::defaultPopupMenu.menu.itemBg->c);
+	_cachedRound.setBackgroundColor(_st.bg->c);
 	_cachedRound.setShadowColor(st::shadowFg->c);
 	q.translate(QPoint(0, _collapsedTopSkip) - _inner.topLeft());
 	const auto radius = st::reactStripHeight / 2;
@@ -383,7 +390,7 @@ void Selector::paintBackgroundToBuffer() {
 	}
 	_paintBuffer.fill(Qt::transparent);
 
-	_cachedRound.setBackgroundColor(st::defaultPopupMenu.menu.itemBg->c);
+	_cachedRound.setBackgroundColor(_st.bg->c);
 	_cachedRound.setShadowColor(st::shadowFg->c);
 
 	auto p = QPainter(&_paintBuffer);
@@ -403,7 +410,7 @@ void Selector::paintCollapsed(QPainter &p) {
 		}
 		p.drawImage(_outer.topLeft(), _paintBuffer);
 	} else {
-		p.fillRect(_inner, st::defaultPopupMenu.menu.itemBg);
+		p.fillRect(_inner, _st.bg);
 	}
 	_strip->paint(
 		p,
@@ -426,7 +433,7 @@ void Selector::paintExpanding(Painter &p, float64 progress) {
 	}
 	_list->paintExpanding(
 		p,
-		rects.list.marginsRemoved(st::reactPanelEmojiPan.margin),
+		rects.list.marginsRemoved(_st.margin),
 		rects.finalBottom,
 		rects.expanding,
 		progress,
@@ -458,11 +465,11 @@ auto Selector::paintExpandingBg(QPainter &p, float64 progress)
 		const auto pattern = _cachedRound.validateFrame(frame, 1., radius);
 		const auto fill = _cachedRound.FillWithImage(p, outer, pattern);
 		if (!fill.isEmpty()) {
-			p.fillRect(fill, st::defaultPopupMenu.menu.itemBg);
+			p.fillRect(fill, _st.bg);
 		}
 	} else {
 		const auto inner = outer.marginsRemoved(extentsForShadow());
-		p.fillRect(inner, st::defaultPopupMenu.menu.itemBg);
+		p.fillRect(inner, _st.bg);
 		p.fillRect(
 			inner.x(),
 			inner.y() + inner.height(),
@@ -513,7 +520,7 @@ void Selector::paintExpanded(QPainter &p) {
 		p.drawImage(0, 0, _paintBuffer);
 	} else {
 		const auto inner = rect().marginsRemoved(extentsForShadow());
-		p.fillRect(inner, st::defaultPopupMenu.menu.itemBg);
+		p.fillRect(inner, _st.bg);
 		p.fillRect(
 			inner.x(),
 			inner.y() + inner.height(),
@@ -536,7 +543,7 @@ void Selector::finishExpand() {
 			st::emojiPanRadius);
 		const auto fill = _cachedRound.FillWithImage(q, rect(), pattern);
 		if (!fill.isEmpty()) {
-			q.fillRect(fill, st::defaultPopupMenu.menu.itemBg);
+			q.fillRect(fill, _st.bg);
 		}
 	}
 	if (_footer) {
@@ -548,7 +555,7 @@ void Selector::finishExpand() {
 }
 
 void Selector::paintBubble(QPainter &p, int innerWidth) {
-	const auto &bubble = st::reactStripBubble;
+	const auto &bubble = _st.icons.stripBubble;
 	const auto bubbleRight = std::min(
 		st::reactStripBubbleRight,
 		(innerWidth - bubble.width()) / 2);
@@ -772,8 +779,7 @@ void Selector::createList() {
 	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, st::reactPanelScroll);
 	_scroll->hide();
 
-	const auto st = lifetime().make_state<style::EmojiPan>(
-		st::reactPanelEmojiPan);
+	const auto st = lifetime().make_state<style::EmojiPan>(_st);
 	st->padding.setTop(_skipy);
 	if (!_reactions.customAllowed) {
 		st->bg = st::transparent;
@@ -835,8 +841,7 @@ void Selector::createList() {
 		}, _shadow->lifetime());
 		_shadow->show();
 	}
-	const auto geometry = inner.marginsRemoved(
-		st::reactPanelEmojiPan.margin);
+	const auto geometry = inner.marginsRemoved(_st.margin);
 	_list->move(0, 0);
 	_list->resizeToWidth(geometry.width());
 	_list->refreshEmoji();
@@ -857,7 +862,7 @@ void Selector::createList() {
 	}, _list->lifetime());
 
 	_scroll->setGeometry(inner.marginsRemoved({
-		st::reactPanelEmojiPan.margin.left(),
+		_st.margin.left(),
 		_footer ? _footer->height() : 0,
 		0,
 		0,
@@ -942,6 +947,7 @@ AttachSelectorResult MakeJustSelectorMenu(
 		Fn<void(ChosenReaction)> chosen) {
 	const auto selector = Ui::CreateChild<Selector>(
 		menu.get(),
+		st::reactPanelEmojiPan,
 		controller->uiShow(),
 		mode,
 		std::move(recent),
@@ -1017,6 +1023,7 @@ AttachSelectorResult AttachSelectorToMenu(
 	const auto withSearch = reactions.customAllowed;
 	const auto selector = Ui::CreateChild<Selector>(
 		menu.get(),
+		st::reactPanelEmojiPan,
 		controller->uiShow(),
 		std::move(reactions),
 		std::move(iconFactory),
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 5cf7ca294..648fe4adb 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -42,6 +42,7 @@ class Selector final : public Ui::RpWidget {
 public:
 	Selector(
 		not_null<QWidget*> parent,
+		const style::EmojiPan &st,
 		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::PossibleItemReactionsRef &reactions,
 		IconFactory iconFactory,
@@ -49,6 +50,7 @@ public:
 		bool child = false);
 	Selector(
 		not_null<QWidget*> parent,
+		const style::EmojiPan &st,
 		std::shared_ptr<ChatHelpers::Show> show,
 		ChatHelpers::EmojiListMode mode,
 		std::vector<DocumentId> recent,
@@ -95,6 +97,7 @@ private:
 
 	Selector(
 		not_null<QWidget*> parent,
+		const style::EmojiPan &st,
 		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::PossibleItemReactionsRef &reactions,
 		ChatHelpers::EmojiListMode mode,
@@ -129,6 +132,7 @@ private:
 	void finishExpand();
 	ChosenReaction lookupChosen(const Data::ReactionId &id) const;
 
+	const style::EmojiPan &_st;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const Data::PossibleItemReactions _reactions;
 	const std::vector<DocumentId> _recent;
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 25d7fa4dd..f9c27b15c 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/animated_icon.h"
 #include "ui/painter.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace HistoryView::Reactions {
 namespace {
@@ -44,11 +45,13 @@ constexpr auto kHoverScale = 1.24;
 } // namespace
 
 Strip::Strip(
+	const style::EmojiPan &st,
 	QRect inner,
 	int size,
 	Fn<void()> update,
 	IconFactory iconFactory)
-: _iconFactory(std::move(iconFactory))
+: _st(st)
+, _iconFactory(std::move(iconFactory))
 , _inner(inner)
 , _finalSize(size)
 , _update(std::move(update)) {
@@ -173,7 +176,7 @@ void Strip::paintOne(
 	} else {
 		const auto paintFrame = [&](not_null<Ui::AnimatedIcon*> animation) {
 			const auto size = int(std::floor(target.width() + 0.01));
-			const auto &textColor = st::windowFg->c;
+			const auto &textColor = _st.textFg->c;
 			const auto frame = animation->frame(
 				textColor,
 				{ size, size },
@@ -238,9 +241,9 @@ int Strip::fillChosenIconGetIndex(ChosenReaction &chosen) const {
 	}
 	const auto &icon = *i;
 	if (const auto &appear = icon.appear; appear && appear->animating()) {
-		chosen.icon = appear->frame(st::windowFg->c);
+		chosen.icon = appear->frame(_st.textFg->c);
 	} else if (const auto &select = icon.select; select && select->valid()) {
-		chosen.icon = select->frame(st::windowFg->c);
+		chosen.icon = select->frame(_st.textFg->c);
 	}
 	return (i - begin(_icons));
 }
@@ -263,7 +266,7 @@ void Strip::paintPremiumIcon(
 		p.translate(-target.center());
 	}
 	auto hq = PainterHighQualityEnabler(p);
-	st::reactionPremiumLocked.paintInCenter(p, to);
+	_st.icons.stripPremiumLocked.paintInCenter(p, to);
 	if (scale != 1.) {
 		p.restore();
 	}
@@ -288,8 +291,8 @@ void Strip::paintExpandIcon(
 	}
 	auto hq = PainterHighQualityEnabler(p);
 	((_finalSize == st::reactionCornerImage)
-		? st::reactionsExpandDropdown
-		: st::reactionExpandPanel).paintInCenter(p, to);
+		? _st.icons.stripExpandDropdown
+		: _st.icons.stripExpandPanel).paintInCenter(p, to);
 	if (scale != 1.) {
 		p.restore();
 	}
@@ -495,7 +498,7 @@ void Strip::setMainReactionIcon() {
 	if (i != end(_loadCache) && i->second.icon) {
 		const auto &icon = i->second.icon;
 		if (!icon->frameIndex() && icon->width() == MainReactionSize()) {
-			_mainReactionImage = i->second.icon->frame(st::windowFg->c);
+			_mainReactionImage = i->second.icon->frame(_st.textFg->c);
 			return;
 		}
 	}
@@ -543,7 +546,7 @@ Ui::ImageSubrect Strip::validateEmoji(int frameIndex, float64 scale) {
 	if (_mainReactionImage.isNull()
 		&& _mainReactionIcon) {
 		_mainReactionImage = base::take(_mainReactionIcon)->frame(
-			st::windowFg->c);
+			_st.textFg->c);
 	}
 	if (!_mainReactionImage.isNull()) {
 		const auto target = QRect(
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 9447b0d77..e8a98fd49 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.h
@@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/round_area_with_shadow.h"
 #include "data/data_message_reaction_id.h"
 
+namespace style {
+struct EmojiPan;
+} // namespace style
+
 class HistoryItem;
 
 namespace Data {
@@ -44,7 +48,12 @@ class Strip final {
 public:
 	using ReactionId = Data::ReactionId;
 
-	Strip(QRect inner, int size, Fn<void()> update, IconFactory iconFactory);
+	Strip(
+		const style::EmojiPan &st,
+		QRect inner,
+		int size,
+		Fn<void()> update,
+		IconFactory iconFactory);
 
 	enum class AddedButton : uchar {
 		None,
@@ -121,6 +130,7 @@ private:
 	void resolveMainReactionIcon();
 	void setMainReactionIcon();
 
+	const style::EmojiPan &_st;
 	const IconFactory _iconFactory;
 	const QRect _inner;
 	const int _finalSize = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 446c8f91b..49434bd53 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -134,6 +134,7 @@ void Reactions::create() {
 	const auto withSearch = reactions.customAllowed;
 	_selector = std::make_unique<HistoryView::Reactions::Selector>(
 		_parent.get(),
+		st::storiesReactionsPan,
 		_controller->uiShow(),
 		std::move(reactions),
 		_controller->cachedReactionIconFactory().createMethod(),
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index cd88a570f..cfc78f8b2 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -525,6 +525,122 @@ storiesComposePremium: PremiumLimits(defaultPremiumLimits) {
 	nonPremiumBg: storiesComposeBgOver;
 	nonPremiumFg: storiesComposeWhiteText;
 }
+storiesEmojiTabbedSearch: TabbedSearch(defaultTabbedSearch) {
+	outer: storiesComposeBg;
+	bg: storiesComposeBgOver;
+	bgActive: storiesComposeBgRipple;
+	fg: storiesComposeGrayIcon;
+	fgActive: storiesComposeWhiteText;
+	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBgOver }};
+	fadeRight: icon {{ "fade_horizontal", storiesComposeBgOver }};
+	field: InputField(defaultTabbedSearchField) {
+		textFg: storiesComposeWhiteText;
+		placeholderFg: storiesComposeGrayText;
+		placeholderFgActive: storiesComposeGrayText;
+		placeholderFgError: storiesComposeGrayText;
+	}
+	search: IconButton(defaultTabbedSearchButton) {
+		icon: icon{{ "emoji/emoji_search_input", storiesComposeGrayIcon }};
+		iconOver: icon{{ "emoji/emoji_search_input", storiesComposeGrayIcon }};
+		ripple: storiesComposeRipple;
+	}
+	back: IconButton(defaultTabbedSearchBack) {
+		icon: icon{{ "emoji/emoji_back", storiesComposeGrayIcon }};
+		iconOver: icon{{ "emoji/emoji_back", storiesComposeGrayIcon }};
+		ripple: storiesComposeRipple;
+	}
+	cancel: CrossButton(defaultTabbedSearchCancel) {
+		crossFg: storiesComposeGrayIcon;
+		crossFgOver: storiesComposeGrayIcon;
+		ripple: emptyRippleAnimation;
+	}
+}
+storiesEmojiPan: EmojiPan(defaultEmojiPan) {
+	showAnimation: PanelAnimation(emojiPanAnimation) {
+		fadeBg: storiesComposeBg;
+	}
+	bg: storiesComposeBg;
+	headerFg: storiesComposeGrayText;
+	trendingHeaderFg: storiesComposeWhiteText;
+	trendingSubheaderFg: storiesComposeGrayText;
+	trendingUnreadFg: storiesComposeBlue;
+	trendingInstalled: icon {{ "chat/input_save", storiesComposeBlue }};
+	overBg: storiesComposeBgOver;
+	pathBg: storiesComposeBgRipple;
+	pathFg: storiesComposeBgOver;
+	textFg: storiesComposeWhiteText;
+	categoriesBg: storiesComposeBg;
+	categoriesBgOver: storiesComposeBgOver;
+	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
+	fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
+	menu: storiesPopupMenuWithIcons;
+	expandedSeparator: MenuSeparator(storiesMenuSeparator) {
+		padding: margins(0px, 4px, 0px, 4px);
+		width: 6px;
+	}
+	tabs: SettingsSlider(emojiTabs) {
+		barFgActive: storiesComposeBlue;
+		labelFg: storiesComposeGrayText;
+		labelFgActive: storiesComposeBlue;
+		rippleBg: storiesComposeBgOver;
+		rippleBgActive: storiesComposeBgOver;
+	}
+	search: storiesEmojiTabbedSearch;
+	removeSet: storiesRemoveSet;
+	boxLabel: FlatLabel(boxLabel) {
+		textFg: groupCallMembersFg;
+	}
+	icons: ComposeIcons {
+		settings: icon {{ "emoji/emoji_settings", storiesComposeGrayIcon }};
+
+		recent: icon {{ "emoji/emoji_recent", storiesComposeGrayIcon }};
+		recentActive: icon {{ "emoji/emoji_recent", storiesComposeWhiteText }};
+		people: icon {{ "emoji/emoji_smile", storiesComposeGrayIcon }};
+		peopleActive: icon {{ "emoji/emoji_smile", storiesComposeWhiteText }};
+		nature: icon {{ "emoji/emoji_nature", storiesComposeGrayIcon }};
+		natureActive: icon {{ "emoji/emoji_nature", storiesComposeWhiteText }};
+		food: icon {{ "emoji/emoji_food", storiesComposeGrayIcon }};
+		foodActive: icon {{ "emoji/emoji_food", storiesComposeWhiteText }};
+		activity: icon {{ "emoji/emoji_activities", storiesComposeGrayIcon }};
+		activityActive: icon {{ "emoji/emoji_activities", storiesComposeWhiteText }};
+		travel: icon {{ "emoji/emoji_travel", storiesComposeGrayIcon }};
+		travelActive: icon {{ "emoji/emoji_travel", storiesComposeWhiteText }};
+		objects: icon {{ "emoji/emoji_objects", storiesComposeGrayIcon }};
+		objectsActive: icon {{ "emoji/emoji_objects", storiesComposeWhiteText }};
+		symbols: icon {{ "emoji/emoji_love", storiesComposeGrayIcon }};
+		symbolsActive: icon {{ "emoji/emoji_love", storiesComposeWhiteText }};
+
+		menuFave: icon {{ "menu/favorite", storiesComposeWhiteText }};
+		menuUnfave: icon {{ "menu/unfavorite", storiesComposeWhiteText }};
+		menuStickerSet: icon {{ "menu/stickers", storiesComposeWhiteText }};
+		menuRecentRemove: icon {{ "menu/delete", storiesComposeWhiteText }};
+		menuGifAdd: icon {{ "menu/gif", storiesComposeWhiteText }};
+		menuGifRemove: icon {{ "menu/delete", storiesComposeWhiteText }};
+		menuMute: icon {{ "menu/mute", storiesComposeWhiteText }};
+		menuSchedule: icon {{ "menu/calendar", storiesComposeWhiteText }};
+		menuWhenOnline: icon {{ "menu/send_when_online", storiesComposeWhiteText }};
+		menuSpoiler: icon {{ "menu/spoiler_on", storiesComposeWhiteText }};
+		menuSpoilerOff: icon {{ "menu/spoiler_off", storiesComposeWhiteText }};
+
+		stripBubble: icon{
+			{ "chat/reactions_bubble_shadow", windowShadowFg },
+			{ "chat/reactions_bubble", storiesComposeBg },
+		};
+		stripPremiumLocked: icon{
+			{ "chat/reactions_premium_bg", storiesComposeBgRipple },
+			{ "chat/reactions_premium_star", storiesComposeGrayIcon },
+		};
+		stripExpandPanel: icon{
+			{ "chat/reactions_round_big", storiesComposeBgRipple },
+			{ "chat/reactions_expand_panel", storiesComposeGrayIcon },
+		};
+		stripExpandDropdown: icon{
+			{ "chat/reactions_round_small", storiesComposeBgRipple },
+			{ "chat/reactions_expand_panel", storiesComposeGrayIcon },
+		};
+	}
+	autocompleteBottomSkip: 10px;
+}
 storiesComposeControls: ComposeControls(defaultComposeControls) {
 	bg: storiesComposeBg;
 	radius: storiesRadius;
@@ -560,104 +676,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
 		fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
 	}
-	tabbed: EmojiPan(defaultEmojiPan) {
-		showAnimation: PanelAnimation(emojiPanAnimation) {
-			fadeBg: storiesComposeBg;
-		}
-		bg: storiesComposeBg;
-		headerFg: storiesComposeGrayText;
-		trendingHeaderFg: storiesComposeWhiteText;
-		trendingSubheaderFg: storiesComposeGrayText;
-		trendingUnreadFg: storiesComposeBlue;
-		trendingInstalled: icon {{ "chat/input_save", storiesComposeBlue }};
-		overBg: storiesComposeBgOver;
-		pathBg: storiesComposeBgRipple;
-		pathFg: storiesComposeBgOver;
-		textFg: storiesComposeWhiteText;
-		categoriesBg: storiesComposeBg;
-		categoriesBgOver: storiesComposeBgOver;
-		fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
-		fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
-		menu: storiesPopupMenuWithIcons;
-		expandedSeparator: MenuSeparator(storiesMenuSeparator) {
-			padding: margins(0px, 4px, 0px, 4px);
-			width: 6px;
-		}
-		tabs: SettingsSlider(emojiTabs) {
-			barFgActive: storiesComposeBlue;
-			labelFg: storiesComposeGrayText;
-			labelFgActive: storiesComposeBlue;
-			rippleBg: storiesComposeBgOver;
-			rippleBgActive: storiesComposeBgOver;
-		}
-		search: TabbedSearch(defaultTabbedSearch) {
-			outer: storiesComposeBg;
-			bg: storiesComposeBgOver;
-			bgActive: storiesComposeBgRipple;
-			fg: storiesComposeGrayIcon;
-			fgActive: storiesComposeWhiteText;
-			fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBgOver }};
-			fadeRight: icon {{ "fade_horizontal", storiesComposeBgOver }};
-			field: InputField(defaultTabbedSearchField) {
-				textFg: storiesComposeWhiteText;
-				placeholderFg: storiesComposeGrayText;
-				placeholderFgActive: storiesComposeGrayText;
-				placeholderFgError: storiesComposeGrayText;
-			}
-			search: IconButton(defaultTabbedSearchButton) {
-				icon: icon{{ "emoji/emoji_search_input", storiesComposeGrayIcon }};
-				iconOver: icon{{ "emoji/emoji_search_input", storiesComposeGrayIcon }};
-				ripple: storiesComposeRipple;
-			}
-			back: IconButton(defaultTabbedSearchBack) {
-				icon: icon{{ "emoji/emoji_back", storiesComposeGrayIcon }};
-				iconOver: icon{{ "emoji/emoji_back", storiesComposeGrayIcon }};
-				ripple: storiesComposeRipple;
-			}
-			cancel: CrossButton(defaultTabbedSearchCancel) {
-				crossFg: storiesComposeGrayIcon;
-				crossFgOver: storiesComposeGrayIcon;
-				ripple: emptyRippleAnimation;
-			}
-		}
-		removeSet: storiesRemoveSet;
-		boxLabel: FlatLabel(boxLabel) {
-			textFg: groupCallMembersFg;
-		}
-		icons: ComposeIcons {
-			settings: icon {{ "emoji/emoji_settings", storiesComposeGrayIcon }};
-
-			recent: icon {{ "emoji/emoji_recent", storiesComposeGrayIcon }};
-			recentActive: icon {{ "emoji/emoji_recent", storiesComposeWhiteText }};
-			people: icon {{ "emoji/emoji_smile", storiesComposeGrayIcon }};
-			peopleActive: icon {{ "emoji/emoji_smile", storiesComposeWhiteText }};
-			nature: icon {{ "emoji/emoji_nature", storiesComposeGrayIcon }};
-			natureActive: icon {{ "emoji/emoji_nature", storiesComposeWhiteText }};
-			food: icon {{ "emoji/emoji_food", storiesComposeGrayIcon }};
-			foodActive: icon {{ "emoji/emoji_food", storiesComposeWhiteText }};
-			activity: icon {{ "emoji/emoji_activities", storiesComposeGrayIcon }};
-			activityActive: icon {{ "emoji/emoji_activities", storiesComposeWhiteText }};
-			travel: icon {{ "emoji/emoji_travel", storiesComposeGrayIcon }};
-			travelActive: icon {{ "emoji/emoji_travel", storiesComposeWhiteText }};
-			objects: icon {{ "emoji/emoji_objects", storiesComposeGrayIcon }};
-			objectsActive: icon {{ "emoji/emoji_objects", storiesComposeWhiteText }};
-			symbols: icon {{ "emoji/emoji_love", storiesComposeGrayIcon }};
-			symbolsActive: icon {{ "emoji/emoji_love", storiesComposeWhiteText }};
-
-			menuFave: icon {{ "menu/favorite", storiesComposeWhiteText }};
-			menuUnfave: icon {{ "menu/unfavorite", storiesComposeWhiteText }};
-			menuStickerSet: icon {{ "menu/stickers", storiesComposeWhiteText }};
-			menuRecentRemove: icon {{ "menu/delete", storiesComposeWhiteText }};
-			menuGifAdd: icon {{ "menu/gif", storiesComposeWhiteText }};
-			menuGifRemove: icon {{ "menu/delete", storiesComposeWhiteText }};
-			menuMute: icon {{ "menu/mute", storiesComposeWhiteText }};
-			menuSchedule: icon {{ "menu/calendar", storiesComposeWhiteText }};
-			menuWhenOnline: icon {{ "menu/send_when_online", storiesComposeWhiteText }};
-			menuSpoiler: icon {{ "menu/spoiler_on", storiesComposeWhiteText }};
-			menuSpoilerOff: icon {{ "menu/spoiler_off", storiesComposeWhiteText }};
-		}
-		autocompleteBottomSkip: 10px;
-	}
+	tabbed: storiesEmojiPan;
 	tabbedHeightMin: 220px;
 	tabbedHeightMax: 480px;
 	record: RecordBar(defaultRecordBar) {
@@ -747,6 +766,18 @@ storiesWhoViewed: WhoRead(defaultWhoRead) {
 		align: align(left);
 	}
 }
+storiesReactionsPan: EmojiPan(storiesEmojiPan) {
+	margin: margins(reactStripSkip, 0px, reactStripSkip, 0px);
+	padding: margins(reactStripSkip, 0px, reactStripSkip, reactStripSkip);
+	desiredSize: reactStripSize;
+	verticalSizeSub: 0px;
+	overBg: transparent;
+	search: TabbedSearch(storiesEmojiTabbedSearch) {
+		defaultFieldWidth: 88px;
+	}
+	searchMargin: margins(1px, 10px, 2px, 6px);
+}
+
 storiesReactionsWidth: 210px;
 storiesReactionsBottomSkip: 29px;
 storiesReactionsAddedTop: 200px;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 6b718137e..56f84a8e6 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -827,19 +827,6 @@ reactionMainAppearShift: 20px;
 reactionCollapseFadeThreshold: 40px;
 reactionFlyUp: 50px;
 
-reactionPremiumLocked: icon{
-	{ "chat/reactions_premium_bg", historyPeerArchiveUserpicBg },
-	{ "chat/reactions_premium_star", historyPeerUserpicFg },
-};
-reactionExpandPanel: icon{
-	{ "chat/reactions_round_big", windowBgRipple },
-	{ "chat/reactions_expand_panel", windowSubTextFg },
-};
-reactionsExpandDropdown: icon{
-	{ "chat/reactions_round_small", windowBgRipple },
-	{ "chat/reactions_expand_panel", windowSubTextFg },
-};
-
 searchInChatMultiSelectItem: MultiSelectItem(defaultMultiSelectItem) {
 	maxWidth: 200px;
 }

From 0a54325db92d386b9e43dff9868e4c2c5e16126f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Jun 2023 18:48:29 +0400
Subject: [PATCH 286/676] Add a separate icon for My Stories.

---
 Telegram/Resources/icons/settings/stories.png    | Bin 0 -> 692 bytes
 Telegram/Resources/icons/settings/stories@2x.png | Bin 0 -> 1311 bytes
 Telegram/Resources/icons/settings/stories@3x.png | Bin 0 -> 1923 bytes
 Telegram/SourceFiles/settings/settings.style     |   1 +
 Telegram/SourceFiles/window/window_main_menu.cpp |   2 +-
 5 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 Telegram/Resources/icons/settings/stories.png
 create mode 100644 Telegram/Resources/icons/settings/stories@2x.png
 create mode 100644 Telegram/Resources/icons/settings/stories@3x.png

diff --git a/Telegram/Resources/icons/settings/stories.png b/Telegram/Resources/icons/settings/stories.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cc794ddc38ecf373529878ce1bea92f69f52c2d
GIT binary patch
literal 692
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl1EO#WBP}
z@M-Y=)f*EfzD1u{ufsOmfMaq{+hn5&BF!RVsRkO|Ml$IO<``+UHScfG&}?m0>7MZ<
z+>1wyc~X$f{ktE(?s;E$@B1Id``>-8*T!D|yytxF-SgfH|7`B|yCyl+>+0*TcJt4_
zEi;zr`B~%l>`!mGh0NrWPwMvTi*>s#eps~gfbZgqufFcO|Neij`lSbtXZk!V+bzn)
zx-_V>f}!Aee?Py)-UyvXl}U5Xrt!BoA5Bu6rYW-e>MReH6Ib@{x%{$a_n#uJTl~3Q
zN0UP8m<vAN%$aun`TmV6t=C`QeOs1eHrv5mg6G2i7`^%ouGS<Isa&(!1r{<KEMcp!
zR@hw2+R7igG^kNB&8gtR>({SKtX!S8MzOxW{Hnz2#D(|Y@87!@aMHm;ZL;ok?+_uk
z2KD&3IE8>G%N1Fg_s6YYp)=KsL-~V?(;AOM4mNV_0Rg_tFF(|L6#e>Z)sK?fZ@>Ni
zZT%_vK#o~`U7gp`AeWC7d-Asbw#c@SdGxzU=D?ee6%!<xebkC~-&LFJ*|R8MM@-(*
zpiHybP74Lj-_F@~`K5{g#|M?R=7SG@)?9m8BH`MkAlvEUq*V8J+SaJty>Y9rW*JR(
zTikgxDMjnp=btqvepJ}FDGBnmH*>~oh;YT~O+T2xu>Ztlmw-ci7F~Q%x4&KFLDS2U
zTNx&HHEYAPr+RISSTp~2huop*-YP;j-<C~2$-=BP{q)WlzGL5u|NlSmhq3X?6E)q+
R-gBT7<LT<>vd$@?2>=mPDY^gv

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/stories@2x.png b/Telegram/Resources/icons/settings/stories@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..eafc4902550e5b57acdfaa4733ff903a722dad2e
GIT binary patch
literal 1311
zcmV+)1>pLLP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGiAh93R9Fe^SXn4_Q53%BxyU@0
zAw`5j9?WGZ9w<p3NaR8CB3>vSl<;DBP+rK85~7g#futmnAu<mkV<DOSU;q9)j<feU
z?z#8sf4TSJw$Iw%xAxj=uf5hfN1@REv>woU;CDTsr>1&cU0nwU2XAlh&(F_?hX*ya
zsYut?*N=^jZES4Z+1Yt}dxI(Xy}Z15d3mX*QDvHukx_AR@#W<uF+%X~=jX@QoSK?i
zQ&Z#X>&q8va-5Noad2?JH)3sVt)-=<va&KiKVPu0v9a;T#|OZ#udns>^(H1JnluGx
z)YR0(nR0%9URqk}>FFu41}JlLa~x%Pd0ArzYH4XXF)=|@BWx=wD$LBxBuwF^0K+zj
zpFp3VpXa7jA7G=Clas`n{r!D^e}B2UqNAht_V%D*YHCU@mx1R_3j4FQwPhfb5E&X8
z#>B*EAdE6IGdbVb*w`qs^lw6NO^%L^U=ZR)g_9C94S^LA5rOm}1`w5(l#~$nl$Di<
zg5*#1^z=aO(9n=PDo*|8<_65u(^FGZQ+Z@b^vui**=Jy2AQPy|l%g_NSy^GKuCDI!
z@lk+5{VFOdLTcIG-X0trjEsyV0Ibp7-MzK7wYj-jUS7_O;<2$Y0?y0J6R4GXY;JBQ
z`*3q}qj3!l4P=)4M{>%|&E@JEk@xra!*l^1>6FYO7YL@L9*>WYL0ei{qCrtnQADFM
z|5;gCw1&mSMZ$G;b){#8I{*T%c5!jRV0LzvCL|;z&_Xc@6I@+g4Ls89?d>g1)Tc#`
zj*di#h^A*fJUnQjn1l)L>+AFJ@i{p;VfIf9gPfe4Bn(0iB(^*)-`(A%g^(cXnQ{mj
zN5*BX=jUgdhI{n>{!Yu8l8%lJrd&eEFzD>;j1ai9<MY?o*HPg360z~XzyNp21sEI|
znh1eV^bt^U3()T|K^7JkI5_EBc6D{dOc_v!NCy|&wzIQi>SqY=@9)7G85v>B{S_fv
zp;62xL~Cehs2F#Ae4G$vlt_3RoTsNJb8~Ysy#WCMxVN-Th`jjtcrg|V0Ge8`z@^is
z7)z0plS5WYOG^_4DHK6LK^GSne49{b5)%_8DB0QB1mD}+D*+Quq5C0q0DZA=?)x*z
zC}fShyF0F~eMfygwYRquaB_0;msFWiTU#4prlh1u<K5lehlhtz#)E@{rIDDet*wRH
zm6a7eJ(=&QxFd)mkWsxQBI!p91OPPYXwYQbc|IS#2XPW&Tt`QTKlOjcsIpvThO5;v
z0_DiSz(5@h|G3W1&Ro9f?CeCNEmtY-c~@5#-p*E6S2g42kdP3hU2=8{3k$gF%G(qd
z7l*1&xJb52zG42XA9)$C@kB573RmI#%a63e!b0w~_4@i6-yVLX$N->zq0SSV$Ulyt
zs;Vj}DG9B#y}doHYhz=BAV)_>xt4~8sU-;u3*%lJ_{L$37RTD!ny)=QJ$-t5x}czd
zFZ`7;+G>2QIy^iS*c2WfuKs#zWfy#*LU`dg@WZF0*49>-sJ=~F4O$OqJ@Bg@_yaIs
VOHNxE+6Vvu002ovPDHLkV1i$hSO5S3

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/stories@3x.png b/Telegram/Resources/icons/settings/stories@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1d6678e0911991ab32a1ebfd118d9799ee0efd5
GIT binary patch
literal 1923
zcmV-}2YmR6P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>?MXyIRA>e5T3bj}T@cPxx~P?A
zqCS|ZdBL(C@<9th1cegw_MoL^SrmqdbkhPYA_#mbLA*n1_25HMhG-U1lBJ^EFJ7`x
zRI;Md#C!c8|G{Z-_C9N0{(TPquzhjPS~K6wti9IknOS?u68%qK0euDZ70_2eUjcmu
z^cAqw3Rsy*(TWu-LPJBhZr$qd@9*vHy?XU(2M33rKYyM)dGf)72WC=gM%XoL)*L!?
z=>GltQ&Ura#QsJ`M$D+*9MCQ<F2%*glarHT?))A5@#BY;mB==6baXs=^yr>Fdu(lO
z&0(GzOglTf{QUg!@$tXro1ngZ`v%j6I&5rg-n@BZ5bEyk-nnz9kjK&^si~>hU80V>
zeEIUig$w)l?~jU#+Pr!5+O=y<85a~3WQ1_*)-7jeXH)#<9k;f&zI^$zkwN(R<jIqq
zoSY3CHpo|xxbpSuS0kvw!NHJ_5cwe5a3V<Dy?fWllvl4_?b@|Voq{b}wsduM83E4B
z%p@izssmIb<>TXnlfW7=JUomow{+=JHE;_u5JyD)^5qMQ+}GE)FmLAn2w%Ouy{zu1
zPoKKFx@x7?-QB&VrG@aZ3$#M!;UIi9H#d`35Vf_n%a<?b$ta(Lmh<P&PfSb<3=D*Y
zg((M6E>Toe#Cmn^+&SeKawSAxcXEXl@ujDyvtCtKS1S@<q|B>UtzwTgV*0XW%ND7v
zip;{Mr^hukG^Am)kZFd8hsUvF$KvARwA`X@Zf-cr<k;T5du3Xq6&tb^+An9$oY4w)
zNoi>*dG+ksGcDIlo{hVA?<NDjfB(L6<w|*STrT8n$N&g8GBT3OZk9<eFR$Off0GRv
z85tU=$;!$i#D@<bN+NoCdZK=L`}Qr4B4W&m6DN=gvQj8a5MWVmf}y{^|Jt={+qP|E
z8AR!O_wJDy9UUE_Jjw=JTU!b7$dMy_;e><)VM&I~bNKLKgCHI_Ub_TnAn-IKPfmP%
zJS&A`&$mQk7Eyj~ZjRI=-{A;s-@bi*ex6m&(kNk4Qc~Dm&CY@*=S5ZEIkP3-zJ2>d
z+2jsJM@N(Twzf9D*z4D?iCF~!yHPZ7RMgkk6YSNiS2>)RlE}x|-49$27Fsuffq@(b
z$tin#`{d+g4qIbmBh7NkRs)ZOV}5>qg!S&-JEDaIy9B~nnIpl$!5q%(*ROy2^a%_&
zlVxRP98OHx@TWI!+(-;4x`-AMl1nHQ5so-HISB`81VIQ*gz)h2_wV2L^z_iUC?Vk(
zsxK1bJBHexI8_tq_V8tK4sYMS&F3-9N^C{!dqUy21W|4hr)okI5Lw#s^bLUsVVW<1
zJPQYaqLvC`dV1P&xi$MTl{`fU4<1zE4~ZaO;jf*Rv((3gdh`bQ&?xEK+uO-dMa1XN
zpVzHh$H&JknzN`}G>E`WO-*DU`ks=C5k=YjfModu!nd5h9hxghK@Cun$(@9$Y?DJ~
zPK{)RlURv*c>45d2|NCsMvsxiQ9a2KG0B64AuP!(hEOsyGf7I4C@(K3K|WDZQbK5G
zmhqV-W&;8O2n!Jsr$|CzVfy&-<0Qx-(7lu2X2pA%pkzMe1#`syvv&>=5fNf6;$x>y
zogzC#2~=XZ01y`zjBeVri3QQ1t<UxaaO4CUc>^d?*~*u-tg5O?{<DIPOP4N@_~_`U
z{Jmq+K2%wRh`Uy$w>t+89H5GhaBxkdsBwY^i)@R;3kwTPnyYAnEwr$5ie$lz;ul#3
znRWK;S)~Z*y^%Nw+-oaE5a*AHi6LB=sOav?fVgAFj>nH5<0>#MElpepcNCkpv$NA+
z!;Kp^xV#D{*&C3$x;ll@8nENLgY4{V+%sw1fkuH$4-EvOf(FJe5(w-8@@;l@R#E6*
zBrb@Xfq3}w<45uhVG389;;jF>QB>w^j*E^bze}OoLG*?2;lQIuk1W@CM%BQ+bI~5<
zx0Y1+mXwtA>(?*C){yMUslYcWlAD`L8`3~rym(QQ3tRMOQEnQ6vz;=NHfc41Zv@zP
zE=)nKjdzryEXl|ie6+*nr3Ux#S(c(4#RyZ)Po!GN*^E~A#fulQv9T&%HR#<NLE-0>
zD_1nx2#VcXzkdDm=g)-(jg5`rC5|V+Z&|bYK79DV;$S=An=zKb(loMcl$GdMux1gB
zFoP*nyA2Hum6etFSkaWLH*ek~DSY$e>+5T2Pek>h{fJK^D3p<jLISCoC<49;tf;8C
zbLWmlzcCUuML3AAU_n6vJ`xi8LnBC8{!4%nDz)ec-r9M2dDu~OBTkOh)YMqU6f1M9
z!94@M3C7XFc14|v8(KJNZlyZDz5@CR=qsSFfW89y3M|eQ_y?gq>GBQ5Gob(g002ov
JPDHLkV1kA2lMMg>

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index bfdc586d6..853af9e43 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -94,6 +94,7 @@ settingsIconGroup: icon {{ "settings/group", settingsIconFg }};
 settingsIconChannel: icon {{ "settings/channel", settingsIconFg }};
 settingsIconUser: icon {{ "settings/user", settingsIconFg }};
 settingsIconSavedMessages: icon {{ "settings/saved_messages", settingsIconFg }};
+settingsIconStories: icon {{ "settings/stories", settingsIconFg }};
 settingsIconKey: icon {{ "settings/key", settingsIconFg }};
 settingsIconReload: icon {{ "settings/reload", settingsIconFg }};
 settingsIconNight: icon {{ "settings/night", settingsIconFg }};
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 227a00d42..816f918cf 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -771,7 +771,7 @@ void MainMenu::setupMenu() {
 					tr::lng_menu_my_stories(),
 					st::mainMenuButton,
 					IconDescriptor{
-						&st::settingsIconSavedMessages,
+						&st::settingsIconStories,
 						kIconLightOrange
 					})));
 		const auto stories = &controller->session().data().stories();

From 43af9fd87e639d65ea35fe6c16cad66decf015b4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Jun 2023 18:48:32 +0400
Subject: [PATCH 287/676] Fix controls fading in raster stories backend.

---
 .../media/view/media_view_overlay_opengl.cpp  |  2 +-
 .../media/view/media_view_overlay_raster.cpp  | 77 +++++++++++--------
 .../media/view/media_view_overlay_raster.h    |  5 +-
 3 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index a1bdce930..85211c74d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -749,8 +749,8 @@ void OverlayWidget::RendererGL::invalidateControls() {
 }
 
 void OverlayWidget::RendererGL::validateControlsFade() {
-	const auto flip = !_owner->topShadowOnTheRight();
 	const auto forStories = (_owner->_stories != nullptr);
+	const auto flip = !forStories && !_owner->topShadowOnTheRight();
 	if (!_controlsFadeImage.image().isNull()
 		&& _shadowTopFlip == flip
 		&& _shadowsForStories == forStories) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
index 13109e828..e7cc17d74 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
@@ -76,7 +76,7 @@ void OverlayWidget::RendererSW::paintTransformedVideoFrame(
 		return;
 	}
 	paintTransformedImage(_owner->videoFrame(), rect, rotation);
-	paintControlsFade(rect, geometry.controlsOpacity, geometry.fade);
+	paintControlsFade(rect, geometry);
 }
 
 void OverlayWidget::RendererSW::paintTransformedStaticContent(
@@ -97,56 +97,71 @@ void OverlayWidget::RendererSW::paintTransformedStaticContent(
 	if (!image.isNull()) {
 		paintTransformedImage(image, rect, rotation);
 	}
-	paintControlsFade(rect, geometry.controlsOpacity, geometry.fade);
+	paintControlsFade(rect, geometry);
 }
 
 void OverlayWidget::RendererSW::paintControlsFade(
-		QRect geometry,
-		float64 opacity,
-		float64 fullFade) {
-	if (fullFade > 0.) {
-		_p->setOpacity(fullFade);
-		_p->fillRect(geometry, Qt::black);
-		opacity *= 1. - fullFade;
+	QRect content,
+	const ContentGeometry &geometry) {
+	auto opacity = geometry.controlsOpacity;
+	if (geometry.fade > 0.) {
+		_p->setOpacity(geometry.fade);
+		_p->fillRect(content, Qt::black);
+		opacity *= 1. - geometry.fade;
 	}
 
 	_p->setOpacity(opacity);
-	_p->setClipRect(geometry);
+	_p->setClipRect(content);
 	const auto width = _owner->width();
-	const auto flip = !_owner->topShadowOnTheRight();
 	const auto stories = (_owner->_stories != nullptr);
-	const auto &top = stories
-		? st::storiesShadowTop
-		: st::mediaviewShadowTop;
-	const auto topShadow = stories
-		? QRect(geometry.topLeft(), QSize(geometry.width(), top.height()))
-		: QRect(
-			QPoint(flip ? 0 : (width - top.width()), 0),
-			top.size());
-	if (topShadow.intersected(geometry).intersects(_clipOuter)) {
-		if (flip) {
-			if (_topShadowCache.isNull()
-				|| _topShadowColor != st::windowShadowFg->c) {
-				_topShadowColor = st::windowShadowFg->c;
-				_topShadowCache = top.instance(
-					_topShadowColor).mirrored(true, false);
+	if (!stories || geometry.topShadowShown) {
+		const auto flip = !stories && !_owner->topShadowOnTheRight();
+		const auto &top = stories
+			? st::storiesShadowTop
+			: st::mediaviewShadowTop;
+		const auto topShadow = stories
+			? QRect(
+				content.topLeft(),
+				QSize(content.width(), top.height()))
+			: QRect(
+				QPoint(flip ? 0 : (width - top.width()), 0),
+				top.size());
+		if (topShadow.intersected(content).intersects(_clipOuter)) {
+			if (stories) {
+				top.fill(*_p, topShadow);
+			} else if (flip) {
+				if (_topShadowCache.isNull()
+					|| _topShadowColor != st::windowShadowFg->c) {
+					_topShadowColor = st::windowShadowFg->c;
+					_topShadowCache = top.instance(
+						_topShadowColor).mirrored(true, false);
+				}
+				_p->drawImage(0, 0, _topShadowCache);
+			} else {
+				top.paint(*_p, topShadow.topLeft(), width);
 			}
-			_p->drawImage(0, 0, _topShadowCache);
-		} else {
-			top.paint(*_p, topShadow.topLeft(), width);
 		}
 	}
 	const auto &bottom = stories
 		? st::storiesShadowBottom
 		: st::mediaviewShadowBottom;
+	const auto bottomStart = _owner->height() - geometry.bottomShadowSkip;
 	const auto bottomShadow = QRect(
-		QPoint(0, _owner->height() - bottom.height()),
+		QPoint(0, bottomStart - bottom.height()),
 		QSize(width, bottom.height()));
-	if (bottomShadow.intersected(geometry).intersects(_clipOuter)) {
+	if (bottomShadow.intersected(content).intersects(_clipOuter)) {
 		bottom.fill(*_p, bottomShadow);
 	}
 	_p->setClipping(false);
 	_p->setOpacity(1.);
+	if (bottomStart < content.y() + content.height()) {
+		_p->fillRect(
+			content.x(),
+			bottomStart,
+			content.width(),
+			content.y() + content.height() - bottomStart,
+			QColor(0, 0, 0, 88));
+	}
 }
 
 void OverlayWidget::RendererSW::paintTransformedImage(
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
index 5c6a7880a..3d8abf4c4 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
@@ -33,10 +33,7 @@ private:
 		const QImage &image,
 		QRect rect,
 		int rotation);
-	void paintControlsFade(
-		QRect geometry,
-		float64 opacity,
-		float64 fullFade);
+	void paintControlsFade(QRect content, const ContentGeometry &geometry);
 	void paintRadialLoading(
 		QRect inner,
 		bool radial,

From 10d64d6bdfebee4682ca1117e1319c1f68c6820c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Jun 2023 18:47:03 +0400
Subject: [PATCH 288/676] Send story reactions as single-emoji messages.

---
 .../SourceFiles/history/history_widget.cpp    |  2 +-
 .../view/history_view_replies_section.cpp     |  5 ++-
 .../view/history_view_scheduled_section.cpp   |  4 +--
 .../stories/media_stories_controller.cpp      |  5 +++
 .../media/stories/media_stories_reactions.cpp |  3 +-
 .../media/stories/media_stories_reactions.h   |  8 +++++
 .../media/stories/media_stories_reply.cpp     | 31 ++++++++++++++++++-
 .../media/stories/media_stories_reply.h       |  8 +++++
 8 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 106dce71e..61c7c7237 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3874,7 +3874,7 @@ void HistoryWidget::send(Api::SendOptions options) {
 			? _previewData->id
 			: WebPageId(0));
 
-	auto message = ApiWrap::MessageToSend(prepareSendAction(options));
+	auto message = Api::MessageToSend(prepareSendAction(options));
 	message.textWithTags = _field->getTextWithAppliedMarkdown();
 	message.webPageId = webPageId;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index fc94a905c..4813dcc5b 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1166,7 +1166,7 @@ void RepliesWidget::send(Api::SendOptions options) {
 
 	const auto webPageId = _composeControls->webPageId();
 
-	auto message = ApiWrap::MessageToSend(prepareSendAction(options));
+	auto message = Api::MessageToSend(prepareSendAction(options));
 	message.textWithTags = _composeControls->getTextWithAppliedMarkdown();
 	message.webPageId = webPageId;
 
@@ -2507,8 +2507,7 @@ void RepliesWidget::listSendBotCommand(
 		_history->peer,
 		command,
 		context);
-	auto message = ApiWrap::MessageToSend(
-		prepareSendAction({}));
+	auto message = Api::MessageToSend(prepareSendAction({}));
 	message.textWithTags = { text };
 	session().api().sendMessage(std::move(message));
 	finishSending();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 998909301..c8966ad9c 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -587,7 +587,7 @@ void ScheduledWidget::send() {
 void ScheduledWidget::send(Api::SendOptions options) {
 	const auto webPageId = _composeControls->webPageId();
 
-	auto message = ApiWrap::MessageToSend(prepareSendAction(options));
+	auto message = Api::MessageToSend(prepareSendAction(options));
 	message.textWithTags = _composeControls->getTextWithAppliedMarkdown();
 	message.webPageId = webPageId;
 
@@ -1235,7 +1235,7 @@ void ScheduledWidget::listSendBotCommand(
 			_history->peer,
 			command,
 			context);
-		auto message = ApiWrap::MessageToSend(prepareSendAction(options));
+		auto message = Api::MessageToSend(prepareSendAction(options));
 		message.textWithTags = { text };
 		session().api().sendMessage(std::move(message));
 	};
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 6ea4a3f82..9131724f2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -167,6 +167,11 @@ Controller::Controller(not_null<Delegate*> delegate)
 		}
 	}, _lifetime);
 
+	_reactions->chosen(
+	) | rpl::start_with_next([=](const Data::ReactionId &id) {
+		_replyArea->sendReaction(id);
+	}, _lifetime);
+
 	_delegate->storiesLayerShown(
 	) | rpl::start_with_next([=](bool shown) {
 		_layerShown = shown;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 49434bd53..d77e8274e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -143,9 +143,8 @@ void Reactions::create() {
 	_selector->chosen(
 	) | rpl::start_with_next([=](
 			HistoryView::Reactions::ChosenReaction reaction) {
+		_chosen.fire_copy(reaction.id);
 		hide();
-		//reaction.context = itemId;
-		//chosen(std::move(reaction));
 	}, _selector->lifetime());
 
 	_selector->premiumPromoChosen() | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.h b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
index e9a89a09c..1be44b34a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
@@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/animations.h"
 
+namespace Data {
+struct ReactionId;
+} // namespace Data
+
 namespace HistoryView::Reactions {
 class Selector;
 } // namespace HistoryView::Reactions
@@ -29,6 +33,9 @@ public:
 	[[nodiscard]] rpl::producer<bool> expandedValue() const {
 		return _expanded.value();
 	}
+	[[nodiscard]] rpl::producer<Data::ReactionId> chosen() const {
+		return _chosen.events();
+	}
 
 	void show();
 	void hide();
@@ -47,6 +54,7 @@ private:
 	std::unique_ptr<Ui::RpWidget> _parent;
 	std::unique_ptr<HistoryView::Reactions::Selector> _selector;
 	std::vector<std::unique_ptr<Hiding>> _hiding;
+	rpl::event_stream<Data::ReactionId> _chosen;
 	Ui::Animations::Simple _showing;
 	rpl::variable<float64> _shownValue;
 	rpl::variable<bool> _expanded;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index db914d816..1ccce96a6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -17,6 +17,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/tabbed_selector.h"
 #include "core/file_utilities.h"
 #include "core/mime_type.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_document.h"
+#include "data/data_message_reaction_id.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/view/controls/compose_controls_common.h"
@@ -101,13 +104,39 @@ void ReplyArea::initGeometry() {
 	}, _lifetime);
 }
 
+void ReplyArea::sendReaction(const Data::ReactionId &id) {
+	Expects(_data.user != nullptr);
+
+	auto message = Api::MessageToSend(prepareSendAction({}));
+	if (const auto emoji = id.emoji(); !emoji.isEmpty()) {
+		message.textWithTags = { emoji };
+	} else if (const auto customId = id.custom()) {
+		const auto document = _data.user->owner().document(customId);
+		if (const auto sticker = document->sticker()) {
+			const auto text = sticker->alt;
+			const auto id = Data::SerializeCustomEmojiId(customId);
+			message.textWithTags = {
+				text,
+				{ { 0, text.size(), Ui::InputField::CustomEmojiLink(id) } }
+			};
+		}
+	}
+	if (!message.textWithTags.empty()) {
+		send(std::move(message), {});
+	}
+}
+
 void ReplyArea::send(Api::SendOptions options) {
 	const auto webPageId = _controls->webPageId();
 
-	auto message = ApiWrap::MessageToSend(prepareSendAction(options));
+	auto message = Api::MessageToSend(prepareSendAction(options));
 	message.textWithTags = _controls->getTextWithAppliedMarkdown();
 	message.webPageId = webPageId;
 
+	send(std::move(message), options);
+}
+
+void ReplyArea::send(Api::MessageToSend message, Api::SendOptions options) {
 	const auto error = GetErrorTextForSending(
 		_data.user,
 		{
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 30d15cb28..4dcd84013 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -15,8 +15,13 @@ enum class SendMediaType;
 namespace Api {
 struct SendAction;
 struct SendOptions;
+struct MessageToSend;
 } // namespace Api
 
+namespace Data {
+struct ReactionId;
+} // namespace Data
+
 namespace HistoryView {
 class ComposeControls;
 } // namespace HistoryView
@@ -56,6 +61,7 @@ public:
 	~ReplyArea();
 
 	void show(ReplyAreaData data);
+	void sendReaction(const Data::ReactionId &id);
 
 	[[nodiscard]] rpl::producer<bool> focusedValue() const;
 	[[nodiscard]] rpl::producer<bool> activeValue() const;
@@ -67,6 +73,8 @@ private:
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] not_null<History*> history() const;
 
+	void send(Api::MessageToSend message, Api::SendOptions options);
+
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 	bool confirmSendingFiles(
 		QImage &&image,

From af5228771cd96ca4168cab2ce0ce04701ea86895 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Jun 2023 18:49:09 +0400
Subject: [PATCH 289/676] Send views for expired pinned stories.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 79 +++++++++++++++++--
 Telegram/SourceFiles/data/data_stories.h      |  6 ++
 .../stories/media_stories_controller.cpp      |  5 ++
 .../media/stories/media_stories_controller.h  |  1 +
 4 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index c1b08a657..5a51f0360 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -33,6 +33,7 @@ constexpr auto kMaxResolveTogether = 100;
 constexpr auto kIgnorePreloadAroundIfLoaded = 15;
 constexpr auto kPreloadAroundCount = 30;
 constexpr auto kMarkAsReadDelay = 3 * crl::time(1000);
+constexpr auto kIncrementViewsDelay = 5 * crl::time(1000);
 constexpr auto kArchiveFirstPerPage = 30;
 constexpr auto kArchivePerPage = 100;
 constexpr auto kSavedFirstPerPage = 30;
@@ -296,7 +297,8 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 Stories::Stories(not_null<Session*> owner)
 : _owner(owner)
 , _expireTimer([=] { processExpired(); })
-, _markReadTimer([=] { sendMarkAsReadRequests(); }) {
+, _markReadTimer([=] { sendMarkAsReadRequests(); })
+, _incrementViewsTimer([=] { sendIncrementViewsRequests(); }) {
 }
 
 Stories::~Stories() {
@@ -1082,6 +1084,20 @@ void Stories::loadAround(FullStoryId id, StoriesContext context) {
 }
 
 void Stories::markAsRead(FullStoryId id, bool viewed) {
+	if (id.peer == _owner->session().userPeerId()) {
+		return;
+	}
+	const auto maybeStory = lookup(id);
+	if (!maybeStory) {
+		return;
+	}
+	const auto story = *maybeStory;
+	if (story->expired() && story->pinned()) {
+		_incrementViewsPending[id.peer].emplace(id.story);
+		if (!_incrementViewsTimer.isActive()) {
+			_incrementViewsTimer.callOnce(kIncrementViewsDelay);
+		}
+	}
 	const auto i = _all.find(id.peer);
 	Assert(i != end(_all));
 	if (i->second.readTill >= id.story) {
@@ -1176,12 +1192,7 @@ void Stories::sendMarkAsReadRequest(
 			&& _markReadPending.contains(peerId)) {
 			sendMarkAsReadRequests();
 		}
-		if (_markReadRequests.empty()) {
-			if (Core::Quitting()) {
-				LOG(("Stories doesn't prevent quit any more."));
-			}
-			Core::App().quitPreventFinished();
-		}
+		checkQuitPreventFinished();
 	};
 
 	const auto api = &_owner->session().api();
@@ -1191,6 +1202,15 @@ void Stories::sendMarkAsReadRequest(
 	)).done(finish).fail(finish).send();
 }
 
+void Stories::checkQuitPreventFinished() {
+	if (_markReadRequests.empty() && _incrementViewsRequests.empty()) {
+		if (Core::Quitting()) {
+			LOG(("Stories doesn't prevent quit any more."));
+		}
+		Core::App().quitPreventFinished();
+	}
+}
+
 void Stories::sendMarkAsReadRequests() {
 	_markReadTimer.cancel();
 	for (auto i = begin(_markReadPending); i != end(_markReadPending);) {
@@ -1207,6 +1227,46 @@ void Stories::sendMarkAsReadRequests() {
 	}
 }
 
+void Stories::sendIncrementViewsRequests() {
+	if (_incrementViewsPending.empty()) {
+		return;
+	}
+	auto ids = QVector<MTPint>();
+	auto peer = PeerId();
+	struct Prepared {
+		PeerId peer = 0;
+		QVector<MTPint> ids;
+	};
+	auto prepared = std::vector<Prepared>();
+	for (const auto &[peer, ids] : _incrementViewsPending) {
+		if (_incrementViewsRequests.contains(peer)) {
+			continue;
+		}
+		prepared.push_back({ .peer = peer });
+		for (const auto &id : ids) {
+			prepared.back().ids.push_back(MTP_int(id));
+		}
+	}
+
+	const auto api = &_owner->session().api();
+	for (auto &[peer, ids] : prepared) {
+		_incrementViewsRequests.emplace(peer);
+		const auto finish = [=] {
+			_incrementViewsRequests.remove(peer);
+			if (!_incrementViewsTimer.isActive()
+				&& _incrementViewsPending.contains(peer)) {
+				sendIncrementViewsRequests();
+			}
+			checkQuitPreventFinished();
+		};
+		api->request(MTPstories_IncrementStoryViews(
+			_owner->peer(peer)->asUser()->inputUser,
+			MTP_vector<MTPint>(std::move(ids))
+		)).done(finish).fail(finish).send();
+		_incrementViewsPending.remove(peer);
+	}
+}
+
 void Stories::loadViewsSlice(
 		StoryId id,
 		std::optional<StoryView> offset,
@@ -1392,7 +1452,10 @@ bool Stories::isQuitPrevent() {
 	if (!_markReadPending.empty()) {
 		sendMarkAsReadRequests();
 	}
-	if (_markReadRequests.empty()) {
+	if (!_incrementViewsPending.empty()) {
+		sendIncrementViewsRequests();
+	}
+	if (_markReadRequests.empty() && _incrementViewsRequests.empty()) {
 		return false;
 	}
 	LOG(("Stories prevents quit, marking as read..."));
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index a94b6ef12..9cde3d245 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -281,6 +281,8 @@ private:
 
 	void sendMarkAsReadRequests();
 	void sendMarkAsReadRequest(not_null<PeerData*> peer, StoryId tillId);
+	void sendIncrementViewsRequests();
+	void checkQuitPreventFinished();
 
 	void requestUserStories(not_null<UserData*> user);
 	void addToArchive(not_null<Story*> story);
@@ -337,6 +339,10 @@ private:
 	base::flat_set<PeerId> _markReadRequests;
 	base::flat_set<not_null<UserData*>> _requestingUserStories;
 
+	base::flat_map<PeerId, base::flat_set<StoryId>> _incrementViewsPending;
+	base::Timer _incrementViewsTimer;
+	base::flat_set<PeerId> _incrementViewsRequests;
+
 	StoryId _viewsStoryId = 0;
 	std::optional<StoryView> _viewsOffset;
 	Fn<void(std::vector<StoryView>)> _viewsDone;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 9131724f2..8889204d9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -490,6 +490,7 @@ void Controller::show(
 		return;
 	}
 	_shown = storyId;
+	_viewed = false;
 	_captionText = story->caption();
 	_captionFullView = nullptr;
 	invalidate_weak_ptrs(&_viewsLoadGuard);
@@ -633,6 +634,10 @@ void Controller::maybeMarkAsRead(const Player::TrackState &state) {
 void Controller::markAsRead() {
 	Expects(_source.has_value());
 
+	if (_viewed) {
+		return;
+	}
+	_viewed = true;
 	_source->user->owner().stories().markAsRead(_shown, _started);
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index f59cb0f36..52d780093 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -195,6 +195,7 @@ private:
 	FullStoryId _waitingForId;
 	int _index = 0;
 	bool _started = false;
+	bool _viewed = false;
 
 	ViewsSlice _viewsSlice;
 	rpl::event_stream<> _moreViewsLoaded;

From bafb4f91b46bce0466d53502e7554a799fe563cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Jun 2023 19:31:51 +0400
Subject: [PATCH 290/676] Update API scheme on layer 160.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/apiwrap.cpp              |  3 +-
 .../data/notify/data_notify_settings.cpp      | 29 ++++++---
 .../data/notify/data_notify_settings.h        |  9 ++-
 .../data/notify/data_peer_notify_settings.cpp | 61 +++++++++++++------
 .../data/notify/data_peer_notify_settings.h   |  3 +-
 .../dialogs/ui/dialogs_stories_content.cpp    |  5 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  6 +-
 8 files changed, 82 insertions(+), 35 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 154400cb6..c29a21018 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3790,6 +3790,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_userpic_builder_color_subtitle" = "Choose background";
 "lng_userpic_builder_emoji_subtitle" = "Choose sticker or emoji";
 
+"lng_stories_my_name" = "My Story";
 "lng_stories_hide_to_contacts" = "Archive";
 "lng_stories_show_in_chats" = "Unarchive";
 "lng_stories_row_count#one" = "{count} Story";
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 7840bdcfa..922407988 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -1804,7 +1804,8 @@ void ApiWrap::requestNotifySettings(const MTPInputNotifyPeer &peer) {
 				MTPint(),
 				MTPNotificationSound(),
 				MTPNotificationSound(),
-				MTPNotificationSound()));
+				MTPNotificationSound(),
+				MTPBool()));
 		_notifySettingRequests.erase(key);
 	}).send();
 	_notifySettingRequests.emplace(key, requestId);
diff --git a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
index cee0afe8a..3beba423d 100644
--- a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
+++ b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
@@ -174,8 +174,13 @@ void NotifySettings::update(
 		not_null<Data::Thread*> thread,
 		Data::MuteValue muteForSeconds,
 		std::optional<bool> silentPosts,
-		std::optional<NotifySound> sound) {
-	if (thread->notify().change(muteForSeconds, silentPosts, sound)) {
+		std::optional<NotifySound> sound,
+		std::optional<bool> storiesMuted) {
+	if (thread->notify().change(
+			muteForSeconds,
+			silentPosts,
+			sound,
+			storiesMuted)) {
 		updateLocal(thread);
 		thread->session().api().updateNotifySettingsDelayed(thread);
 	}
@@ -189,7 +194,8 @@ void NotifySettings::resetToDefault(not_null<Data::Thread*> thread) {
 		MTPint(),
 		MTPNotificationSound(),
 		MTPNotificationSound(),
-		MTPNotificationSound());
+		MTPNotificationSound(),
+		MTPBool());
 	if (thread->notify().change(empty)) {
 		updateLocal(thread);
 		thread->session().api().updateNotifySettingsDelayed(thread);
@@ -200,8 +206,13 @@ void NotifySettings::update(
 		not_null<PeerData*> peer,
 		Data::MuteValue muteForSeconds,
 		std::optional<bool> silentPosts,
-		std::optional<NotifySound> sound) {
-	if (peer->notify().change(muteForSeconds, silentPosts, sound)) {
+		std::optional<NotifySound> sound,
+		std::optional<bool> storiesMuted) {
+	if (peer->notify().change(
+			muteForSeconds,
+			silentPosts,
+			sound,
+			storiesMuted)) {
 		updateLocal(peer);
 		peer->session().api().updateNotifySettingsDelayed(peer);
 	}
@@ -215,7 +226,8 @@ void NotifySettings::resetToDefault(not_null<PeerData*> peer) {
 		MTPint(),
 		MTPNotificationSound(),
 		MTPNotificationSound(),
-		MTPNotificationSound());
+		MTPNotificationSound(),
+		MTPBool());
 	if (peer->notify().change(empty)) {
 		updateLocal(peer);
 		peer->session().api().updateNotifySettingsDelayed(peer);
@@ -262,9 +274,10 @@ void NotifySettings::defaultUpdate(
 		DefaultNotify type,
 		Data::MuteValue muteForSeconds,
 		std::optional<bool> silentPosts,
-		std::optional<NotifySound> sound) {
+		std::optional<NotifySound> sound,
+		std::optional<bool> storiesMuted) {
 	auto &settings = defaultValue(type).settings;
-	if (settings.change(muteForSeconds, silentPosts, sound)) {
+	if (settings.change(muteForSeconds, silentPosts, sound, storiesMuted)) {
 		updateLocal(type);
 		_owner->session().api().updateNotifySettingsDelayed(type);
 	}
diff --git a/Telegram/SourceFiles/data/notify/data_notify_settings.h b/Telegram/SourceFiles/data/notify/data_notify_settings.h
index be41ce8dc..6e51b87ac 100644
--- a/Telegram/SourceFiles/data/notify/data_notify_settings.h
+++ b/Telegram/SourceFiles/data/notify/data_notify_settings.h
@@ -57,13 +57,15 @@ public:
 		not_null<Data::Thread*> thread,
 		Data::MuteValue muteForSeconds,
 		std::optional<bool> silentPosts = std::nullopt,
-		std::optional<NotifySound> sound = std::nullopt);
+		std::optional<NotifySound> sound = std::nullopt,
+		std::optional<bool> storiesMuted = std::nullopt);
 	void resetToDefault(not_null<Data::Thread*> thread);
 	void update(
 		not_null<PeerData*> peer,
 		Data::MuteValue muteForSeconds,
 		std::optional<bool> silentPosts = std::nullopt,
-		std::optional<NotifySound> sound = std::nullopt);
+		std::optional<NotifySound> sound = std::nullopt,
+		std::optional<bool> storiesMuted = std::nullopt);
 	void resetToDefault(not_null<PeerData*> peer);
 
 	void forumParentMuteUpdated(not_null<Data::Forum*> forum);
@@ -84,7 +86,8 @@ public:
 		DefaultNotify type,
 		Data::MuteValue muteForSeconds,
 		std::optional<bool> silentPosts = std::nullopt,
-		std::optional<NotifySound> sound = std::nullopt);
+		std::optional<NotifySound> sound = std::nullopt,
+		std::optional<bool> storiesMuted = std::nullopt);
 
 	[[nodiscard]] bool isMuted(not_null<const Data::Thread*> thread) const;
 	[[nodiscard]] NotifySound sound(
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
index 6d5735624..da03d14f2 100644
--- a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
@@ -18,7 +18,8 @@ namespace {
 		MTPBool(),
 		MTPBool(),
 		MTPint(),
-		MTPNotificationSound());
+		MTPNotificationSound(),
+		MTPBool());
 }
 
 [[nodiscard]] NotifySound ParseSound(const MTPNotificationSound &sound) {
@@ -73,7 +74,8 @@ public:
 	bool change(
 		MuteValue muteForSeconds,
 		std::optional<bool> silentPosts,
-		std::optional<NotifySound> sound);
+		std::optional<NotifySound> sound,
+		std::optional<bool> storiesMuted);
 
 	std::optional<TimeId> muteUntil() const;
 	std::optional<bool> silentPosts() const;
@@ -85,12 +87,14 @@ private:
 		std::optional<int> mute,
 		std::optional<NotifySound> sound,
 		std::optional<bool> showPreviews,
-		std::optional<bool> silentPosts);
+		std::optional<bool> silentPosts,
+		std::optional<bool> storiesMuted);
 
 	std::optional<TimeId> _mute;
 	std::optional<NotifySound> _sound;
 	std::optional<bool> _silent;
 	std::optional<bool> _showPreviews;
+	std::optional<bool> _storiesMuted;
 
 };
 
@@ -104,19 +108,24 @@ bool NotifyPeerSettingsValue::change(const MTPDpeerNotifySettings &data) {
 	const auto sound = data.vother_sound();
 	const auto showPreviews = data.vshow_previews();
 	const auto silent = data.vsilent();
+	const auto storiesMuted = data.vstories_muted();
 	return change(
 		mute ? std::make_optional(mute->v) : std::nullopt,
 		sound ? std::make_optional(ParseSound(*sound)) : std::nullopt,
 		(showPreviews
 			? std::make_optional(mtpIsTrue(*showPreviews))
 			: std::nullopt),
-		silent ? std::make_optional(mtpIsTrue(*silent)) : std::nullopt);
+		silent ? std::make_optional(mtpIsTrue(*silent)) : std::nullopt,
+		(storiesMuted
+			? std::make_optional(mtpIsTrue(*storiesMuted))
+			: std::nullopt));
 }
 
 bool NotifyPeerSettingsValue::change(
 		MuteValue muteForSeconds,
 		std::optional<bool> silentPosts,
-		std::optional<NotifySound> sound) {
+		std::optional<NotifySound> sound,
+		std::optional<bool> storiesMuted) {
 	const auto newMute = muteForSeconds
 		? base::make_optional(muteForSeconds.until())
 		: _mute;
@@ -126,28 +135,35 @@ bool NotifyPeerSettingsValue::change(
 	const auto newSound = sound
 		? base::make_optional(*sound)
 		: _sound;
+	const auto newStoriesMuted = storiesMuted
+		? base::make_optional(*storiesMuted)
+		: _storiesMuted;
 	return change(
 		newMute,
 		newSound,
 		_showPreviews,
-		newSilentPosts);
+		newSilentPosts,
+		newStoriesMuted);
 }
 
 bool NotifyPeerSettingsValue::change(
 		std::optional<int> mute,
 		std::optional<NotifySound> sound,
 		std::optional<bool> showPreviews,
-		std::optional<bool> silentPosts) {
+		std::optional<bool> silentPosts,
+		std::optional<bool> storiesMuted) {
 	if (_mute == mute
 		&& _sound == sound
 		&& _showPreviews == showPreviews
-		&& _silent == silentPosts) {
+		&& _silent == silentPosts
+		&& _storiesMuted == storiesMuted) {
 		return false;
 	}
 	_mute = mute;
 	_sound = sound;
 	_showPreviews = showPreviews;
 	_silent = silentPosts;
+	_storiesMuted = storiesMuted;
 	return true;
 }
 
@@ -172,11 +188,13 @@ MTPinputPeerNotifySettings NotifyPeerSettingsValue::serialize() const {
 		MTP_flags(flag(_mute, Flag::f_mute_until)
 			| flag(_sound, Flag::f_sound)
 			| flag(_silent, Flag::f_silent)
-			| flag(_showPreviews, Flag::f_show_previews)),
-		MTP_bool(_showPreviews ? *_showPreviews : true),
-		MTP_bool(_silent ? *_silent : false),
-		MTP_int(_mute ? *_mute : false),
-		SerializeSound(_sound));
+			| flag(_showPreviews, Flag::f_show_previews)
+			| flag(_storiesMuted, Flag::f_stories_muted)),
+		MTP_bool(_showPreviews.value_or(true)),
+		MTP_bool(_silent.value_or(false)),
+		MTP_int(_mute.value_or(false)),
+		SerializeSound(_sound),
+		MTP_bool(_storiesMuted.value_or(false)));
 }
 
 PeerNotifySettings::PeerNotifySettings() = default;
@@ -203,16 +221,22 @@ bool PeerNotifySettings::change(const MTPPeerNotifySettings &settings) {
 bool PeerNotifySettings::change(
 		MuteValue muteForSeconds,
 		std::optional<bool> silentPosts,
-		std::optional<NotifySound> sound) {
-	if (!muteForSeconds && !silentPosts && !sound) {
+		std::optional<NotifySound> sound,
+		std::optional<bool> storiesMuted) {
+	if (!muteForSeconds && !silentPosts && !sound && !storiesMuted) {
 		return false;
 	} else if (_value) {
-		return _value->change(muteForSeconds, silentPosts, sound);
+		return _value->change(
+			muteForSeconds,
+			silentPosts,
+			sound,
+			storiesMuted);
 	}
 	using Flag = MTPDpeerNotifySettings::Flag;
 	const auto flags = (muteForSeconds ? Flag::f_mute_until : Flag(0))
 		| (silentPosts ? Flag::f_silent : Flag(0))
-		| (sound ? Flag::f_other_sound : Flag(0));
+		| (sound ? Flag::f_other_sound : Flag(0))
+		| (storiesMuted ? Flag::f_stories_muted : Flag(0));
 	return change(MTP_peerNotifySettings(
 		MTP_flags(flags),
 		MTPBool(),
@@ -220,7 +244,8 @@ bool PeerNotifySettings::change(
 		MTP_int(muteForSeconds.until()),
 		MTPNotificationSound(),
 		MTPNotificationSound(),
-		SerializeSound(sound)));
+		SerializeSound(sound),
+		storiesMuted ? MTP_bool(*storiesMuted) : MTPBool()));
 }
 
 std::optional<TimeId> PeerNotifySettings::muteUntil() const {
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
index 3973d7820..76a8ecfd9 100644
--- a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
@@ -44,7 +44,8 @@ public:
 	bool change(
 		MuteValue muteForSeconds,
 		std::optional<bool> silentPosts,
-		std::optional<NotifySound> sound);
+		std::optional<NotifySound> sound,
+		std::optional<bool> storiesMuted);
 
 	bool settingsUnknown() const;
 	std::optional<TimeId> muteUntil() const;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index c47282c26..332dec14a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "dialogs/ui/dialogs_stories_list.h"
 #include "main/main_session.h"
+#include "lang/lang_keys.h"
 #include "ui/painter.h"
 
 namespace Dialogs::Stories {
@@ -144,7 +145,9 @@ Content State::next() {
 		}
 		result.users.push_back({
 			.id = uint64(user->id.value),
-			.name = user->shortName(),
+			.name = (user->isSelf()
+				? tr::lng_stories_my_name(tr::now)
+				: user->shortName()),
 			.userpic = std::move(userpic),
 			.unread = info.unread,
 			.hidden = info.hidden,
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 577a291a1..a916847ce 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -129,7 +129,7 @@ messageMediaInvoice#f6a548d3 flags:# shipping_address_requested:flags.1?true tes
 messageMediaGeoLive#b940c666 flags:# geo:GeoPoint heading:flags.0?int period:int proximity_notification_radius:flags.1?int = MessageMedia;
 messageMediaPoll#4bd6e798 poll:Poll results:PollResults = MessageMedia;
 messageMediaDice#3f7ee58b value:int emoticon:string = MessageMedia;
-messageMediaStory#c79aee11 user_id:long id:int = MessageMedia;
+messageMediaStory#cbb20d88 flags:# user_id:long id:int story:flags.0?StoryItem = MessageMedia;
 
 messageActionEmpty#b6aef7b0 = MessageAction;
 messageActionChatCreate#bd47cbad title:string users:Vector<long> = MessageAction;
@@ -201,9 +201,9 @@ inputNotifyChats#4a95e84e = InputNotifyPeer;
 inputNotifyBroadcasts#b1db7c7e = InputNotifyPeer;
 inputNotifyForumTopic#5c467992 peer:InputPeer top_msg_id:int = InputNotifyPeer;
 
-inputPeerNotifySettings#df1f002b flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int sound:flags.3?NotificationSound = InputPeerNotifySettings;
+inputPeerNotifySettings#e1e51e85 flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int sound:flags.3?NotificationSound stories_muted:flags.6?Bool = InputPeerNotifySettings;
 
-peerNotifySettings#a83b0426 flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int ios_sound:flags.3?NotificationSound android_sound:flags.4?NotificationSound other_sound:flags.5?NotificationSound = PeerNotifySettings;
+peerNotifySettings#6cdc6e52 flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int ios_sound:flags.3?NotificationSound android_sound:flags.4?NotificationSound other_sound:flags.5?NotificationSound stories_muted:flags.6?Bool = PeerNotifySettings;
 
 peerSettings#a518110d flags:# report_spam:flags.0?true add_contact:flags.1?true block_contact:flags.2?true share_contact:flags.3?true need_contacts_exception:flags.4?true report_geo:flags.5?true autoarchived:flags.7?true invite_members:flags.8?true request_chat_broadcast:flags.10?true geo_distance:flags.6?int request_chat_title:flags.9?string request_chat_date:flags.9?int = PeerSettings;
 

From 0401364d71422e30df342648403e493dd305cc7c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Jun 2023 21:25:26 +0400
Subject: [PATCH 291/676] Fix build with Xcode.

---
 Telegram/SourceFiles/data/data_stories.cpp      |  6 +++---
 Telegram/SourceFiles/data/data_stories.h        | 17 +++++++++++++++++
 .../media/stories/media_stories_reply.cpp       |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 5a51f0360..c0f70b925 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -515,7 +515,7 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 			i->second = std::move(result);
 		}
 	} else {
-		_all.emplace(peerId, std::move(result)).first;
+		_all.emplace(peerId, std::move(result));
 	}
 	const auto add = [&](StorySourcesList list) {
 		auto &sources = _sources[static_cast<int>(list)];
@@ -1251,7 +1251,7 @@ void Stories::sendIncrementViewsRequests() {
 	const auto api = &_owner->session().api();
 	for (auto &[peer, ids] : prepared) {
 		_incrementViewsRequests.emplace(peer);
-		const auto finish = [=] {
+		const auto finish = [=, peer = peer] {
 			_incrementViewsRequests.remove(peer);
 			if (!_incrementViewsTimer.isActive()
 				&& _incrementViewsPending.contains(peer)) {
@@ -1462,4 +1462,4 @@ bool Stories::isQuitPrevent() {
 	return true;
 }
 
-} // namespace Data
\ No newline at end of file
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 9cde3d245..b7de66759 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/qt/qt_compare.h"
 #include "base/expected.h"
 #include "base/timer.h"
 #include "base/weak_ptr.h"
@@ -155,15 +156,31 @@ enum class StorySourcesList : uchar {
 };
 
 struct StoriesContextSingle {
+	friend inline auto operator<=>(
+		StoriesContextSingle,
+		StoriesContextSingle) = default;
+	friend inline bool operator==(StoriesContextSingle, StoriesContextSingle) = default;
 };
 
 struct StoriesContextPeer {
+	friend inline auto operator<=>(
+		StoriesContextPeer,
+		StoriesContextPeer) = default;
+	friend inline bool operator==(StoriesContextPeer, StoriesContextPeer) = default;
 };
 
 struct StoriesContextSaved {
+	friend inline auto operator<=>(
+		StoriesContextSaved,
+		StoriesContextSaved) = default;
+	friend inline bool operator==(StoriesContextSaved, StoriesContextSaved) = default;
 };
 
 struct StoriesContextArchive {
+	friend inline auto operator<=>(
+		StoriesContextArchive,
+		StoriesContextArchive) = default;
+	friend inline bool operator==(StoriesContextArchive, StoriesContextArchive) = default;
 };
 
 struct StoriesContext {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 1ccce96a6..becd18b49 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -117,7 +117,7 @@ void ReplyArea::sendReaction(const Data::ReactionId &id) {
 			const auto id = Data::SerializeCustomEmojiId(customId);
 			message.textWithTags = {
 				text,
-				{ { 0, text.size(), Ui::InputField::CustomEmojiLink(id) } }
+				{ { 0, int(text.size()), Ui::InputField::CustomEmojiLink(id) } }
 			};
 		}
 	}

From f828caf0d9858ce9c18bd212de77ab7d3bcb931d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Jun 2023 18:04:10 +0400
Subject: [PATCH 292/676] Simplify saved stories list.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 43 ----------
 .../SourceFiles/data/data_stories_ids.cpp     | 83 ++++---------------
 2 files changed, 17 insertions(+), 109 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index c0f70b925..e737e347e 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -362,49 +362,6 @@ void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
 	if (!data) {
 		applyDeletedFromSources(peer->id, StorySourcesList::All);
 		_all.erase(peer->id);
-		const auto i = _stories.find(peer->id);
-		if (i != end(_stories)) {
-			auto stories = base::take(i->second);
-			_stories.erase(i);
-
-			auto archiveChanged = false;
-			auto savedChanged = false;
-			if (peer->isSelf()) {
-				for (const auto &[id, story] : stories) {
-					if (_archive.list.remove(id)) {
-						archiveChanged = true;
-						if (_archiveTotal > 0) {
-							--_archiveTotal;
-						}
-					}
-				}
-			}
-			const auto j = _saved.find(peer->id);
-			const auto saved = (j != end(_saved)) ? &j->second : nullptr;
-			for (const auto &[id, story] : stories) {
-				// Duplicated in Stories::applyDeleted.
-				_deleted.emplace(FullStoryId{ peer->id, id });
-				_expiring.remove(story->expires(), story->fullId());
-				if (story->pinned() && saved) {
-					if (saved->ids.list.remove(id)) {
-						savedChanged = true;
-						if (saved->total > 0) {
-							--saved->total;
-						}
-					}
-				}
-				session().changes().storyUpdated(
-					story.get(),
-					UpdateFlag::Destroyed);
-				removeDependencyStory(story.get());
-			}
-			if (archiveChanged) {
-				_archiveChanged.fire({});
-			}
-			if (savedChanged) {
-				_savedChanged.fire_copy(peer->id);
-			}
-		}
 		_sourceChanged.fire_copy(peer->id);
 	} else {
 		parseAndApply(*data);
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index 21d0878a6..7506abea5 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -38,70 +38,26 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 			}
 
 			const auto saved = stories->saved(peer->id);
+			Assert(saved != nullptr);
 			const auto count = stories->savedCount(peer->id);
 			const auto around = saved->list.lower_bound(aroundId);
-			Assert(saved != nullptr);
-			const auto source = stories->source(peer->id);
-			if (!source || source->ids.empty()) {
-				const auto hasBefore = int(around - begin(saved->list));
-				const auto hasAfter = int(end(saved->list) - around);
-				if (hasAfter < limit) {
-					stories->savedLoadMore(peer->id);
-				}
-				const auto takeBefore = std::min(hasBefore, limit);
-				const auto takeAfter = std::min(hasAfter, limit);
-				auto ids = base::flat_set<StoryId>{
-					std::make_reverse_iterator(around + takeAfter),
-					std::make_reverse_iterator(around - takeBefore)
-				};
-				const auto added = int(ids.size());
-				state->slice = StoriesIdsSlice(
-					std::move(ids),
-					count,
-					(hasBefore - takeBefore),
-					count - hasBefore - added);
-			} else {
-				auto ids = base::flat_set<StoryId>();
-				auto added = 0;
-				auto skipped = 0;
-				auto skippedBefore = (around - begin(saved->list));
-				auto skippedAfter = (end(saved->list) - around);
-				const auto &active = source->ids;
-				const auto process = [&](StoryId id) {
-					const auto i = active.lower_bound(StoryIdDates{ id });
-					if (i == end(active) || i->id != id) {
-						ids.emplace(id);
-						++added;
-					} else {
-						++skipped;
-					}
-					return (added < limit);
-				};
-				ids.reserve(2 * limit + 1);
-				for (auto i = around, b = begin(saved->list); i != b;) {
-					--skippedBefore;
-					if (!process(*--i)) {
-						break;
-					}
-				}
-				if (ids.size() < limit) {
-					ids.emplace(active.back().id); // #TODO stories fake max story id
-				} else {
-					++skippedBefore;
-				}
-				added = 0;
-				for (auto i = around, e = end(saved->list); i != e; ++i) {
-					--skippedAfter;
-					if (!process(*i)) {
-						break;
-					}
-				}
-				state->slice = StoriesIdsSlice(
-					std::move(ids),
-					count - skipped + 1,
-					skippedBefore,
-					skippedAfter);
+			const auto hasBefore = int(around - begin(saved->list));
+			const auto hasAfter = int(end(saved->list) - around);
+			if (hasAfter < limit) {
+				stories->savedLoadMore(peer->id);
 			}
+			const auto takeBefore = std::min(hasBefore, limit);
+			const auto takeAfter = std::min(hasAfter, limit);
+			auto ids = base::flat_set<StoryId>{
+				std::make_reverse_iterator(around + takeAfter),
+				std::make_reverse_iterator(around - takeBefore)
+			};
+			const auto added = int(ids.size());
+			state->slice = StoriesIdsSlice(
+				std::move(ids),
+				count,
+				(hasBefore - takeBefore),
+				count - hasBefore - added);
 			consumer.put_next_copy(state->slice);
 		};
 		const auto schedule = [=] {
@@ -117,11 +73,6 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 		};
 
 		const auto stories = &peer->owner().stories();
-		stories->sourceChanged(
-		) | rpl::filter(
-			rpl::mappers::_1 == peer->id
-		) | rpl::start_with_next(schedule, lifetime);
-
 		stories->savedChanged(
 		) | rpl::filter(
 			rpl::mappers::_1 == peer->id

From 3ac7725111b86337c3f2b20665ff40097b9eee9a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Jun 2023 18:40:13 +0400
Subject: [PATCH 293/676] Show relative time in stories, like last seen.

---
 Telegram/Resources/langs/lang.strings         |  5 ++
 .../media/stories/media_stories_header.cpp    | 71 ++++++++++++++++++-
 .../media/stories/media_stories_header.h      |  4 ++
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c29a21018..48c5590ad 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2477,6 +2477,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_doc_image" = "File";
 "lng_mediaview_today" = "today at {time}";
 "lng_mediaview_yesterday" = "yesterday at {time}";
+"lng_mediaview_just_now" = "just now";
+"lng_mediaview_minutes_ago#one" = "{count} minute ago";
+"lng_mediaview_minutes_ago#other" = "{count} minutes ago";
+"lng_mediaview_hours_ago#one" = "{count} hour ago";
+"lng_mediaview_hours_ago#other" = "{count} hours ago";
 "lng_mediaview_date_time" = "{date} at {time}";
 "lng_mediaview_set_userpic" = "Set as Main";
 "lng_mediaview_report_profile_photo" = "Report";
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index fca65c8ca..3c089c9bd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "data/data_user.h"
 #include "media/stories/media_stories_controller.h"
+#include "lang/lang_keys.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/text/format_values.h"
 #include "ui/widgets/labels.h"
@@ -23,10 +24,60 @@ namespace {
 constexpr auto kNameOpacity = 1.;
 constexpr auto kDateOpacity = 0.8;
 
+struct Timestamp {
+	QString text;
+	TimeId changes = 0;
+};
+
+[[nodiscard]] Timestamp ComposeTimestamp(TimeId when, TimeId now) {
+	const auto minutes = (now - when) / 60;
+	if (!minutes) {
+		return { tr::lng_mediaview_just_now(tr::now), 61 - (now - when) };
+	} else if (minutes < 60) {
+		return {
+			tr::lng_mediaview_minutes_ago(tr::now, lt_count, minutes),
+			61 - ((now - when) % 60),
+		};
+	}
+	const auto hours = (now - when) / 3600;
+	if (hours < 12) {
+		return {
+			tr::lng_mediaview_hours_ago(tr::now, lt_count, hours),
+			3601 - ((now - when) % 3600),
+		};
+	}
+	const auto whenFull = base::unixtime::parse(when);
+	const auto nowFull = base::unixtime::parse(now);
+	const auto locale = QLocale();
+	auto tomorrow = nowFull;
+	tomorrow.setDate(nowFull.date().addDays(1));
+	tomorrow.setTime(QTime(0, 0, 1));
+	const auto seconds = int(nowFull.secsTo(tomorrow));
+	if (whenFull.date() == nowFull.date()) {
+		const auto whenTime = locale.toString(
+			whenFull.time(),
+			QLocale::ShortFormat);
+		return {
+			tr::lng_mediaview_today(tr::now, lt_time, whenTime),
+			seconds,
+		};
+	} else if (whenFull.date().addDays(1) == nowFull.date()) {
+		const auto whenTime = locale.toString(
+			whenFull.time(),
+			QLocale::ShortFormat);
+		return {
+			tr::lng_mediaview_yesterday(tr::now, lt_time, whenTime),
+			seconds,
+		};
+	}
+	return { Ui::FormatDateTime(whenFull) };
+}
+
 } // namespace
 
 Header::Header(not_null<Controller*> controller)
-: _controller(controller) {
+: _controller(controller)
+, _dateUpdateTimer([=] { updateDateText(); }) {
 }
 
 Header::~Header() {
@@ -66,13 +117,29 @@ void Header::show(HeaderData data) {
 			raw->setGeometry(layout.header);
 		}, raw->lifetime());
 	}
+	auto timestamp = ComposeTimestamp(data.date, base::unixtime::now());
 	_date = std::make_unique<Ui::FlatLabel>(
 		_widget.get(),
-		Ui::FormatDateTime(base::unixtime::parse(data.date)),
+		std::move(timestamp.text),
 		st::storiesHeaderDate);
 	_date->setOpacity(kDateOpacity);
 	_date->show();
 	_date->move(st::storiesHeaderDatePosition);
+
+	if (timestamp.changes > 0) {
+		_dateUpdateTimer.callOnce(timestamp.changes * crl::time(1000));
+	}
+}
+
+void Header::updateDateText() {
+	if (!_date || !_data || !_data->date) {
+		return;
+	}
+	auto timestamp = ComposeTimestamp(_data->date, base::unixtime::now());
+	_date->setText(timestamp.text);
+	if (timestamp.changes > 0) {
+		_dateUpdateTimer.callOnce(timestamp.changes * crl::time(1000));
+	}
 }
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 3f0be2e5c..32c310bff 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/timer.h"
 #include "ui/userpic_view.h"
 
 namespace Ui {
@@ -34,11 +35,14 @@ public:
 	void show(HeaderData data);
 
 private:
+	void updateDateText();
+
 	const not_null<Controller*> _controller;
 
 	std::unique_ptr<Ui::RpWidget> _widget;
 	std::unique_ptr<Ui::FlatLabel> _date;
 	std::optional<HeaderData> _data;
+	base::Timer _dateUpdateTimer;
 
 };
 

From a933168ef71a6b7c025c7725c63a9ff0eddc3193 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Jun 2023 20:41:26 +0400
Subject: [PATCH 294/676] Allow sharing stories and copying a link.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/apiwrap.cpp              |  31 ++-
 Telegram/SourceFiles/apiwrap.h                |   3 +
 Telegram/SourceFiles/boxes/share_box.cpp      |  15 +-
 Telegram/SourceFiles/data/data_stories.cpp    |  52 +++++
 Telegram/SourceFiles/data/data_stories.h      |  14 +-
 Telegram/SourceFiles/data/data_user.cpp       |  14 ++
 Telegram/SourceFiles/data/data_user.h         |   5 +
 .../history/history_item_helpers.cpp          |   8 +-
 .../history/history_item_helpers.h            |   1 +
 .../view/history_view_context_menu.cpp        |  15 ++
 .../history/view/history_view_context_menu.h  |   4 +
 .../stories/media_stories_controller.cpp      |  26 ++-
 .../media/stories/media_stories_controller.h  |   2 +
 .../media/stories/media_stories_share.cpp     | 202 ++++++++++++++++
 .../media/stories/media_stories_share.h       |  26 +++
 .../media/stories/media_stories_view.cpp      |   8 +
 .../media/stories/media_stories_view.h        |   2 +
 .../SourceFiles/media/view/media_view.style   |   1 +
 .../media/view/media_view_overlay_opengl.cpp  |  26 ++-
 .../media/view/media_view_overlay_opengl.h    |   8 +-
 .../media/view/media_view_overlay_raster.cpp  |   2 +-
 .../media/view/media_view_overlay_raster.h    |   2 +-
 .../media/view/media_view_overlay_renderer.h  |   2 +-
 .../media/view/media_view_overlay_widget.cpp  | 219 ++++++++++--------
 .../media/view/media_view_overlay_widget.h    |  49 ++--
 26 files changed, 587 insertions(+), 152 deletions(-)
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_share.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_share.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8f6ea9975..3a3d7e5a7 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -987,6 +987,8 @@ PRIVATE
     media/stories/media_stories_recent_views.h
     media/stories/media_stories_reply.cpp
     media/stories/media_stories_reply.h
+    media/stories/media_stories_share.cpp
+    media/stories/media_stories_share.h
     media/stories/media_stories_sibling.cpp
     media/stories/media_stories_sibling.h
     media/stories/media_stories_slider.cpp
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 922407988..44c7d507e 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -46,6 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_scheduled_messages.h"
 #include "data/data_channel_admins.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
@@ -763,9 +764,7 @@ QString ApiWrap::exportDirectMessageLink(
 		channel->inputChannel,
 		MTP_int(item->id)
 	)).done([=](const MTPExportedMessageLink &result) {
-		const auto link = result.match([&](const auto &data) {
-			return qs(data.vlink());
-		});
+		const auto link = qs(result.data().vlink());
 		if (current != link) {
 			_unlikelyMessageLinks.emplace_or_assign(itemId, link);
 		}
@@ -773,6 +772,32 @@ QString ApiWrap::exportDirectMessageLink(
 	return current;
 }
 
+QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
+	const auto storyId = story->fullId();
+	const auto user = story->peer()->asUser();
+	Assert(user != nullptr);
+	const auto fallback = [&] {
+		const auto base = user->username();
+		const auto story = QString::number(storyId.story);
+		const auto query = base + "?story=" + story;
+		return session().createInternalLinkFull(query);
+	};
+	const auto i = _unlikelyStoryLinks.find(storyId);
+	const auto current = (i != end(_unlikelyStoryLinks))
+		? i->second
+		: fallback();
+	request(MTPstories_ExportStoryLink(
+		story->peer()->asUser()->inputUser,
+		MTP_int(story->id())
+	)).done([=](const MTPExportedStoryLink &result) {
+		const auto link = qs(result.data().vlink());
+		if (current != link) {
+			_unlikelyStoryLinks.emplace_or_assign(storyId, link);
+		}
+	}).send();
+	return current;
+}
+
 void ApiWrap::requestContacts() {
 	if (_session->data().contactsLoaded().current() || _contactsRequestId) {
 		return;
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index e747f0f07..dcab7cde8 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -35,6 +35,7 @@ enum class StickersType : uchar;
 class Forum;
 class ForumTopic;
 class Thread;
+class Story;
 } // namespace Data
 
 namespace InlineBots {
@@ -160,6 +161,7 @@ public:
 	QString exportDirectMessageLink(
 		not_null<HistoryItem*> item,
 		bool inRepliesContext);
+	QString exportDirectStoryLink(not_null<Data::Story*> item);
 
 	void requestContacts();
 	void requestDialogs(Data::Folder *folder = nullptr);
@@ -707,5 +709,6 @@ private:
 	base::flat_map<not_null<UserData*>, Fn<void()>> _botCommonGroupsRequests;
 
 	base::flat_map<FullMsgId, QString> _unlikelyMessageLinks;
+	base::flat_map<FullStoryId, QString> _unlikelyStoryLinks;
 
 };
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index d23e6142c..7cba7daba 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -1414,15 +1414,16 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 				? MsgId(0)
 				: topicRootId;
 			const auto peer = thread->peer();
-			histories.sendRequest(history, requestType, [=](
+			const auto threadHistory = thread->owningHistory();
+			histories.sendRequest(threadHistory, requestType, [=](
 					Fn<void()> finish) {
-				auto &api = history->session().api();
+				auto &api = threadHistory->session().api();
 				const auto sendFlags = commonSendFlags
 					| (topMsgId ? Flag::f_top_msg_id : Flag(0))
 					| (ShouldSendSilent(peer, options)
 						? Flag::f_silent
 						: Flag(0));
-				history->sendRequestId = api.request(
+				threadHistory->sendRequestId = api.request(
 					MTPmessages_ForwardMessages(
 						MTP_flags(sendFlags),
 						history->peer->input,
@@ -1433,7 +1434,7 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 						MTP_int(options.scheduled),
 						MTP_inputPeerEmpty() // send_as
 				)).done([=](const MTPUpdates &updates, mtpRequestId reqId) {
-					history->session().api().applyUpdates(updates);
+					threadHistory->session().api().applyUpdates(updates);
 					state->requests.remove(reqId);
 					if (state->requests.empty()) {
 						if (show->valid()) {
@@ -1451,10 +1452,10 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 								peer->name()));
 					}
 					finish();
-				}).afterRequest(history->sendRequestId).send();
-				return history->sendRequestId;
+				}).afterRequest(threadHistory->sendRequestId).send();
+				return threadHistory->sendRequestId;
 			});
-			state->requests.insert(history->sendRequestId);
+			state->requests.insert(threadHistory->sendRequestId);
 		}
 	};
 }
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index e737e347e..0d2e64bfa 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "core/application.h"
 #include "data/data_changes.h"
+#include "data/data_chat_participant_status.h"
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
 #include "data/data_photo.h"
@@ -196,6 +197,51 @@ bool Story::pinned() const {
 	return _pinned;
 }
 
+void Story::setIsPublic(bool isPublic) {
+	_isPublic = isPublic;
+}
+
+bool Story::isPublic() const {
+	return _isPublic;
+}
+
+void Story::setCloseFriends(bool closeFriends) {
+	_closeFriends = closeFriends;
+}
+
+bool Story::closeFriends() const {
+	return _closeFriends;
+}
+
+bool Story::hasDirectLink() const {
+	if (!_isPublic || (!_pinned && expired())) {
+		return false;
+	}
+	const auto user = _peer->asUser();
+	return user && !user->username().isEmpty();
+}
+
+std::optional<QString> Story::errorTextForForward(
+		not_null<Thread*> to) const {
+	const auto peer = to->peer();
+	const auto holdsPhoto = v::is<not_null<PhotoData*>>(_media.data);
+	const auto first = holdsPhoto
+		? ChatRestriction::SendPhotos
+		: ChatRestriction::SendVideos;
+	const auto second = holdsPhoto
+		? ChatRestriction::SendVideos
+		: ChatRestriction::SendPhotos;
+	if (const auto error = Data::RestrictionError(peer, first)) {
+		return *error;
+	} else if (const auto error = Data::RestrictionError(peer, second)) {
+		return *error;
+	} else if (!Data::CanSend(to, first, false)
+		|| !Data::CanSend(to, second, false)) {
+		return tr::lng_forward_cant(tr::now);
+	}
+	return {};
+}
+
 void Story::setCaption(TextWithEntities &&caption) {
 	_caption = std::move(caption);
 }
@@ -259,6 +305,8 @@ void Story::applyViewsSlice(
 
 bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	const auto pinned = data.is_pinned();
+	const auto isPublic = data.is_public();
+	const auto closeFriends = data.is_close_friends();
 	auto caption = TextWithEntities{
 		data.vcaption().value_or_empty(),
 		Api::EntitiesFromMTP(
@@ -280,6 +328,8 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 
 	const auto changed = (_media != media)
 		|| (_pinned != pinned)
+		|| (_isPublic != isPublic)
+		|| (_closeFriends != closeFriends)
 		|| (_caption != caption)
 		|| (_views != views)
 		|| (_recentViewers != recent);
@@ -288,6 +338,8 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	}
 	_media = std::move(media);
 	_pinned = pinned;
+	_isPublic = isPublic;
+	_closeFriends = closeFriends;
 	_caption = std::move(caption);
 	_views = views;
 	_recentViewers = std::move(recent);
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index b7de66759..8fc341076 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class Image;
 class PhotoData;
 class DocumentData;
+enum class ChatRestriction;
 
 namespace Main {
 class Session;
@@ -23,6 +24,7 @@ class Session;
 namespace Data {
 
 class Session;
+class Thread;
 
 struct StoryIdDates {
 	StoryId id = 0;
@@ -91,6 +93,14 @@ public:
 
 	void setPinned(bool pinned);
 	[[nodiscard]] bool pinned() const;
+	void setIsPublic(bool isPublic);
+	[[nodiscard]] bool isPublic() const;
+	void setCloseFriends(bool closeFriends);
+	[[nodiscard]] bool closeFriends() const;
+
+	[[nodiscard]] bool hasDirectLink() const;
+	[[nodiscard]] std::optional<QString> errorTextForForward(
+		not_null<Thread*> to) const;
 
 	void setCaption(TextWithEntities &&caption);
 	[[nodiscard]] const TextWithEntities &caption() const;
@@ -117,7 +127,9 @@ private:
 	int _views = 0;
 	const TimeId _date = 0;
 	const TimeId _expires = 0;
-	bool _pinned = false;
+	bool _pinned : 1 = false;
+	bool _isPublic : 1 = false;
+	bool _closeFriends : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 148ffb246..be4a9fa6f 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -113,6 +113,18 @@ void UserData::setCommonChatsCount(int count) {
 	}
 }
 
+bool UserData::hasPrivateForwardName() const {
+	return !_privateForwardName.isEmpty();
+}
+
+QString UserData::privateForwardName() const {
+	return _privateForwardName;
+}
+
+void UserData::setPrivateForwardName(const QString &name) {
+	_privateForwardName = name;
+}
+
 void UserData::setName(const QString &newFirstName, const QString &newLastName, const QString &newPhoneName, const QString &newUsername) {
 	bool changeName = !newFirstName.isEmpty() || !newLastName.isEmpty();
 
@@ -449,6 +461,8 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	user->checkFolder(update.vfolder_id().value_or_empty());
 	user->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
 	user->setTranslationDisabled(update.is_translations_disabled());
+	user->setPrivateForwardName(
+		update.vprivate_forward_name().value_or_empty());
 
 	if (const auto info = user->botInfo.get()) {
 		const auto group = update.vbot_group_admin_rights()
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index ad0dec4d4..37005d124 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -170,6 +170,10 @@ public:
 	int commonChatsCount() const;
 	void setCommonChatsCount(int count);
 
+	[[nodiscard]] bool hasPrivateForwardName() const;
+	[[nodiscard]] QString privateForwardName() const;
+	void setPrivateForwardName(const QString &name);
+
 private:
 	auto unavailableReasons() const
 		-> const std::vector<Data::UnavailableReason> & override;
@@ -180,6 +184,7 @@ private:
 
 	std::vector<Data::UnavailableReason> _unavailableReasons;
 	QString _phone;
+	QString _privateForwardName;
 	ContactStatus _contactStatus = ContactStatus::Unknown;
 	CallsStatus _callsStatus = CallsStatus::Unknown;
 	int _commonChatsCount = 0;
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 275b6ebcb..df971938c 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -64,6 +64,11 @@ QString GetErrorTextForSending(
 	const auto thread = topic
 		? not_null<Data::Thread*>(topic)
 		: peer->owner().history(peer);
+	if (request.story) {
+		if (const auto error = request.story->errorTextForForward(thread)) {
+			return *error;
+		}
+	}
 	if (request.forward) {
 		for (const auto &item : *request.forward) {
 			if (const auto error = item->errorTextForForward(thread)) {
@@ -84,6 +89,7 @@ QString GetErrorTextForSending(
 	}
 	if (peer->slowmodeApplied()) {
 		const auto count = (hasText ? 1 : 0)
+			+ (request.story ? 1 : 0)
 			+ (request.forward ? int(request.forward->size()) : 0);
 		if (const auto history = peer->owner().historyLoaded(peer)) {
 			if (!request.ignoreSlowmodeCountdown
@@ -94,7 +100,7 @@ QString GetErrorTextForSending(
 		}
 		if (request.text && request.text->text.size() > MaxMessageSize) {
 			return tr::lng_slowmode_too_long(tr::now);
-		} else if (hasText && count > 1) {
+		} else if ((hasText || request.story) && count > 1) {
 			return tr::lng_slowmode_no_many(tr::now);
 		} else if (count > 1) {
 			const auto albumForward = [&] {
diff --git a/Telegram/SourceFiles/history/history_item_helpers.h b/Telegram/SourceFiles/history/history_item_helpers.h
index f9f45d029..2d9765886 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.h
+++ b/Telegram/SourceFiles/history/history_item_helpers.h
@@ -91,6 +91,7 @@ void RequestDependentMessageStory(
 struct SendingErrorRequest {
 	MsgId topicRootId = 0;
 	const HistoryItemsList *forward = nullptr;
+	const Data::Story *story = nullptr;
 	const TextWithTags *text = nullptr;
 	bool ignoreSlowmodeCountdown = false;
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 2fd7c2ca8..4992cca85 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -48,6 +48,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_media_types.h"
 #include "data/data_forum_topic.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_groups.h"
 #include "data/data_channel.h"
 #include "data/data_file_click_handler.h"
@@ -1131,6 +1132,20 @@ void CopyPostLink(
 		: tr::lng_context_about_private_link(tr::now));
 }
 
+void CopyStoryLink(
+		std::shared_ptr<Main::SessionShow> show,
+		FullStoryId storyId) {
+	const auto session = &show->session();
+	const auto maybeStory = session->data().stories().lookup(storyId);
+	if (!maybeStory) {
+		return;
+	}
+	const auto story = *maybeStory;
+	QGuiApplication::clipboard()->setText(
+		session->api().exportDirectStoryLink(story));
+	show->showToast(tr::lng_channel_public_link_copied(tr::now));
+}
+
 void AddPollActions(
 		not_null<Ui::PopupMenu*> menu,
 		not_null<PollData*> poll,
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.h b/Telegram/SourceFiles/history/view/history_view_context_menu.h
index 84e443d41..d534d9c24 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.h
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.h
@@ -15,6 +15,7 @@ struct ReactionId;
 
 namespace Main {
 class Session;
+class SessionShow;
 } // namespace Main
 
 namespace Ui {
@@ -58,6 +59,9 @@ void CopyPostLink(
 	not_null<Window::SessionController*> controller,
 	FullMsgId itemId,
 	Context context);
+void CopyStoryLink(
+	std::shared_ptr<Main::SessionShow> show,
+	FullStoryId storyId);
 void AddPollActions(
 	not_null<Ui::PopupMenu*> menu,
 	not_null<PollData*> poll,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 8889204d9..3e6828ddf 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -25,9 +25,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_reactions.h"
 #include "media/stories/media_stories_recent_views.h"
 #include "media/stories/media_stories_reply.h"
+#include "media/stories/media_stories_share.h"
 #include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
 #include "ui/rp_widget.h"
+#include "ui/layers/box_content.h"
 #include "styles/style_media_view.h"
 #include "styles/style_widgets.h"
 #include "styles/style_boxes.h" // UserpicButton
@@ -758,8 +760,23 @@ void Controller::setMenuShown(bool shown) {
 	}
 }
 
+bool Controller::canShare() const {
+	if (const auto maybeStory = _session->data().stories().lookup(_shown)) {
+		const auto story = *maybeStory;
+		const auto user = story->peer()->asUser();
+		return story->isPublic()
+			&& (story->pinned() || !story->expired())
+			&& (!user->username().isEmpty()
+				|| !user->hasPrivateForwardName());
+	}
+	return false;
+}
+
 bool Controller::canDownload() const {
-	return _source && _source->user->isSelf();
+	if (const auto maybeStory = _session->data().stories().lookup(_shown)) {
+		return (*maybeStory)->peer()->isSelf();
+	}
+	return false;
 }
 
 void Controller::repaintSibling(not_null<Sibling*> sibling) {
@@ -876,6 +893,13 @@ void Controller::unfocusReply() {
 	_wrap->setFocus();
 }
 
+void Controller::share() {
+	const auto show = _delegate->storiesShow();
+	if (auto box = PrepareShareBox(show, _shown)) {
+		show->show(std::move(box));
+	}
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 52d780093..5c83202c8 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -120,6 +120,7 @@ public:
 	void contentPressed(bool pressed);
 	void setMenuShown(bool shown);
 
+	[[nodiscard]] bool canShare() const;
 	[[nodiscard]] bool canDownload() const;
 
 	void repaintSibling(not_null<Sibling*> sibling);
@@ -129,6 +130,7 @@ public:
 	[[nodiscard]] rpl::producer<> moreViewsLoaded() const;
 
 	void unfocusReply();
+	void share();
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
new file mode 100644
index 000000000..4d1774ff8
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -0,0 +1,202 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_share.h"
+
+#include "api/api_common.h"
+#include "apiwrap.h"
+#include "base/random.h"
+#include "boxes/share_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_chat_participant_status.h"
+#include "data/data_forum_topic.h"
+#include "data/data_histories.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_thread.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/view/history_view_context_menu.h" // CopyStoryLink.
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
+#include "styles/style_calls.h"
+
+namespace Media::Stories {
+
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareShareBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		FullStoryId id) {
+	const auto session = &show->session();
+	const auto resolve = [=] {
+		const auto maybeStory = session->data().stories().lookup(id);
+		return maybeStory ? maybeStory->get() : nullptr;
+	};
+	const auto story = resolve();
+	if (!story) {
+		return { nullptr };
+	}
+	const auto canCopyLink = story->hasDirectLink();
+
+	auto copyCallback = [=] {
+		const auto story = resolve();
+		if (!story) {
+			return;
+		}
+		if (story->hasDirectLink()) {
+			using namespace HistoryView;
+			CopyStoryLink(show, story->fullId());
+		}
+	};
+
+	struct State {
+		int requests = 0;
+	};
+	const auto state = std::make_shared<State>();
+	auto filterCallback = [=](not_null<Data::Thread*> thread) {
+		return Data::CanSend(thread, ChatRestriction::SendPhotos)
+			&& Data::CanSend(thread, ChatRestriction::SendVideos);
+	};
+	auto copyLinkCallback = canCopyLink
+		? Fn<void()>(std::move(copyCallback))
+		: Fn<void()>();
+	auto submitCallback = [=](
+			std::vector<not_null<Data::Thread*>> &&result,
+			TextWithTags &&comment,
+			Api::SendOptions options,
+			Data::ForwardOptions forwardOptions) {
+		if (state->requests) {
+			return; // Share clicked already.
+		}
+		const auto story = resolve();
+		if (!story) {
+			return;
+		}
+		const auto user = story->peer()->asUser();
+		Assert(user != nullptr);
+
+		const auto error = [&] {
+			for (const auto thread : result) {
+				const auto error = GetErrorTextForSending(
+					thread,
+					{ .story = story, .text = &comment });
+				if (!error.isEmpty()) {
+					return std::make_pair(error, thread);
+				}
+			}
+			return std::make_pair(QString(), result.front());
+		}();
+		if (!error.first.isEmpty()) {
+			auto text = TextWithEntities();
+			if (result.size() > 1) {
+				text.append(
+					Ui::Text::Bold(error.second->chatListName())
+				).append("\n\n");
+			}
+			text.append(error.first);
+			show->showBox(Ui::MakeInformBox(text));
+			return;
+		}
+
+		const auto generateRandom = [&] {
+			return base::RandomValue<MTPlong>();
+		};
+		const auto api = &story->owner().session().api();
+		auto &histories = story->owner().histories();
+		const auto requestType = Data::Histories::RequestType::Send;
+		for (const auto thread : result) {
+			const auto action = Api::SendAction(thread, options);
+			if (!comment.text.isEmpty()) {
+				auto message = Api::MessageToSend(action);
+				message.textWithTags = comment;
+				message.action.clearDraft = false;
+				api->sendMessage(std::move(message));
+			}
+			const auto topicRootId = thread->topicRootId();
+			const auto kGeneralId = Data::ForumTopic::kGeneralId;
+			const auto topMsgId = (topicRootId == kGeneralId)
+				? MsgId(0)
+				: topicRootId;
+			const auto peer = thread->peer();
+			const auto threadHistory = thread->owningHistory();
+			const auto randomId = base::RandomValue<uint64>();
+			auto sendFlags = MTPmessages_SendMedia::Flags(0);
+			if (action.replyTo) {
+				sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
+			}
+			const auto anonymousPost = peer->amAnonymous();
+			const auto silentPost = ShouldSendSilent(peer, action.options);
+			if (silentPost) {
+				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
+			}
+			const auto done = [=] {
+				if (!--state->requests) {
+					if (show->valid()) {
+						show->showToast(tr::lng_share_done(tr::now));
+						show->hideLayer();
+					}
+				}
+			};
+			histories.sendPreparedMessage(
+				threadHistory,
+				action.replyTo,
+				randomId,
+				Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
+					MTP_flags(sendFlags),
+					peer->input,
+					Data::Histories::ReplyToPlaceholder(),
+					MTP_inputMediaStory(
+						user->inputUser,
+						MTP_int(id.story)),
+					MTPstring(),
+					MTP_long(randomId),
+					MTPReplyMarkup(),
+					MTPVector<MTPMessageEntity>(),
+					MTP_int(action.options.scheduled),
+					MTP_inputPeerEmpty()
+				), [=](const MTPUpdates &result, const MTP::Response &response) {
+				done();
+			}, [=](const MTP::Error &error, const MTP::Response &response) {
+				api->sendMessageFail(error, peer, randomId);
+				done();
+			});
+			++state->requests;
+		}
+	};
+
+	const auto scheduleStyle = [&] {
+		auto date = Ui::ChooseDateTimeStyleArgs();
+		date.labelStyle = &st::groupCallBoxLabel;
+		date.dateFieldStyle = &st::groupCallScheduleDateField;
+		date.timeFieldStyle = &st::groupCallScheduleTimeField;
+		date.separatorStyle = &st::callMuteButtonLabel;
+		date.atStyle = &st::callMuteButtonLabel;
+		date.calendarStyle = &st::groupCallCalendarColors;
+
+		auto st = HistoryView::ScheduleBoxStyleArgs();
+		st.topButtonStyle = &st::groupCallMenuToggle;
+		st.popupMenuStyle = &st::groupCallPopupMenu;
+		st.chooseDateTimeArgs = std::move(date);
+		return st;
+	};
+
+	return Box<ShareBox>(ShareBox::Descriptor{
+		.session = session,
+		.copyCallback = std::move(copyLinkCallback),
+		.submitCallback = std::move(submitCallback),
+		.filterCallback = std::move(filterCallback),
+		.stMultiSelect = &st::groupCallMultiSelect,
+		.stComment = &st::groupCallShareBoxComment,
+		.st = &st::groupCallShareBoxList,
+		.stLabel = &st::groupCallField,
+		.scheduleBoxStyle = scheduleStyle(),
+	});
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.h b/Telegram/SourceFiles/media/stories/media_stories_share.h
new file mode 100644
index 000000000..e3dab6245
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.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/object_ptr.h"
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Ui {
+class BoxContent;
+} // namespace Ui
+
+namespace Media::Stories {
+
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareShareBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	FullStoryId id);
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 47f967160..1b2747ee4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -32,6 +32,10 @@ void View::ready() {
 	_controller->ready();
 }
 
+bool View::canShare() const {
+	return _controller->canShare();
+}
+
 bool View::canDownload() const {
 	return _controller->canDownload();
 }
@@ -79,6 +83,10 @@ void View::contentPressed(bool pressed) {
 	_controller->contentPressed(pressed);
 }
 
+void View::share() {
+	_controller->share();
+}
+
 SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 40ee13c91..ba138ac5d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -56,6 +56,7 @@ public:
 	void show(not_null<Data::Story*> story, Data::StoriesContext context);
 	void ready();
 
+	[[nodiscard]] bool canShare() const;
 	[[nodiscard]] bool canDownload() const;
 	[[nodiscard]] QRect finalShownGeometry() const;
 	[[nodiscard]] rpl::producer<QRect> finalShownGeometryValue() const;
@@ -74,6 +75,7 @@ public:
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
 	void contentPressed(bool pressed);
+	void share();
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index cfc78f8b2..e6e1805ea 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -109,6 +109,7 @@ mediaviewRight: icon {
 	{ "mediaview/next", mediaviewControlFg }
 };
 mediaviewSave: icon {{ "mediaview/download", mediaviewControlFg }};
+mediaviewShare: icon {{ "mediaview/stories_next", mediaviewControlFg }};
 mediaviewRotate: icon {{ "mediaview/rotate", mediaviewControlFg }};
 mediaviewMore: icon {{ "title_menu_dots", mediaviewControlFg }};
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 85211c74d..96da6d8ff 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -611,7 +611,7 @@ void OverlayWidget::RendererGL::paintControlsStart() {
 }
 
 void OverlayWidget::RendererGL::paintControl(
-		OverState control,
+		Over control,
 		QRect over,
 		float64 overOpacity,
 		QRect inner,
@@ -676,20 +676,21 @@ void OverlayWidget::RendererGL::paintControl(
 	FillTexturedRectangle(*_f, &*_controlsProgram, fgOffset);
 }
 
-auto OverlayWidget::RendererGL::ControlMeta(OverState control, bool stories)
+auto OverlayWidget::RendererGL::ControlMeta(Over control, bool stories)
 -> Control {
 	switch (control) {
-	case OverLeftNav: return {
+	case Over::Left: return {
 		0,
 		stories ? &st::storiesLeft : &st::mediaviewLeft
 	};
-	case OverRightNav: return {
+	case Over::Right: return {
 		1,
 		stories ? &st::storiesRight : &st::mediaviewRight
 	};
-	case OverSave: return { 2, &st::mediaviewSave };
-	case OverRotate: return { 3, &st::mediaviewRotate };
-	case OverMore: return { 4, &st::mediaviewMore };
+	case Over::Save: return { 2, &st::mediaviewSave };
+	case Over::Share: return { 3, &st::mediaviewShare };
+	case Over::Rotate: return { 4, &st::mediaviewRotate };
+	case Over::More: return { 5, &st::mediaviewMore };
 	}
 	Unexpected("Control value in OverlayWidget::RendererGL::ControlIndex.");
 }
@@ -700,11 +701,12 @@ void OverlayWidget::RendererGL::validateControls() {
 	}
 	const auto stories = (_owner->_stories != nullptr);
 	const auto metas = {
-		ControlMeta(OverLeftNav, stories),
-		ControlMeta(OverRightNav, stories),
-		ControlMeta(OverSave, stories),
-		ControlMeta(OverRotate, stories),
-		ControlMeta(OverMore, stories),
+		ControlMeta(Over::Left, stories),
+		ControlMeta(Over::Right, stories),
+		ControlMeta(Over::Save, stories),
+		ControlMeta(Over::Share, stories),
+		ControlMeta(Over::Rotate, stories),
+		ControlMeta(Over::More, stories),
 	};
 	auto maxWidth = 0;
 	auto fullHeight = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index df6f2aa71..4f769ce7b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -63,7 +63,7 @@ private:
 	void paintSaveMsg(QRect outer) override;
 	void paintControlsStart() override;
 	void paintControl(
-		OverState control,
+		Over control,
 		QRect over,
 		float64 overOpacity,
 		QRect inner,
@@ -145,10 +145,8 @@ private:
 	static constexpr auto kStoriesSiblingPartsCount = 4;
 	Ui::GL::Image _storiesSiblingParts[kStoriesSiblingPartsCount];
 
-	static constexpr auto kControlsCount = 5;
-	[[nodiscard]] static Control ControlMeta(
-		OverState control,
-		bool stories);
+	static constexpr auto kControlsCount = 6;
+	[[nodiscard]] static Control ControlMeta(Over control, bool stories);
 
 	// Last one is for the over circle image.
 	std::array<QRect, kControlsCount + 1> _controlsTextures;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
index e7cc17d74..277d39d96 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
@@ -215,7 +215,7 @@ void OverlayWidget::RendererSW::paintControlsStart() {
 }
 
 void OverlayWidget::RendererSW::paintControl(
-		OverState control,
+		Over control,
 		QRect over,
 		float64 overOpacity,
 		QRect inner,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
index 3d8abf4c4..6399f2219 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
@@ -43,7 +43,7 @@ private:
 	void paintSaveMsg(QRect outer) override;
 	void paintControlsStart() override;
 	void paintControl(
-		OverState control,
+		Over control,
 		QRect over,
 		float64 overOpacity,
 		QRect inner,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h b/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
index cd3ea698e..612bad39e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
@@ -34,7 +34,7 @@ public:
 	virtual void paintSaveMsg(QRect outer) = 0;
 	virtual void paintControlsStart() = 0;
 	virtual void paintControl(
-		OverState control,
+		Over control,
 		QRect over,
 		float64 overOpacity,
 		QRect inner,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 8aa3612c6..42a5117b6 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -536,8 +536,8 @@ OverlayWidget::OverlayWidget()
 	base::install_event_filter(_widget, [=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Leave) {
-			if (_over != OverNone) {
-				updateOverState(OverNone);
+			if (_over != Over::None) {
+				updateOverState(Over::None);
 			}
 		} else if (type == QEvent::MouseButtonPress) {
 			handleMousePress(mousePosition(e), mouseButton(e));
@@ -675,7 +675,7 @@ void OverlayWidget::setupWindow() {
 			|| _helper->skipTitleHitTest(widgetPoint)) {
 			return Flag::None | Flag(0);
 		}
-		const auto inControls = (_over != OverNone) && (_over != OverVideo);
+		const auto inControls = (_over != Over::None) && (_over != Over::Video);
 		if (inControls
 			|| (_streamed
 				&& _streamed->controls
@@ -970,13 +970,16 @@ QSize OverlayWidget::flipSizeByRotation(QSize size) const {
 }
 
 bool OverlayWidget::hasCopyMediaRestriction() const {
-	return (_history && !_history->peer->allowsForwarding())
+	return (_stories && !_stories->canDownload())
+		|| (_history && !_history->peer->allowsForwarding())
 		|| (_message && _message->forbidsSaving());
 }
 
 bool OverlayWidget::showCopyMediaRestriction() {
 	if (!hasCopyMediaRestriction()) {
 		return false;
+	} else if (!_history) {
+		return true;
 	}
 	Ui::Toast::Show(_widget, _history->peer->isBroadcast()
 		? tr::lng_error_nocopy_channel(tr::now)
@@ -1145,8 +1148,7 @@ void OverlayWidget::refreshNavVisibility() {
 }
 
 bool OverlayWidget::contentCanBeSaved() const {
-	if ((_stories && !_stories->canDownload())
-		|| hasCopyMediaRestriction()) {
+	if (hasCopyMediaRestriction()) {
 		return false;
 	} else if (_photo) {
 		return _photo->hasVideo() || _photoMedia->loaded();
@@ -1225,6 +1227,7 @@ void OverlayWidget::updateControls() {
 		QPoint(),
 		QSize(st::mediaviewIconOver, st::mediaviewIconOver));
 	_saveVisible = contentCanBeSaved();
+	_shareVisible = _stories && _stories->canShare();
 	_rotateVisible = !_themePreviewShown && !_stories;
 	const auto navRect = [&](int i) {
 		return QRect(width() - st::mediaviewIconSize.width() * i,
@@ -1232,15 +1235,26 @@ void OverlayWidget::updateControls() {
 			st::mediaviewIconSize.width(),
 			st::mediaviewIconSize.height());
 	};
-	_saveNav = navRect(_rotateVisible ? 3 : 2);
-	_saveNavOver = style::centerrect(_saveNav, overRect);
-	_saveNavIcon = style::centerrect(_saveNav, st::mediaviewSave);
-	_rotateNav = navRect(2);
-	_rotateNavOver = style::centerrect(_rotateNav, overRect);
-	_rotateNavIcon = style::centerrect(_rotateNav, st::mediaviewRotate);
-	_moreNav = navRect(1);
+	auto index = 1;
+	_moreNav = navRect(index);
 	_moreNavOver = style::centerrect(_moreNav, overRect);
 	_moreNavIcon = style::centerrect(_moreNav, st::mediaviewMore);
+	++index;
+	_rotateNav = navRect(index);
+	_rotateNavOver = style::centerrect(_rotateNav, overRect);
+	_rotateNavIcon = style::centerrect(_rotateNav, st::mediaviewRotate);
+	if (_rotateVisible) {
+		++index;
+	}
+	_shareNav = navRect(index);
+	_shareNavOver = style::centerrect(_shareNav, overRect);
+	_shareNavIcon = style::centerrect(_shareNav, st::mediaviewSave);
+	if (_shareVisible) {
+		++index;
+	}
+	_saveNav = navRect(index);
+	_saveNavOver = style::centerrect(_saveNav, overRect);
+	_saveNavIcon = style::centerrect(_saveNav, st::mediaviewSave);
 
 	const auto dNow = QDateTime::currentDateTime();
 	const auto d = [&] {
@@ -1571,17 +1585,18 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) {
 	}
 	_helper->setControlsOpacity(_controlsOpacity.current());
 	const auto content = finalContentRect();
-	const auto siblingType = (_over == OverLeftStories)
+	const auto siblingType = (_over == Over::LeftStories)
 		? Stories::SiblingType::Left
 		: Stories::SiblingType::Right;
 	const auto toUpdate = QRegion()
-		+ (_over == OverLeftNav ? _leftNavOver : _leftNavIcon)
-		+ (_over == OverRightNav ? _rightNavOver : _rightNavIcon)
-		+ (_over == OverSave ? _saveNavOver : _saveNavIcon)
-		+ (_over == OverRotate ? _rotateNavOver : _rotateNavIcon)
-		+ (_over == OverMore ? _moreNavOver : _moreNavIcon)
+		+ (_over == Over::Left ? _leftNavOver : _leftNavIcon)
+		+ (_over == Over::Right ? _rightNavOver : _rightNavIcon)
+		+ (_over == Over::Save ? _saveNavOver : _saveNavIcon)
+		+ (_over == Over::Share ? _shareNavOver : _shareNavIcon)
+		+ (_over == Over::Rotate ? _rotateNavOver : _rotateNavIcon)
+		+ (_over == Over::More ? _moreNavOver : _moreNavIcon)
 		+ ((_stories
-			&& (_over == OverLeftStories || _over == OverRightStories))
+			&& (_over == Over::LeftStories || _over == Over::RightStories))
 			? _stories->sibling(siblingType).layout.geometry
 			: QRect())
 		+ _headerNav
@@ -1604,7 +1619,7 @@ void OverlayWidget::waitingAnimationCallback() {
 void OverlayWidget::updateCursor() {
 	setCursor((_controlsState == ControlsHidden)
 		? Qt::BlankCursor
-		: (_over == OverNone || (_over == OverVideo && _stories))
+		: (_over == Over::None || (_over == Over::Video && _stories))
 		? style::cur_default
 		: style::cur_pointer);
 }
@@ -2971,7 +2986,7 @@ void OverlayWidget::clearControlsState() {
 	_saveMsgAnimation.stop();
 	_saveMsgTimer.cancel();
 	_loadRequest = 0;
-	_over = _down = OverNone;
+	_over = _down = Over::None;
 	_pressed = false;
 	_dragging = 0;
 	setCursor(style::cur_default);
@@ -3158,7 +3173,7 @@ void OverlayWidget::displayPhoto(
 	refreshCaption();
 
 	_blurred = true;
-	_down = OverNone;
+	_down = Over::None;
 	if (!_staticContent.isNull()) {
 		// Video thumbnail.
 		const auto size = style::ConvertScale(
@@ -4117,8 +4132,8 @@ void OverlayWidget::storiesTogglePaused(bool paused) {
 
 float64 OverlayWidget::storiesSiblingOver(Stories::SiblingType type) {
 	return (type == Stories::SiblingType::Left)
-		? overLevel(OverLeftStories)
-		: overLevel(OverRightStories);
+		? overLevel(Over::LeftStories)
+		: overLevel(Over::RightStories);
 }
 void OverlayWidget::storiesRepaint() {
 	update();
@@ -4408,7 +4423,7 @@ void OverlayWidget::paintRadialLoadingContent(
 	if (_photo) {
 		paintBg(radialOpacity, st::radialBg);
 	} else {
-		const auto o = overLevel(OverIcon);
+		const auto o = overLevel(Over::Icon);
 		paintBg(
 			_documentMedia->loaded() ? radialOpacity : 1.,
 			anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, o));
@@ -4584,7 +4599,7 @@ void OverlayWidget::paintControls(
 		not_null<Renderer*> renderer,
 		float64 opacity) {
 	struct Control {
-		OverState state = OverNone;
+		Over state = Over::None;
 		bool visible = false;
 		const QRect &over;
 		const QRect &inner;
@@ -4595,33 +4610,39 @@ void OverlayWidget::paintControls(
 	// When adding / removing controls please update RendererGL.
 	const Control controls[] = {
 		{
-			OverLeftNav,
+			Over::Left,
 			_leftNavVisible,
 			_leftNavOver,
 			_leftNavIcon,
 			_stories ? st::storiesLeft : st::mediaviewLeft,
 			true },
 		{
-			OverRightNav,
+			Over::Right,
 			_rightNavVisible,
 			_rightNavOver,
 			_rightNavIcon,
 			_stories ? st::storiesRight : st::mediaviewRight,
 			true },
 		{
-			OverSave,
+			Over::Save,
 			_saveVisible,
 			_saveNavOver,
 			_saveNavIcon,
 			st::mediaviewSave },
 		{
-			OverRotate,
+			Over::Share,
+			_shareVisible,
+			_shareNavOver,
+			_shareNavIcon,
+			st::mediaviewShare },
+		{
+			Over::Rotate,
 			_rotateVisible,
 			_rotateNavOver,
 			_rotateNavIcon,
 			st::mediaviewRotate },
 		{
-			OverMore,
+			Over::More,
 			true,
 			_moreNavOver,
 			_moreNavIcon,
@@ -4673,7 +4694,7 @@ void OverlayWidget::paintFooterContent(
 	const auto name = _nameNav.translated(shift);
 	const auto date = _dateNav.translated(shift);
 	if (header.intersects(clip)) {
-		auto o = _headerHasLink ? overLevel(OverHeader) : 0;
+		auto o = _headerHasLink ? overLevel(Over::Header) : 0;
 		p.setOpacity(controlOpacity(o) * opacity);
 		p.drawText(header.left(), header.top() + st::mediaviewThickFont->ascent, _headerText);
 
@@ -4687,7 +4708,7 @@ void OverlayWidget::paintFooterContent(
 
 	// name
 	if (_nameNav.isValid() && name.intersects(clip)) {
-		float64 o = _from ? overLevel(OverName) : 0.;
+		float64 o = _from ? overLevel(Over::Name) : 0.;
 		p.setOpacity(controlOpacity(o) * opacity);
 		_fromNameLabel.drawElided(p, name.left(), name.top(), name.width());
 
@@ -4699,7 +4720,7 @@ void OverlayWidget::paintFooterContent(
 
 	// date
 	if (date.intersects(clip)) {
-		float64 o = overLevel(OverDate);
+		float64 o = overLevel(Over::Date);
 		p.setOpacity(controlOpacity(o) * opacity);
 		p.drawText(date.left(), date.top() + st::mediaviewFont->ascent, _dateText);
 
@@ -4768,7 +4789,7 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 	const auto key = e->key();
 	const auto modifiers = e->modifiers();
 	const auto ctrl = modifiers.testFlag(Qt::ControlModifier);
-	if (_stories && key == Qt::Key_Space && _down != OverVideo) {
+	if (_stories && key == Qt::Key_Space && _down != Over::Video) {
 		_stories->togglePaused(!_stories->paused());
 		return;
 	}
@@ -5180,27 +5201,28 @@ void OverlayWidget::handleMousePress(
 	ClickHandler::pressed();
 
 	if (button == Qt::LeftButton) {
-		_down = OverNone;
+		_down = Over::None;
 		if (!ClickHandler::getPressed()) {
-			if ((_over == OverLeftNav && moveToNext(-1))
-				|| (_over == OverRightNav && moveToNext(1))
+			if ((_over == Over::Left && moveToNext(-1))
+				|| (_over == Over::Right && moveToNext(1))
 				|| (_stories
-					&& _over == OverLeftStories
+					&& _over == Over::LeftStories
 					&& _stories->jumpFor(-1))
 				|| (_stories
-					&& _over == OverRightStories
+					&& _over == Over::RightStories
 					&& _stories->jumpFor(1))) {
 				_lastAction = position;
-			} else if (_over == OverName
-				|| _over == OverDate
-				|| _over == OverHeader
-				|| _over == OverSave
-				|| _over == OverRotate
-				|| _over == OverIcon
-				|| _over == OverMore
-				|| _over == OverVideo) {
+			} else if (_over == Over::Name
+				|| _over == Over::Date
+				|| _over == Over::Header
+				|| _over == Over::Save
+				|| _over == Over::Share
+				|| _over == Over::Rotate
+				|| _over == Over::Icon
+				|| _over == Over::More
+				|| _over == Over::Video) {
 				_down = _over;
-				if (_over == OverVideo && _stories) {
+				if (_over == Over::Video && _stories) {
 					_stories->contentPressed(true);
 				}
 			} else if (!_saveMsg.contains(position) || !isSaveMsgShown()) {
@@ -5223,7 +5245,7 @@ bool OverlayWidget::handleDoubleClick(
 		Qt::MouseButton button) {
 	updateOver(position);
 
-	if (_over != OverVideo || !_streamed || button != Qt::LeftButton) {
+	if (_over != Over::Video || !_streamed || button != Qt::LeftButton) {
 		return false;
 	} else if (_stories) {
 		toggleFullScreen(_windowed);
@@ -5276,46 +5298,47 @@ void OverlayWidget::handleMouseMove(QPoint position) {
 	}
 }
 
-void OverlayWidget::updateOverRect(OverState state) {
+void OverlayWidget::updateOverRect(Over state) {
 	using Type = Stories::SiblingType;
 	switch (state) {
-	case OverLeftNav:
+	case Over::Left:
 		update(_stories ? _leftNavIcon : _leftNavOver);
 		break;
-	case OverRightNav:
+	case Over::Right:
 		update(_stories ? _rightNavIcon : _rightNavOver);
 		break;
-	case OverLeftStories:
+	case Over::LeftStories:
 		update(_stories
 			? _stories->sibling(Type::Left).layout.geometry :
 			QRect());
 		break;
-	case OverRightStories:
+	case Over::RightStories:
 		update(_stories
 			? _stories->sibling(Type::Right).layout.geometry
 			: QRect());
 		break;
-	case OverName: update(_nameNav); break;
-	case OverDate: update(_dateNav); break;
-	case OverSave: update(_saveNavOver); break;
-	case OverRotate: update(_rotateNavOver); break;
-	case OverIcon: update(_docIconRect); break;
-	case OverHeader: update(_headerNav); break;
-	case OverMore: update(_moreNavOver); break;
+	case Over::Name: update(_nameNav); break;
+	case Over::Date: update(_dateNav); break;
+	case Over::Save: update(_saveNavOver); break;
+	case Over::Share: update(_shareNavOver); break;
+	case Over::Rotate: update(_rotateNavOver); break;
+	case Over::Icon: update(_docIconRect); break;
+	case Over::Header: update(_headerNav); break;
+	case Over::More: update(_moreNavOver); break;
 	}
 }
 
-bool OverlayWidget::updateOverState(OverState newState) {
+bool OverlayWidget::updateOverState(Over newState) {
 	bool result = true;
 	if (_over != newState) {
-		if (newState == OverMore && !_ignoringDropdown) {
+		if (newState == Over::More && !_ignoringDropdown) {
 			_dropdownShowTimer.callOnce(0);
 		} else {
 			_dropdownShowTimer.cancel();
 		}
 		updateOverRect(_over);
 		updateOverRect(newState);
-		if (_over != OverNone) {
+		if (_over != Over::None) {
 			_animations[_over] = crl::now();
 			const auto i = _animationOpacities.find(_over);
 			if (i != end(_animationOpacities)) {
@@ -5330,7 +5353,7 @@ bool OverlayWidget::updateOverState(OverState newState) {
 			result = false;
 		}
 		_over = newState;
-		if (newState != OverNone) {
+		if (newState != Over::None) {
 			_animations[_over] = crl::now();
 			const auto i = _animationOpacities.find(_over);
 			if (i != end(_animationOpacities)) {
@@ -5382,52 +5405,54 @@ void OverlayWidget::updateOver(QPoint pos) {
 
 	using SiblingType = Stories::SiblingType;
 	if (_fullScreenVideo) {
-		updateOverState(OverVideo);
+		updateOverState(Over::Video);
 	} else if (_leftNavVisible && _leftNav.contains(pos)) {
-		updateOverState(OverLeftNav);
+		updateOverState(Over::Left);
 	} else if (_rightNavVisible && _rightNav.contains(pos)) {
-		updateOverState(OverRightNav);
+		updateOverState(Over::Right);
 	} else if (_stories
 		&& _stories->sibling(
 			SiblingType::Left).layout.geometry.contains(pos)) {
-		updateOverState(OverLeftStories);
+		updateOverState(Over::LeftStories);
 	} else if (_stories
 		&& _stories->sibling(
 			SiblingType::Right).layout.geometry.contains(pos)) {
-		updateOverState(OverRightStories);
+		updateOverState(Over::RightStories);
 	} else if (!_stories && _from && _nameNav.contains(pos)) {
-		updateOverState(OverName);
+		updateOverState(Over::Name);
 	} else if (!_stories
 		&& _message
 		&& _message->isRegular()
 		&& _dateNav.contains(pos)) {
-		updateOverState(OverDate);
+		updateOverState(Over::Date);
 	} else if (!_stories && _headerHasLink && _headerNav.contains(pos)) {
-		updateOverState(OverHeader);
+		updateOverState(Over::Header);
 	} else if (_saveVisible && _saveNav.contains(pos)) {
-		updateOverState(OverSave);
+		updateOverState(Over::Save);
+	} else if (_shareVisible && _shareNav.contains(pos)) {
+		updateOverState(Over::Share);
 	} else if (_rotateVisible && _rotateNav.contains(pos)) {
-		updateOverState(OverRotate);
+		updateOverState(Over::Rotate);
 	} else if (_document
 		&& documentBubbleShown()
 		&& _docIconRect.contains(pos)) {
-		updateOverState(OverIcon);
+		updateOverState(Over::Icon);
 	} else if (_moreNav.contains(pos)) {
-		updateOverState(OverMore);
+		updateOverState(Over::More);
 	} else if (contentShown() && finalContentRect().contains(pos)) {
 		if (_stories) {
-			updateOverState(OverVideo);
+			updateOverState(Over::Video);
 		} else if (_streamed
 			&& _document
 			&& (_document->isVideoFile() || _document->isVideoMessage())) {
-			updateOverState(OverVideo);
+			updateOverState(Over::Video);
 		} else if (!_streamed && _document && !_documentMedia->loaded()) {
-			updateOverState(OverIcon);
-		} else if (_over != OverNone) {
-			updateOverState(OverNone);
+			updateOverState(Over::Icon);
+		} else if (_over != Over::None) {
+			updateOverState(Over::None);
 		}
-	} else if (_over != OverNone) {
-		updateOverState(OverNone);
+	} else if (_over != Over::None) {
+		updateOverState(Over::None);
 	}
 }
 
@@ -5476,7 +5501,7 @@ void OverlayWidget::handleMouseRelease(
 		return;
 	}
 
-	if (_over == OverName && _down == OverName) {
+	if (_over == Over::Name && _down == Over::Name) {
 		if (_from) {
 			if (!_windowed) {
 				close();
@@ -5486,19 +5511,21 @@ void OverlayWidget::handleMouseRelease(
 				window->window().activate();
 			}
 		}
-	} else if (_over == OverDate && _down == OverDate) {
+	} else if (_over == Over::Date && _down == Over::Date) {
 		toMessage();
-	} else if (_over == OverHeader && _down == OverHeader) {
+	} else if (_over == Over::Header && _down == Over::Header) {
 		showMediaOverview();
-	} else if (_over == OverSave && _down == OverSave) {
+	} else if (_over == Over::Save && _down == Over::Save) {
 		downloadMedia();
-	} else if (_over == OverRotate && _down == OverRotate) {
+	} else if (_over == Over::Share && _down == Over::Share && _stories) {
+		_stories->share();
+	} else if (_over == Over::Rotate && _down == Over::Rotate) {
 		playbackControlsRotate();
-	} else if (_over == OverIcon && _down == OverIcon) {
+	} else if (_over == Over::Icon && _down == Over::Icon) {
 		handleDocumentClick();
-	} else if (_over == OverMore && _down == OverMore) {
+	} else if (_over == Over::More && _down == Over::More) {
 		InvokeQueued(_widget, [=] { showDropdown(); });
-	} else if (_over == OverVideo && _down == OverVideo) {
+	} else if (_over == Over::Video && _down == Over::Video) {
 		if (_stories) {
 			_stories->contentPressed(false);
 		} else if (_streamed) {
@@ -5530,7 +5557,7 @@ void OverlayWidget::handleMouseRelease(
 		}
 		_pressed = false;
 	}
-	_down = OverNone;
+	_down = Over::None;
 	if (!isHidden()) {
 		activateControls();
 	}
@@ -5921,7 +5948,7 @@ void OverlayWidget::updateHeader() {
 	_headerNav = QRect(st::mediaviewTextLeft, height() - st::mediaviewHeaderTop, hwidth, st::mediaviewThickFont->height);
 }
 
-float64 OverlayWidget::overLevel(OverState control) const {
+float64 OverlayWidget::overLevel(Over control) const {
 	auto i = _animationOpacities.find(control);
 	return (i == end(_animationOpacities))
 		? (_over == control ? 1. : 0.)
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 01cc71f3d..d323a640e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -109,7 +109,7 @@ public:
 
 	//void leaveToChildEvent(QEvent *e, QWidget *child) override {
 	//	// e -- from enterEvent() of child TWidget
-	//	updateOverState(OverNone);
+	//	updateOverState(Over::None);
 	//}
 	//void enterFromChildEvent(QEvent *e, QWidget *child) override {
 	//	// e -- from leaveEvent() of child TWidget
@@ -143,21 +143,22 @@ private:
 	class RendererGL;
 
 	// If changing, see paintControls()!
-	enum OverState {
-		OverNone,
-		OverLeftNav,
-		OverRightNav,
-		OverLeftStories,
-		OverRightStories,
-		OverHeader,
-		OverName,
-		OverDate,
-		OverSave,
-		OverRotate,
-		OverMore,
-		OverIcon,
-		OverVideo,
-		OverCaption,
+	enum class Over {
+		None,
+		Left,
+		Right,
+		LeftStories,
+		RightStories,
+		Header,
+		Name,
+		Date,
+		Save,
+		Share,
+		Rotate,
+		More,
+		Icon,
+		Video,
+		Caption,
 	};
 	struct Entity {
 		std::variant<
@@ -471,9 +472,9 @@ private:
 		bool nonbright = false) const;
 	[[nodiscard]] bool isSaveMsgShown() const;
 
-	void updateOverRect(OverState state);
-	bool updateOverState(OverState newState);
-	float64 overLevel(OverState control) const;
+	void updateOverRect(Over state);
+	bool updateOverState(Over newState);
+	float64 overLevel(Over control) const;
 
 	void checkGroupThumbsAnimation();
 	void initGroupThumbs();
@@ -549,11 +550,13 @@ private:
 	QRect _rightNav, _rightNavOver, _rightNavIcon;
 	QRect _headerNav, _nameNav, _dateNav;
 	QRect _rotateNav, _rotateNavOver, _rotateNavIcon;
+	QRect _shareNav, _shareNavOver, _shareNavIcon;
 	QRect _saveNav, _saveNavOver, _saveNavIcon;
 	QRect _moreNav, _moreNavOver, _moreNavIcon;
 	bool _leftNavVisible = false;
 	bool _rightNavVisible = false;
 	bool _saveVisible = false;
+	bool _shareVisible = false;
 	bool _rotateVisible = false;
 	bool _headerHasLink = false;
 	QString _dateText;
@@ -653,8 +656,8 @@ private:
 
 	mtpRequestId _loadRequest = 0;
 
-	OverState _over = OverNone;
-	OverState _down = OverNone;
+	Over _over = Over::None;
+	Over _down = Over::None;
 	QPoint _lastAction, _lastMouseMovePos;
 	bool _ignoringDropdown = false;
 
@@ -693,8 +696,8 @@ private:
 	Ui::Animations::Simple _saveMsgAnimation;
 	base::Timer _saveMsgTimer;
 
-	base::flat_map<OverState, crl::time> _animations;
-	base::flat_map<OverState, anim::value> _animationOpacities;
+	base::flat_map<Over, crl::time> _animations;
+	base::flat_map<Over, anim::value> _animationOpacities;
 
 	rpl::event_stream<Media::Player::TrackState> _touchbarTrackState;
 	rpl::event_stream<TouchBarItemType> _touchbarDisplay;

From d7186e68e276d2e59ec2800ed4b4a0cef8933b7d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Jun 2023 21:06:28 +0400
Subject: [PATCH 295/676] Open stories by t.me/username?story=id links.

---
 Telegram/SourceFiles/core/local_url_handlers.cpp     |  2 ++
 .../SourceFiles/window/window_session_controller.cpp | 12 ++++++++++++
 .../SourceFiles/window/window_session_controller.h   |  1 +
 3 files changed, 15 insertions(+)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 1e6cda40f..2d013e612 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -383,6 +383,7 @@ bool ResolveUsernameOrPhone(
 	if (const auto postId = postParam.toInt()) {
 		post = postId;
 	}
+	const auto storyId = params.value(u"story"_q).toInt();
 	const auto appname = params.value(u"appname"_q);
 	const auto appstart = params.value(u"startapp"_q);
 	const auto commentParam = params.value(u"comment"_q);
@@ -408,6 +409,7 @@ bool ResolveUsernameOrPhone(
 		.usernameOrId = domain,
 		.phone = phone,
 		.messageId = post,
+		.storyId = storyId,
 		.repliesInfo = commentId
 			? Navigation::RepliesByLinkInfo{
 				Navigation::CommentId{ commentId }
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index d6214affc..0e3277348 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -503,6 +503,18 @@ void SessionNavigation::showPeerByLinkResolved(
 				info.messageId,
 				callback);
 		}
+	} else if (peer->isUser() && info.storyId) {
+		const auto storyId = FullStoryId{ peer->id, info.storyId };
+		peer->owner().stories().resolve(storyId, crl::guard(this, [=] {
+			if (peer->owner().stories().lookup(storyId)) {
+				parentController()->openPeerStory(
+					peer,
+					storyId.story,
+					Data::StoriesContext{ Data::StoriesContextSingle() });
+			} else {
+				showToast(tr::lng_confirm_phone_link_invalid(tr::now));
+			}
+		}));
 	} else if (bot && resolveType == ResolveType::BotApp) {
 		const auto itemId = info.clickFromMessageId;
 		const auto item = _session->data().message(itemId);
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index f92f7d98f..1fb50ac2a 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -204,6 +204,7 @@ public:
 		std::variant<QString, ChannelId> usernameOrId;
 		QString phone;
 		MsgId messageId = ShowAtUnreadMsgId;
+		StoryId storyId = 0;
 		RepliesByLinkInfo repliesInfo;
 		ResolveType resolveType = ResolveType::Default;
 		QString startToken;

From c133f4de6901fd3cc45e81ec6c7073db3805392c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Jun 2023 22:37:17 +0400
Subject: [PATCH 296/676] Display shared stories in message history.

---
 Telegram/Resources/langs/lang.strings         |  3 +
 .../SourceFiles/data/data_media_types.cpp     | 84 +++++++++++++++++++
 Telegram/SourceFiles/data/data_media_types.h  | 26 ++++++
 Telegram/SourceFiles/history/history_item.cpp | 25 +++++-
 Telegram/SourceFiles/history/history_item.h   |  1 +
 .../history/history_item_components.h         |  1 +
 .../history/view/history_view_element.cpp     | 23 +++--
 .../history/view/media/history_view_gif.cpp   |  9 +-
 .../history/view/media/history_view_gif.h     |  5 +-
 .../history/view/media/history_view_photo.cpp | 39 +++++++--
 .../history/view/media/history_view_photo.h   |  5 +-
 .../window/window_session_controller.cpp      | 46 +++++-----
 .../window/window_session_controller.h        |  5 +-
 13 files changed, 229 insertions(+), 43 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 48c5590ad..fdd35ffdd 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1503,6 +1503,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_pinned_media_sticker" = "a sticker";
 "lng_action_pinned_media_emoji_sticker" = "a {emoji} sticker";
 "lng_action_pinned_media_game" = "the game «{game}»";
+"lng_action_pinned_media_story" = "a story";
 "lng_action_game_score#one" = "{from} scored {count} in {game}";
 "lng_action_game_score#other" = "{from} scored {count} in {game}";
 "lng_action_game_you_scored#one" = "You scored {count} in {game}";
@@ -3810,6 +3811,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_button" = "Archive";
 "lng_stories_archive_title" = "Stories Archive";
 
+"lng_stories_link_invalid" = "This link is broken or has expired.";
+
 // 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 4e311e1f1..5a13cf2d5 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -56,6 +56,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_poll.h"
 #include "data/data_channel.h"
 #include "data/data_file_origin.h"
+#include "data/data_stories.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "core/application.h"
@@ -72,6 +73,7 @@ namespace {
 
 constexpr auto kFastRevokeRestriction = 24 * 60 * TimeId(60);
 constexpr auto kMaxPreviewImages = 3;
+constexpr auto kLoadingStoryPhotoId = PhotoId(0x7FFF'DEAD'FFFF'FFFFULL);
 
 using ItemPreview = HistoryView::ItemPreview;
 using ItemPreviewImage = HistoryView::ItemPreviewImage;
@@ -404,6 +406,10 @@ const WallPaper *Media::paper() const {
 	return nullptr;
 }
 
+FullStoryId Media::storyId() const {
+	return {};
+}
+
 bool Media::uploading() const {
 	return false;
 }
@@ -1968,4 +1974,82 @@ std::unique_ptr<HistoryView::Media> MediaWallPaper::createView(
 		std::make_unique<HistoryView::ThemeDocumentBox>(message, _paper));
 }
 
+MediaStory::MediaStory(not_null<HistoryItem*> parent, FullStoryId storyId)
+: Media(parent)
+, _storyId(storyId) {
+	const auto stories = &parent->history()->owner().stories();
+	if (!stories->lookup(storyId)) {
+		stories->resolve(storyId, crl::guard(this, [=] {
+			if (stories->lookup(storyId)) {
+				parent->history()->owner().requestItemViewRefresh(parent);
+			}
+		}));
+	}
+}
+
+std::unique_ptr<Media> MediaStory::clone(not_null<HistoryItem*> parent) {
+	return std::make_unique<MediaStory>(parent, _storyId);
+}
+
+FullStoryId MediaStory::storyId() const {
+	return _storyId;
+}
+
+TextWithEntities MediaStory::notificationText() const {
+	const auto stories = &parent()->history()->owner().stories();
+	const auto maybeStory = stories->lookup(_storyId);
+	return WithCaptionNotificationText(
+		tr::lng_in_dlg_story(tr::now),
+		(maybeStory
+			? (*maybeStory)->caption()
+			: TextWithEntities()));
+}
+
+QString MediaStory::pinnedTextSubstring() const {
+	return tr::lng_action_pinned_media_story(tr::now);
+}
+
+TextForMimeData MediaStory::clipboardText() const {
+	return WithCaptionClipboardText(
+		tr::lng_in_dlg_story(tr::now),
+		parent()->clipboardText());
+}
+
+bool MediaStory::updateInlineResultMedia(const MTPMessageMedia &media) {
+	return false;
+}
+
+bool MediaStory::updateSentMedia(const MTPMessageMedia &media) {
+	return false;
+}
+
+std::unique_ptr<HistoryView::Media> MediaStory::createView(
+		not_null<HistoryView::Element*> message,
+		not_null<HistoryItem*> realParent,
+		HistoryView::Element *replacing) {
+	const auto spoiler = false;
+	const auto stories = &parent()->history()->owner().stories();
+	const auto maybeStory = stories->lookup(_storyId);
+	if (const auto story = maybeStory ? maybeStory->get() : nullptr) {
+		if (const auto photo = story->photo()) {
+			return std::make_unique<HistoryView::Photo>(
+				message,
+				realParent,
+				photo,
+				spoiler);
+		} else {
+			return std::make_unique<HistoryView::Gif>(
+				message,
+				realParent,
+				story->document(),
+				spoiler);
+		}
+	}
+	return std::make_unique<HistoryView::Photo>(
+		message,
+		realParent,
+		realParent->history()->owner().photo(kLoadingStoryPhotoId),
+		spoiler);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 985e2c8aa..614d0333a 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/weak_ptr.h"
 #include "data/data_location.h"
 #include "data/data_wall_paper.h"
 
@@ -110,6 +111,7 @@ public:
 	virtual CloudImage *location() const;
 	virtual PollData *poll() const;
 	virtual const WallPaper *paper() const;
+	virtual FullStoryId storyId() const;
 
 	virtual bool uploading() const;
 	virtual Storage::SharedMediaTypesMask sharedMediaTypes() const;
@@ -563,6 +565,30 @@ private:
 
 };
 
+class MediaStory final : public Media, public base::has_weak_ptr {
+public:
+	MediaStory(not_null<HistoryItem*> parent, FullStoryId storyId);
+
+	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
+
+	[[nodiscard]] FullStoryId storyId() const override;
+
+	TextWithEntities notificationText() const override;
+	QString pinnedTextSubstring() const override;
+	TextForMimeData clipboardText() const override;
+
+	bool updateInlineResultMedia(const MTPMessageMedia &media) override;
+	bool updateSentMedia(const MTPMessageMedia &media) override;
+	std::unique_ptr<HistoryView::Media> createView(
+		not_null<HistoryView::Element*> message,
+		not_null<HistoryItem*> realParent,
+		HistoryView::Element *replacing = nullptr) override;
+
+private:
+	const FullStoryId _storyId;
+
+};
+
 [[nodiscard]] TextForMimeData WithCaptionClipboardText(
 	const QString &attachType,
 	TextForMimeData &&caption);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index e886b7ed7..2e73286a8 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -291,7 +291,10 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			qs(media.vemoticon()),
 			media.vvalue().v);
 	}, [&](const MTPDmessageMediaStory &media) -> Result {
-		return nullptr; // #TODO stories
+		return std::make_unique<Data::MediaStory>(item, FullStoryId{
+			peerFromUser(media.vuser_id()),
+			media.vid().v,
+		});
 	}, [](const MTPDmessageMediaEmpty &) -> Result {
 		return nullptr;
 	}, [](const MTPDmessageMediaUnsupported &) -> Result {
@@ -3594,9 +3597,29 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 
 void HistoryItem::setMedia(const MTPMessageMedia &media) {
 	_media = CreateMedia(this, media);
+	checkStoryForwardInfo();
 	checkBuyButton();
 }
 
+void HistoryItem::checkStoryForwardInfo() {
+	if (const auto storyId = _media ? _media->storyId() : FullStoryId()) {
+		const auto adding = !Has<HistoryMessageForwarded>();
+		if (adding) {
+			AddComponents(HistoryMessageForwarded::Bit());
+		}
+		const auto forwarded = Get<HistoryMessageForwarded>();
+		if (forwarded->story || adding) {
+			const auto peer = history()->owner().peer(storyId.peer);
+			forwarded->story = true;
+			forwarded->originalSender = peer;
+		}
+	} else if (const auto forwarded = Get<HistoryMessageForwarded>()) {
+		if (forwarded->story) {
+			RemoveComponents(HistoryMessageForwarded::Bit());
+		}
+	}
+}
+
 void HistoryItem::applyServiceDateEdition(const MTPDmessageService &data) {
 	const auto date = data.vdate().v;
 	if (_date == date) {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index c2f26fb44..a5bbb3ced 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -192,6 +192,7 @@ public:
 	[[nodiscard]] MsgId dependencyMsgId() const;
 	[[nodiscard]] bool notificationReady() const;
 	[[nodiscard]] PeerData *specialNotificationPeer() const;
+	void checkStoryForwardInfo();
 	void checkBuyButton();
 
 	void updateServiceText(PreparedServiceText &&text);
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 99100f6b0..57d38514e 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -129,6 +129,7 @@ struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded
 	PeerData *savedFromPeer = nullptr;
 	MsgId savedFromMsgId = 0;
 	bool imported = false;
+	bool story = false;
 };
 
 struct HistoryMessageSponsored : public RuntimeComponent<HistoryMessageSponsored, HistoryItem> {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index d6e7c4099..4d734bfcb 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -248,6 +248,7 @@ TextSelection ShiftItemSelection(
 QString DateTooltipText(not_null<Element*> view) {
 	const auto locale = QLocale();
 	const auto format = QLocale::LongFormat;
+	const auto item = view->data();
 	auto dateText = locale.toString(view->dateTime(), format);
 	if (const auto editedDate = view->displayedEditDate()) {
 		dateText += '\n' + tr::lng_edited_date(
@@ -255,18 +256,22 @@ QString DateTooltipText(not_null<Element*> view) {
 			lt_date,
 			locale.toString(base::unixtime::parse(editedDate), format));
 	}
-	if (const auto forwarded = view->data()->Get<HistoryMessageForwarded>()) {
-		dateText += '\n' + tr::lng_forwarded_date(
-			tr::now,
-			lt_date,
-			locale.toString(base::unixtime::parse(forwarded->originalDate), format));
-		if (forwarded->imported) {
-			dateText = tr::lng_forwarded_imported(tr::now)
-				+ "\n\n" + dateText;
+	if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
+		if (!forwarded->story && forwarded->psaType.isEmpty()) {
+			dateText += '\n' + tr::lng_forwarded_date(
+				tr::now,
+				lt_date,
+				locale.toString(
+					base::unixtime::parse(forwarded->originalDate),
+					format));
+			if (forwarded->imported) {
+				dateText = tr::lng_forwarded_imported(tr::now)
+					+ "\n\n" + dateText;
+			}
 		}
 	}
 	if (view->isSignedAuthorElided()) {
-		if (const auto msgsigned = view->data()->Get<HistoryMessageSigned>()) {
+		if (const auto msgsigned = item->Get<HistoryMessageSigned>()) {
 			dateText += '\n'
 				+ tr::lng_signed_author(tr::now, lt_user, msgsigned->author);
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 67e4c8f3f..e1c78f8b5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -90,6 +90,11 @@ Gif::Gif(
 , _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right())
 , _spoiler(spoiler ? std::make_unique<MediaSpoiler>() : nullptr)
 , _downloadSize(Ui::FormatSizeText(_data->size)) {
+	if (const auto media = realParent->media()) {
+		if (media->storyId()) {
+			_story = true;
+		}
+	}
 	setDocumentLinks(_data, realParent, [=] {
 		if (!_data->createMediaView()->canBePlayed(realParent)
 			|| !_data->isAnimation()
@@ -1441,7 +1446,9 @@ void Gif::hideSpoilers() {
 }
 
 bool Gif::needsBubble() const {
-	if (_data->isVideoMessage()) {
+	if (_story) {
+		return true;
+	} else if (_data->isVideoMessage()) {
 		return false;
 	} else if (!_caption.isEmpty()) {
 		return true;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 7900f9e46..6a8fca3b5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -219,8 +219,9 @@ private:
 	mutable QImage _thumbCache;
 	mutable QImage _roundingMask;
 	mutable std::optional<Ui::BubbleRounding> _thumbCacheRounding;
-	mutable bool _thumbCacheBlurred = false;
-	mutable bool _thumbIsEllipse = false;
+	mutable bool _thumbCacheBlurred : 1 = false;
+	mutable bool _thumbIsEllipse : 1 = false;
+	mutable bool _story : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 78c4be6f3..efa945cc4 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -40,6 +40,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 namespace {
 
+constexpr auto kStoryWidth = 720;
+constexpr auto kStoryHeight = 1280;
+
 using Data::PhotoSize;
 
 } // namespace
@@ -67,6 +70,11 @@ Photo::Photo(
 , _data(photo)
 , _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right())
 , _spoiler(spoiler ? std::make_unique<MediaSpoiler>() : nullptr) {
+	if (const auto media = realParent->media()) {
+		if (media->storyId()) {
+			_story = true;
+		}
+	}
 	_caption = createCaption(realParent);
 	create(realParent->fullId());
 }
@@ -167,7 +175,7 @@ QSize Photo::countOptimalSize() {
 			_parent->skipBlockHeight());
 	}
 
-	const auto dimensions = QSize(_data->width(), _data->height());
+	const auto dimensions = photoSize();
 	const auto scaled = CountDesiredMediaSize(dimensions);
 	const auto minWidth = std::clamp(
 		_parent->minWidthForMedia(),
@@ -210,7 +218,7 @@ QSize Photo::countCurrentSize(int newWidth) {
 			? st::historyPhotoBubbleMinWidth
 			: st::minPhotoSize),
 		thumbMaxWidth);
-	const auto dimensions = QSize(_data->width(), _data->height());
+	const auto dimensions = photoSize();
 	auto pix = CountPhotoMediaSize(
 		CountDesiredMediaSize(dimensions),
 		newWidth,
@@ -255,7 +263,11 @@ int Photo::adjustHeightForLessCrop(QSize dimensions, QSize current) const {
 }
 
 void Photo::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;
+	} else if (_story && _data->isNull()) {
+		return;
+	}
 
 	ensureDataMediaCreated();
 	_dataMedia->automaticLoad(_realParent->fullId(), _parent->data());
@@ -590,11 +602,20 @@ void Photo::paintUserpicFrame(
 	}
 }
 
+QSize Photo::photoSize() const {
+	if (_story) {
+		return { kStoryWidth, kStoryHeight };
+	}
+	return QSize(_data->width(), _data->height());
+}
+
 TextState Photo::textState(QPoint point, StateRequest request) const {
 	auto result = TextState(_parent);
 
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return result;
+	} else if (_story && _data->isNull()) {
+		return result;
 	}
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
@@ -657,9 +678,8 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 }
 
 QSize Photo::sizeForGroupingOptimal(int maxWidth) const {
-	const auto width = _data->width();
-	const auto height = _data->height();
-	return { std::max(width, 1), std::max(height, 1) };
+	const auto size = photoSize();
+	return { std::max(size.width(), 1), std::max(size.height(), 1)};
 }
 
 QSize Photo::sizeForGrouping(int width) const {
@@ -848,8 +868,9 @@ void Photo::validateGroupedCache(
 		return;
 	}
 
-	const auto originalWidth = style::ConvertScale(_data->width());
-	const auto originalHeight = style::ConvertScale(_data->height());
+	const auto unscaled = photoSize();
+	const auto originalWidth = style::ConvertScale(unscaled.width());
+	const auto originalHeight = style::ConvertScale(unscaled.height());
 	const auto pixSize = Ui::GetImageScaleSizeForGeometry(
 		{ originalWidth, originalHeight },
 		{ width, height });
@@ -1012,7 +1033,7 @@ void Photo::hideSpoilers() {
 }
 
 bool Photo::needsBubble() const {
-	if (!_caption.isEmpty()) {
+	if (_story || !_caption.isEmpty()) {
 		return true;
 	}
 	const auto item = _parent->data();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 9440d1421..31d2b08bc 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -158,6 +158,8 @@ private:
 		const PaintContext &context,
 		QPoint photoPosition) const;
 
+	[[nodiscard]] QSize photoSize() const;
+
 	const not_null<PhotoData*> _data;
 	Ui::Text::String _caption;
 	mutable std::shared_ptr<Data::PhotoMedia> _dataMedia;
@@ -165,9 +167,10 @@ private:
 	const std::unique_ptr<MediaSpoiler> _spoiler;
 	mutable QImage _imageCache;
 	mutable std::optional<Ui::BubbleRounding> _imageCacheRounding;
-	int _serviceWidth : 30 = 0;
+	int _serviceWidth : 29 = 0;
 	mutable int _imageCacheForum : 1 = 0;
 	mutable int _imageCacheBlurred : 1 = 0;
+	mutable int _story : 1 = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 0e3277348..2d447621c 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -512,7 +512,7 @@ void SessionNavigation::showPeerByLinkResolved(
 					storyId.story,
 					Data::StoriesContext{ Data::StoriesContextSingle() });
 			} else {
-				showToast(tr::lng_confirm_phone_link_invalid(tr::now));
+				showToast(tr::lng_stories_link_invalid(tr::now));
 			}
 		}));
 	} else if (bot && resolveType == ResolveType::BotApp) {
@@ -2155,14 +2155,12 @@ void SessionController::openPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId contextId,
 		MsgId topicRootId) {
-	if (openStory(contextId)) {
+	const auto item = session().data().message(contextId);
+	if (openSharedStory(item) || openFakeItemStory(contextId)) {
 		return;
 	}
-	_window->openInMediaView(Media::View::OpenRequest(
-		this,
-		photo,
-		session().data().message(contextId),
-		topicRootId));
+	_window->openInMediaView(
+		Media::View::OpenRequest(this, photo, item, topicRootId));
 }
 
 void SessionController::openPhoto(
@@ -2176,24 +2174,34 @@ void SessionController::openDocument(
 		FullMsgId contextId,
 		MsgId topicRootId,
 		bool showInMediaView) {
-	if (openStory(contextId)) {
+	const auto item = session().data().message(contextId);
+	if (openSharedStory(item) || openFakeItemStory(contextId)) {
 		return;
 	} else if (showInMediaView) {
-		_window->openInMediaView(Media::View::OpenRequest(
-			this,
-			document,
-			session().data().message(contextId),
-			topicRootId));
+		_window->openInMediaView(
+			Media::View::OpenRequest(this, document, item, topicRootId));
 		return;
 	}
-	Data::ResolveDocument(
-		this,
-		document,
-		session().data().message(contextId),
-		topicRootId);
+	Data::ResolveDocument(this, document, item, topicRootId);
 }
 
-bool SessionController::openStory(
+bool SessionController::openSharedStory(HistoryItem *item) {
+	if (const auto media = item ? item->media() : nullptr) {
+		if (const auto storyId = media->storyId()) {
+			const auto story = session().data().stories().lookup(storyId);
+			if (story) {
+				_window->openInMediaView(::Media::View::OpenRequest(
+					this,
+					*story,
+					Data::StoriesContext{ Data::StoriesContextSingle() }));
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+bool SessionController::openFakeItemStory(
 		FullMsgId fakeItemId,
 		bool forceArchiveContext) {
 	if (!peerIsUser(fakeItemId.peer)
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 1fb50ac2a..845cdb223 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -492,7 +492,10 @@ public:
 		FullMsgId contextId,
 		MsgId topicRootId,
 		bool showInMediaView = false);
-	bool openStory(FullMsgId fakeItemId, bool forceArchiveContext = false);
+	bool openSharedStory(HistoryItem *item);
+	bool openFakeItemStory(
+		FullMsgId fakeItemId,
+		bool forceArchiveContext = false);
 
 	void showChooseReportMessages(
 		not_null<PeerData*> peer,

From 1c41df364ccaf08dc4f8100548b7702dc4df4e69 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Jun 2023 13:36:17 +0400
Subject: [PATCH 297/676] Improved shared story layout.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../SourceFiles/data/data_media_types.cpp     | 69 ++++++++++++-------
 Telegram/SourceFiles/data/data_media_types.h  |  6 +-
 Telegram/SourceFiles/data/data_stories.cpp    |  5 +-
 .../history/history_item_components.cpp       |  8 ++-
 .../history/view/history_view_element.cpp     | 54 ++++++++-------
 .../history/view/history_view_element.h       |  3 +
 .../history/view/history_view_message.cpp     | 15 ++--
 .../history/view/media/history_view_photo.cpp |  2 +-
 9 files changed, 107 insertions(+), 56 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index fdd35ffdd..9a0a660b4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1699,6 +1699,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_about_private_link" = "This link will only work for members of this chat.";
 
 "lng_forwarded" = "Forwarded from {user}";
+"lng_forwarded_story" = "Story from {user}";
 "lng_forwarded_date" = "Original: {date}";
 "lng_forwarded_channel" = "Forwarded from {channel}";
 "lng_forwarded_psa_default" = "Forwarded from {channel}";
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 5a13cf2d5..cd9d863dc 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -410,6 +410,10 @@ FullStoryId Media::storyId() const {
 	return {};
 }
 
+bool Media::storyExpired() const {
+	return false;
+}
+
 bool Media::uploading() const {
 	return false;
 }
@@ -1978,12 +1982,16 @@ MediaStory::MediaStory(not_null<HistoryItem*> parent, FullStoryId storyId)
 : Media(parent)
 , _storyId(storyId) {
 	const auto stories = &parent->history()->owner().stories();
-	if (!stories->lookup(storyId)) {
-		stories->resolve(storyId, crl::guard(this, [=] {
-			if (stories->lookup(storyId)) {
+	const auto maybeStory = stories->lookup(storyId);
+	if (!maybeStory) {
+		if (maybeStory.error() == NoStory::Unknown) {
+			stories->resolve(storyId, crl::guard(this, [=] {
+				_expired = !stories->lookup(storyId);
 				parent->history()->owner().requestItemViewRefresh(parent);
-			}
-		}));
+			}));
+		} else {
+			_expired = true;
+		}
 	}
 }
 
@@ -1995,6 +2003,10 @@ FullStoryId MediaStory::storyId() const {
 	return _storyId;
 }
 
+bool MediaStory::storyExpired() const {
+	return _expired;
+}
+
 TextWithEntities MediaStory::notificationText() const {
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
@@ -2015,6 +2027,10 @@ TextForMimeData MediaStory::clipboardText() const {
 		parent()->clipboardText());
 }
 
+bool MediaStory::dropForwardedInfo() const {
+	return true;
+}
+
 bool MediaStory::updateInlineResultMedia(const MTPMessageMedia &media) {
 	return false;
 }
@@ -2030,26 +2046,33 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	const auto spoiler = false;
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
-	if (const auto story = maybeStory ? maybeStory->get() : nullptr) {
-		if (const auto photo = story->photo()) {
-			return std::make_unique<HistoryView::Photo>(
-				message,
-				realParent,
-				photo,
-				spoiler);
-		} else {
-			return std::make_unique<HistoryView::Gif>(
-				message,
-				realParent,
-				story->document(),
-				spoiler);
+	if (!maybeStory) {
+		if (maybeStory.error() == Data::NoStory::Deleted) {
+			_expired = true;
+			return nullptr;
 		}
+		_expired = false;
+		return std::make_unique<HistoryView::Photo>(
+			message,
+			realParent,
+			realParent->history()->owner().photo(kLoadingStoryPhotoId),
+			spoiler);
+	}
+	_expired = false;
+	const auto story = *maybeStory;
+	if (const auto photo = story->photo()) {
+		return std::make_unique<HistoryView::Photo>(
+			message,
+			realParent,
+			photo,
+			spoiler);
+	} else {
+		return std::make_unique<HistoryView::Gif>(
+			message,
+			realParent,
+			story->document(),
+			spoiler);
 	}
-	return std::make_unique<HistoryView::Photo>(
-		message,
-		realParent,
-		realParent->history()->owner().photo(kLoadingStoryPhotoId),
-		spoiler);
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 614d0333a..0ba84e928 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -112,6 +112,7 @@ public:
 	virtual PollData *poll() const;
 	virtual const WallPaper *paper() const;
 	virtual FullStoryId storyId() const;
+	virtual bool storyExpired() const;
 
 	virtual bool uploading() const;
 	virtual Storage::SharedMediaTypesMask sharedMediaTypes() const;
@@ -571,11 +572,13 @@ public:
 
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
-	[[nodiscard]] FullStoryId storyId() const override;
+	FullStoryId storyId() const override;
+	bool storyExpired() const override;
 
 	TextWithEntities notificationText() const override;
 	QString pinnedTextSubstring() const override;
 	TextForMimeData clipboardText() const override;
+	bool dropForwardedInfo() const override;
 
 	bool updateInlineResultMedia(const MTPMessageMedia &media) override;
 	bool updateSentMedia(const MTPMessageMedia &media) override;
@@ -586,6 +589,7 @@ public:
 
 private:
 	const FullStoryId _storyId;
+	bool _expired = false;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0d2e64bfa..3952f9712 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -742,11 +742,12 @@ void Stories::sendResolveRequests() {
 	auto leftToSend = kMaxResolveTogether;
 	auto byPeer = base::flat_map<PeerId, QVector<MTPint>>();
 	for (auto i = begin(_resolvePending); i != end(_resolvePending);) {
-		auto &[peerId, ids] = *i;
+		const auto peerId = i->first;
+		auto &ids = i->second;
 		auto &sent = _resolveSent[peerId];
 		if (ids.size() <= leftToSend) {
 			sent = base::take(ids);
-			i = _resolvePending.erase(i);
+			i = _resolvePending.erase(i); // Invalidates `ids`.
 			leftToSend -= int(sent.size());
 		} else {
 			sent = {
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index ce9a8edf2..05289283e 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -192,7 +192,13 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
 	} else {
 		phrase = name;
 	}
-	if (via && psaType.isEmpty()) {
+	if (story) {
+		phrase = tr::lng_forwarded_story(
+			tr::now,
+			lt_user,
+			Ui::Text::Link(phrase.text, QString()), // Link 1.
+			Ui::Text::WithEntities);
+	} else if (via && psaType.isEmpty()) {
 		if (fromChannel) {
 			phrase = tr::lng_forwarded_channel_via(
 				tr::now,
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 4d734bfcb..763978823 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -839,14 +839,15 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 void Element::validateText() {
 	const auto item = data();
 	const auto &text = item->_text;
-	if (_text.isEmpty() == text.empty()) {
-		return;
-	}
-	const auto context = Core::MarkedTextContext{
-		.session = &history()->session(),
-		.customEmojiRepaint = [=] { customEmojiRepaint(); },
-	};
-	if (_flags & Flag::ServiceMessage) {
+	const auto media = item->media();
+	if (media && media->storyExpired()) {
+		_media = nullptr;
+		if (_text.isEmpty()) {
+			setTextWithLinks(
+				Ui::Text::Italic(u"This story has expired"_q));
+		}
+	} else if (_text.isEmpty() == text.empty()) {
+	} else if (_flags & Flag::ServiceMessage) {
 		const auto contextDependentText = contextDependentServiceText();
 		const auto &markedText = contextDependentText.text.empty()
 			? text
@@ -854,28 +855,33 @@ void Element::validateText() {
 		const auto &customLinks = contextDependentText.text.empty()
 			? item->customTextLinks()
 			: contextDependentText.links;
-		_text.setMarkedText(
-			st::serviceTextStyle,
-			markedText,
-			Ui::ItemTextServiceOptions(),
-			context);
+		setTextWithLinks(markedText, customLinks);
+	} else {
+		setTextWithLinks(item->translatedTextWithLocalEntities());
+	}
+}
+
+void Element::setTextWithLinks(
+		const TextWithEntities &text,
+		const std::vector<ClickHandlerPtr> &links) {
+	const auto context = Core::MarkedTextContext{
+		.session = &history()->session(),
+		.customEmojiRepaint = [=] { customEmojiRepaint(); },
+	};
+	if (_flags & Flag::ServiceMessage) {
+		const auto &options = Ui::ItemTextServiceOptions();
+		_text.setMarkedText(st::serviceTextStyle, text, options, context);
 		auto linkIndex = 0;
-		for (const auto &link : customLinks) {
+		for (const auto &link : links) {
 			// Link indices start with 1.
 			_text.setLink(++linkIndex, link);
 		}
 	} else {
+		const auto item = data();
+		const auto &options = Ui::ItemTextOptions(item);
 		clearSpecialOnlyEmoji();
-		const auto context = Core::MarkedTextContext{
-			.session = &history()->session(),
-			.customEmojiRepaint = [=] { customEmojiRepaint(); },
-		};
-		_text.setMarkedText(
-			st::messageTextStyle,
-			item->translatedTextWithLocalEntities(),
-			Ui::ItemTextOptions(item),
-			context);
-		if (!text.empty() && _text.isEmpty()) {
+		_text.setMarkedText(st::messageTextStyle, text, options, context);
+		if (!item->_text.empty() && _text.isEmpty()){
 			// If server has allowed some text that we've trim-ed entirely,
 			// just replace it with something so that UI won't look buggy.
 			_text.setMarkedText(
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index a2b9cb049..3faaa355b 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -536,6 +536,9 @@ private:
 	virtual QSize performCountCurrentSize(int newWidth) = 0;
 
 	void refreshMedia(Element *replacing);
+	void setTextWithLinks(
+		const TextWithEntities &text,
+		const std::vector<ClickHandlerPtr> &links = {});
 
 	struct TextWithLinks {
 		TextWithEntities text;
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index e2892d105..ad06f53c4 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1777,9 +1777,8 @@ void Message::unloadHeavyPart() {
 bool Message::showForwardsFromSender(
 		not_null<HistoryMessageForwarded*> forwarded) const {
 	const auto peer = data()->history()->peer;
-	return peer->isSelf()
-		|| peer->isRepliesChat()
-		|| forwarded->imported;
+	return !forwarded->story
+		&& (peer->isSelf() || peer->isRepliesChat() || forwarded->imported);
 }
 
 bool Message::hasFromPhoto() const {
@@ -2877,7 +2876,9 @@ bool Message::displayFromName() const {
 bool Message::displayForwardedFrom() const {
 	const auto item = data();
 	if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
-		if (showForwardsFromSender(forwarded)) {
+		if (forwarded->story) {
+			return true;
+		} else if (showForwardsFromSender(forwarded)) {
 			return false;
 		}
 		if (const auto sender = item->discussionPostOriginalSender()) {
@@ -3685,6 +3686,9 @@ bool Message::needInfoDisplay() const {
 
 bool Message::hasVisibleText() const {
 	if (data()->emptyText()) {
+		if (const auto media = data()->media()) {
+			return media->storyExpired();
+		}
 		return false;
 	}
 	const auto media = this->media();
@@ -3713,6 +3717,9 @@ void Message::refreshInfoSkipBlock() {
 	const auto media = this->media();
 	const auto hasTextSkipBlock = [&] {
 		if (item->_text.empty()) {
+			if (const auto media = data()->media()) {
+				return media->storyExpired();
+			}
 			return false;
 		} else if (item->Has<HistoryMessageLogEntryOriginal>()) {
 			return false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index efa945cc4..960a4cd16 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -72,7 +72,7 @@ Photo::Photo(
 , _spoiler(spoiler ? std::make_unique<MediaSpoiler>() : nullptr) {
 	if (const auto media = realParent->media()) {
 		if (media->storyId()) {
-			_story = true;
+			_story = 1;
 		}
 	}
 	_caption = createCaption(realParent);

From 881867186a3e0e714c9a780deb7688a11adb5386 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Jun 2023 19:51:08 +0400
Subject: [PATCH 298/676] Load more saved / archive in the viewer.

---
 .../data/data_document_resolver.cpp           |   5 +-
 Telegram/SourceFiles/data/data_stories.cpp    |   3 +-
 .../SourceFiles/data/data_stories_ids.cpp     |   4 +-
 .../admin_log/history_admin_log_inner.cpp     |   6 +-
 .../history/history_inner_widget.cpp          |   6 +-
 .../SourceFiles/history/history_widget.cpp    |   4 +-
 .../history_view_compose_controls.cpp         |   4 +-
 .../view/history_view_pinned_section.cpp      |   4 +-
 .../view/history_view_replies_section.cpp     |   7 +-
 .../view/history_view_scheduled_section.cpp   |   4 +-
 .../info/media/info_media_list_widget.cpp     |  22 +-
 .../stories/media_stories_controller.cpp      | 263 ++++++++++++++----
 .../media/stories/media_stories_controller.h  |  21 ++
 .../window/window_session_controller.cpp      |  41 +--
 .../window/window_session_controller.h        |  16 +-
 15 files changed, 301 insertions(+), 109 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index 2a03aaa7c..2839eeb76 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -254,7 +254,10 @@ void ResolveDocument(
 			&& !document->filepath().isEmpty()) {
 			File::Launch(document->location(false).fname);
 		} else if (controller) {
-			controller->openDocument(document, msgId, topicRootId, true);
+			controller->openDocument(
+				document,
+				true,
+				{ msgId, topicRootId });
 		}
 	};
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 3952f9712..dedc741f9 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1109,8 +1109,7 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 		}
 	}
 	const auto i = _all.find(id.peer);
-	Assert(i != end(_all));
-	if (i->second.readTill >= id.story) {
+	if (i == end(_all) || i->second.readTill >= id.story) {
 		return;
 	} else if (!_markReadPending.contains(id.peer)) {
 		sendMarkAsReadRequests();
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index 7506abea5..31604f2eb 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -44,7 +44,7 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 			const auto hasBefore = int(around - begin(saved->list));
 			const auto hasAfter = int(end(saved->list) - around);
 			if (hasAfter < limit) {
-				stories->savedLoadMore(peer->id);
+				//stories->savedLoadMore(peer->id);
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
@@ -116,7 +116,7 @@ rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
 			const auto hasBefore = int(i - begin(archive.list));
 			const auto hasAfter = int(end(archive.list) - i);
 			if (hasAfter < limit) {
-				stories->archiveLoadMore();
+				//stories->archiveLoadMore();
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
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 ec8f4c593..f6e5c92d5 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -610,14 +610,14 @@ void InnerWidget::elementShowPollResults(
 void InnerWidget::elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	_controller->openPhoto(photo, context, MsgId(0));
+	_controller->openPhoto(photo, { context });
 }
 
 void InnerWidget::elementOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	_controller->openDocument(document, context, MsgId(0), showInMediaView);
+	_controller->openDocument(document, showInMediaView, { context });
 }
 
 void InnerWidget::elementCancelUpload(const FullMsgId &context) {
@@ -1380,7 +1380,7 @@ void InnerWidget::openContextGif(FullMsgId itemId) {
 	if (const auto item = session().data().message(itemId)) {
 		if (const auto media = item->media()) {
 			if (const auto document = media->document()) {
-				_controller->openDocument(document, itemId, MsgId(), true);
+				_controller->openDocument(document, true, { itemId });
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 8d0d8b980..36a1a29e6 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2779,7 +2779,7 @@ void HistoryInner::openContextGif(FullMsgId itemId) {
 	if (const auto item = session().data().message(itemId)) {
 		if (const auto media = item->media()) {
 			if (const auto document = media->document()) {
-				_controller->openDocument(document, itemId, MsgId(), true);
+				_controller->openDocument(document, true, { itemId });
 			}
 		}
 	}
@@ -3376,14 +3376,14 @@ void HistoryInner::elementShowPollResults(
 void HistoryInner::elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	_controller->openPhoto(photo, context, MsgId(0));
+	_controller->openPhoto(photo, { context });
 }
 
 void HistoryInner::elementOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	_controller->openDocument(document, context, MsgId(0), showInMediaView);
+	_controller->openDocument(document, showInMediaView, { context });
 }
 
 void HistoryInner::elementCancelUpload(const FullMsgId &context) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 61c7c7237..8e50593be 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1467,9 +1467,9 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 				if (result.open) {
 					const auto request = result.result->openRequest();
 					if (const auto photo = request.photo()) {
-						controller()->openPhoto(photo, {}, {});
+						controller()->openPhoto(photo, {});
 					} else if (const auto document = request.document()) {
-						controller()->openDocument(document, {}, {});
+						controller()->openDocument(document, false, {});
 					}
 				} else {
 					sendInlineResult(result);
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 c53650919..2b5523b28 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -3059,9 +3059,9 @@ void ComposeControls::applyInlineBotQuery(
 				if (result.open) {
 					const auto request = result.result->openRequest();
 					if (const auto photo = request.photo()) {
-						_regularWindow->openPhoto(photo, {}, {});
+						_regularWindow->openPhoto(photo, {});
 					} else if (const auto document = request.document()) {
-						_regularWindow->openDocument(document, {}, {});
+						_regularWindow->openDocument(document, false, {});
 					}
 				} else {
 					_inlineResultChosen.fire_copy(result);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 2a5cd65be..263d057ff 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -643,14 +643,14 @@ void PinnedWidget::listShowPremiumToast(not_null<DocumentData*> document) {
 void PinnedWidget::listOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	controller()->openPhoto(photo, context, MsgId());
+	controller()->openPhoto(photo, { context });
 }
 
 void PinnedWidget::listOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	controller()->openDocument(document, context, MsgId(), showInMediaView);
+	controller()->openDocument(document, showInMediaView, { context });
 }
 
 void PinnedWidget::listPaintEmpty(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 4813dcc5b..65c9e503a 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -2553,14 +2553,17 @@ void RepliesWidget::listShowPremiumToast(not_null<DocumentData*> document) {
 void RepliesWidget::listOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	controller()->openPhoto(photo, context, _rootId);
+	controller()->openPhoto(photo, { context, _rootId });
 }
 
 void RepliesWidget::listOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	controller()->openDocument(document, context, _rootId, showInMediaView);
+	controller()->openDocument(
+		document,
+		showInMediaView,
+		{ context, _rootId });
 }
 
 void RepliesWidget::listPaintEmpty(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index c8966ad9c..ca5e7b8bd 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1290,14 +1290,14 @@ void ScheduledWidget::listShowPremiumToast(
 void ScheduledWidget::listOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	controller()->openPhoto(photo, context, MsgId());
+	controller()->openPhoto(photo, { context });
 }
 
 void ScheduledWidget::listOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	controller()->openDocument(document, context, MsgId(), showInMediaView);
+	controller()->openDocument(document, showInMediaView, { context });
 }
 
 void ScheduledWidget::listPaintEmpty(
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 9909cb23a..7940bca59 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer_values.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_file_origin.h"
 #include "data/data_download_manager.h"
@@ -476,18 +477,31 @@ bool ListWidget::tooltipWindowActive() const {
 }
 
 void ListWidget::openPhoto(not_null<PhotoData*> photo, FullMsgId id) {
-	_controller->parentController()->openPhoto(photo, id, topicRootId());
+	using namespace Data;
+
+	const auto tab = _controller->storiesTab();
+	const auto context = (tab == Stories::Tab::Archive)
+		? Data::StoriesContext{ Data::StoriesContextArchive() }
+		: Data::StoriesContext{ Data::StoriesContextSaved() };
+	_controller->parentController()->openPhoto(
+		photo,
+		{ id, topicRootId() },
+		_controller->storiesPeer() ? &context : nullptr);
 }
 
 void ListWidget::openDocument(
 		not_null<DocumentData*> document,
 		FullMsgId id,
 		bool showInMediaView) {
+	const auto tab = _controller->storiesTab();
+	const auto context = (tab == Stories::Tab::Archive)
+		? Data::StoriesContext{ Data::StoriesContextArchive() }
+		: Data::StoriesContext{ Data::StoriesContextSaved() };
 	_controller->parentController()->openDocument(
 		document,
-		id,
-		topicRootId(),
-		showInMediaView);
+		showInMediaView,
+		{ id, topicRootId() },
+		_controller->storiesPeer() ? &context : nullptr);
 }
 
 void ListWidget::trackSession(not_null<Main::Session*> session) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 3e6828ddf..7a187bcf8 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -48,6 +48,7 @@ constexpr auto kSiblingOutsidePart = 0.24;
 constexpr auto kSiblingUserpicSize = 0.3;
 constexpr auto kInnerHeightMultiplier = 1.6;
 constexpr auto kPreloadUsersCount = 3;
+constexpr auto kPreloadStoriesCount = 5;
 constexpr auto kMarkAsReadAfterSeconds = 1;
 constexpr auto kMarkAsReadAfterProgress = 0.2;
 
@@ -432,48 +433,142 @@ auto Controller::cachedReactionIconFactory() const
 	return _delegate->storiesCachedReactionIconFactory();
 }
 
-void Controller::show(
-		not_null<Data::Story*> story,
-		Data::StoriesContext context) {
+void Controller::rebuildFromContext(
+		not_null<UserData*> user,
+		FullStoryId storyId) {
 	using namespace Data;
 
-	auto &stories = story->owner().stories();
-	const auto storyId = story->fullId();
+	auto &stories = user->owner().stories();
+	auto list = std::optional<StoriesList>();
+	auto source = (const StoriesSource*)nullptr;
+	const auto peerId = storyId.peer;
 	const auto id = storyId.story;
-	auto source = stories.source(storyId.peer);
-	auto single = StoriesSource{ story->peer()->asUser() };
-	v::match(context.data, [&](StoriesContextSingle) {
-		source = nullptr;
+	v::match(_context.data, [&](StoriesContextSingle) {
 		hideSiblings();
 	}, [&](StoriesContextPeer) {
+		source = stories.source(peerId);
 		hideSiblings();
 	}, [&](StoriesContextSaved) {
+		if (stories.savedCountKnown(peerId)) {
+			if (const auto saved = stories.saved(peerId)) {
+				const auto &ids = saved->list;
+				const auto i = ids.find(id);
+				if (i != end(ids)) {
+					list = StoriesList{
+						.user = user,
+						.ids = *saved,
+						.total = stories.savedCount(peerId),
+					};
+					_index = int(i - begin(ids));
+					if (ids.size() < list->total
+						&& (end(ids) - i) < kPreloadStoriesCount) {
+						stories.savedLoadMore(peerId);
+					}
+				}
+			}
+		}
 		hideSiblings();
 	}, [&](StoriesContextArchive) {
+		Expects(user->isSelf());
+
+		if (stories.archiveCountKnown()) {
+			const auto &archive = stories.archive();
+			const auto &ids = archive.list;
+			const auto i = ids.find(id);
+			if (i != end(ids)) {
+				list = StoriesList{
+					.user = user,
+					.ids = archive,
+					.total = stories.archiveCount(),
+				};
+				_index = int(i - begin(ids));
+				if (ids.size() < list->total
+					&& (end(ids) - i) < kPreloadStoriesCount) {
+					stories.archiveLoadMore();
+				}
+			}
+		}
 		hideSiblings();
 	}, [&](StorySourcesList list) {
+		source = stories.source(peerId);
 		const auto &sources = stories.sources(list);
 		const auto i = ranges::find(
 			sources,
 			storyId.peer,
 			&StoriesSourceInfo::id);
-		if (i == end(sources)) {
-			source = nullptr;
-			return;
-		}
-		showSiblings(&story->session(), sources, (i - begin(sources)));
-
-		if (int(sources.end() - i) < kPreloadUsersCount) {
-			stories.loadMore(list);
+		if (i != end(sources)) {
+			showSiblings(&user->session(), sources, (i - begin(sources)));
+			if (int(sources.end() - i) < kPreloadUsersCount) {
+				stories.loadMore(list);
+			}
 		}
 	});
-	const auto idDates = story->idDates();
-	_index = source ? (source->ids.find(idDates) - begin(source->ids)) : 0;
-	if (!source || _index == source->ids.size()) {
-		source = &single;
-		single.ids.emplace(idDates);
-		_index = 0;
+	if (list) {
+		_source = std::nullopt;
+		if (_list != list) {
+			_list = std::move(list);
+		}
+	} else {
+		if (source) {
+			const auto i = source->ids.lower_bound(StoryIdDates{ id });
+			if (i != end(source->ids) && i->id == id) {
+				_index = int(i - begin(source->ids));
+			} else {
+				source = nullptr;
+			}
+		}
+		if (!source) {
+			_source = std::nullopt;
+			_list = StoriesList{
+				.user = user,
+				.ids = { { id } },
+				.total = 1,
+			};
+			_index = 0;
+		} else {
+			_list = std::nullopt;
+			if (_source != *source) {
+				_source = *source;
+			}
+		}
 	}
+	_slider->show({ .index = _index, .total = shownCount() });
+}
+
+void Controller::checkMoveByDelta() {
+	const auto index = _index + _waitingForDelta;
+	if (_waitingForDelta && shown() && index >= 0 && index < shownCount()) {
+		subjumpTo(index);
+	}
+}
+
+void Controller::show(
+		not_null<Data::Story*> story,
+		Data::StoriesContext context) {
+	auto &stories = story->owner().stories();
+	const auto storyId = story->fullId();
+	const auto user = story->peer()->asUser();
+	_context = context;
+	_waitingForId = {};
+	_waitingForDelta = 0;
+
+	rebuildFromContext(user, storyId);
+	_contextLifetime.destroy();
+	v::match(_context.data, [&](Data::StoriesContextSaved) {
+		stories.savedChanged() | rpl::filter(
+			rpl::mappers::_1 == storyId.peer
+		) | rpl::start_with_next([=] {
+			rebuildFromContext(user, storyId);
+			checkMoveByDelta();
+		}, _contextLifetime);
+	}, [&](Data::StoriesContextArchive) {
+		stories.archiveChanged(
+		) | rpl::start_with_next([=] {
+			rebuildFromContext(user, storyId);
+			checkMoveByDelta();
+		}, _contextLifetime);
+	}, [](const auto &) {});
+
 	const auto guard = gsl::finally([&] {
 		_paused = false;
 		_started = false;
@@ -483,11 +578,7 @@ void Controller::show(
 			_photoPlayback = nullptr;
 		}
 	});
-	if (_source != *source) {
-		_source = *source;
-	}
-	_context = context;
-	_waitingForId = {};
+
 	if (_shown == storyId) {
 		return;
 	}
@@ -501,13 +592,12 @@ void Controller::show(
 		unfocusReply();
 	}
 
-	_header->show({ .user = source->user, .date = story->date() });
-	_slider->show({ .index = _index, .total = int(source->ids.size()) });
-	_replyArea->show({ .user = source->user, .id = id });
+	_header->show({ .user = user, .date = story->date() });
+	_replyArea->show({ .user = user, .id = story->id() });
 	_recentViews->show({
 		.list = story->recentViewers(),
 		.total = story->views(),
-		.valid = source->user->isSelf(),
+		.valid = user->isSelf(),
 	});
 
 	const auto session = &story->session();
@@ -531,7 +621,7 @@ void Controller::show(
 	stories.loadAround(storyId, context);
 
 	updatePlayingAllowed();
-	source->user->updateFull();
+	user->updateFull();
 }
 
 void Controller::updatePlayingAllowed() {
@@ -634,23 +724,23 @@ void Controller::maybeMarkAsRead(const Player::TrackState &state) {
 }
 
 void Controller::markAsRead() {
-	Expects(_source.has_value());
+	Expects(shown());
 
 	if (_viewed) {
 		return;
 	}
 	_viewed = true;
-	_source->user->owner().stories().markAsRead(_shown, _started);
+	shownUser()->owner().stories().markAsRead(_shown, _started);
 }
 
 bool Controller::subjumpAvailable(int delta) const {
 	const auto index = _index + delta;
 	if (index < 0) {
 		return _siblingLeft && _siblingLeft->shownId().valid();
-	} else if (index >= int(_source->ids.size())) {
+	} else if (index >= shownCount()) {
 		return _siblingRight && _siblingRight->shownId().valid();
 	}
-	return index >= 0 && index < int(_source->ids.size());
+	return index >= 0 && index < shownCount();
 }
 
 bool Controller::subjumpFor(int delta) {
@@ -661,12 +751,12 @@ bool Controller::subjumpFor(int delta) {
 	if (index < 0) {
 		if (_siblingLeft && _siblingLeft->shownId().valid()) {
 			return jumpFor(-1);
-		} else if (!_source || _source->ids.empty()) {
+		} else if (!shown() || !shownCount()) {
 			return false;
 		}
 		subjumpTo(0);
 		return true;
-	} else if (index >= int(_source->ids.size())) {
+	} else if (index >= shownCount()) {
 		return _siblingRight
 			&& _siblingRight->shownId().valid()
 			&& jumpFor(1);
@@ -677,27 +767,37 @@ bool Controller::subjumpFor(int delta) {
 }
 
 void Controller::subjumpTo(int index) {
-	Expects(_source.has_value());
-	Expects(index >= 0 && index < _source->ids.size());
+	Expects(shown());
+	Expects(index >= 0 && index < shownCount());
 
+	const auto user = shownUser();
 	const auto id = FullStoryId{
-		.peer = _source->user->id,
-		.story = (begin(_source->ids) + index)->id,
+		.peer = user->id,
+		.story = shownId(index),
 	};
-	auto &stories = _source->user->owner().stories();
-	if (stories.lookup(id)) {
-		_delegate->storiesJumpTo(&_source->user->session(), id, _context);
+	auto &stories = user->owner().stories();
+	if (!id.story) {
+		const auto delta = index - _index;
+		if (_waitingForDelta != delta) {
+			_waitingForDelta = delta;
+			_waitingForId = {};
+			loadMoreToList();
+		}
+	} else if (stories.lookup(id)) {
+		_delegate->storiesJumpTo(&user->session(), id, _context);
 	} else if (_waitingForId != id) {
 		_waitingForId = id;
+		_waitingForDelta = 0;
 		stories.loadAround(id, _context);
 	}
 }
 
 void Controller::checkWaitingFor() {
 	Expects(_waitingForId.valid());
-	Expects(_source.has_value());
+	Expects(shown());
 
-	auto &stories = _source->user->owner().stories();
+	const auto user = shownUser();
+	auto &stories = user->owner().stories();
 	const auto maybe = stories.lookup(_waitingForId);
 	if (!maybe) {
 		if (maybe.error() == Data::NoStory::Deleted) {
@@ -706,7 +806,7 @@ void Controller::checkWaitingFor() {
 		return;
 	}
 	_delegate->storiesJumpTo(
-		&_source->user->session(),
+		&user->session(),
 		base::take(_waitingForId),
 		_context);
 }
@@ -721,7 +821,7 @@ bool Controller::jumpFor(int delta) {
 			return true;
 		}
 	} else if (delta == 1) {
-		if (_source && _index + 1 >= int(_source->ids.size())) {
+		if (shown() && _index + 1 >= shownCount()) {
 			markAsRead();
 		}
 		if (const auto right = _siblingRight.get()) {
@@ -817,7 +917,8 @@ Fn<void(std::vector<Data::StoryView>)> Controller::viewsGotMoreCallback() {
 	return crl::guard(&_viewsLoadGuard, [=](
 			const std::vector<Data::StoryView> &result) {
 		if (_viewsSlice.list.empty()) {
-			auto &stories = _source->user->owner().stories();
+			const auto user = shownUser();
+			auto &stories = user->owner().stories();
 			if (const auto maybeStory = stories.lookup(_shown)) {
 				_viewsSlice = {
 					.list = result,
@@ -838,12 +939,57 @@ Fn<void(std::vector<Data::StoryView>)> Controller::viewsGotMoreCallback() {
 	});
 }
 
-void Controller::refreshViewsFromData() {
-	Expects(_source.has_value());
+bool Controller::shown() const {
+	return _source || _list;
+}
 
-	auto &stories = _source->user->owner().stories();
+UserData *Controller::shownUser() const {
+	return _source
+		? _source->user.get()
+		: _list
+		? _list->user.get()
+		: nullptr;
+}
+
+int Controller::shownCount() const {
+	return _source ? int(_source->ids.size()) : _list ? _list->total : 0;
+}
+
+StoryId Controller::shownId(int index) const {
+	Expects(index >= 0 && index < shownCount());
+
+	return _source
+		? (_source->ids.begin() + index)->id
+		: (index < int(_list->ids.list.size()))
+		? *(_list->ids.list.begin() + index)
+		: StoryId();
+}
+
+void Controller::loadMoreToList() {
+	Expects(shown());
+
+	using namespace Data;
+
+	const auto user = shownUser();
+	const auto peerId = _shown.peer;
+	auto &stories = user->owner().stories();
+	v::match(_context.data, [&](StoriesContextSaved) {
+		stories.savedLoadMore(peerId);
+	}, [&](StoriesContextArchive) {
+		Expects(user->isSelf());
+
+		stories.archiveLoadMore();
+	}, [](const auto &) {
+	});
+}
+
+void Controller::refreshViewsFromData() {
+	Expects(shown());
+
+	const auto user = shownUser();
+	auto &stories = user->owner().stories();
 	const auto maybeStory = stories.lookup(_shown);
-	if (!maybeStory || !_source->user->isSelf()) {
+	if (!maybeStory || !user->isSelf()) {
 		_viewsSlice = {};
 		return;
 	}
@@ -861,11 +1007,12 @@ void Controller::refreshViewsFromData() {
 }
 
 bool Controller::sliceViewsTo(PeerId offset) {
-	Expects(_source.has_value());
+	Expects(shown());
 
-	auto &stories = _source->user->owner().stories();
+	const auto user = shownUser();
+	auto &stories = user->owner().stories();
 	const auto maybeStory = stories.lookup(_shown);
-	if (!maybeStory || !_source->user->isSelf()) {
+	if (!maybeStory || !user->isSelf()) {
 		_viewsSlice = {};
 		return true;
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 5c83202c8..277140db0 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -135,6 +135,15 @@ public:
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
+	struct StoriesList {
+		not_null<UserData*> user;
+		Data::StoriesIds ids;
+		int total = 0;
+
+		friend inline bool operator==(
+			const StoriesList &,
+			const StoriesList &) = default;
+	};
 	class PhotoPlayback;
 
 	void initLayout();
@@ -166,6 +175,14 @@ private:
 	[[nodiscard]] auto viewsGotMoreCallback()
 		-> Fn<void(std::vector<Data::StoryView>)>;
 
+	[[nodiscard]] bool shown() const;
+	[[nodiscard]] UserData *shownUser() const;
+	[[nodiscard]] int shownCount() const;
+	[[nodiscard]] StoryId shownId(int index) const;
+	void rebuildFromContext(not_null<UserData*> user, FullStoryId storyId);
+	void checkMoveByDelta();
+	void loadMoreToList();
+
 	const not_null<Delegate*> _delegate;
 
 	rpl::variable<std::optional<Layout>> _layout;
@@ -194,7 +211,9 @@ private:
 	TextWithEntities _captionText;
 	Data::StoriesContext _context;
 	std::optional<Data::StoriesSource> _source;
+	std::optional<StoriesList> _list;
 	FullStoryId _waitingForId;
+	int _waitingForDelta = 0;
 	int _index = 0;
 	bool _started = false;
 	bool _viewed = false;
@@ -211,6 +230,8 @@ private:
 	Main::Session *_session = nullptr;
 	rpl::lifetime _sessionLifetime;
 
+	rpl::lifetime _contextLifetime;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 2d447621c..c21ef8437 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2153,14 +2153,14 @@ void SessionController::hideLayer(anim::type animated) {
 
 void SessionController::openPhoto(
 		not_null<PhotoData*> photo,
-		FullMsgId contextId,
-		MsgId topicRootId) {
-	const auto item = session().data().message(contextId);
-	if (openSharedStory(item) || openFakeItemStory(contextId)) {
+		MessageContext message,
+		const Data::StoriesContext *stories) {
+	const auto item = session().data().message(message.id);
+	if (openSharedStory(item) || openFakeItemStory(message.id, stories)) {
 		return;
 	}
 	_window->openInMediaView(
-		Media::View::OpenRequest(this, photo, item, topicRootId));
+		Media::View::OpenRequest(this, photo, item, message.topicRootId));
 }
 
 void SessionController::openPhoto(
@@ -2171,18 +2171,21 @@ void SessionController::openPhoto(
 
 void SessionController::openDocument(
 		not_null<DocumentData*> document,
-		FullMsgId contextId,
-		MsgId topicRootId,
-		bool showInMediaView) {
-	const auto item = session().data().message(contextId);
-	if (openSharedStory(item) || openFakeItemStory(contextId)) {
+		bool showInMediaView,
+		MessageContext message,
+		const Data::StoriesContext *stories) {
+	const auto item = session().data().message(message.id);
+	if (openSharedStory(item) || openFakeItemStory(message.id, stories)) {
 		return;
 	} else if (showInMediaView) {
-		_window->openInMediaView(
-			Media::View::OpenRequest(this, document, item, topicRootId));
+		_window->openInMediaView(Media::View::OpenRequest(
+			this,
+			document,
+			item,
+			message.topicRootId));
 		return;
 	}
-	Data::ResolveDocument(this, document, item, topicRootId);
+	Data::ResolveDocument(this, document, item, message.topicRootId);
 }
 
 bool SessionController::openSharedStory(HistoryItem *item) {
@@ -2203,7 +2206,7 @@ bool SessionController::openSharedStory(HistoryItem *item) {
 
 bool SessionController::openFakeItemStory(
 		FullMsgId fakeItemId,
-		bool forceArchiveContext) {
+		const Data::StoriesContext *stories) {
 	if (!peerIsUser(fakeItemId.peer)
 		|| !IsStoryMsgId(fakeItemId.msg)) {
 		return false;
@@ -2215,13 +2218,11 @@ bool SessionController::openFakeItemStory(
 	if (maybeStory) {
 		using namespace Data;
 		const auto story = *maybeStory;
-		const auto context = !story->expired()
-			? StoriesContext{ StoriesContextPeer() }
-			: (story->pinned() && !forceArchiveContext)
-			? StoriesContext{ StoriesContextSaved() }
-			: StoriesContext{ StoriesContextArchive() };
+		const auto context = stories
+			? *stories
+			: StoriesContext{ StoriesContextSingle() };
 		_window->openInMediaView(
-			::Media::View::OpenRequest(this, *maybeStory, context));
+			::Media::View::OpenRequest(this, story, context));
 	}
 	return true;
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 845cdb223..4903c6be9 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -482,20 +482,24 @@ public:
 	void showPassportForm(const Passport::FormRequest &request);
 	void clearPassportForm();
 
+	struct MessageContext {
+		FullMsgId id;
+		MsgId topicRootId;
+	};
 	void openPhoto(
 		not_null<PhotoData*> photo,
-		FullMsgId contextId,
-		MsgId topicRootId);
+		MessageContext message,
+		const Data::StoriesContext *stories = nullptr);
 	void openPhoto(not_null<PhotoData*> photo, not_null<PeerData*> peer);
 	void openDocument(
 		not_null<DocumentData*> document,
-		FullMsgId contextId,
-		MsgId topicRootId,
-		bool showInMediaView = false);
+		bool showInMediaView,
+		MessageContext message,
+		const Data::StoriesContext *stories = nullptr);
 	bool openSharedStory(HistoryItem *item);
 	bool openFakeItemStory(
 		FullMsgId fakeItemId,
-		bool forceArchiveContext = false);
+		const Data::StoriesContext *stories = nullptr);
 
 	void showChooseReportMessages(
 		not_null<PeerData*> peer,

From cdb5f4dc1ed9970bfc778ca10da3db361a23f486 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Jun 2023 22:07:29 +0400
Subject: [PATCH 299/676] Update API scheme on layer 160.

---
 Telegram/SourceFiles/data/data_file_origin.cpp | 6 +++++-
 Telegram/SourceFiles/data/data_session.cpp     | 2 ++
 Telegram/SourceFiles/data/data_stories.cpp     | 4 ++--
 Telegram/SourceFiles/mtproto/scheme/api.tl     | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index ead9b1729..d37663208 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -53,7 +53,11 @@ struct FileReferenceAccumulator {
 		push(data.data().vdocument());
 	}
 	void push(const MTPWebPageAttribute &data) {
-		push(data.data().vdocuments());
+		data.match([&](const MTPDwebPageAttributeStory &data) {
+			push(data.vstory());
+		}, [&](const MTPDwebPageAttributeTheme &data) {
+			push(data.vdocuments());
+		});
 	}
 	void push(const MTPWebPage &data) {
 		data.match([&](const MTPDwebPage &data) {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 952f1e0fe..ebc7ef8ee 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3311,6 +3311,8 @@ void Session::webpageApplyFields(
 				const auto result = attribute.match([&](
 						const MTPDwebPageAttributeTheme &data) {
 					return lookupInAttribute(data);
+				}, [&](const MTPDwebPageAttributeStory &data) {
+					return (DocumentData*)nullptr;
 				});
 				if (result) {
 					return result;
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index dedc741f9..d36404bba 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -43,8 +43,8 @@ constexpr auto kSavedPerPage = 100;
 using UpdateFlag = StoryUpdate::Flag;
 
 [[nodiscard]] std::optional<StoryMedia> ParseMedia(
-	not_null<Session*> owner,
-	const MTPMessageMedia &media) {
+		not_null<Session*> owner,
+		const MTPMessageMedia &media) {
 	return media.match([&](const MTPDmessageMediaPhoto &data)
 		-> std::optional<StoryMedia> {
 		if (const auto photo = data.vphoto()) {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a916847ce..e3bcb489f 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1195,6 +1195,7 @@ inputThemeSettings#8fde504f flags:# message_colors_animated:flags.2?true base_th
 themeSettings#fa58b6d4 flags:# message_colors_animated:flags.2?true base_theme:BaseTheme accent_color:int outbox_accent_color:flags.3?int message_colors:flags.0?Vector<int> wallpaper:flags.1?WallPaper = ThemeSettings;
 
 webPageAttributeTheme#54b56617 flags:# documents:flags.0?Vector<Document> settings:flags.1?ThemeSettings = WebPageAttribute;
+webPageAttributeStory#939a4671 flags:# user_id:long id:int story:flags.0?StoryItem = WebPageAttribute;
 
 messages.votesList#4899484e flags:# count:int votes:Vector<MessagePeerVote> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?string = messages.VotesList;
 
@@ -1529,7 +1530,7 @@ storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long>
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#693206a2 id:int date:int expire_date:int = StoryItem;
-storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
@@ -2095,6 +2096,7 @@ stories.getUserStories#96d528e0 user_id:InputUser = stories.UserStories;
 stories.getPinnedStories#b471137 user_id:InputUser offset_id:int limit:int = stories.Stories;
 stories.getStoriesArchive#1f5bc5d2 offset_id:int limit:int = stories.Stories;
 stories.getStoriesByID#6a15cf46 user_id:InputUser id:Vector<int> = stories.Stories;
+stories.toggleAllStoriesHidden#7c2557c4 hidden:Bool = Bool;
 stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
 stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
 stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;

From 41eac3692ccb3face37a886b49be92449f479c62 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 14 Jun 2023 21:31:23 +0400
Subject: [PATCH 300/676] Correctly show views count without viewers.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 24 ++++++-----
 .../stories/media_stories_recent_views.cpp    | 42 ++++++++++++-------
 .../stories/media_stories_recent_views.h      |  2 +
 .../ui/chat/group_call_userpics.cpp           | 16 ++++---
 .../SourceFiles/ui/chat/group_call_userpics.h |  1 +
 5 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index d36404bba..12f4b33a7 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -313,15 +313,17 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 			&owner().session(),
 			data.ventities().value_or_empty()),
 	};
-	auto views = 0;
+	auto views = -1;
 	auto recent = std::vector<not_null<PeerData*>>();
-	if (const auto info = data.vviews()) {
-		views = info->data().vviews_count().v;
-		if (const auto list = info->data().vrecent_viewers()) {
-			recent.reserve(list->v.size());
-			auto &owner = _peer->owner();
-			for (const auto &id : list->v) {
-				recent.push_back(owner.peer(peerFromUser(id)));
+	if (!data.is_min()) {
+		if (const auto info = data.vviews()) {
+			views = info->data().vviews_count().v;
+			if (const auto list = info->data().vrecent_viewers()) {
+				recent.reserve(list->v.size());
+				auto &owner = _peer->owner();
+				for (const auto &id : list->v) {
+					recent.push_back(owner.peer(peerFromUser(id)));
+				}
 			}
 		}
 	}
@@ -331,7 +333,7 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 		|| (_isPublic != isPublic)
 		|| (_closeFriends != closeFriends)
 		|| (_caption != caption)
-		|| (_views != views)
+		|| (views >= 0 && _views != views)
 		|| (_recentViewers != recent);
 	if (!changed) {
 		return false;
@@ -341,7 +343,9 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	_isPublic = isPublic;
 	_closeFriends = closeFriends;
 	_caption = std::move(caption);
-	_views = views;
+	if (views >= 0) {
+		_views = views;
+	}
 	_recentViewers = std::move(recent);
 	return true;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 98f8ca9a8..cb6077bf2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -150,15 +150,41 @@ void RecentViews::show(RecentViewsData data) {
 	if (usersChanged) {
 		updateUserpics();
 	}
+	refreshClickHandler();
+}
+
+void RecentViews::refreshClickHandler() {
+	const auto nowEmpty = _data.list.empty();
+	const auto wasEmpty = !_clickHandlerLifetime;
+	const auto raw = _widget.get();
+	if (wasEmpty == nowEmpty) {
+		return;
+	} else if (nowEmpty) {
+		_clickHandlerLifetime.destroy();
+	} else {
+		_clickHandlerLifetime = raw->events(
+		) | rpl::filter([=](not_null<QEvent*> e) {
+			return (_data.total > 0)
+				&& (e->type() == QEvent::MouseButtonPress)
+				&& (static_cast<QMouseEvent*>(e.get())->button()
+					== Qt::LeftButton);
+		}) | rpl::start_with_next([=] {
+			showMenu();
+		});
+	}
+	raw->setCursor(_clickHandlerLifetime
+		? style::cur_pointer
+		: style::cur_default);
 }
 
 void RecentViews::updateUserpics() {
 	_userpicsLifetime = ContentByUsers(
 		_data.list
 	) | rpl::start_with_next([=](
-		const std::vector<Ui::GroupCallUser> &list) {
+			const std::vector<Ui::GroupCallUser> &list) {
 		_userpics->update(list, true);
 	});
+	_userpics->finishAnimating();
 }
 
 void RecentViews::setupUserpics() {
@@ -201,18 +227,6 @@ void RecentViews::setupWidget() {
 			_textPosition.y(),
 			raw->width() - _userpicsWidth - st::storiesRecentViewsSkip);
 	}, raw->lifetime());
-
-	raw->events(
-	) | rpl::filter([=](not_null<QEvent*> e) {
-		return (_data.total > 0)
-			&& (e->type() == QEvent::MouseButtonPress)
-			&& (static_cast<QMouseEvent*>(e.get())->button()
-				== Qt::LeftButton);
-	}) | rpl::start_with_next([=] {
-		showMenu();
-	}, raw->lifetime());
-
-	raw->setCursor(style::cur_pointer);
 }
 
 void RecentViews::updatePartsGeometry() {
@@ -242,7 +256,7 @@ void RecentViews::updateText() {
 }
 
 void RecentViews::showMenu() {
-	if (_menu) {
+	if (_menu || _data.list.empty()) {
 		return;
 	}
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
index 79b4ee3fc..2ecddf4ac 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
@@ -70,6 +70,7 @@ private:
 	void addMenuRowPlaceholder();
 	void rebuildMenuTail();
 	void subscribeToMenuUserpicsLoading(not_null<Main::Session*> session);
+	void refreshClickHandler();
 
 	const not_null<Controller*> _controller;
 
@@ -88,6 +89,7 @@ private:
 	rpl::variable<bool> _shortAnimationPlaying;
 	bool _waitingUserpicsCheck = false;
 	rpl::lifetime _waitingForUserpicsLifetime;
+	rpl::lifetime _clickHandlerLifetime;
 
 	QRect _outer;
 	QPoint _userpicsPosition;
diff --git a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
index b5aadd41e..3c2ad72b9 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
@@ -348,11 +348,17 @@ void GroupCallUserpics::update(
 		_speakingAnimation.start();
 	}
 
-	if (!visible) {
-		for (auto &userpic : _list) {
-			userpic.shownAnimation.stop();
-			userpic.leftAnimation.stop();
-		}
+	if (visible) {
+		recountAndRepaint();
+	} else {
+		finishAnimating();
+	}
+}
+
+void GroupCallUserpics::finishAnimating() {
+	for (auto &userpic : _list) {
+		userpic.shownAnimation.stop();
+		userpic.leftAnimation.stop();
 	}
 	recountAndRepaint();
 }
diff --git a/Telegram/SourceFiles/ui/chat/group_call_userpics.h b/Telegram/SourceFiles/ui/chat/group_call_userpics.h
index 326992d3d..d9be41fd4 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_userpics.h
+++ b/Telegram/SourceFiles/ui/chat/group_call_userpics.h
@@ -34,6 +34,7 @@ public:
 		const std::vector<GroupCallUser> &users,
 		bool visible);
 	void paint(QPainter &p, int x, int y, int size);
+	void finishAnimating();
 
 	[[nodiscard]] int maxWidth() const;
 	[[nodiscard]] rpl::producer<int> widthValue() const;

From ff835ec76ce2d0d60ef02ff74f6a95866c6cae08 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Jun 2023 16:26:49 +0400
Subject: [PATCH 301/676] Show animation on story reaction sending.

---
 .../history_view_reactions_selector.cpp       | 19 ++++++++
 .../history_view_reactions_selector.h         |  1 +
 .../stories/media_stories_controller.cpp      | 46 +++++++++++++++++--
 .../media/stories/media_stories_controller.h  |  8 ++++
 .../media/stories/media_stories_reactions.cpp |  2 +-
 .../media/stories/media_stories_reactions.h   |  6 ++-
 .../ui/effects/reaction_fly_animation.cpp     | 24 +++++++++-
 .../ui/effects/reaction_fly_animation.h       |  2 +
 8 files changed, 100 insertions(+), 8 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 fa0dec3f9..4aa2370a8 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "history/history_item.h"
 #include "data/data_document.h"
+#include "data/data_document_media.h"
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "main/main_session.h"
@@ -667,12 +668,30 @@ ChosenReaction Selector::lookupChosen(const Data::ReactionId &id) const {
 	return result;
 }
 
+void Selector::preloadAllRecentsAnimations() {
+	const auto preload = [&](DocumentData *document) {
+		const auto view = document
+			? document->activeMediaView()
+			: nullptr;
+		if (view) {
+			view->checkStickerLarge();
+		}
+	};
+	for (const auto &reaction : _reactions.recent) {
+		if (!reaction.id.custom()) {
+			preload(reaction.centerIcon);
+		}
+		preload(reaction.aroundAnimation);
+	}
+}
+
 void Selector::expand() {
 	if (_expandScheduled) {
 		return;
 	}
 	_expandScheduled = true;
 	_willExpand.fire({});
+	preloadAllRecentsAnimations();
 	const auto parent = parentWidget()->geometry();
 	const auto extents = extentsForShadow();
 	const auto heightLimit = _reactions.customAllowed
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 648fe4adb..b47dfa2d8 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -131,6 +131,7 @@ private:
 	void createList();
 	void finishExpand();
 	ChosenReaction lookupChosen(const Data::ReactionId &id) const;
+	void preloadAllRecentsAnimations();
 
 	const style::EmojiPan &_st;
 	const std::shared_ptr<ChatHelpers::Show> _show;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 7a187bcf8..1a519058b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -11,11 +11,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/power_save_blocker.h"
 #include "base/qt_signal_producer.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_file_origin.h"
+#include "data/data_message_reactions.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
+#include "history/view/reactions/history_view_reactions_strip.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_caption_full_view.h"
 #include "media/stories/media_stories_delegate.h"
@@ -28,8 +31,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_share.h"
 #include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
-#include "ui/rp_widget.h"
+#include "ui/effects/emoji_fly_animation.h"
+#include "ui/effects/message_sending_animation_common.h"
+#include "ui/effects/reaction_fly_animation.h"
 #include "ui/layers/box_content.h"
+#include "ui/rp_widget.h"
 #include "styles/style_media_view.h"
 #include "styles/style_widgets.h"
 #include "styles/style_boxes.h" // UserpicButton
@@ -171,8 +177,14 @@ Controller::Controller(not_null<Delegate*> delegate)
 	}, _lifetime);
 
 	_reactions->chosen(
-	) | rpl::start_with_next([=](const Data::ReactionId &id) {
-		_replyArea->sendReaction(id);
+	) | rpl::start_with_next([=](HistoryView::Reactions::ChosenReaction id) {
+		startReactionAnimation(id.id, {
+			.type = Ui::MessageSendingAnimationFrom::Type::Emoji,
+			.globalStartGeometry = id.globalGeometry,
+			.frame = id.icon,
+		});
+		_replyArea->sendReaction(id.id);
+		unfocusReply();
 	}, _lifetime);
 
 	_delegate->storiesLayerShown(
@@ -1062,4 +1074,32 @@ void Controller::updatePowerSaveBlocker(const Player::TrackState &state) {
 		[=] { return _wrap->window()->windowHandle(); });
 }
 
+void Controller::startReactionAnimation(
+		Data::ReactionId id,
+		Ui::MessageSendingAnimationFrom from) {
+	Expects(shown());
+
+	auto args = Ui::ReactionFlyAnimationArgs{
+		.id = id,
+		.flyIcon = from.frame,
+		.flyFrom = _wrap->mapFromGlobal(from.globalStartGeometry),
+		.scaleOutDuration = st::fadeWrapDuration * 2,
+	};
+	_reactionAnimation = std::make_unique<Ui::EmojiFlyAnimation>(
+		_wrap,
+		&shownUser()->owner().reactions(),
+		std::move(args),
+		[=] { _reactionAnimation->repaint(); },
+		Data::CustomEmojiSizeTag::Isolated);
+	const auto layer = _reactionAnimation->layer();
+	_wrap->paintRequest() | rpl::start_with_next([=] {
+		if (!_reactionAnimation->paintBadgeFrame(_wrap.get())) {
+			InvokeQueued(layer, [=] {
+				_reactionAnimation = nullptr;
+				_wrap->update();
+			});
+		}
+	}, layer->lifetime());
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 277140db0..74dde653b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -21,6 +21,7 @@ struct FileChosen;
 
 namespace Data {
 struct FileOrigin;
+struct ReactionId;
 } // namespace Data
 
 namespace HistoryView::Reactions {
@@ -29,6 +30,8 @@ class CachedIconFactory;
 
 namespace Ui {
 class RpWidget;
+struct MessageSendingAnimationFrom;
+class EmojiFlyAnimation;
 } // namespace Ui
 
 namespace Main {
@@ -183,6 +186,10 @@ private:
 	void checkMoveByDelta();
 	void loadMoreToList();
 
+	void startReactionAnimation(
+		Data::ReactionId id,
+		Ui::MessageSendingAnimationFrom from);
+
 	const not_null<Delegate*> _delegate;
 
 	rpl::variable<std::optional<Layout>> _layout;
@@ -226,6 +233,7 @@ private:
 	std::unique_ptr<Sibling> _siblingRight;
 
 	std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
+	std::unique_ptr<Ui::EmojiFlyAnimation> _reactionAnimation;
 
 	Main::Session *_session = nullptr;
 	rpl::lifetime _sessionLifetime;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index d77e8274e..fb94bc026 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -143,7 +143,7 @@ void Reactions::create() {
 	_selector->chosen(
 	) | rpl::start_with_next([=](
 			HistoryView::Reactions::ChosenReaction reaction) {
-		_chosen.fire_copy(reaction.id);
+		_chosen.fire_copy(reaction);
 		hide();
 	}, _selector->lifetime());
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.h b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
index 1be44b34a..ca2200d7e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
@@ -15,6 +15,7 @@ struct ReactionId;
 
 namespace HistoryView::Reactions {
 class Selector;
+struct ChosenReaction;
 } // namespace HistoryView::Reactions
 
 namespace Ui {
@@ -30,10 +31,11 @@ public:
 	explicit Reactions(not_null<Controller*> controller);
 	~Reactions();
 
+	using Chosen = HistoryView::Reactions::ChosenReaction;
 	[[nodiscard]] rpl::producer<bool> expandedValue() const {
 		return _expanded.value();
 	}
-	[[nodiscard]] rpl::producer<Data::ReactionId> chosen() const {
+	[[nodiscard]] rpl::producer<Chosen> chosen() const {
 		return _chosen.events();
 	}
 
@@ -54,7 +56,7 @@ private:
 	std::unique_ptr<Ui::RpWidget> _parent;
 	std::unique_ptr<HistoryView::Reactions::Selector> _selector;
 	std::vector<std::unique_ptr<Hiding>> _hiding;
-	rpl::event_stream<Data::ReactionId> _chosen;
+	rpl::event_stream<Chosen> _chosen;
 	Ui::Animations::Simple _showing;
 	rpl::variable<float64> _shownValue;
 	rpl::variable<bool> _expanded;
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
index 44c7686c6..361eb3b7b 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
@@ -67,7 +67,8 @@ ReactionFlyAnimation::ReactionFlyAnimation(
 	Data::CustomEmojiSizeTag customSizeTag)
 : _owner(owner)
 , _repaint(std::move(repaint))
-, _flyFrom(args.flyFrom) {
+, _flyFrom(args.flyFrom)
+, _scaleOutDuration(args.scaleOutDuration) {
 	const auto &list = owner->list(::Data::Reactions::Type::All);
 	auto centerIcon = (DocumentData*)nullptr;
 	auto aroundAnimation = (DocumentData*)nullptr;
@@ -135,7 +136,26 @@ QRect ReactionFlyAnimation::paintGetArea(
 		const QColor &colored,
 		QRect clip,
 		crl::time now) const {
-	if (_flyIcon.isNull()) {
+	const auto scale = [&] {
+		const auto rate = _effect ? _effect->frameRate() : 0.;
+		if (!_scaleOutDuration || !rate) {
+			return 1.;
+		}
+		const auto left = _effect->framesCount() - _effect->frameIndex();
+		const auto duration = left * 1000. / rate;
+		return (duration < _scaleOutDuration)
+			? (duration / double(_scaleOutDuration))
+			: 1.;
+	}();
+	if (scale < 1.) {
+		const auto delta = ((1. - scale) / 2.) * target.size();
+		target = QRect(
+			target.topLeft() + QPoint(delta.width(), delta.height()),
+			target.size() * scale);
+	}
+	if (!_valid) {
+		return QRect();
+	} else if (_flyIcon.isNull()) {
 		const auto wide = QRect(
 			target.topLeft() - QPoint(target.width(), target.height()) / 2,
 			target.size() * 2);
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
index 6092d46c1..595e11e86 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
@@ -27,6 +27,7 @@ struct ReactionFlyAnimationArgs {
 	::Data::ReactionId id;
 	QImage flyIcon;
 	QRect flyFrom;
+	crl::time scaleOutDuration = 0;
 
 	[[nodiscard]] ReactionFlyAnimationArgs translated(QPoint point) const;
 };
@@ -102,6 +103,7 @@ private:
 	QRect _flyFrom;
 	float64 _centerSizeMultiplier = 0.;
 	int _customSize = 0;
+	crl::time _scaleOutDuration = 0;
 	bool _valid = false;
 
 	mutable Parabolic _cached;

From ad5b96b049d103ae682366053fa4f213de584006 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Jun 2023 20:28:53 +0400
Subject: [PATCH 302/676] Show toasts on reply / archive / unarchive.

---
 Telegram/Resources/langs/lang.strings         |  3 +++
 .../boxes/peer_list_controllers.cpp           |  3 ++-
 Telegram/SourceFiles/data/data_stories.cpp    | 26 +++++++++++++------
 Telegram/SourceFiles/data/data_stories.h      |  9 ++++++-
 .../dialogs/dialogs_inner_widget.cpp          |  3 ++-
 .../media/stories/media_stories_reply.cpp     | 15 ++++++++---
 .../media/stories/media_stories_reply.h       |  7 +++--
 7 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9a0a660b4..982160f60 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3811,6 +3811,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_my_title" = "My Stories";
 "lng_stories_archive_button" = "Archive";
 "lng_stories_archive_title" = "Stories Archive";
+"lng_stories_reply_sent" = "Message Sent";
+"lng_stories_hidden_to_contacts" = "Those stories are now shown only in your Contacts list.";
+"lng_stories_shown_in_chats" = "Those stories are now shown in your Chats list.";
 
 "lng_stories_link_invalid" = "This link is broken or has expired.";
 
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 86150e820..9e6e2e146 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -108,7 +108,8 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
 			sessionController->session().data().stories().toggleHidden(
 				PeerId(int64(request.id)),
-				!request.shown);
+				!request.shown,
+				sessionController->uiShow());
 		}, raw->lifetime());
 
 		raw->loadMoreRequests(
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 12f4b33a7..a0560e565 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -16,16 +16,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
 #include "data/data_photo.h"
-#include "data/data_session.h"
-#include "lang/lang_keys.h"
-#include "main/main_session.h"
-#include "ui/text/text_utilities.h"
-
-// #TODO stories testing
 #include "data/data_user.h"
+#include "data/data_session.h"
+#include "data/data_thread.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "storage/storage_shared_media.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/layers/show.h"
+#include "ui/text/text_utilities.h"
 
 namespace Data {
 namespace {
@@ -1140,7 +1139,10 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 	_markReadTimer.callOnce(kMarkAsReadDelay);
 }
 
-void Stories::toggleHidden(PeerId peerId, bool hidden) {
+void Stories::toggleHidden(
+		PeerId peerId,
+		bool hidden,
+		std::shared_ptr<Ui::Show> show) {
 	const auto user = _owner->peer(peerId)->asUser();
 	Assert(user != nullptr);
 	if (user->hasStoriesHidden() != hidden) {
@@ -1153,6 +1155,14 @@ void Stories::toggleHidden(PeerId peerId, bool hidden) {
 		)).send();
 	}
 
+	const auto guard = gsl::finally([&] {
+		if (show) {
+			show->showToast(hidden
+				? tr::lng_stories_hidden_to_contacts(tr::now)
+				: tr::lng_stories_shown_in_chats(tr::now));
+		}
+	});
+
 	const auto i = _all.find(peerId);
 	if (i == end(_all)) {
 		return;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 8fc341076..74cffd64b 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -21,6 +21,10 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Ui {
+class Show;
+} // namespace Ui
+
 namespace Data {
 
 class Session;
@@ -251,7 +255,10 @@ public:
 	[[nodiscard]] bool isQuitPrevent();
 	void markAsRead(FullStoryId id, bool viewed);
 
-	void toggleHidden(PeerId peerId, bool hidden);
+	void toggleHidden(
+		PeerId peerId,
+		bool hidden,
+		std::shared_ptr<Ui::Show> show);
 
 	static constexpr auto kViewsPerPage = 50;
 	void loadViewsSlice(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index cb559842e..22ac09842 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -353,7 +353,8 @@ InnerWidget::InnerWidget(
 	) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
 		session().data().stories().toggleHidden(
 			PeerId(int64(request.id)),
-			!request.shown);
+			!request.shown,
+			_controller->uiShow());
 	}, lifetime());
 
 	_stories->loadMoreRequests(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index becd18b49..9d7f24715 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -122,7 +122,7 @@ void ReplyArea::sendReaction(const Data::ReactionId &id) {
 		}
 	}
 	if (!message.textWithTags.empty()) {
-		send(std::move(message), {});
+		send(std::move(message), {}, true);
 	}
 }
 
@@ -136,7 +136,10 @@ void ReplyArea::send(Api::SendOptions options) {
 	send(std::move(message), options);
 }
 
-void ReplyArea::send(Api::MessageToSend message, Api::SendOptions options) {
+void ReplyArea::send(
+		Api::MessageToSend message,
+		Api::SendOptions options,
+		bool skipToast) {
 	const auto error = GetErrorTextForSending(
 		_data.user,
 		{
@@ -151,7 +154,7 @@ void ReplyArea::send(Api::MessageToSend message, Api::SendOptions options) {
 	session().api().sendMessage(std::move(message));
 
 	_controls->clear();
-	finishSending();
+	finishSending(skipToast);
 }
 
 void ReplyArea::sendVoice(VoiceToSend &&data) {
@@ -256,9 +259,13 @@ void ReplyArea::sendInlineResult(
 	finishSending();
 }
 
-void ReplyArea::finishSending() {
+void ReplyArea::finishSending(bool skipToast) {
 	_controls->hidePanelsAnimated();
 	_controller->wrap()->setFocus();
+	if (!skipToast) {
+		_controller->uiShow()->showToast(
+			tr::lng_stories_reply_sent(tr::now));
+	}
 }
 
 void ReplyArea::uploadFile(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 4dcd84013..5853ffc0e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -73,7 +73,10 @@ private:
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] not_null<History*> history() const;
 
-	void send(Api::MessageToSend message, Api::SendOptions options);
+	void send(
+		Api::MessageToSend message,
+		Api::SendOptions options,
+		bool skipToast = false);
 
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 	bool confirmSendingFiles(
@@ -98,7 +101,7 @@ private:
 		TextWithTags &&caption,
 		Api::SendOptions options,
 		bool ctrlShiftEnter);
-	void finishSending();
+	void finishSending(bool skipToast = false);
 
 	void sendExistingDocument(not_null<DocumentData*> document);
 	bool sendExistingDocument(

From a2bf0fc51197f56336d5eb988176478e6e769739 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Jun 2023 13:34:08 +0400
Subject: [PATCH 303/676] Show unsupported stories with an Update button.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../SourceFiles/data/data_media_types.cpp     |  7 ++-
 Telegram/SourceFiles/data/data_media_types.h  |  5 ++
 Telegram/SourceFiles/data/data_stories.cpp    | 13 +++-
 Telegram/SourceFiles/data/data_stories.h      |  6 +-
 Telegram/SourceFiles/history/history_item.cpp |  8 ++-
 .../info/stories/info_stories_provider.cpp    |  6 ++
 .../stories/media_stories_controller.cpp      | 61 ++++++++++++++++++-
 .../media/stories/media_stories_controller.h  |  2 +
 .../media/stories/media_stories_sibling.cpp   | 19 ++++--
 .../media/stories/media_stories_sibling.h     |  1 +
 .../SourceFiles/media/view/media_view.style   | 11 ++++
 .../media/view/media_view_overlay_widget.cpp  | 18 +++---
 13 files changed, 138 insertions(+), 20 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 982160f60..ad8e9037d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3807,6 +3807,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_views#one" = "{count} view";
 "lng_stories_views#other" = "{count} views";
 "lng_stories_no_views" = "No views";
+"lng_stories_unsupported" = "This story is not supported\nby your version of Telegram.";
 
 "lng_stories_my_title" = "My Stories";
 "lng_stories_archive_button" = "Archive";
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index cd9d863dc..8cdaebc25 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -2039,6 +2039,11 @@ bool MediaStory::updateSentMedia(const MTPMessageMedia &media) {
 	return false;
 }
 
+not_null<PhotoData*> MediaStory::LoadingStoryPhoto(
+		not_null<Session*> owner) {
+	return owner->photo(kLoadingStoryPhotoId);
+}
+
 std::unique_ptr<HistoryView::Media> MediaStory::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
@@ -2055,7 +2060,7 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 		return std::make_unique<HistoryView::Photo>(
 			message,
 			realParent,
-			realParent->history()->owner().photo(kLoadingStoryPhotoId),
+			LoadingStoryPhoto(&realParent->history()->owner()),
 			spoiler);
 	}
 	_expired = false;
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 0ba84e928..a77e26e46 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -38,6 +38,7 @@ namespace Data {
 
 class CloudImage;
 class WallPaper;
+class Session;
 
 enum class CallFinishReason : char {
 	Missed,
@@ -59,6 +60,7 @@ struct Call {
 	int duration = 0;
 	FinishReason finishReason = FinishReason::Missed;
 	bool video = false;
+
 };
 
 struct ExtendedPreview {
@@ -587,6 +589,9 @@ public:
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing = nullptr) override;
 
+	[[nodiscard]] static not_null<PhotoData*> LoadingStoryPhoto(
+		not_null<Session*> owner);
+
 private:
 	const FullStoryId _storyId;
 	bool _expired = false;
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index a0560e565..0cf32566d 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -63,6 +63,8 @@ using UpdateFlag = StoryUpdate::Flag;
 			}
 		}
 		return {};
+	}, [&](const MTPDmessageMediaUnsupported &data) {
+		return std::make_optional(StoryMedia{ v::null });
 	}, [](const auto &) { return std::optional<StoryMedia>(); });
 }
 
@@ -135,6 +137,10 @@ bool Story::expired(TimeId now) const {
 	return _expires <= (now ? now : base::unixtime::now());
 }
 
+bool Story::unsupported() const {
+	return v::is_null(_media.data);
+}
+
 const StoryMedia &Story::media() const {
 	return _media;
 }
@@ -154,6 +160,8 @@ bool Story::hasReplyPreview() const {
 		return !photo->isNull();
 	}, [](not_null<DocumentData*> document) {
 		return document->hasThumbnail();
+	}, [](v::null_t) {
+		return false;
 	});
 }
 
@@ -168,6 +176,8 @@ Image *Story::replyPreview() const {
 			Data::FileOriginStory(_peer->id, _id),
 			_peer,
 			false);
+	}, [](v::null_t) {
+		return (Image*)nullptr;
 	});
 }
 
@@ -246,7 +256,8 @@ void Story::setCaption(TextWithEntities &&caption) {
 }
 
 const TextWithEntities &Story::caption() const {
-	return _caption;
+	static const auto empty = TextWithEntities();
+	return unsupported() ? empty : _caption;
 }
 
 void Story::setViewsData(
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 74cffd64b..c136bff5c 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -55,7 +55,10 @@ struct StoriesIds {
 };
 
 struct StoryMedia {
-	std::variant<not_null<PhotoData*>, not_null<DocumentData*>> data;
+	std::variant<
+		v::null_t,
+		not_null<PhotoData*>,
+		not_null<DocumentData*>> data;
 
 	friend inline bool operator==(StoryMedia, StoryMedia) = default;
 };
@@ -86,6 +89,7 @@ public:
 	[[nodiscard]] FullStoryId fullId() const;
 	[[nodiscard]] TimeId date() const;
 	[[nodiscard]] TimeId expires() const;
+	[[nodiscard]] bool unsupported() const;
 	[[nodiscard]] bool expired(TimeId now = 0) const;
 	[[nodiscard]] const StoryMedia &media() const;
 	[[nodiscard]] PhotoData *photo() const;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 2e73286a8..3fb9ab309 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -685,7 +685,10 @@ HistoryItem::HistoryItem(
 : id(StoryIdToMsgId(story->id()))
 , _history(history)
 , _from(history->peer)
-, _flags(MessageFlag::Local | MessageFlag::Outgoing | MessageFlag::FakeHistoryItem | MessageFlag::StoryItem)
+, _flags(MessageFlag::Local
+	| MessageFlag::Outgoing
+	| MessageFlag::FakeHistoryItem
+	| MessageFlag::StoryItem)
 , _date(story->date()) {
 	setStoryFields(story);
 }
@@ -1522,8 +1525,7 @@ void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
 	const auto spoiler = false;
 	if (const auto photo = story->photo()) {
 		_media = std::make_unique<Data::MediaPhoto>(this, photo, spoiler);
-	} else {
-		const auto document = story->document();
+	} else if (const auto document = story->document()) {
 		_media = std::make_unique<Data::MediaFile>(
 			this,
 			document,
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index bd5d88f93..388602347 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -302,6 +302,12 @@ std::unique_ptr<BaseLayout> Provider::createLayout(
 		return std::make_unique<Photo>(delegate, item, photo, spoiler);
 	} else if (const auto file = getFile()) {
 		return std::make_unique<Video>(delegate, item, file, spoiler);
+	} else {
+		return std::make_unique<Photo>(
+			delegate,
+			item,
+			Data::MediaStory::LoadingStoryPhoto(&item->history()->owner()),
+			spoiler);
 	}
 	return nullptr;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 1a519058b..f6f70098c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/power_save_blocker.h"
 #include "base/qt_signal_producer.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "core/update_checker.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_file_origin.h"
@@ -19,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_stories.h"
 #include "data/data_user.h"
 #include "history/view/reactions/history_view_reactions_strip.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_caption_full_view.h"
 #include "media/stories/media_stories_delegate.h"
@@ -35,6 +37,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/message_sending_animation_common.h"
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/layers/box_content.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 #include "ui/rp_widget.h"
 #include "styles/style_media_view.h"
 #include "styles/style_widgets.h"
@@ -78,6 +82,19 @@ private:
 
 };
 
+class Controller::Unsupported final {
+public:
+	explicit Unsupported(not_null<Controller*> controller);
+
+private:
+	void setup();
+
+	const not_null<Controller*> _controller;
+	std::unique_ptr<Ui::FlatLabel> _text;
+	std::unique_ptr<Ui::RoundButton> _button;
+
+};
+
 Controller::PhotoPlayback::PhotoPlayback(not_null<Controller*> controller)
 : _controller(controller)
 , _timer([=] { callback(); })
@@ -129,6 +146,42 @@ void Controller::PhotoPlayback::callback() {
 	});
 }
 
+Controller::Unsupported::Unsupported(not_null<Controller*> controller)
+: _controller(controller) {
+	setup();
+}
+
+void Controller::Unsupported::setup() {
+	const auto wrap = _controller->wrap();
+
+	_text = std::make_unique<Ui::FlatLabel>(
+		wrap,
+		tr::lng_stories_unsupported(),
+		st::storiesUnsupportedLabel);
+	_text->show();
+
+	_button = std::make_unique<Ui::RoundButton>(
+		wrap,
+		tr::lng_update_telegram(),
+		st::storiesUnsupportedUpdate);
+	_button->show();
+
+	rpl::combine(
+		wrap->sizeValue(),
+		_text->sizeValue(),
+		_button->sizeValue()
+	) | rpl::start_with_next([=](QSize wrap, QSize text, QSize button) {
+		_text->move((wrap.width() - text.width()) / 2, wrap.height() / 3);
+		_button->move(
+			(wrap.width() - button.width()) / 2,
+			2 * wrap.height() / 3);
+	}, _button->lifetime());
+
+	_button->setClickedCallback([=] {
+		Core::UpdateApplication();
+	});
+}
+
 Controller::Controller(not_null<Delegate*> delegate)
 : _delegate(delegate)
 , _wrap(_delegate->storiesWrap())
@@ -584,13 +637,19 @@ void Controller::show(
 	const auto guard = gsl::finally([&] {
 		_paused = false;
 		_started = false;
-		if (story->photo()) {
+		if (!story->document()) {
 			_photoPlayback = std::make_unique<PhotoPlayback>(this);
 		} else {
 			_photoPlayback = nullptr;
 		}
 	});
 
+	if (!story->unsupported()) {
+		_unsupported = nullptr;
+	} else {
+		_unsupported = std::make_unique<Unsupported>(this);
+	}
+
 	if (_shown == storyId) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 74dde653b..96d102073 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -148,6 +148,7 @@ private:
 			const StoriesList &) = default;
 	};
 	class PhotoPlayback;
+	class Unsupported;
 
 	void initLayout();
 	void updatePhotoPlayback(const Player::TrackState &state);
@@ -200,6 +201,7 @@ private:
 	const std::unique_ptr<ReplyArea> _replyArea;
 	const std::unique_ptr<Reactions> _reactions;
 	const std::unique_ptr<RecentViews> _recentViews;
+	std::unique_ptr<Unsupported> _unsupported;
 	std::unique_ptr<PhotoPlayback> _photoPlayback;
 	std::unique_ptr<CaptionFullView> _captionFullView;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 375bf1f23..c95674a0b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -242,11 +242,7 @@ void Sibling::checkStory() {
 	const auto maybeStory = _peer->owner().stories().lookup(_id);
 	if (!maybeStory) {
 		if (_blurred.isNull()) {
-			_blurred = QImage(
-				st::storiesMaxSize,
-				QImage::Format_ARGB32_Premultiplied);
-			_blurred.fill(Qt::black);
-
+			setBlackThumbnail();
 			if (maybeStory.error() == Data::NoStory::Unknown) {
 				_peer->owner().stories().resolve(_id, crl::guard(this, [=] {
 					checkStory();
@@ -266,11 +262,24 @@ void Sibling::checkStory() {
 		_loader = std::make_unique<LoaderVideo>(document, origin, [=] {
 			check();
 		});
+	}, [&](v::null_t) {
+		_loader = nullptr;
 	});
+	if (!_loader) {
+		setBlackThumbnail();
+		return;
+	}
 	_blurred = _loader->blurred();
 	check();
 }
 
+void Sibling::setBlackThumbnail() {
+	_blurred = QImage(
+		st::storiesMaxSize,
+		QImage::Format_ARGB32_Premultiplied);
+	_blurred.fill(Qt::black);
+}
+
 FullStoryId Sibling::shownId() const {
 	return _id;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.h b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
index ed4b8789c..28cfc9cbc 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
@@ -45,6 +45,7 @@ private:
 	void checkStory();
 	void check();
 
+	void setBlackThumbnail();
 	[[nodiscard]] QImage userpicImage(const SiblingLayout &layout);
 	[[nodiscard]] QImage nameImage(const SiblingLayout &layout);
 	[[nodiscard]] QPoint namePosition(
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index e6e1805ea..fc94f4dba 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -782,3 +782,14 @@ storiesReactionsPan: EmojiPan(storiesEmojiPan) {
 storiesReactionsWidth: 210px;
 storiesReactionsBottomSkip: 29px;
 storiesReactionsAddedTop: 200px;
+
+storiesUnsupportedLabel: FlatLabel(defaultFlatLabel) {
+	textFg: mediaviewControlFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(15px semibold);
+		linkFont: font(15px semibold);
+		linkFontOver: font(15px semibold underline);
+	}
+	align: align(top);
+}
+storiesUnsupportedUpdate: themePreviewApplyButton;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 42a5117b6..59be5c1be 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3111,8 +3111,8 @@ void OverlayWidget::show(OpenRequest request) {
 		displayPhoto(photo);
 		preloadData(0);
 		activateControls();
-	} else if (document) {
-		setSession(&document->session());
+	} else if (story || document) {
+		setSession(document ? &document->session() : &story->session());
 
 		if (story) {
 			setContext(StoriesContext{
@@ -4093,6 +4093,8 @@ void OverlayWidget::storiesJumpTo(
 		displayPhoto(photo, anim::activation::background);
 	}, [&](not_null<DocumentData*> document) {
 		displayDocument(document, anim::activation::background);
+	}, [&](v::null_t) {
+		displayDocument(nullptr, anim::activation::background);
 	});
 }
 
@@ -4325,12 +4327,12 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 				paint(right, kRightSiblingTextureIndex);
 			}
 		}
-	} else {
-		if (_themePreviewShown) {
-			renderer->paintThemePreview(_themePreviewRect);
-		} else if (documentBubbleShown() && !_docRect.isEmpty()) {
-			renderer->paintDocumentBubble(_docRect, _docIconRect);
-		}
+	} else if (_stories) {
+		// Unsupported story.
+	} else if (_themePreviewShown) {
+		renderer->paintThemePreview(_themePreviewRect);
+	} else if (documentBubbleShown() && !_docRect.isEmpty()) {
+		renderer->paintDocumentBubble(_docRect, _docIconRect);
 	}
 	if (isSaveMsgShown()) {
 		renderer->paintSaveMsg(_saveMsg);

From e41fc695134977b16649325e305feddb2c8391a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Jun 2023 15:56:44 +0400
Subject: [PATCH 304/676] Show nice short info box from viewers dropdown.

---
 Telegram/SourceFiles/boxes/boxes.style        | 28 +++++++++++++++++++
 .../boxes/peers/peer_short_info_box.cpp       | 16 +++++++----
 .../boxes/peers/peer_short_info_box.h         |  5 +++-
 .../boxes/peers/prepare_short_info_box.cpp    | 12 +++++---
 .../boxes/peers/prepare_short_info_box.h      |  7 +++--
 Telegram/SourceFiles/info/info.style          | 16 -----------
 .../info/profile/info_profile_actions.cpp     |  1 +
 .../info/profile/info_profile_text.cpp        |  3 +-
 .../info/profile/info_profile_text.h          |  1 +
 .../stories/media_stories_recent_views.cpp    | 28 +++++++++++++++++--
 .../SourceFiles/media/view/media_view.style   | 18 ++++++++++++
 11 files changed, 103 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index fb0a19ef5..4dba7e723 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -24,6 +24,11 @@ UserpicButton {
 	uploadIcon: icon;
 	uploadIconPosition: point;
 }
+ShortInfoBox {
+	label: FlatLabel;
+	labeled: FlatLabel;
+	labeledOneLine: FlatLabel;
+}
 
 countryRowHeight: 36px;
 countryRowNameFont: semiboldFont;
@@ -961,3 +966,26 @@ ringtonesBoxSkip: 7px;
 gradientButtonGlareDuration: 700;
 gradientButtonGlareTimeout: 2000;
 gradientButtonGlareWidth: 100px;
+
+infoLabeledOneLine: FlatLabel(defaultFlatLabel) {
+	maxHeight: 20px;
+	style: TextStyle(defaultTextStyle) {
+		lineHeight: 19px;
+	}
+	margin: margins(5px, 5px, 5px, 5px);
+}
+infoLabelSkip: 2px;
+infoLabeled: FlatLabel(infoLabeledOneLine) {
+	minWidth: 180px;
+	maxHeight: 0px;
+	margin: margins(5px, 5px, 5px, 5px);
+}
+infoLabel: FlatLabel(infoLabeled) {
+	textFg: windowSubTextFg;
+}
+
+shortInfoBox: ShortInfoBox {
+	label: infoLabel;
+	labeled: infoLabeled;
+	labeledOneLine: infoLabeledOneLine;
+}
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index 619542edb..1bf236db1 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/streaming/media_streaming_player.h"
 #include "base/event_filter.h"
 #include "lang/lang_keys.h"
+#include "styles/style_boxes.h"
 #include "styles/style_layers.h"
 #include "styles/style_info.h"
 
@@ -614,8 +615,10 @@ PeerShortInfoBox::PeerShortInfoBox(
 	rpl::producer<PeerShortInfoFields> fields,
 	rpl::producer<QString> status,
 	rpl::producer<PeerShortInfoUserpic> userpic,
-	Fn<bool()> videoPaused)
-: _type(type)
+	Fn<bool()> videoPaused,
+	const style::ShortInfoBox *stOverride)
+: _st(stOverride ? *stOverride : st::shortInfoBox)
+, _type(type)
 , _fields(std::move(fields))
 , _topRoundBackground(this)
 , _scroll(this, st::shortInfoScroll)
@@ -691,11 +694,12 @@ void PeerShortInfoBox::prepareRows() {
 	auto addInfoLineGeneric = [&](
 			rpl::producer<QString> &&label,
 			rpl::producer<TextWithEntities> &&text,
-			const style::FlatLabel &textSt = st::infoLabeled) {
+			const style::FlatLabel &textSt) {
 		auto line = CreateTextWithLabel(
 			_rows,
 			rpl::duplicate(label) | Ui::Text::ToWithEntities(),
 			rpl::duplicate(text),
+			_st.label,
 			textSt,
 			st::shortInfoLabeledPadding);
 		_rows->add(object_ptr<Ui::OverrideMargins>(
@@ -715,7 +719,7 @@ void PeerShortInfoBox::prepareRows() {
 	auto addInfoLine = [&](
 			rpl::producer<QString> &&label,
 			rpl::producer<TextWithEntities> &&text,
-			const style::FlatLabel &textSt = st::infoLabeled) {
+			const style::FlatLabel &textSt) {
 		return addInfoLineGeneric(
 			std::move(label),
 			std::move(text),
@@ -728,7 +732,7 @@ void PeerShortInfoBox::prepareRows() {
 		auto result = addInfoLine(
 			std::move(label),
 			std::move(text),
-			st::infoLabeledOneLine);
+			_st.labeledOneLine);
 		result->setDoubleClickSelectsParagraph(true);
 		result->setContextCopyText(contextCopyText);
 		return result;
@@ -744,7 +748,7 @@ void PeerShortInfoBox::prepareRows() {
 	auto label = _fields.current().isBio
 		? tr::lng_info_bio_label()
 		: tr::lng_info_about_label();
-	addInfoLine(std::move(label), aboutValue());
+	addInfoLine(std::move(label), aboutValue(), _st.labeled);
 	addInfoOneLine(
 		tr::lng_info_username_label(),
 		usernameValue() | Ui::Text::ToWithEntities(),
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
index fc29b7062..07e60132a 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace style {
 struct ShortInfoCover;
+struct ShortInfoBox;
 } // namespace style
 
 namespace Media::Streaming {
@@ -144,7 +145,8 @@ public:
 		rpl::producer<PeerShortInfoFields> fields,
 		rpl::producer<QString> status,
 		rpl::producer<PeerShortInfoUserpic> userpic,
-		Fn<bool()> videoPaused);
+		Fn<bool()> videoPaused,
+		const style::ShortInfoBox *stOverride);
 	~PeerShortInfoBox();
 
 	[[nodiscard]] rpl::producer<> openRequests() const;
@@ -166,6 +168,7 @@ private:
 	[[nodiscard]] rpl::producer<QString> usernameValue() const;
 	[[nodiscard]] rpl::producer<TextWithEntities> aboutValue() const;
 
+	const style::ShortInfoBox &_st;
 	const PeerShortInfoType _type = PeerShortInfoType::User;
 
 	rpl::variable<PeerShortInfoFields> _fields;
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index a39b7eb47..8baf378b5 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -420,7 +420,8 @@ bool ProcessCurrent(
 object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 		not_null<PeerData*> peer,
 		Fn<void()> open,
-		Fn<bool()> videoPaused) {
+		Fn<bool()> videoPaused,
+		const style::ShortInfoBox *stOverride) {
 	const auto type = peer->isUser()
 		? PeerShortInfoType::User
 		: peer->isBroadcast()
@@ -432,7 +433,8 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 		FieldsValue(peer),
 		StatusValue(peer),
 		std::move(userpic.value),
-		std::move(videoPaused));
+		std::move(videoPaused),
+		stOverride);
 
 	result->openRequests(
 	) | rpl::start_with_next(open, result->lifetime());
@@ -445,7 +447,8 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 
 object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 		not_null<PeerData*> peer,
-		not_null<Window::SessionNavigation*> navigation) {
+		not_null<Window::SessionNavigation*> navigation,
+		const style::ShortInfoBox *stOverride) {
 	const auto open = [=] { navigation->showPeerHistory(peer); };
 	const auto videoIsPaused = [=] {
 		return navigation->parentController()->isGifPausedAtLeastFor(
@@ -454,7 +457,8 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 	return PrepareShortInfoBox(
 		peer,
 		open,
-		videoIsPaused);
+		videoIsPaused,
+		stOverride);
 }
 
 rpl::producer<QString> PrepareShortInfoStatus(not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h
index f50a23bf7..327ce373b 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h
@@ -13,6 +13,7 @@ class PeerData;
 
 namespace style {
 struct ShortInfoCover;
+struct ShortInfoBox;
 } // namespace style
 
 namespace Ui {
@@ -33,11 +34,13 @@ struct PreparedShortInfoUserpic {
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 	not_null<PeerData*> peer,
 	Fn<void()> open,
-	Fn<bool()> videoPaused);
+	Fn<bool()> videoPaused,
+	const style::ShortInfoBox *stOverride = nullptr);
 
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 	not_null<PeerData*> peer,
-	not_null<Window::SessionNavigation*> navigation);
+	not_null<Window::SessionNavigation*> navigation,
+	const style::ShortInfoBox *stOverride = nullptr);
 
 [[nodiscard]] rpl::producer<QString> PrepareShortInfoStatus(
 	not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index d4c146ce7..a106a9586 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -389,22 +389,6 @@ infoNotificationsIconPosition: point(20px, 5px);
 infoSharedMediaButtonIconPosition: point(20px, 3px);
 infoGroupMembersIconPosition: point(20px, 10px);
 infoChannelMembersIconPosition: point(20px, 19px);
-infoLabeledOneLine: FlatLabel(defaultFlatLabel) {
-	maxHeight: 20px;
-	style: TextStyle(defaultTextStyle) {
-		lineHeight: 19px;
-	}
-	margin: margins(5px, 5px, 5px, 5px);
-}
-infoLabelSkip: 2px;
-infoLabeled: FlatLabel(infoLabeledOneLine) {
-	minWidth: 180px;
-	maxHeight: 0px;
-	margin: margins(5px, 5px, 5px, 5px);
-}
-infoLabel: FlatLabel(infoLabeled) {
-	textFg: windowSubTextFg;
-}
 
 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 82e0e5720..ad6b8519f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -350,6 +350,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			result,
 			v::text::take_marked(std::move(label)),
 			std::move(text),
+			st::infoLabel,
 			textSt,
 			padding);
 		tracker.track(result->add(std::move(line.wrap)));
diff --git a/Telegram/SourceFiles/info/profile/info_profile_text.cpp b/Telegram/SourceFiles/info/profile/info_profile_text.cpp
index d6655dc7e..b09e35484 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_text.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_text.cpp
@@ -22,6 +22,7 @@ TextWithLabel CreateTextWithLabel(
 		QWidget *parent,
 		rpl::producer<TextWithEntities> &&label,
 		rpl::producer<TextWithEntities> &&text,
+		const style::FlatLabel &labelSt,
 		const style::FlatLabel &textSt,
 		const style::margins &padding) {
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -58,7 +59,7 @@ TextWithLabel CreateTextWithLabel(
 		) | rpl::after_next([=] {
 			layout->resizeToWidth(layout->widthNoMargins());
 		}),
-		st::infoLabel));
+		labelSt));
 	result->finishAnimating();
 	return { std::move(result), labeled, subtext };
 }
diff --git a/Telegram/SourceFiles/info/profile/info_profile_text.h b/Telegram/SourceFiles/info/profile/info_profile_text.h
index dbf8b8384..50c97681a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_text.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_text.h
@@ -35,6 +35,7 @@ TextWithLabel CreateTextWithLabel(
 	QWidget *parent,
 	rpl::producer<TextWithEntities> &&label,
 	rpl::producer<TextWithEntities> &&text,
+	const style::FlatLabel &labelSt,
 	const style::FlatLabel &textSt,
 	const style::margins &padding);
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index cb6077bf2..306e1a1f0 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -8,17 +8,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_recent_views.h"
 
 #include "api/api_who_reacted.h" // FormatReadDate.
+#include "boxes/peers/prepare_short_info_box.h"
+#include "core/application.h"
 #include "data/data_peer.h"
 #include "data/data_stories.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
 #include "lang/lang_keys.h"
 #include "ui/chat/group_call_userpics.h"
-#include "ui/widgets/popup_menu.h"
 #include "ui/controls/who_reacted_context_action.h"
+#include "ui/layers/box_content.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "ui/userpic_view.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
 
@@ -324,8 +329,27 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 
 	const auto peer = entry.peer;
 	const auto date = Api::FormatReadDate(entry.date, now);
+	const auto show = _controller->uiShow();
 	const auto prepare = [&](Ui::PeerUserpicView &view) {
 		const auto size = st::storiesWhoViewed.photoSize;
+		auto callback = [=] {
+			const auto open = [=] {
+				if (const auto window = Core::App().windowFor(peer)) {
+					window->invokeForSessionController(
+						&peer->session().account(),
+						peer,
+						[&](not_null<Window::SessionController*> controller) {
+							Core::App().hideMediaView();
+							controller->showPeerHistory(peer);
+						});
+				}
+			};
+			show->show(PrepareShortInfoBox(
+				peer,
+				open,
+				[] { return false; },
+				&st::storiesShortInfoBox));
+		};
 		auto userpic = peer->generateUserpicImage(
 			view,
 			size * style::DevicePixelRatio());
@@ -334,7 +358,7 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 			.text = peer->name(),
 			.date = date,
 			.userpic = std::move(userpic),
-			.callback = [] {},
+			.callback = std::move(callback),
 		};
 	};
 	if (_menuPlaceholderCount > 0) {
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index fc94f4dba..bf2f7624e 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -793,3 +793,21 @@ storiesUnsupportedLabel: FlatLabel(defaultFlatLabel) {
 	align: align(top);
 }
 storiesUnsupportedUpdate: themePreviewApplyButton;
+storiesShortInfoBox: ShortInfoBox(shortInfoBox) {
+	label: FlatLabel(infoLabel) {
+		textFg: storiesComposeGrayText;
+		palette: TextPalette(mediaviewTextPalette) {
+			linkFg: mediaviewTextLinkFg;
+			monoFg: storiesComposeGrayText;
+			spoilerFg: storiesComposeGrayText;
+		}
+	}
+	labeled: FlatLabel(infoLabeled) {
+		textFg: mediaviewCaptionFg;
+		palette: mediaviewTextPalette;
+	}
+	labeledOneLine: FlatLabel(infoLabeledOneLine) {
+		textFg: mediaviewCaptionFg;
+		palette: mediaviewTextPalette;
+	}
+}

From fc0902adf09675ee598d98e898fca213fb2e6130 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Jun 2023 16:11:27 +0400
Subject: [PATCH 305/676] Force focus on parent widget on story show.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 59be5c1be..bb8d12a5b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3063,6 +3063,7 @@ bool OverlayWidget::takeFocusFrom(not_null<QWidget*> window) const {
 void OverlayWidget::activate() {
 	_window->raise();
 	_window->activateWindow();
+	setFocus();
 	QApplication::setActiveWindow(_window);
 	setFocus();
 }

From 08c4f1f67a1912d08b90ab25490e11f217481a8e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Jun 2023 16:44:32 +0400
Subject: [PATCH 306/676] Force streaming bit for stories videos.

---
 Telegram/SourceFiles/data/data_document.cpp | 18 ++++++++++++-
 Telegram/SourceFiles/data/data_document.h   | 28 ++++++++++++---------
 Telegram/SourceFiles/data/data_stories.cpp  |  1 +
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 7af141841..473b7027d 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -443,7 +443,10 @@ void DocumentData::setattributes(
 		_additional = std::make_unique<StickerData>();
 		sticker()->type = StickerType::Webm;
 	}
-	if (isAudioFile() || isAnimation() || isVoiceMessage()) {
+	if (isAudioFile()
+		|| isAnimation()
+		|| isVoiceMessage()
+		|| storyMedia()) {
 		setMaybeSupportsStreaming(true);
 	}
 }
@@ -1588,6 +1591,19 @@ void DocumentData::setRemoteLocation(
 	}
 }
 
+void DocumentData::setStoryMedia(bool value) {
+	if (value) {
+		_flags |= Flag::StoryDocument;
+		setMaybeSupportsStreaming(true);
+	} else {
+		_flags &= ~Flag::StoryDocument;
+	}
+}
+
+bool DocumentData::storyMedia() const {
+	return (_flags & Flag::StoryDocument);
+}
+
 void DocumentData::setContentUrl(const QString &url) {
 	_url = url;
 }
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index b4bc0cad3..617eb331c 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -232,6 +232,9 @@ public:
 
 	[[nodiscard]] Storage::Cache::Key bigFileBaseCacheKey() const;
 
+	void setStoryMedia(bool value);
+	[[nodiscard]] bool storyMedia() const;
+
 	void setRemoteLocation(
 		int32 dc,
 		uint64 access,
@@ -283,18 +286,19 @@ public:
 
 private:
 	enum class Flag : ushort {
-		StreamingMaybeYes = 0x001,
-		StreamingMaybeNo = 0x002,
-		StreamingPlaybackFailed = 0x004,
-		ImageType = 0x008,
-		DownloadCancelled = 0x010,
-		LoadedInMediaCache = 0x020,
-		HasAttachedStickers = 0x040,
-		InlineThumbnailIsPath = 0x080,
-		ForceToCache = 0x100,
-		PremiumSticker = 0x200,
-		PossibleCoverThumbnail = 0x400,
-		UseTextColor = 0x800,
+		StreamingMaybeYes = 0x0001,
+		StreamingMaybeNo = 0x0002,
+		StreamingPlaybackFailed = 0x0004,
+		ImageType = 0x0008,
+		DownloadCancelled = 0x0010,
+		LoadedInMediaCache = 0x0020,
+		HasAttachedStickers = 0x0040,
+		InlineThumbnailIsPath = 0x0080,
+		ForceToCache = 0x0100,
+		PremiumSticker = 0x0200,
+		PossibleCoverThumbnail = 0x0400,
+		UseTextColor = 0x0800,
+		StoryDocument = 0x1000,
 	};
 	using Flags = base::flags<Flag>;
 	friend constexpr bool is_flag_type(Flag) { return true; };
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0cf32566d..260e4d766 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -59,6 +59,7 @@ using UpdateFlag = StoryUpdate::Flag;
 			const auto result = owner->processDocument(*document);
 			if (!result->isNull()
 				&& (result->isGifv() || result->isVideoFile())) {
+				result->setStoryMedia(true);
 				return StoryMedia{ result };
 			}
 		}

From 2a1631247d601e5cb685925ac2c29623021b8b33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Jun 2023 21:23:40 +0400
Subject: [PATCH 307/676] Add stories to data export.

---
 Telegram/Resources/export_html/css/style.css  |  15 +
 .../export_html/images/section_stories.png    | Bin 0 -> 605 bytes
 .../export_html/images/section_stories@2x.png | Bin 0 -> 1120 bytes
 Telegram/Resources/langs/lang.strings         |   2 +
 Telegram/Resources/qrc/telegram/export.qrc    |   2 +
 .../export/data/export_data_types.cpp         | 103 +++++++
 .../export/data/export_data_types.h           |  29 ++
 .../SourceFiles/export/export_api_wrap.cpp    | 271 +++++++++++++++++-
 Telegram/SourceFiles/export/export_api_wrap.h |  29 +-
 .../SourceFiles/export/export_controller.cpp  |  55 +++-
 .../SourceFiles/export/export_controller.h    |  12 +-
 Telegram/SourceFiles/export/export_settings.h |   8 +-
 .../export/output/export_output_abstract.h    |   8 +
 .../export/output/export_output_html.cpp      | 210 +++++++++++++-
 .../export/output/export_output_html.h        |  10 +
 .../export/output/export_output_json.cpp      |  71 +++++
 .../export/output/export_output_json.h        |   4 +
 .../export/view/export_view_content.cpp       |   7 +
 .../export/view/export_view_settings.cpp      |   5 +
 19 files changed, 812 insertions(+), 29 deletions(-)
 create mode 100644 Telegram/Resources/export_html/images/section_stories.png
 create mode 100644 Telegram/Resources/export_html/images/section_stories@2x.png

diff --git a/Telegram/Resources/export_html/css/style.css b/Telegram/Resources/export_html/css/style.css
index 456d59f46..79b680cc2 100644
--- a/Telegram/Resources/export_html/css/style.css
+++ b/Telegram/Resources/export_html/css/style.css
@@ -111,6 +111,11 @@ pre {
     border-radius: 50%;
     overflow: hidden;
 }
+.story {
+    display: block;
+    border-radius: 4px;
+    overflow: hidden;
+}
 .userpic .initials {
     display: block;
     color: #fff;
@@ -194,6 +199,10 @@ a.block_link:hover {
     text-decoration: none !important;
     background-color: #f5f7f8;
 }
+a.expanded {
+    padding: 2px 8px;
+    margin: -2px -8px;
+}
 .sections {
     padding: 11px 0;
 }
@@ -428,6 +437,9 @@ div.toast_shown {
 .section.sessions {
     background-image: url(../images/section_sessions.png);
 }
+.section.stories {
+    background-image: url(../images/section_stories.png);
+}
 .section.web {
     background-image: url(../images/section_web.png);
 }
@@ -489,6 +501,9 @@ div.toast_shown {
 .section.sessions {
     background-image: url(../images/section_sessions@2x.png);
 }
+.section.stories {
+    background-image: url(../images/section_stories@2x.png);
+}
 .section.web {
     background-image: url(../images/section_web@2x.png);
 }
diff --git a/Telegram/Resources/export_html/images/section_stories.png b/Telegram/Resources/export_html/images/section_stories.png
new file mode 100644
index 0000000000000000000000000000000000000000..650c69c91f7966a5e18dedee4cb00a8354291b3f
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000;O000>X1^@s6D=Y3@00009a7bBm000Gv
z000Gv0c~iV`Tzg`0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0rE*iK~#7F?N!T7
z!$1(7v12~BbO0rU4sZpK3KA+{FF*uHED{P999SwKR1l~DIsiIw3BE;&jfdH>6D1^z
z9Znp0l4EBwo;SPu<^|v%6~L+l)jQt>q7FZ{0E4y!DShD27$|=>H`h<UB2YcOT^8D%
z2EDuu<R?t{GLsrJacCkP*CtR$r!DY2E<#OCNjU2spfQ*fk>7n@5#a@Y-R3I+pF-2`
zzgH3zoo8=S9N`f*0%f#LmNuev6V@}$xrai6!Or)UG#1{X)GnVpr+X9i75o5WgjlKL
zGuuq3+|qD1$D8Zu_<X-yatxbm8tP&kDA`IrFA;@{0Fd^|`=x7Jz_k)NCks)WgP`c%
zM&Ds&WP_qUAHI_SKMw$LsT!(aqKM}L+gzjVCV&lq{Idzag~v*=HReLIpmYf64MnOe
zLLKRr3}B%o2LZxI@sM?4RruppStE8601o6vbf~nhy;YK1Of{FtpPd9Ix_afCy_zse
z@1QP5>BKT(b3Jc<i<4}XL=9^dU3GGnz-Hi_3F&+^wvBWP&&tAua!X&FGdt^+bZKW}
zB3}_fKJKs})YK63JT$j8%x+53>#^ziFEANC$;J?J-ae$^Ozf3KaUgTB1l4~y)}K6L
rkHRfmNP^U0ITLq_kL9`j;}7Et0Ts%$t7y#m00000NkvXXu0mjfil6t<

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/export_html/images/section_stories@2x.png b/Telegram/Resources/export_html/images/section_stories@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..429245138d9d9aa5af1375b66d1c69d418e7b93f
GIT binary patch
literal 1120
zcmV-m1fTnfP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1NBKnK~#7F?O9Du
z+dve4lMpI)^aM>$K-jS;!knOR0^kI=i$WBTa3n|_b&<&llANIF32LgUV%KnjnjOpT
z5G3*RjbkV?_KfYsNn6REgmA_)Z{FX$dG8q@M~)mh{w4@y1hZ<D!5i)%#WezK&}uf?
z!uzAz84ywi!Y%=p9co)HWPq6kFsrqFU}O&;4UsabQ~TWV=NzB3_&;gs0EKB&yU~Ri
zumn@WtezUcSO*xC6;rnUJQAG4<o6X6yo17_WmtV$K~f7~TGlGu4bPByQ$N$|Jv|cd
zGcvoQm{<-3S%Z~Qom$o}NP$!?<oh`regdw&NNU6Zk0G<np&uIqacvdPNO1=W@D`0>
zD7J8cl(y5HkHi85%zpuhav9b}EmLaSE+l|23=}OCWG~`%Dj^aH5V*|`2s7`Z#&>0H
zCxtHvD@G}0fbO)N#GML|1l;H4O$hXGll5tt=kP6dUs^|Eed$#t*fSQf76`&*M_SgW
z&GTKz5a!WI7r7B#iV$?Ab4Rx>-U5usns8xd=>W3EL&@}M3wyIp+%l~IzV<_|Gu}=c
z>XLv`q>1NA8ZHMsD519iBZtCo0^OvMW*SV+6KP94?CI7h1@OaWDBh3jFmI3%l}3z!
zmq=(V@L-69i8D{_KO)$}5e9jZsDMTQVu(cWhFugGh<g=aO*K^~fGf@%_hC_BB}e$}
zdDp6`Mb(R|Z(p5_H(M`JkXy_ao7Dc`z=Ck~-MQV^+`K`zUB$m1Z8mJk@sC2AN(5z~
zfiBdWwQ@>}NeY9hH=ae>ym+UYrxXBl6BFOIo(76+oi?UV+|nRO-G4p}JS$ISsH0Fp
zy2M6OSe++Aai6_XO;rovfv9c5&AA|i_Trt4XlN`Diu>9tJu3uz7~-hssOBpLh`iF-
z@DSz=7Aj;0x)esAjbikXMohC-tH7KPXn!9>9@@G!@fF$e36BQlXG5-EN@iRWDC%w=
zLSO6F#aCp6$kkUFH)=uFxEpmKR6McR^gUTu;`kJEbSC*f>%+?O!K{{;X#N2eLiQ#4
zZOnnpxb?}p68B3MfD~2%J8fw4St679zE+vIjm$iE(`73OjTDV7We<k~I||qqOxTPH
zZdz{9C=I)Q-JP&_O4(Y}3c=y{#Ymylmxb}87r)IXmz1Gcj~(mrZkoz3b$i`3(Pv+b
ztnitTDYJve1Tea{Bm=`Gx=q?MmAX6aw?DWX)!HEF8I>a^GT`}4ck-<5EVw+<QTxJy
zDKPc-fk3<6iFONU4OR&;_6R~Qu}NhJZ+RyhTkx}{=^1`v;vMILfh6(62Dy>bUq3zP
m#kmL9QD-DajvP7uPy7aUhMV9W!l4@g0000<MNUMnLSTX~%k$6x

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ad8e9037d..bbd952df0 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3409,6 +3409,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_export_option_info_about" = "Your chosen screen name, username, phone number and profile pictures.";
 "lng_export_option_contacts" = "Contacts list";
 "lng_export_option_contacts_about" = "If you allow access, contacts are continuously synced with Telegram. You can adjust this in Settings > Privacy & Security on mobile devices.";
+"lng_export_option_stories" = "Stories archive";
+"lng_export_option_stories_about" = "All stories you posted from Telegram mobile apps.";
 "lng_export_option_sessions" = "Active sessions";
 "lng_export_option_sessions_about" = "We store this to display your connected devices in Settings > Privacy & Security > Active Sessions.";
 "lng_export_header_other" = "Other";
diff --git a/Telegram/Resources/qrc/telegram/export.qrc b/Telegram/Resources/qrc/telegram/export.qrc
index 06ecc7eb7..290d24a30 100644
--- a/Telegram/Resources/qrc/telegram/export.qrc
+++ b/Telegram/Resources/qrc/telegram/export.qrc
@@ -37,6 +37,8 @@
     <file alias="images/section_photos@2x.png">../../export_html/images/section_photos@2x.png</file>
     <file alias="images/section_sessions.png">../../export_html/images/section_sessions.png</file>
     <file alias="images/section_sessions@2x.png">../../export_html/images/section_sessions@2x.png</file>
+    <file alias="images/section_stories.png">../../export_html/images/section_stories.png</file>
+    <file alias="images/section_stories@2x.png">../../export_html/images/section_stories@2x.png</file>
     <file alias="images/section_web.png">../../export_html/images/section_web.png</file>
     <file alias="images/section_web@2x.png">../../export_html/images/section_web@2x.png</file>
     <file alias="js/script.js">../../export_html/js/script.js</file>
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index e2840acc4..e2bc9fde2 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -42,6 +42,16 @@ QString PreparePhotoFileName(int index, TimeId date) {
 		+ ".jpg";
 }
 
+QString PrepareStoryFileName(
+		int index,
+		TimeId date,
+		const Utf8String &extension) {
+	return "story_"
+		+ QString::number(index)
+		+ PrepareFileNameDatePart(date)
+		+ extension;
+}
+
 } // namespace
 
 int PeerColorIndex(BareId bareId) {
@@ -584,6 +594,99 @@ UserpicsSlice ParseUserpicsSlice(
 	return result;
 }
 
+File &Story::file() {
+	return media.file();
+}
+
+const File &Story::file() const {
+	return media.file();
+}
+
+Image &Story::thumb() {
+	return media.thumb();
+}
+
+const Image &Story::thumb() const {
+	return media.thumb();
+}
+
+StoriesSlice ParseStoriesSlice(
+		const MTPVector<MTPStoryItem> &data,
+		int baseIndex) {
+	const auto &list = data.v;
+	auto result = StoriesSlice();
+	result.list.reserve(list.size());
+	for (const auto &story : list) {
+		result.lastId = story.match([](const auto &data) {
+			return data.vid().v;
+		});
+		++result.skipped;
+		story.match([&](const MTPDstoryItem &data) {
+			const auto date = data.vdate().v;
+			const auto expires = data.vexpire_date().v;
+			auto media = Media();
+			data.vmedia().match([&](const MTPDmessageMediaPhoto &data) {
+				const auto suggestedPath = "stories/"
+					+ PrepareStoryFileName(
+						++baseIndex,
+						date,
+						".jpg"_q);
+				const auto photo = data.vphoto();
+				auto content = photo
+					? ParsePhoto(*photo, suggestedPath)
+					: Photo();
+				media.content = content;
+			}, [&](const MTPDmessageMediaDocument &data) {
+				const auto document = data.vdocument();
+				auto fake = ParseMediaContext();
+				auto content = document
+					? ParseDocument(fake, *document, "stories", date)
+					: Document();
+				const auto extension = (content.mime == "image/jpeg")
+					? ".jpg"_q
+					: (content.mime == "image/png")
+					? ".png"_q
+					: [&] {
+						const auto mimeType = Core::MimeTypeForName(
+							content.mime);
+						QStringList patterns = mimeType.globPatterns();
+						if (!patterns.isEmpty()) {
+							return patterns.front().replace(
+								'*',
+								QString()).toUtf8();
+						}
+						return QByteArray();
+					}();
+				const auto path = content.file.suggestedPath = "stories/"
+					+ PrepareStoryFileName(
+						++baseIndex,
+						date,
+						extension);
+				content.thumb.file.suggestedPath = path + "_thumb.jpg";
+				media.content = content;
+			}, [&](const auto &data) {
+				media.content = UnsupportedMedia();
+			});
+			if (!v::is<UnsupportedMedia>(media.content)) {
+				result.list.push_back(Story{
+					.id = data.vid().v,
+					.date = date,
+					.expires = data.vexpire_date().v,
+					.media = std::move(media),
+					.pinned = data.is_pinned(),
+					.caption = (data.vcaption()
+						? ParseText(
+							*data.vcaption(),
+							data.ventities().value_or_empty())
+						: std::vector<TextPart>()),
+				});
+				--result.skipped;
+			}
+		}, [](const auto &) {});
+	}
+	return result;
+}
+
 std::pair<QString, QSize> WriteImageThumb(
 		const QString &basePath,
 		const QString &largePath,
diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h
index d383fdb94..27fb14ea1 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.h
+++ b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -48,6 +48,10 @@ struct UserpicsInfo {
 	int count = 0;
 };
 
+struct StoriesInfo {
+	int count = 0;
+};
+
 struct FileLocation {
 	int dcId = 0;
 	MTPInputFileLocation data;
@@ -663,9 +667,34 @@ struct FileOrigin {
 	int split = 0;
 	MTPInputPeer peer;
 	int32 messageId = 0;
+	int32 storyId = 0;
 	uint64 customEmojiId = 0;
 };
 
+struct Story {
+	int32 id = 0;
+	TimeId date = 0;
+	TimeId expires = 0;
+	Media media;
+	bool pinned = false;
+	std::vector<TextPart> caption;
+
+	File &file();
+	const File &file() const;
+	Image &thumb();
+	const Image &thumb() const;
+};
+
+struct StoriesSlice {
+	std::vector<Story> list;
+	int32 lastId = 0;
+	int skipped = 0;
+};
+
+StoriesSlice ParseStoriesSlice(
+	const MTPVector<MTPStoryItem> &data,
+	int baseIndex);
+
 Message ParseMessage(
 	ParseMediaContext &context,
 	const MTPMessage &data,
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index 3e31914d4..1ff8d6774 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -30,6 +30,7 @@ constexpr auto kTopPeerSliceLimit = 100;
 constexpr auto kFileMaxSize = 4000 * int64(1024 * 1024);
 constexpr auto kLocationCacheSize = 100'000;
 constexpr auto kMaxEmojiPerRequest = 100;
+constexpr auto kStoriesSliceLimit = 100;
 
 struct LocationKey {
 	uint64 type;
@@ -109,6 +110,7 @@ struct ApiWrap::StartProcess {
 
 	enum class Step {
 		UserpicsCount,
+		StoriesCount,
 		SplitRanges,
 		DialogsCount,
 		LeftChannelsCount,
@@ -139,6 +141,19 @@ struct ApiWrap::UserpicsProcess {
 	int fileIndex = 0;
 };
 
+struct ApiWrap::StoriesProcess {
+	FnMut<bool(Data::StoriesInfo&&)> start;
+	Fn<bool(DownloadProgress)> fileProgress;
+	Fn<bool(Data::StoriesSlice&&)> handleSlice;
+	FnMut<void()> finish;
+
+	int processed = 0;
+	std::optional<Data::StoriesSlice> slice;
+	int offsetId = 0;
+	bool lastSlice = false;
+	int fileIndex = 0;
+};
+
 struct ApiWrap::OtherDataProcess {
 	Data::File file;
 	FnMut<void(Data::File&&)> done;
@@ -417,6 +432,9 @@ void ApiWrap::startExport(
 	if (_settings->types & Settings::Type::Userpics) {
 		_startProcess->steps.push_back(Step::UserpicsCount);
 	}
+	if (_settings->types & Settings::Type::Stories) {
+		_startProcess->steps.push_back(Step::StoriesCount);
+	}
 	if (_settings->types & Settings::Type::AnyChatsMask) {
 		_startProcess->steps.push_back(Step::SplitRanges);
 	}
@@ -447,6 +465,8 @@ void ApiWrap::sendNextStartRequest() {
 	switch (step) {
 	case Step::UserpicsCount:
 		return requestUserpicsCount();
+	case Step::StoriesCount:
+		return requestStoriesCount();
 	case Step::SplitRanges:
 		return requestSplitRanges();
 	case Step::DialogsCount:
@@ -480,6 +500,22 @@ void ApiWrap::requestUserpicsCount() {
 	}).send();
 }
 
+void ApiWrap::requestStoriesCount() {
+	Expects(_startProcess != nullptr);
+
+	mainRequest(MTPstories_GetStoriesArchive(
+		MTP_int(0), // offset_id
+		MTP_int(0) // limit
+	)).done([=](const MTPstories_Stories &result) {
+		Expects(_settings != nullptr);
+		Expects(_startProcess != nullptr);
+
+		_startProcess->info.storiesCount = result.data().vcount().v;
+
+		sendNextStartRequest();
+	}).send();
+}
+
 void ApiWrap::requestSplitRanges() {
 	Expects(_startProcess != nullptr);
 
@@ -616,7 +652,8 @@ void ApiWrap::startMainSession(FnMut<void()> done) {
 	using Type = Settings::Type;
 	const auto sizeLimit = _settings->media.sizeLimit;
 	const auto hasFiles = ((_settings->media.types != 0) && (sizeLimit > 0))
-		|| (_settings->types & Type::Userpics);
+		|| (_settings->types & Type::Userpics)
+		|| (_settings->types & Type::Stories);
 
 	using Flag = MTPaccount_InitTakeoutSession::Flag;
 	const auto flags = Flag(0)
@@ -856,6 +893,171 @@ void ApiWrap::finishUserpics() {
 	base::take(_userpicsProcess)->finish();
 }
 
+void ApiWrap::requestStories(
+		FnMut<bool(Data::StoriesInfo&&)> start,
+		Fn<bool(DownloadProgress)> progress,
+		Fn<bool(Data::StoriesSlice&&)> slice,
+		FnMut<void()> finish) {
+	Expects(_storiesProcess == nullptr);
+
+	_storiesProcess = std::make_unique<StoriesProcess>();
+	_storiesProcess->start = std::move(start);
+	_storiesProcess->fileProgress = std::move(progress);
+	_storiesProcess->handleSlice = std::move(slice);
+	_storiesProcess->finish = std::move(finish);
+
+	mainRequest(MTPstories_GetStoriesArchive(
+		MTP_int(_storiesProcess->offsetId),
+		MTP_int(kStoriesSliceLimit)
+	)).done([=](const MTPstories_Stories &result) mutable {
+		Expects(_storiesProcess != nullptr);
+
+		auto startInfo = Data::StoriesInfo{ result.data().vcount().v };
+		if (!_storiesProcess->start(std::move(startInfo))) {
+			return;
+		}
+
+		handleStoriesSlice(result);
+	}).send();
+}
+
+void ApiWrap::handleStoriesSlice(const MTPstories_Stories &result) {
+	Expects(_storiesProcess != nullptr);
+
+	loadStoriesFiles(Data::ParseStoriesSlice(
+		result.data().vstories(),
+		_storiesProcess->processed));
+}
+
+void ApiWrap::loadStoriesFiles(Data::StoriesSlice &&slice) {
+	Expects(_storiesProcess != nullptr);
+	Expects(!_storiesProcess->slice.has_value());
+
+	if (!slice.lastId) {
+		_storiesProcess->lastSlice = true;
+	}
+	_storiesProcess->slice = std::move(slice);
+	_storiesProcess->fileIndex = 0;
+	loadNextStory();
+}
+
+void ApiWrap::loadNextStory() {
+	Expects(_storiesProcess != nullptr);
+	Expects(_storiesProcess->slice.has_value());
+
+	for (auto &list = _storiesProcess->slice->list
+		; _storiesProcess->fileIndex < list.size()
+		; ++_storiesProcess->fileIndex) {
+		auto &story = list[_storiesProcess->fileIndex];
+		const auto origin = Data::FileOrigin{ .storyId = story.id };
+		const auto ready = processFileLoad(
+			story.file(),
+			origin,
+			[=](FileProgress value) { return loadStoryProgress(value); },
+			[=](const QString &path) { loadStoryDone(path); });
+		if (!ready) {
+			return;
+		}
+		const auto thumbProgress = [=](FileProgress value) {
+			return loadStoryThumbProgress(value);
+		};
+		const auto thumbReady = processFileLoad(
+			story.thumb().file,
+			origin,
+			thumbProgress,
+			[=](const QString &path) { loadStoryThumbDone(path); },
+			nullptr,
+			&story);
+		if (!thumbReady) {
+			return;
+		}
+	}
+	finishStoriesSlice();
+}
+
+void ApiWrap::finishStoriesSlice() {
+	Expects(_storiesProcess != nullptr);
+	Expects(_storiesProcess->slice.has_value());
+
+	auto slice = *base::take(_storiesProcess->slice);
+	if (slice.lastId) {
+		_storiesProcess->processed += slice.list.size();
+		_storiesProcess->offsetId = slice.lastId;
+		if (!_storiesProcess->handleSlice(std::move(slice))) {
+			return;
+		}
+	}
+	if (_storiesProcess->lastSlice) {
+		finishStories();
+		return;
+	}
+
+	mainRequest(MTPstories_GetStoriesArchive(
+		MTP_int(_storiesProcess->offsetId),
+		MTP_int(kStoriesSliceLimit)
+	)).done([=](const MTPstories_Stories &result) {
+		handleStoriesSlice(result);
+	}).send();
+}
+
+bool ApiWrap::loadStoryProgress(FileProgress progress) {
+	Expects(_fileProcess != nullptr);
+	Expects(_storiesProcess != nullptr);
+	Expects(_storiesProcess->slice.has_value());
+	Expects((_storiesProcess->fileIndex >= 0)
+		&& (_storiesProcess->fileIndex
+			< _storiesProcess->slice->list.size()));
+
+	return _storiesProcess->fileProgress(DownloadProgress{
+		_fileProcess->randomId,
+		_fileProcess->relativePath,
+		_storiesProcess->fileIndex,
+		progress.ready,
+		progress.total });
+}
+
+void ApiWrap::loadStoryDone(const QString &relativePath) {
+	Expects(_storiesProcess != nullptr);
+	Expects(_storiesProcess->slice.has_value());
+	Expects((_storiesProcess->fileIndex >= 0)
+		&& (_storiesProcess->fileIndex
+			< _storiesProcess->slice->list.size()));
+
+	const auto index = _storiesProcess->fileIndex;
+	auto &file = _storiesProcess->slice->list[index].file();
+	file.relativePath = relativePath;
+	if (relativePath.isEmpty()) {
+		file.skipReason = Data::File::SkipReason::Unavailable;
+	}
+	loadNextStory();
+}
+
+bool ApiWrap::loadStoryThumbProgress(FileProgress progress) {
+	return loadStoryProgress(progress);
+}
+
+void ApiWrap::loadStoryThumbDone(const QString &relativePath) {
+	Expects(_storiesProcess != nullptr);
+	Expects(_storiesProcess->slice.has_value());
+	Expects((_storiesProcess->fileIndex >= 0)
+		&& (_storiesProcess->fileIndex
+			< _storiesProcess->slice->list.size()));
+
+	const auto index = _storiesProcess->fileIndex;
+	auto &file = _storiesProcess->slice->list[index].thumb().file;
+	file.relativePath = relativePath;
+	if (relativePath.isEmpty()) {
+		file.skipReason = Data::File::SkipReason::Unavailable;
+	}
+	loadNextStory();
+}
+
+void ApiWrap::finishStories() {
+	Expects(_storiesProcess != nullptr);
+
+	base::take(_storiesProcess)->finish();
+}
+
 void ApiWrap::requestContacts(FnMut<void(Data::ContactsList&&)> done) {
 	Expects(_contactsProcess == nullptr);
 
@@ -1753,7 +1955,8 @@ bool ApiWrap::processFileLoad(
 		const Data::FileOrigin &origin,
 		Fn<bool(FileProgress)> progress,
 		FnMut<void(QString)> done,
-		Data::Message *message) {
+		Data::Message *message,
+		Data::Story *story) {
 	using SkipReason = Data::File::SkipReason;
 
 	if (!file.relativePath.isEmpty()
@@ -1767,7 +1970,12 @@ bool ApiWrap::processFileLoad(
 	}
 
 	using Type = MediaSettings::Type;
-	const auto type = message ? v::match(message->media.content, [&](
+	const auto media = message
+		? &message->media
+		: story
+		? &story->media
+		: nullptr;
+	const auto type = media ? v::match(media->content, [&](
 			const Data::Document &data) {
 		if (data.isSticker) {
 			return Type::Sticker;
@@ -1786,14 +1994,18 @@ bool ApiWrap::processFileLoad(
 		return Type::Photo;
 	}) : Type(0);
 
-	const auto limit = _settings->media.sizeLimit;
+	const auto fullSize = message
+		? message->file().size
+		: story
+		? story->file().size
+		: file.size;
 	if (message && Data::SkipMessageByDate(*message, *_settings)) {
 		file.skipReason = SkipReason::DateLimits;
 		return true;
-	} else if ((_settings->media.types & type) != type) {
+	} else if (!story && (_settings->media.types & type) != type) {
 		file.skipReason = SkipReason::FileType;
 		return true;
-	} else if ((message ? message->file().size : file.size) >= limit) {
+	} else if (!story && fullSize >= _settings->media.sizeLimit) {
 		// Don't load thumbs for large files that we skip.
 		file.skipReason = SkipReason::FileSize;
 		return true;
@@ -1972,7 +2184,20 @@ void ApiWrap::filePartRefreshReference(int64 offset) {
 	Expects(_fileProcess->requestId == 0);
 
 	const auto &origin = _fileProcess->origin;
-	if (!origin.messageId) {
+	if (origin.storyId) {
+		_fileProcess->requestId = mainRequest(MTPstories_GetStoriesByID(
+			MTP_inputUserSelf(),
+			MTP_vector<MTPint>(1, MTP_int(origin.storyId))
+		)).fail([=](const MTP::Error &error) {
+			_fileProcess->requestId = 0;
+			filePartUnavailable();
+			return true;
+		}).done([=](const MTPstories_Stories &result) {
+			_fileProcess->requestId = 0;
+			filePartExtractReference(offset, result);
+		}).send();
+		return;
+	} else if (!origin.messageId) {
 		error("FILE_REFERENCE error for non-message file.");
 		return;
 	}
@@ -2061,6 +2286,38 @@ void ApiWrap::filePartExtractReference(
 	});
 }
 
+void ApiWrap::filePartExtractReference(
+		int64 offset,
+		const MTPstories_Stories &result) {
+	Expects(_fileProcess != nullptr);
+	Expects(_fileProcess->requestId == 0);
+
+	const auto stories = Data::ParseStoriesSlice(
+		result.data().vstories(),
+		0);
+	for (const auto &story : stories.list) {
+		if (story.id == _fileProcess->origin.storyId) {
+			const auto refresh1 = Data::RefreshFileReference(
+				_fileProcess->location,
+				story.file().location);
+			const auto refresh2 = Data::RefreshFileReference(
+				_fileProcess->location,
+				story.thumb().file.location);
+			if (refresh1 || refresh2) {
+				_fileProcess->requestId = fileRequest(
+					_fileProcess->location,
+					offset
+				).done([=](const MTPupload_File &result) {
+					_fileProcess->requestId = 0;
+					filePartDone(offset, result);
+				}).send();
+				return;
+			}
+		}
+	}
+	filePartUnavailable();
+}
+
 void ApiWrap::filePartUnavailable() {
 	Expects(_fileProcess != nullptr);
 	Expects(!_fileProcess->requests.empty());
diff --git a/Telegram/SourceFiles/export/export_api_wrap.h b/Telegram/SourceFiles/export/export_api_wrap.h
index 6384457d7..4723cd882 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.h
+++ b/Telegram/SourceFiles/export/export_api_wrap.h
@@ -19,12 +19,15 @@ struct FileLocation;
 struct PersonalInfo;
 struct UserpicsInfo;
 struct UserpicsSlice;
+struct StoriesInfo;
+struct StoriesSlice;
 struct ContactsList;
 struct SessionsList;
 struct DialogsInfo;
 struct DialogInfo;
 struct MessagesSlice;
 struct Message;
+struct Story;
 struct FileOrigin;
 } // namespace Data
 
@@ -44,6 +47,7 @@ public:
 
 	struct StartInfo {
 		int userpicsCount = 0;
+		int storiesCount = 0;
 		int dialogsCount = 0;
 	};
 	void startExport(
@@ -74,6 +78,12 @@ public:
 		Fn<bool(Data::UserpicsSlice&&)> slice,
 		FnMut<void()> finish);
 
+	void requestStories(
+		FnMut<bool(Data::StoriesInfo&&)> start,
+		Fn<bool(DownloadProgress)> progress,
+		Fn<bool(Data::StoriesSlice&&)> slice,
+		FnMut<void()> finish);
+
 	void requestContacts(FnMut<void(Data::ContactsList&&)> done);
 
 	void requestSessions(FnMut<void(Data::SessionsList&&)> done);
@@ -96,6 +106,7 @@ private:
 	struct StartProcess;
 	struct ContactsProcess;
 	struct UserpicsProcess;
+	struct StoriesProcess;
 	struct OtherDataProcess;
 	struct FileProcess;
 	struct FileProgress;
@@ -107,6 +118,7 @@ private:
 	void startMainSession(FnMut<void()> done);
 	void sendNextStartRequest();
 	void requestUserpicsCount();
+	void requestStoriesCount();
 	void requestSplitRanges();
 	void requestDialogsCount();
 	void requestLeftChannelsCount();
@@ -122,6 +134,16 @@ private:
 	void finishUserpicsSlice();
 	void finishUserpics();
 
+	void handleStoriesSlice(const MTPstories_Stories &result);
+	void loadStoriesFiles(Data::StoriesSlice &&slice);
+	void loadNextStory();
+	bool loadStoryProgress(FileProgress value);
+	void loadStoryDone(const QString &relativePath);
+	bool loadStoryThumbProgress(FileProgress value);
+	void loadStoryThumbDone(const QString &relativePath);
+	void finishStoriesSlice();
+	void finishStories();
+
 	void otherDataDone(const QString &relativePath);
 
 	bool useOnlyLastSplit() const;
@@ -179,7 +201,8 @@ private:
 		const Data::FileOrigin &origin,
 		Fn<bool(FileProgress)> progress,
 		FnMut<void(QString)> done,
-		Data::Message *message = nullptr);
+		Data::Message *message = nullptr,
+		Data::Story *story = nullptr);
 	std::unique_ptr<FileProcess> prepareFileProcess(
 		const Data::File &file,
 		const Data::FileOrigin &origin) const;
@@ -198,6 +221,9 @@ private:
 	void filePartExtractReference(
 		int64 offset,
 		const MTPmessages_Messages &result);
+	void filePartExtractReference(
+		int64 offset,
+		const MTPstories_Stories &result);
 
 	template <typename Request>
 	class RequestBuilder;
@@ -228,6 +254,7 @@ private:
 	std::unique_ptr<LoadedFileCache> _fileCache;
 	std::unique_ptr<ContactsProcess> _contactsProcess;
 	std::unique_ptr<UserpicsProcess> _userpicsProcess;
+	std::unique_ptr<StoriesProcess> _storiesProcess;
 	std::unique_ptr<OtherDataProcess> _otherDataProcess;
 	std::unique_ptr<FileProcess> _fileProcess;
 	std::unique_ptr<LeftChannelsProcess> _leftChannelsProcess;
diff --git a/Telegram/SourceFiles/export/export_controller.cpp b/Telegram/SourceFiles/export/export_controller.cpp
index 516c75cf7..b3d543f4c 100644
--- a/Telegram/SourceFiles/export/export_controller.cpp
+++ b/Telegram/SourceFiles/export/export_controller.cpp
@@ -75,6 +75,7 @@ private:
 	void collectDialogsList();
 	void exportPersonalInfo();
 	void exportUserpics();
+	void exportStories();
 	void exportContacts();
 	void exportSessions();
 	void exportOtherData();
@@ -89,6 +90,7 @@ private:
 	ProcessingState stateDialogsList(int processed) const;
 	ProcessingState statePersonalInfo() const;
 	ProcessingState stateUserpics(const DownloadProgress &progress) const;
+	ProcessingState stateStories(const DownloadProgress &progress) const;
 	ProcessingState stateContacts() const;
 	ProcessingState stateSessions() const;
 	ProcessingState stateOtherData() const;
@@ -114,6 +116,9 @@ private:
 	int _userpicsWritten = 0;
 	int _userpicsCount = 0;
 
+	int _storiesWritten = 0;
+	int _storiesCount = 0;
+
 	// rpl::variable<State> fails to compile in MSVC :(
 	State _state;
 	rpl::event_stream<State> _stateChanges;
@@ -273,6 +278,9 @@ void ControllerObject::fillExportSteps() {
 	if (_settings.types & Type::Userpics) {
 		_steps.push_back(Step::Userpics);
 	}
+	if (_settings.types & Type::Stories) {
+		_steps.push_back(Step::Stories);
+	}
 	if (_settings.types & Type::Contacts) {
 		_steps.push_back(Step::Contacts);
 	}
@@ -306,6 +314,9 @@ void ControllerObject::fillSubstepsInSteps(const ApiWrap::StartInfo &info) {
 	if (_settings.types & Settings::Type::Userpics) {
 		push(Step::Userpics, 1);
 	}
+	if (_settings.types & Settings::Type::Stories) {
+		push(Step::Stories, 1);
+	}
 	if (_settings.types & Settings::Type::Contacts) {
 		push(Step::Contacts, 1);
 	}
@@ -344,6 +355,7 @@ void ControllerObject::exportNext() {
 	case Step::DialogsList: return collectDialogsList();
 	case Step::PersonalInfo: return exportPersonalInfo();
 	case Step::Userpics: return exportUserpics();
+	case Step::Stories: return exportStories();
 	case Step::Contacts: return exportContacts();
 	case Step::Sessions: return exportSessions();
 	case Step::OtherData: return exportOtherData();
@@ -416,6 +428,32 @@ void ControllerObject::exportUserpics() {
 	});
 }
 
+void ControllerObject::exportStories() {
+	_api.requestStories([=](Data::StoriesInfo &&start) {
+		if (ioCatchError(_writer->writeStoriesStart(start))) {
+			return false;
+		}
+		_storiesWritten = 0;
+		_storiesCount = start.count;
+		return true;
+	}, [=](DownloadProgress progress) {
+		setState(stateStories(progress));
+		return true;
+	}, [=](Data::StoriesSlice &&slice) {
+		if (ioCatchError(_writer->writeStoriesSlice(slice))) {
+			return false;
+		}
+		_storiesWritten += slice.list.size();
+		setState(stateStories(DownloadProgress()));
+		return true;
+	}, [=] {
+		if (ioCatchError(_writer->writeStoriesEnd())) {
+			return;
+		}
+		exportNext();
+	});
+}
+
 void ControllerObject::exportContacts() {
 	setState(stateContacts());
 	_api.requestContacts([=](Data::ContactsList &&result) {
@@ -533,7 +571,21 @@ ProcessingState ControllerObject::stateUserpics(
 	return prepareState(Step::Userpics, [&](ProcessingState &result) {
 		result.entityIndex = _userpicsWritten + progress.itemIndex;
 		result.entityCount = std::max(_userpicsCount, result.entityIndex);
-		result.bytesType = ProcessingState::FileType::Photo;
+		result.bytesRandomId = progress.randomId;
+		if (!progress.path.isEmpty()) {
+			const auto last = progress.path.lastIndexOf('/');
+			result.bytesName = progress.path.mid(last + 1);
+		}
+		result.bytesLoaded = progress.ready;
+		result.bytesCount = progress.total;
+	});
+}
+
+ProcessingState ControllerObject::stateStories(
+		const DownloadProgress &progress) const {
+	return prepareState(Step::Stories, [&](ProcessingState &result) {
+		result.entityIndex = _storiesWritten + progress.itemIndex;
+		result.entityCount = std::max(_storiesCount, result.entityIndex);
 		result.bytesRandomId = progress.randomId;
 		if (!progress.path.isEmpty()) {
 			const auto last = progress.path.lastIndexOf('/');
@@ -586,7 +638,6 @@ void ControllerObject::fillMessagesState(
 		: ProcessingState::EntityType::Chat;
 	result.itemIndex = _messagesWritten + progress.itemIndex;
 	result.itemCount = std::max(_messagesCount, result.itemIndex);
-	result.bytesType = ProcessingState::FileType::File; // TODO
 	result.bytesRandomId = progress.randomId;
 	if (!progress.path.isEmpty()) {
 		const auto last = progress.path.lastIndexOf('/');
diff --git a/Telegram/SourceFiles/export/export_controller.h b/Telegram/SourceFiles/export/export_controller.h
index e9b08acdc..fae4b54a1 100644
--- a/Telegram/SourceFiles/export/export_controller.h
+++ b/Telegram/SourceFiles/export/export_controller.h
@@ -38,21 +38,12 @@ struct ProcessingState {
 		DialogsList,
 		PersonalInfo,
 		Userpics,
+		Stories,
 		Contacts,
 		Sessions,
 		OtherData,
 		Dialogs,
 	};
-	enum class FileType {
-		None,
-		Photo,
-		Video,
-		VoiceMessage,
-		VideoMessage,
-		Sticker,
-		GIF,
-		File,
-	};
 	enum class EntityType {
 		Chat,
 		SavedMessages,
@@ -75,7 +66,6 @@ struct ProcessingState {
 	int itemCount = 0;
 
 	uint64 bytesRandomId = 0;
-	FileType bytesType = FileType::None;
 	QString bytesName;
 	int64 bytesLoaded = 0;
 	int64 bytesCount = 0;
diff --git a/Telegram/SourceFiles/export/export_settings.h b/Telegram/SourceFiles/export/export_settings.h
index beac47760..be2e1b782 100644
--- a/Telegram/SourceFiles/export/export_settings.h
+++ b/Telegram/SourceFiles/export/export_settings.h
@@ -57,13 +57,18 @@ struct Settings {
 		PublicGroups        = 0x100,
 		PrivateChannels     = 0x200,
 		PublicChannels      = 0x400,
+		Stories             = 0x800,
 
 		GroupsMask          = PrivateGroups | PublicGroups,
 		ChannelsMask        = PrivateChannels | PublicChannels,
 		GroupsChannelsMask  = GroupsMask | ChannelsMask,
 		NonChannelChatsMask = PersonalChats | BotChats | PrivateGroups,
 		AnyChatsMask        = PersonalChats | BotChats | GroupsChannelsMask,
-		NonChatsMask        = PersonalInfo | Userpics | Contacts | Sessions,
+		NonChatsMask        = (PersonalInfo
+			| Userpics
+			| Contacts
+			| Stories
+			| Sessions),
 		AllMask             = NonChatsMask | OtherData | AnyChatsMask,
 	};
 	using Types = base::flags<Type>;
@@ -91,6 +96,7 @@ struct Settings {
 		return Type::PersonalInfo
 			| Type::Userpics
 			| Type::Contacts
+			| Type::Stories
 			| Type::PersonalChats
 			| Type::PrivateGroups;
 	}
diff --git a/Telegram/SourceFiles/export/output/export_output_abstract.h b/Telegram/SourceFiles/export/output/export_output_abstract.h
index b98f65422..7a2bb65ea 100644
--- a/Telegram/SourceFiles/export/output/export_output_abstract.h
+++ b/Telegram/SourceFiles/export/output/export_output_abstract.h
@@ -14,6 +14,8 @@ namespace Data {
 struct PersonalInfo;
 struct UserpicsInfo;
 struct UserpicsSlice;
+struct StoriesInfo;
+struct StoriesSlice;
 struct ContactsList;
 struct SessionsList;
 struct DialogsInfo;
@@ -55,6 +57,12 @@ public:
 		const Data::UserpicsSlice &data) = 0;
 	[[nodiscard]] virtual Result writeUserpicsEnd() = 0;
 
+	[[nodiscard]] virtual Result writeStoriesStart(
+		const Data::StoriesInfo &data) = 0;
+	[[nodiscard]] virtual Result writeStoriesSlice(
+		const Data::StoriesSlice &data) = 0;
+	[[nodiscard]] virtual Result writeStoriesEnd() = 0;
+
 	[[nodiscard]] virtual Result writeContactsList(
 		const Data::ContactsList &data) = 0;
 
diff --git a/Telegram/SourceFiles/export/output/export_output_html.cpp b/Telegram/SourceFiles/export/output/export_output_html.cpp
index 00c4155ad..efa4a7599 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html.cpp
@@ -35,11 +35,23 @@ constexpr auto kStickerMaxWidth = 384;
 constexpr auto kStickerMaxHeight = 384;
 constexpr auto kStickerMinWidth = 80;
 constexpr auto kStickerMinHeight = 80;
+constexpr auto kStoryThumbWidth = 45;
+constexpr auto kStoryThumbHeight = 80;
+
+constexpr auto kChatsPriority = 0;
+constexpr auto kContactsPriority = 2;
+constexpr auto kFrequentContactsPriority = 3;
+constexpr auto kUserpicsPriority = 4;
+constexpr auto kStoriesPriority = 5;
+constexpr auto kSessionsPriority = 6;
+constexpr auto kWebSessionsPriority = 7;
+constexpr auto kOtherPriority = 8;
 
 const auto kLineBreak = QByteArrayLiteral("<br>");
 
 using Context = details::HtmlContext;
 using UserpicData = details::UserpicData;
+using StoryData = details::StoryData;
 using PeersMap = details::PeersMap;
 using MediaData = details::MediaData;
 
@@ -347,6 +359,11 @@ struct UserpicData {
 	QByteArray lastName;
 };
 
+struct StoryData {
+	QString imageLink;
+	QString largeLink;
+};
+
 class PeersMap {
 public:
 	using Peer = Data::Peer;
@@ -503,6 +520,14 @@ public:
 		const QByteArray &details,
 		const QByteArray &info,
 		const QString &link = QString());
+	[[nodiscard]] QByteArray pushStoriesListEntry(
+		const StoryData &story,
+		const QByteArray &name,
+		const QByteArrayList &details,
+		const QByteArray &info,
+		const std::vector<Data::TextPart> &caption,
+		const QString &internalLinksDomain,
+		const QString &link = QString());
 	[[nodiscard]] QByteArray pushSessionListEntry(
 		int apiId,
 		const QByteArray &name,
@@ -750,6 +775,75 @@ QByteArray HtmlWriter::Wrap::pushListEntry(
 		info);
 }
 
+QByteArray HtmlWriter::Wrap::pushStoriesListEntry(
+		const StoryData &story,
+		const QByteArray &name,
+		const QByteArrayList &details,
+		const QByteArray &info,
+		const std::vector<Data::TextPart> &caption,
+		const QString &internalLinksDomain,
+		const QString &link) {
+	auto result = pushDiv("entry clearfix");
+	if (!link.isEmpty()) {
+		result.append(pushTag("a", {
+			{ "class", "pull_left userpic_wrap" },
+			{ "href", relativePath(link).toUtf8() + "#allow_back" },
+		}));
+	} else {
+		result.append(pushDiv("pull_left userpic_wrap"));
+	}
+	if (!story.imageLink.isEmpty()) {
+		const auto sizeStyle = "width: "
+			+ Data::NumberToString(kStoryThumbWidth)
+			+ "px; height: "
+			+ Data::NumberToString(kStoryThumbHeight)
+			+ "px";
+		result.append(pushTag("img", {
+			{ "class", "story" },
+			{ "style", sizeStyle },
+			{ "src", relativePath(story.imageLink).toUtf8() },
+			{ "empty", "" }
+		}));
+	}
+	result.append(popTag());
+	result.append(pushDiv("body"));
+	if (!info.isEmpty()) {
+		result.append(pushDiv("pull_right info details"));
+		result.append(SerializeString(info));
+		result.append(popTag());
+	}
+	if (!name.isEmpty()) {
+		if (!link.isEmpty()) {
+			result.append(pushTag("a", {
+				{ "class", "block_link expanded" },
+				{ "href", relativePath(link).toUtf8() + "#allow_back" },
+			}));
+		}
+		result.append(pushDiv("name bold"));
+		result.append(SerializeString(name));
+		result.append(popTag());
+		if (!link.isEmpty()) {
+			result.append(popTag());
+		}
+	}
+	const auto text = caption.empty()
+		? QByteArray()
+		: FormatText(caption, internalLinksDomain, _base);
+	if (!text.isEmpty()) {
+		result.append(pushDiv("text"));
+		result.append(text);
+		result.append(popTag());
+	}
+	for (const auto &detail : details) {
+		result.append(pushDiv("details_entry details"));
+		result.append(SerializeString(detail));
+		result.append(popTag());
+	}
+	result.append(popTag());
+	result.append(popTag());
+	return result;
+}
+
 QByteArray HtmlWriter::Wrap::pushSessionListEntry(
 		int apiId,
 		const QByteArray &name,
@@ -1980,6 +2074,7 @@ Result HtmlWriter::start(
 		"images/section_other.png",
 		"images/section_photos.png",
 		"images/section_sessions.png",
+		"images/section_stories.png",
 		"images/section_web.png",
 		"js/script.js",
 	};
@@ -2176,13 +2271,114 @@ QString HtmlWriter::userpicsFilePath() const {
 
 void HtmlWriter::pushUserpicsSection() {
 	pushSection(
-		4,
+		kUserpicsPriority,
 		"Profile pictures",
 		"photos",
 		_userpicsCount,
 		userpicsFilePath());
 }
 
+Result HtmlWriter::writeStoriesStart(const Data::StoriesInfo &data) {
+	Expects(_summary != nullptr);
+	Expects(_stories == nullptr);
+
+	_storiesCount = data.count;
+	if (!_storiesCount) {
+		return Result::Success();
+	}
+	_stories = fileWithRelativePath(storiesFilePath());
+
+	auto block = _stories->pushHeader(
+		"Stories archive",
+		mainFileRelativePath());
+	block.append(_stories->pushDiv("page_body list_page"));
+	block.append(_stories->pushDiv("entry_list"));
+	if (const auto result = _stories->writeBlock(block); !result) {
+		return result;
+	}
+	return Result::Success();
+}
+
+Result HtmlWriter::writeStoriesSlice(const Data::StoriesSlice &data) {
+	Expects(_stories != nullptr);
+
+	_storiesCount -= data.skipped;
+	if (data.list.empty()) {
+		return Result::Success();
+	}
+	auto block = QByteArray();
+	for (const auto &story : data.list) {
+		auto data = StoryData{};
+		using SkipReason = Data::File::SkipReason;
+		const auto &file = story.file();
+		Assert(!file.relativePath.isEmpty()
+			|| file.skipReason != SkipReason::None);
+		auto status = QByteArrayList();
+		if (story.pinned) {
+			status.append("Saved to Profile");
+		}
+		if (story.expires > 0) {
+			status.append("Expiring: " + Data::FormatDateTime(story.expires));
+		}
+		status.append([&]() -> Data::Utf8String {
+			switch (file.skipReason) {
+			case SkipReason::Unavailable:
+				return "(Story unavailable, please try again later)";
+			case SkipReason::FileSize:
+				return "(Story exceeds maximum size. "
+					"Change data exporting settings to download.)";
+			case SkipReason::FileType:
+				return "(Story not included. "
+					"Change data exporting settings to download.)";
+			case SkipReason::None: return Data::FormatFileSize(file.size);
+			}
+			Unexpected("Skip reason while writing story path.");
+		}());
+		const auto &path = story.file().relativePath;
+		const auto &image = story.thumb().file.relativePath.isEmpty()
+			? story.file().relativePath
+			: story.thumb().file.relativePath;
+		data.imageLink = Data::WriteImageThumb(
+			_settings.path,
+			image,
+			kStoryThumbWidth * 2,
+			kStoryThumbHeight * 2);
+		const auto info = (story.date > 0)
+			? Data::FormatDateTime(story.date)
+			: QByteArray();
+		block.append(_stories->pushStoriesListEntry(
+			data,
+			(path.isEmpty() ? QString("Story unavailable") : path).toUtf8(),
+			status,
+			info,
+			story.caption,
+			_environment.internalLinksDomain,
+			path));
+	}
+	return _stories->writeBlock(block);
+}
+
+Result HtmlWriter::writeStoriesEnd() {
+	pushStoriesSection();
+	if (_stories) {
+		return base::take(_stories)->close();
+	}
+	return Result::Success();
+}
+
+QString HtmlWriter::storiesFilePath() const {
+	return "lists/stories.html";
+}
+
+void HtmlWriter::pushStoriesSection() {
+	pushSection(
+		kStoriesPriority,
+		"Stories archive",
+		"stories",
+		_storiesCount,
+		storiesFilePath());
+}
+
 Result HtmlWriter::writeContactsList(const Data::ContactsList &data) {
 	Expects(_summary != nullptr);
 
@@ -2228,7 +2424,7 @@ Result HtmlWriter::writeSavedContacts(const Data::ContactsList &data) {
 	}
 
 	pushSection(
-		2,
+		kContactsPriority,
 		"Contacts",
 		"contacts",
 		data.list.size(),
@@ -2294,7 +2490,7 @@ Result HtmlWriter::writeFrequentContacts(const Data::ContactsList &data) {
 	}
 
 	pushSection(
-		3,
+		kFrequentContactsPriority,
 		"Frequent contacts",
 		"frequent",
 		size,
@@ -2360,7 +2556,7 @@ Result HtmlWriter::writeSessions(const Data::SessionsList &data) {
 	}
 
 	pushSection(
-		5,
+		kSessionsPriority,
 		"Sessions",
 		"sessions",
 		data.list.size(),
@@ -2406,7 +2602,7 @@ Result HtmlWriter::writeWebSessions(const Data::SessionsList &data) {
 	}
 
 	pushSection(
-		6,
+		kWebSessionsPriority,
 		"Web sessions",
 		"web",
 		data.webList.size(),
@@ -2418,7 +2614,7 @@ Result HtmlWriter::writeOtherData(const Data::File &data) {
 	Expects(_summary != nullptr);
 
 	pushSection(
-		7,
+		kOtherPriority,
 		"Other data",
 		"other",
 		1,
@@ -2447,7 +2643,7 @@ Result HtmlWriter::writeDialogsStart(const Data::DialogsInfo &data) {
 	}
 
 	pushSection(
-		0,
+		kChatsPriority,
 		"Chats",
 		"chats",
 		data.chats.size() + data.left.size(),
diff --git a/Telegram/SourceFiles/export/output/export_output_html.h b/Telegram/SourceFiles/export/output/export_output_html.h
index a2235d130..c1dee2ffd 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.h
+++ b/Telegram/SourceFiles/export/output/export_output_html.h
@@ -35,6 +35,7 @@ private:
 };
 
 struct UserpicData;
+struct StoryData;
 class PeersMap;
 struct MediaData;
 
@@ -59,6 +60,10 @@ public:
 	Result writeUserpicsSlice(const Data::UserpicsSlice &data) override;
 	Result writeUserpicsEnd() override;
 
+	Result writeStoriesStart(const Data::StoriesInfo &data) override;
+	Result writeStoriesSlice(const Data::StoriesSlice &data) override;
+	Result writeStoriesEnd() override;
+
 	Result writeContactsList(const Data::ContactsList &data) override;
 
 	Result writeSessionsList(const Data::SessionsList &data) override;
@@ -125,8 +130,10 @@ private:
 		const Data::PersonalInfo &data,
 		const QString &userpicPath);
 	void pushUserpicsSection();
+	void pushStoriesSection();
 
 	[[nodiscard]] QString userpicsFilePath() const;
+	[[nodiscard]] QString storiesFilePath() const;
 
 	[[nodiscard]] QByteArray wrapMessageLink(
 		int messageId,
@@ -149,6 +156,9 @@ private:
 	int _userpicsCount = 0;
 	std::unique_ptr<Wrap> _userpics;
 
+	int _storiesCount = 0;
+	std::unique_ptr<Wrap> _stories;
+
 	QString _dialogsRelativePath;
 	Data::DialogInfo _dialog;
 	DialogsMode _dialogsMode = DialogsMode::None;
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index 1c6ba2c87..9dfd21620 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -887,6 +887,77 @@ Result JsonWriter::writeUserpicsEnd() {
 	return _output->writeBlock(popNesting());
 }
 
+Result JsonWriter::writeStoriesStart(const Data::StoriesInfo &data) {
+	Expects(_output != nullptr);
+
+	auto block = prepareObjectItemStart("stories");
+	return _output->writeBlock(block + pushNesting(Context::kArray));
+}
+
+Result JsonWriter::writeStoriesSlice(const Data::StoriesSlice &data) {
+	Expects(_output != nullptr);
+
+	if (data.list.empty()) {
+		return Result::Success();
+	}
+
+	auto block = QByteArray();
+	for (const auto &story : data.list) {
+		using SkipReason = Data::File::SkipReason;
+		const auto &file = story.file();
+		Assert(!file.relativePath.isEmpty()
+			|| file.skipReason != SkipReason::None);
+		const auto path = [&]() -> Data::Utf8String {
+			switch (file.skipReason) {
+			case SkipReason::Unavailable:
+				return "(Photo unavailable, please try again later)";
+			case SkipReason::FileSize:
+				return "(Photo exceeds maximum size. "
+					"Change data exporting settings to download.)";
+			case SkipReason::FileType:
+				return "(Photo not included. "
+					"Change data exporting settings to download.)";
+			case SkipReason::None: return FormatFilePath(file);
+			}
+			Unexpected("Skip reason while writing story path.");
+		}();
+		block.append(prepareArrayItemStart());
+		block.append(SerializeObject(_context, {
+			{
+				"date",
+				story.date ? SerializeDate(story.date) : QByteArray()
+			},
+			{
+				"date_unixtime",
+				story.date ? SerializeDateRaw(story.date) : QByteArray()
+			},
+			{
+				"expires",
+				story.expires ? SerializeDate(story.expires) : QByteArray()
+			},
+			{
+				"expires_unixtime",
+				story.expires ? SerializeDateRaw(story.expires) : QByteArray()
+			},
+			{
+				"pinned",
+				story.pinned ? "true" : "false"
+			},
+			{
+				"media",
+				SerializeString(path)
+			},
+		}));
+	}
+	return _output->writeBlock(block);
+}
+
+Result JsonWriter::writeStoriesEnd() {
+	Expects(_output != nullptr);
+
+	return _output->writeBlock(popNesting());
+}
+
 Result JsonWriter::writeContactsList(const Data::ContactsList &data) {
 	Expects(_output != nullptr);
 
diff --git a/Telegram/SourceFiles/export/output/export_output_json.h b/Telegram/SourceFiles/export/output/export_output_json.h
index 49f7035b0..879918fce 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.h
+++ b/Telegram/SourceFiles/export/output/export_output_json.h
@@ -44,6 +44,10 @@ public:
 	Result writeUserpicsSlice(const Data::UserpicsSlice &data) override;
 	Result writeUserpicsEnd() override;
 
+	Result writeStoriesStart(const Data::StoriesInfo &data) override;
+	Result writeStoriesSlice(const Data::StoriesSlice &data) override;
+	Result writeStoriesEnd() override;
+
 	Result writeContactsList(const Data::ContactsList &data) override;
 
 	Result writeSessionsList(const Data::SessionsList &data) override;
diff --git a/Telegram/SourceFiles/export/view/export_view_content.cpp b/Telegram/SourceFiles/export/view/export_view_content.cpp
index fac8b3d76..9813321ef 100644
--- a/Telegram/SourceFiles/export/view/export_view_content.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_content.cpp
@@ -89,6 +89,13 @@ Content ContentFromState(
 	case Step::Contacts:
 		pushMain(tr::lng_export_option_contacts(tr::now));
 		break;
+	case Step::Stories:
+		pushMain(tr::lng_export_option_stories(tr::now));
+		pushBytes(
+			"story" + QString::number(state.entityIndex),
+			state.bytesName,
+			state.bytesRandomId);
+		break;
 	case Step::Sessions:
 		pushMain(tr::lng_export_option_sessions(tr::now));
 		break;
diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp
index d01d4eb53..94e00b43a 100644
--- a/Telegram/SourceFiles/export/view/export_view_settings.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp
@@ -173,6 +173,11 @@ void SettingsWidget::setupFullExportOptions(
 		tr::lng_export_option_contacts(tr::now),
 		Type::Contacts,
 		tr::lng_export_option_contacts_about(tr::now));
+	addOptionWithAbout(
+		container,
+		tr::lng_export_option_stories(tr::now),
+		Type::Stories,
+		tr::lng_export_option_stories_about(tr::now));
 	addHeader(container, tr::lng_export_header_chats(tr::now));
 	addOption(
 		container,

From 119ee6044aea3cae32732ad655c9c6587460a2ab Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Jun 2023 22:03:34 +0400
Subject: [PATCH 308/676] Update stories icons in some places.

---
 .../icons/info/info_media_stories.png         | Bin 0 -> 729 bytes
 .../icons/info/info_media_stories@2x.png      | Bin 0 -> 1463 bytes
 .../icons/info/info_media_stories@3x.png      | Bin 0 -> 2222 bytes
 .../icons/mediaview/viewer_share.png          | Bin 0 -> 671 bytes
 .../icons/mediaview/viewer_share@2x.png       | Bin 0 -> 1278 bytes
 .../icons/mediaview/viewer_share@3x.png       | Bin 0 -> 1959 bytes
 Telegram/Resources/icons/settings/stories.png | Bin 692 -> 667 bytes
 .../Resources/icons/settings/stories@2x.png   | Bin 1311 -> 1276 bytes
 .../Resources/icons/settings/stories@3x.png   | Bin 1923 -> 1848 bytes
 Telegram/Resources/langs/lang.strings         |   2 +
 Telegram/SourceFiles/info/info.style          |   1 +
 .../info/media/info_media_buttons.h           |   2 +-
 .../profile/info_profile_inner_widget.cpp     |   2 +-
 .../SourceFiles/media/view/media_view.style   |   2 +-
 .../SourceFiles/window/window_main_menu.cpp   |  39 +++++++++---------
 15 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 Telegram/Resources/icons/info/info_media_stories.png
 create mode 100644 Telegram/Resources/icons/info/info_media_stories@2x.png
 create mode 100644 Telegram/Resources/icons/info/info_media_stories@3x.png
 create mode 100644 Telegram/Resources/icons/mediaview/viewer_share.png
 create mode 100644 Telegram/Resources/icons/mediaview/viewer_share@2x.png
 create mode 100644 Telegram/Resources/icons/mediaview/viewer_share@3x.png

diff --git a/Telegram/Resources/icons/info/info_media_stories.png b/Telegram/Resources/icons/info/info_media_stories.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b4cb99beb7eadffe7dc268a251206ffc9ee313d
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00009a7bBm000XU
z000XU0RWnu7ytkQi%CR5R7i>KQq4;$aTL8XPa2ZKMIxzKh@fs1LL?Y5MZ(+(inCBc
za4iYC4<-EzLZXE(X5mT#-Kj+s(kciIaiJ3~gh2;15XBsYx9i!Muc-%b<yoG4?m6f8
z0kFaf{{<?QDiVp1Bv~qz%w{tHY;SKX6be4O=-<a0jV71NHJeSZ*W2&+i^XEI*#v-K
zFi25UDwW#U*!X#If*?ktQ8t@ZtJRzlf*>A`=lc3uqtX1(-RJYYy}bnjfiIO(sdRUD
z_j~Soy?!(r`Tc%A;#e$3QPleS`ZofK#Ue?P9CB}OZ)ay`QM|Ra#W2k2=_y}#gTXMF
zOgLVCzkf2Buq+#k#SjGHtXQqqqoX6f0cU4trBaDQk|cS4er~Z?7>2pJy5j$NKKZ6N
zj^EteaCIokvh3a6ozZAisZ<XS4@#wSUJwq4O(qks0GUkIZnu{;YPDK8jyD>OLZKiK
z2;O;{&8FAuc?Adr0+wZ$1pvTsIILEy5{YE~F^0q8eBK|oMT(|rnM}6KT__Z$(`mci
z?smK9dqktr*Vk8GC#X~^pWY^dAPR+|TrTT$I-}9Zd8c~4PSf<VS|4zDcsLjgL?Y2V
zd2(_>(=@{{`FwtJbCa`jaBvU`g?PCG0E(i|&(DcOf>Yn)@%Vf`6y+Wo!?2f^mt-=@
zHvj+}4##*r{`8_2K@dd0-xrI;-v|JJcs$<icK7%9zf@uvCYQ^XO@A#L+}_@b#o~*L
zi`i`U`1m-TPB{XdPM1t3F${ZpdKwG{{HuR}%jKdds?+IQUS1v_AKPp;48s7xY&Oqk
zv-|sdtycR(>vycJtq}x~$z*D^TCdl0I-LL@6bf-1|5xi3R^W%<hhXpD#S@Ay00000
LNkvXXu0mjf$Gl0S

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_media_stories@2x.png b/Telegram/Resources/icons/info/info_media_stories@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc0a2f6e32f22765f563299d97b6962f1bbd0091
GIT binary patch
literal 1463
zcmV;o1xWgdP)<h;3K|Lk000e1NJLTq002M$002M;0ssI2B@5<>00009a7bBm000XU
z000XU0RWnu7ytkTX-PyuRA_<inO#UzZyd)Toz2Y|o3H3}T1hSp$3(=`1W~aUw8cO#
zBDzp9Og0#SFW?Kc1*YOc1wpaIAfz_Qu99N0qKkPUl-)Gu8^RpS(8RsC)aQTk`*See
zjz@jeKm5<<>UjK~@ALhgo#*8|2O$;~78Vv37MA}nLBt&+A|g^#Qxg&r#A0!DbhOcE
zoSvR0-U@k=l9JSFwaH}K+}y-FuvjcRWwo`nb#-+Df#9@q`r*Qb3!|f>cn=#J8#bG*
zy1JTD=H}+Yzno5IQ&ZE~vu95+HbMxAL?XRjzp=3av9`9hK7anK(P-pyd31DiP|)t@
zGbSd+YPC`o{`&PRGc)s4k|TtWR4S#?xZQ4@P8Smsv+q?r9#5rGEiNv?g-@P5If1Bt
zC@wBuSy_P)FJ8PzNJu!)<y<bes;Ww_*T==h9aBO&Zr!@|=g%LEvB%@NbLY+}BsdC}
zFJE3;Tf-PT9F8kju8^{=si|pbXgG7`3@JnZL`Fv1Y&MLs%jJ^G<)m!SpFa;zV{2<G
zDNp~rdi4rgs;H<SXv^Vn78VvT#$K;CH8qu>^Iv3SWNdG5V~o4IyNR2Zm6gG*F_}!n
z&HrU$Vgd$lp-@P#%+Jq%`t+$*tCdQn%>9i<Bh-+Wmv^+J{>aPA1NVmyAJQu|8V&qV
z7-OH$S65fZunDnPJTo)1y1JT@l5*s{d+6!ufh7Qs$D@%&Mn=NK>~uQU*Vmzpfq?;r
z!wZkcqxU~Nb8~YrXVJ?F3JM^!OeQ;b?%cO;-{8+LU%te~#vV&DCdgzm$Z`AjZF=SP
z>(@akkw_3i0)fC_Fu<9Gg$05m@4-;1RIs|-cNx5^0EAFbP*7W28}tg7%T-=pPVd0w
za#bqTjT<+}L<id2+cCzov$Oju_Z9#sl}f5hXtmnC3ss7WiVBzz7<PtWCZhQGc!ZGM
zZf7F)%h=dhZf@@U{5(Raxw*NouP=}ix=LthD9HlEVlhH!X=#axI1t~zf6vOwGMmi^
zp$88hBqb&Jm3h5hIN)$NOl%nyz~}Q3LLQHYQPRLHFE77+`xcI)qN4n2j->#&_eWg2
zb2yx?t}eY^j}Wq2t%2V3mzS5}0AtL=HiU@?3V;XcaEL^r(b3Us*RCOitX6AjY3b(X
zreEc!PoJJYf4;uH?sPg2-P~>(8yhjkD=RDeD*cW^mo8oU`ST~7fB*iyNF*Ybj3Lxg
zF(V^`Ub(k`n>TN+uCBt#uC6YIPc~ure7@W5#u&G?wb3i70+N%H5kmF#^;=t8Fs|Rb
zcke{P24H-A9Ai8+HAOE=OG~5P^vA}=;Mi`rXJ=<KX(cu`wxpyaIGEAUaxf|@D<RF*
zt5@ljX0sXZz+$m5?EPV3VbE3fU9lgAu&^+@-HtK-`t>WlQYaLTjEwyL{oCPi=yW>f
z%i~9n9zo4&wfe|;{c->PeP}?TP!KmyPELkyHa9nST(1NnAtCS+FD)${bSG<HhK7dV
z?kJT?vd(`|R8$0;&y$mrWbf054<9hbA3uI1=;<GgMgzC%_3PJME|-+8L?WrGstOMe
zCuK;-@bED8qR3=J_diEyXehPAH9I?-laq4@6RA|%+1a`C>%mFW($Ye0pS*eVhWTDd
zVq)Up;2`v+?d|Q;{LG<LDjg07)Zp{^3<ks9yLai=YD%Tj<MB|_+{>3QPbzEx!o$NK
zKYr|Txu{G&pU+~k7>&l>-roB9dRP=uynFYKnxP8|3r{QdZsOzPwOZ|uA3yLOcFo-B
z>FNFb{R9Vl!k<|$Uc9JKDALl>#9}dgW_|YTSw}|)*;ZIsSXfwCSXfwqe*p0_SSd{x
Rf9wDN002ovPDHLkV1nzm&LIE*

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_media_stories@3x.png b/Telegram/Resources/icons/info/info_media_stories@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..df8a23bbdd4cd4568064dabeffa7897787d3fef6
GIT binary patch
literal 2222
zcmV;f2vPTmP)<h;3K|Lk000e1NJLTq003YB003YJ0ssI2ZTjGE00009a7bBm000XU
z000XU0RWnu7ytkWU`a$lRCt{2n|(-AT^z^noVqsK%%$XevJj!tqNWH7iy9$;_8w`G
z2`MowH3Ey$gbFHYLhq4akdRYREQ_L8X@M<Erim^m<Xhs~(#@&cboV}g+=s(`HmBRY
z+r7qfK7ZX^_WPah`R=})^E+n<0)apv5C{YUfj}S-2m}IwKp@V-Vp;&=<Kq(*6%`N=
zz~}Qh9F9t*(&=<ei(;CXm>8K%R$X1K(P-x8<}d=o!^1&AK}-u|h_!3iUcP*}ySp1(
zl$4Ydo51Ac<hHi9rlzKhj0_Hk!-#m#5*HU&RaIrRS{Jtl!?1yYfz_*5+l1?MI`D<j
z(b2-fLO(x0dX#(o85ABKE|<#>9XiBf*|uf1TGeWGS67!tqZu9^o|>Ba^XJdkuU`!Y
z1MzEYHe0XP+c+{bG*nnvSYBR^VVI}8;3-%vR(^i|)YO#CHKNz+%gV}9Qc?s0fs?6@
z9Xn<)80;@Mxm@niE_e_gk5^MuW7D6$zP`-NOfHv8BB4Ma$j!~wYPH0KLqkJuS560E
zVPW6De<${2a&oeupkT#{6%;eG+3f7>?BU^IJnge*&)g!IR^sF1hlYlLH7JVSxpT+<
zxl08;pP!wbot2eE-Eq3vxpU{t%nWd6dV2cc!GlbTS~iG8BI5gaaBy(TmMu(+S~jd)
zxw5091Gv-D(h?F9LZ<++Slrp!IWRDA`0!ym+jR;Si&a-w2i(zWwE+PEG;3&VY{Xli
zot@pVVFS&rFF|o}F>uFVFsxs{o_-DQ-n|1F)M~Y_uP^-?7A7_}7ECx%6irP{Wkg0&
zQWA=yz@y^gVn$>v0Jyd>3@a)sVo*t0SsC#K8WtADpqPKzzkff_)YH@B<Kx4i7@<%&
zIywsUl$Vz?DCS>UT3UdhqeqXr8ZMDYDl03yySvqD_5J(zLqkI;>N$S=IM8D@o0<K=
z5UErO)U>v?+RxV)=fZ^xHU$u)(Rk#@5sIqbym^CX>+S8On2IV@RaKyGyLaz)DOMtp
zI4Tcay?WJEuZaW(20ncFu(Gl;Ha3=Y5;x%Q?>{>`i+AbUw{Nb7KY#ulIMUwU{`>cD
zqDS@h^?W|x6SC<eBO?R!CpS0O)o@UFZEtT!5X8^V&!#-m(a|9ii98^jE-ET2@SdP3
zx@OH9SHs80$MNu*ni~8Ji^aNf<qB~uqtoej?b_vT;dC)LIEZ&ctyYr=w>Jpqz<~os
zqY-#CH#c|Y%o+D6rjw|sDA0$}(ozx`92tZlNL*apuV252w_90R8HuR_m&;8}P2IF<
z6A5`#Nls1%>eJKHNn}{WAOt}I0|P&N_(1gN^XJbl-N-B!tGT%uk7ZzffA;KIAYCjL
zlgO~RK?s6)dwV~4@PO!1e}BL81*UcD)`7r=h6WM}alFWdMMXt{W35(8y7@(zpP!e>
zWT#J`o|~J)&qPE-eERe$K0e-=aFfXdj)Q}PNy{K<5LmIXTCIA$o^<m|^7!#%sZ=^P
zHim!X@p!ehwcg&|O9qaQkAq_>YuO|X0;4#i(MY;&CuwSGijR+PYiq+lhKGksB$6eg
z%x3e<%nW|)@9$5#b&>{wcZ$VgA(z3W$wXgY-@SYHz(*&`m25T}Kd@S@E@>k|(jai*
zkX|FlTv;;C%gcN8=n)9iXf)15fvG%rijjb-K|CH0{7{~N!{L;dmzS27f>!WNGtR_<
zTWn%tg0ujV1`+o-Q7_^+A~-ns<HwIDPo4y4luBh*R+f|DH*elV5X5S=mXwruLf&E!
zXR73;OG}P}#9}d+&EVX<d)Jxw7m>)wNGk7m@+2lE0^K<|IV3VHZcuu9I&p>8Y&M@d
zb&9fT8W9Kt^Yin#dWAwkB7-A?yu7?_+_*u!a7IQ(wr$(yCgC&!s?j4OBP7BXG)N#2
zG&D32-Dz!YjfjYFpK2Ppb?X-BMq*;3tKnl~V|Z*`T^)WVIy$<mtBdH4LZRUCc<vTX
z7fDG;peMvpoRfeHaD04RB9Wx0r%y~wfP^TDUb=LNiac`LwA=}c#p><t1)X$t#8^^N
zf;qroFi=^Z<#M@7r4qw1rBcbTP1mkn1HCFNEOaT>W|0rj)6+w7>j812Kt@Iel~hy-
z3kx%w&A1f3ULP13=u)^yBqHvZK~c1#qCzMXQjsJS3iWzD$Z5ajnr@yvc>>gssJ*h;
z?4+cmf`WqV?CgyjH&WLlm&<{k&dyFRFOpLQw;>XVz(r&-nTUln`bkJg0HZUEkxJ`=
zT)%!DX!`Qy3sZj;V6)jje*6GRR4Nsf<ym*a<MF`j48yRePoFX(WBc~)K!e$AcFPUx
zHWCsNOePc1mzS4EzlP}OXmEcqyG?0fPMkOa44R*xPfkvzU&G$Ld+Y1#FJ8RJ{IhvM
zZr{EQJhE6Uf7$$-2H0%&+qZ9tqdvJ@zD$2irdYLVmCcIit5>h6EGjr6GBUEDpdc+R
z&Fz^zj*pKIarB5`*vQC;OeS-+80ZKNhf`Ek1j=b7cHS%t^7Hd;HjrsFntl8BQOU{W
za%D1^&Ax`(+FCbBrky=|_DoJrV*jPNxj8d4lf>?^w6rw)$t{YafA^ndLPJ9p3I%4z
z^z`)0moM}3^0sc>>P$&2C@9EcvDhT(=;+w7V~6KE;d!J|DcFf(4~nAw{rxJH>izro
z)z#GtK6fJ`B5WRN=gysT*F$Z&AeBmAzkW@eOgduo=FRru#l^+5v$H>c{*=jN%vTFN
zM@UG>`Sa%+8yi6lz#c~nZH!Dl8Jq9&csz+j5*r&E6B8319W4|J`Fy^wukVW&FLH8n
wu)p`u-Vg``0)apv5C{YUfj}S-2;_gvKVcGYWmoR)@c;k-07*qoM6N<$g6p#^OaK4?

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/viewer_share.png b/Telegram/Resources/icons/mediaview/viewer_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..14861b1ee6630af80b47dfe759dbfc03204b209c
GIT binary patch
literal 671
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfr-=8#WBP}
z@NMwP)0v49&$TsE7rN;1NGhcyo|tgRD`!nkgogICf2?65sZaGcsB<sXko5BO5EDt&
zFiMl#|NG9961yvJf4}>5Z?on3-+$UZ?>ql<uf!SqKNm8#WSB^CwQ7i*itkmF>yOu)
z{`%{!*IzAU&Yj<T>us6Y?5z<xzyH=*$Z)YV$yYT7s!e9xcroKnj@jdn5lRzl4tJkT
ztG1b!V6Y=<?K?MxYgt=2%sHE8H1o~*IHidibN%Y=<{f@G!ADJSrqjY1=bxW`8npPL
z!ddgylPOJ+4Hhzdhrf5aJks{mn(C)E`D@kM>#yT4-k04N!6SAzZ~F1ad(&-pIV~(O
zk;>g3tvCJmi-q@o*3@mkz4v&)mg<$4Uq1K}xBk22#M4h1e*FEH{^0H`7p1AEQ#q!4
zEv-7HxO@BU-lIvj%=+0zGh^0<HNGj^9q+)iEJEko@4wa#3IYk|J6#rqt=1Lm4$*4m
zSP_!7_+rD}9Wi=KelBg;AD|(!;OO(uv(Ku@2yY74nwqf4qwhsY)#|HF(vJ%)_H|5T
zmFs6u)e%cJn%R7i;fUXI;qIeMjGkuA2Vay}J^y?&ZL{K`=S+RPZjBBMiz=+<@~|-<
z+9B<DK~e1Z<BM5al`hO?YCn9?c9!4rgy)}sUf?;w(!;61vFc`yoAdkZ-FM^GUss-Z
x;`nj)Sqnq7w5NLMO%Gmu^~JyczitcvVC~iAGhFpOwh)v!JYD@<);T3K0RRIz8_ECx

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/viewer_share@2x.png b/Telegram/Resources/icons/mediaview/viewer_share@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c6e9341e6004f3e02f502ecabb4a42e54029c4e
GIT binary patch
literal 1278
zcmV<a1OfYrP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGXh}ptR9Fe^SXn4`T@?PzLxyBX
zAwy(}gc8YAQgVSrq=ZNkigH2W#)aGnAwxup5M?Z(loFy0DVahfQ|9^qpT1qI(|Nbo
ze(_)Y^}ZKx`>eg5XFX?~z1Lpn{Q0B)sWYI?z<-+ojo+fTwzduo4Aj)roSvS(y1M!;
z+Hdk?Wo11+KK}FfcXxM}oSghkqF;ge`}@DYzcV%TUs+lCE9BoHsjaPLI<Bv;@9*zP
zQ%z0Hcj$hO85tR2A}T5>JUu-R4h~3DLqmgxhHA@H^XG!Jw6qw>+uPg5#zsg;$nNeg
zv*hOHwzjrnrHe;V!BvnH8G@#*tu5xCk&)5W)upYiEeQX8K?r<&d>k4Yy0*5)M5Lso
z^!E1Z=;(-O`jH?bBO@m#Cu3t{#YksoXW`-D%gf7bDn34bXlO`ZUtiJlrxsgV+nk)7
z(b3V{+gn<^Y*1EKCSx}>HJzWIC%37oDMLd;na}qxeSCaoW@d<8aiAy&!H`8MYHn_h
zn^DzdnVXw8H8m+#Kc?yV`T6AJ1nZ`tpn%J3U|=vYF+n%5u&`ieX2$gtGCDXo?CtFl
z9R>*B*47pm7w6*Qf`=l)qNk@fJUmP!D=RA&78W8vxsRix<Np3W5n-H=kf3U<W2D&m
z*lR?EiiPu79#8o-o|Lrg;wV7!l|z)zqJ(yKc9N#`^>x+uU3+^wfw>D-d3f$DvfJF;
zOtjV2)m%4@5!LqN<AWhpfN_{OCepOCv%{I@nowt%n(ggvEJ?1<w~c6+82RPpr4UI_
zP!MG`GBQ#KBkU9w7Dh#NY-~&jhpNK_EiEkx0fe1!dk+r}j2um-hlj`4P&^<s#SD|5
zpZ_&L*dsbR`swM3F~7dPCM6{aK_em}2xDn!DTEPlij9p$O=rw6FE2Q51wemYii(OD
z?6c=(Z*Pw-r@p>^c6JtPAGHc=6a8y(aq(v{5)%`V5=M(8#l*yX=E<>lcXu;nOG}Gv
z+Re>vU|;~9A#;%Ze^#qfQ&S0o1r!w(C8Pb~5=EUwLIWywO;1n9D~?Qr^pYzmGc%J;
zWx&xSNjZhawC+$F835(Av9VDa8|Q0(e}8FdX<AwuPD(bVC<wPi)%E7)CO9})NP*M|
zTZ{tZ6@pFG)zy&^B_umLTiTC~kB@T&6&4l}3fndyAV3;Obc}69EOvHwfFTWJ+1%W8
zb#;|-aRrr>lo0CT;=<S0SB4V3bar+oA`=r6FE20J9avj9{}qW81(lbV6A7AYZ*Ol!
zl&A#?h)Y*jmpbCp(^DH88!n4XP*qhGF<_~=ySsByqDJI^==%ElXsqP>K~GN)b3+e5
zI5<d<!^1<gl%j!^_^qz45-A%@PEIQE&&$h``QsA3CAv)|C>5q~bkO++>Z7Bh&mI;d
z#g1ECT$F0UgT~vE3Lzz~{4W81ety{7R#sMcL%_@V`T4m7!Wp6y#esvmg$;!dRvjH3
oD9s!{wMm@;bq3TK_#b58Uv8BPryNFOzW@LL07*qoM6N<$f{i9H?f?J)

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/viewer_share@3x.png b/Telegram/Resources/icons/mediaview/viewer_share@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..43310c8956492e9536765475086057a19275159a
GIT binary patch
literal 1959
zcmV;Y2Uz%tP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?5lKWrRA>e5T74{5Z5R)U5XDN3
zn5=w6Qbuc1=3^>qOKFPMW|qyCW|DuhTGp0kv-*eiIW;!2MNJwtq)A~F+FOe$q-2Sr
zlDzM4dtPVP?(;n7xt-^D^vCf>UFW{9`*(fZ=Un%7UH3C@p8BVHK=pv?0o4Pl2UHLI
zbsjJ?zD5fdE;KVU`}60I@kP&yM00cV)2C0jx3^DDPEJitb#`_hJ$iKh{Q0vY%xIuX
zmo9B?ZvI#F_vFbFM@L7asiC}}n>TNYjQW3|ySsbUs#VI1Gy>wfb?bClr5W$*>+|sN
zFoGrui%3pRriOKOb$$5ofsTOw`0=BUkB`EFXB#drFOQlL5fQO?@#6aWdO8StXlQ7|
zh7C$7W2zL81P<aMogEt+`}*~3R8-Xc`}gU%gM-7vhYvSx+C&Fs)5b7Nt8zbn{MfyF
zcV%TIowc*GtEs8kx^*iZlt<5*VNmziuU~uj?kz1XrK;Q5*xb8!FETQc4$7eC(lDs|
z`}gky2M!b!6;aiZnqVhmVq)mv-$-A$aDm2&&6_tfTAG-c6c!dz9?%mL6Z`h<V>th=
zN4<t=)XmS&XKX|Am6(_)&lu%XH3YXUTekT6`ntQjBc(tx<>chVqujA$#}HAnva$qb
z<jU8tU$?ZhymaZ3FlcN7sY6aqPDe)v5?sdd%%k{Kq`GEjXEXc&M7m6Qj6`qWzWwpz
z$BZ@-kJ5%g>5PmF@$wTVP8i7^h}pPtV^dR;SPAJ7y@mlfH8oYd^QTUonswWdOq@A$
z2Ekg|2F)zk1_lQHnf~+l_vg_sDJcoXD1)Dyo6ECSCeM;3OX}+C7?Hx``1tspJ9my8
zIf4*^56|A-9?@K$Bph)Fi~_QTxOnlRY(ObBR<2z6>eVYo7#?x#T)upH=gyrtUZvL0
za4t4B7RZb^1W8j<MN<pxl~${e&U$)!&QNDwb~p>i0Am{}R~!bs5Yl|;Pds|`h!ODq
z{rg?Jc1bTZd^S8h95n$Wy12MlnRhZXGn0Wv$>`$ZVz}Ns2>4=0M@Jb26gUH1U0oTU
zy?y%@-y4rkO7R2*1q}}mQ`=xFssV%W5$Gu5yLa!Lot+Irl(l&M`t>NZsU`*$Z+rIa
zp;(~tLCaE1fkik-s4{73X);0af#O@DSmovAGO?6ccJ=C2s?5QI2W6sSuPM;CZ{OzR
zCDdqt{``5W3}`PeFPVm2xpIYKojiF`CXivv@ZvCa9khD-^r=i#q!Bd8B6*vW?SfU}
z68ro2@0@9;7UPkv(e0|Ot<}Ob%R|VXu3fuE)c}oL1Pwg-lB=q!DB__*hvZ|)T8X>~
z83xq>G)~m8urOJ8(~IbV2slGe!)aK~|4|&>x^;`O3ehVhBt$QQRL{fB%?-V10Rs0x
zc&&v;U4)gD6>cHWtj1xweED))TU)e2@h`?Tsa<q*bW2N%uI0kGg@r{~SsBxW8yOiv
z!H()yV3R{I=Q3LG5-3QK_wV1|*w`qppct3)RM2SPpl!-5{PN{XKtO<m4!l#Sktwu9
zC+zUy!@a$|lv#q-YZ&(S!Gi}3!spMQ{rvoRRhQ<wd-pCy*Lux^ceSFTg0ktQr43uO
zXi-B$0|SCfrnPI=N^3iVS=3sB0EAcZeKCX~#}{}w2?@jSHHy1K%3llq{P|PR6%9ki
zCBebL_>=_(fj}TFDJeOA{5YyZv`Ve5t<j|rW<lsO4BZg~70L-3Wds_pjA(-%7c5vn
zWuS9N;c(>Rj*BvYMj%d4PZu8vOe&<+Ff@#xKYz{uBKbxgNaZR(LlPB(lUe{>vu4ew
zPoL;4XsCs8frk=$4a2E`Uq>*2uV26B?2S`d0<E*xgV$YP0)dQC^QgI-TefT&oxO46
z25utXym><hIcaE*Yg=z`Z_1CB5vq#*{(d?*BU-0nI8rGPJ}1rN*|TSvK1V@80a7h|
zkd&X3#+!y1$ZYk?moK+%+lENU38Ixvr(s%mEHE%IB_)Ld;XV@WXgb1ABPzfu=0_f_
zt*xP<p*XepakO&kG>qv;qD_r_6tx2#fA;JdPHi;VwL(h|qDhQ5klB3vPzTv9G7Rap
z2F<Qsy_$Z_Xo;RXcaDxAb>b|CaJ@tqV$b8_<7s-WnZ@qmbT&w7p2Z0F;@&dV4;PR;
zIN*tki=zv*(#WB3;&B2R$|f#a1)X|&dicG&V#NxS1;Sb}QC(e)tk+O=`PU<4(Y}D7
z5E=wL6%iGLD@kEFLm>R1LZQsYpix=Tj1f8w4i2IsnyGAr99%BrhaJ=^TsWa^t|`)H
z3aFP~|IHOH%M%h3a9NHDx~;A4_U+rknWh(=VZe>djvYHtfFkg`c<}-$CEUdDsE?`#
tR1c^gP(7e}K=pv?0o4Pl2WHy?{{fbxC7#M=G^_vs002ovPDHLkV1lB_m306B

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/stories.png b/Telegram/Resources/icons/settings/stories.png
index 5cc794ddc38ecf373529878ce1bea92f69f52c2d..c41ac06dd731404239fd352eb4b28930076c0edf 100644
GIT binary patch
delta 549
zcmV+=0^0qw1)Bwsfqw-_L_t(I5#>}psQF<O_ALe_3>L|#l*vX>OiC$>K`aIq%BYM!
zb|yv{EWQ?{SPWuhVIn1A;3nVx|L6YP-uw2uzuT?5-ZSWVpXZ$Od(U~#!Q=fsGnq`O
zRI1Tv3<d+Q*ZZ3W7z~D5t@e+x`~ALLF8zN0D^WU~P9~EAfq&rVymq^Nx7#5}y<T^@
zToQ?djv0+ckebb=LZP5}HbyybjCnjBw#J;*YIV2UMXpk*#Od%(3WdV)cznCv91aI@
z`dWopEKVd6R;!ixut6XYz^8J#91(On9m;IAS}K)_kUxWVyN&D6F>bdTsbTZ^++wk?
zQlQMQ_vL}QTz@XTUXS)BiI59wBoZMinteW>!{IPtJ|0q|(cpn*vl$Us0BSy;kHumy
zUa3?{rBXx@w~s_3kq8u~h6tR1&*#7R$KwG&m-ZeHTd&v8=TooOGbfIp>-8Fs#|wqR
zOWSNV+wFF>T5-7c`~BnbD3{BLMta2AY}TxjC?4uZQ-3idgu<@i%a~*ODT(?mkjZ3N
ztHa@7G#ZH$X$oNgLZOh&W}_K4b~>Ht_hPXyo6T&EIpd|u<uWdgt>$$2B!j^q`g%H@
zve_&q`%_?0wOU1%;c%$cYFQG;5qmV5Ob`IWWOX_n{3X2nGMP-VSfn3>Bc7(Pz&@X^
nQmIU*(;oePAB{$7^{?UoV3P6g1z1t(00000NkvXXu0mjf*}f3t

delta 574
zcmV-E0>S;81+)c_fqx!JL_t(I5#>|AtFd7i_FKrWEC!n}2$NEVlQNJLgA^8JFer;M
z9A}`MGAf3Hzknzyg@q)GnB-SV3>E{DQXJpi@%6m#ao+d*0pIsb*L_{r^SsY}-Oo#*
z{IiQr))|#b)$8>>pU>@fGZ>8dd`{;4jdwU4lgZ?Mzb_VxMt`H>a=E}wqtWX1y5H~r
zZ70&;<C#q6cDoe{1*KAncmQz6kB<*Hy;v;bd19Q+W)Fvh#bP0rDHN;Knn)zb)W5vb
z>4dxdathiHZHmQWRDJ_+^Vw{c&*#6fB!$=O-R*X4Hk&{<7!1(ATrPiT3WZ`c8f`Y4
za5x+Y1Xioncz-<BYPAnlrBZ<zW<qe#>+9=uIz>XYS_SLV>U28D(C_!(-ri8jKu9K&
zEtgAF5=MY0UtV4yP~@i}1cSd`uc$1QN(dwHL_(}c!azJ8hfq*Wr_<pn;#=$WdiZqP
z?e_coJMv?|Y&L&>eoCcMMDcjMZnyh5Yd9R@`+^+6?0@likQoC^CUd*pCX-2wqENV8
zZlzLbHk(4B5YO9ew$te(5D4%jhJ(T2`Fz&tbQnc~ARUQBLLz?smbF@Ky<V%;YBG~X
zqlv|0WGcq<`FzOucsxcT5e|og3127_3SBOj!C(Nt$dg1+!n~r<=zhP46ySpCblPY%
zK76fKD>s!&u~@91+lU^*mrEoP+3j|d$pix`m&>_a4#xL$|Np@J0fF@7CM|i5&Hw-a
M07*qoM6N<$f?e4iqyPW_

diff --git a/Telegram/Resources/icons/settings/stories@2x.png b/Telegram/Resources/icons/settings/stories@2x.png
index eafc4902550e5b57acdfaa4733ff903a722dad2e..82e24fc672e249cebea379fe1035fe67bc2afa9d 100644
GIT binary patch
delta 1163
zcmV;61a$kK3j7I>fq!O6L_t(o3GG-(C~jdG{!N+Z`63ykkjP3XD^l!?S&@{Xh!sf|
zh_Wy&SP4-q5M?2vL_&!|BpdUPF*4uhI(h$dzjJ)fIX8Fpp9Syte(&>q&-teJJ-<$8
zcnmXOn1P?20VB=y!NI{%QBl7>9w#TKv9Yn?;bF~e+JO-f5q}L04I3L9?|(n9ude|C
z0or*rApQOQ`}_Of-roLJqHl$UhKgxjTwE$EE3>k)jEuCegP2fn8yg$f*VjKiJ?RJk
zv~F*2x3{;ar>6@F3iN;vYj$>4h?<(3^6~LudbKz0?d>NfCO!rH`445|<Ky}H`5qn~
z9NvqI3qoC9UVkPgCUSz6c6obyZ*6T6FV<^dU;t~U1YcBCgpEbmhlhvc<YXnlFJr8%
ztX5W5i1Fy?C^k0s%V@cd`1ts}y**-he0;>2kPB4c!%iF=93-x#r6n&fF9kR@#KFN~
zVPS!IN=i!D2!-v!!a`!fA-A)$QwWrX+1S`jPELaD?0@Xc&(BX9@Vy5V$H&KlAnZ-f
z1!HS#`#qgbhjSVp9<KeZYHMq0da|>#WruWkcVAy$$2P~Q<|vlMs&kr~o8R2r2!gPw
zzq;1y>gq`J)zwvMYO1<nlt-teq|iv5gWB2INntQBRY)l&CML=UQX1LS)g_E{etymw
zfDt4>aDQcEDfuJeI?c??L{jF5>3a_j4g~h@?ryzTV#x{u5OB_Q<>=^ma&m$&oH$EM
zO9`vam~mNHSdjLanHi>6NfU4Y%gV}RgCip&-Q3*Jh14sX;8;PV2AKW*eOc0Pou;Oy
zEiElQJw4I`f$dLlYinz=$zTO}dU{gd;o%|K8h?!3+}wnO1O|xpB99_LSTX`2^^mR2
zz+Pd1VvpFSFm{H-vm%}?0w_07&7mY>;<2g8Bm2UvAf$8xi1!mYl^8ECFXiRsIXOAf
zU^6o_a^BzHlg%^k?(Q&|cp4iUIdR&KJ(Ako+#JYvc6N{wIQ;r9d_R2XdEeaJ)O#hC
ztbZUS7b7%<goG$ngK<%t3WD&LsoTY>7(qxKm{HEnF2<^}adA=U+1uOu6}Y0Jf^?%~
z{=wu51w%ta!eDrB+^w>jpnGj?4Po>1^FLdDVECY*py%gjLDS;mB4@pwot<UnN}c$+
z<?u-3Sx-kt2dxN_0Nbsy-Q3&^w$szouz#>HmC(;{++aAFq^YT?Nt&2GV|o99YHx2R
z9w_5Q^ZRf(kqe1ybaWK8HXp+DVnIhnMu-7MdU`q&qpq2hlqCLw-re2J$jDGQRrmx$
zy&zUoQ&XdEc-iQ<xHzo6n0I-38F$sUl_B#1UR6~k%df@h>+8F^x+>NL8+R2BV1Hj<
zAGTL%X=z|!AVZChZUKV#L7mR@{%aFSvADQcs6H8GLi76i+SS!nJPc~Wwzjs`*4BTl
z8pNEejnBgB>T2XTSxqr9F)ToRTjNhj_&qNzEiF1a8YK!QKsZf#d3g}3UV{N)m;u8K
d{MQ-y4YQ1YdLI4Z>i_@%07*qoL<FuvV1f%4K^g!6

delta 1198
zcmV;f1X26^37-m(fq#ifL_t(o3GG-}D0NX3zUH~eJeDCvghC$7WhfpfNghb#LGmJA
zC?1sXVt7zq$dD4Ekoke6B#|L94<TbAnf+h?{yUDd_c`vl_v(MS_u;nB+TXYK+H0@9
z);dR_(EhX@(0br^J)ozidR<*z2L}glZ|~2~&xeNxHMOZo*MHa7kByCOY;4@w*?D_=
zgDLpEyu5gMd8w#TWtx$ZQE_qc<>e(YLh$eB=f~HanwnZuQ{(IF%NJ^LoRN`naB#pk
zVr^}$rKP2^vNAtEU$C&TvGK>p2f(kdul4oyCMG7DGzDkW)YQb8a(;eZT3YJq=_#=W
zD06dj9A$ZVS$|^(YH4XXF)=|@BWx=wD$LBxBuwF^0K+zjpFp3VpXa7jA7G=Clas`n
z{r!D^e}B2UqNAht_V%D*YHCU@mx1R_3j4FQwPhfb5E&X8#>B*EAdE6IGdbVb*w`qs
z^lw6NO^%L^U=ZR)g_9C94S^LA5rOm}1`w5(l#~$nlz)|#iGt)$^z`&V?a<JWJStB8
z=H>>>)6-K^Q&V|lN%YLj4B2O3U?3By%ao!rSXo(Ns;;i?@$pfBLH#N!Dne@6-rgP@
z9E^;NBmk_@-QB&lwY9mqSzcbwjN-AeF#^uZ%M+-TdTefPCi`%6bE9z$4Gm<L`$uxh
z&CTWN8h?@Z_xHne0Uha-%pw;ErlcN^kB>oHT3Vt(QBhGuqcZ<lSy{A(#l=O!b#-;6
zXN5Ze0<Ly(alv4Ac9te2BqY#6F$oh~U0n@4((LW+Elt#?MUIY+M2Lu{XFWVTXrY*d
z3GVCb^YQUHIXPkWPYi>coSY;KLJuUiJT2ed-G8NpkRa-ratIkm#$~PN=VzLRd-VSP
zPRp5+j*bqdTtdh&=<Mu_5V*7B^ViqcQQ-IzvGKsb0C&j+7#taz2!T-a5m0gq(C;xp
z78VvbIO$t<b#=u|8BmBw2N&D6v$JFBX9(}_@4*=v8DY%*6(L%oQOqVpYiMYw7<YVp
zoPQ8ylt_3RoTsNJb8~Ysy#WCMxVN-Th`jjtcrg|V0Ge8`z@^is7)z0plS5WYOG^_4
zDHK6LK^GSne49{b5)%_8DB0QB1mD}+D*+Quq5C0q0DZA=?)x*zC}fShyF0F~eMfyg
zwYRquaB_0;msFWiTU#4prlh1u<K5lehku8MQO1LVgQby}t*xzv+Le_RJw2K4sJJ7D
zA&^nMB_ioZ3j_c(>1fbo+<879y$5j;Vq8Z@hd=dy#;CGfWrnNOF#_etz`#Hq4ga{#
z&dyxE>Fn%8qb*k{?s->N7v9cRS64OT=8%vOq+N1$3kwUl>dM;`7Z-=BPPj<6N`Jm#
z{;VH)8L#m~FZK#o;rq*vw8Fwd?zQ#$`WoLJex%3%pnjpw6Pw6Cj-aZlDk&)mt+c(p
zJ*{hFV}l?^M@PAqhK8vn2@4D3UK{wvVT=~X+S;10Jv}{rdV0E`pnxy@l`-0Ce62b>
zJQUaz9v-g#dTM1Ce4#>k;W+TarzfM<)>fFPzD-&US`TPF@T(s912A7pPFoq;2mk;8
M07*qoM6N<$g1MVcUH||9

diff --git a/Telegram/Resources/icons/settings/stories@3x.png b/Telegram/Resources/icons/settings/stories@3x.png
index a1d6678e0911991ab32a1ebfd118d9799ee0efd5..23c70a8ccc06db02b2d3a72756094e83b2f5dcb0 100644
GIT binary patch
delta 1739
zcmV;+1~mDD54aAHfq$Y&L_t(&1?^f}NL5V~_L6zSyJ(qr%u*4A3?WVO!3QxfAc`P@
z_Rve1AwG!EL!@aLiXb71hN1|Hs73mq4<d$GXliN~&?vk{N-7$f+W-CS-|aN}>^b|K
z&KwW?`@Ebrv)8P(zBPN+tXZ?o%+#Oi0o4Pl2UHKJ9#B1Ca(^B$=Vy_PjZIKcP;hXt
zi;Ihcg98-x_xI1t%<$95QL?qQby8ANb#?XIw{H&)4u1Xl`}y-{N=gbx^*ls}hKAPG
z)~>Iw|A~cey?XVEhjuP9&z(Eh(9p2IzfXhE)SjH2lrzH4&Mr1KHZU+yj=^~S&d$!|
z<>fm&JDMP9?ti;^^QK1oA|fKbe*G$pX=!P3a&pqhW{l40=;)P|70u=!^<tSVFE5Xc
zjXi(<yr!lmAt6D|vX?Jk9u4~U|I3#zadB~S%pCh~+_<s3yGxov(o<7Y_wV12jEuCj
zv{Yz>ba5UY9+sAtDjaSAHrQHKRYk%O=^sCSJbd_2zkfy2-Q6w9AqfN|b90V+(tjQS
zs-B)6Qn5fIav*+qdwc8cxie?Zyng*!Dj7XZO-;&YUQYumD=VeC-@SVm9v-fzL}Hkg
zmDPg>52U*vG(LIqgkUr@iFGAK)!W-^*a(K0w6L&1DZ+a5^z<||px^RhVq&DxqN1Y0
z!otGf`hT!WKYjW{VLN~RyulTjVNO<8S1C=8A3rv{rXz`1t{*;p5H*gDjvhTR=zm#R
znW#e`Uc7k0W3EW6kvbzJVh^mZujld}B4eU*i`m&(M@L7}2ss)_y|1sYG2*qH1&sd2
z#zu0w5Ve%Vz|*HsW1tY?km*N7MKM&Iz@xCRFn=ok!dxYG+`D&=bO!>@ty{O03^WoC
zHW1Q2ypsxdVPx^-K!I*;ZMC<zH<IZLHF%xY*49Y-kjpdp$wx~|OXNV2o}Qk*aNz>U
zc>;7|Vxnk}K;Wpa&<;6Zkh8hDnVz1mP!1P1DuIHtm8)R@6MO{Wr%s(xE)blEu~?``
zyMK_K=roXKo|u>*XH2I<gjQgXJUl$?<>f_dm1!fB#GWSDgA6MxD@%q^TQ>xu_Cf-?
zeEG7rLC4RP0E2KOGzt%tsi~=?G4J2MKUSs_b@AdwQV?iVpp;8c2n=Fz<S8mD(z=OL
zDL6JEwlT6PEEOkk!o^<1mZjfQoVAd$b$@kru^k5kNcl+U*h^Fv7z#C{Aj|;SG&qfV
zBf<$oEb1%NQ!Ey$hiu9M6Kc02D{o*>l%1U|s*@5}jZ~+ez_2@$g0{D}$tDk)z09Of
zu|64Q$j;c-))qPJ?AfzqlLy`0+{_S*Qw;T#9Y2%;Q@-I)>J>JhJ$qJISjb?O0)Im|
zW$?=aTU=ZuhoOojeHlmwy=geUxVRYG6smU&A<~%1o-tWbZf<VWKBm*#sBj-szCokr
zfrLXe355e$)3rVji|K;6oSYo3LqrB8z;sHfAo=dyy8^b2jg4#9u8F#ICOSJiMGt|%
z9;#e~R$wS6v*Wc!U4DLkNWuQL;D3iyngoW3Z)<C-QJ=Jv0qo?DEdc=m<ZBI(X=!Ov
z3>tgnfSJTW6BZ8*4Uv=f=FJ<0RX5x<lLH0XR7wK?mYbVP*~d<N#Mvt;DIo`%Trme3
z^v91MNfSSR{w&>6L_8vaj12cL!ijEteB9*9Z!i?=iUbB)`B56_0_v?IT7Q!xMn*;`
zY#A9DMz9jEeOp@_E)zXGJh-U4di5#=3<btZmo9Np_FE{@x4ODIQ7H-m_@;o1I@}M4
zY6JqeSX{1l%*+sYsk%BeCMPFz0fsDLaBz^qhU0pCe7s@x;X@^yUnoUr;)5T<Dms>i
zw0LfAj#7!U!|mI*kD30C!hh#I_~L+4fhJO3>frl#dL*N9M}dS$su-uKkdP1wyKWsw
zvZ?zjLDBsDJW@p6Wa+_u<;oT5?ItY1)ZvCs@8Ev@`gN(l&;wMsVbjA-eTG02ax0B?
zz~$}j?I_byMJ}yskZnl?A{hGk_-Gw#NCpJoj*bqgDPj+Dj)8#zY=1%d`T5xNa5v93
z5g#OpV+G>r)2AnM=Y*~1&Ye5bPlYJ^$R;k${QdnkIv6|0w{PDB=I`IXXJ%$<WHVkT
zlBP$G9-&-80$|XL(<<sk1qB6gmQFPYzEJU+;mz6G+hafy9wDXXYYGqP?(Xh+d3pFi
zkGiHI(ISK4p;{`F%S4A|D32q(L^6q6Su7q`S6B1^USD4y-ZbolQajWh)dQ*rR1c^g
hP(7e};Q!!(e*ghRL<D8R&zk@M002ovPDHLkV1g%1Knwr?

delta 1815
zcmV+y2k7{?4ucPnfq(5uL_t(&1?^f}NL5`B&Q!Xnm1d$on5lWevL5n53qb^h67%+;
zrDj<ahKO|20xcp4d?`V^Lu&QlLs5ok7EzL=qTMfEvQSjAqSC~B{U86qX>s;GYhV6-
z4*sxxan4#Z-^{GN*6f*Cd&v_0PhSCj1@slrS3q9@eFgLtuz%DFSeZ%DiWMtDLqoT2
z-Rke}@9piqdi81t2Zx_Of1W&f^1*`#W>RWK*fnd`96EI9{{8z?Q&WG${zgVd%&6WR
z&@L`6#l^*wlapfZ{2lx8<A;@%$To3wbUb?W=$<`$Y;A4LVV)XHJ3G7l{QU9p@xSJq
zpuT<k2GfN)Y=3NQ-n@BZ5bEyk-nnz9kjK&^si~>hU80V>eEIUig$w)l?~jU#+Pr!5
z+O=y<85a~3WQ1_*)-7jeXH)#<9k;f&zI^$zkwN(R<jIqqoSY3CHpo|xxbpSuS0kvw
z!NHJ_5cwe5a3V<Dy?fWllvl4_?b@|Voq{b}wsduM8GixJ%*-SvCaMEeBjw}cgOk7-
zF+4nsEw^;(QZ;Z3G7v{Z{qp4ti`>`Ow=i$!{|H~by}hjNr%#`{y1Htm*4^E`rKN@N
zu?w_9=HVcGH8(etRuHwdwab?;=gBCagO>B>&reKD3=9l}g@q{xP%cqaRK$99?%X-$
z7;+^<Uw?OUg%$Cor>C=CRaaLl5?`dut5&UIk2PZYvSrH_sjZ64!ltLkH8eD&VYHBG
zhKGm8v17;L;^MU2qHb<(ILhSM-o1NeTB8*kvKHDeXU?3_3U*0pX(@U2?AbFd*G!&`
zyLay<1HOO%zH;SCd2(DX<ZQ?Q2sbh^lFM$ENq;Xduiw9alMNXe85*d`%E}_dhYuf0
zB6@myqJDY%_AQPgV$6vXCy)xVQYcIiU{P*@p})WX+O=!jwryh>MCp6??vWWC9UY=P
z$_86oTM6;Vkt2NJgoFfPNrugH`0!zaARahgy98(;@H8Y(PJDbkD}`gvw?twVQGRZ2
zj(^l6-{A;s-@bi*ex6m&(kNk4Qc~Dm&CY@*=S5ZEIkP3-zJ2>d+2jsJM@N(Twzf9D
z*z4D?iCF~!yHPZ7RMgkk6YSNiS2>)RlE}x|-49$27Fsuffq@(b$tin#`{d+g4qIbm
zBh7NkRs)ZOV}5>qg!S&-JEDaIy9B~nnSUd}!NDBP>({S;`t%75IFn^%WgJdS+3=?~
zZrn%=D7uIi5|T?O6cLU%IXMXjX#_zCO@#39@b~ZE_w@A8xF{jv7^*K4<2#1ho;Xz#
z==ShsaSm_azRl+`%t~xU?0Z7tw**mc5~pfH6A)S2@$?OW2w|EpfIJHafTETPVt;yi
z+H$!y`!bb0MF$TaRN)VaAYb9HotCrI$Ao(H2Kmq^>D$}e$xuba=g*(lty{;($1Iw&
zs9ZFNz)ej}WFPvTl8O;U+5CWH`2@nZoW32JD@Z{NP?E`=gsE(kLuO8mWQCJhiF$bY
z^l1q@{+&jTk;G9w$q_NhgM}e1$$u<{P%<+!NlKC^FE1xSK2cIqLTG4~@tGxN0|EjF
z3lS2hNJ3y?`uOqVB*-Dqy_4T&#e12cWIp5tbHx6$cMcH|5n?RjW2a7?B0EG0RARUQ
z5EmAVZrZeo1<|0b&-Mjy<OCXd11M72%9pjQs;Wx<vx1IGmoAa`=;)~Yy?<lUK2%wR
zh`Uy$w>t+89H5GhaBxkdsBwY^i)@R;3kwTPnyYAnEwr$5ie$lz;ul#3nRWK;S)~Z*
zy^%Nw+-oaE5a*AHi6LB=sOav?fVgAFj>nH5<0>#MElpepcNCkpv$NA+!;Kp^xV#D{
z*&C3$x;ll@8nENLgY4{V+<!A^+<``cOb-nNqJjp-E)odr0rG8jc2-g7UnDMwn}K-v
z@#9DG4Pgpbo8qkhyHQl;Y>tbLC%;Rf+ClV%@ZrFtM~^Jmct+L0zH`wY<+qkp_?DEE
z^y}9z!`6`O$*I6MDUzF;OB>QaT)cQulM7q)XHjk%fwP@5lQwBJfq!oV*mo{WL9LB<
zl%g!j$QXRI!{((1_wZSkq8!BtQ_WALTFBXqR`<n=7qPLiDqc0{-5WvS=anm0G}#D>
z-CMtY{qyI~g$9j{jo~GZC%|u6v-&=K_`u>|JK&o!mci0AvTT%<=vc635sff|DO9@+
z4Goo*mH1fEl&d#y-hU)1eDmY$>uYIGMD?Nlh)*LZl#z)-0;!oO0=^2YsHnJe=Z;0c
zF%mUJIEb!bK|ujN5)%4DBS=~POMnq7wde@m+Ie|-*im#NPL9>o)L6z8D|4&CJp;Z8
z#?iudMV*QpS~zKLr8>U80{RN*E1<7{z5@CREY2192cbRb@(>NhGob(g002ovPDHLk
FV1nv&i-Z6G

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index bbd952df0..fc537b734 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1123,6 +1123,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_sure_kick_channel" = "Remove {user} from the channel?";
 "lng_profile_sure_remove_admin" = "Remove {user} from admins?";
 "lng_profile_loading" = "Loading...";
+"lng_profile_stories#one" = "{count} story";
+"lng_profile_stories#other" = "{count} stories";
 "lng_profile_photos#one" = "{count} photo";
 "lng_profile_photos#other" = "{count} photos";
 "lng_profile_gifs#one" = "{count} GIF";
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index a106a9586..62febc455 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -367,6 +367,7 @@ infoIconMediaAudio: icon {{ "info/info_media_audio", infoIconFg }};
 infoIconMediaLink: icon {{ "info/info_media_link", infoIconFg }};
 infoIconMediaGroup: icon {{ "info/info_common_groups", infoIconFg }};
 infoIconMediaVoice: icon {{ "info/info_media_voice", infoIconFg }};
+infoIconMediaStories: icon {{ "info/info_media_stories", infoIconFg }};
 
 infoRoundedIconRequests: icon {{ "info/edit/group_manage_join_requests", settingsIconFg }};
 infoRoundedIconRecentActions: icon {{ "info/edit/group_manage_actions", settingsIconFg }};
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index 8ba60b121..af1facc58 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -142,7 +142,7 @@ inline auto AddStoriesButton(
 		parent,
 		std::move(count),
 		[](int count) {
-			return tr::lng_stories_row_count(tr::now, lt_count, count);
+			return tr::lng_profile_stories(tr::now, lt_count, count);
 		},
 		tracker)->entity();
 	result->addClickHandler([=] {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 3b85f8989..642b4d422 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -201,7 +201,7 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 	};
 
 	if (auto user = _peer->asUser()) {
-		addStoriesButton(user, st::infoIconMediaGroup);
+		addStoriesButton(user, st::infoIconMediaStories);
 	}
 	addMediaButton(MediaType::Photo, st::infoIconMediaPhoto);
 	addMediaButton(MediaType::Video, st::infoIconMediaVideo);
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index bf2f7624e..4137dbce9 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -109,7 +109,7 @@ mediaviewRight: icon {
 	{ "mediaview/next", mediaviewControlFg }
 };
 mediaviewSave: icon {{ "mediaview/download", mediaviewControlFg }};
-mediaviewShare: icon {{ "mediaview/stories_next", mediaviewControlFg }};
+mediaviewShare: icon {{ "mediaview/viewer_share", mediaviewControlFg }};
 mediaviewRotate: icon {{ "mediaview/rotate", mediaviewControlFg }};
 mediaviewMore: icon {{ "title_menu_dots", mediaviewControlFg }};
 
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 816f918cf..13f4e45bf 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -744,24 +744,6 @@ void MainMenu::setupMenu() {
 		)->setClickedCallback([=] {
 			controller->showNewChannel();
 		});
-		addAction(
-			tr::lng_menu_contacts(),
-			{ &st::settingsIconUser, kIconRed }
-		)->setClickedCallback([=] {
-			controller->show(PrepareContactsBox(controller));
-		});
-		addAction(
-			tr::lng_menu_calls(),
-			{ &st::settingsIconCalls, kIconGreen }
-		)->setClickedCallback([=] {
-			ShowCallsBox(controller);
-		});
-		addAction(
-			tr::lng_saved_messages(),
-			{ &st::settingsIconSavedMessages, kIconLightBlue }
-		)->setClickedCallback([=] {
-			controller->showPeerHistory(controller->session().user());
-		});
 
 		const auto wrap = _menu->add(
 			object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
@@ -772,7 +754,7 @@ void MainMenu::setupMenu() {
 					st::mainMenuButton,
 					IconDescriptor{
 						&st::settingsIconStories,
-						kIconLightOrange
+						kIconDarkBlue
 					})));
 		const auto stories = &controller->session().data().stories();
 		if (stories->archiveCount() > 0) {
@@ -791,6 +773,25 @@ void MainMenu::setupMenu() {
 			controller->showSection(
 				Info::Stories::Make(controller->session().user()));
 		});
+
+		addAction(
+			tr::lng_menu_contacts(),
+			{ &st::settingsIconUser, kIconRed }
+		)->setClickedCallback([=] {
+			controller->show(PrepareContactsBox(controller));
+		});
+		addAction(
+			tr::lng_menu_calls(),
+			{ &st::settingsIconCalls, kIconGreen }
+		)->setClickedCallback([=] {
+			ShowCallsBox(controller);
+		});
+		addAction(
+			tr::lng_saved_messages(),
+			{ &st::settingsIconSavedMessages, kIconLightBlue }
+		)->setClickedCallback([=] {
+			controller->showPeerHistory(controller->session().user());
+		});
 	} else {
 		addAction(
 			tr::lng_profile_add_contact(),

From e98770d418e52b6518a363961de2192b6166a872 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 19 Jun 2023 21:00:34 +0400
Subject: [PATCH 309/676] Improve saved / archive stories design.

---
 .../icons/info/info_stories_archive.png       | Bin 0 -> 727 bytes
 .../icons/info/info_stories_archive@2x.png    | Bin 0 -> 1450 bytes
 .../icons/info/info_stories_archive@3x.png    | Bin 0 -> 2221 bytes
 .../icons/info/info_stories_recent.png        | Bin 0 -> 606 bytes
 .../icons/info/info_stories_recent@2x.png     | Bin 0 -> 1131 bytes
 .../icons/info/info_stories_recent@3x.png     | Bin 0 -> 1719 bytes
 Telegram/Resources/langs/lang.strings         |  10 +-
 .../boxes/peer_list_controllers.cpp           |   1 +
 Telegram/SourceFiles/data/data_stories.cpp    |   1 +
 Telegram/SourceFiles/dialogs/dialogs.style    |  19 ++
 .../dialogs/dialogs_inner_widget.cpp          |   1 +
 .../dialogs/ui/dialogs_stories_content.cpp    | 292 +++++++++++++++++-
 .../dialogs/ui/dialogs_stories_content.h      |   2 +
 .../dialogs/ui/dialogs_stories_list.cpp       | 208 +++++++------
 .../dialogs/ui/dialogs_stories_list.h         |  40 ++-
 Telegram/SourceFiles/history/history_item.cpp |   2 +
 Telegram/SourceFiles/info/info.style          |   2 +
 Telegram/SourceFiles/info/info_top_bar.cpp    |   2 +
 .../info/media/info_media_buttons.h           |   2 +-
 .../info/media/info_media_list_section.cpp    |   4 +-
 .../info/media/info_media_list_section.h      |   1 +
 .../info/media/info_media_provider.cpp        |  18 +-
 .../stories/info_stories_inner_widget.cpp     | 123 ++++++--
 .../info/stories/info_stories_inner_widget.h  |   2 +-
 .../info/stories/info_stories_provider.cpp    |  19 +-
 .../SourceFiles/overview/overview_layout.cpp  |  92 +++---
 .../SourceFiles/overview/overview_layout.h    |  11 +-
 .../window/window_session_controller.cpp      |   6 +-
 .../window/window_session_controller.h        |   4 +-
 29 files changed, 660 insertions(+), 202 deletions(-)
 create mode 100644 Telegram/Resources/icons/info/info_stories_archive.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_archive@2x.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_archive@3x.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_recent.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_recent@2x.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_recent@3x.png

diff --git a/Telegram/Resources/icons/info/info_stories_archive.png b/Telegram/Resources/icons/info/info_stories_archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b4b79ce4365cb35163cb2cb7eb37c13479bc395
GIT binary patch
literal 727
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSVF5FO4N|zKE$K4@1Cyhti(`lf
z@7vJ*uU96D{QouellH=vNfId+!~?~CN~<s%CQV>W-7+I(2e&5k?ACxVql6$YFR>QR
zX2(<c-%IXSRjvQNH!nW^yWhNrZ;S1o+dQ{<UwO{*{PE+}dyPNT8#^q&-0Gw_)vLDf
z#`*K-L$pli`sq(U{kF_{uHWH@1`|Crrk;B5mb5WqXUw}AyKpVh{^N_UzZT_cJ(=?9
z_upQ(#}zhelRep*Kc+}DI$U`Dm94qaZ@F@5;?}5#+h?6sn|)Tzw8G_5#+ItR_wu#_
z&0w~k=yB!!_tQ^}TAeBr+!lSR+I#wGkdBzLtjnedog*zLo_;!;_PA*0gs1lzWzy~D
zvo|}YaPd6J+JE0)O?YiscLk5j;)@?EYTWIF&Zd2SSa3j{y^i&j`_iD)%{SkcWpBRu
z;rGuPyD8HyW*nK^U!WqCxizYSyVHe<@d0;=f<VKEjS)Qazxyp0=4$;AZQ!FGbiiZj
zrK3rXtC)=D`Z>#sbRYd%HTPtS!RDJeYLicPM8B&xnt%SV=i!GNF27`9P%7j%C=gzK
zl`EcUNt%jE`{9*WvmQu^F$fqc*K{qIcA$D|lxx(6pTS)oNe=9Per#n>Fy(si`R4<s
zM;|TzG3~24c|xD*0pBK`sk?5!mEmK5WccB!(catrogah)VzajX^84+xSW&!eH_!n}
z6FKI|i$369_CLeqRoQN--nJJ~GxB+@&nWjF*B0S2Sm(WT((Six?GL9umYRDj!N9@!
zV9LI@^#S|V*AxWs@cdb={#ox#bWQq$?>v84qD|Nya#>xp0VOI=S3j3^P6<r_xzsZm

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_archive@2x.png b/Telegram/Resources/icons/info/info_stories_archive@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..831363fa5c51083ffa552c679471de10d18f94af
GIT binary patch
literal 1450
zcmV;b1y%ZqP)<h;3K|Lk000e1NJLTq002M$002M;0ssI2B@5<>00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuB6iGxuRA>e5Sy?D{T@?Pz^N@Kc
zB}$Qb$XE&&?xYMCawQjplq(`BQ(uV^Wr&C(Tp)Lb#4T5f%$etT9=`v{s?+<Q_niH{
zj`Q;U{pVbq_E~$awbxpE?Y*D1&#zy~qeMW7fD!>E0!jpw2q+OyBJiJ$fPqdex3#tP
z^z^j0wtjqke0_b@=~(h8H#av=NlEGI>RMY{yT8Bxqw-u_Tr4gw*45QTM@Q@H>&r8q
zj9NTAJi5EPc}A<)|F7oJ(NRT3g@uL1*A3A7x(eh;X=!OeL4m2MDQVl@-X0$xUtL|@
z-`_ttH~`(%)z!_-EjTzhIXM{_MQm`Rs;a83t?ehX%h%U;eSMw6i$rf|Xb21pWCX>?
z$S5f(X=G%Cn~~}1X$J=fhKLTk5YDTsD>9|0rw3W2{a}%ik+ZY2B)hq}84wVly{tT(
zupUzn3y}9285t6k>gnlKR#v{hzeCCO^|imhzXT-`MSOgGE-x=JFj71$EKH)753$tL
z)VsSosM^}va&mI|iYjeou?m-$moenS!^0P?ry=13&BNT>92SYTc1Y%{si}eWc(Ssx
zBrD+wmX(!}&Z43sUYE?D*br&P`}_MDszXCVtE;PPYiomof*5S7T~kw2@Zt3I)W*g}
zl`eC;rKJVKJU>5sd3lMc&d$!J^$pIqx3}{0axqR-I(()?g4?QeIol>CCbze@Fbi&o
z=`}Poq`eiZoEAFx2L}g%GQ>nUI%XBjm;?g@-GDS~ofrU5cz8HBDzD+^=SMsV2?@^5
z&RCc92_U5Lpoou;CuTHwYUTNCZEeK>00`K^#WW%l$OtsRV{B~P(a}Ma<KyGFxHvIE
z&=GiqAIwcnO$;{aU9@|)x3@D?@Ejn{!otFrmls%u#gm(x%Mb@51l!Wm5`#y27cGF|
z;$nshK?lH(j5<3zqp4_aZpKm(R8mq>0v;U9g1zd*PvCMZD=PxPIDOR>X{1a}PDVsT
zP-ye>^ZWYx1VxaapkpjcOG`lp9`O?n-~=FHX%0XZxHT#&YIJlI?ez3?S|mJ!$N>-m
zzj<APpBfy<%*;gA(!8&%tdNSCnHi#>3k-sK#fUdIH`r3CR~8hl!GVp9ji;w4F>BC;
zpo;Yh(g7KIdwbD!czB2%R-K0nJU12UJfEWg3+(RhQpi=`APT|+u|<r7Y+zu3H0<o`
zpgI$@<FkucPzj&t?(U9bNY#3Lg2?Cl_!e{kN7%x`0%@3^pT_|wC<~&lwo&W}V`F1v
z0UC@gLfwJb*jSXmB-`29iK9)-dhQ@=Y-|+ckxqy9-yaVfsDy-skgZfI<mBXFsel4_
zrx7aa97<^8y`!TeIWROdghH9x=jZ2%iHRD;bq?k<T0jgio$RJJ4lf4w=5!+WbPlJv
z!PpHmGc(|AL><Ts*^FbA%}>4GRM2Q+iUgkTD=8%yr%~j)i+au=tkL1&VU1-9$1m9U
zfom1A!`|MW3g45H6WkUG8pkI7<i!?QmY0`DP!E+m7VD?3rGEZuk$i}WiP_uRqwNyq
zPJMknF6|hBm;G{Aw6tXy!RrFB!BrQoQn(@u7<OV}0`(^#CqM-5GJrAh{EgS^oHO3u
z-oVLJ_^O^_f^GW2!2nd8+V5`QQY|el4ZoOhV@?o=bAWy^A;;wX#Uw)tF@j`gXXoPL
zf*&8KLU9w!;8ePl2q+OyBA`S-iGUITB?3wW{*Mv(2VDWuz*png9smFU07*qoM6N<$
Ef+_Hj#sB~S

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_archive@3x.png b/Telegram/Resources/icons/info/info_stories_archive@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e02e85c6cf21b8384a02b72f8008303628c7aa91
GIT binary patch
literal 2221
zcmai0X*kqv7oS1JFw8IvV;g%hmZ9uKNMjjImQ?oak$uZ!eae=7YrK<PAsIAfXHtnl
z_EMoRgzVX~J^wzu@B8V!-Vf(K=iKL9_jTRpcc0(66R+Y8p%4@V1Oh>ESM;v|+To8d
zGXSgi?<pTZfdj4?UILN(1r`BE-^Ci|YHA9S25e>!INk%q^d|)n6d)iFV-Xm{2x#!1
zy&{JHL>-D4|7-tAtW>hc14kfn`nndO;1$yK1cWK9Yukhv@IG3tl(^lI;Q!N)SrTDD
zfMd_}$xA1(5H@u62UWy);gnc777h8q6ld0X$VZ^A#itl3QCdcnR5ZfFceLD1&4Mhq
zqckim$7XxoPB08S;D^x$uSFf;wanH`|I39z8TLyF^vWl`({Eng8Iv=AYLdt)QFL;2
zv^%hNaiAUNaz#SNl%%}!tu4Ia?&Qsv?qKy(5QHzs_S<-l2A}WRQOAe0EGe^m_3hP3
z4HYxHJC$~AzgxpL?|y6DFC3t*eW$KXwuHQn2A^W(>AO=@u~8eFD{p^1*NZIdR{gT}
ztxdyyu;_5Vlz2>70OgAsB$+%`%}6vS+o*M=oh*&j$Xq8+H2Tr|^EKq{+Yk3P#FQT7
zS6EbDd)^WU<*&apMmEZkPPNmtYYz0-S^gr0f9y*&qU7T9)wS+zbz`AK!-L&5VI^0S
zxt<)ZwD`Q?_K1Tg#*Y|E^qAAmunSaNExzQ$()4>J0WQ`adGw59`2$Hs$*mt_*BT0H
z;lJSd(tBK4GGA`J<L@&-gaa+xX{)HH_}OnOBYLzaN2WJdmZaBvv*B*U)&jv+k(Cm4
za;%2n_XtrI#0x~QxeXLl-=MfATy}PKZNIl|WT8;~W1vvD<Zw3WYik&V$X@5t%Y$aM
zm1x-miXUh|f1ko?YrMx$ZjvW@`Q&gv;M4OP(@T3|8Esx;WZRNdF4(~4K(Eby)Ifn&
z)Zv~8Pnv+5;ulx{KJSS}!g=5V&30|~XjZ7Jk<~X})tY(Pw%rTT(baC5zD0*6+D!y%
zo-0%ob^P8ORAn7D+nqt2w#;PfIMw-<XXPPM9-mn<<#g+nr-V=sfNenJ<AV#Q<P)c?
z9Jdxn$~`|m+s{e2Io6A3r*Wu;t~=<t^u4GwFP|CHj65WUMgYjD<%I;y_jB_rdw+Fy
z*F$*Owghwc%GtMj@#0>X+cf&>s!PYBt1hRYI+EpXzFYtvO}0QkL{Yk9_Wt*Wf2AZ-
zuGiSbL6p5dquT;!Iv*nQHA0jTGY$X<*$H2p0?O&$o<eG^&by9zyePtRYpfshx_$p+
zwat}r6+Zs+#m|e+=BL2se{U}tv0v(WBws@{g=)F=3-Enj7%GLPpnD$Kjg*^}UnePh
zJI7R9U;0$dnl2>9%R}RmG*NgdmFQJ&R%mq^o2EH}bTXty9y#+4KFc2+XbPAw6P(%G
zps!*wnG<nSXOr#&)#;i|Bxghra!+fJn`Vfhq5O&u@SaI(6cs@GN9J_4<@>M!+31>f
z^?<lzSh6HZf@gWWL7oU}L;6yN@Fe9FRs5^5O7r;Eh~VJ*{#@cWid&kKL;3AFNmu;3
zGE+24<t_%&7vjFinPyFKg|egottNe1AQosPdFxuV5ViE^bKULX%&fQCK=OHa^iy90
zvA}+oRzuEVCMzREJ2&`Us-OlDQSjyo^09cm);=A3ACz9!@r@c~R)#V&uiXjXT@6|o
zjCn^16jt>`6ACb%9wD&V6BZ2%F}nnM_5N*U5N-m~+hNnjB1L!Jy;1L#r$E<}vuV64
zM29<ZAjLOAHOKWp70$FwBj{LX!S7h?lorexDyW{_0+Vp;P8TUCxndzBR5wU@Na_&Q
zIYcZg&N!Vdx!sj&Bqvoz=SJEoQYV^^>T3^dT0;rjNf^s1j-uwErJuK6%roPnUwVBR
z&iZg4tl!NOxHxQpT?+SYT~+jRmhPmpQSwK|u%?`vWZM?ynAOnKk{07ENz*N7UepF?
z!Yh@B9qMvxRAi|PmnGhv9M8^HtA+{IL@{LN<VbiZjEaQ)nx(N5R=WV|Nc66<s`ghB
zZ+K9L_330d(;>sFDXRcZXyc2zIUAq=klMJpA{*xN;)UR4>nu5u&DthaQ6CprO56e7
zDVlj>i%sQ?&t$VpJLAkXh)x;wl2B{0s&oX|u1z{vXZ=d4<1P~@gCH(jX{-%2&EoJA
zsKi?yt6EPoR#~cC)d1xw4r^!M4h3!eZ601;N^$Ch3_H}xCVYHWuAzG1RHy&>a;hLT
z_ac?H0}vMk!daQ+lQqlYv%wY*<^K_KzDdsUM+hjX5Pb_Isu5Gz6nS*dBgR4F&Uk&b
z{d5y{?q>*F5*6S$vqJ5U@F5RQ9m^^!C|XTLa)psiFNjb3uSWKy!I&yt|Fu_U4#@%%
z?%9XFA-vWom-JZwv&eWjx1Xetf}d5Pc0}X3$em?A!{S*#&Ru`%+|N9Bs|OB+7o*7b
zRBeVyuP6^=6hgji{Sl7z3n?g;X^1d4NN>cIGf0CIdQ^vL%a0~r>@E!Hebtj1u3<9M
z)p=@*=i)>#&BbjCwZlxtMDeF-ACkq?j4f+x+()=7x8xXIL$fUxBrHwNlAT=ph%xf>
zYJ2b4!iv*vQqpVPhe`~t@s;vSZq5(jluyf$`ppYPyD@0b`2)5unF!sxz6U!ijYHfr
zR)~Hg6A3wXVw{V?(Yi43u;C&dC>(n~JOWE?6rAZc7k2n1UvS=S#C}UHyN|Ub08%0#
ze4^@_OS_#dJes&M1TQl`H;g6~yU|U3aWttsxNIG9eN#lh@PeZ>o{JlX&3cAu7>yhy
z8AS(<R(yKBBqk?PWh$ETLSZ#^lw3x+@%8_V;C~P3Fl5XL81?>)c=Erv5C41>a0YmN
J@+F7Ze*lqM@|*ww

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_recent.png b/Telegram/Resources/icons/info/info_stories_recent.png
new file mode 100644
index 0000000000000000000000000000000000000000..341ee2a06ce04c9b9a159b216e977e5653984211
GIT binary patch
literal 606
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSVF5FO4N|zKE$K5**$Gb<#}E(R
zx1sy{8672__H}4*a2@G)S-kj$%chV?xh@MYb-Sou6#C!d=DbvJE!)&2(Jex~K_ZKS
z12|4Ti^~(98GV19;=5U!k3Kv5`(91{x7joEeV2XzyzapLumf3JXPtd^z4}?v&bs~k
zZ@(3BU3vYrL5JJon>pWD{U&<2OndtH<BgXkpMKUTO+4VPuwKQp{V=0q`{9p!d~M{8
zuVQa*y#Idx*+-v$0u8#Gx1YDrP_93HZ`}6VZ+E-qn@HttpRKK_?eywrP2R?c2%&Ww
zBYILB(l<x0zItgwdE3E+4@End1Znp2nM(4tO9hFzh6FjswabSeVS4jCYwMv)5kfyc
z|GqfkM?lf!5XsyLe#_M-cdAW1DA4XJz!Kyj&BD}pHqF^j;iS{T0IjJfF7(@~i0V|@
z&EI(GV+D`U?2xr#g_jx%86zdTGn?O*N%OTw&h6TLSFho0+F@z7-+$wtR_~p6`e~5i
z_1!@$b*6jky)0JRo9vZ#*l@1j@{|)DD*95Ei5nwKX8RhYxK!<pn-|u2uifrNiB)gW
z%cDKBV>Lvyrk}1VuB_Z!7ONxXzx;BB$*$X6JLlxpTbxWWntZarx6b2B^!_vLVjso+
c@8_yvl)trP%Io6H%b>XRboFyt=akR{0PKbPApigX

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_recent@2x.png b/Telegram/Resources/icons/info/info_stories_recent@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecb3fc72d91d3cbbc9ec444f1b5151960118bb19
GIT binary patch
literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq002M$002M;0ssI2B@5<>00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAu9)k#D_RA>e5S<5SYQ5^RkGlVco
zW2Go1k)&UFEU=kKR*FcJ1q&3}%*sMm{s${7C9jCZM5cy96q%Yl@|X$bk$xWG_xU+>
z;|}+J&)j>>sB;##d(ZiNU!QxP-xCobieNx6AQ%t~2nGZLf&syRU?7lz$jC^m)fy8M
z6WA2KH90vsgM))kr}N<8;PLVC?d{F$^~S};g|ElVGmzcX)U>_54Uc8z`uaLCF;NO&
zWMstcb^{C%sWQYbWo2dXN%H&Y>1lp`et3AeySuxgp&>mz{iA<}hldQgwzgJYUjDHu
zH17_F<Ms8G`LwmQ)zZ?El9Hm}N^x=V=H@2Dzr4H@6ci|cjcr2D9vd5DuAHBrx3{-P
zMMY6e0@l{nc6@w%b8~|+LlMy*gC0CJHO0JNU0s#+6QVtf#X>~t4;va9V&0FBkDE*;
zjRwqSv(0AHsDwkjzP_II`=zC&=;&w;$#0<R>+2Z$cDwzXc3rE%*6Haf=*LW-mX@ZA
zZUg{@9*-wBHdYsfN=gO>23Y5*sHjlFy|>lX)s2phCM6{)BLQPNdwYA8ky=}mlasHm
zu3&6#ZjPc0vlGA_9UZD*^hO{rE-qA&ngDQxQB_n_L{W5qe-C_LU!N*CFE8)%@)E0?
zDpCgE+iBrnLmn#;icFEl&%M39%*;$IZM=Fo0*H@~udc3!f$8aKUNaQ@^Yb$WCc}`{
zP9{@YTAGlMfcKf18JU(4esTnmm6gRD-QC?a$YZRJ`}_MD85wl_908z@Lhs$(9fl^|
z02i{evokk0x3I8~F2x-HW=6VpUL-rdaUB&n1~IQU5*|w)wjR<aUNB=$OiVmHJbbLg
zJLX(GxdM=BQ2Ole?}vfg+gl~j=Qf|u$JUL&Cr+N9vH!o0j*ft=si_HU(xIlgxtaOF
z<|2y5*49?P-~TtDoSd9|xf8)cIXgRx^`4@f8&g?X$pR=TDd842On_q$<KWBYpW515
z!~8K=@#N$re!|AahQW3WQ_s7ZqdStFosDb~<_Wq;Fi76*G~LF^$_oDN&dv^9BuFIJ
zfre;9n%}y*x`-md!*oAV;#7Thb_V*9R?_8!tsa|ns9#)M)NT@6H=O9PR3pQuZd)&e
zzG;;|??o@)NP1+6Eu_&&VqpaeI<<&ISWiz6((Vfj3!#sQH@Vx`*vNKl7`51whQ;*<
zJ-wcvpAWxTK^}#e+W3jTgdst>;7CnPb-7&2%ga?&RX^cY5H_SMCR}9vrYoi|L&b0T
xeV2S+Mj|Q&1A+m;fM7r{AQ%t~2nGyd;2#KPV-@s>`&<A3002ovPDHLkV1kc0`MdxC

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_recent@3x.png b/Telegram/Resources/icons/info/info_stories_recent@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bacf1a3c1e7d87b063979055f1a360e1dc3acea8
GIT binary patch
literal 1719
zcmaKtd05iv7RP_6Bso{Xg>Y@eYtJ|^E}=E0ky)6cX=!C+C0diFCK_s~U}!G5WHm~f
zTP{r82^TcV4HaXPvfRtk$HJ>lTA3ju;(|8#PxIgW@jajOp7)$T&ikD6ygA2wJ#=+U
zbpQa+#e3rX)ePAbL_=+fs}nJ5fa3f;4g%~x^AG9+F7y|Cn2!&DQu`19lobJJZKkMY
zsulofR)GLbH9?!PDvfWqAyu0H_?w9=$6#Lo*n-64+)gBdK9_w$hXxx<vPdS=0d~l#
z?XhS-dTcM#I#*=oZ)BhS^5unTDC`;febb%npY3`xZ2qjkO!+!mwT$;%b9kYAz5P?m
zOgX7<l=AtJl5~1Ty!X<V^*Y7A{+YVYrAH&=rP@<-LWqM#9`N5M|B9!FCYts|K8_^C
z$H!l}qF7u^PEPLNa)(ecDviFrzNDn2%Kg_$i;MSQv0%h}9EDOwr~j(jaGj|xEIjGv
z#+S)tLZQ&m@Rf99gR1xl0)YYp1Dl(hKi<uo&SSA6NTh{#?<!ExrYYqYY3;JPiAhcc
zm`|tExm;%og#y2hNGUETz__|L&?dVKU8$<s&!34=QFScVkM{OQeSHIz&0KD2uu>*#
zY-~IhH0NGHij7VCnyhS<kB^T_ZhxPio_=MaM=Jd~JL}2J=kxi96bX3CmguM`nMHe7
zR}7J;SXda${4Tg#EM_v9;8!d4ENPw!MI-ngIU@Rvubla7rXPt!I$ix;qEIOEcYAw#
zN1Q&+iT3l;|G6%<FXW}?(W7^JEURK-VkF_~t4-A+lHjbjkI%Z|6Jn+ER6u}ArOMcK
zPBg^h@l-CCE?m&^<LIxUU+gk7D{BbuD&RRfID|w;+tqFL8-nP;@)P3Yjmg<shFk9`
z6j!vhwf#19*pDAQ5`GZBv2Nu=!C|@v&Ikmey1JUfdarF55fQ=p0RLZjSQriH>FtFF
ztl-B)qG^`R1On>AFvY%xRYs4Fj*3L~!92+2dA!jS;_zZwS=s99>K}33jq{AGfpTMj
zz#X~cp|@mfYpcJ;U@&mAe=0Q+5)!IyMG}dj=0HwH!0U!&Ds}%(c6<Aoa!yZ=*HHGY
zI48I}7K^<Pc5!hjto7PHN$Lxvo!n01@yX-^1OlPGy}j{%eZ3Ff9L0UOJ24?a0xB&p
zKhajRhQwOV3ew73T3Y74n!HLQ3kOiClA4kdlOJe>y7h80yp_j$H$HynSf*C0fq_A`
zTX7_vLo%`kjLgiQKYTMbCg4<)E+Yv88l1*POGm}ShdYPZoJ{oya5xw!6iRjs2c4Vu
z6$I>ao7H8+AZ={IuU_5u{PythuxR&S?~n$0ZOL}<rp0&u0gbZxw=Rp9j8ntuRA%Nj
zSjy=50RUO|LkiR**F4uoB`wPCd2l{8b@|qS=Bi<r%xqT%CJp=3*v7EI+}9AXyz*`<
z9TNELB(<d6=tLDbo=WvyY-?-F$Ap67?#`SB_RQIz|1!H5wBIOWxj*MaV#U%nIt(VT
z3CinEXVuhrrBC-)x_&DcDRVj6$cyJ9BfSuxcJ(hePH{UsZ(bcJeP8B>2zuP|M!hA2
zGi{d-iLCUbxVhiOVsU6#m{t5hBfGV$OFBCGtl@!ww`JxrNEuhkyEY|_MxB>iu-R;Z
zUh;A$e!qe|f}`Bv@52ZWP=CSUGAeY7+LN{dH*eiCsCC3(JWJpku-_v2FN&{wai+bX
zkcg_FprFKDlkt0Y&lp&&WdV!1SFh@nbu0J<R6T@k7fpC#;u>URH39se6jAEJ!a|q5
z=@b3+ZsbkFqM{<z+l!h$*4-NL6{vd*_J%Mc-h*N4GBIg7NU>!WAY{g!9Uar^*S?*T
zGuU3sfZG&oq!Hmm*GfxEac1@&?(PN;8~`LmCr?Hs5^b|8ot%yEeBtyqLkr#GXH9S4
zZ+Kp?r^(UX?#9MYYQEpuGiPqFYu@S|DjM*xO7izNU|fjyJWQ}!FYOQjJCfl@XJ=FT
zPx8l;I*CuvbI49Io)ESo`+xfCT4--?@8bIiqT7+~`y+>6fnkSsJ2_=!Wz_~BZ0->V
z1Y=`k>eke2B$s0dEywkR7<AajX={Ha8ik_KXirUkwFx<hUd?naIHT>fW5*7;^&e<W
zi|ggtr!dlvr1aBIUy^s`>tTcP8tf;TgpzK{`UCm2>m4WN7QZ()pLqLYz5Gb3eu$Pa
g=<vV8!C9jV<o%%M-pKG)-OWz}@9v9Z9}G$R8#f*$IRF3v

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index fc537b734..328cc231a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1123,8 +1123,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_sure_kick_channel" = "Remove {user} from the channel?";
 "lng_profile_sure_remove_admin" = "Remove {user} from admins?";
 "lng_profile_loading" = "Loading...";
-"lng_profile_stories#one" = "{count} story";
-"lng_profile_stories#other" = "{count} stories";
+"lng_profile_saved_stories#one" = "{count} saved story";
+"lng_profile_saved_stories#other" = "{count} saved stories";
 "lng_profile_photos#one" = "{count} photo";
 "lng_profile_photos#other" = "{count} photos";
 "lng_profile_gifs#one" = "{count} GIF";
@@ -3812,9 +3812,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_views#other" = "{count} views";
 "lng_stories_no_views" = "No views";
 "lng_stories_unsupported" = "This story is not supported\nby your version of Telegram.";
+"lng_stories_cant_reply" = "You can't reply to this story.";
 
-"lng_stories_my_title" = "My Stories";
-"lng_stories_archive_button" = "Archive";
+"lng_stories_my_title" = "Saved Stories";
+"lng_stories_archive_button" = "Stories Archive";
+"lng_stories_recent_button" = "Recent Stories";
 "lng_stories_archive_title" = "Stories Archive";
 "lng_stories_reply_sent" = "Message Sent";
 "lng_stories_hidden_to_contacts" = "Those stories are now shown only in your Contacts list.";
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 9e6e2e146..834592de6 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -82,6 +82,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 
 		auto stories = object_ptr<Stories::List>(
 			box,
+			st::dialogsStoriesList,
 			Stories::ContentForSession(
 				&sessionController->session(),
 				Data::StorySourcesList::All),
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 260e4d766..f8a51b93e 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -423,6 +423,7 @@ void Stories::apply(const MTPDupdateStory &data) {
 	if (!user->hasStoriesHidden()) {
 		refreshInList(StorySourcesList::NotHidden);
 	}
+	_sourceChanged.fire_copy(peerId);
 }
 
 void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 47a025611..30b36538d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -500,6 +500,12 @@ DialogsStories {
 	nameTop: pixels;
 	nameStyle: TextStyle;
 }
+DialogsStoriesList {
+	small: DialogsStories;
+	full: DialogsStories;
+	bg: color;
+	readOpacity: double;
+}
 
 dialogsStories: DialogsStories {
 	left: 4px;
@@ -532,3 +538,16 @@ dialogsStoriesFull: DialogsStories {
 		linkFontOver: font(11px);
 	}
 }
+
+dialogsStoriesList: DialogsStoriesList {
+	small: dialogsStories;
+	full: dialogsStoriesFull;
+	bg: dialogsBg;
+	readOpacity: 0.6;
+}
+dialogsStoriesListInfo: DialogsStoriesList(dialogsStoriesList) {
+	bg: transparent;
+}
+dialogsStoriesListMine: DialogsStoriesList(dialogsStoriesListInfo) {
+	readOpacity: 1.;
+}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 22ac09842..a63e159c7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -142,6 +142,7 @@ InnerWidget::InnerWidget(
 , _controller(controller)
 , _stories(std::make_unique<Stories::List>(
 	this,
+	st::dialogsStoriesList,
 	Stories::ContentForSession(
 		&controller->session(),
 		Data::StorySourcesList::NotHidden),
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 332dec14a..24a97ae70 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -8,6 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_stories_content.h"
 
 #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_photo.h"
+#include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
@@ -19,7 +24,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Dialogs::Stories {
 namespace {
 
-class PeerUserpic final : public Userpic {
+constexpr auto kShownLastCount = 3;
+
+class PeerUserpic final : public Thumbnail {
 public:
 	explicit PeerUserpic(not_null<PeerData*> peer);
 
@@ -48,6 +55,70 @@ private:
 
 };
 
+class StoryThumbnail : public Thumbnail {
+public:
+	explicit StoryThumbnail(FullStoryId id);
+	virtual ~StoryThumbnail() = default;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+protected:
+	struct Thumb {
+		Image *image = nullptr;
+		bool blurred = false;
+	};
+	[[nodiscard]] virtual Main::Session &session() = 0;
+	[[nodiscard]] virtual Thumb loaded(FullStoryId id) = 0;
+	virtual void clear() = 0;
+
+private:
+	const FullStoryId _id;
+	QImage _full;
+	rpl::lifetime _subscription;
+	QImage _prepared;
+	bool _blurred = false;
+
+};
+
+class PhotoThumbnail final : public StoryThumbnail {
+public:
+	PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id);
+
+private:
+	Main::Session &session() override;
+	Thumb loaded(FullStoryId id) override;
+	void clear() override;
+
+	const not_null<PhotoData*> _photo;
+	std::shared_ptr<Data::PhotoMedia> _media;
+
+};
+
+class VideoThumbnail final : public StoryThumbnail {
+public:
+	VideoThumbnail(not_null<DocumentData*> video, FullStoryId id);
+
+private:
+	Main::Session &session() override;
+	Thumb loaded(FullStoryId id) override;
+	void clear() override;
+
+	const not_null<DocumentData*> _video;
+	std::shared_ptr<Data::DocumentMedia> _media;
+
+};
+
+class EmptyThumbnail final : public Thumbnail {
+public:
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	QImage _cached;
+
+};
+
 class State final {
 public:
 	State(not_null<Data::Stories*> data, Data::StorySourcesList list);
@@ -57,7 +128,9 @@ public:
 private:
 	const not_null<Data::Stories*> _data;
 	const Data::StorySourcesList _list;
-	base::flat_map<not_null<UserData*>, std::shared_ptr<Userpic>> _userpics;
+	base::flat_map<
+		not_null<UserData*>,
+		std::shared_ptr<Thumbnail>> _userpics;
 
 };
 
@@ -122,6 +195,127 @@ void PeerUserpic::processNewPhoto() {
 	}, _subscribed->downloadLifetime);
 }
 
+StoryThumbnail::StoryThumbnail(FullStoryId id)
+: _id(id) {
+}
+
+QImage StoryThumbnail::image(int size) {
+	const auto ratio = style::DevicePixelRatio();
+	if (_prepared.width() != size * ratio) {
+		if (_full.isNull()) {
+			_prepared = QImage(
+				QSize(size, size) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_prepared.fill(Qt::black);
+		} else {
+			const auto width = _full.width();
+			const auto skip = std::max((_full.height() - width) / 2, 0);
+			_prepared = _full.copy(0, skip, width, width).scaled(
+				QSize(size, size) * ratio,
+				Qt::IgnoreAspectRatio,
+				Qt::SmoothTransformation);
+		}
+		_prepared = Images::Circle(std::move(_prepared));
+	}
+	return _prepared;
+}
+
+void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
+	_subscription.destroy();
+	if (!callback) {
+		clear();
+		return;
+	} else if (!_full.isNull() && !_blurred) {
+		return;
+	}
+	const auto thumbnail = loaded(_id);
+	if (const auto image = thumbnail.image) {
+		_full = image->original();
+	}
+	_blurred = thumbnail.blurred;
+	if (!_blurred) {
+		_prepared = QImage();
+	} else {
+		_subscription = session().downloaderTaskFinished(
+		) | rpl::filter([=] {
+			const auto thumbnail = loaded(_id);
+			if (!thumbnail.blurred) {
+				_full = thumbnail.image->original();
+				_prepared = QImage();
+				_blurred = false;
+				return true;
+			}
+			return false;
+		}) | rpl::take(1) | rpl::start_with_next(callback);
+	}
+}
+
+PhotoThumbnail::PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id)
+: StoryThumbnail(id)
+, _photo(photo) {
+}
+
+Main::Session &PhotoThumbnail::session() {
+	return _photo->session();
+}
+
+StoryThumbnail::Thumb PhotoThumbnail::loaded(FullStoryId id) {
+	if (!_media) {
+		_media = _photo->createMediaView();
+		_media->wanted(
+			Data::PhotoSize::Small,
+			Data::FileOriginStory(id.peer, id.story));
+	}
+	if (const auto small = _media->image(Data::PhotoSize::Small)) {
+		return { .image = small };
+	}
+	return { .image = _media->thumbnailInline(), .blurred = true };
+}
+
+void PhotoThumbnail::clear() {
+	_media = nullptr;
+}
+
+VideoThumbnail::VideoThumbnail(
+	not_null<DocumentData*> video,
+	FullStoryId id)
+: StoryThumbnail(id)
+, _video(video) {
+}
+
+Main::Session &VideoThumbnail::session() {
+	return _video->session();
+}
+
+StoryThumbnail::Thumb VideoThumbnail::loaded(FullStoryId id) {
+	if (!_media) {
+		_media = _video->createMediaView();
+		_media->thumbnailWanted(Data::FileOriginStory(id.peer, id.story));
+	}
+	if (const auto small = _media->thumbnail()) {
+		return { .image = small };
+	}
+	return { .image = _media->thumbnailInline(), .blurred = true };
+}
+
+void VideoThumbnail::clear() {
+	_media = nullptr;
+}
+
+QImage EmptyThumbnail::image(int size) {
+	const auto ratio = style::DevicePixelRatio();
+	if (_cached.width() != size * ratio) {
+		_cached = QImage(
+			QSize(size, size) * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_cached.fill(Qt::black);
+	}
+	return _cached;
+}
+
+void EmptyThumbnail::subscribeToUpdates(Fn<void()> callback) {
+}
+
 State::State(not_null<Data::Stories*> data, Data::StorySourcesList list)
 : _data(data)
 , _list(list) {
@@ -130,12 +324,12 @@ State::State(not_null<Data::Stories*> data, Data::StorySourcesList list)
 Content State::next() {
 	auto result = Content{ .full = (_list == Data::StorySourcesList::All) };
 	const auto &sources = _data->sources(_list);
-	result.users.reserve(sources.size());
+	result.elements.reserve(sources.size());
 	for (const auto &info : sources) {
 		const auto source = _data->source(info.id);
 		Assert(source != nullptr);
 
-		auto userpic = std::shared_ptr<Userpic>();
+		auto userpic = std::shared_ptr<Thumbnail>();
 		const auto user = source->user;
 		if (const auto i = _userpics.find(user); i != end(_userpics)) {
 			userpic = i->second;
@@ -143,15 +337,15 @@ Content State::next() {
 			userpic = std::make_shared<PeerUserpic>(user);
 			_userpics.emplace(user, userpic);
 		}
-		result.users.push_back({
+		result.elements.push_back({
 			.id = uint64(user->id.value),
 			.name = (user->isSelf()
 				? tr::lng_stories_my_name(tr::now)
 				: user->shortName()),
-			.userpic = std::move(userpic),
+			.thumbnail = std::move(userpic),
 			.unread = info.unread,
 			.hidden = info.hidden,
-			.self = user->isSelf(),
+			.skipSmall = user->isSelf(),
 		});
 	}
 	return result;
@@ -177,4 +371,88 @@ rpl::producer<Content> ContentForSession(
 	};
 }
 
+[[nodiscard]] std::shared_ptr<Thumbnail> PrepareThumbnail(
+		not_null<Data::Story*> story) {
+	using Result = std::shared_ptr<Thumbnail>;
+	const auto id = story->fullId();
+	return v::match(story->media().data, [](v::null_t) -> Result {
+		return std::make_shared<EmptyThumbnail>();
+	}, [&](not_null<PhotoData*> photo) -> Result {
+		return std::make_shared<PhotoThumbnail>(photo, id);
+	}, [&](not_null<DocumentData*> video) -> Result {
+		return std::make_shared<VideoThumbnail>(video, id);
+	});
+}
+
+rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
+	using namespace rpl::mappers;
+
+	const auto stories = &peer->owner().stories();
+	const auto peerId = peer->id;
+
+	return rpl::single(
+		peerId
+	) | rpl::then(
+		stories->sourceChanged() | rpl::filter(_1 == peerId)
+	) | rpl::map([=] {
+		auto ids = std::vector<StoryId>();
+		auto readTill = StoryId();
+		if (const auto source = stories->source(peerId)) {
+			readTill = source->readTill;
+			ids = ranges::views::all(source->ids)
+				| ranges::views::reverse
+				| ranges::views::take(kShownLastCount)
+				| ranges::views::transform(&Data::StoryIdDates::id)
+				| ranges::to_vector;
+		}
+		return rpl::make_producer<Content>([=](auto consumer) {
+			auto lifetime = rpl::lifetime();
+
+			struct State {
+				Fn<void()> check;
+				base::has_weak_ptr guard;
+				bool pushed = false;
+			};
+			const auto state = lifetime.make_state<State>();
+			state->check = [=] {
+				if (state->pushed) {
+					return;
+				}
+				auto resolving = false;
+				auto result = Content();
+				for (const auto id : ids) {
+					const auto storyId = FullStoryId{ peerId, id };
+					const auto maybe = stories->lookup(storyId);
+					if (maybe) {
+						if (!resolving) {
+							result.elements.reserve(ids.size());
+							result.elements.push_back({
+								.id = uint64(id),
+								.thumbnail = PrepareThumbnail(*maybe),
+								.unread = (id > readTill),
+							});
+						}
+					} else if (maybe.error() == Data::NoStory::Unknown) {
+						resolving = true;
+						stories->resolve(
+							storyId,
+							crl::guard(&state->guard, state->check));
+					}
+				}
+				if (resolving) {
+					return;
+				}
+				state->pushed = true;
+				consumer.put_next(std::move(result));
+				consumer.put_done();
+			};
+			rpl::single(peerId) | rpl::then(
+				stories->itemsChanged() | rpl::filter(_1 == peerId)
+			) | rpl::start_with_next(state->check, lifetime);
+
+			return lifetime;
+		});
+	}) | rpl::flatten_latest();
+}
+
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
index 1feb6a77a..8b25c8313 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
@@ -23,4 +23,6 @@ struct Content;
 	not_null<Main::Session*> session,
 	Data::StorySourcesList list);
 
+[[nodiscard]] rpl::producer<Content> LastForPeer(not_null<PeerData*> peer);
+
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index c53282395..c022e025c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -17,13 +17,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Dialogs::Stories {
 namespace {
 
-constexpr auto kSmallUserpicsShown = 3;
-constexpr auto kSmallReadOpacity = 0.6;
+constexpr auto kSmallThumbsShown = 3;
 constexpr auto kSummaryExpandLeft = 1.5;
 constexpr auto kPreloadPages = 2;
 
-[[nodiscard]] int AvailableNameWidth() {
-	const auto &full = st::dialogsStoriesFull;
+[[nodiscard]] int AvailableNameWidth(const style::DialogsStoriesList &st) {
+	const auto &full = st.full;
 	const auto &font = full.nameStyle.font;
 	const auto skip = font->spacew;
 	return full.photoLeft * 2 + full.photo - 2 * skip;
@@ -35,7 +34,7 @@ struct List::Layout {
 	int itemsCount = 0;
 	int shownHeight = 0;
 	float64 ratio = 0.;
-	float64 userpicLeft = 0.;
+	float64 thumbnailLeft = 0.;
 	float64 photoLeft = 0.;
 	float64 left = 0.;
 	float64 single = 0.;
@@ -52,9 +51,11 @@ struct List::Layout {
 
 List::List(
 	not_null<QWidget*> parent,
+	const style::DialogsStoriesList &st,
 	rpl::producer<Content> content,
 	Fn<int()> shownHeight)
 : RpWidget(parent)
+, _st(st)
 , _shownHeight(shownHeight) {
 	setCursor(style::cur_default);
 
@@ -64,45 +65,46 @@ List::List(
 
 	_shownAnimation.stop();
 	setMouseTracking(true);
-	resize(0, _data.empty() ? 0 : st::dialogsStoriesFull.height);
+	resize(0, _data.empty() ? 0 : st.full.height);
 }
 
 void List::showContent(Content &&content) {
 	if (_content == content) {
 		return;
 	}
-	if (content.users.empty()) {
+	if (content.elements.empty()) {
 		_hidingData = base::take(_data);
 		if (!_hidingData.empty()) {
 			toggleAnimated(false);
 		}
 		return;
 	}
-	const auto hidden = _content.users.empty();
+	const auto hidden = _content.elements.empty();
 	_content = std::move(content);
 	auto items = base::take(
 		_data.items.empty() ? _hidingData.items : _data.items);
 	_hidingData = {};
-	_data.items.reserve(_content.users.size());
-	for (const auto &user : _content.users) {
-		const auto i = ranges::find(items, user.id, [](const Item &item) {
-			return item.user.id;
+	_data.items.reserve(_content.elements.size());
+	for (const auto &element : _content.elements) {
+		const auto id = element.id;
+		const auto i = ranges::find(items, id, [](const Item &item) {
+			return item.element.id;
 		});
 		if (i != end(items)) {
 			_data.items.push_back(std::move(*i));
 			auto &item = _data.items.back();
-			if (item.user.userpic != user.userpic) {
-				item.user.userpic = user.userpic;
+			if (item.element.thumbnail != element.thumbnail) {
+				item.element.thumbnail = element.thumbnail;
 				item.subscribed = false;
 			}
-			if (item.user.name != user.name) {
-				item.user.name = user.name;
+			if (item.element.name != element.name) {
+				item.element.name = element.name;
 				item.nameCache = QImage();
 			}
-			item.user.unread = user.unread;
-			item.user.hidden = user.hidden;
+			item.element.unread = element.unread;
+			item.element.hidden = element.hidden;
 		} else {
-			_data.items.emplace_back(Item{ .user = user });
+			_data.items.emplace_back(Item{ .element = element });
 		}
 	}
 	updateScrollMax();
@@ -115,23 +117,25 @@ void List::showContent(Content &&content) {
 
 List::Summaries List::ComposeSummaries(Data &data) {
 	const auto total = int(data.items.size());
-	const auto skip = (total > 1 && data.items[0].user.self) ? 1 : 0;
+	const auto skip = (total > 1 && data.items[0].element.skipSmall)
+		? 1
+		: 0;
 	auto unreadInFirst = 0;
 	auto unreadTotal = 0;
 	for (auto i = skip; i != total; ++i) {
-		if (data.items[i].user.unread) {
+		if (data.items[i].element.unread) {
 			++unreadTotal;
-			if (i < skip + kSmallUserpicsShown) {
+			if (i < skip + kSmallThumbsShown) {
 				++unreadInFirst;
 			}
 		}
 	}
-	auto result = Summaries{ .skipSelf = (skip > 0) };
+	auto result = Summaries{ .skipOne = (skip > 0) };
 	result.total.string
 		= tr::lng_stories_row_count(tr::now, lt_count, total);
 	const auto append = [&](QString &to, int index, bool last) {
 		if (to.isEmpty()) {
-			to = data.items[index].user.name;
+			to = data.items[index].element.name;
 		} else {
 			to = (last
 				? tr::lng_stories_row_unread_and_last
@@ -140,19 +144,19 @@ List::Summaries List::ComposeSummaries(Data &data) {
 					lt_accumulated,
 					to,
 					lt_user,
-					data.items[index].user.name);
+					data.items[index].element.name);
 		}
 	};
 	if (!total) {
 		return result;
-	} else if (total <= skip + kSmallUserpicsShown) {
+	} else if (total <= skip + kSmallThumbsShown) {
 		for (auto i = skip; i != total; ++i) {
 			append(result.allNames.string, i, i == total - 1);
 		}
 	}
 	if (unreadInFirst > 0 && unreadInFirst == unreadTotal) {
 		for (auto i = skip; i != total; ++i) {
-			if (data.items[i].user.unread) {
+			if (data.items[i].element.unread) {
 				append(result.unreadNames.string, i, !--unreadTotal);
 			}
 		}
@@ -166,20 +170,22 @@ bool List::StringsEqual(const Summaries &a, const Summaries &b) {
 		&& (a.unreadNames.string == b.unreadNames.string);
 }
 
-void List::Populate(Summary &summary) {
+void List::Populate(
+		const style::DialogsStories &st,
+		Summary &summary) {
 	if (summary.empty()) {
 		return;
 	}
 	summary.cache = QImage();
-	summary.text = Ui::Text::String(
-		st::dialogsStories.nameStyle,
-		summary.string);
+	summary.text = Ui::Text::String(st.nameStyle, summary.string);
 }
 
-void List::Populate(Summaries &summaries) {
-	Populate(summaries.total);
-	Populate(summaries.allNames);
-	Populate(summaries.unreadNames);
+void List::Populate(
+		const style::DialogsStories &st,
+		Summaries &summaries) {
+	Populate(st, summaries.total);
+	Populate(st, summaries.allNames);
+	Populate(st, summaries.unreadNames);
 }
 
 void List::updateSummary(Data &data) {
@@ -188,7 +194,7 @@ void List::updateSummary(Data &data) {
 		return;
 	}
 	data.summaries = std::move(summaries);
-	Populate(data.summaries);
+	Populate(_st.small, data.summaries);
 }
 
 void List::toggleAnimated(bool shown) {
@@ -203,14 +209,14 @@ void List::updateHeight() {
 	const auto shown = _shownAnimation.value(_data.empty() ? 0. : 1.);
 	resize(
 		width(),
-		anim::interpolate(0, st::dialogsStoriesFull.height, shown));
+		anim::interpolate(0, _st.full.height, shown));
 	if (_data.empty() && shown == 0.) {
 		_hidingData = {};
 	}
 }
 
 void List::updateScrollMax() {
-	const auto &full = st::dialogsStoriesFull;
+	const auto &full = _st.full;
 	const auto singleFull = full.photoLeft * 2 + full.photo;
 	const auto widthFull = full.left + int(_data.items.size()) * singleFull;
 	_scrollLeftMax = std::max(widthFull - width(), 0);
@@ -252,8 +258,8 @@ void List::resizeEvent(QResizeEvent *e) {
 }
 
 List::Layout List::computeLayout() const {
-	const auto &st = st::dialogsStories;
-	const auto &full = st::dialogsStoriesFull;
+	const auto &st = _st.small;
+	const auto &full = _st.full;
 	const auto shownHeight = std::max(_shownHeight(), st.height);
 	const auto ratio = float64(shownHeight - st.height)
 		/ (full.height - st.height);
@@ -267,11 +273,12 @@ List::Layout List::computeLayout() const {
 		+ st::defaultDialogRow.photoSize
 		+ st::defaultDialogRow.padding.left();
 	const auto narrow = (width() <= narrowWidth);
-	const auto smallSkip = (itemsCount > 1 && rendering.items[0].user.self)
+	const auto smallSkip = (itemsCount > 1
+		&& rendering.items[0].element.skipSmall)
 		? 1
 		: 0;
 	const auto smallCount = std::min(
-		kSmallUserpicsShown,
+		kSmallThumbsShown,
 		itemsCount - smallSkip);
 	const auto smallWidth = st.photo + (smallCount - 1) * st.shift;
 	const auto leftSmall = (narrow
@@ -288,17 +295,17 @@ List::Layout List::computeLayout() const {
 	const auto startIndexSmall = std::min(startIndexFull, smallSkip);
 	const auto endIndexSmall = smallSkip + smallCount;
 	const auto cellLeftSmall = leftSmall + (startIndexSmall * st.shift);
-	const auto userpicLeftFull = cellLeftFull + full.photoLeft;
-	const auto userpicLeftSmall = cellLeftSmall + st.photoLeft;
-	const auto userpicLeft = lerp(userpicLeftSmall, userpicLeftFull);
+	const auto thumbnailLeftFull = cellLeftFull + full.photoLeft;
+	const auto thumbnailLeftSmall = cellLeftSmall + st.photoLeft;
+	const auto thumbnailLeft = lerp(thumbnailLeftSmall, thumbnailLeftFull);
 	const auto photoLeft = lerp(st.photoLeft, full.photoLeft);
 	return Layout{
 		.itemsCount = itemsCount,
 		.shownHeight = shownHeight,
 		.ratio = ratio,
-		.userpicLeft = userpicLeft,
+		.thumbnailLeft = thumbnailLeft,
 		.photoLeft = photoLeft,
-		.left = userpicLeft - photoLeft,
+		.left = thumbnailLeft - photoLeft,
 		.single = lerp(st.shift, singleFull),
 		.smallSkip = smallSkip,
 		.leftFull = leftFull,
@@ -313,8 +320,8 @@ List::Layout List::computeLayout() const {
 }
 
 void List::paintEvent(QPaintEvent *e) {
-	const auto &st = st::dialogsStories;
-	const auto &full = st::dialogsStoriesFull;
+	const auto &st = _st.small;
+	const auto &full = _st.full;
 	const auto layout = computeLayout();
 	const auto ratio = layout.ratio;
 	const auto lerp = [&](float64 a, float64 b) {
@@ -331,14 +338,14 @@ void List::paintEvent(QPaintEvent *e) {
 		+ (photoTop + (photo / 2.));
 	const auto nameScale = layout.shownHeight / float64(full.height);
 	const auto nameTop = nameScale * full.nameTop;
-	const auto nameWidth = nameScale * AvailableNameWidth();
+	const auto nameWidth = nameScale * AvailableNameWidth(_st);
 	const auto nameHeight = nameScale * full.nameStyle.font->height;
 	const auto nameLeft = layout.photoLeft + (photo - nameWidth) / 2.;
-	const auto readUserpicOpacity = lerp(kSmallReadOpacity, 1.);
-	const auto readUserpicAppearingOpacity = lerp(kSmallReadOpacity, 0.);
+	const auto readUserpicOpacity = lerp(_st.readOpacity, 1.);
+	const auto readUserpicAppearingOpacity = lerp(_st.readOpacity, 0.);
 
 	auto p = QPainter(this);
-	p.fillRect(e->rect(), st::dialogsBg);
+	p.fillRect(e->rect(), _st.bg);
 	p.translate(0, height() - layout.shownHeight);
 
 	const auto drawSmall = (ratio < 1.);
@@ -375,8 +382,8 @@ void List::paintEvent(QPaintEvent *e) {
 		return Single{ x, indexSmall, small, indexFull, full };
 	};
 	const auto hasUnread = [&](const Single &single) {
-		return (single.itemSmall && single.itemSmall->user.unread)
-			|| (single.itemFull && single.itemFull->user.unread);
+		return (single.itemSmall && single.itemSmall->element.unread)
+			|| (single.itemFull && single.itemFull->element.unread);
 	};
 	const auto enumerate = [&](auto &&paintGradient, auto &&paintOther) {
 		auto nextGradientPainted = false;
@@ -398,7 +405,9 @@ void List::paintEvent(QPaintEvent *e) {
 				}
 				if (i > first && hasUnread(current) && next) {
 					if (current.itemSmall || !next.itemSmall) {
-						if (i - 1 == first && first > 0 && !skippedPainted) {
+						if (i - 1 == first
+							&& first > 0
+							&& !skippedPainted) {
 							if (const auto skipped = lookup(i - 2)) {
 								skippedPainted = true;
 								paintGradient(skipped);
@@ -425,11 +434,15 @@ void List::paintEvent(QPaintEvent *e) {
 
 		// Unread gradient.
 		const auto x = single.x;
-		const auto userpic = QRectF(x + layout.photoLeft, photoTop, photo, photo);
+		const auto userpic = QRectF(
+			x + layout.photoLeft,
+			photoTop,
+			photo,
+			photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
-		const auto smallUnread = small && small->user.unread;
-		const auto fullUnread = itemFull && itemFull->user.unread;
+		const auto smallUnread = small && small->element.unread;
+		const auto fullUnread = itemFull && itemFull->element.unread;
 		const auto unreadOpacity = (smallUnread && fullUnread)
 			? 1.
 			: smallUnread
@@ -458,11 +471,15 @@ void List::paintEvent(QPaintEvent *e) {
 		Expects(single.itemSmall || single.itemFull);
 
 		const auto x = single.x;
-		const auto userpic = QRectF(x + layout.photoLeft, photoTop, photo, photo);
+		const auto userpic = QRectF(
+			x + layout.photoLeft,
+			photoTop,
+			photo,
+			photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
-		const auto smallUnread = small && small->user.unread;
-		const auto fullUnread = itemFull && itemFull->user.unread;
+		const auto smallUnread = small && small->element.unread;
+		const auto fullUnread = itemFull && itemFull->element.unread;
 
 		// White circle with possible read gray line.
 		const auto hasReadLine = (itemFull && !fullUnread);
@@ -483,25 +500,27 @@ void List::paintEvent(QPaintEvent *e) {
 		// Userpic.
 		if (itemFull == small) {
 			p.setOpacity(smallUnread ? 1. : readUserpicOpacity);
-			validateUserpic(itemFull);
+			validateThumbnail(itemFull);
 			const auto size = full.photo;
-			p.drawImage(userpic, itemFull->user.userpic->image(size));
+			p.drawImage(userpic, itemFull->element.thumbnail->image(size));
 		} else {
 			if (small) {
 				p.setOpacity(smallUnread
 					? (itemFull ? 1. : (1. - ratio))
 					: (itemFull
-						? kSmallReadOpacity
+						? _st.readOpacity
 						: readUserpicAppearingOpacity));
-				validateUserpic(small);
+				validateThumbnail(small);
 				const auto size = (ratio > 0.) ? full.photo : st.photo;
-				p.drawImage(userpic, small->user.userpic->image(size));
+				p.drawImage(userpic, small->element.thumbnail->image(size));
 			}
 			if (itemFull) {
 				p.setOpacity(ratio);
-				validateUserpic(itemFull);
+				validateThumbnail(itemFull);
 				const auto size = full.photo;
-				p.drawImage(userpic, itemFull->user.userpic->image(size));
+				p.drawImage(
+					userpic,
+					itemFull->element.thumbnail->image(size));
 			}
 		}
 		p.setOpacity(1.);
@@ -510,11 +529,11 @@ void List::paintEvent(QPaintEvent *e) {
 	paintSummary(p, rendering, summaryTop, ratio);
 }
 
-void List::validateUserpic(not_null<Item*> item) {
+void List::validateThumbnail(not_null<Item*> item) {
 	if (!item->subscribed) {
 		item->subscribed = true;
-		//const auto id = item.user.id;
-		item->user.userpic->subscribeToUpdates([=] {
+		//const auto id = item.element.id;
+		item->element.thumbnail->subscribeToUpdates([=] {
 			update();
 		});
 	}
@@ -525,10 +544,10 @@ void List::validateName(not_null<Item*> item) {
 	if (!item->nameCache.isNull() && item->nameCacheColor == color->c) {
 		return;
 	}
-	const auto &full = st::dialogsStoriesFull;
+	const auto &full = _st.full;
 	const auto &font = full.nameStyle.font;
-	const auto available = AvailableNameWidth();
-	const auto text = Ui::Text::String(full.nameStyle, item->user.name);
+	const auto available = AvailableNameWidth(_st);
+	const auto text = Ui::Text::String(full.nameStyle, item->element.name);
 	const auto ratio = style::DevicePixelRatio();
 	item->nameCacheColor = color->c;
 	item->nameCache = QImage(
@@ -542,13 +561,13 @@ void List::validateName(not_null<Item*> item) {
 }
 
 List::Summary &List::ChooseSummary(
+		const style::DialogsStories &st,
 		Summaries &summaries,
 		int totalItems,
 		int fullWidth) {
-	const auto &st = st::dialogsStories;
 	const auto used = std::min(
-		totalItems - (summaries.skipSelf ? 1 : 0),
-		kSmallUserpicsShown);
+		totalItems - (summaries.skipOne ? 1 : 0),
+		kSmallThumbsShown);
 	const auto taken = st.left
 		+ st.photoLeft
 		+ st.photo
@@ -572,13 +591,14 @@ List::Summary &List::ChooseSummary(
 	return summaries.total;
 }
 
-void List::PrerenderSummary(Summary &summary) {
+void List::PrerenderSummary(
+		const style::DialogsStories &st,
+		Summary &summary) {
 	if (!summary.cache.isNull()
 		&& summary.cacheForWidth == summary.available
 		&& summary.cacheColor == st::dialogsNameFg->c) {
 		return;
 	}
-	const auto &st = st::dialogsStories;
 	const auto use = std::min(summary.text.maxWidth(), summary.available);
 	const auto ratio = style::DevicePixelRatio();
 	summary.cache = QImage(
@@ -597,16 +617,20 @@ void List::paintSummary(
 		float64 summaryTop,
 		float64 hidden) {
 	const auto total = int(data.items.size());
-	auto &summary = ChooseSummary(data.summaries, total, width());
-	PrerenderSummary(summary);
+	auto &summary = ChooseSummary(
+		_st.small,
+		data.summaries,
+		total,
+		width());
+	PrerenderSummary(_st.small, summary);
 	const auto lerp = [&](float64 from, float64 to) {
 		return from + (to - from) * hidden;
 	};
-	const auto &st = st::dialogsStories;
-	const auto &full = st::dialogsStoriesFull;
+	const auto &st = _st.small;
+	const auto &full = _st.full;
 	const auto used = std::min(
-		total - (data.summaries.skipSelf ? 1 : 0),
-		kSmallUserpicsShown);
+		total - (data.summaries.skipOne ? 1 : 0),
+		kSmallThumbsShown);
 	const auto fullLeft = st.left
 		+ st.photoLeft
 		+ st.photo
@@ -671,7 +695,7 @@ void List::mouseMoveEvent(QMouseEvent *e) {
 	if (!_dragging && _mouseDownPosition) {
 		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
 			>= QApplication::startDragDistance()) {
-			if (_shownHeight() < st::dialogsStoriesFull.height) {
+			if (_shownHeight() < _st.full.height) {
 				_expandRequests.fire({});
 			}
 			_dragging = true;
@@ -718,7 +742,7 @@ void List::mouseReleaseEvent(QMouseEvent *e) {
 		if (_selected < 0) {
 			_expandRequests.fire({});
 		} else if (_selected < _data.items.size()) {
-			_clicks.fire_copy(_data.items[_selected].user.id);
+			_clicks.fire_copy(_data.items[_selected].element.id);
 		}
 	}
 }
@@ -737,8 +761,8 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 	auto &item = _data.items[_selected];
 	_menu = base::make_unique_q<Ui::PopupMenu>(this);
 
-	const auto id = item.user.id;
-	const auto hidden = item.user.hidden;
+	const auto id = item.element.id;
+	const auto hidden = item.element.hidden;
 	_menu->addAction(tr::lng_context_view_profile(tr::now), [=] {
 		_showProfileRequests.fire_copy(id);
 	});
@@ -781,8 +805,8 @@ void List::updateSelected() {
 	if (_pressed >= 0) {
 		return;
 	}
-	const auto &st = st::dialogsStories;
-	const auto &full = st::dialogsStoriesFull;
+	const auto &st = _st.small;
+	const auto &full = _st.full;
 	const auto p = mapFromGlobal(_lastMousePosition);
 	const auto layout = computeLayout();
 	const auto firstRightFull = layout.leftFull
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 72fd67a9a..f81f90c05 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -13,31 +13,38 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class QPainter;
 
+namespace style {
+struct DialogsStories;
+struct DialogsStoriesList;
+} // namespace style
+
 namespace Ui {
 class PopupMenu;
 } // namespace Ui
 
 namespace Dialogs::Stories {
 
-class Userpic {
+class Thumbnail {
 public:
 	[[nodiscard]] virtual QImage image(int size) = 0;
 	virtual void subscribeToUpdates(Fn<void()> callback) = 0;
 };
 
-struct User {
+struct Element {
 	uint64 id = 0;
 	QString name;
-	std::shared_ptr<Userpic> userpic;
+	std::shared_ptr<Thumbnail> thumbnail;
 	bool unread = false;
 	bool hidden = false;
-	bool self = false;
+	bool skipSmall = false;
 
-	friend inline bool operator==(const User &a, const User &b) = default;
+	friend inline bool operator==(
+		const Element &a,
+		const Element &b) = default;
 };
 
 struct Content {
-	std::vector<User> users;
+	std::vector<Element> elements;
 	bool full = false;
 
 	friend inline bool operator==(
@@ -54,6 +61,7 @@ class List final : public Ui::RpWidget {
 public:
 	List(
 		not_null<QWidget*> parent,
+		const style::DialogsStoriesList &st,
 		rpl::producer<Content> content,
 		Fn<int()> shownHeight);
 
@@ -67,7 +75,7 @@ public:
 private:
 	struct Layout;
 	struct Item {
-		User user;
+		Element element;
 		QImage nameCache;
 		QColor nameCacheColor;
 		bool subscribed = false;
@@ -88,7 +96,7 @@ private:
 		Summary total;
 		Summary allNames;
 		Summary unreadNames;
-		bool skipSelf = false;
+		bool skipOne = false;
 	};
 	struct Data {
 		std::vector<Item> items;
@@ -103,13 +111,20 @@ private:
 	[[nodiscard]] static bool StringsEqual(
 		const Summaries &a,
 		const Summaries &b);
-	static void Populate(Summary &summary);
-	static void Populate(Summaries &summaries);
+	static void Populate(
+		const style::DialogsStories &st,
+		Summary &summary);
+	static void Populate(
+		const style::DialogsStories &st,
+		Summaries &summaries);
 	[[nodiscard]] static Summary &ChooseSummary(
+		const style::DialogsStories &st,
 		Summaries &summaries,
 		int totalItems,
 		int fullWidth);
-	static void PrerenderSummary(Summary &summary);
+	static void PrerenderSummary(
+		const style::DialogsStories &st,
+		Summary &summary);
 
 	void showContent(Content &&content);
 	void enterEventHook(QEnterEvent *e) override;
@@ -121,7 +136,7 @@ private:
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
 
-	void validateUserpic(not_null<Item*> item);
+	void validateThumbnail(not_null<Item*> item);
 	void validateName(not_null<Item*> item);
 	void updateScrollMax();
 	void updateSummary(Data &data);
@@ -140,6 +155,7 @@ private:
 
 	[[nodiscard]] Layout computeLayout() const;
 
+	const style::DialogsStoriesList &_st;
 	Content _content;
 	Data _data;
 	Data _hidingData;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 3fb9ab309..e2bee8c06 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1979,6 +1979,8 @@ bool HistoryItem::forbidsSaving() const {
 bool HistoryItem::canDelete() const {
 	if (isSponsored()) {
 		return false;
+	} else if (IsStoryMsgId(id)) {
+		return false && _history->peer->isSelf(); // #TODO stories
 	} else if (isService() && !isRegular()) {
 		return false;
 	} else if (topicRootId() == id) {
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 62febc455..f2a9482cb 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -368,6 +368,8 @@ infoIconMediaLink: icon {{ "info/info_media_link", infoIconFg }};
 infoIconMediaGroup: icon {{ "info/info_common_groups", infoIconFg }};
 infoIconMediaVoice: icon {{ "info/info_media_voice", infoIconFg }};
 infoIconMediaStories: icon {{ "info/info_media_stories", infoIconFg }};
+infoIconMediaStoriesArchive: icon {{ "info/info_stories_archive", infoIconFg }};
+infoIconMediaStoriesRecent: icon {{ "info/info_stories_recent", infoIconFg }};
 
 infoRoundedIconRequests: icon {{ "info/edit/group_manage_join_requests", settingsIconFg }};
 infoRoundedIconRecentActions: icon {{ "info/edit/group_manage_actions", settingsIconFg }};
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 37dfe5529..a9e114515 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -534,6 +534,8 @@ Ui::StringWithNumbers TopBar::generateSelectedText() const {
 		case Type::MusicFile: return tr::lng_media_selected_song;
 		case Type::Link: return tr::lng_media_selected_link;
 		case Type::RoundVoiceFile: return tr::lng_media_selected_audio;
+			// #TODO stories
+		case Type::PhotoVideo: return tr::lng_media_selected_photo;
 		}
 		Unexpected("Type in TopBar::generateSelectedText()");
 	}();
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index af1facc58..9d3693280 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -142,7 +142,7 @@ inline auto AddStoriesButton(
 		parent,
 		std::move(count),
 		[](int count) {
-			return tr::lng_profile_stories(tr::now, lt_count, count);
+			return tr::lng_profile_saved_stories(tr::now, lt_count, count);
 		},
 		tracker)->entity();
 	result->addClickHandler([=] {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.cpp b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
index 970b63d02..9fabb28ad 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
@@ -347,7 +347,7 @@ void ListSection::resizeToWidth(int newWidth) {
 		_itemWidth = ((newWidth - _itemsLeft) / _itemsInRow)
 			- st::infoMediaSkip;
 		for (auto &item : _items) {
-			item->resizeGetHeight(_itemWidth);
+			_itemHeight = item->resizeGetHeight(_itemWidth);
 		}
 	} break;
 
@@ -378,7 +378,7 @@ int ListSection::recountHeight() {
 	case Type::Video:
 	case Type::PhotoVideo: // #TODO stories
 	case Type::RoundFile: {
-		auto itemHeight = _itemWidth + st::infoMediaSkip;
+		auto itemHeight = _itemHeight + st::infoMediaSkip;
 		auto index = 0;
 		result += _itemsTop;
 		for (auto &item : _items) {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.h b/Telegram/SourceFiles/info/media/info_media_list_section.h
index 77666a31a..358712a75 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.h
@@ -82,6 +82,7 @@ private:
 	int _itemsLeft = 0;
 	int _itemsTop = 0;
 	int _itemWidth = 0;
+	int _itemHeight = 0;
 	int _itemsInRow = 1;
 	mutable int _rowsCount = 0;
 	int _top = 0;
diff --git a/Telegram/SourceFiles/info/media/info_media_provider.cpp b/Telegram/SourceFiles/info/media/info_media_provider.cpp
index f2d8dcde7..3e75975fa 100644
--- a/Telegram/SourceFiles/info/media/info_media_provider.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_provider.cpp
@@ -421,19 +421,21 @@ std::unique_ptr<BaseLayout> Provider::createLayout(
 		}
 		return nullptr;
 	};
-	const auto spoiler = [&] {
-		if (const auto media = item->media()) {
-			return media->hasSpoiler();
-		}
-		return false;
-	};
 
 	const auto &songSt = st::overviewFileLayout;
 	using namespace Overview::Layout;
+	const auto options = [&] {
+		const auto media = item->media();
+		return MediaOptions{ .spoiler = media && media->hasSpoiler() };
+	};
 	switch (type) {
 	case Type::Photo:
 		if (const auto photo = getPhoto()) {
-			return std::make_unique<Photo>(delegate, item, photo, spoiler());
+			return std::make_unique<Photo>(
+				delegate,
+				item,
+				photo,
+				options());
 		}
 		return nullptr;
 	case Type::GIF:
@@ -443,7 +445,7 @@ std::unique_ptr<BaseLayout> Provider::createLayout(
 		return nullptr;
 	case Type::Video:
 		if (const auto file = getFile()) {
-			return std::make_unique<Video>(delegate, item, file, spoiler());
+			return std::make_unique<Video>(delegate, item, file, options());
 		}
 		return nullptr;
 	case Type::File:
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index fe32be04d..068da1c33 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -8,17 +8,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/stories/info_stories_inner_widget.h"
 
 #include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_user.h"
+#include "dialogs/ui/dialogs_stories_content.h"
+#include "dialogs/ui/dialogs_stories_list.h"
 #include "info/media/info_media_list_widget.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/stories/info_stories_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "settings/settings_common.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_info.h"
+#include "styles/style_settings.h"
 
 namespace Info::Stories {
 
@@ -99,38 +108,112 @@ void InnerWidget::setupArchive() {
 		&& _isStackBottom) {
 		createArchiveButton();
 	} else {
-		_archive.destroy();
+		_buttons.destroy();
 		refreshHeight();
 	}
 }
 
 void InnerWidget::createArchiveButton() {
-	_archive.create(this);
-	_archive->show();
+	_buttons.create(this);
+	_buttons->show();
 
-	const auto button = ::Settings::AddButton(
-		_archive,
+	const auto stories = &_controller->session().data().stories();
+	const auto self = _controller->session().user();
+	const auto archive = ::Settings::AddButton(
+		_buttons,
 		tr::lng_stories_archive_button(),
 		st::infoSharedMediaButton);
-	button->addClickHandler([=] {
+	archive->addClickHandler([=] {
 		_controller->showSection(Info::Stories::Make(
 			_controller->key().storiesPeer(),
 			Stories::Tab::Archive));
 	});
+	auto count = rpl::single(
+		rpl::empty
+	) | rpl::then(stories->archiveChanged()) | rpl::map([=] {
+		const auto value = stories->archiveCount();
+		return (value > 0) ? QString::number(value) : QString();
+	});
+	::Settings::CreateRightLabel(
+		archive,
+		std::move(count),
+		st::infoSharedMediaButton,
+		tr::lng_stories_archive_button());
 	object_ptr<Profile::FloatingIcon>(
-		button,
-		st::infoIconMediaGroup,
+		archive,
+		st::infoIconMediaStoriesArchive,
 		st::infoSharedMediaButtonIconPosition)->show();
-	_archive->add(object_ptr<Ui::FixedHeightWidget>(
-		_archive,
-		st::infoProfileSkip));
-	_archive->add(object_ptr<Ui::BoxContentDivider>(_archive));
 
-	_archive->resizeToWidth(width());
-	_archive->heightValue(
+	const auto recentWrap = _buttons->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			_buttons,
+			::Settings::CreateButton(
+				_buttons,
+				tr::lng_stories_recent_button(),
+				st::infoSharedMediaButton)));
+
+	using namespace Dialogs::Stories;
+	auto last = LastForPeer(
+		self
+	) | rpl::map([=](Content &&content) {
+		for (auto &element : content.elements) {
+			element.unread = false;
+		}
+		return std::move(content);
+	}) | rpl::start_spawning(recentWrap->lifetime());
+	const auto recent = recentWrap->entity();
+	const auto thumbs = Ui::CreateChild<List>(
+		recent,
+		st::dialogsStoriesListMine,
+		rpl::duplicate(last) | rpl::filter([](const Content &content) {
+			return !content.elements.empty();
+		}),
+		[] { return st::dialogsStories.height; });
+	rpl::combine(
+		recent->sizeValue(),
+		rpl::duplicate(last)
+	) | rpl::start_with_next([=](QSize size, const Content &content) {
+		if (content.elements.empty()) {
+			return;
+		}
+		const auto width = st::defaultDialogRow.padding.left()
+			+ st::defaultDialogRow.photoSize
+			+ st::defaultDialogRow.padding.left();
+		const auto &small = st::dialogsStories;
+		const auto count = int(content.elements.size());
+		const auto smallWidth = small.photo + (count - 1) * small.shift;
+		const auto real = smallWidth;
+		const auto top = st::dialogsStories.height
+			- st::dialogsStoriesFull.height
+			+ (size.height() - st::dialogsStories.height) / 2;
+		const auto right = st::settingsButtonRightSkip - (width - real) / 2;
+		thumbs->resizeToWidth(width);
+		thumbs->moveToRight(right, top);
+	}, thumbs->lifetime());
+	thumbs->setAttribute(Qt::WA_TransparentForMouseEvents);
+	recent->addClickHandler([=] {
+		_controller->parentController()->openPeerStories(self->id);
+	});
+	object_ptr<Profile::FloatingIcon>(
+		recent,
+		st::infoIconMediaStoriesRecent,
+		st::infoSharedMediaButtonIconPosition)->show();
+	recentWrap->toggleOn(rpl::duplicate(
+		last
+	) | rpl::map([](const Content &content) {
+		return !content.elements.empty();
+	}));
+
+	_buttons->add(object_ptr<Ui::FixedHeightWidget>(
+		_buttons,
+		st::infoProfileSkip));
+	_buttons->add(object_ptr<Ui::BoxContentDivider>(_buttons));
+
+	_buttons->resizeToWidth(width());
+	_buttons->heightValue(
 	) | rpl::start_with_next([=] {
 		refreshHeight();
-	}, _archive->lifetime());
+	}, _buttons->lifetime());
 }
 
 void InnerWidget::visibleTopBottomUpdated(
@@ -194,8 +277,8 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 	_inResize = true;
 	auto guard = gsl::finally([this] { _inResize = false; });
 
-	if (_archive) {
-		_archive->resizeToWidth(newWidth);
+	if (_buttons) {
+		_buttons->resizeToWidth(newWidth);
 	}
 	_list->resizeToWidth(newWidth);
 	_empty->resizeToWidth(newWidth);
@@ -211,9 +294,9 @@ void InnerWidget::refreshHeight() {
 
 int InnerWidget::recountHeight() {
 	auto top = 0;
-	if (_archive) {
-		_archive->moveToLeft(0, top);
-		top += _archive->heightNoMargins() - st::lineWidth;
+	if (_buttons) {
+		_buttons->moveToLeft(0, top);
+		top += _buttons->heightNoMargins() - st::lineWidth;
 	}
 	auto listHeight = 0;
 	if (_list) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index e683013fe..92814b72e 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -71,7 +71,7 @@ private:
 
 	const not_null<Controller*> _controller;
 
-	object_ptr<Ui::VerticalLayout> _archive = { nullptr };
+	object_ptr<Ui::VerticalLayout> _buttons = { nullptr };
 	object_ptr<Media::ListWidget> _list = { nullptr };
 	object_ptr<EmptyWidget> _empty;
 
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index 388602347..2c6621fff 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -61,7 +61,7 @@ Type Provider::type() {
 }
 
 bool Provider::hasSelectRestriction() {
-	return false;
+	return true; // #TODO stories
 }
 
 rpl::producer<bool> Provider::hasSelectRestrictionChanges() {
@@ -292,22 +292,18 @@ std::unique_ptr<BaseLayout> Provider::createLayout(
 		}
 		return nullptr;
 	};
-	// #TODO stories
-	const auto maybeStory = item->history()->owner().stories().lookup(
-		{ item->history()->peer->id, StoryIdFromMsgId(item->id) });
-	const auto spoiler = maybeStory && !(*maybeStory)->expired();
-
 	using namespace Overview::Layout;
+	const auto options = MediaOptions{ .story = true };
 	if (const auto photo = getPhoto()) {
-		return std::make_unique<Photo>(delegate, item, photo, spoiler);
+		return std::make_unique<Photo>(delegate, item, photo, options);
 	} else if (const auto file = getFile()) {
-		return std::make_unique<Video>(delegate, item, file, spoiler);
+		return std::make_unique<Video>(delegate, item, file, options);
 	} else {
 		return std::make_unique<Photo>(
 			delegate,
 			item,
 			Data::MediaStory::LoadingStoryPhoto(&item->history()->owner()),
-			spoiler);
+			options);
 	}
 	return nullptr;
 }
@@ -316,9 +312,8 @@ ListItemSelectionData Provider::computeSelectionData(
 		not_null<const HistoryItem*> item,
 		TextSelection selection) {
 	auto result = ListItemSelectionData(selection);
-	result.canDelete = true;
-	result.canForward = item->allowsForward()
-		&& (&item->history()->session() == &_controller->session());
+	result.canDelete = item->canDelete();
+	result.canForward = item->allowsForward();
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 599dd8f1b..603963621 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -65,12 +65,42 @@ TextParseOptions _documentNameOptions = {
 };
 
 constexpr auto kMaxInlineArea = 1280 * 720;
+constexpr auto kStoryRatio = 1.46;
 
 [[nodiscard]] bool CanPlayInline(not_null<DocumentData*> document) {
 	const auto dimensions = document->dimensions;
 	return dimensions.width() * dimensions.height() <= kMaxInlineArea;
 }
 
+[[nodiscard]] QImage CropMediaFrame(QImage image, int width, int height) {
+	const auto ratio = style::DevicePixelRatio();
+	width *= ratio;
+	height *= ratio;
+	const auto finalize = [&](QImage result) {
+		result = result.scaled(
+			width,
+			height,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+		result.setDevicePixelRatio(ratio);
+		return result;
+	};
+	if (image.width() * height == image.height() * width) {
+		if (image.width() != width) {
+			return finalize(std::move(image));
+		}
+		image.setDevicePixelRatio(ratio);
+		return image;
+	} else if (image.width() * height > image.height() * width) {
+		const auto use = (image.height() * width) / height;
+		const auto skip = (image.width() - use) / 2;
+		return finalize(image.copy(skip, 0, use, image.height()));
+	} else {
+		const auto use = (image.width() * height) / width;
+		const auto skip = (image.height() - use) / 2;
+		return finalize(image.copy(0, skip, image.width(), use));
+	}
+}
 
 } // namespace
 
@@ -298,7 +328,7 @@ Photo::Photo(
 	not_null<Delegate*> delegate,
 	not_null<HistoryItem*> parent,
 	not_null<PhotoData*> photo,
-	bool spoiler)
+	MediaOptions options)
 : ItemBase(delegate, parent)
 , _data(photo)
 , _link(std::make_shared<PhotoOpenClickHandler>(
@@ -308,9 +338,10 @@ Photo::Photo(
 		delegate->openPhoto(photo, id);
 	}),
 	parent->fullId()))
-, _spoiler(spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
+, _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
 	delegate->repaintItem(this);
-}) : nullptr) {
+}) : nullptr)
+, _story(options.story) {
 	if (_data->inlineThumbnailBytes().isEmpty()
 		&& (_data->hasExact(Data::PhotoSize::Small)
 			|| _data->hasExact(Data::PhotoSize::Thumbnail))) {
@@ -320,14 +351,14 @@ Photo::Photo(
 
 void Photo::initDimensions() {
 	_maxw = 2 * st::overviewPhotoMinSize;
-	_minh = _maxw;
+	_minh = _story ? qRound(_maxw * kStoryRatio) : _maxw;
 }
 
 int32 Photo::resizeGetHeight(int32 width) {
 	width = qMin(width, _maxw);
-	if (width != _width || width != _height) {
-		_width = qMin(width, _maxw);
-		_height = _width;
+	if (_width != width) {
+		_width = width;
+		_height = _story ? qRound(_width * kStoryRatio) : _width;
 	}
 	return _height;
 }
@@ -382,21 +413,14 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 }
 
 void Photo::setPixFrom(not_null<Image*> image) {
-	const auto size = _width * cIntRetinaFactor();
+	Expects(_width > 0 && _height > 0);
+
 	auto img = image->original();
 	if (!_goodLoaded) {
 		img = Images::Blur(std::move(img));
 	}
-	if (img.width() == img.height()) {
-		if (img.width() != size) {
-			img = img.scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-		}
-	} else if (img.width() > img.height()) {
-		img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-	} else {
-		img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-	}
-	img.setDevicePixelRatio(cRetinaFactor());
+	_pix = Ui::PixmapFromImage(
+		CropMediaFrame(std::move(img), _width, _height));
 
 	// In case we have inline thumbnail we can unload all images and we still
 	// won't get a blank image in the media viewer when the photo is opened.
@@ -404,8 +428,6 @@ void Photo::setPixFrom(not_null<Image*> image) {
 		_dataMedia = nullptr;
 		delegate()->unregisterHeavyItem(this);
 	}
-
-	_pix = Ui::PixmapFromImage(std::move(img));
 }
 
 void Photo::ensureDataMediaCreated() const {
@@ -445,13 +467,14 @@ Video::Video(
 	not_null<Delegate*> delegate,
 	not_null<HistoryItem*> parent,
 	not_null<DocumentData*> video,
-	bool spoiler)
+	MediaOptions options)
 : RadialProgressItem(delegate, parent)
 , _data(video)
 , _duration(Ui::FormatDurationText(_data->duration() / 1000))
-, _spoiler(spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
+, _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
 	delegate->repaintItem(this);
-}) : nullptr) {
+}) : nullptr)
+, _story(options.story) {
 	setDocumentLinks(_data);
 	_data->loadThumbnail(parent->fullId());
 }
@@ -460,12 +483,15 @@ Video::~Video() = default;
 
 void Video::initDimensions() {
 	_maxw = 2 * st::overviewPhotoMinSize;
-	_minh = _maxw;
+	_minh = _story ? qRound(_maxw * kStoryRatio) : _maxw;
 }
 
 int32 Video::resizeGetHeight(int32 width) {
-	_width = qMin(width, _maxw);
-	_height = _width;
+	width = qMin(width, _maxw);
+	if (_width != width) {
+		_width = width;
+		_height = _story ? qRound(_width * kStoryRatio) : _width;
+	}
 	return _height;
 }
 
@@ -497,18 +523,8 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			: thumbnail
 			? thumbnail->original()
 			: Images::Blur(blurred->original());
-		if (img.width() == img.height()) {
-			if (img.width() != size) {
-				img = img.scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-			}
-		} else if (img.width() > img.height()) {
-			img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-		} else {
-			img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-		}
-		img.setDevicePixelRatio(cRetinaFactor());
-
-		_pix = Ui::PixmapFromImage(std::move(img));
+		_pix = Ui::PixmapFromImage(
+			CropMediaFrame(std::move(img), _width, _height));
 		_pixBlurred = !(thumbnail || good);
 	}
 
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 53dc9bdb0..e566de4a5 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -183,13 +183,18 @@ struct Info : public RuntimeComponent<Info, LayoutItemBase> {
 	int top = 0;
 };
 
+struct MediaOptions {
+	bool spoiler = false;
+	bool story = false;
+};
+
 class Photo final : public ItemBase {
 public:
 	Photo(
 		not_null<Delegate*> delegate,
 		not_null<HistoryItem*> parent,
 		not_null<PhotoData*> photo,
-		bool spoiler);
+		MediaOptions options);
 
 	void initDimensions() override;
 	int32 resizeGetHeight(int32 width) override;
@@ -212,6 +217,7 @@ private:
 
 	QPixmap _pix;
 	bool _goodLoaded = false;
+	bool _story = false;
 
 };
 
@@ -279,7 +285,7 @@ public:
 		not_null<Delegate*> delegate,
 		not_null<HistoryItem*> parent,
 		not_null<DocumentData*> video,
-		bool spoiler);
+		MediaOptions options);
 	~Video();
 
 	void initDimensions() override;
@@ -311,6 +317,7 @@ private:
 
 	QPixmap _pix;
 	bool _pixBlurred = true;
+	bool _story = false;
 
 };
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index c21ef8437..394ca2358 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2530,7 +2530,7 @@ void SessionController::openPeerStory(
 
 void SessionController::openPeerStories(
 		PeerId peerId,
-		Data::StorySourcesList list) {
+		std::optional<Data::StorySourcesList> list) {
 	using namespace Media::View;
 	using namespace Data;
 
@@ -2541,7 +2541,9 @@ void SessionController::openPeerStories(
 		openPeerStory(
 			source->user,
 			j != source->ids.end() ? j->id : source->ids.front().id,
-			{ list });
+			(list
+				? StoriesContext{ *list }
+				: StoriesContext{ StoriesContextPeer() }));
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 4903c6be9..7d9567427 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -582,7 +582,9 @@ public:
 		not_null<PeerData*> peer,
 		StoryId storyId,
 		Data::StoriesContext context);
-	void openPeerStories(PeerId peerId, Data::StorySourcesList list);
+	void openPeerStories(
+		PeerId peerId,
+		std::optional<Data::StorySourcesList> list = std::nullopt);
 
 	struct PaintContextArgs {
 		not_null<Ui::ChatTheme*> theme;

From 738e20252e880ddd2323b23304122cc75a389e7c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Jun 2023 18:24:40 +0400
Subject: [PATCH 310/676] Fix a crash in saved stories layer management.

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

diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 0c5ba45ed..3ff8fe7be 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -244,6 +244,12 @@ Dialogs::RowDescriptor WrapWidget::activeChat() const {
 		return Dialogs::RowDescriptor(
 			peer->owner().history(peer),
 			FullMsgId());
+	} else if (const auto storiesPeer = key().storiesPeer()) {
+		return (key().storiesTab() == Stories::Tab::Saved)
+			? Dialogs::RowDescriptor(
+				storiesPeer->owner().history(storiesPeer),
+				FullMsgId())
+			: Dialogs::RowDescriptor();
 	} else if (key().settingsSelf() || key().isDownloads() || key().poll()) {
 		return Dialogs::RowDescriptor();
 	}

From d2dd63e90af13948b722f714bd9f9b828ea47faf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Jun 2023 19:31:40 +0400
Subject: [PATCH 311/676] Show active stories in profile top bar.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  3 +
 .../dialogs/ui/dialogs_stories_list.cpp       |  2 +-
 .../SourceFiles/info/info_content_widget.cpp  |  5 +
 .../SourceFiles/info/info_content_widget.h    |  6 ++
 Telegram/SourceFiles/info/info_top_bar.cpp    | 94 ++++++++++++++++++-
 Telegram/SourceFiles/info/info_top_bar.h      | 24 ++++-
 .../SourceFiles/info/info_wrap_widget.cpp     |  6 ++
 .../info/profile/info_profile_widget.cpp      | 10 ++
 .../info/profile/info_profile_widget.h        |  1 +
 9 files changed, 143 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 30b36538d..8e9f09232 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -505,6 +505,7 @@ DialogsStoriesList {
 	full: DialogsStories;
 	bg: color;
 	readOpacity: double;
+	fullClickable: int;
 }
 
 dialogsStories: DialogsStories {
@@ -544,9 +545,11 @@ dialogsStoriesList: DialogsStoriesList {
 	full: dialogsStoriesFull;
 	bg: dialogsBg;
 	readOpacity: 0.6;
+	fullClickable: 0;
 }
 dialogsStoriesListInfo: DialogsStoriesList(dialogsStoriesList) {
 	bg: transparent;
+	fullClickable: 1;
 }
 dialogsStoriesListMine: DialogsStoriesList(dialogsStoriesListInfo) {
 	readOpacity: 1.;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index c022e025c..b630d9b64 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -846,7 +846,7 @@ void List::updateSelected() {
 				+ lastRightAdd)
 		? (infiniteIndex - 1) // Last small part should still be clickable.
 		: (startIndex + infiniteIndex >= endIndex)
-		? -1
+		? (_st.fullClickable ? (endIndex - 1) : -1)
 		: infiniteIndex;
 	const auto selected = (index < 0
 		|| startIndex + index >= layout.itemsCount)
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 640c75d67..e96ba3cfc 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -273,6 +273,11 @@ void ContentWidget::setViewport(
 	}, _scroll->lifetime());
 }
 
+auto ContentWidget::titleStories()
+-> rpl::producer<Dialogs::Stories::Content> {
+	return nullptr;
+}
+
 void ContentWidget::saveChanges(FnMut<void()> done) {
 	done();
 }
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 1a54f5fdf..6a6f75bbd 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "info/info_wrap_widget.h"
 
+namespace Dialogs::Stories {
+struct Content;
+} // namespace Dialogs::Stories
+
 namespace Storage {
 enum class SharedMediaType : signed char;
 } // namespace Storage
@@ -88,6 +92,8 @@ public:
 	}
 
 	[[nodiscard]] virtual rpl::producer<QString> title() = 0;
+	[[nodiscard]] virtual auto titleStories()
+		-> rpl::producer<Dialogs::Stories::Content>;
 
 	virtual void saveChanges(FnMut<void()> done);
 
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index a9e114515..309ca167d 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <rpl/never.h>
 #include <rpl/merge.h>
+#include "dialogs/ui/dialogs_stories_content.h"
+#include "dialogs/ui/dialogs_stories_list.h"
 #include "lang/lang_keys.h"
 #include "lang/lang_numbers_animation.h"
 #include "info/info_wrap_widget.h"
@@ -30,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_user.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_info.h"
 
 namespace Info {
@@ -88,9 +91,11 @@ void TopBar::setTitle(rpl::producer<QString> &&title) {
 		object_ptr<Ui::FlatLabel>(this, std::move(title), _st.title),
 		st::infoTopBarScale);
 	_title->setDuration(st::infoTopBarDuration);
-	_title->toggle(!selectionMode(), anim::type::instant);
+	_title->toggle(
+		!selectionMode() && !storiesTitle(),
+		anim::type::instant);
 	registerToggleControlCallback(_title.data(), [=] {
-		return !selectionMode() && !searchMode();
+		return !selectionMode() && !storiesTitle() && !searchMode();
 	});
 
 	if (_back) {
@@ -309,12 +314,15 @@ int TopBar::resizeGetHeight(int newWidth) {
 void TopBar::updateControlsGeometry(int newWidth) {
 	updateDefaultControlsGeometry(newWidth);
 	updateSelectionControlsGeometry(newWidth);
+	updateStoriesGeometry(newWidth);
 }
 
 void TopBar::updateDefaultControlsGeometry(int newWidth) {
 	auto right = 0;
 	for (auto &button : _buttons) {
-		if (!button) continue;
+		if (!button) {
+			continue;
+		}
 		button->moveToRight(right, 0, newWidth);
 		right += button->width();
 	}
@@ -362,6 +370,28 @@ void TopBar::updateSelectionControlsGeometry(int newWidth) {
 		newWidth);
 }
 
+void TopBar::updateStoriesGeometry(int newWidth) {
+	if (!_stories) {
+		return;
+	}
+
+	auto right = 0;
+	for (auto &button : _buttons) {
+		if (!button) {
+			continue;
+		}
+		button->moveToRight(right, 0, newWidth);
+		right += button->width();
+	}
+	const auto left = (_back ? _st.back.width : _st.titlePosition.x())
+		- st::dialogsStories.left - st::dialogsStories.photoLeft;
+	const auto top = st::dialogsStories.height
+		- st::dialogsStoriesFull.height
+		+ (_st.height - st::dialogsStories.height) / 2;
+	_stories->resizeToWidth(newWidth - left - right);
+	_stories->moveToLeft(left, top, newWidth);
+}
+
 void TopBar::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
@@ -412,6 +442,60 @@ void TopBar::updateControlsVisibility(anim::type animated) {
 	}
 }
 
+void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
+	_storiesLifetime.destroy();
+	if (content) {
+		using namespace Dialogs::Stories;
+
+		auto last = std::move(
+			content
+		) | rpl::start_spawning(_storiesLifetime);
+		delete _stories;
+
+		const auto stories = Ui::CreateChild<Ui::FadeWrap<List>>(
+			this,
+			object_ptr<List>(
+				this,
+				st::dialogsStoriesListInfo,
+				rpl::duplicate(
+					last
+				) | rpl::filter([](const Content &content) {
+					return !content.elements.empty();
+				}),
+				[] { return st::dialogsStories.height; }),
+				st::infoTopBarScale);
+		registerToggleControlCallback(
+			stories,
+			[this] { return _storiesCount > 0; });
+		stories->toggle(false, anim::type::instant);
+		stories->setDuration(st::infoTopBarDuration);
+		_stories = stories;
+		_stories->entity()->clicks(
+		) | rpl::start_to_stream(_storyClicks, _stories->lifetime());
+		if (_back) {
+			_back->raise();
+		}
+
+		rpl::duplicate(
+			last
+		) | rpl::start_with_next([=](const Content &content) {
+			const auto count = int(content.elements.size());
+			if (_storiesCount != count) {
+				const auto was = (_storiesCount > 0);
+				_storiesCount = count;
+				const auto now = (_storiesCount > 0);
+				if (was != now) {
+					updateControlsVisibility(anim::type::normal);
+				}
+				updateControlsGeometry(width());
+			}
+		}, _storiesLifetime);
+	} else {
+		_storiesCount = 0;
+	}
+	updateControlsVisibility(anim::type::instant);
+}
+
 void TopBar::setSelectedItems(SelectedItems &&items) {
 	auto wasSelectionMode = selectionMode();
 	_selectedItems = std::move(items);
@@ -550,6 +634,10 @@ bool TopBar::selectionMode() const {
 	return !_selectedItems.list.empty();
 }
 
+bool TopBar::storiesTitle() const {
+	return _storiesCount > 0;
+}
+
 bool TopBar::searchMode() const {
 	return _searchModeAvailable && _searchModeEnabled;
 }
diff --git a/Telegram/SourceFiles/info/info_top_bar.h b/Telegram/SourceFiles/info/info_top_bar.h
index a2ed052c5..b038e213a 100644
--- a/Telegram/SourceFiles/info/info_top_bar.h
+++ b/Telegram/SourceFiles/info/info_top_bar.h
@@ -18,6 +18,11 @@ namespace style {
 struct InfoTopBar;
 } // namespace style
 
+namespace Dialogs::Stories {
+class List;
+struct Content;
+} // namespace Dialogs::Stories
+
 namespace Window {
 class SessionNavigation;
 } // namespace Window
@@ -43,11 +48,15 @@ public:
 		const style::InfoTopBar &st,
 		SelectedItems &&items);
 
-	auto backRequest() const {
+	[[nodiscard]] auto backRequest() const {
 		return _backClicks.events();
 	}
+	[[nodiscard]] auto storyClicks() const {
+		return _storyClicks.events();
+	}
 
 	void setTitle(rpl::producer<QString> &&title);
+	void setStories(rpl::producer<Dialogs::Stories::Content> content);
 	void enableBackButton();
 	void highlight();
 
@@ -95,6 +104,7 @@ private:
 	void updateControlsGeometry(int newWidth);
 	void updateDefaultControlsGeometry(int newWidth);
 	void updateSelectionControlsGeometry(int newWidth);
+	void updateStoriesGeometry(int newWidth);
 	Ui::FadeWrap<Ui::RpWidget> *pushButton(
 		base::unique_qptr<Ui::RpWidget> button);
 	void forceButtonVisibility(
@@ -104,9 +114,10 @@ private:
 	void startHighlightAnimation();
 	void updateControlsVisibility(anim::type animated);
 
-	bool selectionMode() const;
-	bool searchMode() const;
-	Ui::StringWithNumbers generateSelectedText() const;
+	[[nodiscard]] bool selectionMode() const;
+	[[nodiscard]] bool storiesTitle() const;
+	[[nodiscard]] bool searchMode() const;
+	[[nodiscard]] Ui::StringWithNumbers generateSelectedText() const;
 	[[nodiscard]] bool computeCanDelete() const;
 	[[nodiscard]] bool computeCanForward() const;
 	void updateSelectionState();
@@ -147,6 +158,7 @@ private:
 	QPointer<Ui::InputField> _searchField;
 
 	rpl::event_stream<> _backClicks;
+	rpl::event_stream<uint64> _storyClicks;
 
 	SelectedItems _selectedItems;
 	bool _canDelete = false;
@@ -157,6 +169,10 @@ private:
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _delete;
 	rpl::event_stream<SelectionAction> _selectionActionRequests;
 
+	QPointer<Ui::FadeWrap<Dialogs::Stories::List>> _stories;
+	rpl::lifetime _storiesLifetime;
+	int _storiesCount = 0;
+
 	using UpdateCallback = Fn<bool(anim::type)>;
 	std::map<QObject*, UpdateCallback> _updateControlCallbacks;
 
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 3ff8fe7be..2d8e2669a 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -303,6 +303,11 @@ void WrapWidget::createTopBar() {
 			_controller->parentController()->closeThirdSection();
 		});
 	}
+	_topBar->storyClicks() | rpl::start_with_next([=] {
+		if (const auto peer = _controller->key().peer()) {
+			_controller->parentController()->openPeerStories(peer->id);
+		}
+	}, _topBar->lifetime());
 	if (wrapValue == Wrap::Layer) {
 		auto close = _topBar->addButton(
 			base::make_unique_q<Ui::IconButton>(
@@ -579,6 +584,7 @@ void WrapWidget::finishShowContent() {
 	_content->setIsStackBottom(!hasStackHistory());
 	if (_topBar) {
 		_topBar->setTitle(_content->title());
+		_topBar->setStories(_content->titleStories());
 	}
 	_desiredHeights.fire(desiredHeightForContent());
 	_desiredShadowVisibilities.fire(_content->desiredShadowVisibility());
diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
index f610c2bfe..40b374ef1 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/profile/info_profile_widget.h"
 
+#include "dialogs/ui/dialogs_stories_content.h"
 #include "info/profile/info_profile_inner_widget.h"
 #include "info/profile/info_profile_members.h"
 #include "ui/widgets/scroll_area.h"
@@ -105,7 +106,16 @@ rpl::producer<QString> Widget::title() {
 		return tr::lng_info_group_title();
 	}
 	Unexpected("Bad peer type in Info::TitleValue()");
+}
 
+rpl::producer<Dialogs::Stories::Content> Widget::titleStories() {
+	const auto peer = controller()->key().peer();
+	if (const auto user = peer->asUser()) {
+		if (!user->isBot()) {
+			return Dialogs::Stories::LastForPeer(user);
+		}
+	}
+	return nullptr;
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.h b/Telegram/SourceFiles/info/profile/info_profile_widget.h
index 51e9f0b06..38758fc00 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_widget.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_widget.h
@@ -60,6 +60,7 @@ public:
 	void setInnerFocus() override;
 
 	rpl::producer<QString> title() override;
+	rpl::producer<Dialogs::Stories::Content> titleStories() override;
 
 private:
 	void saveState(not_null<Memento*> memento);

From 19d0bf142cdaa4b38190168dd7a3d7490b2d1875 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Jun 2023 09:34:59 +0400
Subject: [PATCH 312/676] Improve empty / archived stories section.

---
 .../icons/info/info_media_story_empty.png     | Bin 0 -> 1534 bytes
 .../icons/info/info_media_story_empty@2x.png  | Bin 0 -> 3435 bytes
 .../icons/info/info_media_story_empty@3x.png  | Bin 0 -> 5763 bytes
 Telegram/Resources/langs/lang.strings         |   1 +
 .../dialogs/ui/dialogs_stories_content.cpp    |   3 +-
 .../dialogs/ui/dialogs_stories_list.cpp       |   8 +-
 .../dialogs/ui/dialogs_stories_list.h         |   1 +
 Telegram/SourceFiles/info/info.style          |   9 +++
 .../stories/info_stories_inner_widget.cpp     |  74 ++++++++++++------
 .../info/stories/info_stories_inner_widget.h  |  10 ++-
 10 files changed, 73 insertions(+), 33 deletions(-)
 create mode 100644 Telegram/Resources/icons/info/info_media_story_empty.png
 create mode 100644 Telegram/Resources/icons/info/info_media_story_empty@2x.png
 create mode 100644 Telegram/Resources/icons/info/info_media_story_empty@3x.png

diff --git a/Telegram/Resources/icons/info/info_media_story_empty.png b/Telegram/Resources/icons/info/info_media_story_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..6196956ba4c9da3760487afaa77a0445271a8be0
GIT binary patch
literal 1534
zcmV<a1p)erP)<h;3K|Lk000e1NJLTq003YB002M;0ssI2YF6c000001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91V4wp41ONa40RR91KmY&$0BG`XN&o-_Xh}ptRCodHTUjV=Ul_lpi;S74
z44E>Ou_T2TQi>PT3lhnb>BR#{@+jU!Azn-=nF_^|p$rivb5drR=i&Z;|JJ>`?m5o3
z&z{e1?+5l->s#OVTfe=A{eA1(KYl2e!hphn!hphn!ho(aU?2zJPEJm4Zf;&)UhnVk
z4-XG=fFv;n0|SGEgoLK1rlqB&ySuwzf3BOG8&gwLiNQ%|USD57H8r)fv-9%u@((Bf
z|Nr>-xW2wVJUr~~?pB94K0bbOa?;Sy;N#<?Ui<HqBqk=VtgKMHTwGjqbaZ57WCR5T
z{rvfprk{Izd!*I<{k?~W2aTkzR)vLyO-@ddPGY1qHa5n^#bK5)><?C``uchdqO-Fz
z7Z(?Xt#n4Ly1M%F^Aqg6yu5%KTU%S!(3x|}+JvYLvE26b^pJsr8*Ea%n>R5r;a#Ul
z3SC`Y7Zw)4&g<)IVPT;VR$E$H9v>g`^74dGF04*RN5_MM1F&;`evaivAY=Xg{V;(Y
zFefKRAQOV9#g;TPGXv;bTU$a*D+;uYjm`4%G7RDUfGX61o3^$#fWErA^7Hc(8ZJ0$
zZf+K63JU_hw6qlLz+*^CN)p6?PAheHcYl6<20>+IWjfsvp}@n306SAtQ$iWgX}uvK
zA=pqrP*hZuR2_+oj0^|}kjnZuc1K4?!A@Ua-#2oCRl^H;dwWA{z`?;mFe7Xg2L}g(
z9pLlz^<}GrYdbSDGkCLrQCV5ZRTuB=tE#GiY<PH>cg<QUY;A1?jK#%8ty+m8OuUMM
zf&wv&X}00%>AAYP3fEt=h!iz&yWp?mf``G-zLAj;+*iCz*4Eb2G+`)4qd^u`#l^)K
z*t4^<%+ciM=c5U^LPJ9}HDoBJsW~s@`rNfdM@K`+#KZ)1Rd^?$gt5R=_bN9G#Z+4H
z`;!NPh|jgLvB4bK+S(c=yuQ9p-K*R%6jNy>yPt@JVzPvXhcib8kDtjJ#86D#E*3BK
zLdi-HO9esLK_o-)x8bp|F`NiEJ3IefEYUAKWU|(B2{!YKo#07HN#R8;4{H!FIQUYc
zr>93$;kAPoom>e*$Qc))SXfx_0*Ip$44<Q;BPfwkn32UI&5;HA=I{sO<KyXNM6I2h
zo5OR<%*^C&)zZ?^+}xbI9v(GtonnBpxw(nI>;f?eD(B|r4h|0P@9#f7Jt27k@d_k(
z?C$RN_V#9FWq~ptdn=797On<>;>-_@7<ok?`_7kt5y7aas4z4%l%{XISY_d?`uqED
zZ*LPuj*pKKrbtgukBN!#_V&gK5*r(vot=#UE?#Gd46+_zg%`BaDA6k1fmcdwG3fd2
z?JdIlG^4}V*tn*q22&5haAoZ6?diK`ZEcNF3HIs5B&a0;vyqVzCbmfu3<eIv@MA<o
z1ad;a5fX*y^^;QrI5G5M64YuHa-E-_$H6p>6R+L@%)Zmp)1jdu^(v|a(I~Q_;cSj7
zl+le=L3<X?<hM<bi$$ibOgBEskA1AHtgzT4#ZN|~Mg<C40;Z>@Rmzp0zZsy8p3BS2
z6;i%tproV(3xSfn@HIQ6w7tC@9Ep?uVrOSpR8%C#qf{D(L`$H;jNaMV!NWj8It?B<
zR*8^;hsOYi7VO~N2TA*KWPu)&&`F$_R#@rag(N2@(<6~@t<Y(}IBvoxF!Jp`Lu5QA
zk~6fZdtw|vML_hUtE&sXSY2J6?sc9yVwI0skU~v9W(f=o#EPp)Pg+_UR$_7u3=C)z
z`$x)Id=7>1JN7A@K_hY`lY<j69)=EmQ1|<oO$=5v+rS4;2nJ$+AWnosB+Y_KjlzJ!
kfWm;nfWm;nfEEn=2l1?1r|GMat^fc407*qoM6N<$g4>C_Pyhe`

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_media_story_empty@2x.png b/Telegram/Resources/icons/info/info_media_story_empty@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3e6997cd164e77196d4c0d1be72b22a29494871
GIT binary patch
literal 3435
zcmb7HX*|?z_n-NhG{(}5F-SAX8repY^)CC8kTvUMLY9zy&o<U(5VwjfF-U~lzROsX
zge*1INR~2U5)G06-2WHP>*slKuJ1Y5Id9JSobTtHlXAmEpA#kk1A#!Ch6Xz3Or$U+
z1`06W@m0Dy6TkuH`dXms5%gE4q2p>}c*ocnbb+ZuLEt105aizwrU)<v1Y#)!gIJgd
z{`apC_>Y%T$nqaO=HEcnAf5mMaZDNNXj+DXHy!VKaT)XYG=9JGk;km!+YgkkgPjoB
zoGjrXYH;FFOZ+tlZKUW0*{TMu`QsZ`OWY04L|JOjKPcouO)5hC*zJP4qCPFpj`Fw9
z{+j=;_WS$y_O+vK8f`cypg<)*UnO9b^i1#w3f78&pM(7OzyoDS`R8RL;BdHrfB+hO
z_%XVRl~Z8xI9>4S>X$EBPoAhD5brLkS;juS<iU->U{I*tU(sD$7}d#YM|-xJD*NW}
zpX>Df9k&&!AwM*rc=rP-HPzVEv@4YU`PbH`<M(?+5@|9ntE=nk`dvvwS6UKC@9Dc-
zrLM?*^W2d`St~QM*xI2giijR5^v~gb^Sw_n80_=%GF>y!J^@Arfrp)WWgTp+t@rFj
z9G+vphV9X&^VLFR9oqtbe0ek99-_T7H)LC^$C=}KCH$xRbe*fFrl!w^IhZIMgBKAK
zTiM<CD9gjDkV__$hlhttN=mY``G*U4*;o{h=*vlULL@^WA)y0zbD0UaJGBOHXJ_Z?
zT3V-HnwOcG$;^fWquPM$3@5kr-8OD)MM+sFd&aGYvc$&6$DcPXc(J$An{>*;!lJjg
zH+4}2i}hU{&iVMyttX24d3jzs0Xi1yfDMU{mv`vEG<<k;R8Tz>Yi;=1-s%Qg*>|zv
zuZV3wor(Vbeny+*gByvv@NBh^>Pfc_0FTSe&7FODQ*LXAUCrfn8b-c#FKS})_AcCg
zuEh_BJNu84xj?a*j*iZ*yO~Fs5D59{==U$z8G_0fgT9>4dg6_}H)J3U^YYNE+b-G4
zrqLtE46JsZD%$;egfxKpBrdH~*9pyzbOM^#vDrd+tK?cFuK_;~t*0q{n@!{&T7A%;
z!!TOutU*U*rL;IO{Ha8HVWXWy;$ZE}(r}~t@F9)v<6z@La*|_YU1I25MxybwkvF?H
z>%_6?vn%vEjU;9li8dgF_s#<;DJh4Kk>l*V(v14#{DQ<&g0d4ucRyB78-gO}u$Hc<
zqoLzBCeN<S<AfzzAAN<3PYzwo5&^~5)L<Da+cWinU(LaRG8%yD&p$^Ih7D6MZ`#L*
zJaaCxuCn8kby#dXIdJw?Cig<a&e~`?k+>sPBrVE*7!<nMy~n#LZ~G!bdIaW0=-8X<
zjQA*<c!$Wc0o_|<?^gTev`h}!T1b1C7ta$%IoRFUUveACQ_&jaM(Cd#tFl*$n&<k(
zp`UE51=9pA5XwyQZ}*Nqk-Np=uZ!xDLDZswV!hPcGXzN97n#?>@-D8Bk$kn+JW!ug
zK)R`ot>@``%9YT2-)S`3-sbFE-1}lF$RcR8;bcm=MOoX0&El=L;LQgC)!bal>+WhH
zEDG%_>+g%N$NKgmAG<5G%9nf7e#*li@+;gS8Iq_~wrKKVYyfS%lUZJME=F;kz3J1w
ztwhc<{JwIyju-aL)rO?(Pqar;H~D$C9luVN|Glqno5zy36+e!h^!g?(4s$^Vx!yQe
z8@y>}mUaK}$Y6#@*dR9Jr>&VHG%-JqNxX|1%=C+kGTC&c1H=8tOAI+c5SwnZfW37J
zq`~d?-sbh~@p1FV&*NbLBZ?mFyR-VvLh?(Ebe;f#i%G<LAFCZx1r+_We@^i<M<4(3
zYSGgQX*k>buE}efJ4qNj-4?!Ev4)$vUEb<i0JBU1by(&A^BrOJL;eMw?(fM7f#meY
zMvn>cdC`9JiFd44hbf?YSLd3%b2SUS=Gz{Xr)5!Kt!|?Q2Tzek#)79TH_ijf5@`gp
z%DaBw=b;WYZ$?e)Z2~qvR873kv+-2ruQ5OwRrbKoR+!|gav&frE*`Ndm%V3Ruqv#N
zmlD&g`^+c0V{|KQbYuC^$;K(CWg|-B`w=yH!2GNGv*!kD6n}r8R}-V3QSy;cm|smU
zU2Rf%%gb~x1%nBco|2QSsMCH^*KJQv=}$eV$f=l;v=9Z7M}hTHK`jDN^ys`yE&ILN
z$v<DR3MvQ`!pT!nU(=Uf$=x=NW>$bw8Fh5P(^7velJOFdn91Z8_fl})OYD+&Kx#(_
zT#GzpxF;PQ>{>`J(WJeSY7yaYGQ}PPy@!UE@~p$Utf&XlCmy1*Jw8@roQu6@o20!H
z;`d>q>}%C+<4u6M_zz0b^y>v;N}fdS<y)~>WvOX0Ix$9CfK3vvy?Pw)HJHI^@MC-=
zLi~jP#F}y|Nl>b!&9Q$$6&ovbQnNN^QQca4qAz~`85TNfn&$z@^kCsh4oSWeOv|nW
z{dGXUi5nAAE!Ar9oPy<I%S@jQm~pPy57BpKtXc6gXs}Ua4+9g*U}fXWgbE~S6#A7k
zTC9dFRuyVsy*|(2uCLXyBuGL(q(BFVza1EFDucg9wu?%RjsEFpMf$w#b7g6XWAh7H
z@|LhyFXj+_j-TL*y;3U_bjYCByNwD@cHEOn@-Ep}=v15C&?JZLtS;a&uc*rdscM1i
zaAIjs{gNu@c^?Pqt1g4^(u%O8FwYew;9^;L;J2-iffBf%+lNY9CX0fq#OxM&iu``A
zzaOYEv{V#X%y<5aTaAU4Lt|20W~iu><GSMZ$M@3JTRaVYXsB<`6<#D#WNC=I2hRnC
z+PsR~|J+Z^xWWB8i6cA)q3ch3@~1!NZlw8Aq{I=?W~xF-bJ=Bc<?Rz@$94v+nTWX#
z$)mw?Xzzg;&*MKwLz<;^b^f1T-AA4`@tSEU=T)(9_DLPRrKt(t8t5CWwrjk`j<_Jg
z4=yH1IXw+xY~w$?GY8)Okg;!C{O)_dhoZPfiDkL?G?XV4!x1R(QtLiVrP|uWglmJ8
znaN%I!&xc@@r1ht0?qiMe(!{4%6=7pN~pho-C7pHiO0U|T<DiU#KPK0z|bqh?iP^6
zQ2RwCpE(KN{Zx%U2AK|fP|Fz-8#Zpr9HxR-BAqTVXB~}AQGZfVq7TD!q8|MLX+Wda
z5`NK<fNYNnFA7DkqKvPzxn6N#8@&Btg-x++Qc-wNoY$cP*qm>_xk&8|;ix8Gkd?io
z8t?n{aMrVw-u#n6ch-aH`3}#$)a@=x;Dqg{IS+7n^v92xC$er1<nghbQvJhR6$<!8
zxVgEr_s)S!LtbdD!*iP@U>uhgDsAf@K7?Zq*I&d1{hbu`i0Zh6f?nprcqunLpj8k&
zCZ4Onp$nR@m%1l~7c&Oy-dZnOEFo0RSQlXNz?=aVir-s)Q#O`JCOYL*M*t6~3b8DA
z*GBSn&waxR*f>ul1aNHxy#G8@-BB{Dr^6ymDj0g+fSoxD*UC~;epIKyu8hXvaB1bG
zCq>IEdf^nXeB0hE{=Tf;9D@<MfCi#nY$9}(w0=ek#10Q%$0hj(1aQtIZ+q}yq|tNy
zPKL`t28GS31izrnbvz!ALZLdi@MSYfAPVPAUt09;H&i74zP2#&8u*g{)g=tm)7Zef
zVx?f;B9&|iX|L~<qfT(-F2pg1Yi7_b0OK(#cX#|PF(&+Ch#>Stv?@3-C7vCUm6mY1
z^Cs%NHkB$Ows@rN=j{;KS#$IB>C+e2>+9+`g6N2W139hxzxN)cfCBh7!;a!!Gmb6H
z&0R1c_8@on7jzk-2Yx6^QvJ9Els@8^tZA+GsH8+Rv}$KQX6$s0s%M$gZ9^TOhvY;;
zG$f|Uj*3HO&^;$wvP{CNPl*fLXICJu1C`Ydt=v(WINel%WkfQGWO;V5ClcW5kCeZL
z1gwN(v`fRn!Va6SUt=yxdOA9mwy8KcpboUS;PzDrMbI;D6|rzeTb4K^N;rlR${&=a
zjqv}mv$OO<?ohOdJ49zYrnI7=fhXgw@0|jg>b2y`0>bpEEv>!{r1jhK^75snCA~qc
z7ZvMH@~Thh3FHSiE?ugH85tQZr;~qp#$W2WOo>Xhf8$%|2vr(0vPF(N2M0I74|Mt<
zkVP)`2oaKYg`<?~?V0!q+O|@h6`Q_W9DxvoeIO^I@NL^0&&tckS4KEzRSO5Q6Bb!N
z)YV;lb=R>3!O1d$g4(5;ed|j>CKsJXp;oNVqMxmJeAW)$UhH09cW*|O$9ThI&Qg3|
z->Q5Q(n`E^_z;`j`WPv~Y0^W0UPArtK1cr6rry~o1yBQ0|9`L6FLawWNoL2ywT@R&
zpwX)~o%9f5nkg@(C9dZ44X(=L+DpB`&pn~o_%Z!;zv0J`+z=rx70Xx`s!$?)Z%00T
xpdsZ5E2cI1SDyagsOS3s<GsMVEGV47F)%8S1qq0%f&Y8x80wnnRBJiK{U0fbGQ$7>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_media_story_empty@3x.png b/Telegram/Resources/icons/info/info_media_story_empty@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6422809dcbdc0a470834b91e6923a3f08542494
GIT binary patch
literal 5763
zcmcIohgTC#v`<2)h8Cns@4d(;HFS_JQl$t46cD7VbPz%)Qbegykfwk@1VkxP6M|Bu
zOEVxr=`GT$zV*EG{)BhV?#}G)Jv+OzcYftQxp~8oo{ozS1Om|;8|hntKwy5LkE4MA
zN2xIh63~DjSQ+YqYKFMifD?TWdt*;?bC4v^rvZVJyg|@^A;8WB>>v<DF&IPvwBUc&
ziXs1Z7tCKw@qc{~?qA@25X)B(h;_?YU&kg4y!9&5m-RDmj{zF8#Tu^fEi=uZZKd-r
zmOdH5BEg79hgR)cX$zVZ!$scnJMwoVGyjsbebV?IVIbJBWVs}R5-|~S<fGKF!m+KF
zjX;8Tj)FHmU(6I9ZEtR$6l%@RXnauYJQ+M6+WzCYeAG&!iZP0X{(o=#P_9)*jGYm`
zq+}JL!6KDS=8s6UtaFQvjZOBeSJ4OSwh6lR>)Nz8@emQV!t;^hv+Y(n35iPUIWYl&
z5;sEPyy@`3z!j~Swj;!OE>tjEd%WD7nt>aWlhY9JqhlaX?yvG&#)+%Czg0iXD63lg
ziW$Gk%)IJ5T?eM1+TWaE8IBW3nSXz$XK`_Hfez0DH;MUkezG9DVk?Xkf&>Kx4Qm_`
zNra^M7E4Z7G`l>)l4`W~dOBD8>3X%Tt*!V`o@>kt<$!s=ra3l!)iyNrGRwV5tV2XZ
zgqs`b$K$_#SP_8&=eDq*z^{>eUzHPl+^*rTICsWeproGNIx&vD&Y-1pGBnxf_x;m@
zl^Ym&Fcs{_r;TAtOUvJUYt}9<9e&@HIN%$dHS+;n%Km9Ry2NhS18&veUq7ZaZ>kbt
z2xCYJEiruMmDH`8ZV>A>T$8c7x|)$k4XxgXqP&FUMT3PzMMXE$pJZelN%Z04sq>Ws
zcn_-__-WDl{Hm&|Vqz=(IZ~R2b-7^WEEEbt+-P~U5%M!#Ink#52YV4B+=`{RqkE&a
zb2~JA&<G;Rg8TUG<+c0BM{fh#=vLfb4i64)&b5X{XZV!&tNTod7nM@^75rx#%*Go8
zC7V!45fd)4Ls_pPq@|>snga!VH~JOI%FF$Kbj;l}8t!|g9xBP63DH*rn|a|S7d$W#
z9Vi{{ftRQIYvaXn?Sn>jyK>GgAM5L_{JSP9t%ce{XJQhdvmd>)^7ExKOi8f$5YOR4
z9v+@|H*Jb+@3e%Ey)iyJ+Bu@h2<@G6iTt`^JE#ruWad!zCj#>eb%rx!@M@^t`I0s=
z<%9V~^*Y!Mx%s2>v9B+7G!J12S!TI6_NFg|Rq9`)si~=$MIp93!c7x2sSPP-jtzqB
z*`U<c7!?Exo<9#7H@`jR?Z{V$Y=U#Bhitk&z9_pTCeZFbr-pF<)Nta<PKz-BRS)IK
zxyruH`opy0F+MgnSXH=`8JkLr>uU5K7j0Kt8^_c**Waae8N6+V^BS*P;p&u|jwX2B
zDZ*k%YLF&k@IZ}o>poYRMUiH7#7MEulrvK}b%y4txLss;U3PXh@xidh^PX54h7=I?
z8<219F0c2!r5`q59Da|NoYr7}v`uudA3t9ydORPw)4uI3;N%VmbHLtXjcY9(xiS)f
z1-H8<PY}lY+DhkI``CYkJ{q)(zH8{#@^CG9eL}*odzD4Lo00Qs_fy^KXS6#-5h{)^
z)yhkixvjifL$+=dsFb9$MlTM&Py~`7)JPr6#4@0{AGPnjj$!3lXjXG<@Ui`|=qw#=
zVrKU6cIqJ8@mAB1$&DOMdY=0~I@)I-bx}P`v43H{<714>GW2I0=3I$9Ps~gCVvb9w
zOpK7bb7aZFG!+PjFw++PL0%J)6nVIbx3TDE{@sdqc?eVFjA19F)ri*le3R7MIz9Xz
zpttY%)5rJke>Ivsgq9Vfdz#-@<8i?I(KlSWU%V<mLfzU@OaEx|WTmL~tnjZ;4yf(x
z#N=c@9o5u5G9zoH4a!^jp)Y^|yvhsH4YWI{DlBF?ZC|cI{X0%PiRE{<y1K$!q8V%Q
zNInd!j*Y&Y#HF@=Tc};Fi_Cp?|9dn83soWY3c^T@xV7<$f!PGb51wD^T{tF<AT@#`
z4fm%~+2#7_8iRgbztxbHE&$%3#YNA~w?}$xsfBEERJ37t7$#ShAb}=A_t^(sr?0Ix
zme*?tBNf2J*LA+P?BrFFo9y9sh7eid*i}S*$kz0Gg1>*Lb8?}1utprOMnvy>GC43=
z16dQGe#Ho~499h$D5x2Fn`)Kk!wAF_2Q^xKNZjaa!-3g@9=^wcssY0Ln&0oKf%Q7u
z$l^W`pRwA4fjvB-<WTd{#a}FXNenpwuE`HKe<`V2g-GiW4g)P*qjvkm$muJ+o;UBs
zfey`qnafXlmY!4&$5Bzbfxn&}Y?!}$p5UZY?AjSqAL2Jt|2d__A?c~Mon0=GSwcdh
zMcPd58E*2O(^AaV_oiBk{6*jAw`y)ngm$;?bZl(e88q)tTS<hjZ_l*~ai?Z3YyIwK
z33kPO7pCVmX%Rx?$T~HeZBGD5mQ?XD7fu7l{0F1>qIED~9e0_~)+i8blodE4CT<@T
z^xhAerlJFzYl}Xb3uUJ6;-TkNa7PzAs}x-INKtoO>9%`QUf!>PQY7{-bkDbeJLD3!
z(Jz|A_m-dfra7UN3Vyq`Jgjt@Wmnk3u{<_6PcKH23Cs#0-`NrG@p9T%C<6TzrD+=?
z`N@)!m=gdhPf}9g$5H#EhFzSzj%NJI%14_sA9Tx-zlau)O6F*z4!+&$k`pOVRUE72
zX`!#hpVpjQ9Q{~Z`^s<ukA;nnj_RHp?5{cnw6kh65BiA40lf40_h<IN8y)VS=^}0_
zWqnlj5Q?q;qdb<?m{CbbO55ArWm>CkX*tag=)l9UlulJSHa<6w>TSM3e;ucir|xI1
z5P;u&yQ6h^WkuP0tQ+BLB6+P=RoVeaC^ob@2jsFu?waF4qW>jC>B}Zb3*)koVslP2
z0Z_$WvKGJibb;yvvr1{4ZfZ&j6#r4Lw;((FGBP~I<CayWYo<aL3oYWDOqhN94IYxb
zB9Fv@%y|h=m%%QE+s0*X0hE_MGJ}ubGbaXkc$D#!uJOOk;Ku~o+uDAsb0d&TZLGY*
z@)w?t5fw*a4_=IjkfXu?x+lFkNb2kBo0s}b@SFarBUL#OsVKDPbR=%??p`{Q5I8Mb
zU>UqRe6_c(weqG_CA>|kc0z;>pxh6~$6;{?7Frj=KtQsXcF{qhdgzc>VeD1$%K!Lj
zg@iwtUWPTvg^x{&(j5{QwZiz!FxdF&>pS6)3p?YoI66++6X#OoE44@Ph)V&kG^|nu
zHo?aLOhneQS0^nHzeg5ociLKc7wcZ_yhC%>)03|JQ+@r_Go#wOCML#Zhi*5FyNp4t
z0#HgRad8?i%95P2yOs%=CVD@+tG7(F4;6fx4E9ZODJ3f>YVM$e6SNn|BtjR@W&*nl
zO$owU*0#RR*|;obF*P-H<9{is=;VbtC%7$$mhNzW+(IfVk@ZY4)_H|5iX2xlfLw@s
zz%WCzSq+N`5CG3ueD8k3B7-fmrM$jSmgfSGVe%R(;IwBR^b?7jopmfBTz|^#T?WER
z@k2WQoK}yx0(A9ATSP_V!<A(`m+Ki#H>toug`juFq>Yu=!Gvth(s~htR;efz_k(Xx
ze%J%$gfcE9dV0mh=YFN9V`E_vYAT`=ReayasTY~ZbEtvA_t4XM_I|Eor+={f<}(zg
zyk?1)-cA5jDYiLq&QC(bvmMNZv?&$o->Fg-X+3t4ohE-a8~UO+$x@7R7)HF|A~DeO
zmC#6HK;4>2iH9&v!P$y<nDFx=cqNhwvl&F!nYgsHgpyX8aS}FSJuNX!<F=_ANkZj_
z-1YLh^i9C1C@?WeNibH0r>j2}Si&<#nkm5=V5|W;G9rV|6pH!U+uQsnl6NKz1Sz;g
z=h?I+sYKy<DQMvZb?OCkJ%McuBZM~PWzOJH7bQP`MMJ|G_O<|o*yFcS)O8cj>qdZY
zmm=#QUy;Ow$0v%MS>PJz5<kB#r;`26r|{tV)wq1(XxIru;>;iej~c+sDlKvLms7PL
z+2^3xS%+PHExHw1mnVO-|Ct{uQ2n_|)#4JCCvNZUEs@6Eb*hIDQM-XBzaFV|?F8sv
za1_v^Xfzs-nc<uXHx&o@Nqc+4T0+6Xf~)R3m3imqDNvMfET$7BFe;H7(JXSq!s74o
z&x{N{E!qDBM)a^rxHL-Xx5+hv=S1j}oV@3;N&nzBfpol9Q8dea!^cMwLdIi6jd*kQ
zjwN1bJ??007+p3KFEpo}R*HHqAQxucC3;dPo_VB89-^vv4xqI1<#;h;oGXNoNS~GT
zk_SSjr8hD*mXMatHn?^G%l#|k)CfC->u~U9#&$wCxpgPUsnB;GpDg7qsWg>W<#v!$
zQs_=0yP=2#3D<b}oI9!RhdY2;xj5P|=o=p9Q+xRKPg>P~SX7t|OZT2248ny!$Xuat
zLSPe)ku$vIe8~EvD5l1pq5FIY@Tt}sbrO15^9)N8Rg>E#OTnAn`Z7gM`F!6fSfkGp
zga3=CqVI}$tfO>724p0laV<1Y?iLT+9JxMix;*r%708a4FS$P5B@Je1{W1EPv};L1
zfO#WU1>A&5bzZ}TK2BFdHtpLWeJF1)@>U}Kl|)9q?dbl2VLN{NW#EZNTi+{k0x-C2
z?UkWd7t&cXMhkzT<ON|ykA{Ku3iEs_^+FO;k8xW@``<rjqMx8q3vtv;Wi1_5LA(})
zfJ|B$5r_lPASL4E-;jxA>k>hO7zNA;>#tFUCf^zO>T4v3f4#oEtPId_0gh$5kO56H
z{8ru+@h`?AsmJ%>2*9vOFiv-W59v8!h;_vc)-Oy9Zg}NNHM!4=%b<L;G;C<$nl}K6
zx$i#49-(ck?Kn+PS%y!!e~Y=d<mI03u@=SvD06UigtJ|X=$l6!z`yJCXZ>5X4BO>H
z4Yc!QhL}wHUg(eLrq8>@Ej_%EW-&2`MhVD-`sz8diHg?{cY3T?oGag7nIaNvVp)Pd
za<1i(uB%I1*eHt6yM5&TR1NE0GPk?2?Bve+1IHJ<h%kBIi$oO3c@$w>+`emKne0aJ
z04?hTTJ*{H^xe7FpDmHwz?7kvm`KmjlT%w3M#fYBejv1`qwTeKoW^y{q=wncvB}@h
zrA&H88p81-xLLjpgt0BMku8jpb?uObRrdFr_-Z}hl~hsiC#vWualfoW0_wEB`8uV&
zP?ZU`H7oKmqfxF-Y>Am1XrKPfP`Y}~%OLn%-R#v#n`AT0KC;rVq>L~8*YgFsU$*PC
z4>u;wH;iP!!`8XRlcff!fK7?0`cf(;;%T;%9=()v3(@2-_}Q&$1d&x<0%lR9PGtDl
zJ}?;Ir>{NFn@E~(3UHM&*c>Y}-I;IqyD!yxFzIx*zsADH7r>iUZl2H8v5S9u@88$Z
zL8ilM=UP8PmqXsY&3`n(y!x#=kIK~)`AWgldcB_9d50E|5QZBzGJs}d>{03sM-ggX
zKc9l{wCz3JbJTs}0hxYV`lu>*y3sGcAj@k|D7J!%UK0*v@se)L-aRMh-4eZ|{q_yx
zJK?S0g7pKV-#IqSHV3`-a%Y-9kY{Gc%io^b|EC85G&6zu-wnD&z@{wSS)P%U@n@($
zO9J`g0XO~Z5sWvuHyLWg4}&7VJ!6-3qoYyUm(Ly&1nL7!DJC6H+ypTe(%e^snW!LP
zVBEH|L(f9DAgt^I4V*u&FG~z~Jhj0Ruln>g;RPUqi`W`ki@lRfOghWI;@GS7EY=Z1
z<KW&byZvEU(^`t-z8E-<3D@C#BATd3en!e<tLGFh&IO%6=vA|Ga#9am&~8Az4}k|#
zfSc<Ko7I59C@`{u#1Xu2d@yAC=@X}1>>YqDa#d+<7zCstxQFQWH#84bV$P4hq+dxY
zGh<t%f&})9NpTD<ESD4I(yfmheP@Et4!5|jAK&sFFHg5dR}_@9$P@dYl2ArHx9K*s
zG(+@+?B10-7j^^gH_D|K_FNbA=Oc5fK8IkT-sZ%wUzofgCU*9uvz#=Bo%gq+mlK@2
zqbUQ{4h#eU&5J)wNfuf(jDPPuHev#eCPe(FMTg8a5{%u7P1O3rA#0eyYi?$iCd|?C
zolb~pvZMD%c9=74V9y!)K%Wb&&!`r(h$a=g#qwPsan%xy!dFmTeeu+c?sWP^Mc(k^
zB%E{T+#|rQ5lZ5Fv(p-W;`av?hdBhhjInzkr_Z!{Y6vvAzm^UTFGwKWv|58ywii5)
zyZ^KSo=`(i(>3PA0~q{bsRErs+x_KBf4P^Rkz2ecI$xtM`o`-L5xPs4NX|Av!|x+1
zm}2$J2u75JztPASG+x`;jcDf^2xuWtCa{(fR`Q#@%*x7om||a?PrGo$@$<S?+P*hJ
zR@R}uyK%nm>ox|ca|oVup{Dpp9IjtateS4~RL)w;HwD!?0hOAmjhts+^q=LtcO3MS
zF%<)gKo^QGo3cQ^jqxou5hr?SO&q_P7~|9+@-kefRFf01>rt8#4pV&CzGx`9#bfor
zd|W};1aR%<FVVd(x9@8@=|k+8w5M&mN5`dd3cie0aVmPM3{-t-_+*#HJ4s>$`-b#?
z{hD)NqC%l}2&}W$uU}tCSR3;;vsjp#4h#$suoSwF1g=sLUWu>K*!gIKN^&=xxUo|o
ztE#FtH+{P^K7Nxa1w2wRcjWnTQ2SdW!m|I0D>UAJL4utHHy`Gk*%?Se$(zwLzCZUN
zbtQ1j_{61gD7g1L<w=A`+yKfwI`7cfSI`=vXV0G1g={$vsz-7*oYvO;mR3|`5y*en
zlrYhhcvFryhO*{9FQXBT0h*bW^&mL7=JuyjKJ5H>*p`I2IIczWcpks;Z04OdF?44)
ztb<22_{~gaT@;)q6VxcMn7#o3(I1#cbm98C&)^6Ad>s-GQSn6mXs(kp{pT+Zu5p!z
z?#%neRZ-JUk@BtuHlHiO`8M_gU0<pMxhI=gSz5-i3OA3su{oXL%D78S*;!dBXOV;4
z$eCNww@PFY+KVT3<>loa2!sVhNf4yPx3;!6-7R2vq1YA)eHi?E@pGI~!=sJKWOdmI
zl-KO}c~tjQnIb_u{A#B&4ekK$e=o352)2Eb!OeONsPYucYyv3Qn0J{i9HT81b;qd~
z^y0@P)XK_=EQt2&41--VXhlr9(*`rW`~2{>l@*-VJ-#_N?^&!O4YGn$*X*u`2mWrx
z^kcll6`ob~*B>_Cym|imDZ1e=DVDYhwW2Xh-NcT)wYzpmad@5M%DbHGh6MdsIyQKR
zyi1yGmpwU-v4D=C^OB6`2AL&eV7UAC98w;Z!rGAk_YEl%_ZM8)fWF2?s=4@A05&$b
Kp<knmMEwsXaG);$

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 328cc231a..018d19573 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3818,6 +3818,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_button" = "Stories Archive";
 "lng_stories_recent_button" = "Recent Stories";
 "lng_stories_archive_title" = "Stories Archive";
+"lng_stories_archive_about" = "Only you can see archived stories unless you choose to save them to your profile.";
 "lng_stories_reply_sent" = "Message Sent";
 "lng_stories_hidden_to_contacts" = "Those stories are now shown only in your Contacts list.";
 "lng_stories_shown_in_chats" = "Those stories are now shown in your Chats list.";
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 24a97ae70..a0a8a8aaa 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -345,6 +345,7 @@ Content State::next() {
 			.thumbnail = std::move(userpic),
 			.unread = info.unread,
 			.hidden = info.hidden,
+			.profile = true,
 			.skipSmall = user->isSelf(),
 		});
 	}
@@ -419,7 +420,7 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 					return;
 				}
 				auto resolving = false;
-				auto result = Content();
+				auto result = Content{ .full = true };
 				for (const auto id : ids) {
 					const auto storyId = FullStoryId{ peerId, id };
 					const auto maybe = stories->lookup(storyId);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index b630d9b64..811fbc033 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -763,9 +763,11 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 
 	const auto id = item.element.id;
 	const auto hidden = item.element.hidden;
-	_menu->addAction(tr::lng_context_view_profile(tr::now), [=] {
-		_showProfileRequests.fire_copy(id);
-	});
+	if (item.element.profile) {
+		_menu->addAction(tr::lng_context_view_profile(tr::now), [=] {
+			_showProfileRequests.fire_copy(id);
+		});
+	}
 	if (!_content.full || hidden) {
 		_menu->addAction(hidden
 			? tr::lng_stories_show_in_chats(tr::now)
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index f81f90c05..a7826d892 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -36,6 +36,7 @@ struct Element {
 	std::shared_ptr<Thumbnail> thumbnail;
 	bool unread = false;
 	bool hidden = false;
+	bool profile = false;
 	bool skipSmall = false;
 
 	friend inline bool operator==(
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index f2a9482cb..1b9d1fa4a 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -576,6 +576,7 @@ infoEmptyAudio: icon {{ "info/info_media_audio_empty", infoEmptyFg }};
 infoEmptyFile: icon {{ "info/info_media_file_empty", infoEmptyFg }};
 infoEmptyVoice: icon {{ "info/info_media_voice_empty", infoEmptyFg }};
 infoEmptyLink: icon {{ "info/info_media_link_empty", infoEmptyFg }};
+infoEmptyStories: icon {{ "info/info_media_story_empty", infoEmptyFg }};
 infoEmptyIconTop: 120px;
 infoEmptyLabelTop: 40px;
 infoEmptyLabelSkip: 20px;
@@ -584,6 +585,14 @@ infoEmptyLabel: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 }
 
+infoStoriesAboutArchive: FlatLabel(defaultFlatLabel) {
+	minWidth: 245px;
+	align: align(top);
+	textFg: windowSubTextFg;
+	style: defaultTextStyle;
+}
+infoStoriesAboutArchivePadding: margins(22px, 8px, 22px, 16px);
+
 editPeerBottomButtonsLayoutMargins: margins(0px, 7px, 0px, 0px);
 
 editPeerTopButtonsLayoutSkip: 13px;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 068da1c33..4f7af1f68 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -59,7 +59,7 @@ void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
 	) | rpl::start_with_next([this](int fullHeight) {
 		// Make icon center be on 1/3 height.
 		auto iconCenter = fullHeight / 3;
-		auto iconHeight = st::infoEmptyFile.height();
+		auto iconHeight = st::infoEmptyStories.height();
 		auto iconTop = iconCenter - iconHeight / 2;
 		_height = iconTop + st::infoEmptyIconTop;
 		resizeToWidth(width());
@@ -81,9 +81,9 @@ int EmptyWidget::resizeGetHeight(int newWidth) {
 void EmptyWidget::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
-	const auto iconLeft = (width() - st::infoEmptyFile.width()) / 2;
+	const auto iconLeft = (width() - st::infoEmptyStories.width()) / 2;
 	const auto iconTop = height() - st::infoEmptyIconTop;
-	st::infoEmptyFile.paint(p, iconLeft, iconTop, width());
+	st::infoEmptyStories.paint(p, iconLeft, iconTop, width());
 }
 
 InnerWidget::InnerWidget(
@@ -99,28 +99,31 @@ InnerWidget::InnerWidget(
 	_list = setupList();
 }
 
-void InnerWidget::setupArchive() {
+void InnerWidget::setupTop() {
 	const auto key = _controller->key();
 	const auto peer = key.storiesPeer();
 	if (peer
 		&& peer->isSelf()
 		&& key.storiesTab() == Stories::Tab::Saved
 		&& _isStackBottom) {
-		createArchiveButton();
+		createButtons();
+	} else if (key.storiesTab() == Stories::Tab::Archive) {
+		createAboutArchive();
 	} else {
-		_buttons.destroy();
+		_top.destroy();
 		refreshHeight();
 	}
 }
 
-void InnerWidget::createArchiveButton() {
-	_buttons.create(this);
-	_buttons->show();
+void InnerWidget::createButtons() {
+	_top.create(this);
+	_top->show();
+	_topHeight = _top->heightValue();
 
 	const auto stories = &_controller->session().data().stories();
 	const auto self = _controller->session().user();
 	const auto archive = ::Settings::AddButton(
-		_buttons,
+		_top,
 		tr::lng_stories_archive_button(),
 		st::infoSharedMediaButton);
 	archive->addClickHandler([=] {
@@ -144,11 +147,11 @@ void InnerWidget::createArchiveButton() {
 		st::infoIconMediaStoriesArchive,
 		st::infoSharedMediaButtonIconPosition)->show();
 
-	const auto recentWrap = _buttons->add(
+	const auto recentWrap = _top->add(
 		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
-			_buttons,
+			_top,
 			::Settings::CreateButton(
-				_buttons,
+				_top,
 				tr::lng_stories_recent_button(),
 				st::infoSharedMediaButton)));
 
@@ -204,16 +207,36 @@ void InnerWidget::createArchiveButton() {
 		return !content.elements.empty();
 	}));
 
-	_buttons->add(object_ptr<Ui::FixedHeightWidget>(
-		_buttons,
+	_top->add(object_ptr<Ui::FixedHeightWidget>(
+		_top,
 		st::infoProfileSkip));
-	_buttons->add(object_ptr<Ui::BoxContentDivider>(_buttons));
+	_top->add(object_ptr<Ui::BoxContentDivider>(_top));
 
-	_buttons->resizeToWidth(width());
-	_buttons->heightValue(
+	_top->resizeToWidth(width());
+	_top->heightValue(
 	) | rpl::start_with_next([=] {
 		refreshHeight();
-	}, _buttons->lifetime());
+	}, _top->lifetime());
+}
+
+void InnerWidget::createAboutArchive() {
+	_top.create(this);
+	_top->show();
+	_topHeight = _top->heightValue();
+
+	_top->add(object_ptr<Ui::DividerLabel>(
+		_top,
+		object_ptr<Ui::FlatLabel>(
+			_top,
+			tr::lng_stories_archive_about(),
+			st::infoStoriesAboutArchive),
+		st::infoStoriesAboutArchivePadding));
+
+	_top->resizeToWidth(width());
+	_top->heightValue(
+	) | rpl::start_with_next([=] {
+		refreshHeight();
+	}, _top->lifetime());
 }
 
 void InnerWidget::visibleTopBottomUpdated(
@@ -277,8 +300,8 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 	_inResize = true;
 	auto guard = gsl::finally([this] { _inResize = false; });
 
-	if (_buttons) {
-		_buttons->resizeToWidth(newWidth);
+	if (_top) {
+		_top->resizeToWidth(newWidth);
 	}
 	_list->resizeToWidth(newWidth);
 	_empty->resizeToWidth(newWidth);
@@ -294,9 +317,9 @@ void InnerWidget::refreshHeight() {
 
 int InnerWidget::recountHeight() {
 	auto top = 0;
-	if (_buttons) {
-		_buttons->moveToLeft(0, top);
-		top += _buttons->heightNoMargins() - st::lineWidth;
+	if (_top) {
+		_top->moveToLeft(0, top);
+		top += _top->heightNoMargins() - st::lineWidth;
 	}
 	auto listHeight = 0;
 	if (_list) {
@@ -321,7 +344,8 @@ void InnerWidget::setScrollHeightValue(rpl::producer<int> value) {
 		_listTops.events_starting_with(
 			_list->topValue()
 		) | rpl::flatten_latest(),
-		_1 - _2));
+		_topHeight.value(),
+		_1 - _2 + _3));
 }
 
 rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index 92814b72e..3e6819af9 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -40,7 +40,7 @@ public:
 	bool showInternal(not_null<Memento*> memento);
 	void setIsStackBottom(bool isStackBottom) {
 		_isStackBottom = isStackBottom;
-		setupArchive();
+		setupTop();
 	}
 
 	void saveState(not_null<Memento*> memento);
@@ -64,14 +64,15 @@ private:
 	int recountHeight();
 	void refreshHeight();
 
-	void setupArchive();
-	void createArchiveButton();
+	void setupTop();
+	void createButtons();
+	void createAboutArchive();
 
 	object_ptr<Media::ListWidget> setupList();
 
 	const not_null<Controller*> _controller;
 
-	object_ptr<Ui::VerticalLayout> _buttons = { nullptr };
+	object_ptr<Ui::VerticalLayout> _top = { nullptr };
 	object_ptr<Media::ListWidget> _list = { nullptr };
 	object_ptr<EmptyWidget> _empty;
 
@@ -81,6 +82,7 @@ private:
 	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
 	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
 	rpl::event_stream<rpl::producer<int>> _listTops;
+	rpl::variable<int> _topHeight;
 
 };
 

From 8d2fd4bd69e8782a283115eb401e0a0e3076d916 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Jun 2023 10:12:28 +0400
Subject: [PATCH 313/676] Show only hidden stories in Contacts.

---
 .../boxes/peer_list_controllers.cpp           |   6 +-
 Telegram/SourceFiles/data/data_stories.cpp    | 102 +++++++++---------
 Telegram/SourceFiles/data/data_stories.h      |   2 +-
 .../dialogs/ui/dialogs_stories_content.cpp    |   9 +-
 .../dialogs/ui/dialogs_stories_list.cpp       |  18 ++--
 .../dialogs/ui/dialogs_stories_list.h         |  11 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   4 +-
 7 files changed, 79 insertions(+), 73 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 834592de6..1b62876ed 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -85,7 +85,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 			st::dialogsStoriesList,
 			Stories::ContentForSession(
 				&sessionController->session(),
-				Data::StorySourcesList::All),
+				Data::StorySourcesList::Hidden),
 			[=] { return state->stories->height() - box->scrollTop(); });
 		const auto raw = state->stories = stories.data();
 		box->peerListSetAboveWidget(object_ptr<::Ui::PaddingWrap<>>(
@@ -97,7 +97,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		) | rpl::start_with_next([=](uint64 id) {
 			sessionController->openPeerStories(
 				PeerId(int64(id)),
-				Data::StorySourcesList::All);
+				Data::StorySourcesList::Hidden);
 		}, raw->lifetime());
 
 		raw->showProfileRequests(
@@ -116,7 +116,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		raw->loadMoreRequests(
 		) | rpl::start_with_next([=] {
 			sessionController->session().data().stories().loadMore(
-				Data::StorySourcesList::All);
+				Data::StorySourcesList::Hidden);
 		}, raw->lifetime());
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(init));
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index f8a51b93e..525a0d200 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -419,8 +419,9 @@ void Stories::apply(const MTPDupdateStory &data) {
 			sort(list);
 		}
 	};
-	refreshInList(StorySourcesList::All);
-	if (!user->hasStoriesHidden()) {
+	if (user->hasStoriesHidden()) {
+		refreshInList(StorySourcesList::Hidden);
+	} else {
 		refreshInList(StorySourcesList::NotHidden);
 	}
 	_sourceChanged.fire_copy(peerId);
@@ -428,7 +429,8 @@ void Stories::apply(const MTPDupdateStory &data) {
 
 void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
 	if (!data) {
-		applyDeletedFromSources(peer->id, StorySourcesList::All);
+		applyDeletedFromSources(peer->id, StorySourcesList::NotHidden);
+		applyDeletedFromSources(peer->id, StorySourcesList::Hidden);
 		_all.erase(peer->id);
 		_sourceChanged.fire_copy(peer->id);
 	} else {
@@ -449,7 +451,8 @@ void Stories::requestUserStories(not_null<UserData*> user) {
 		parseAndApply(data.vstories());
 	}).fail([=] {
 		_requestingUserStories.remove(user);
-		applyDeletedFromSources(user->id, StorySourcesList::All);
+		applyDeletedFromSources(user->id, StorySourcesList::NotHidden);
+		applyDeletedFromSources(user->id, StorySourcesList::Hidden);
 	}).send();
 }
 
@@ -528,7 +531,8 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 		}
 	}
 	if (result.ids.empty()) {
-		applyDeletedFromSources(peerId, StorySourcesList::All);
+		applyDeletedFromSources(peerId, StorySourcesList::NotHidden);
+		applyDeletedFromSources(peerId, StorySourcesList::Hidden);
 		return;
 	} else if (user->isSelf()) {
 		result.readTill = result.ids.back().id;
@@ -558,14 +562,15 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 		sort(list);
 	};
 	if (result.user->isContact()) {
-		add(StorySourcesList::All);
-		if (result.user->hasStoriesHidden()) {
-			applyDeletedFromSources(peerId, StorySourcesList::NotHidden);
-		} else {
-			add(StorySourcesList::NotHidden);
-		}
+		const auto hidden = result.user->hasStoriesHidden();
+		using List = StorySourcesList;
+		add(hidden ? List::Hidden : List::NotHidden);
+		applyDeletedFromSources(
+			peerId,
+			hidden ? List::NotHidden : List::Hidden);
 	} else {
-		applyDeletedFromSources(peerId, StorySourcesList::All);
+		applyDeletedFromSources(peerId, StorySourcesList::NotHidden);
+		applyDeletedFromSources(peerId, StorySourcesList::Hidden);
 	}
 	_sourceChanged.fire_copy(peerId);
 }
@@ -725,11 +730,11 @@ void Stories::loadMore(StorySourcesList list) {
 	if (_loadMoreRequestId[index] || _sourcesLoaded[index]) {
 		return;
 	}
-	const auto all = (list == StorySourcesList::All);
+	const auto hidden = (list == StorySourcesList::Hidden);
 	const auto api = &_owner->session().api();
 	using Flag = MTPstories_GetAllStories::Flag;
 	_loadMoreRequestId[index] = api->request(MTPstories_GetAllStories(
-		MTP_flags((all ? Flag::f_include_hidden : Flag())
+		MTP_flags((hidden ? Flag::f_hidden : Flag())
 			| (_sourcesStates[index].isEmpty()
 				? Flag(0)
 				: (Flag::f_next | Flag::f_state))),
@@ -917,7 +922,7 @@ void Stories::applyRemovedFromActive(FullStoryId id) {
 			if (i->second.ids.empty()) {
 				_all.erase(i);
 				removeFromList(StorySourcesList::NotHidden);
-				removeFromList(StorySourcesList::All);
+				removeFromList(StorySourcesList::Hidden);
 			}
 			_sourceChanged.fire_copy(id.peer);
 		}
@@ -925,21 +930,15 @@ void Stories::applyRemovedFromActive(FullStoryId id) {
 }
 
 void Stories::applyDeletedFromSources(PeerId id, StorySourcesList list) {
-	const auto removeFromList = [&](StorySourcesList from) {
-		auto &sources = _sources[static_cast<int>(from)];
-		const auto i = ranges::find(
-			sources,
-			id,
-			&StoriesSourceInfo::id);
-		if (i != end(sources)) {
-			sources.erase(i);
-		}
-		_sourcesChanged[static_cast<int>(from)].fire({});
-	};
-	removeFromList(StorySourcesList::NotHidden);
-	if (list == StorySourcesList::All) {
-		removeFromList(StorySourcesList::All);
+	auto &sources = _sources[static_cast<int>(list)];
+	const auto i = ranges::find(
+		sources,
+		id,
+		&StoriesSourceInfo::id);
+	if (i != end(sources)) {
+		sources.erase(i);
 	}
+	_sourcesChanged[static_cast<int>(list)].fire({});
 }
 
 void Stories::removeDependencyStory(not_null<Story*> story) {
@@ -1146,8 +1145,8 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 				sort(list);
 			}
 		};
-		refreshInList(StorySourcesList::All);
 		refreshInList(StorySourcesList::NotHidden);
+		refreshInList(StorySourcesList::Hidden);
 	}
 	_markReadTimer.callOnce(kMarkAsReadDelay);
 }
@@ -1181,37 +1180,36 @@ void Stories::toggleHidden(
 		return;
 	}
 	i->second.hidden = hidden;
+	const auto info = i->second.info();
 	const auto main = static_cast<int>(StorySourcesList::NotHidden);
-	const auto all = static_cast<int>(StorySourcesList::All);
+	const auto other = static_cast<int>(StorySourcesList::Hidden);
+	const auto proj = &StoriesSourceInfo::id;
 	if (hidden) {
-		const auto i = ranges::find(
-			_sources[main],
-			peerId,
-			&StoriesSourceInfo::id);
+		const auto i = ranges::find(_sources[main], peerId, proj);
 		if (i != end(_sources[main])) {
 			_sources[main].erase(i);
 			_sourcesChanged[main].fire({});
 		}
-		const auto j = ranges::find(_sources[all], peerId, &StoriesSourceInfo::id);
-		if (j != end(_sources[all])) {
-			j->hidden = hidden;
-			_sourcesChanged[all].fire({});
+		const auto j = ranges::find(_sources[other], peerId, proj);
+		if (j == end(_sources[other])) {
+			_sources[other].push_back(info);
+		} else {
+			*j = info;
 		}
+		sort(StorySourcesList::Hidden);
 	} else {
-		const auto i = ranges::find(
-			_sources[all],
-			peerId,
-			&StoriesSourceInfo::id);
-		if (i != end(_sources[all])) {
-			i->hidden = hidden;
-			_sourcesChanged[all].fire({});
-
-			auto &sources = _sources[main];
-			if (!ranges::contains(sources, peerId, &StoriesSourceInfo::id)) {
-				sources.push_back(*i);
-				sort(StorySourcesList::NotHidden);
-			}
+		const auto i = ranges::find(_sources[other], peerId, proj);
+		if (i != end(_sources[other])) {
+			_sources[other].erase(i);
+			_sourcesChanged[other].fire({});
 		}
+		const auto j = ranges::find(_sources[main], peerId, proj);
+		if (j == end(_sources[main])) {
+			_sources[main].push_back(info);
+		} else {
+			*j = info;
+		}
+		sort(StorySourcesList::NotHidden);
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index c136bff5c..d082d05a6 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -172,7 +172,7 @@ enum class NoStory : uchar {
 
 enum class StorySourcesList : uchar {
 	NotHidden,
-	All,
+	Hidden,
 };
 
 struct StoriesContextSingle {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index a0a8a8aaa..acce7637e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -322,7 +322,9 @@ State::State(not_null<Data::Stories*> data, Data::StorySourcesList list)
 }
 
 Content State::next() {
-	auto result = Content{ .full = (_list == Data::StorySourcesList::All) };
+	auto result = Content{
+		.hidden = (_list == Data::StorySourcesList::Hidden)
+	};
 	const auto &sources = _data->sources(_list);
 	result.elements.reserve(sources.size());
 	for (const auto &info : sources) {
@@ -344,7 +346,8 @@ Content State::next() {
 				: user->shortName()),
 			.thumbnail = std::move(userpic),
 			.unread = info.unread,
-			.hidden = info.hidden,
+			.suggestHide = !info.hidden,
+			.suggestUnhide = info.hidden,
 			.profile = true,
 			.skipSmall = user->isSelf(),
 		});
@@ -420,7 +423,7 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 					return;
 				}
 				auto resolving = false;
-				auto result = Content{ .full = true };
+				auto result = Content{};
 				for (const auto id : ids) {
 					const auto storyId = FullStoryId{ peerId, id };
 					const auto maybe = stories->lookup(storyId);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 811fbc033..c54803ef6 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -102,7 +102,9 @@ void List::showContent(Content &&content) {
 				item.nameCache = QImage();
 			}
 			item.element.unread = element.unread;
-			item.element.hidden = element.hidden;
+			item.element.suggestHide = element.suggestHide;
+			item.element.suggestUnhide = element.suggestUnhide;
+			item.element.profile = element.profile;
 		} else {
 			_data.items.emplace_back(Item{ .element = element });
 		}
@@ -762,17 +764,19 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = base::make_unique_q<Ui::PopupMenu>(this);
 
 	const auto id = item.element.id;
-	const auto hidden = item.element.hidden;
 	if (item.element.profile) {
 		_menu->addAction(tr::lng_context_view_profile(tr::now), [=] {
 			_showProfileRequests.fire_copy(id);
 		});
 	}
-	if (!_content.full || hidden) {
-		_menu->addAction(hidden
-			? tr::lng_stories_show_in_chats(tr::now)
-			: tr::lng_stories_hide_to_contacts(tr::now),
-			[=] { _toggleShown.fire({ .id = id, .shown = hidden }); });
+	if (item.element.suggestHide) {
+		_menu->addAction(
+			tr::lng_stories_hide_to_contacts(tr::now),
+			[=] { _toggleShown.fire({ .id = id, .shown = false }); });
+	} else if (item.element.suggestUnhide) {
+		_menu->addAction(
+			tr::lng_stories_show_in_chats(tr::now),
+			[=] { _toggleShown.fire({ .id = id, .shown = true }); });
 	}
 	const auto updateAfterMenuDestroyed = [=] {
 		const auto globalPosition = QCursor::pos();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index a7826d892..8381a4289 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -34,10 +34,11 @@ struct Element {
 	uint64 id = 0;
 	QString name;
 	std::shared_ptr<Thumbnail> thumbnail;
-	bool unread = false;
-	bool hidden = false;
-	bool profile = false;
-	bool skipSmall = false;
+	bool unread : 1 = false;
+	bool suggestHide : 1 = false;
+	bool suggestUnhide : 1 = false;
+	bool profile : 1 = false;
+	bool skipSmall : 1 = false;
 
 	friend inline bool operator==(
 		const Element &a,
@@ -46,7 +47,7 @@ struct Element {
 
 struct Content {
 	std::vector<Element> elements;
-	bool full = false;
+	bool hidden = false;
 
 	friend inline bool operator==(
 		const Content &a,
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index e3bcb489f..1ccafbc6f 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -129,7 +129,7 @@ messageMediaInvoice#f6a548d3 flags:# shipping_address_requested:flags.1?true tes
 messageMediaGeoLive#b940c666 flags:# geo:GeoPoint heading:flags.0?int period:int proximity_notification_radius:flags.1?int = MessageMedia;
 messageMediaPoll#4bd6e798 poll:Poll results:PollResults = MessageMedia;
 messageMediaDice#3f7ee58b value:int emoticon:string = MessageMedia;
-messageMediaStory#cbb20d88 flags:# user_id:long id:int story:flags.0?StoryItem = MessageMedia;
+messageMediaStory#cbb20d88 flags:# via_mention:flags.1?true user_id:long id:int story:flags.0?StoryItem = MessageMedia;
 
 messageActionEmpty#b6aef7b0 = MessageAction;
 messageActionChatCreate#bd47cbad title:string users:Vector<long> = MessageAction;
@@ -2091,7 +2091,7 @@ stories.sendStory#424cd47a flags:# pinned:flags.2?true media:InputMedia caption:
 stories.editStory#2aae7a41 flags:# id:int media:flags.0?InputMedia caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
 stories.deleteStories#b5d501d7 id:Vector<int> = Vector<int>;
 stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
-stories.getAllStories#eeb0d625 flags:# next:flags.1?true include_hidden:flags.2?true state:flags.0?string = stories.AllStories;
+stories.getAllStories#eeb0d625 flags:# next:flags.1?true hidden:flags.2?true state:flags.0?string = stories.AllStories;
 stories.getUserStories#96d528e0 user_id:InputUser = stories.UserStories;
 stories.getPinnedStories#b471137 user_id:InputUser offset_id:int limit:int = stories.Stories;
 stories.getStoriesArchive#1f5bc5d2 offset_id:int limit:int = stories.Stories;

From eb260b91c1943f59423dbc8fe92b782a14893fe3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Jun 2023 12:29:04 +0400
Subject: [PATCH 314/676] Improve unsupported stories design.

---
 .../history_view_compose_controls.cpp         | 28 +++---
 Telegram/SourceFiles/info/info.style          |  5 +-
 .../info/media/info_media_list_section.cpp    | 11 ++-
 .../stories/media_stories_controller.cpp      | 90 ++++++++++++++++---
 .../media/stories/media_stories_header.cpp    |  6 ++
 .../media/stories/media_stories_header.h      |  1 +
 .../media/stories/media_stories_reply.cpp     |  1 +
 .../media/stories/media_stories_slider.cpp    |  6 ++
 .../media/stories/media_stories_slider.h      |  1 +
 .../SourceFiles/media/view/media_view.style   | 15 +++-
 10 files changed, 126 insertions(+), 38 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 2b5523b28..235091a00 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2791,24 +2791,24 @@ void ComposeControls::replyToMessage(FullMsgId id) {
 }
 
 void ComposeControls::cancelReplyMessage() {
-	Expects(_history != nullptr);
-
 	const auto wasReply = replyingToMessage();
 	_header->replyToMessage({});
-	const auto key = draftKey(DraftType::Normal);
-	if (const auto localDraft = _history->draft(key)) {
-		if (localDraft->msgId) {
-			if (localDraft->textWithTags.text.isEmpty()) {
-				_history->clearDraft(key);
-			} else {
-				localDraft->msgId = 0;
+	if (_history) {
+		const auto key = draftKey(DraftType::Normal);
+		if (const auto localDraft = _history->draft(key)) {
+			if (localDraft->msgId) {
+				if (localDraft->textWithTags.text.isEmpty()) {
+					_history->clearDraft(key);
+				} else {
+					localDraft->msgId = 0;
+				}
 			}
 		}
-	}
-	if (wasReply) {
-		_saveDraftText = true;
-		_saveDraftStart = crl::now();
-		saveDraft();
+		if (wasReply) {
+			_saveDraftText = true;
+			_saveDraftStart = crl::now();
+			saveDraft();
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 1b9d1fa4a..fcd649b38 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -496,7 +496,8 @@ infoMediaHeaderStyle: TextStyle(semiboldTextStyle) {
 }
 infoMediaHeaderHeight: 28px;
 infoMediaHeaderPosition: point(14px, 6px);
-infoMediaSkip: 5px;
+infoMediaSkip: 2px;
+infoMediaLeft: 3px;
 infoMediaMargin: margins(0px, 6px, 0px, 2px);
 infoMediaMinGridSize: 90px;
 
@@ -591,7 +592,7 @@ infoStoriesAboutArchive: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 	style: defaultTextStyle;
 }
-infoStoriesAboutArchivePadding: margins(22px, 8px, 22px, 16px);
+infoStoriesAboutArchivePadding: margins(22px, 12px, 22px, 12px);
 
 editPeerBottomButtonsLayoutMargins: margins(0px, 7px, 0px, 0px);
 
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.cpp b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
index 9fabb28ad..ed70623ce 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
@@ -340,12 +340,15 @@ void ListSection::resizeToWidth(int newWidth) {
 	case Type::Video:
 	case Type::PhotoVideo: // #TODO stories
 	case Type::RoundFile: {
-		_itemsLeft = st::infoMediaSkip;
+		const auto skip = st::infoMediaSkip;
+		_itemsLeft = st::infoMediaLeft;
 		_itemsTop = st::infoMediaSkip;
-		_itemsInRow = (newWidth - _itemsLeft)
-			/ (st::infoMediaMinGridSize + st::infoMediaSkip);
-		_itemWidth = ((newWidth - _itemsLeft) / _itemsInRow)
+		_itemsInRow = (newWidth - _itemsLeft * 2 + skip)
+			/ (st::infoMediaMinGridSize + skip);
+		_itemWidth = ((newWidth - _itemsLeft * 2 + skip) / _itemsInRow)
 			- st::infoMediaSkip;
+		_itemsLeft = (newWidth - (_itemWidth + skip) * _itemsInRow + skip)
+			/ 2;
 		for (auto &item : _items) {
 			_itemHeight = item->resizeGetHeight(_itemWidth);
 		}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index f6f70098c..5e71fcad0 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -39,7 +39,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/box_content.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/round_rect.h"
 #include "ui/rp_widget.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
 #include "styles/style_widgets.h"
 #include "styles/style_boxes.h" // UserpicButton
@@ -84,14 +87,17 @@ private:
 
 class Controller::Unsupported final {
 public:
-	explicit Unsupported(not_null<Controller*> controller);
+	Unsupported(not_null<Controller*> controller, not_null<UserData*> user);
 
 private:
-	void setup();
+	void setup(not_null<UserData*> user);
 
 	const not_null<Controller*> _controller;
+	std::unique_ptr<Ui::RpWidget> _bg;
+	std::unique_ptr<Ui::RpWidget> _reply;
 	std::unique_ptr<Ui::FlatLabel> _text;
 	std::unique_ptr<Ui::RoundButton> _button;
+	Ui::RoundRect _bgRound;
 
 };
 
@@ -146,14 +152,52 @@ void Controller::PhotoPlayback::callback() {
 	});
 }
 
-Controller::Unsupported::Unsupported(not_null<Controller*> controller)
-: _controller(controller) {
-	setup();
+Controller::Unsupported::Unsupported(
+	not_null<Controller*> controller,
+	not_null<UserData*> user)
+: _controller(controller)
+, _bgRound(st::storiesRadius, st::storiesComposeBg) {
+	setup(user);
 }
 
-void Controller::Unsupported::setup() {
+void Controller::Unsupported::setup(not_null<UserData*> user) {
 	const auto wrap = _controller->wrap();
 
+	_bg = std::make_unique<Ui::RpWidget>(wrap);
+	_bg->show();
+	_bg->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(_bg.get());
+		_bgRound.paint(p, _bg->rect());
+	}, _bg->lifetime());
+
+	if (!user->isSelf()) {
+		_reply = std::make_unique<Ui::RpWidget>(wrap);
+		_reply->show();
+		_reply->paintRequest() | rpl::start_with_next([=] {
+			auto p = QPainter(_reply.get());
+			_bgRound.paint(p, _reply->rect());
+
+			p.setPen(st::storiesComposeGrayText);
+			p.setFont(st::normalFont);
+			p.drawText(
+				_reply->rect(),
+				tr::lng_stories_cant_reply(tr::now),
+				style::al_center);
+		}, _reply->lifetime());
+	}
+
+	_controller->layoutValue(
+	) | rpl::start_with_next([=](const Layout &layout) {
+		_bg->setGeometry(layout.content);
+		if (_reply) {
+			const auto height = st::storiesComposeControls.attach.height;
+			const auto position = layout.controlsBottomPosition
+				- QPoint(0, height);
+			_reply->setGeometry(
+				{ position, QSize{ layout.controlsWidth, height } });
+		}
+	}, _bg->lifetime());
+
 	_text = std::make_unique<Ui::FlatLabel>(
 		wrap,
 		tr::lng_stories_unsupported(),
@@ -164,17 +208,29 @@ void Controller::Unsupported::setup() {
 		wrap,
 		tr::lng_update_telegram(),
 		st::storiesUnsupportedUpdate);
+	_button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	_button->show();
 
 	rpl::combine(
-		wrap->sizeValue(),
+		_controller->layoutValue(),
 		_text->sizeValue(),
 		_button->sizeValue()
-	) | rpl::start_with_next([=](QSize wrap, QSize text, QSize button) {
-		_text->move((wrap.width() - text.width()) / 2, wrap.height() / 3);
+	) | rpl::start_with_next([=](
+			const Layout &layout,
+			QSize text,
+			QSize button) {
+		const auto wrap = layout.content;
+		const auto totalHeight = st::storiesUnsupportedTop
+			+ text.height()
+			+ st::storiesUnsupportedSkip
+			+ button.height();
+		const auto top = (wrap.height() - totalHeight) / 2;
+		_text->move(
+			wrap.x() + (wrap.width() - text.width()) / 2,
+			wrap.y() + top + st::storiesUnsupportedTop);
 		_button->move(
-			(wrap.width() - button.width()) / 2,
-			2 * wrap.height() / 3);
+			wrap.x() + (wrap.width() - button.width()) / 2,
+			wrap.y() + top + totalHeight - button.height());
 	}, _button->lifetime());
 
 	_button->setClickedCallback([=] {
@@ -644,10 +700,13 @@ void Controller::show(
 		}
 	});
 
-	if (!story->unsupported()) {
+	const auto unsupported = story->unsupported();
+	if (!unsupported) {
 		_unsupported = nullptr;
 	} else {
-		_unsupported = std::make_unique<Unsupported>(this);
+		_unsupported = std::make_unique<Unsupported>(this, user);
+		_header->raise();
+		_slider->raise();
 	}
 
 	if (_shown == storyId) {
@@ -664,7 +723,10 @@ void Controller::show(
 	}
 
 	_header->show({ .user = user, .date = story->date() });
-	_replyArea->show({ .user = user, .id = story->id() });
+	_replyArea->show({
+		.user = unsupported ? nullptr : user,
+		.id = story->id(),
+	});
 	_recentViews->show({
 		.list = story->recentViewers(),
 		.total = story->views(),
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 3c089c9bd..cbd67f5e6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -131,6 +131,12 @@ void Header::show(HeaderData data) {
 	}
 }
 
+void Header::raise() {
+	if (_widget) {
+		_widget->raise();
+	}
+}
+
 void Header::updateDateText() {
 	if (!_date || !_data || !_data->date) {
 		return;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 32c310bff..97d62b250 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -33,6 +33,7 @@ public:
 	~Header();
 
 	void show(HeaderData data);
+	void raise();
 
 private:
 	void updateDateText();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 9d7f24715..2929d52c9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -74,6 +74,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 )) {
 	initGeometry();
 	initActions();
+	_controls->hide();
 }
 
 ReplyArea::~ReplyArea() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
index f4dc57956..53f39c1ad 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
@@ -73,6 +73,12 @@ void Slider::show(SliderData data) {
 	}, raw->lifetime());
 }
 
+void Slider::raise() {
+	if (_widget) {
+		_widget->raise();
+	}
+}
+
 void Slider::updatePlayback(const Player::TrackState &state) {
 	_progress->updateState(state);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.h b/Telegram/SourceFiles/media/stories/media_stories_slider.h
index 140df471f..37d1c71ec 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.h
@@ -37,6 +37,7 @@ public:
 	~Slider();
 
 	void show(SliderData data);
+	void raise();
 
 	void updatePlayback(const Player::TrackState &state);
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 4137dbce9..edc5bd517 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -786,13 +786,20 @@ storiesReactionsAddedTop: 200px;
 storiesUnsupportedLabel: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewControlFg;
 	style: TextStyle(defaultTextStyle) {
-		font: font(15px semibold);
-		linkFont: font(15px semibold);
-		linkFontOver: font(15px semibold underline);
+		font: font(14px);
+		linkFont: font(14px);
+		linkFontOver: font(14px underline);
+		lineHeight: 21px;
 	}
 	align: align(top);
 }
-storiesUnsupportedUpdate: themePreviewApplyButton;
+storiesUnsupportedUpdate: RoundButton(defaultActiveButton) {
+	width: -102px;
+	height: 42px;
+	textTop: 12px;
+}
+storiesUnsupportedTop: 24px;
+storiesUnsupportedSkip: 18px;
 storiesShortInfoBox: ShortInfoBox(shortInfoBox) {
 	label: FlatLabel(infoLabel) {
 		textFg: storiesComposeGrayText;

From 80bec508b620e24290d3d5b756e7bafba86db898 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Jun 2023 12:57:57 +0400
Subject: [PATCH 315/676] Support new stories link t.me/username/s/123.

---
 Telegram/SourceFiles/apiwrap.cpp                 | 2 +-
 Telegram/SourceFiles/core/local_url_handlers.cpp | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 44c7d507e..ea70c516b 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -779,7 +779,7 @@ QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
 	const auto fallback = [&] {
 		const auto base = user->username();
 		const auto story = QString::number(storyId.story);
-		const auto query = base + "?story=" + story;
+		const auto query = base + "/s" + story;
 		return session().createInternalLinkFull(query);
 	};
 	const auto i = _unlikelyStoryLinks.find(storyId);
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 2d013e612..df0c92771 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -383,7 +383,8 @@ bool ResolveUsernameOrPhone(
 	if (const auto postId = postParam.toInt()) {
 		post = postId;
 	}
-	const auto storyId = params.value(u"story"_q).toInt();
+	const auto storyParam = params.value(u"story"_q);
+	const auto storyId = storyParam.toInt();
 	const auto appname = params.value(u"appname"_q);
 	const auto appstart = params.value(u"startapp"_q);
 	const auto commentParam = params.value(u"comment"_q);
@@ -423,7 +424,7 @@ bool ResolveUsernameOrPhone(
 		.startToken = startToken,
 		.startAdminRights = adminRights,
 		.startAutoSubmit = myContext.botStartAutoSubmit,
-		.botAppName = appname.isEmpty() ? postParam : appname,
+		.botAppName = (appname.isEmpty() ? postParam : appname),
 		.botAppForceConfirmation = myContext.mayShowConfirmation,
 		.attachBotUsername = params.value(u"attach"_q),
 		.attachBotToggleCommand = (params.contains(u"startattach"_q)
@@ -1029,6 +1030,7 @@ QString TryConvertUrlToLocal(QString url) {
 				"/?$|"
 				"/[a-zA-Z0-9\\.\\_]+/?(\\?|$)|"
 				"/\\d+/?(\\?|$)|"
+				"/s/\\d+/?(\\?|$)|"
 				"/\\d+/\\d+/?(\\?|$)"
 			")"_q, query, matchOptions)) {
 			const auto params = query.mid(usernameMatch->captured(0).size()).toString();
@@ -1038,6 +1040,8 @@ QString TryConvertUrlToLocal(QString url) {
 				added = u"&topic=%1&post=%2"_q.arg(threadPostMatch->captured(1)).arg(threadPostMatch->captured(2));
 			} else if (const auto postMatch = regex_match(u"^/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&post="_q + postMatch->captured(1);
+			} else if (const auto storyMatch = regex_match(u"^/s/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
+				added = u"&story="_q + storyMatch->captured(1);
 			} else if (const auto appNameMatch = regex_match(u"^/([a-zA-Z0-9\\.\\_]+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&appname="_q + appNameMatch->captured(1);
 			}

From 4e39144d0f5c74de3af182ae0320bbbe2b5e93b2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Jun 2023 13:15:59 +0400
Subject: [PATCH 316/676] Resolve unknown story on open.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp     | 4 +++-
 Telegram/SourceFiles/window/window_session_controller.cpp | 8 +++++++-
 Telegram/SourceFiles/window/window_session_controller.h   | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index a63e159c7..c65f9a2a0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -342,7 +342,9 @@ InnerWidget::InnerWidget(
 
 	_stories->clicks(
 	) | rpl::start_with_next([=](uint64 id) {
-		_controller->openPeerStories(PeerId(int64(id)), {});
+		_controller->openPeerStories(
+			PeerId(int64(id)),
+			Data::StorySourcesList::NotHidden);
 	}, lifetime());
 
 	_stories->showProfileRequests(
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 394ca2358..9758d8545 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2522,9 +2522,15 @@ void SessionController::openPeerStory(
 	using namespace Media::View;
 	using namespace Data;
 
+	invalidate_weak_ptrs(&_storyOpenGuard);
 	auto &stories = session().data().stories();
-	if (const auto from = stories.lookup({ peer->id, storyId })) {
+	const auto from = stories.lookup({ peer->id, storyId });
+	if (from) {
 		window().openInMediaView(OpenRequest(this, *from, context));
+	} else if (from.error() == Data::NoStory::Unknown) {
+		stories.resolve({ peer->id, storyId }, crl::guard(&_storyOpenGuard, [=] {
+			openPeerStory(peer, storyId, context);
+		}));
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 7d9567427..509fa2818 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -717,6 +717,8 @@ private:
 	using ReactionIconFactory = HistoryView::Reactions::CachedIconFactory;
 	std::unique_ptr<ReactionIconFactory> _cachedReactionIconFactory;
 
+	base::has_weak_ptr _storyOpenGuard;
+
 	GiftPremiumValidator _giftPremiumValidator;
 
 	QString _premiumRef;

From ebafb55b1b9b93667546dec19ca92c99a3357eaf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Jun 2023 13:35:10 +0400
Subject: [PATCH 317/676] Cache stories sources order in viewer.

---
 .../stories/media_stories_controller.cpp      | 78 +++++++++++++++++--
 .../media/stories/media_stories_controller.h  | 11 ++-
 2 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 5e71fcad0..79828f7fc 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -618,7 +618,8 @@ void Controller::rebuildFromContext(
 			storyId.peer,
 			&StoriesSourceInfo::id);
 		if (i != end(sources)) {
-			showSiblings(&user->session(), sources, (i - begin(sources)));
+			rebuildCachedSourcesList(sources, (i - begin(sources)));
+			showSiblings(&user->session());
 			if (int(sources.end() - i) < kPreloadUsersCount) {
 				stories.loadMore(list);
 			}
@@ -780,18 +781,19 @@ void Controller::setPlayingAllowed(bool allowed) {
 	}
 }
 
-void Controller::showSiblings(
-		not_null<Main::Session*> session,
-		const std::vector<Data::StoriesSourceInfo> &sources,
-		int index) {
+void Controller::showSiblings(not_null<Main::Session*> session) {
 	showSibling(
 		_siblingLeft,
 		session,
-		(index > 0) ? sources[index - 1].id : PeerId());
+		(_cachedSourceIndex > 0
+			? _cachedSourcesList[_cachedSourceIndex - 1]
+			: PeerId()));
 	showSibling(
 		_siblingRight,
 		session,
-		(index + 1 < sources.size()) ? sources[index + 1].id : PeerId());
+		(_cachedSourceIndex + 1 < _cachedSourcesList.size()
+			? _cachedSourcesList[_cachedSourceIndex + 1]
+			: PeerId()));
 }
 
 void Controller::hideSiblings() {
@@ -1116,6 +1118,68 @@ void Controller::loadMoreToList() {
 	});
 }
 
+void Controller::rebuildCachedSourcesList(
+		const std::vector<Data::StoriesSourceInfo> &lists,
+		int index) {
+	Expects(index >= 0 && index < lists.size());
+
+	// Remove removed.
+	_cachedSourcesList.erase(ranges::remove_if(_cachedSourcesList, [&](
+			PeerId id) {
+		return !ranges::contains(lists, id, &Data::StoriesSourceInfo::id);
+	}), end(_cachedSourcesList));
+
+	// Find current, full rebuild if can't find.
+	const auto i = ranges::find(_cachedSourcesList, lists[index].id);
+	if (i == end(_cachedSourcesList)) {
+		_cachedSourcesList.clear();
+	} else {
+		_cachedSourceIndex = int(i - begin(_cachedSourcesList));
+	}
+
+	if (_cachedSourcesList.empty()) {
+		// Full rebuild.
+		_cachedSourcesList = lists
+			| ranges::views::transform(&Data::StoriesSourceInfo::id)
+			| ranges::to_vector;
+		_cachedSourceIndex = index;
+	} else if (ranges::equal(
+			lists,
+			_cachedSourcesList,
+			ranges::equal_to(),
+			&Data::StoriesSourceInfo::id)) {
+		// No rebuild needed.
+		_cachedSourceIndex = index;
+	} else {
+		// All that go before the current push to front.
+		for (auto before = index; before > 0;) {
+			--before;
+			const auto peerId = lists[--before].id;
+			if (!ranges::contains(_cachedSourcesList, peerId)) {
+				_cachedSourcesList.insert(
+					begin(_cachedSourcesList),
+					peerId);
+				++_cachedSourceIndex;
+			}
+		}
+		// All that go after the current push to back.
+		for (auto after = index + 1, count = int(lists.size()); after != count; ++after) {
+			const auto peerId = lists[after].id;
+			if (!ranges::contains(_cachedSourcesList, peerId)) {
+				_cachedSourcesList.push_back(peerId);
+			}
+		}
+	}
+
+	Ensures(_cachedSourcesList.size() == lists.size());
+	Ensures(ranges::equal(
+		lists,
+		_cachedSourcesList,
+		ranges::equal_to(),
+		&Data::StoriesSourceInfo::id));
+	Ensures(_cachedSourceIndex >= 0 && _cachedSourceIndex < _cachedSourcesList.size());
+}
+
 void Controller::refreshViewsFromData() {
 	Expects(shown());
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 96d102073..405960f39 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -162,10 +162,7 @@ private:
 	void setPlayingAllowed(bool allowed);
 
 	void hideSiblings();
-	void showSiblings(
-		not_null<Main::Session*> session,
-		const std::vector<Data::StoriesSourceInfo> &lists,
-		int index);
+	void showSiblings(not_null<Main::Session*> session);
 	void showSibling(
 		std::unique_ptr<Sibling> &sibling,
 		not_null<Main::Session*> session,
@@ -186,6 +183,9 @@ private:
 	void rebuildFromContext(not_null<UserData*> user, FullStoryId storyId);
 	void checkMoveByDelta();
 	void loadMoreToList();
+	void rebuildCachedSourcesList(
+		const std::vector<Data::StoriesSourceInfo> &lists,
+		int index);
 
 	void startReactionAnimation(
 		Data::ReactionId id,
@@ -227,6 +227,9 @@ private:
 	bool _started = false;
 	bool _viewed = false;
 
+	std::vector<PeerId> _cachedSourcesList;
+	int _cachedSourceIndex = -1;
+
 	ViewsSlice _viewsSlice;
 	rpl::event_stream<> _moreViewsLoaded;
 	base::has_weak_ptr _viewsLoadGuard;

From e21c06f67ce89b9f302683438745c878b927540d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Jun 2023 19:29:11 +0400
Subject: [PATCH 318/676] Support deleting and reporting stories.

---
 Telegram/Resources/langs/lang.strings         |  6 ++
 Telegram/SourceFiles/api/api_report.cpp       | 26 +++++--
 Telegram/SourceFiles/api/api_report.h         |  6 +-
 Telegram/SourceFiles/boxes/background_box.cpp |  4 +-
 .../SourceFiles/boxes/report_messages_box.cpp | 26 +++++--
 .../chat_helpers/chat_helpers.style           | 37 ++++++++++
 Telegram/SourceFiles/data/data_stories.cpp    | 48 +++++++++++++
 Telegram/SourceFiles/data/data_stories.h      | 13 ++++
 .../SourceFiles/history/history_widget.cpp    |  3 +-
 Telegram/SourceFiles/info/info.style          |  6 --
 .../stories/media_stories_controller.cpp      | 70 +++++++++++++------
 .../media/stories/media_stories_controller.h  |  8 +--
 .../media/stories/media_stories_view.cpp      | 20 +++---
 .../media/stories/media_stories_view.h        |  8 ++-
 .../SourceFiles/media/view/media_view.style   | 53 ++++++++++----
 .../media/view/media_view_overlay_widget.cpp  | 36 +++++++---
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  1 +
 Telegram/SourceFiles/ui/boxes/report_box.cpp  | 44 ++++++------
 Telegram/SourceFiles/ui/boxes/report_box.h    |  7 ++
 19 files changed, 322 insertions(+), 100 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 018d19573..091cf0610 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -757,6 +757,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_background_apply2" = "Enjoy the view.";
 "lng_background_apply_button" = "Apply For This Chat";
 "lng_background_dimming" = "Background dimming";
+"lng_background_sure_reset_default" = "Are you sure you want to reset the wallpaper?";
+"lng_background_reset_default" = "Reset";
 
 "lng_download_path_ask" = "Ask download path for each file";
 "lng_download_path" = "Download path";
@@ -1348,6 +1350,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_report_group_video_title" = "Report group video";
 "lng_report_channel_photo_title" = "Report channel photo";
 "lng_report_channel_video_title" = "Report channel video";
+"lng_report_story" = "Report story";
 "lng_report_please_select_messages" = "Please select messages to report.";
 "lng_report_select_messages" = "Select messages";
 "lng_report_messages_none" = "Select Messages";
@@ -3822,6 +3825,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_reply_sent" = "Message Sent";
 "lng_stories_hidden_to_contacts" = "Those stories are now shown only in your Contacts list.";
 "lng_stories_shown_in_chats" = "Those stories are now shown in your Chats list.";
+"lng_stories_delete_one_sure" = "Are you sure you want to delete this story?";
+"lng_stories_delete_sure#one" = "Are you sure you want to delete {count} story?";
+"lng_stories_delete_sure#other" = "Are you sure you want to delete {count} stories?";
 
 "lng_stories_link_invalid" = "This link is broken or has expired.";
 
diff --git a/Telegram/SourceFiles/api/api_report.cpp b/Telegram/SourceFiles/api/api_report.cpp
index 7185b76f5..501870180 100644
--- a/Telegram/SourceFiles/api/api_report.cpp
+++ b/Telegram/SourceFiles/api/api_report.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "data/data_peer.h"
 #include "data/data_photo.h"
+#include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/boxes/report_box.h"
@@ -39,11 +40,15 @@ MTPreportReason ReasonToTL(const Ui::ReportReason &reason) {
 } // namespace
 
 void SendReport(
-		std::shared_ptr<Ui::Show> show,
-		not_null<PeerData*> peer,
-		Ui::ReportReason reason,
-		const QString &comment,
-		std::variant<v::null_t, MessageIdsList, not_null<PhotoData*>> data) {
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> peer,
+	Ui::ReportReason reason,
+	const QString &comment,
+	std::variant<
+		v::null_t,
+		MessageIdsList,
+		not_null<PhotoData*>,
+		StoryId> data) {
 	auto done = [=] {
 		show->showToast(tr::lng_report_thanks(tr::now));
 	};
@@ -72,6 +77,17 @@ void SendReport(
 			ReasonToTL(reason),
 			MTP_string(comment)
 		)).done(std::move(done)).send();
+	}, [&](StoryId id) {
+		const auto user = peer->asUser();
+		if (!user) {
+			return;
+		}
+		peer->session().api().request(MTPstories_Report(
+			user->inputUser,
+			MTP_vector<MTPint>(1, MTP_int(id)),
+			ReasonToTL(reason),
+			MTP_string(comment)
+		)).done(std::move(done)).send();
 	});
 }
 
diff --git a/Telegram/SourceFiles/api/api_report.h b/Telegram/SourceFiles/api/api_report.h
index 08535c00b..14e9d4ef1 100644
--- a/Telegram/SourceFiles/api/api_report.h
+++ b/Telegram/SourceFiles/api/api_report.h
@@ -22,6 +22,10 @@ void SendReport(
 	not_null<PeerData*> peer,
 	Ui::ReportReason reason,
 	const QString &comment,
-	std::variant<v::null_t, MessageIdsList, not_null<PhotoData*>> data);
+	std::variant<
+		v::null_t,
+		MessageIdsList,
+		not_null<PhotoData*>,
+		StoryId> data);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index e1262b4c9..a7b92aa32 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -282,9 +282,9 @@ void BackgroundBox::chosen(const Data::WallPaper &paper) {
 				close();
 			});
 			_controller->show(Ui::MakeConfirmBox({
-				.text = u"Are you sure you want to reset the wallpaper?"_q,
+				.text = tr::lng_background_sure_reset_default(),
 				.confirmed = reset,
-				.confirmText = u"Reset"_q,
+				.confirmText = tr::lng_background_reset_default(),
 			}));
 		} else {
 			closeBox();
diff --git a/Telegram/SourceFiles/boxes/report_messages_box.cpp b/Telegram/SourceFiles/boxes/report_messages_box.cpp
index 291e0617b..5c8d59133 100644
--- a/Telegram/SourceFiles/boxes/report_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_messages_box.cpp
@@ -14,12 +14,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/report_box.h"
 #include "ui/layers/generic_box.h"
 #include "window/window_session_controller.h"
+#include "styles/style_chat_helpers.h"
 
 namespace {
 
 [[nodiscard]] object_ptr<Ui::BoxContent> Report(
 		not_null<PeerData*> peer,
-		std::variant<v::null_t, MessageIdsList, not_null<PhotoData*>> data) {
+		std::variant<
+			v::null_t,
+			MessageIdsList,
+			not_null<PhotoData*>,
+			StoryId> data,
+		const style::ReportBox *stOverride) {
 	const auto source = v::match(data, [](const MessageIdsList &ids) {
 		return Ui::ReportSource::Message;
 	}, [&](not_null<PhotoData*> photo) {
@@ -34,15 +40,18 @@ namespace {
 			: (photo->hasVideo()
 				? Ui::ReportSource::ChannelVideo
 				: Ui::ReportSource::ChannelPhoto);
+	}, [&](StoryId id) {
+		return Ui::ReportSource::Story;
 	}, [](v::null_t) {
 		Unexpected("Bad source report.");
 		return Ui::ReportSource::Bot;
 	});
+	const auto st = stOverride ? stOverride : &st::defaultReportBox;
 	return Box([=](not_null<Ui::GenericBox*> box) {
 		const auto show = box->uiShow();
-		Ui::ReportReasonBox(box, source, [=](Ui::ReportReason reason) {
+		Ui::ReportReasonBox(box, *st, source, [=](Ui::ReportReason reason) {
 			show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-				Ui::ReportDetailsBox(box, [=](const QString &text) {
+				Ui::ReportDetailsBox(box, *st, [=](const QString &text) {
 					Api::SendReport(show, peer, reason, text, data);
 					show->hideLayer();
 				});
@@ -56,13 +65,13 @@ namespace {
 object_ptr<Ui::BoxContent> ReportItemsBox(
 		not_null<PeerData*> peer,
 		MessageIdsList ids) {
-	return Report(peer, ids);
+	return Report(peer, ids, nullptr);
 }
 
 object_ptr<Ui::BoxContent> ReportProfilePhotoBox(
 		not_null<PeerData*> peer,
 		not_null<PhotoData*> photo) {
-	return Report(peer, photo);
+	return Report(peer, photo, nullptr);
 }
 
 void ShowReportPeerBox(
@@ -93,17 +102,20 @@ void ShowReportPeerBox(
 		if (reason == Ui::ReportReason::Fake
 			|| reason == Ui::ReportReason::Other) {
 			state->ids = {};
-			state->detailsBox = window->show(Box(Ui::ReportDetailsBox, send));
+			state->detailsBox = window->show(
+				Box(Ui::ReportDetailsBox, st::defaultReportBox, send));
 			return;
 		}
 		window->showChooseReportMessages(peer, reason, [=](
 				MessageIdsList ids) {
 			state->ids = std::move(ids);
-			state->detailsBox = window->show(Box(Ui::ReportDetailsBox, send));
+			state->detailsBox = window->show(
+				Box(Ui::ReportDetailsBox, st::defaultReportBox, send));
 		});
 	};
 	state->reasonBox = window->show(Box(
 		Ui::ReportReasonBox,
+		st::defaultReportBox,
 		(peer->isBroadcast()
 			? Ui::ReportSource::Channel
 			: peer->isUser()
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index e5552ead4..5c72090e0 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -206,6 +206,21 @@ ComposeControls {
 	premium: PremiumLimits;
 }
 
+ReportBox {
+	button: SettingsButton;
+	label: FlatLabel;
+	field: InputField;
+	spam: icon;
+	fake: icon;
+	violence: icon;
+	children: icon;
+	pornography: icon;
+	copyright: icon;
+	drugs: icon;
+	personal: icon;
+	other: icon;
+}
+
 WhoRead {
 	userpics: GroupCallUserpics;
 	photoLeft: pixels;
@@ -1152,3 +1167,25 @@ moreChatsBarClose: IconButton(defaultIconButton) {
 		color: windowBgOver;
 	}
 }
+
+reportReasonTopSkip: 8px;
+reportReasonButton: SettingsButton(defaultSettingsButton) {
+	style: boxTextStyle;
+	padding: margins(62px, 7px, 8px, 7px);
+	iconLeft: 22px;
+}
+
+defaultReportBox: ReportBox {
+	button: reportReasonButton;
+	label: boxLabel;
+	field: newGroupDescription;
+	spam: menuIconDelete;
+	fake: menuIconFake;
+	violence: menuIconViolence;
+	children: menuIconBlock;
+	pornography: menuIconPorn;
+	copyright: menuIconCopyright;
+	drugs: menuIconDrugs;
+	personal: menuIconPersonal;
+	other: menuIconReport;
+}
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 525a0d200..1ebd7a1ed 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_stories.h"
 
+#include "api/api_report.h"
 #include "base/unixtime.h"
 #include "api/api_text_entities.h"
 #include "apiwrap.h"
@@ -223,6 +224,22 @@ bool Story::closeFriends() const {
 	return _closeFriends;
 }
 
+bool Story::canDownload() const {
+	return _peer->isSelf();
+}
+
+bool Story::canShare() const {
+	return isPublic() && (pinned() || !expired());
+}
+
+bool Story::canDelete() const {
+	return _peer->isSelf();
+}
+
+bool Story::canReport() const {
+	return !_peer->isSelf();
+}
+
 bool Story::hasDirectLink() const {
 	if (!_isPublic || (!_pinned && expired())) {
 		return false;
@@ -1479,7 +1496,38 @@ void Stories::savedLoadMore(PeerId peerId) {
 		saved.total = int(saved.ids.list.size());
 		_savedChanged.fire_copy(peerId);
 	}).send();
+}
 
+void Stories::deleteList(const std::vector<FullStoryId> &ids) {
+	auto list = QVector<MTPint>();
+	list.reserve(ids.size());
+	const auto selfId = session().userPeerId();
+	for (const auto &id : ids) {
+		if (id.peer == selfId) {
+			list.push_back(MTP_int(id.story));
+		}
+	}
+	if (!list.empty()) {
+		const auto api = &_owner->session().api();
+		api->request(MTPstories_DeleteStories(
+			MTP_vector<MTPint>(list)
+		)).done([=](const MTPVector<MTPint> &result) {
+			for (const auto &id : result.v) {
+				applyDeleted({ selfId, id.v });
+			}
+		}).send();
+	}
+}
+
+void Stories::report(
+		std::shared_ptr<Ui::Show> show,
+		FullStoryId id,
+		Ui::ReportReason reason,
+		QString text) {
+	if (const auto maybeStory = lookup(id)) {
+		const auto story = *maybeStory;
+		Api::SendReport(show, story->peer(), reason, text, story->id());
+	}
 }
 
 bool Stories::isQuitPrevent() {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index d082d05a6..3199ff82f 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -23,6 +23,7 @@ class Session;
 
 namespace Ui {
 class Show;
+enum class ReportReason;
 } // namespace Ui
 
 namespace Data {
@@ -106,6 +107,11 @@ public:
 	void setCloseFriends(bool closeFriends);
 	[[nodiscard]] bool closeFriends() const;
 
+	[[nodiscard]] bool canDownload() const;
+	[[nodiscard]] bool canShare() const;
+	[[nodiscard]] bool canDelete() const;
+	[[nodiscard]] bool canReport() const;
+
 	[[nodiscard]] bool hasDirectLink() const;
 	[[nodiscard]] std::optional<QString> errorTextForForward(
 		not_null<Thread*> to) const;
@@ -284,6 +290,13 @@ public:
 	[[nodiscard]] bool savedLoaded(PeerId peerId) const;
 	void savedLoadMore(PeerId peerId);
 
+	void deleteList(const std::vector<FullStoryId> &ids);
+	void report(
+		std::shared_ptr<Ui::Show> show,
+		FullStoryId id,
+		Ui::ReportReason reason,
+		QString text);
+
 private:
 	struct Saved {
 		StoriesIds ids;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 8e50593be..e99b55c85 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4009,7 +4009,8 @@ void HistoryWidget::reportSelectedMessages() {
 	const auto reason = _chooseForReport->reason;
 	const auto weak = Ui::MakeWeak(_list.data());
 	controller()->window().show(Box([=](not_null<Ui::GenericBox*> box) {
-		Ui::ReportDetailsBox(box, [=](const QString &text) {
+		const auto &st = st::defaultReportBox;
+		Ui::ReportDetailsBox(box, st, [=](const QString &text) {
 			if (weak) {
 				clearSelected();
 				controller()->clearChooseReportMessages();
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index fcd649b38..b6958d4fa 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -885,10 +885,4 @@ shortInfoCover: ShortInfoCover {
 	}
 }
 
-reportReasonTopSkip: 8px;
-reportReasonButton: SettingsButton(infoProfileButton) {
-	style: boxTextStyle;
-	padding: margins(62px, 7px, 8px, 7px);
-}
-
 permissionsExpandIcon: icon{{ "info/edit/expand_arrow_small", windowBoldFg }};
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 79828f7fc..bc7d0eaec 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -33,6 +33,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_share.h"
 #include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/report_box.h"
 #include "ui/effects/emoji_fly_animation.h"
 #include "ui/effects/message_sending_animation_common.h"
 #include "ui/effects/reaction_fly_animation.h"
@@ -493,6 +495,11 @@ void Controller::initLayout() {
 	});
 }
 
+Data::Story *Controller::story() const {
+	const auto maybeStory = _session->data().stories().lookup(_shown);
+	return maybeStory ? maybeStory->get() : nullptr;
+}
+
 not_null<Ui::RpWidget*> Controller::wrap() const {
 	return _wrap;
 }
@@ -995,25 +1002,6 @@ void Controller::setMenuShown(bool shown) {
 	}
 }
 
-bool Controller::canShare() const {
-	if (const auto maybeStory = _session->data().stories().lookup(_shown)) {
-		const auto story = *maybeStory;
-		const auto user = story->peer()->asUser();
-		return story->isPublic()
-			&& (story->pinned() || !story->expired())
-			&& (!user->username().isEmpty()
-				|| !user->hasPrivateForwardName());
-	}
-	return false;
-}
-
-bool Controller::canDownload() const {
-	if (const auto maybeStory = _session->data().stories().lookup(_shown)) {
-		return (*maybeStory)->peer()->isSelf();
-	}
-	return false;
-}
-
 void Controller::repaintSibling(not_null<Sibling*> sibling) {
 	if (sibling == _siblingLeft.get() || sibling == _siblingRight.get()) {
 		_delegate->storiesRepaint();
@@ -1237,13 +1225,55 @@ void Controller::unfocusReply() {
 	_wrap->setFocus();
 }
 
-void Controller::share() {
+void Controller::shareRequested() {
 	const auto show = _delegate->storiesShow();
 	if (auto box = PrepareShareBox(show, _shown)) {
 		show->show(std::move(box));
 	}
 }
 
+void Controller::deleteRequested() {
+	const auto story = this->story();
+	if (!story) {
+		return;
+	}
+	const auto id = story->fullId();
+	const auto owner = &story->owner();
+	const auto confirmed = [=](Fn<void()> close) {
+		owner->stories().deleteList({ id });
+		close();
+	};
+	uiShow()->show(Ui::MakeConfirmBox({
+		.text = tr::lng_stories_delete_one_sure(),
+		.confirmed = confirmed,
+		.confirmText = tr::lng_selected_delete(),
+		.labelStyle = &st::storiesBoxLabel,
+	}));
+}
+
+void Controller::reportRequested() {
+	const auto story = this->story();
+	if (!story) {
+		return;
+	}
+	const auto id = story->fullId();
+	const auto owner = &story->owner();
+	const auto confirmed = [=](Fn<void()> close) {
+		owner->stories().deleteList({ id });
+		close();
+	};
+	const auto show = uiShow();
+	const auto st = &st::storiesReportBox;
+	show->show(Box(Ui::ReportReasonBox, *st, Ui::ReportSource::Story, [=](
+			Ui::ReportReason reason) {
+		const auto done = [=](const QString &text) {
+			owner->stories().report(show, id, reason, text);
+			show->hideLayer();
+		};
+		show->showBox(Box(Ui::ReportDetailsBox, *st, done));
+	}));
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 405960f39..a680d7f68 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -96,6 +96,7 @@ public:
 	explicit Controller(not_null<Delegate*> delegate);
 	~Controller();
 
+	[[nodiscard]] Data::Story *story() const;
 	[[nodiscard]] not_null<Ui::RpWidget*> wrap() const;
 	[[nodiscard]] Layout layout() const;
 	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
@@ -123,9 +124,6 @@ public:
 	void contentPressed(bool pressed);
 	void setMenuShown(bool shown);
 
-	[[nodiscard]] bool canShare() const;
-	[[nodiscard]] bool canDownload() const;
-
 	void repaintSibling(not_null<Sibling*> sibling);
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 
@@ -133,7 +131,9 @@ public:
 	[[nodiscard]] rpl::producer<> moreViewsLoaded() const;
 
 	void unfocusReply();
-	void share();
+	void shareRequested();
+	void deleteRequested();
+	void reportRequested();
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 1b2747ee4..b79064e2e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -32,12 +32,8 @@ void View::ready() {
 	_controller->ready();
 }
 
-bool View::canShare() const {
-	return _controller->canShare();
-}
-
-bool View::canDownload() const {
-	return _controller->canDownload();
+Data::Story *View::story() const {
+	return _controller->story();
 }
 
 QRect View::finalShownGeometry() const {
@@ -83,8 +79,16 @@ void View::contentPressed(bool pressed) {
 	_controller->contentPressed(pressed);
 }
 
-void View::share() {
-	_controller->share();
+void View::shareRequested() {
+	_controller->shareRequested();
+}
+
+void View::deleteRequested() {
+	_controller->deleteRequested();
+}
+
+void View::reportRequested() {
+	_controller->reportRequested();
 }
 
 SiblingView View::sibling(SiblingType type) const {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index ba138ac5d..dabb6952a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -56,8 +56,7 @@ public:
 	void show(not_null<Data::Story*> story, Data::StoriesContext context);
 	void ready();
 
-	[[nodiscard]] bool canShare() const;
-	[[nodiscard]] bool canDownload() const;
+	[[nodiscard]] Data::Story *story() const;
 	[[nodiscard]] QRect finalShownGeometry() const;
 	[[nodiscard]] rpl::producer<QRect> finalShownGeometryValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
@@ -75,7 +74,10 @@ public:
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
 	void contentPressed(bool pressed);
-	void share();
+
+	void shareRequested();
+	void deleteRequested();
+	void reportRequested();
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index edc5bd517..85a2716d3 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -509,6 +509,9 @@ storiesPopupMenuWithIcons: PopupMenu(storiesPopupMenu) {
 	menu: storiesMenuWithIcons;
 }
 
+storiesBoxLabel: FlatLabel(boxLabel) {
+	textFg: groupCallMembersFg;
+}
 storiesAttachEmojiInner: IconButton(storiesAttach) {
 	icon: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
 	iconOver: icon {{ "chat/input_smile_face", storiesComposeGrayIcon }};
@@ -520,9 +523,7 @@ storiesAttachEmoji: EmojiButton(historyAttachEmoji) {
 	lineFgOver: storiesComposeGrayIcon;
 }
 storiesComposePremium: PremiumLimits(defaultPremiumLimits) {
-	boxLabel: FlatLabel(boxLabel) {
-		textFg: groupCallMembersFg;
-	}
+	boxLabel: storiesBoxLabel;
 	nonPremiumBg: storiesComposeBgOver;
 	nonPremiumFg: storiesComposeWhiteText;
 }
@@ -588,9 +589,7 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 	}
 	search: storiesEmojiTabbedSearch;
 	removeSet: storiesRemoveSet;
-	boxLabel: FlatLabel(boxLabel) {
-		textFg: groupCallMembersFg;
-	}
+	boxLabel: storiesBoxLabel;
 	icons: ComposeIcons {
 		settings: icon {{ "emoji/emoji_settings", storiesComposeGrayIcon }};
 
@@ -642,6 +641,15 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 	}
 	autocompleteBottomSkip: 10px;
 }
+storiesBoxInputField: InputField(defaultComposeFilesField) {
+	textFg: storiesComposeWhiteText;
+	textBg: storiesComposeBg;
+	placeholderFg: storiesComposeGrayText;
+	placeholderFgActive: storiesComposeBlue;
+	borderFg: storiesComposeGrayText;
+	borderFgActive: storiesComposeBlue;
+	menu: storiesPopupMenu;
+}
 storiesComposeControls: ComposeControls(defaultComposeControls) {
 	bg: storiesComposeBg;
 	radius: storiesRadius;
@@ -718,15 +726,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 			iconOver: icon {{ "title_menu_dots", storiesComposeGrayIcon }};
 			ripple: storiesComposeRippleLight;
 		}
-		caption: InputField(defaultComposeFilesField) {
-			textFg: storiesComposeWhiteText;
-			textBg: storiesComposeBg;
-			placeholderFg: storiesComposeGrayText;
-			placeholderFgActive: storiesComposeBlue;
-			borderFg: storiesComposeGrayText;
-			borderFgActive: storiesComposeBlue;
-			menu: storiesPopupMenu;
-		}
+		caption: storiesBoxInputField;
 		emoji: EmojiButton(storiesAttachEmoji) {
 			inner: IconButton(storiesAttachEmojiInner) {
 				width: 30px;
@@ -818,3 +818,26 @@ storiesShortInfoBox: ShortInfoBox(shortInfoBox) {
 		palette: mediaviewTextPalette;
 	}
 }
+storiesReportBox: ReportBox(defaultReportBox) {
+	button: SettingsButton(reportReasonButton) {
+		textFg: storiesComposeWhiteText;
+		textFgOver: storiesComposeWhiteText;
+		textBg: storiesComposeBg;
+		textBgOver: storiesComposeBgOver;
+		ripple: storiesComposeRipple;
+	}
+	label: storiesBoxLabel;
+	field: InputField(storiesBoxInputField) {
+		textMargins: margins(1px, 26px, 1px, 4px);
+		heightMax: 116px;
+	}
+	spam: icon {{ "menu/delete", storiesComposeWhiteText }};
+	fake: icon {{ "menu/fake", storiesComposeWhiteText }};
+	violence: icon {{ "menu/violence", storiesComposeWhiteText }};
+	children: icon {{ "menu/block", storiesComposeWhiteText }};
+	pornography: icon {{ "menu/porn", storiesComposeWhiteText }};
+	copyright: icon {{ "menu/copyright", storiesComposeWhiteText }};
+	drugs: icon {{ "menu/drugs", storiesComposeWhiteText }};
+	personal: icon {{ "menu/personal", storiesComposeWhiteText }};
+	other: icon {{ "menu/report", storiesComposeWhiteText }};
+}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index bb8d12a5b..30c1ae8aa 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -970,7 +970,8 @@ QSize OverlayWidget::flipSizeByRotation(QSize size) const {
 }
 
 bool OverlayWidget::hasCopyMediaRestriction() const {
-	return (_stories && !_stories->canDownload())
+	const auto story = _stories ? _stories->story() : nullptr;
+	return (story && !story->canDownload())
 		|| (_history && !_history->peer->allowsForwarding())
 		|| (_message && _message->forbidsSaving());
 }
@@ -1223,12 +1224,13 @@ void OverlayWidget::updateControls() {
 
 	updateThemePreviewGeometry();
 
+	const auto story = _stories ? _stories->story() : nullptr;
 	const auto overRect = QRect(
 		QPoint(),
 		QSize(st::mediaviewIconOver, st::mediaviewIconOver));
 	_saveVisible = contentCanBeSaved();
-	_shareVisible = _stories && _stories->canShare();
-	_rotateVisible = !_themePreviewShown && !_stories;
+	_shareVisible = story && story->canShare();
+	_rotateVisible = !_themePreviewShown && !story;
 	const auto navRect = [&](int i) {
 		return QRect(width() - st::mediaviewIconSize.width() * i,
 			height() - st::mediaviewIconSize.height(),
@@ -1364,7 +1366,8 @@ void OverlayWidget::refreshCaptionGeometry() {
 }
 
 void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
-	if (_document && _document->loading()) {
+	const auto story = _stories ? _stories->story() : nullptr;
+	if (!story && _document && _document->loading()) {
 		addAction(
 			tr::lng_cancel(tr::now),
 			[=] { saveCancel(); },
@@ -1376,7 +1379,9 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			[=] { toMessage(); },
 			&st::mediaMenuIconShowInChat);
 	}
-	if (_document && !_document->filepath(true).isEmpty()) {
+	if ((!story || story->canDownload())
+		&& _document
+		&& !_document->filepath(true).isEmpty()) {
 		const auto text =  Platform::IsMac()
 			? tr::lng_context_show_in_finder(tr::now)
 			: tr::lng_context_show_in_folder(tr::now);
@@ -1406,8 +1411,15 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			[=] { forwardMedia(); },
 			&st::mediaMenuIconForward);
 	}
+	if (story && story->canShare()) {
+		addAction(tr::lng_mediaview_forward(tr::now), [=] {
+			_stories->shareRequested();
+		}, &st::mediaMenuIconForward);
+	}
 	const auto canDelete = [&] {
-		if (_message && _message->canDelete()) {
+		if (story && story->canDelete()) {
+			return true;
+		} else if (_message && _message->canDelete()) {
 			return true;
 		} else if (!_message
 			&& _photo
@@ -1527,6 +1539,11 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			}
 		}, &st::mediaMenuIconReport);
 	}();
+	if (story && story->canReport()) {
+		addAction(tr::lng_profile_report(tr::now), [=] {
+			_stories->reportRequested();
+		}, &st::mediaMenuIconReport);
+	}
 }
 
 auto OverlayWidget::computeOverviewType() const
@@ -2433,7 +2450,10 @@ void OverlayWidget::forwardMedia() {
 }
 
 void OverlayWidget::deleteMedia() {
-	if (!_session) {
+	if (_stories) {
+		_stories->deleteRequested();
+		return;
+	} else if (!_session) {
 		return;
 	}
 
@@ -5521,7 +5541,7 @@ void OverlayWidget::handleMouseRelease(
 	} else if (_over == Over::Save && _down == Over::Save) {
 		downloadMedia();
 	} else if (_over == Over::Share && _down == Over::Share && _stories) {
-		_stories->share();
+		_stories->shareRequested();
 	} else if (_over == Over::Rotate && _down == Over::Rotate) {
 		playbackControlsRotate();
 	} else if (_over == Over::Icon && _down == Over::Icon) {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 1ccafbc6f..7509f2c0e 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -2102,3 +2102,4 @@ stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
 stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;
 stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
 stories.exportStoryLink#16e443ce user_id:InputUser id:int = ExportedStoryLink;
+stories.report#c95be06a user_id:InputUser id:Vector<int> reason:ReportReason message:string = Bool;
diff --git a/Telegram/SourceFiles/ui/boxes/report_box.cpp b/Telegram/SourceFiles/ui/boxes/report_box.cpp
index 97fd61120..fa0ac22ff 100644
--- a/Telegram/SourceFiles/ui/boxes/report_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/report_box.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "ui/toast/toast.h"
 #include "info/profile/info_profile_icon.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
@@ -32,6 +33,7 @@ using Reason = ReportReason;
 
 void ReportReasonBox(
 		not_null<GenericBox*> box,
+		const style::ReportBox &st,
 		ReportSource source,
 		Fn<void(Reason)> done) {
 	box->setTitle([&] {
@@ -50,28 +52,27 @@ void ReportReasonBox(
 			return tr::lng_report_channel_photo_title();
 		case Source::ChannelVideo:
 			return tr::lng_report_channel_video_title();
+		case Source::Story:
+			return tr::lng_report_story();
 		}
 		Unexpected("'source' in ReportReasonBox.");
 	}());
-	const auto isProfileSource = (source == Source::ProfilePhoto)
-		|| (source == Source::ProfileVideo);
 	auto margin = style::margins{ 0, st::reportReasonTopSkip, 0, 0 };
 	const auto add = [&](
 			Reason reason,
 			tr::phrase<> text,
 			const style::icon &icon) {
-		const auto &st = st::reportReasonButton;
 		const auto layout = box->verticalLayout();
 		const auto button = layout->add(
-			object_ptr<Ui::SettingsButton>(layout.get(), text(), st),
+			object_ptr<Ui::SettingsButton>(layout.get(), text(), st.button),
 			margin);
 		margin = {};
 		button->setClickedCallback([=] {
 			done(reason);
 		});
-		const auto height = st.padding.top()
-			+ st.height
-			+ st.padding.bottom();
+		const auto height = st.button.padding.top()
+			+ st.button.height
+			+ st.button.padding.bottom();
 		object_ptr<Info::Profile::FloatingIcon>(
 			button,
 			icon,
@@ -80,49 +81,52 @@ void ReportReasonBox(
 				(height - icon.height()) / 2,
 			});
 	};
-	add(Reason::Spam, tr::lng_report_reason_spam, st::menuIconDelete);
-	if (source != Source::Message && !isProfileSource) {
-		add(Reason::Fake, tr::lng_report_reason_fake, st::menuIconFake);
+	add(Reason::Spam, tr::lng_report_reason_spam, st.spam);
+	if (source == Source::Channel
+		|| source == Source::Group
+		|| source == Source::Bot) {
+		add(Reason::Fake, tr::lng_report_reason_fake, st.fake);
 	}
 	add(
 		Reason::Violence,
 		tr::lng_report_reason_violence,
-		st::menuIconViolence);
+		st.violence);
 	add(
 		Reason::ChildAbuse,
 		tr::lng_report_reason_child_abuse,
-		st::menuIconBlock);
+		st.children);
 	add(
 		Reason::Pornography,
 		tr::lng_report_reason_pornography,
-		st::menuIconPorn);
+		st.pornography);
 	add(
 		Reason::Copyright,
 		tr::lng_report_reason_copyright,
-		st::menuIconCopyright);
-	if (source == Source::Message) {
+		st.copyright);
+	if (source == Source::Message || source == Source::Story) {
 		add(
 			Reason::IllegalDrugs,
 			tr::lng_report_reason_illegal_drugs,
-			st::menuIconDrugs);
+			st.drugs);
 		add(
 			Reason::PersonalDetails,
 			tr::lng_report_reason_personal_details,
-			st::menuIconPersonal);
+			st.personal);
 	}
-	add(Reason::Other, tr::lng_report_reason_other, st::menuIconReport);
+	add(Reason::Other, tr::lng_report_reason_other, st.other);
 
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
 void ReportDetailsBox(
 		not_null<GenericBox*> box,
+		const style::ReportBox &st,
 		Fn<void(QString)> done) {
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box, // #TODO reports
 			tr::lng_report_details_about(),
-			st::boxLabel),
+			st.label),
 		{
 			st::boxRowPadding.left(),
 			st::boxPadding.top(),
@@ -131,7 +135,7 @@ void ReportDetailsBox(
 	const auto details = box->addRow(
 		object_ptr<InputField>(
 			box,
-			st::newGroupDescription,
+			st.field,
 			InputField::Mode::MultiLine,
 			tr::lng_report_details(),
 			QString()));
diff --git a/Telegram/SourceFiles/ui/boxes/report_box.h b/Telegram/SourceFiles/ui/boxes/report_box.h
index 61d17e612..fb462bad5 100644
--- a/Telegram/SourceFiles/ui/boxes/report_box.h
+++ b/Telegram/SourceFiles/ui/boxes/report_box.h
@@ -7,6 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace style {
+struct ReportBox;
+} // namespace style
+
 namespace Ui {
 
 class GenericBox;
@@ -22,6 +26,7 @@ enum class ReportSource {
 	GroupVideo,
 	ChannelPhoto,
 	ChannelVideo,
+	Story,
 };
 
 enum class ReportReason {
@@ -38,11 +43,13 @@ enum class ReportReason {
 
 void ReportReasonBox(
 	not_null<GenericBox*> box,
+	const style::ReportBox &st,
 	ReportSource source,
 	Fn<void(ReportReason)> done);
 
 void ReportDetailsBox(
 	not_null<GenericBox*> box,
+	const style::ReportBox &st,
 	Fn<void(QString)> done);
 
 } // namespace Ui

From 22b6f27f7bc37a258c01fdbae998bc26ee04be5d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 13:23:50 +0400
Subject: [PATCH 319/676] Put changelog stories above premium stories.

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

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 1ebd7a1ed..8b27104f4 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -973,10 +973,12 @@ void Stories::removeDependencyStory(not_null<Story*> story) {
 void Stories::sort(StorySourcesList list) {
 	const auto index = static_cast<int>(list);
 	auto &sources = _sources[index];
-	const auto self = _owner->session().user()->id;
+	const auto self = _owner->session().userPeerId();
+	const auto changelogSenderId = UserData::kServiceNotificationsId;
 	const auto proj = [&](const StoriesSourceInfo &info) {
 		const auto key = int64(info.last)
-			+ (info.premium ? (int64(1) << 48) : 0)
+			+ (info.premium ? (int64(1) << 47) : 0)
+			+ ((info.id == changelogSenderId) ? (int64(1) << 47) : 0)
 			+ (info.unread ? (int64(1) << 49) : 0)
 			+ ((info.id == self) ? (int64(1) << 50) : 0);
 		return std::make_pair(key, info.id);

From 1b581a1597a6e7ba3144ac0ea6f47b0fca52963e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 16:04:53 +0400
Subject: [PATCH 320/676] Support story link previews.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/apiwrap.cpp              |  2 +-
 .../SourceFiles/data/data_media_types.cpp     | 13 +++--
 Telegram/SourceFiles/data/data_session.cpp    | 51 +++++++++++++++++--
 Telegram/SourceFiles/data/data_session.h      |  1 +
 Telegram/SourceFiles/data/data_stories.cpp    | 11 ++++
 Telegram/SourceFiles/data/data_stories.h      |  1 +
 Telegram/SourceFiles/data/data_web_page.cpp   |  5 ++
 Telegram/SourceFiles/data/data_web_page.h     |  3 ++
 .../history/view/history_view_view_button.cpp |  4 ++
 .../view/media/history_view_web_page.cpp      |  1 +
 11 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 091cf0610..a562c678a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3702,6 +3702,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_view_button_background" = "View background";
 "lng_view_button_theme" = "View theme";
 "lng_view_button_message" = "View message";
+"lng_view_button_story" = "View story";
 "lng_view_button_voice_chat" = "Voice chat";
 "lng_view_button_voice_chat_channel" = "Live stream";
 "lng_view_button_request_join" = "Request to Join";
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index ea70c516b..c906e9c1e 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -779,7 +779,7 @@ QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
 	const auto fallback = [&] {
 		const auto base = user->username();
 		const auto story = QString::number(storyId.story);
-		const auto query = base + "/s" + story;
+		const auto query = base + "/s/" + story;
 		return session().createInternalLinkFull(query);
 	};
 	const auto i = _unlikelyStoryLinks.find(storyId);
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 8cdaebc25..9e55643b0 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1982,11 +1982,16 @@ MediaStory::MediaStory(not_null<HistoryItem*> parent, FullStoryId storyId)
 : Media(parent)
 , _storyId(storyId) {
 	const auto stories = &parent->history()->owner().stories();
-	const auto maybeStory = stories->lookup(storyId);
-	if (!maybeStory) {
+	if (const auto maybeStory = stories->lookup(storyId)) {
+		parent->setText((*maybeStory)->caption());
+	} else {
 		if (maybeStory.error() == NoStory::Unknown) {
 			stories->resolve(storyId, crl::guard(this, [=] {
-				_expired = !stories->lookup(storyId);
+				if (const auto maybeStory = stories->lookup(storyId)) {
+					parent->setText((*maybeStory)->caption());
+				} else {
+					_expired = true;
+				}
 				parent->history()->owner().requestItemViewRefresh(parent);
 			}));
 		} else {
@@ -2052,6 +2057,7 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
 	if (!maybeStory) {
+		realParent->setText(TextWithEntities());
 		if (maybeStory.error() == Data::NoStory::Deleted) {
 			_expired = true;
 			return nullptr;
@@ -2065,6 +2071,7 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	}
 	_expired = false;
 	const auto story = *maybeStory;
+	realParent->setText(story->caption());
 	if (const auto photo = story->photo()) {
 		return std::make_unique<HistoryView::Photo>(
 			message,
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index ebc7ef8ee..2023c9b67 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3215,6 +3215,7 @@ not_null<WebPageData*> Session::processWebpage(const MTPDwebPagePending &data) {
 		QString(),
 		QString(),
 		TextWithEntities(),
+		FullStoryId(),
 		nullptr,
 		nullptr,
 		WebPageCollage(),
@@ -3269,6 +3270,7 @@ not_null<WebPageData*> Session::webpage(
 		siteName,
 		title,
 		description,
+		FullStoryId(),
 		photo,
 		document,
 		std::move(collage),
@@ -3321,16 +3323,55 @@ void Session::webpageApplyFields(
 		}
 		return nullptr;
 	};
+	auto story = (Data::Story*)nullptr;
+	auto storyId = FullStoryId();
+	if (const auto attributes = data.vattributes()) {
+		for (const auto &attribute : attributes->v) {
+			attribute.match([&](const MTPDwebPageAttributeStory &data) {
+				storyId = FullStoryId{
+					peerFromUser(data.vuser_id()),
+					data.vid().v,
+				};
+				if (const auto embed = data.vstory()) {
+					story = stories().applyFromWebpage(
+						peerFromUser(data.vuser_id()),
+						*embed);
+				} else if (const auto maybe = stories().lookup(storyId)) {
+					story = *maybe;
+				} else if (maybe.error() == Data::NoStory::Unknown) {
+					stories().resolve(storyId, [=] {
+						if (const auto maybe = stories().lookup(storyId)) {
+							const auto story = *maybe;
+							page->document = story->document();
+							page->photo = story->photo();
+							page->description = story->caption();
+							page->type = WebPageType::Story;
+							notifyWebPageUpdateDelayed(page);
+						}
+					});
+				}
+			}, [](const auto &) {});
+		}
+	}
 	webpageApplyFields(
 		page,
-		ParseWebPageType(data),
+		(story ? WebPageType::Story : ParseWebPageType(data)),
 		qs(data.vurl()),
 		qs(data.vdisplay_url()),
 		siteName,
 		qs(data.vtitle().value_or_empty()),
-		description,
-		photo ? processPhoto(*photo).get() : nullptr,
-		document ? processDocument(*document).get() : lookupThemeDocument(),
+		(story ? story->caption() : description),
+		storyId,
+		(story
+			? story->photo()
+			: photo
+			? processPhoto(*photo).get()
+			: nullptr),
+		(story
+			? story->document()
+			: document
+			? processDocument(*document).get()
+			: lookupThemeDocument()),
 		WebPageCollage(this, data),
 		data.vduration().value_or_empty(),
 		qs(data.vauthor().value_or_empty()),
@@ -3345,6 +3386,7 @@ void Session::webpageApplyFields(
 		const QString &siteName,
 		const QString &title,
 		const TextWithEntities &description,
+		FullStoryId storyId,
 		PhotoData *photo,
 		DocumentData *document,
 		WebPageCollage &&collage,
@@ -3359,6 +3401,7 @@ void Session::webpageApplyFields(
 		siteName,
 		title,
 		description,
+		storyId,
 		photo,
 		document,
 		std::move(collage),
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 154b1b73f..c287713d3 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -811,6 +811,7 @@ private:
 		const QString &siteName,
 		const QString &title,
 		const TextWithEntities &description,
+		FullStoryId storyId,
 		PhotoData *photo,
 		DocumentData *document,
 		WebPageCollage &&collage,
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 8b27104f4..8ac462e05 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -455,6 +455,17 @@ void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
 	}
 }
 
+Story *Stories::applyFromWebpage(PeerId peerId, const MTPstoryItem &story) {
+	const auto idDates = parseAndApply(
+		_owner->peer(peerId),
+		story,
+		base::unixtime::now());
+	const auto value = idDates
+		? lookup({ peerId, idDates.id })
+		: base::make_unexpected(NoStory::Deleted);
+	return value ? value->get() : nullptr;
+}
+
 void Stories::requestUserStories(not_null<UserData*> user) {
 	if (!_requestingUserStories.emplace(user).second) {
 		return;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 3199ff82f..2cd0dcccf 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -244,6 +244,7 @@ public:
 	void loadMore(StorySourcesList list);
 	void apply(const MTPDupdateStory &data);
 	void apply(not_null<PeerData*> peer, const MTPUserStories *data);
+	Story *applyFromWebpage(PeerId peerId, const MTPstoryItem &story);
 	void loadAround(FullStoryId id, StoriesContext context);
 
 	const StoriesSource *source(PeerId id) const;
diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp
index 57b31d0f6..4a7b036e3 100644
--- a/Telegram/SourceFiles/data/data_web_page.cpp
+++ b/Telegram/SourceFiles/data/data_web_page.cpp
@@ -152,6 +152,8 @@ WebPageType ParseWebPageType(
 		return WebPageType::WallPaper;
 	} else if (type == u"telegram_theme"_q) {
 		return WebPageType::Theme;
+	} else if (type == u"telegram_story"_q) {
+		return WebPageType::Story;
 	} else if (type == u"telegram_channel"_q) {
 		return WebPageType::Channel;
 	} else if (type == u"telegram_channel_request"_q) {
@@ -214,6 +216,7 @@ bool WebPageData::applyChanges(
 		const QString &newSiteName,
 		const QString &newTitle,
 		const TextWithEntities &newDescription,
+		FullStoryId newStoryId,
 		PhotoData *newPhoto,
 		DocumentData *newDocument,
 		WebPageCollage &&newCollage,
@@ -254,6 +257,7 @@ bool WebPageData::applyChanges(
 		&& siteName == resultSiteName
 		&& title == resultTitle
 		&& description.text == newDescription.text
+		&& storyId == newStoryId
 		&& photo == newPhoto
 		&& document == newDocument
 		&& collage.items == newCollage.items
@@ -271,6 +275,7 @@ bool WebPageData::applyChanges(
 	siteName = resultSiteName;
 	title = resultTitle;
 	description = newDescription;
+	storyId = newStoryId;
 	photo = newPhoto;
 	document = newDocument;
 	collage = std::move(newCollage);
diff --git a/Telegram/SourceFiles/data/data_web_page.h b/Telegram/SourceFiles/data/data_web_page.h
index 8481a7b3b..83e7bde80 100644
--- a/Telegram/SourceFiles/data/data_web_page.h
+++ b/Telegram/SourceFiles/data/data_web_page.h
@@ -35,6 +35,7 @@ enum class WebPageType {
 
 	WallPaper,
 	Theme,
+	Story,
 
 	Article,
 	ArticleWithIV,
@@ -70,6 +71,7 @@ struct WebPageData {
 		const QString &newSiteName,
 		const QString &newTitle,
 		const TextWithEntities &newDescription,
+		FullStoryId newStoryId,
 		PhotoData *newPhoto,
 		DocumentData *newDocument,
 		WebPageCollage &&newCollage,
@@ -89,6 +91,7 @@ struct WebPageData {
 	QString siteName;
 	QString title;
 	TextWithEntities description;
+	FullStoryId storyId;
 	int duration = 0;
 	QString author;
 	PhotoData *photo = nullptr;
diff --git a/Telegram/SourceFiles/history/view/history_view_view_button.cpp b/Telegram/SourceFiles/history/view/history_view_view_button.cpp
index 1a2db4d6b..d7d406f4b 100644
--- a/Telegram/SourceFiles/history/view/history_view_view_button.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_view_button.cpp
@@ -52,6 +52,8 @@ inline auto WebPageToPhrase(not_null<WebPageData*> webpage) {
 	const auto type = webpage->type;
 	return Ui::Text::Upper((type == WebPageType::Theme)
 		? tr::lng_view_button_theme(tr::now)
+		: (type == WebPageType::Story)
+		? tr::lng_view_button_story(tr::now)
 		: (type == WebPageType::Message)
 		? tr::lng_view_button_message(tr::now)
 		: (type == WebPageType::Group)
@@ -139,6 +141,8 @@ bool ViewButton::MediaHasViewButton(
 		|| ((type == WebPageType::Theme)
 			&& webpage->document
 			&& webpage->document->isTheme())
+		|| ((type == WebPageType::Story)
+			&& (webpage->photo || webpage->document))
 		|| ((type == WebPageType::WallPaper)
 			&& webpage->document
 			&& webpage->document->isWallPaper());
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 3b909485f..cec353017 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -168,6 +168,7 @@ QSize WebPage::countOptimalSize() {
 		&& _data->photo
 		&& _data->type != WebPageType::Photo
 		&& _data->type != WebPageType::Document
+		&& _data->type != WebPageType::Story
 		&& _data->type != WebPageType::Video) {
 		if (_data->type == WebPageType::Profile) {
 			_asArticle = true;

From 859636ff9c0dfa2b5ce2073dd61e7b1bff4ac7ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 18:46:06 +0400
Subject: [PATCH 321/676] Show "Expired story" in the reply bar.

---
 Telegram/Resources/langs/lang.strings          |  1 +
 Telegram/SourceFiles/data/data_media_types.cpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index a562c678a..281718c8f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1980,6 +1980,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
 "lng_in_dlg_poll" = "Poll";
 "lng_in_dlg_story" = "Story";
+"lng_in_dlg_story_expired" = "Expired story";
 "lng_in_dlg_media_count#one" = "{count} media";
 "lng_in_dlg_media_count#other" = "{count} media";
 "lng_in_dlg_photo_count#one" = "{count} photo";
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 9e55643b0..1a80583c8 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -2016,7 +2016,11 @@ TextWithEntities MediaStory::notificationText() const {
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
 	return WithCaptionNotificationText(
-		tr::lng_in_dlg_story(tr::now),
+		((_expired
+			|| (!maybeStory
+				&& maybeStory.error() == Data::NoStory::Deleted))
+			? tr::lng_in_dlg_story_expired
+			: tr::lng_in_dlg_story)(tr::now),
 		(maybeStory
 			? (*maybeStory)->caption()
 			: TextWithEntities()));
@@ -2028,7 +2032,9 @@ QString MediaStory::pinnedTextSubstring() const {
 
 TextForMimeData MediaStory::clipboardText() const {
 	return WithCaptionClipboardText(
-		tr::lng_in_dlg_story(tr::now),
+		(_expired
+			? tr::lng_in_dlg_story_expired
+			: tr::lng_in_dlg_story)(tr::now),
 		parent()->clipboardText());
 }
 

From 7ad5520b82d0447cb97cea66e2e612c8315bf76f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 19:36:40 +0400
Subject: [PATCH 322/676] Support external links sponsored messages.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../data/data_sponsored_messages.cpp          | 51 +++++++++++++------
 .../data/data_sponsored_messages.h            |  3 ++
 Telegram/SourceFiles/history/history_item.cpp |  4 +-
 .../history/history_item_components.h         |  1 +
 .../history/view/history_view_view_button.cpp | 20 +++++++-
 6 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 281718c8f..425dc2843 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3707,6 +3707,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_view_button_voice_chat" = "Voice chat";
 "lng_view_button_voice_chat_channel" = "Live stream";
 "lng_view_button_request_join" = "Request to Join";
+"lng_view_button_external_link" = "Open link";
 
 "lng_sponsored_hide_ads" = "Hide";
 "lng_sponsored_title" = "What are sponsored messages?";
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index 9f4f992ed..c586b219e 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -270,28 +270,45 @@ void SponsoredMessages::append(
 			.isForceUserpicDisplay = data.is_show_peer_photo(),
 		};
 	};
+	const auto externalLink = data.vwebpage()
+		? qs(data.vwebpage()->data().vurl())
+		: QString();
+	const auto userpicFromPhoto = [&](const MTPphoto &photo) {
+		return photo.match([&](const MTPDphoto &data) {
+			for (const auto &size : data.vsizes().v) {
+				const auto result = Images::FromPhotoSize(
+					_session,
+					data,
+					size);
+				if (result.location.valid()) {
+					return result;
+				}
+			}
+			return ImageWithLocation{};
+		}, [](const MTPDphotoEmpty &) {
+			return ImageWithLocation{};
+		});
+	};
 	const auto from = [&]() -> SponsoredFrom {
-		if (data.vfrom_id()) {
+		if (const auto webpage = data.vwebpage()) {
+			const auto &data = webpage->data();
+			auto userpic = data.vphoto()
+				? userpicFromPhoto(*data.vphoto())
+				: ImageWithLocation{};
+			return SponsoredFrom{
+				.title = qs(data.vsite_name()),
+				.isExternalLink = true,
+				.userpic = std::move(userpic),
+				.isForceUserpicDisplay = message.data().is_show_peer_photo(),
+			};
+		} else if (const auto fromId = data.vfrom_id()) {
 			return makeFrom(
-				_session->data().peer(peerFromMTP(*data.vfrom_id())),
+				_session->data().peer(peerFromMTP(*fromId)),
 				(data.vchannel_post() != nullptr));
 		}
 		Assert(data.vchat_invite());
 		return data.vchat_invite()->match([&](const MTPDchatInvite &data) {
-			auto userpic = data.vphoto().match([&](const MTPDphoto &data) {
-				for (const auto &size : data.vsizes().v) {
-					const auto result = Images::FromPhotoSize(
-						_session,
-						data,
-						size);
-					if (result.location.valid()) {
-						return result;
-					}
-				}
-				return ImageWithLocation{};
-			}, [](const MTPDphotoEmpty &) {
-				return ImageWithLocation{};
-			});
+			auto userpic = userpicFromPhoto(data.vphoto());
 			return SponsoredFrom{
 				.title = qs(data.vtitle()),
 				.isBroadcast = data.is_broadcast(),
@@ -336,6 +353,7 @@ void SponsoredMessages::append(
 		.history = history,
 		.msgId = data.vchannel_post().value_or_empty(),
 		.chatInviteHash = hash,
+		.externalLink = externalLink,
 		.sponsorInfo = std::move(sponsorInfo),
 		.additionalInfo = std::move(additionalInfo),
 	};
@@ -423,6 +441,7 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 		.peer = data.from.peer,
 		.msgId = data.msgId,
 		.info = std::move(info),
+		.externalLink = data.externalLink,
 	};
 }
 
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/data_sponsored_messages.h
index 7abbe2ea3..9c309ade3 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.h
@@ -31,6 +31,7 @@ struct SponsoredFrom {
 	bool isBot = false;
 	bool isExactPost = false;
 	bool isRecommended = false;
+	bool isExternalLink = false;
 	ImageWithLocation userpic;
 	bool isForceUserpicDisplay = false;
 };
@@ -42,6 +43,7 @@ struct SponsoredMessage {
 	History *history = nullptr;
 	MsgId msgId;
 	QString chatInviteHash;
+	QString externalLink;
 	TextWithEntities sponsorInfo;
 	TextWithEntities additionalInfo;
 };
@@ -58,6 +60,7 @@ public:
 		PeerData *peer = nullptr;
 		MsgId msgId;
 		std::vector<TextWithEntities> info;
+		QString externalLink;
 	};
 	using RandomId = QByteArray;
 	explicit SponsoredMessages(not_null<Session*> owner);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index e2bee8c06..039a7bc8d 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -3201,7 +3201,9 @@ void HistoryItem::setSponsoredFrom(const Data::SponsoredFrom &from) {
 	}
 
 	using Type = HistoryMessageSponsored::Type;
-	sponsored->type = from.isExactPost
+	sponsored->type = from.isExternalLink
+		? Type::ExternalLink
+		: from.isExactPost
 		? Type::Post
 		: from.isBot
 		? Type::Bot
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 57d38514e..5a8db07c9 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -139,6 +139,7 @@ struct HistoryMessageSponsored : public RuntimeComponent<HistoryMessageSponsored
 		Broadcast,
 		Post,
 		Bot,
+		ExternalLink,
 	};
 	std::unique_ptr<HiddenSenderInfo> sender;
 	Type type = Type::User;
diff --git a/Telegram/SourceFiles/history/view/history_view_view_button.cpp b/Telegram/SourceFiles/history/view/history_view_view_button.cpp
index d7d406f4b..71b258ed9 100644
--- a/Telegram/SourceFiles/history/view/history_view_view_button.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_view_button.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_chat_invite.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
+#include "core/file_utilities.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_session.h"
 #include "data/data_sponsored_messages.h"
@@ -42,6 +43,8 @@ inline auto SponsoredPhrase(SponsoredType type) {
 		case SponsoredType::Broadcast: return tr::lng_view_button_channel;
 		case SponsoredType::Post: return tr::lng_view_button_message;
 		case SponsoredType::Bot: return tr::lng_view_button_bot;
+		case SponsoredType::ExternalLink:
+			return tr::lng_view_button_external_link;
 		}
 		Unexpected("SponsoredType in SponsoredPhrase.");
 	}();
@@ -115,6 +118,7 @@ struct ViewButton::Inner {
 	const ClickHandlerPtr link;
 	const Fn<void()> updateCallback;
 	bool belowInfo = true;
+	bool externalLink = false;
 	int lastWidth = 0;
 	QPoint lastPoint;
 	std::unique_ptr<Ui::RippleAnimation> ripple;
@@ -158,7 +162,9 @@ ViewButton::Inner::Inner(
 		const auto &data = controller->session().data();
 		const auto itemId = my.itemId;
 		const auto details = data.sponsoredMessages().lookupDetails(itemId);
-		if (details.hash) {
+		if (!details.externalLink.isEmpty()) {
+			File::OpenUrl(details.externalLink);
+		} else if (details.hash) {
 			Api::CheckChatInvite(controller, *details.hash);
 		} else if (details.peer) {
 			controller->showPeerHistory(
@@ -169,6 +175,7 @@ ViewButton::Inner::Inner(
 	}
 }))
 , updateCallback(std::move(updateCallback))
+, externalLink(sponsored->type == SponsoredType::ExternalLink)
 , text(st::historyViewButtonTextStyle, SponsoredPhrase(sponsored->type)) {
 }
 
@@ -260,6 +267,17 @@ void ViewButton::draw(
 			r.width(),
 			1,
 			style::al_center);
+
+		if (_inner->externalLink) {
+			const auto &icon = st::msgBotKbUrlIcon;
+			const auto padding = st::msgBotKbIconPadding;
+			icon.paint(
+				p,
+				r.left() + r.width() - icon.width() - padding,
+				r.top() + padding,
+				r.width(),
+				stm->fwdTextPalette.linkFg->c);
+		}
 	}
 	p.restore();
 	if (_inner->lastWidth != r.width()) {

From 3c44cf0251c37bd24fa2ab2de005473e5c4d3c10 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 20:05:58 +0400
Subject: [PATCH 323/676] Track all sponsored messages clicks.

---
 Telegram/SourceFiles/core/ui_integration.cpp       | 12 ++++++++++++
 Telegram/SourceFiles/core/ui_integration.h         |  3 +++
 .../SourceFiles/data/data_sponsored_messages.cpp   | 14 ++++++++++++++
 .../SourceFiles/data/data_sponsored_messages.h     |  1 +
 .../history/view/history_view_element.cpp          |  5 ++++-
 Telegram/lib_ui                                    |  2 +-
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index d0d7580cc..e7351e8fd 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/click_handler_types.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_session.h"
+#include "data/data_sponsored_messages.h"
 #include "ui/text/text_custom_emoji.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/emoji_config.h"
@@ -26,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_app_config.h"
 #include "mtproto/mtproto_config.h"
 #include "window/window_controller.h"
+#include "window/window_session_controller.h"
 #include "mainwindow.h"
 
 namespace Core {
@@ -264,6 +266,16 @@ Fn<void()> UiIntegration::createSpoilerRepaint(const std::any &context) {
 	return my ? my->customEmojiRepaint : nullptr;
 }
 
+bool UiIntegration::allowClickHandlerActivation(
+		const std::shared_ptr<ClickHandler> &handler,
+		const ClickContext &context) {
+	const auto my = context.other.value<ClickHandlerContext>();
+	if (const auto window = my.sessionWindow.get()) {
+		window->session().data().sponsoredMessages().clicked(my.itemId);
+	}
+	return true;
+}
+
 rpl::producer<> UiIntegration::forcePopupMenuHideRequests() {
 	return Core::App().passcodeLockChanges() | rpl::to_empty;
 }
diff --git a/Telegram/SourceFiles/core/ui_integration.h b/Telegram/SourceFiles/core/ui_integration.h
index a71c9cfbe..65661ecfd 100644
--- a/Telegram/SourceFiles/core/ui_integration.h
+++ b/Telegram/SourceFiles/core/ui_integration.h
@@ -60,6 +60,9 @@ public:
 		const QString &data,
 		const std::any &context) override;
 	Fn<void()> createSpoilerRepaint(const std::any &context) override;
+	bool allowClickHandlerActivation(
+		const std::shared_ptr<ClickHandler> &handler,
+		const ClickContext &context) override;
 
 	QString phraseContextCopyText() override;
 	QString phraseContextCopyEmail() override;
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index c586b219e..bbf6273c5 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -445,6 +445,20 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 	};
 }
 
+void SponsoredMessages::clicked(const FullMsgId &fullId) {
+	const auto entryPtr = find(fullId);
+	if (!entryPtr) {
+		return;
+	}
+	const auto randomId = entryPtr->sponsored.randomId;
+	const auto channel = entryPtr->item->history()->peer->asChannel();
+	Assert(channel != nullptr);
+	_session->api().request(MTPchannels_ClickSponsoredMessage(
+		channel->inputChannel,
+		MTP_bytes(randomId)
+	)).send();
+}
+
 SponsoredMessages::State SponsoredMessages::state(
 		not_null<History*> history) const {
 	const auto it = _data.find(history);
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.h b/Telegram/SourceFiles/data/data_sponsored_messages.h
index 9c309ade3..e9cd46b45 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.h
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.h
@@ -72,6 +72,7 @@ public:
 	void request(not_null<History*> history, Fn<void()> done);
 	void clearItems(not_null<History*> history);
 	[[nodiscard]] Details lookupDetails(const FullMsgId &fullId) const;
+	void clicked(const FullMsgId &fullId);
 
 	[[nodiscard]] bool append(not_null<History*> history);
 	void inject(
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 763978823..6a3f78b8a 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/click_handler_types.h"
+#include "core/file_utilities.h"
 #include "core/ui_integration.h"
 #include "main/main_session.h"
 #include "main/main_domain.h"
@@ -992,7 +993,9 @@ ClickHandlerPtr Element::fromLink() const {
 				auto &sponsored = session->data().sponsoredMessages();
 				const auto itemId = my.itemId ? my.itemId : item->fullId();
 				const auto details = sponsored.lookupDetails(itemId);
-				if (const auto &hash = details.hash) {
+				if (!details.externalLink.isEmpty()) {
+					File::OpenUrl(details.externalLink);
+				} else if (const auto &hash = details.hash) {
 					Api::CheckChatInvite(window, *hash);
 				} else if (const auto peer = details.peer) {
 					window->showPeerInfo(peer);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 8a5604880..fc8d4d25d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 8a560488011f833b7ba534999f878d20d5152e6c
+Subproject commit fc8d4d25dee6e3ded99749c06fd870e6df4615f8

From 01837905185baf4ce764083d39c6522625154de8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 20:39:57 +0400
Subject: [PATCH 324/676] Improve archive / unarchive story toast.

---
 Telegram/Resources/langs/lang.strings      |  4 ++--
 Telegram/SourceFiles/data/data_stories.cpp | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 425dc2843..f0dddd290 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3826,8 +3826,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_title" = "Stories Archive";
 "lng_stories_archive_about" = "Only you can see archived stories unless you choose to save them to your profile.";
 "lng_stories_reply_sent" = "Message Sent";
-"lng_stories_hidden_to_contacts" = "Those stories are now shown only in your Contacts list.";
-"lng_stories_shown_in_chats" = "Those stories are now shown in your Chats list.";
+"lng_stories_hidden_to_contacts" = "Stories from {user} will now be shown in Contacts, not Chats.";
+"lng_stories_shown_in_chats" = "Stories from {user} will now be shown in Chats, not Contacts.";
 "lng_stories_delete_one_sure" = "Are you sure you want to delete this story?";
 "lng_stories_delete_sure#one" = "Are you sure you want to delete {count} story?";
 "lng_stories_delete_sure#other" = "Are you sure you want to delete {count} stories?";
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 8ac462e05..30d7fbc8f 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1197,11 +1197,17 @@ void Stories::toggleHidden(
 		)).send();
 	}
 
+	const auto name = user->shortName();
 	const auto guard = gsl::finally([&] {
 		if (show) {
-			show->showToast(hidden
-				? tr::lng_stories_hidden_to_contacts(tr::now)
-				: tr::lng_stories_shown_in_chats(tr::now));
+			const auto phrase = hidden
+				? tr::lng_stories_hidden_to_contacts
+				: tr::lng_stories_shown_in_chats;
+			show->showToast(phrase(
+				tr::now,
+				lt_user,
+				Ui::Text::Bold(name),
+				Ui::Text::WithEntities));
 		}
 	});
 

From 6eaa192f515b1a81932e0e1c91cb5416d9facb59 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 21:10:08 +0400
Subject: [PATCH 325/676] Don't allow reply to changelog stories.

---
 .../stories/media_stories_controller.cpp      | 33 +-----------
 .../media/stories/media_stories_reply.cpp     | 51 +++++++++++++++++--
 .../media/stories/media_stories_reply.h       |  3 ++
 3 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index bc7d0eaec..af4abbb4b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -96,7 +96,6 @@ private:
 
 	const not_null<Controller*> _controller;
 	std::unique_ptr<Ui::RpWidget> _bg;
-	std::unique_ptr<Ui::RpWidget> _reply;
 	std::unique_ptr<Ui::FlatLabel> _text;
 	std::unique_ptr<Ui::RoundButton> _button;
 	Ui::RoundRect _bgRound;
@@ -172,32 +171,9 @@ void Controller::Unsupported::setup(not_null<UserData*> user) {
 		_bgRound.paint(p, _bg->rect());
 	}, _bg->lifetime());
 
-	if (!user->isSelf()) {
-		_reply = std::make_unique<Ui::RpWidget>(wrap);
-		_reply->show();
-		_reply->paintRequest() | rpl::start_with_next([=] {
-			auto p = QPainter(_reply.get());
-			_bgRound.paint(p, _reply->rect());
-
-			p.setPen(st::storiesComposeGrayText);
-			p.setFont(st::normalFont);
-			p.drawText(
-				_reply->rect(),
-				tr::lng_stories_cant_reply(tr::now),
-				style::al_center);
-		}, _reply->lifetime());
-	}
-
 	_controller->layoutValue(
 	) | rpl::start_with_next([=](const Layout &layout) {
 		_bg->setGeometry(layout.content);
-		if (_reply) {
-			const auto height = st::storiesComposeControls.attach.height;
-			const auto position = layout.controlsBottomPosition
-				- QPoint(0, height);
-			_reply->setGeometry(
-				{ position, QSize{ layout.controlsWidth, height } });
-		}
 	}, _bg->lifetime());
 
 	_text = std::make_unique<Ui::FlatLabel>(
@@ -1141,7 +1117,6 @@ void Controller::rebuildCachedSourcesList(
 	} else {
 		// All that go before the current push to front.
 		for (auto before = index; before > 0;) {
-			--before;
 			const auto peerId = lists[--before].id;
 			if (!ranges::contains(_cachedSourcesList, peerId)) {
 				_cachedSourcesList.insert(
@@ -1160,12 +1135,8 @@ void Controller::rebuildCachedSourcesList(
 	}
 
 	Ensures(_cachedSourcesList.size() == lists.size());
-	Ensures(ranges::equal(
-		lists,
-		_cachedSourcesList,
-		ranges::equal_to(),
-		&Data::StoriesSourceInfo::id));
-	Ensures(_cachedSourceIndex >= 0 && _cachedSourceIndex < _cachedSourcesList.size());
+	Ensures(_cachedSourceIndex >= 0
+		&& _cachedSourceIndex < _cachedSourcesList.size());
 }
 
 void Controller::refreshViewsFromData() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 2929d52c9..d032533b3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_account.h"
 #include "storage/storage_media_prepare.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/round_rect.h"
 #include "window/section_widget.h"
 #include "styles/style_boxes.h" // sendMediaPreviewSize.
 #include "styles/style_chat_helpers.h"
@@ -42,6 +43,35 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Media::Stories {
 
+class ReplyArea::Cant final : public Ui::RpWidget {
+public:
+	explicit Cant(not_null<QWidget*> parent);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	Ui::RoundRect _bg;
+
+};
+
+ReplyArea::Cant::Cant(not_null<QWidget*> parent)
+: RpWidget(parent)
+, _bg(st::storiesRadius, st::storiesComposeBg) {
+	show();
+}
+
+void ReplyArea::Cant::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	_bg.paint(p, rect());
+
+	p.setPen(st::storiesComposeGrayText);
+	p.setFont(st::normalFont);
+	p.drawText(
+		rect(),
+		tr::lng_stories_cant_reply(tr::now),
+		style::al_center);
+}
+
 ReplyArea::ReplyArea(not_null<Controller*> controller)
 : _controller(controller)
 , _controls(std::make_unique<HistoryView::ComposeControls>(
@@ -599,10 +629,25 @@ void ReplyArea::show(ReplyAreaData data) {
 		.history = history,
 	});
 	_controls->clear();
-	if (!user || user->isSelf()) {
-		_controls->hide();
-	} else {
+	const auto hidden = user && user->isSelf();
+	const auto cant = !user || user->isServiceUser();
+	if (!hidden && !cant) {
 		_controls->show();
+	} else {
+		_controls->hide();
+		if (cant) {
+			_cant = std::make_unique<Cant>(_controller->wrap());
+			_controller->layoutValue(
+			) | rpl::start_with_next([=](const Layout &layout) {
+				const auto height = st::storiesComposeControls.attach.height;
+				const auto position = layout.controlsBottomPosition
+					- QPoint(0, height);
+				_cant->setGeometry(
+					{ position, QSize{ layout.controlsWidth, height } });
+			}, _cant->lifetime());
+		} else {
+			_cant = nullptr;
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 5853ffc0e..eeaa54726 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -68,6 +68,8 @@ public:
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 
 private:
+	class Cant;
+
 	using VoiceToSend = HistoryView::Controls::VoiceToSend;
 
 	[[nodiscard]] Main::Session &session() const;
@@ -134,6 +136,7 @@ private:
 
 	const not_null<Controller*> _controller;
 	const std::unique_ptr<HistoryView::ComposeControls> _controls;
+	std::unique_ptr<Cant> _cant;
 
 	ReplyAreaData _data;
 	base::has_weak_ptr _shownUserGuard;

From e7ccf5d8ad8a9812c15bb0331776fb22edf47893 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Jun 2023 12:24:17 +0400
Subject: [PATCH 326/676] Fix possible std::clamp contract violation.

---
 .../media/streaming/media_streaming_utility.cpp            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
index 5b3ac86dd..fdfbe20f8 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
@@ -28,7 +28,12 @@ crl::time FramePosition(const Stream &stream) {
 		: (stream.decodedFrame->pts != AV_NOPTS_VALUE)
 		? stream.decodedFrame->pts
 		: stream.decodedFrame->pkt_dts;
-	return FFmpeg::PtsToTime(pts, stream.timeBase);
+	const auto result = FFmpeg::PtsToTime(pts, stream.timeBase);
+
+	// Sometimes the result here may be larger than the stream duration.
+	return (stream.duration == kDurationUnavailable)
+		? result
+		: std::min(result, stream.duration);
 }
 
 FFmpeg::AvErrorWrap ProcessPacket(Stream &stream, FFmpeg::Packet &&packet) {

From a57e9990b0c953117209983641ea22a7ba4a8bec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Jun 2023 12:24:32 +0400
Subject: [PATCH 327/676] Update API scheme on layer 160.

---
 Telegram/SourceFiles/apiwrap.cpp                   |  6 +++++-
 .../data/notify/data_notify_settings.cpp           | 12 ++++++++++--
 .../data/notify/data_peer_notify_settings.cpp      | 14 +++++++++++---
 Telegram/SourceFiles/mtproto/scheme/api.tl         |  8 ++++----
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index c906e9c1e..3b030e7a7 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -1830,7 +1830,11 @@ void ApiWrap::requestNotifySettings(const MTPInputNotifyPeer &peer) {
 				MTPNotificationSound(),
 				MTPNotificationSound(),
 				MTPNotificationSound(),
-				MTPBool()));
+				MTPBool(),
+				MTPBool(),
+				MTPNotificationSound(),
+				MTPNotificationSound(),
+				MTPNotificationSound()));
 		_notifySettingRequests.erase(key);
 	}).send();
 	_notifySettingRequests.emplace(key, requestId);
diff --git a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
index 3beba423d..1675d1e92 100644
--- a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
+++ b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
@@ -195,7 +195,11 @@ void NotifySettings::resetToDefault(not_null<Data::Thread*> thread) {
 		MTPNotificationSound(),
 		MTPNotificationSound(),
 		MTPNotificationSound(),
-		MTPBool());
+		MTPBool(),
+		MTPBool(),
+		MTPNotificationSound(),
+		MTPNotificationSound(),
+		MTPNotificationSound());
 	if (thread->notify().change(empty)) {
 		updateLocal(thread);
 		thread->session().api().updateNotifySettingsDelayed(thread);
@@ -227,7 +231,11 @@ void NotifySettings::resetToDefault(not_null<PeerData*> peer) {
 		MTPNotificationSound(),
 		MTPNotificationSound(),
 		MTPNotificationSound(),
-		MTPBool());
+		MTPBool(),
+		MTPBool(),
+		MTPNotificationSound(),
+		MTPNotificationSound(),
+		MTPNotificationSound());
 	if (peer->notify().change(empty)) {
 		updateLocal(peer);
 		peer->session().api().updateNotifySettingsDelayed(peer);
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
index da03d14f2..4b756a611 100644
--- a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
@@ -19,7 +19,9 @@ namespace {
 		MTPBool(),
 		MTPint(),
 		MTPNotificationSound(),
-		MTPBool());
+		MTPBool(),
+		MTPBool(),
+		MTPNotificationSound());
 }
 
 [[nodiscard]] NotifySound ParseSound(const MTPNotificationSound &sound) {
@@ -194,7 +196,9 @@ MTPinputPeerNotifySettings NotifyPeerSettingsValue::serialize() const {
 		MTP_bool(_silent.value_or(false)),
 		MTP_int(_mute.value_or(false)),
 		SerializeSound(_sound),
-		MTP_bool(_storiesMuted.value_or(false)));
+		MTP_bool(_storiesMuted.value_or(false)),
+		MTP_bool(false), // stories_hide_sender
+		SerializeSound(std::nullopt)); // stories_sound
 }
 
 PeerNotifySettings::PeerNotifySettings() = default;
@@ -245,7 +249,11 @@ bool PeerNotifySettings::change(
 		MTPNotificationSound(),
 		MTPNotificationSound(),
 		SerializeSound(sound),
-		storiesMuted ? MTP_bool(*storiesMuted) : MTPBool()));
+		storiesMuted ? MTP_bool(*storiesMuted) : MTPBool(),
+		MTPBool(), // stories_hide_sender
+		MTPNotificationSound(),
+		MTPNotificationSound(),
+		SerializeSound(std::nullopt))); // stories_sound
 }
 
 std::optional<TimeId> PeerNotifySettings::muteUntil() const {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 7509f2c0e..b9197b033 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -201,9 +201,9 @@ inputNotifyChats#4a95e84e = InputNotifyPeer;
 inputNotifyBroadcasts#b1db7c7e = InputNotifyPeer;
 inputNotifyForumTopic#5c467992 peer:InputPeer top_msg_id:int = InputNotifyPeer;
 
-inputPeerNotifySettings#e1e51e85 flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int sound:flags.3?NotificationSound stories_muted:flags.6?Bool = InputPeerNotifySettings;
+inputPeerNotifySettings#cacb6ae2 flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int sound:flags.3?NotificationSound stories_muted:flags.6?Bool stories_hide_sender:flags.7?Bool stories_sound:flags.8?NotificationSound = InputPeerNotifySettings;
 
-peerNotifySettings#6cdc6e52 flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int ios_sound:flags.3?NotificationSound android_sound:flags.4?NotificationSound other_sound:flags.5?NotificationSound stories_muted:flags.6?Bool = PeerNotifySettings;
+peerNotifySettings#99622c0c flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int ios_sound:flags.3?NotificationSound android_sound:flags.4?NotificationSound other_sound:flags.5?NotificationSound stories_muted:flags.6?Bool stories_hide_sender:flags.7?Bool stories_ios_sound:flags.8?NotificationSound stories_android_sound:flags.9?NotificationSound stories_other_sound:flags.10?NotificationSound = PeerNotifySettings;
 
 peerSettings#a518110d flags:# report_spam:flags.0?true add_contact:flags.1?true block_contact:flags.2?true share_contact:flags.3?true need_contacts_exception:flags.4?true report_geo:flags.5?true autoarchived:flags.7?true invite_members:flags.8?true request_chat_broadcast:flags.10?true geo_distance:flags.6?int request_chat_title:flags.9?string request_chat_date:flags.9?int = PeerSettings;
 
@@ -529,7 +529,7 @@ accountDaysTTL#b8d0afdf days:int = AccountDaysTTL;
 documentAttributeImageSize#6c37c15c w:int h:int = DocumentAttribute;
 documentAttributeAnimated#11b58939 = DocumentAttribute;
 documentAttributeSticker#6319d612 flags:# mask:flags.1?true alt:string stickerset:InputStickerSet mask_coords:flags.0?MaskCoords = DocumentAttribute;
-documentAttributeVideo#d38ff1c2 flags:# round_message:flags.0?true supports_streaming:flags.1?true duration:double w:int h:int preload_prefix_size:flags.2?int = DocumentAttribute;
+documentAttributeVideo#d38ff1c2 flags:# round_message:flags.0?true supports_streaming:flags.1?true nosound:flags.3?true duration:double w:int h:int preload_prefix_size:flags.2?int = DocumentAttribute;
 documentAttributeAudio#9852f9c6 flags:# voice:flags.10?true duration:int title:flags.0?string performer:flags.1?string waveform:flags.2?bytes = DocumentAttribute;
 documentAttributeFilename#15590068 file_name:string = DocumentAttribute;
 documentAttributeHasStickers#9801d2f7 = DocumentAttribute;
@@ -1632,7 +1632,7 @@ account.resendPasswordEmail#7a7f2a15 = Bool;
 account.cancelPasswordEmail#c1cbd5b6 = Bool;
 account.getContactSignUpNotification#9f07c728 = Bool;
 account.setContactSignUpNotification#cff43f61 silent:Bool = Bool;
-account.getNotifyExceptions#53577479 flags:# compare_sound:flags.1?true peer:flags.0?InputNotifyPeer = Updates;
+account.getNotifyExceptions#53577479 flags:# compare_sound:flags.1?true compare_stories:flags.2?true peer:flags.0?InputNotifyPeer = Updates;
 account.getWallPaper#fc8ddbea wallpaper:InputWallPaper = WallPaper;
 account.uploadWallPaper#e39a8f03 flags:# for_chat:flags.0?true file:InputFile mime_type:string settings:WallPaperSettings = WallPaper;
 account.saveWallPaper#6c5a5b37 wallpaper:InputWallPaper unsave:Bool settings:WallPaperSettings = Bool;

From 21543338d78833a26e842870c6461580d691fa86 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Jun 2023 16:44:02 +0400
Subject: [PATCH 328/676] On typing in messages selection focus input field.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp      | 3 +++
 Telegram/SourceFiles/history/history_widget.cpp            | 7 +++++++
 Telegram/SourceFiles/history/history_widget.h              | 2 ++
 .../view/controls/history_view_compose_controls.cpp        | 7 +++++++
 .../history/view/controls/history_view_compose_controls.h  | 1 +
 .../SourceFiles/history/view/history_view_list_widget.cpp  | 3 +++
 .../SourceFiles/history/view/history_view_list_widget.h    | 1 +
 .../history/view/history_view_pinned_section.cpp           | 3 +++
 .../SourceFiles/history/view/history_view_pinned_section.h | 1 +
 .../history/view/history_view_replies_section.cpp          | 4 ++++
 .../history/view/history_view_replies_section.h            | 1 +
 .../history/view/history_view_scheduled_section.cpp        | 4 ++++
 .../history/view/history_view_scheduled_section.h          | 1 +
 13 files changed, 38 insertions(+)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 36a1a29e6..857803c17 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2915,6 +2915,9 @@ void HistoryInner::keyPressEvent(QKeyEvent *e) {
 			&& selectedState.canDeleteCount == selectedState.count) {
 			_widget->confirmDeleteSelected();
 		}
+	} else if (!(e->modifiers() & ~Qt::ShiftModifier)
+		&& e->key() != Qt::Key_Shift) {
+		_widget->tryProcessKeyInput(e);
 	} else {
 		e->ignore();
 	}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index e99b55c85..aaa9733fe 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1803,6 +1803,13 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(
 	return false;
 }
 
+void HistoryWidget::tryProcessKeyInput(not_null<QKeyEvent*> e) {
+	if (_canSendTexts && _field->isVisible()) {
+		_field->setFocusFast();
+		QCoreApplication::sendEvent(_field->rawTextEdit(), e);
+	}
+}
+
 void HistoryWidget::setupShortcuts() {
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 46d8287b9..ae1f9bf54 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -280,6 +280,8 @@ public:
 
 	bool notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo);
 
+	void tryProcessKeyInput(not_null<QKeyEvent*> e);
+
 	~HistoryWidget();
 
 protected:
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 235091a00..089767c2c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2843,6 +2843,13 @@ bool ComposeControls::handleCancelRequest() {
 	return false;
 }
 
+void ComposeControls::tryProcessKeyInput(not_null<QKeyEvent*> e) {
+	if (_field->isVisible()) {
+		_field->setFocusFast();
+		QCoreApplication::sendEvent(_field->rawTextEdit(), e);
+	}
+}
+
 void ComposeControls::initWebpageProcess() {
 	if (!_history) {
 		_preview = nullptr;
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 f8c887593..fa63a8b3d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -200,6 +200,7 @@ public:
 	void cancelForward();
 
 	bool handleCancelRequest();
+	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
 	[[nodiscard]] TextWithTags getTextWithAppliedMarkdown() const;
 	[[nodiscard]] WebPageId webPageId() const;
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index f45f4f62b..9ca933844 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -2460,6 +2460,9 @@ void ListWidget::keyPressEvent(QKeyEvent *e) {
 #endif // Q_OS_MAC
 	} else if (e == QKeySequence::Delete) {
 		_delegate->listDeleteRequest();
+	} else if (!(e->modifiers() & ~Qt::ShiftModifier)
+		&& e->key() != Qt::Key_Shift) {
+		_delegate->listTryProcessKeyInput(e);
 	} else {
 		e->ignore();
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index ad3517723..704fb1685 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -93,6 +93,7 @@ public:
 	virtual bool listScrollTo(int top, bool syntetic = true) = 0;
 	virtual void listCancelRequest() = 0;
 	virtual void listDeleteRequest() = 0;
+	virtual void listTryProcessKeyInput(not_null<QKeyEvent*> e) = 0;
 	virtual rpl::producer<Data::MessagesSlice> listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 263d057ff..0fbaf0349 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -497,6 +497,9 @@ void PinnedWidget::listDeleteRequest() {
 	confirmDeleteSelected();
 }
 
+void PinnedWidget::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
+}
+
 rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index 1ee0a9b7d..7125a1f18 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -82,6 +82,7 @@ public:
 	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,
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 65c9e503a..7b878ec52 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -2383,6 +2383,10 @@ void RepliesWidget::listDeleteRequest() {
 	confirmDeleteSelected();
 }
 
+void RepliesWidget::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
+	_composeControls->tryProcessKeyInput(e);
+}
+
 rpl::producer<Data::MessagesSlice> RepliesWidget::listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index a8645a5c5..b048dca36 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -126,6 +126,7 @@ public:
 	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,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index ca5e7b8bd..602f46ae2 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1078,6 +1078,10 @@ void ScheduledWidget::listDeleteRequest() {
 	confirmDeleteSelected();
 }
 
+void ScheduledWidget::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
+	_composeControls->tryProcessKeyInput(e);
+}
+
 rpl::producer<Data::MessagesSlice> ScheduledWidget::listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index acbec32d8..2173d3dcc 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -104,6 +104,7 @@ public:
 	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,

From d567282430ad3bbc4c069729323a4283f51c98f8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Jun 2023 20:22:56 +0400
Subject: [PATCH 329/676] Preload stories in the sources lists.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../boxes/peer_list_controllers.cpp           |  17 +-
 Telegram/SourceFiles/data/data_document.cpp   |  22 +
 Telegram/SourceFiles/data/data_document.h     |   3 +
 .../SourceFiles/data/data_media_types.cpp     |   1 +
 .../SourceFiles/data/data_photo_media.cpp     |  14 +-
 Telegram/SourceFiles/data/data_photo_media.h  |   3 +-
 Telegram/SourceFiles/data/data_session.cpp    |   1 +
 Telegram/SourceFiles/data/data_stories.cpp    | 447 ++++++------------
 Telegram/SourceFiles/data/data_stories.h      | 139 +-----
 .../streaming/media_streaming_reader.cpp      |  39 +-
 .../media/streaming/media_streaming_reader.h  |   3 +
 .../window/window_session_controller.cpp      |  16 +-
 13 files changed, 264 insertions(+), 443 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 3a3d7e5a7..a4ac996e8 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -553,6 +553,8 @@ PRIVATE
     data/data_stories.h
     data/data_stories_ids.cpp
     data/data_stories_ids.h
+    data/data_story.cpp
+    data/data_story.h
     data/data_streaming.cpp
     data/data_streaming.h
     data/data_thread.cpp
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 1b62876ed..1e104b5a3 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -65,6 +65,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 			Mode mode = ContactsBoxController::SortMode::Online;
 		};
 
+		const auto stories = &sessionController->session().data().stories();
 		const auto state = box->lifetime().make_state<State>();
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 		box->addLeftButton(
@@ -80,17 +81,17 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		});
 		raw->setSortMode(Mode::Online);
 
-		auto stories = object_ptr<Stories::List>(
+		auto list = object_ptr<Stories::List>(
 			box,
 			st::dialogsStoriesList,
 			Stories::ContentForSession(
 				&sessionController->session(),
 				Data::StorySourcesList::Hidden),
 			[=] { return state->stories->height() - box->scrollTop(); });
-		const auto raw = state->stories = stories.data();
+		const auto raw = state->stories = list.data();
 		box->peerListSetAboveWidget(object_ptr<::Ui::PaddingWrap<>>(
 			box,
-			std::move(stories),
+			std::move(list),
 			style::margins(0, st::membersMarginTop, 0, 0)));
 
 		raw->clicks(
@@ -107,7 +108,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 
 		raw->toggleShown(
 		) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
-			sessionController->session().data().stories().toggleHidden(
+			stories->toggleHidden(
 				PeerId(int64(request.id)),
 				!request.shown,
 				sessionController->uiShow());
@@ -115,9 +116,13 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 
 		raw->loadMoreRequests(
 		) | rpl::start_with_next([=] {
-			sessionController->session().data().stories().loadMore(
-				Data::StorySourcesList::Hidden);
+			stories->loadMore(Data::StorySourcesList::Hidden);
 		}, raw->lifetime());
+
+		stories->incrementPreloadingHiddenSources();
+		raw->lifetime().add([=] {
+			stories->decrementPreloadingHiddenSources();
+		});
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(init));
 }
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 473b7027d..173cfbb91 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -335,6 +335,7 @@ void DocumentData::setattributes(
 
 	validateLottieSticker();
 
+	_videoPreloadPrefix = 0;
 	for (const auto &attribute : attributes) {
 		attribute.match([&](const MTPDdocumentAttributeImageSize &data) {
 			dimensions = QSize(data.vw().v, data.vh().v);
@@ -390,6 +391,10 @@ void DocumentData::setattributes(
 					: VideoDocument;
 				if (data.is_round_message()) {
 					_additional = std::make_unique<RoundData>();
+				} else if (const auto size = data.vpreload_prefix_size()) {
+					if (size->v > 0) {
+						_videoPreloadPrefix = size->v;
+					}
 				}
 			} else if (const auto info = sticker()) {
 				info->type = StickerType::Webm;
@@ -1334,6 +1339,23 @@ bool DocumentData::inappPlaybackFailed() const {
 	return (_flags & Flag::StreamingPlaybackFailed);
 }
 
+int DocumentData::videoPreloadPrefix() const {
+	return _videoPreloadPrefix;
+}
+
+StorageFileLocation DocumentData::videoPreloadLocation() const {
+	return hasRemoteLocation()
+		? StorageFileLocation(
+			_dc,
+			session().userId(),
+			MTP_inputDocumentFileLocation(
+				MTP_long(id),
+				MTP_long(_access),
+				MTP_bytes(_fileReference),
+				MTP_string()))
+		: StorageFileLocation();
+}
+
 auto DocumentData::createStreamingLoader(
 	Data::FileOrigin origin,
 	bool forceRemoteLoader) const
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index 617eb331c..ded87abfd 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -274,6 +274,8 @@ public:
 
 	void setInappPlaybackFailed();
 	[[nodiscard]] bool inappPlaybackFailed() const;
+	[[nodiscard]] int videoPreloadPrefix() const;
+	[[nodiscard]] StorageFileLocation videoPreloadLocation() const;
 
 	DocumentId id = 0;
 	int64 size = 0;
@@ -344,6 +346,7 @@ private:
 
 	const not_null<Data::Session*> _owner;
 
+	int _videoPreloadPrefix = 0;
 	// Two types of location: from MTProto by dc+access or from web by url
 	int32 _dc = 0;
 	uint64 _access = 0;
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 1a80583c8..79f99591d 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -57,6 +57,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_file_origin.h"
 #include "data/data_stories.h"
+#include "data/data_story.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "core/application.h"
diff --git a/Telegram/SourceFiles/data/data_photo_media.cpp b/Telegram/SourceFiles/data/data_photo_media.cpp
index 7bbdcdd1e..be713b4a9 100644
--- a/Telegram/SourceFiles/data/data_photo_media.cpp
+++ b/Telegram/SourceFiles/data/data_photo_media.cpp
@@ -166,14 +166,22 @@ bool PhotoMedia::autoLoadThumbnailAllowed(not_null<PeerData*> peer) const {
 }
 
 void PhotoMedia::automaticLoad(
-		Data::FileOrigin origin,
+		FileOrigin origin,
 		const HistoryItem *item) {
-	if (!item || loaded() || _owner->cancelled()) {
+	if (item) {
+		automaticLoad(origin, item->history()->peer);
+	}
+}
+
+void PhotoMedia::automaticLoad(
+		FileOrigin origin,
+		not_null<PeerData*> peer) {
+	if (loaded() || _owner->cancelled()) {
 		return;
 	}
 	const auto loadFromCloud = Data::AutoDownload::Should(
 		_owner->session().settings().autoDownload(),
-		item->history()->peer,
+		peer,
 		_owner);
 	_owner->load(
 		origin,
diff --git a/Telegram/SourceFiles/data/data_photo_media.h b/Telegram/SourceFiles/data/data_photo_media.h
index 7c5c34bd4..f9e3c7708 100644
--- a/Telegram/SourceFiles/data/data_photo_media.h
+++ b/Telegram/SourceFiles/data/data_photo_media.h
@@ -43,7 +43,8 @@ public:
 
 	[[nodiscard]] bool autoLoadThumbnailAllowed(
 		not_null<PeerData*> peer) const;
-	void automaticLoad(Data::FileOrigin origin, const HistoryItem *item);
+	void automaticLoad(FileOrigin origin, const HistoryItem *item);
+	void automaticLoad(FileOrigin origin, not_null<PeerData*> peer);
 
 	void collectLocalData(not_null<PhotoMedia*> local);
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 2023c9b67..6c3100d4d 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -67,6 +67,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum_icons.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_stories.h"
+#include "data/data_story.h"
 #include "data/data_streaming.h"
 #include "data/data_media_rotation.h"
 #include "data/data_histories.h"
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 30d7fbc8f..0c7586151 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -9,17 +9,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_report.h"
 #include "base/unixtime.h"
-#include "api/api_text_entities.h"
 #include "apiwrap.h"
 #include "core/application.h"
 #include "data/data_changes.h"
-#include "data/data_chat_participant_status.h"
 #include "data/data_document.h"
-#include "data/data_file_origin.h"
 #include "data/data_photo.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
-#include "data/data_thread.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
@@ -39,6 +35,8 @@ constexpr auto kArchiveFirstPerPage = 30;
 constexpr auto kArchivePerPage = 100;
 constexpr auto kSavedFirstPerPage = 30;
 constexpr auto kSavedPerPage = 100;
+constexpr auto kMaxPreloadSources = 10;
+constexpr auto kStillPreloadFromFirst = 3;
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -86,296 +84,12 @@ bool StoriesSource::unread() const {
 	return !ids.empty() && readTill < ids.back().id;
 }
 
-Story::Story(
-	StoryId id,
-	not_null<PeerData*> peer,
-	StoryMedia media,
-	TimeId date,
-	TimeId expires)
-: _id(id)
-, _peer(peer)
-, _media(std::move(media))
-, _date(date)
-, _expires(expires) {
-}
-
-Session &Story::owner() const {
-	return _peer->owner();
-}
-
-Main::Session &Story::session() const {
-	return _peer->session();
-}
-
-not_null<PeerData*> Story::peer() const {
-	return _peer;
-}
-
-StoryId Story::id() const {
-	return _id;
-}
-
-bool Story::mine() const {
-	return _peer->isSelf();
-}
-
-StoryIdDates Story::idDates() const {
-	return { _id, _date, _expires };
-}
-
-FullStoryId Story::fullId() const {
-	return { _peer->id, _id };
-}
-
-TimeId Story::date() const {
-	return _date;
-}
-
-TimeId Story::expires() const {
-	return _expires;
-}
-
-bool Story::expired(TimeId now) const {
-	return _expires <= (now ? now : base::unixtime::now());
-}
-
-bool Story::unsupported() const {
-	return v::is_null(_media.data);
-}
-
-const StoryMedia &Story::media() const {
-	return _media;
-}
-
-PhotoData *Story::photo() const {
-	const auto result = std::get_if<not_null<PhotoData*>>(&_media.data);
-	return result ? result->get() : nullptr;
-}
-
-DocumentData *Story::document() const {
-	const auto result = std::get_if<not_null<DocumentData*>>(&_media.data);
-	return result ? result->get() : nullptr;
-}
-
-bool Story::hasReplyPreview() const {
-	return v::match(_media.data, [](not_null<PhotoData*> photo) {
-		return !photo->isNull();
-	}, [](not_null<DocumentData*> document) {
-		return document->hasThumbnail();
-	}, [](v::null_t) {
-		return false;
-	});
-}
-
-Image *Story::replyPreview() const {
-	return v::match(_media.data, [&](not_null<PhotoData*> photo) {
-		return photo->getReplyPreview(
-			Data::FileOriginStory(_peer->id, _id),
-			_peer,
-			false);
-	}, [&](not_null<DocumentData*> document) {
-		return document->getReplyPreview(
-			Data::FileOriginStory(_peer->id, _id),
-			_peer,
-			false);
-	}, [](v::null_t) {
-		return (Image*)nullptr;
-	});
-}
-
-TextWithEntities Story::inReplyText() const {
-	const auto type = tr::lng_in_dlg_story(tr::now);
-	return _caption.text.isEmpty()
-		? Ui::Text::PlainLink(type)
-		: tr::lng_dialogs_text_media(
-			tr::now,
-			lt_media_part,
-			tr::lng_dialogs_text_media_wrapped(
-				tr::now,
-				lt_media,
-				Ui::Text::PlainLink(type),
-				Ui::Text::WithEntities),
-			lt_caption,
-			_caption,
-			Ui::Text::WithEntities);
-}
-
-void Story::setPinned(bool pinned) {
-	_pinned = pinned;
-}
-
-bool Story::pinned() const {
-	return _pinned;
-}
-
-void Story::setIsPublic(bool isPublic) {
-	_isPublic = isPublic;
-}
-
-bool Story::isPublic() const {
-	return _isPublic;
-}
-
-void Story::setCloseFriends(bool closeFriends) {
-	_closeFriends = closeFriends;
-}
-
-bool Story::closeFriends() const {
-	return _closeFriends;
-}
-
-bool Story::canDownload() const {
-	return _peer->isSelf();
-}
-
-bool Story::canShare() const {
-	return isPublic() && (pinned() || !expired());
-}
-
-bool Story::canDelete() const {
-	return _peer->isSelf();
-}
-
-bool Story::canReport() const {
-	return !_peer->isSelf();
-}
-
-bool Story::hasDirectLink() const {
-	if (!_isPublic || (!_pinned && expired())) {
-		return false;
+StoryIdDates StoriesSource::toOpen() const {
+	if (ids.empty()) {
+		return {};
 	}
-	const auto user = _peer->asUser();
-	return user && !user->username().isEmpty();
-}
-
-std::optional<QString> Story::errorTextForForward(
-		not_null<Thread*> to) const {
-	const auto peer = to->peer();
-	const auto holdsPhoto = v::is<not_null<PhotoData*>>(_media.data);
-	const auto first = holdsPhoto
-		? ChatRestriction::SendPhotos
-		: ChatRestriction::SendVideos;
-	const auto second = holdsPhoto
-		? ChatRestriction::SendVideos
-		: ChatRestriction::SendPhotos;
-	if (const auto error = Data::RestrictionError(peer, first)) {
-		return *error;
-	} else if (const auto error = Data::RestrictionError(peer, second)) {
-		return *error;
-	} else if (!Data::CanSend(to, first, false)
-		|| !Data::CanSend(to, second, false)) {
-		return tr::lng_forward_cant(tr::now);
-	}
-	return {};
-}
-
-void Story::setCaption(TextWithEntities &&caption) {
-	_caption = std::move(caption);
-}
-
-const TextWithEntities &Story::caption() const {
-	static const auto empty = TextWithEntities();
-	return unsupported() ? empty : _caption;
-}
-
-void Story::setViewsData(
-		std::vector<not_null<PeerData*>> recent,
-		int total) {
-	_recentViewers = std::move(recent);
-	_views = total;
-}
-
-const std::vector<not_null<PeerData*>> &Story::recentViewers() const {
-	return _recentViewers;
-}
-
-const std::vector<StoryView> &Story::viewsList() const {
-	return _viewsList;
-}
-
-int Story::views() const {
-	return _views;
-}
-
-void Story::applyViewsSlice(
-		const std::optional<StoryView> &offset,
-		const std::vector<StoryView> &slice,
-		int total) {
-	_views = total;
-	if (!offset) {
-		const auto i = _viewsList.empty()
-			? end(slice)
-			: ranges::find(slice, _viewsList.front());
-		const auto merge = (i != end(slice))
-			&& !ranges::contains(slice, _viewsList.back());
-		if (merge) {
-			_viewsList.insert(begin(_viewsList), begin(slice), i);
-		} else {
-			_viewsList = slice;
-		}
-	} else if (!slice.empty()) {
-		const auto i = ranges::find(_viewsList, *offset);
-		const auto merge = (i != end(_viewsList))
-			&& !ranges::contains(_viewsList, slice.back());
-		if (merge) {
-			const auto after = i + 1;
-			if (after == end(_viewsList)) {
-				_viewsList.insert(after, begin(slice), end(slice));
-			} else {
-				const auto j = ranges::find(slice, _viewsList.back());
-				if (j != end(slice)) {
-					_viewsList.insert(end(_viewsList), j + 1, end(slice));
-				}
-			}
-		}
-	}
-}
-
-bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
-	const auto pinned = data.is_pinned();
-	const auto isPublic = data.is_public();
-	const auto closeFriends = data.is_close_friends();
-	auto caption = TextWithEntities{
-		data.vcaption().value_or_empty(),
-		Api::EntitiesFromMTP(
-			&owner().session(),
-			data.ventities().value_or_empty()),
-	};
-	auto views = -1;
-	auto recent = std::vector<not_null<PeerData*>>();
-	if (!data.is_min()) {
-		if (const auto info = data.vviews()) {
-			views = info->data().vviews_count().v;
-			if (const auto list = info->data().vrecent_viewers()) {
-				recent.reserve(list->v.size());
-				auto &owner = _peer->owner();
-				for (const auto &id : list->v) {
-					recent.push_back(owner.peer(peerFromUser(id)));
-				}
-			}
-		}
-	}
-
-	const auto changed = (_media != media)
-		|| (_pinned != pinned)
-		|| (_isPublic != isPublic)
-		|| (_closeFriends != closeFriends)
-		|| (_caption != caption)
-		|| (views >= 0 && _views != views)
-		|| (_recentViewers != recent);
-	if (!changed) {
-		return false;
-	}
-	_media = std::move(media);
-	_pinned = pinned;
-	_isPublic = isPublic;
-	_closeFriends = closeFriends;
-	_caption = std::move(caption);
-	if (views >= 0) {
-		_views = views;
-	}
-	_recentViewers = std::move(recent);
-	return true;
+	const auto i = ids.lower_bound(StoryIdDates{ readTill + 1 });
+	return (i != end(ids)) ? *i : ids.front();
 }
 
 Stories::Stories(not_null<Session*> owner)
@@ -622,6 +336,7 @@ Story *Stories::parseAndApply(
 	if (i != end(stories)) {
 		const auto result = i->second.get();
 		const auto pinned = result->pinned();
+		const auto mediaChanged = (result->media() != *media);
 		if (result->applyChanges(*media, data)) {
 			if (result->pinned() != pinned) {
 				savedStateUpdated(result);
@@ -633,6 +348,16 @@ Story *Stories::parseAndApply(
 				item->applyChanges(result);
 			}
 		}
+		if (mediaChanged) {
+			const auto fullId = result->fullId();
+			_preloaded.remove(fullId);
+			if (_preloading && _preloading->id() == fullId) {
+				_preloading = nullptr;
+				rebuildPreloadSources(StorySourcesList::NotHidden);
+				rebuildPreloadSources(StorySourcesList::Hidden);
+				continuePreloading();
+			}
+		}
 		return result;
 	}
 	const auto result = stories.emplace(id, std::make_unique<Story>(
@@ -911,6 +636,9 @@ void Stories::applyDeleted(FullStoryId id) {
 					}
 				}
 			}
+			if (_preloading && _preloading->id() == id) {
+				preloadFinished();
+			}
 			if (i->second.empty()) {
 				_stories.erase(i);
 			}
@@ -996,6 +724,7 @@ void Stories::sort(StorySourcesList list) {
 	};
 	ranges::sort(sources, ranges::greater(), proj);
 	_sourcesChanged[index].fire({});
+	preloadSourcesChanged(list);
 }
 
 std::shared_ptr<HistoryItem> Stories::lookupItem(not_null<Story*> story) {
@@ -1225,6 +954,7 @@ void Stories::toggleHidden(
 		if (i != end(_sources[main])) {
 			_sources[main].erase(i);
 			_sourcesChanged[main].fire({});
+			preloadSourcesChanged(StorySourcesList::NotHidden);
 		}
 		const auto j = ranges::find(_sources[other], peerId, proj);
 		if (j == end(_sources[other])) {
@@ -1238,6 +968,7 @@ void Stories::toggleHidden(
 		if (i != end(_sources[other])) {
 			_sources[other].erase(i);
 			_sourcesChanged[other].fire({});
+			preloadSourcesChanged(StorySourcesList::Hidden);
 		}
 		const auto j = ranges::find(_sources[main], peerId, proj);
 		if (j == end(_sources[main])) {
@@ -1563,4 +1294,134 @@ bool Stories::isQuitPrevent() {
 	return true;
 }
 
+void Stories::incrementPreloadingHiddenSources() {
+	Expects(_preloadingHiddenSourcesCounter >= 0);
+
+	if (++_preloadingHiddenSourcesCounter == 1
+		&& rebuildPreloadSources(StorySourcesList::Hidden)) {
+		continuePreloading();
+	}
+}
+
+void Stories::decrementPreloadingHiddenSources() {
+	Expects(_preloadingHiddenSourcesCounter > 0);
+
+	if (!--_preloadingHiddenSourcesCounter
+		&& rebuildPreloadSources(StorySourcesList::Hidden)) {
+		continuePreloading();
+	}
+}
+
+void Stories::setPreloadingInViewer(std::vector<FullStoryId> ids) {
+	ids.erase(ranges::remove_if(ids, [&](FullStoryId id) {
+		return _preloaded.contains(id);
+	}), end(ids));
+	if (_toPreloadViewer != ids) {
+		_toPreloadViewer = std::move(ids);
+		continuePreloading();
+	}
+}
+
+void Stories::preloadSourcesChanged(StorySourcesList list) {
+	if (rebuildPreloadSources(list)) {
+		continuePreloading();
+	}
+}
+
+bool Stories::rebuildPreloadSources(StorySourcesList list) {
+	const auto index = static_cast<int>(list);
+	if (!_preloadingHiddenSourcesCounter
+		&& list == StorySourcesList::Hidden) {
+		return !base::take(_toPreloadSources[index]).empty();
+	}
+	auto now = std::vector<FullStoryId>();
+	auto processed = 0;
+	for (const auto &source : _sources[index]) {
+		const auto i = _all.find(source.id);
+		if (i != end(_all)) {
+			if (const auto id = i->second.toOpen().id) {
+				const auto fullId = FullStoryId{ source.id, id };
+				if (!_preloaded.contains(fullId)) {
+					now.push_back(fullId);
+				}
+			}
+		}
+		if (++processed >= kMaxPreloadSources) {
+			break;
+		}
+	}
+	if (now != _toPreloadSources[index]) {
+		_toPreloadSources[index] = std::move(now);
+		return true;
+	}
+	return false;
+}
+
+void Stories::continuePreloading() {
+	const auto now = _preloading ? _preloading->id() : FullStoryId();
+	if (now) {
+		if (shouldContinuePreload(now)) {
+			return;
+		}
+		_preloading = nullptr;
+	}
+	const auto id = nextPreloadId();
+	if (!id) {
+		return;
+	} else if (const auto maybeStory = lookup(id)) {
+		startPreloading(*maybeStory);
+	}
+}
+
+bool Stories::shouldContinuePreload(FullStoryId id) const {
+	const auto first = ranges::views::concat(
+		_toPreloadViewer,
+		_toPreloadSources[static_cast<int>(StorySourcesList::Hidden)],
+		_toPreloadSources[static_cast<int>(StorySourcesList::NotHidden)]
+	) | ranges::views::take(kStillPreloadFromFirst);
+	return ranges::contains(first, id);
+}
+
+FullStoryId Stories::nextPreloadId() const {
+	const auto hidden = static_cast<int>(StorySourcesList::Hidden);
+	const auto main = static_cast<int>(StorySourcesList::NotHidden);
+	const auto result = !_toPreloadViewer.empty()
+		? _toPreloadViewer.front()
+		: !_toPreloadSources[hidden].empty()
+		? _toPreloadSources[hidden].front()
+		: !_toPreloadSources[main].empty()
+		? _toPreloadSources[main].front()
+		: FullStoryId();
+
+	Ensures(!_preloaded.contains(result));
+	return result;
+}
+
+void Stories::startPreloading(not_null<Story*> story) {
+	Expects(!_preloaded.contains(story->fullId()));
+
+	const auto id = story->fullId();
+	_preloading = std::make_unique<StoryPreload>(story, [=] {
+		preloadFinished(true);
+	});
+}
+
+void Stories::preloadFinished(bool markAsPreloaded) {
+	Expects(_preloading != nullptr);
+
+	const auto id = base::take(_preloading)->id();
+	for (auto &sources : _toPreloadSources) {
+		sources.erase(ranges::remove(sources, id), end(sources));
+	}
+	_toPreloadViewer.erase(
+		ranges::remove(_toPreloadViewer, id),
+		end(_toPreloadViewer));
+	if (markAsPreloaded) {
+		_preloaded.emplace(id);
+	}
+	crl::on_main(this, [=] {
+		continuePreloading();
+	});
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 2cd0dcccf..80d4a9732 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -11,11 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/expected.h"
 #include "base/timer.h"
 #include "base/weak_ptr.h"
-
-class Image;
-class PhotoData;
-class DocumentData;
-enum class ChatRestriction;
+#include "data/data_story.h"
 
 namespace Main {
 class Session;
@@ -29,23 +25,10 @@ enum class ReportReason;
 namespace Data {
 
 class Session;
-class Thread;
-
-struct StoryIdDates {
-	StoryId id = 0;
-	TimeId date = 0;
-	TimeId expires = 0;
-
-	[[nodiscard]] bool valid() const {
-		return id != 0;
-	}
-	explicit operator bool() const {
-		return valid();
-	}
-
-	friend inline auto operator<=>(StoryIdDates, StoryIdDates) = default;
-	friend inline bool operator==(StoryIdDates, StoryIdDates) = default;
-};
+struct StoryView;
+struct StoryIdDates;
+class Story;
+class StoryPreload;
 
 struct StoriesIds {
 	base::flat_set<StoryId, std::greater<>> list;
@@ -55,98 +38,6 @@ struct StoriesIds {
 		const StoriesIds&) = default;
 };
 
-struct StoryMedia {
-	std::variant<
-		v::null_t,
-		not_null<PhotoData*>,
-		not_null<DocumentData*>> data;
-
-	friend inline bool operator==(StoryMedia, StoryMedia) = default;
-};
-
-struct StoryView {
-	not_null<PeerData*> peer;
-	TimeId date = 0;
-
-	friend inline bool operator==(StoryView, StoryView) = default;
-};
-
-class Story final {
-public:
-	Story(
-		StoryId id,
-		not_null<PeerData*> peer,
-		StoryMedia media,
-		TimeId date,
-		TimeId expires);
-
-	[[nodiscard]] Session &owner() const;
-	[[nodiscard]] Main::Session &session() const;
-	[[nodiscard]] not_null<PeerData*> peer() const;
-
-	[[nodiscard]] StoryId id() const;
-	[[nodiscard]] bool mine() const;
-	[[nodiscard]] StoryIdDates idDates() const;
-	[[nodiscard]] FullStoryId fullId() const;
-	[[nodiscard]] TimeId date() const;
-	[[nodiscard]] TimeId expires() const;
-	[[nodiscard]] bool unsupported() const;
-	[[nodiscard]] bool expired(TimeId now = 0) const;
-	[[nodiscard]] const StoryMedia &media() const;
-	[[nodiscard]] PhotoData *photo() const;
-	[[nodiscard]] DocumentData *document() const;
-
-	[[nodiscard]] bool hasReplyPreview() const;
-	[[nodiscard]] Image *replyPreview() const;
-	[[nodiscard]] TextWithEntities inReplyText() const;
-
-	void setPinned(bool pinned);
-	[[nodiscard]] bool pinned() const;
-	void setIsPublic(bool isPublic);
-	[[nodiscard]] bool isPublic() const;
-	void setCloseFriends(bool closeFriends);
-	[[nodiscard]] bool closeFriends() const;
-
-	[[nodiscard]] bool canDownload() const;
-	[[nodiscard]] bool canShare() const;
-	[[nodiscard]] bool canDelete() const;
-	[[nodiscard]] bool canReport() const;
-
-	[[nodiscard]] bool hasDirectLink() const;
-	[[nodiscard]] std::optional<QString> errorTextForForward(
-		not_null<Thread*> to) const;
-
-	void setCaption(TextWithEntities &&caption);
-	[[nodiscard]] const TextWithEntities &caption() const;
-
-	void setViewsData(std::vector<not_null<PeerData*>> recent, int total);
-	[[nodiscard]] auto recentViewers() const
-		-> const std::vector<not_null<PeerData*>> &;
-	[[nodiscard]] const std::vector<StoryView> &viewsList() const;
-	[[nodiscard]] int views() const;
-	void applyViewsSlice(
-		const std::optional<StoryView> &offset,
-		const std::vector<StoryView> &slice,
-		int total);
-
-	bool applyChanges(StoryMedia media, const MTPDstoryItem &data);
-
-private:
-	const StoryId _id = 0;
-	const not_null<PeerData*> _peer;
-	StoryMedia _media;
-	TextWithEntities _caption;
-	std::vector<not_null<PeerData*>> _recentViewers;
-	std::vector<StoryView> _viewsList;
-	int _views = 0;
-	const TimeId _date = 0;
-	const TimeId _expires = 0;
-	bool _pinned : 1 = false;
-	bool _isPublic : 1 = false;
-	bool _closeFriends : 1 = false;
-
-};
-
 struct StoriesSourceInfo {
 	PeerId id = 0;
 	TimeId last = 0;
@@ -167,6 +58,7 @@ struct StoriesSource {
 
 	[[nodiscard]] StoriesSourceInfo info() const;
 	[[nodiscard]] bool unread() const;
+	[[nodiscard]] StoryIdDates toOpen() const;
 
 	friend inline bool operator==(StoriesSource, StoriesSource) = default;
 };
@@ -298,6 +190,10 @@ public:
 		Ui::ReportReason reason,
 		QString text);
 
+	void incrementPreloadingHiddenSources();
+	void decrementPreloadingHiddenSources();
+	void setPreloadingInViewer(std::vector<FullStoryId> ids);
+
 private:
 	struct Saved {
 		StoriesIds ids;
@@ -339,11 +235,18 @@ private:
 	void checkQuitPreventFinished();
 
 	void requestUserStories(not_null<UserData*> user);
-	void addToArchive(not_null<Story*> story);
 	void registerExpiring(TimeId expires, FullStoryId id);
 	void scheduleExpireTimer();
 	void processExpired();
 
+	void preloadSourcesChanged(StorySourcesList list);
+	bool rebuildPreloadSources(StorySourcesList list);
+	void continuePreloading();
+	[[nodiscard]] bool shouldContinuePreload(FullStoryId id) const;
+	[[nodiscard]] FullStoryId nextPreloadId() const;
+	void startPreloading(not_null<Story*> story);
+	void preloadFinished(bool markAsPreloaded = false);
+
 	const not_null<Session*> _owner;
 	std::unordered_map<
 		PeerId,
@@ -402,6 +305,12 @@ private:
 	Fn<void(std::vector<StoryView>)> _viewsDone;
 	mtpRequestId _viewsRequestId = 0;
 
+	base::flat_set<FullStoryId> _preloaded;
+	std::vector<FullStoryId> _toPreloadSources[kStorySourcesListCount];
+	std::vector<FullStoryId> _toPreloadViewer;
+	std::unique_ptr<StoryPreload> _preloading;
+	int _preloadingHiddenSourcesCounter = 0;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
index d87ad902f..aa5841c53 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
@@ -807,23 +807,7 @@ void Reader::Slices::unloadSlice(Slice &slice) const {
 }
 
 QByteArray Reader::Slices::serializeComplexSlice(const Slice &slice) const {
-	auto result = QByteArray();
-	const auto count = slice.parts.size();
-	const auto intSize = sizeof(int32);
-	result.reserve(count * kPartSize + 2 * intSize * (count + 1));
-	const auto appendInt = [&](int value) {
-		auto serialized = int32(value);
-		result.append(
-			reinterpret_cast<const char*>(&serialized),
-			intSize);
-	};
-	appendInt(count);
-	for (const auto &[offset, part] : slice.parts) {
-		appendInt(offset);
-		appendInt(part.size());
-		result.append(part);
-	}
-	return result;
+	return SerializeComplexPartsMap(slice.parts);
 }
 
 QByteArray Reader::Slices::serializeAndUnloadFirstSliceNoHeader() {
@@ -1411,5 +1395,26 @@ Reader::~Reader() {
 	finalizeCache();
 }
 
+QByteArray SerializeComplexPartsMap(
+		const base::flat_map<uint32, QByteArray> &parts) {
+	auto result = QByteArray();
+	const auto count = parts.size();
+	const auto intSize = sizeof(int32);
+	result.reserve(count * kPartSize + 2 * intSize * (count + 1));
+	const auto appendInt = [&](int value) {
+		auto serialized = int32(value);
+		result.append(
+			reinterpret_cast<const char*>(&serialized),
+			intSize);
+	};
+	appendInt(count);
+	for (const auto &[offset, part] : parts) {
+		appendInt(offset);
+		appendInt(part.size());
+		result.append(part);
+	}
+	return result;
+}
+
 } // namespace Streaming
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.h b/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
index c588823ac..179829846 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
@@ -277,5 +277,8 @@ private:
 
 };
 
+[[nodiscard]] QByteArray SerializeComplexPartsMap(
+	const base::flat_map<uint32, QByteArray> &parts);
+
 } // namespace Streaming
 } // namespace Media
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 9758d8545..e35e83d03 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2542,14 +2542,14 @@ void SessionController::openPeerStories(
 
 	auto &stories = session().data().stories();
 	if (const auto source = stories.source(peerId)) {
-		const auto j = source->ids.lower_bound(
-			StoryIdDates{ source->readTill + 1 });
-		openPeerStory(
-			source->user,
-			j != source->ids.end() ? j->id : source->ids.front().id,
-			(list
-				? StoriesContext{ *list }
-				: StoriesContext{ StoriesContextPeer() }));
+		if (const auto idDates = source->toOpen()) {
+			openPeerStory(
+				source->user,
+				idDates.id,
+				(list
+					? StoriesContext{ *list }
+					: StoriesContext{ StoriesContextPeer() }));
+		}
 	}
 }
 

From 010c666d2373453ebdd0e5bda96e0f77b3d7189c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 12:38:02 +0400
Subject: [PATCH 330/676] Preload next stories inside the media viewer.

---
 Telegram/SourceFiles/data/data_stories.cpp    |  39 +-
 Telegram/SourceFiles/data/data_stories.h      |   5 +-
 Telegram/SourceFiles/data/data_story.cpp      | 515 ++++++++++++++++++
 Telegram/SourceFiles/data/data_story.h        | 158 ++++++
 .../dialogs/dialogs_inner_widget.cpp          |   3 +
 .../stories/media_stories_controller.cpp      |  40 +-
 .../media/stories/media_stories_controller.h  |   1 +
 7 files changed, 749 insertions(+), 12 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_story.cpp
 create mode 100644 Telegram/SourceFiles/data/data_story.h

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0c7586151..86ee493e6 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -637,7 +637,7 @@ void Stories::applyDeleted(FullStoryId id) {
 				}
 			}
 			if (_preloading && _preloading->id() == id) {
-				preloadFinished();
+				preloadFinished(id);
 			}
 			if (i->second.empty()) {
 				_stories.erase(i);
@@ -1294,6 +1294,24 @@ bool Stories::isQuitPrevent() {
 	return true;
 }
 
+void Stories::incrementPreloadingMainSources() {
+	Expects(_preloadingMainSourcesCounter >= 0);
+
+	if (++_preloadingMainSourcesCounter == 1
+		&& rebuildPreloadSources(StorySourcesList::NotHidden)) {
+		continuePreloading();
+	}
+}
+
+void Stories::decrementPreloadingMainSources() {
+	Expects(_preloadingMainSourcesCounter > 0);
+
+	if (!--_preloadingMainSourcesCounter
+		&& rebuildPreloadSources(StorySourcesList::NotHidden)) {
+		continuePreloading();
+	}
+}
+
 void Stories::incrementPreloadingHiddenSources() {
 	Expects(_preloadingHiddenSourcesCounter >= 0);
 
@@ -1330,8 +1348,10 @@ void Stories::preloadSourcesChanged(StorySourcesList list) {
 
 bool Stories::rebuildPreloadSources(StorySourcesList list) {
 	const auto index = static_cast<int>(list);
-	if (!_preloadingHiddenSourcesCounter
-		&& list == StorySourcesList::Hidden) {
+	const auto &counter = (list == StorySourcesList::Hidden)
+		? _preloadingHiddenSourcesCounter
+		: _preloadingMainSourcesCounter;
+	if (!counter) {
 		return !base::take(_toPreloadSources[index]).empty();
 	}
 	auto now = std::vector<FullStoryId>();
@@ -1401,15 +1421,16 @@ void Stories::startPreloading(not_null<Story*> story) {
 	Expects(!_preloaded.contains(story->fullId()));
 
 	const auto id = story->fullId();
-	_preloading = std::make_unique<StoryPreload>(story, [=] {
-		preloadFinished(true);
+	auto preloading = std::make_unique<StoryPreload>(story, [=] {
+		_preloading = nullptr;
+		preloadFinished(id, true);
 	});
+	if (!_preloaded.contains(id)) {
+		_preloading = std::move(preloading);
+	}
 }
 
-void Stories::preloadFinished(bool markAsPreloaded) {
-	Expects(_preloading != nullptr);
-
-	const auto id = base::take(_preloading)->id();
+void Stories::preloadFinished(FullStoryId id, bool markAsPreloaded) {
 	for (auto &sources : _toPreloadSources) {
 		sources.erase(ranges::remove(sources, id), end(sources));
 	}
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 80d4a9732..648535187 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -190,6 +190,8 @@ public:
 		Ui::ReportReason reason,
 		QString text);
 
+	void incrementPreloadingMainSources();
+	void decrementPreloadingMainSources();
 	void incrementPreloadingHiddenSources();
 	void decrementPreloadingHiddenSources();
 	void setPreloadingInViewer(std::vector<FullStoryId> ids);
@@ -245,7 +247,7 @@ private:
 	[[nodiscard]] bool shouldContinuePreload(FullStoryId id) const;
 	[[nodiscard]] FullStoryId nextPreloadId() const;
 	void startPreloading(not_null<Story*> story);
-	void preloadFinished(bool markAsPreloaded = false);
+	void preloadFinished(FullStoryId id, bool markAsPreloaded = false);
 
 	const not_null<Session*> _owner;
 	std::unordered_map<
@@ -310,6 +312,7 @@ private:
 	std::vector<FullStoryId> _toPreloadViewer;
 	std::unique_ptr<StoryPreload> _preloading;
 	int _preloadingHiddenSourcesCounter = 0;
+	int _preloadingMainSourcesCounter = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
new file mode 100644
index 000000000..cf31749f4
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -0,0 +1,515 @@
+/*
+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_story.h"
+
+#include "base/unixtime.h"
+#include "api/api_text_entities.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
+#include "data/data_user.h"
+#include "data/data_session.h"
+#include "data/data_thread.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "media/streaming/media_streaming_reader.h"
+#include "storage/download_manager_mtproto.h"
+#include "ui/text/text_utilities.h"
+
+namespace Data {
+
+class StoryPreload::LoadTask final : private Storage::DownloadMtprotoTask {
+public:
+	LoadTask(
+		FullStoryId id,
+		not_null<DocumentData*> document,
+		Fn<void(QByteArray)> done);
+	~LoadTask();
+
+private:
+	bool readyToRequest() const override;
+	int64 takeNextRequestOffset() override;
+	bool feedPart(int64 offset, const QByteArray &bytes) override;
+	void cancelOnFail() override;
+	bool setWebFileSizeHook(int64 size) override;
+
+	base::flat_map<uint32, QByteArray> _parts;
+	Fn<void(QByteArray)> _done;
+	base::flat_set<int> _requestedOffsets;
+	int64 _full = 0;
+	int  _nextRequestOffset = 0;
+	bool _finished = false;
+	bool _failed = false;
+
+};
+
+StoryPreload::LoadTask::LoadTask(
+	FullStoryId id,
+	not_null<DocumentData*> document,
+	Fn<void(QByteArray)> done)
+: DownloadMtprotoTask(
+	&document->session().downloader(),
+	document->videoPreloadLocation(),
+	FileOriginStory(id.peer, id.story))
+, _done(std::move(done))
+, _full(document->size) {
+	const auto prefix = document->videoPreloadPrefix();
+	Assert(prefix > 0 && prefix <= document->size);
+	const auto part = Storage::kDownloadPartSize;
+	const auto parts = (prefix + part - 1) / part;
+	for (auto i = 0; i != parts; ++i) {
+		_parts.emplace(i * part, QByteArray());
+	}
+	addToQueue();
+}
+
+StoryPreload::LoadTask::~LoadTask() {
+	if (!_finished && !_failed) {
+		cancelAllRequests();
+	}
+}
+
+bool StoryPreload::LoadTask::readyToRequest() const {
+	const auto part = Storage::kDownloadPartSize;
+	return !_failed && (_nextRequestOffset < _parts.size() * part);
+}
+
+int64 StoryPreload::LoadTask::takeNextRequestOffset() {
+	Expects(readyToRequest());
+
+	_requestedOffsets.emplace(_nextRequestOffset);
+	_nextRequestOffset += Storage::kDownloadPartSize;
+	return _requestedOffsets.back();
+}
+
+bool StoryPreload::LoadTask::feedPart(
+		int64 offset,
+		const QByteArray &bytes) {
+	Expects(offset < _parts.size() * Storage::kDownloadPartSize);
+	Expects(_requestedOffsets.contains(int(offset)));
+	Expects(bytes.size() <= Storage::kDownloadPartSize);
+
+	const auto part = Storage::kDownloadPartSize;
+	const auto index = offset / part;
+	_requestedOffsets.remove(int(offset));
+	_parts[offset] = bytes;
+	if ((_nextRequestOffset + part >= _parts.size() * part)
+		&& _requestedOffsets.empty()) {
+		_finished = true;
+		removeFromQueue();
+		auto result = Media::Streaming::SerializeComplexPartsMap(_parts);
+		if (result.size() == _full) {
+			// Make sure it is parsed as a complex map.
+			result.push_back(char(0));
+		}
+		_done(result);
+	}
+	return true;
+}
+
+void StoryPreload::LoadTask::cancelOnFail() {
+	_failed = true;
+	cancelAllRequests();
+	_done({});
+}
+
+bool StoryPreload::LoadTask::setWebFileSizeHook(int64 size) {
+	_failed = true;
+	cancelAllRequests();
+	_done({});
+	return false;
+}
+
+Story::Story(
+	StoryId id,
+	not_null<PeerData*> peer,
+	StoryMedia media,
+	TimeId date,
+	TimeId expires)
+: _id(id)
+, _peer(peer)
+, _media(std::move(media))
+, _date(date)
+, _expires(expires) {
+}
+
+Session &Story::owner() const {
+	return _peer->owner();
+}
+
+Main::Session &Story::session() const {
+	return _peer->session();
+}
+
+not_null<PeerData*> Story::peer() const {
+	return _peer;
+}
+
+StoryId Story::id() const {
+	return _id;
+}
+
+bool Story::mine() const {
+	return _peer->isSelf();
+}
+
+StoryIdDates Story::idDates() const {
+	return { _id, _date, _expires };
+}
+
+FullStoryId Story::fullId() const {
+	return { _peer->id, _id };
+}
+
+TimeId Story::date() const {
+	return _date;
+}
+
+TimeId Story::expires() const {
+	return _expires;
+}
+
+bool Story::expired(TimeId now) const {
+	return _expires <= (now ? now : base::unixtime::now());
+}
+
+bool Story::unsupported() const {
+	return v::is_null(_media.data);
+}
+
+const StoryMedia &Story::media() const {
+	return _media;
+}
+
+PhotoData *Story::photo() const {
+	const auto result = std::get_if<not_null<PhotoData*>>(&_media.data);
+	return result ? result->get() : nullptr;
+}
+
+DocumentData *Story::document() const {
+	const auto result = std::get_if<not_null<DocumentData*>>(&_media.data);
+	return result ? result->get() : nullptr;
+}
+
+bool Story::hasReplyPreview() const {
+	return v::match(_media.data, [](not_null<PhotoData*> photo) {
+		return !photo->isNull();
+	}, [](not_null<DocumentData*> document) {
+		return document->hasThumbnail();
+	}, [](v::null_t) {
+		return false;
+	});
+}
+
+Image *Story::replyPreview() const {
+	return v::match(_media.data, [&](not_null<PhotoData*> photo) {
+		return photo->getReplyPreview(
+			Data::FileOriginStory(_peer->id, _id),
+			_peer,
+			false);
+	}, [&](not_null<DocumentData*> document) {
+		return document->getReplyPreview(
+			Data::FileOriginStory(_peer->id, _id),
+			_peer,
+			false);
+	}, [](v::null_t) {
+		return (Image*)nullptr;
+	});
+}
+
+TextWithEntities Story::inReplyText() const {
+	const auto type = tr::lng_in_dlg_story(tr::now);
+	return _caption.text.isEmpty()
+		? Ui::Text::PlainLink(type)
+		: tr::lng_dialogs_text_media(
+			tr::now,
+			lt_media_part,
+			tr::lng_dialogs_text_media_wrapped(
+				tr::now,
+				lt_media,
+				Ui::Text::PlainLink(type),
+				Ui::Text::WithEntities),
+			lt_caption,
+			_caption,
+			Ui::Text::WithEntities);
+}
+
+void Story::setPinned(bool pinned) {
+	_pinned = pinned;
+}
+
+bool Story::pinned() const {
+	return _pinned;
+}
+
+void Story::setIsPublic(bool isPublic) {
+	_isPublic = isPublic;
+}
+
+bool Story::isPublic() const {
+	return _isPublic;
+}
+
+void Story::setCloseFriends(bool closeFriends) {
+	_closeFriends = closeFriends;
+}
+
+bool Story::closeFriends() const {
+	return _closeFriends;
+}
+
+bool Story::canDownload() const {
+	return _peer->isSelf();
+}
+
+bool Story::canShare() const {
+	return isPublic() && (pinned() || !expired());
+}
+
+bool Story::canDelete() const {
+	return _peer->isSelf();
+}
+
+bool Story::canReport() const {
+	return !_peer->isSelf();
+}
+
+bool Story::hasDirectLink() const {
+	if (!_isPublic || (!_pinned && expired())) {
+		return false;
+	}
+	const auto user = _peer->asUser();
+	return user && !user->username().isEmpty();
+}
+
+std::optional<QString> Story::errorTextForForward(
+		not_null<Thread*> to) const {
+	const auto peer = to->peer();
+	const auto holdsPhoto = v::is<not_null<PhotoData*>>(_media.data);
+	const auto first = holdsPhoto
+		? ChatRestriction::SendPhotos
+		: ChatRestriction::SendVideos;
+	const auto second = holdsPhoto
+		? ChatRestriction::SendVideos
+		: ChatRestriction::SendPhotos;
+	if (const auto error = Data::RestrictionError(peer, first)) {
+		return *error;
+	} else if (const auto error = Data::RestrictionError(peer, second)) {
+		return *error;
+	} else if (!Data::CanSend(to, first, false)
+		|| !Data::CanSend(to, second, false)) {
+		return tr::lng_forward_cant(tr::now);
+	}
+	return {};
+}
+
+void Story::setCaption(TextWithEntities &&caption) {
+	_caption = std::move(caption);
+}
+
+const TextWithEntities &Story::caption() const {
+	static const auto empty = TextWithEntities();
+	return unsupported() ? empty : _caption;
+}
+
+void Story::setViewsData(
+		std::vector<not_null<PeerData*>> recent,
+		int total) {
+	_recentViewers = std::move(recent);
+	_views = total;
+}
+
+const std::vector<not_null<PeerData*>> &Story::recentViewers() const {
+	return _recentViewers;
+}
+
+const std::vector<StoryView> &Story::viewsList() const {
+	return _viewsList;
+}
+
+int Story::views() const {
+	return _views;
+}
+
+void Story::applyViewsSlice(
+		const std::optional<StoryView> &offset,
+		const std::vector<StoryView> &slice,
+		int total) {
+	_views = total;
+	if (!offset) {
+		const auto i = _viewsList.empty()
+			? end(slice)
+			: ranges::find(slice, _viewsList.front());
+		const auto merge = (i != end(slice))
+			&& !ranges::contains(slice, _viewsList.back());
+		if (merge) {
+			_viewsList.insert(begin(_viewsList), begin(slice), i);
+		} else {
+			_viewsList = slice;
+		}
+	} else if (!slice.empty()) {
+		const auto i = ranges::find(_viewsList, *offset);
+		const auto merge = (i != end(_viewsList))
+			&& !ranges::contains(_viewsList, slice.back());
+		if (merge) {
+			const auto after = i + 1;
+			if (after == end(_viewsList)) {
+				_viewsList.insert(after, begin(slice), end(slice));
+			} else {
+				const auto j = ranges::find(slice, _viewsList.back());
+				if (j != end(slice)) {
+					_viewsList.insert(end(_viewsList), j + 1, end(slice));
+				}
+			}
+		}
+	}
+}
+
+bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
+	const auto pinned = data.is_pinned();
+	const auto isPublic = data.is_public();
+	const auto closeFriends = data.is_close_friends();
+	auto caption = TextWithEntities{
+		data.vcaption().value_or_empty(),
+		Api::EntitiesFromMTP(
+			&owner().session(),
+			data.ventities().value_or_empty()),
+	};
+	auto views = -1;
+	auto recent = std::vector<not_null<PeerData*>>();
+	if (!data.is_min()) {
+		if (const auto info = data.vviews()) {
+			views = info->data().vviews_count().v;
+			if (const auto list = info->data().vrecent_viewers()) {
+				recent.reserve(list->v.size());
+				auto &owner = _peer->owner();
+				for (const auto &id : list->v) {
+					recent.push_back(owner.peer(peerFromUser(id)));
+				}
+			}
+		}
+	}
+
+	const auto changed = (_media != media)
+		|| (_pinned != pinned)
+		|| (_isPublic != isPublic)
+		|| (_closeFriends != closeFriends)
+		|| (_caption != caption)
+		|| (views >= 0 && _views != views)
+		|| (_recentViewers != recent);
+	if (!changed) {
+		return false;
+	}
+	_media = std::move(media);
+	_pinned = pinned;
+	_isPublic = isPublic;
+	_closeFriends = closeFriends;
+	_caption = std::move(caption);
+	if (views >= 0) {
+		_views = views;
+	}
+	_recentViewers = std::move(recent);
+	return true;
+}
+
+StoryPreload::StoryPreload(not_null<Story*> story, Fn<void()> done)
+: _story(story)
+, _done(std::move(done)) {
+	start();
+}
+
+StoryPreload::~StoryPreload() {
+	if (_photo) {
+		base::take(_photo)->owner()->cancel();
+	}
+}
+
+FullStoryId StoryPreload::id() const {
+	return _story->fullId();
+}
+
+not_null<Story*> StoryPreload::story() const {
+	return _story;
+}
+
+void StoryPreload::start() {
+	const auto origin = FileOriginStory(
+		_story->peer()->id,
+		_story->id());
+	if (const auto photo = _story->photo()) {
+		_photo = photo->createMediaView();
+		if (_photo->loaded()) {
+			callDone();
+		} else {
+			_photo->automaticLoad(origin, _story->peer());
+			photo->session().downloaderTaskFinished(
+			) | rpl::filter([=] {
+				return _photo->loaded();
+			}) | rpl::start_with_next([=] { callDone(); }, _lifetime);
+		}
+	} else if (const auto video = _story->document()) {
+		if (video->canBeStreamed(nullptr) && video->videoPreloadPrefix()) {
+			const auto key = video->bigFileBaseCacheKey();
+			if (key) {
+				const auto weak = base::make_weak(this);
+				video->owner().cacheBigFile().get(key, [weak](
+						const QByteArray &result) {
+					if (!result.isEmpty()) {
+						crl::on_main([weak] {
+							if (const auto strong = weak.get()) {
+								strong->callDone();
+							}
+						});
+					} else {
+						crl::on_main([weak] {
+							if (const auto strong = weak.get()) {
+								strong->load();
+							}
+						});
+					}
+				});
+			} else {
+				callDone();
+			}
+		} else {
+			callDone();
+		}
+	} else {
+		callDone();
+	}
+}
+
+void StoryPreload::load() {
+	Expects(_story->document() != nullptr);
+
+	const auto video = _story->document();
+	const auto valid = video->videoPreloadLocation().valid();
+	const auto prefix = video->videoPreloadPrefix();
+	const auto key = video->bigFileBaseCacheKey();
+	if (!valid || prefix <= 0 || prefix > video->size || !key) {
+		callDone();
+		return;
+	}
+	_task = std::make_unique<LoadTask>(id(), video, [=](QByteArray data) {
+		if (!data.isEmpty()) {
+			_story->owner().cacheBigFile().putIfEmpty(
+				key,
+				Storage::Cache::Database::TaggedValue(std::move(data), 0));
+		}
+		callDone();
+	});
+}
+
+void StoryPreload::callDone() {
+	if (const auto onstack = _done) {
+		onstack();
+	}
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
new file mode 100644
index 000000000..1f4801efd
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -0,0 +1,158 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+
+class Image;
+class PhotoData;
+class DocumentData;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+class Session;
+class Thread;
+class PhotoMedia;
+
+struct StoryIdDates {
+	StoryId id = 0;
+	TimeId date = 0;
+	TimeId expires = 0;
+
+	[[nodiscard]] bool valid() const {
+		return id != 0;
+	}
+	explicit operator bool() const {
+		return valid();
+	}
+
+	friend inline auto operator<=>(StoryIdDates, StoryIdDates) = default;
+	friend inline bool operator==(StoryIdDates, StoryIdDates) = default;
+};
+
+struct StoryMedia {
+	std::variant<
+		v::null_t,
+		not_null<PhotoData*>,
+		not_null<DocumentData*>> data;
+
+	friend inline bool operator==(StoryMedia, StoryMedia) = default;
+};
+
+struct StoryView {
+	not_null<PeerData*> peer;
+	TimeId date = 0;
+
+	friend inline bool operator==(StoryView, StoryView) = default;
+};
+
+class Story final {
+public:
+	Story(
+		StoryId id,
+		not_null<PeerData*> peer,
+		StoryMedia media,
+		TimeId date,
+		TimeId expires);
+
+	[[nodiscard]] Session &owner() const;
+	[[nodiscard]] Main::Session &session() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
+
+	[[nodiscard]] StoryId id() const;
+	[[nodiscard]] bool mine() const;
+	[[nodiscard]] StoryIdDates idDates() const;
+	[[nodiscard]] FullStoryId fullId() const;
+	[[nodiscard]] TimeId date() const;
+	[[nodiscard]] TimeId expires() const;
+	[[nodiscard]] bool unsupported() const;
+	[[nodiscard]] bool expired(TimeId now = 0) const;
+	[[nodiscard]] const StoryMedia &media() const;
+	[[nodiscard]] PhotoData *photo() const;
+	[[nodiscard]] DocumentData *document() const;
+
+	[[nodiscard]] bool hasReplyPreview() const;
+	[[nodiscard]] Image *replyPreview() const;
+	[[nodiscard]] TextWithEntities inReplyText() const;
+
+	void setPinned(bool pinned);
+	[[nodiscard]] bool pinned() const;
+	void setIsPublic(bool isPublic);
+	[[nodiscard]] bool isPublic() const;
+	void setCloseFriends(bool closeFriends);
+	[[nodiscard]] bool closeFriends() const;
+
+	[[nodiscard]] bool canDownload() const;
+	[[nodiscard]] bool canShare() const;
+	[[nodiscard]] bool canDelete() const;
+	[[nodiscard]] bool canReport() const;
+
+	[[nodiscard]] bool hasDirectLink() const;
+	[[nodiscard]] std::optional<QString> errorTextForForward(
+		not_null<Thread*> to) const;
+
+	void setCaption(TextWithEntities &&caption);
+	[[nodiscard]] const TextWithEntities &caption() const;
+
+	void setViewsData(std::vector<not_null<PeerData*>> recent, int total);
+	[[nodiscard]] auto recentViewers() const
+		-> const std::vector<not_null<PeerData*>> &;
+	[[nodiscard]] const std::vector<StoryView> &viewsList() const;
+	[[nodiscard]] int views() const;
+	void applyViewsSlice(
+		const std::optional<StoryView> &offset,
+		const std::vector<StoryView> &slice,
+		int total);
+
+	bool applyChanges(StoryMedia media, const MTPDstoryItem &data);
+
+private:
+	const StoryId _id = 0;
+	const not_null<PeerData*> _peer;
+	StoryMedia _media;
+	TextWithEntities _caption;
+	std::vector<not_null<PeerData*>> _recentViewers;
+	std::vector<StoryView> _viewsList;
+	int _views = 0;
+	const TimeId _date = 0;
+	const TimeId _expires = 0;
+	bool _pinned : 1 = false;
+	bool _isPublic : 1 = false;
+	bool _closeFriends : 1 = false;
+
+};
+
+class StoryPreload final : public base::has_weak_ptr {
+public:
+	StoryPreload(not_null<Story*> story, Fn<void()> done);
+	~StoryPreload();
+
+	[[nodiscard]] FullStoryId id() const;
+	[[nodiscard]] not_null<Story*> story() const;
+
+private:
+	class LoadTask;
+
+	void start();
+	void load();
+	void callDone();
+
+	const not_null<Story*> _story;
+	Fn<void()> _done;
+
+	std::shared_ptr<Data::PhotoMedia> _photo;
+	std::unique_ptr<LoadTask> _task;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index c65f9a2a0..1ab020d36 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -366,6 +366,8 @@ InnerWidget::InnerWidget(
 			Data::StorySourcesList::NotHidden);
 	}, lifetime());
 
+	session().data().stories().incrementPreloadingMainSources();
+
 	handleChatListEntryRefreshes();
 
 	refreshWithCollapsedRows(true);
@@ -2426,6 +2428,7 @@ void InnerWidget::appendToFiltered(Key key) {
 }
 
 InnerWidget::~InnerWidget() {
+	session().data().stories().decrementPreloadingMainSources();
 	clearSearchResults();
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index af4abbb4b..40cd9fc4a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -64,6 +64,8 @@ constexpr auto kSiblingUserpicSize = 0.3;
 constexpr auto kInnerHeightMultiplier = 1.6;
 constexpr auto kPreloadUsersCount = 3;
 constexpr auto kPreloadStoriesCount = 5;
+constexpr auto kPreloadNextMediaCount = 3;
+constexpr auto kPreloadPreviousMediaCount = 1;
 constexpr auto kMarkAsReadAfterSeconds = 1;
 constexpr auto kMarkAsReadAfterProgress = 0.2;
 
@@ -637,9 +639,28 @@ void Controller::rebuildFromContext(
 			}
 		}
 	}
+	preloadNext();
 	_slider->show({ .index = _index, .total = shownCount() });
 }
 
+void Controller::preloadNext() {
+	Expects(shown());
+
+	auto ids = std::vector<FullStoryId>();
+	ids.reserve(kPreloadPreviousMediaCount + kPreloadNextMediaCount);
+	const auto user = shownUser();
+	const auto count = shownCount();
+	const auto till = std::min(_index + kPreloadNextMediaCount, count);
+	for (auto i = _index + 1; i != till; ++i) {
+		ids.push_back({ .peer = user->id, .story = shownId(i) });
+	}
+	const auto from = std::max(_index - kPreloadPreviousMediaCount, 0);
+	for (auto i = _index; i != from;) {
+		ids.push_back({ .peer = user->id, .story = shownId(--i) });
+	}
+	user->owner().stories().setPreloadingInViewer(std::move(ids));
+}
+
 void Controller::checkMoveByDelta() {
 	const auto index = _index + _waitingForDelta;
 	if (_waitingForDelta && shown() && index >= 0 && index < shownCount()) {
@@ -659,7 +680,17 @@ void Controller::show(
 
 	rebuildFromContext(user, storyId);
 	_contextLifetime.destroy();
-	v::match(_context.data, [&](Data::StoriesContextSaved) {
+	const auto subscribeToSource = [&] {
+		stories.sourceChanged() | rpl::filter(
+			rpl::mappers::_1 == storyId.peer
+		) | rpl::start_with_next([=] {
+			rebuildFromContext(user, storyId);
+		}, _contextLifetime);
+	};
+	v::match(_context.data, [&](Data::StoriesContextSingle) {
+	}, [&](Data::StoriesContextPeer) {
+		subscribeToSource();
+	}, [&](Data::StoriesContextSaved) {
 		stories.savedChanged() | rpl::filter(
 			rpl::mappers::_1 == storyId.peer
 		) | rpl::start_with_next([=] {
@@ -672,7 +703,9 @@ void Controller::show(
 			rebuildFromContext(user, storyId);
 			checkMoveByDelta();
 		}, _contextLifetime);
-	}, [](const auto &) {});
+	}, [&](Data::StorySourcesList) {
+		subscribeToSource();
+	});
 
 	const auto guard = gsl::finally([&] {
 		_paused = false;
@@ -733,6 +766,9 @@ void Controller::show(
 				checkWaitingFor();
 			}
 		}, _sessionLifetime);
+		_sessionLifetime.add([=] {
+			session->data().stories().setPreloadingInViewer({});
+		});
 	}
 
 	stories.loadAround(storyId, context);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index a680d7f68..89dda44d4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -183,6 +183,7 @@ private:
 	void rebuildFromContext(not_null<UserData*> user, FullStoryId storyId);
 	void checkMoveByDelta();
 	void loadMoreToList();
+	void preloadNext();
 	void rebuildCachedSourcesList(
 		const std::vector<Data::StoriesSourceInfo> &lists,
 		int index);

From bc7da9309dc244013ed314568a60be09052a34d8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 13:36:12 +0400
Subject: [PATCH 331/676] Fix controls in regular media viewer.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 30c1ae8aa..29415489f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -5092,6 +5092,7 @@ void OverlayWidget::setStoriesPeer(PeerData *peer) {
 		_stories = nullptr;
 		_storiesSession = nullptr;
 		_storiesChanged.fire({});
+		updateNavigationControlsGeometry();
 	} else if (_storiesSession != session) {
 		_stories = nullptr;
 		_storiesSession = session;

From aa2cf2f6cae3e040b49e2ed2147fc265f0ddb1e2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 13:36:25 +0400
Subject: [PATCH 332/676] Collapse stories on chat open.

---
 .../dialogs/dialogs_inner_widget.cpp            | 17 ++++++++++-------
 .../SourceFiles/dialogs/dialogs_inner_widget.h  |  3 ++-
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 11 +++++++----
 .../dialogs/ui/dialogs_stories_list.cpp         | 16 ++++++++++------
 .../dialogs/ui/dialogs_stories_list.h           |  7 +++++--
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 1ab020d36..7587706a8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -473,8 +473,10 @@ int InnerWidget::dialogsOffset() const {
 		- skipTopHeight();
 }
 
-rpl::producer<> InnerWidget::scrollToVeryTopRequests() const {
-	return _stories->expandRequests();
+rpl::producer<bool> InnerWidget::storiesExpandedRequests() const {
+	return rpl::merge(
+		_stories->toggleExpandedRequests(),
+		_storiesExpandedRequests.events());
 }
 
 int InnerWidget::defaultScrollTop() const {
@@ -623,11 +625,6 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 	if (_controller->contentOverlapped(this, e)) {
 		return;
 	}
-	const auto fillGuard = gsl::finally([&] {
-		// We translate painter down, but it'll be cropped below rect.
-		p.fillRect(rect(), st::dialogsBg);
-	});
-
 	const auto activeEntry = _controller->activeChatEntryCurrent();
 	const auto videoPaused = _controller->isGifPausedAtLeastFor(
 		Window::GifPauseReason::Any);
@@ -648,6 +645,11 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		.paused = videoPaused,
 		.narrow = (fullWidth < st::columnMinimalWidthLeft / 2),
 	};
+	_stories->setBgOverride(context.currentBg);
+	const auto fillGuard = gsl::finally([&] {
+		// We translate painter down, but it'll be cropped below rect.
+		p.fillRect(rect(), context.currentBg);
+	});
 	const auto paintRow = [&](
 			not_null<Row*> row,
 			bool selected,
@@ -3408,6 +3410,7 @@ ChosenRow InnerWidget::computeChosenRow() const {
 bool InnerWidget::chooseRow(
 		Qt::KeyboardModifiers modifiers,
 		MsgId pressedTopicRootId) {
+	_storiesExpandedRequests.fire(false);
 	if (chooseCollapsedRow()) {
 		return true;
 	} else if (chooseHashtag()) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index 1dcaf68fe..ce70f3bb3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -104,7 +104,7 @@ public:
 		const QVector<MTPPeer> &my,
 		const QVector<MTPPeer> &result);
 
-	[[nodiscard]] rpl::producer<> scrollToVeryTopRequests() const;
+	[[nodiscard]] rpl::producer<bool> storiesExpandedRequests() const;
 	[[nodiscard]] int defaultScrollTop() const;
 	void setViewportHeight(int viewportHeight);
 
@@ -408,6 +408,7 @@ private:
 	const not_null<Window::SessionController*> _controller;
 
 	const std::unique_ptr<Stories::List> _stories;
+	rpl::event_stream<bool> _storiesExpandedRequests;
 	int _viewportHeight = 0;
 
 	not_null<IndexedList*> _shownList;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 008102df0..de20a5fac 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -261,9 +261,11 @@ Widget::Widget(
 		}
 	}, lifetime());
 
-	_inner->scrollToVeryTopRequests(
-	) | rpl::start_with_next([=] {
-		scrollToDefaultChecked(true);
+	_inner->storiesExpandedRequests(
+	) | rpl::start_with_next([=](bool expanded) {
+		if (expanded || _scroll->scrollTop() < _inner->defaultScrollTop()) {
+			scrollToDefaultChecked(expanded);
+		}
 	}, lifetime());
 
 	_inner->mustScrollTo(
@@ -1123,7 +1125,7 @@ void Widget::scrollToDefault(bool verytop) {
 	_scrollToAnimation.stop();
 	auto scrollTop = _scroll->scrollTop();
 	const auto scrollTo = verytop ? 0 : _inner->defaultScrollTop();
-	if (scrollTop <= scrollTo) {
+	if (scrollTop == scrollTo) {
 		return;
 	}
 	const auto maxAnimatedDelta = _scroll->height();
@@ -2017,6 +2019,7 @@ void Widget::dropEvent(QDropEvent *e) {
 
 void Widget::listScrollUpdated() {
 	const auto scrollTop = _scroll->scrollTop();
+	PROFILE_LOG(("SCROLLED: %1").arg(scrollTop));
 	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
 	updateScrollUpVisibility();
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index c54803ef6..b8d9c5a5b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -239,8 +239,8 @@ rpl::producer<ToggleShownRequest> List::toggleShown() const {
 	return _toggleShown.events();
 }
 
-rpl::producer<> List::expandRequests() const {
-	return _expandRequests.events();
+rpl::producer<bool> List::toggleExpandedRequests() const {
+	return _toggleExpandedRequests.events();
 }
 
 rpl::producer<> List::entered() const {
@@ -347,7 +347,7 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto readUserpicAppearingOpacity = lerp(_st.readOpacity, 0.);
 
 	auto p = QPainter(this);
-	p.fillRect(e->rect(), _st.bg);
+	p.fillRect(e->rect(), _bgOverride.value_or(_st.bg));
 	p.translate(0, height() - layout.shownHeight);
 
 	const auto drawSmall = (ratio < 1.);
@@ -670,7 +670,7 @@ void List::wheelEvent(QWheelEvent *e) {
 	const auto used = now - delta;
 	const auto next = std::clamp(used, 0, _scrollLeftMax);
 	if (next != now) {
-		_expandRequests.fire({});
+		_toggleExpandedRequests.fire(true);
 		_scrollLeft = next;
 		updateSelected();
 		checkLoadMore();
@@ -698,7 +698,7 @@ void List::mouseMoveEvent(QMouseEvent *e) {
 		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
 			>= QApplication::startDragDistance()) {
 			if (_shownHeight() < _st.full.height) {
-				_expandRequests.fire({});
+				_toggleExpandedRequests.fire(true);
 			}
 			_dragging = true;
 			_startDraggingLeft = _scrollLeft;
@@ -742,13 +742,17 @@ void List::mouseReleaseEvent(QMouseEvent *e) {
 	updateSelected();
 	if (_selected == pressed) {
 		if (_selected < 0) {
-			_expandRequests.fire({});
+			_toggleExpandedRequests.fire(true);
 		} else if (_selected < _data.items.size()) {
 			_clicks.fire_copy(_data.items[_selected].element.id);
 		}
 	}
 }
 
+void List::setBgOverride(QBrush brush) {
+	_bgOverride = std::move(brush);
+}
+
 void List::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 8381a4289..1f1cabb45 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -67,10 +67,12 @@ public:
 		rpl::producer<Content> content,
 		Fn<int()> shownHeight);
 
+	void setBgOverride(QBrush brush);
+
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] rpl::producer<uint64> showProfileRequests() const;
 	[[nodiscard]] rpl::producer<ToggleShownRequest> toggleShown() const;
-	[[nodiscard]] rpl::producer<> expandRequests() const;
+	[[nodiscard]] rpl::producer<bool> toggleExpandedRequests() const;
 	[[nodiscard]] rpl::producer<> entered() const;
 	[[nodiscard]] rpl::producer<> loadMoreRequests() const;
 
@@ -165,10 +167,11 @@ private:
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<uint64> _showProfileRequests;
 	rpl::event_stream<ToggleShownRequest> _toggleShown;
-	rpl::event_stream<> _expandRequests;
+	rpl::event_stream<bool> _toggleExpandedRequests;
 	rpl::event_stream<> _entered;
 	rpl::event_stream<> _loadMoreRequests;
 
+	std::optional<QBrush> _bgOverride;
 	Ui::Animations::Simple _shownAnimation;
 
 	QPoint _lastMousePosition;

From aff094f278b8cda86f2a2de6e122d72732994da6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 13:59:36 +0400
Subject: [PATCH 333/676] Prevent some accidental story closing.

---
 .../media/stories/media_stories_controller.cpp           | 9 +++++++++
 .../SourceFiles/media/stories/media_stories_controller.h | 1 +
 .../SourceFiles/media/stories/media_stories_view.cpp     | 4 ++++
 Telegram/SourceFiles/media/stories/media_stories_view.h  | 1 +
 .../SourceFiles/media/view/media_view_overlay_widget.cpp | 4 +++-
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 40cd9fc4a..ab7e2ab48 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -505,6 +505,15 @@ ContentLayout Controller::contentLayout() const {
 	};
 }
 
+bool Controller::closeByClickAt(QPoint position) const {
+	const auto &current = _layout.current();
+	Assert(current.has_value());
+
+	return (position.x() < current->content.x() - st::storiesControlSize)
+		|| (position.x() > current->content.x() + current->content.width()
+			+ st::storiesControlSize);
+}
+
 Data::FileOrigin Controller::fileOrigin() const {
 	return Data::FileOriginStory(_shown.peer, _shown.story);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 89dda44d4..c7137a250 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -101,6 +101,7 @@ public:
 	[[nodiscard]] Layout layout() const;
 	[[nodiscard]] rpl::producer<Layout> layoutValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
+	[[nodiscard]] bool closeByClickAt(QPoint position) const;
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
 	void showFullCaption();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index b79064e2e..79528eb11 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -51,6 +51,10 @@ ContentLayout View::contentLayout() const {
 	return _controller->contentLayout();
 }
 
+bool View::closeByClickAt(QPoint position) const {
+	return _controller->closeByClickAt(position);
+}
+
 void View::updatePlayback(const Player::TrackState &state) {
 	_controller->updateVideoPlayback(state);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index dabb6952a..d2f62a0ac 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -60,6 +60,7 @@ public:
 	[[nodiscard]] QRect finalShownGeometry() const;
 	[[nodiscard]] rpl::producer<QRect> finalShownGeometryValue() const;
 	[[nodiscard]] ContentLayout contentLayout() const;
+	[[nodiscard]] bool closeByClickAt(QPoint position) const;
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 29415489f..6fc85848f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -5576,7 +5576,9 @@ void OverlayWidget::handleMouseRelease(
 				|| documentContentShown()
 				|| !documentBubbleShown()
 				|| !_docRect.contains(position)) {
-				close();
+				if (!_stories || _stories->closeByClickAt(position)) {
+					close();
+				}
 			}
 		}
 		_pressed = false;

From 7f583f86c0d4c2945e68e8413937df5c4d988712 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 14:49:04 +0400
Subject: [PATCH 334/676] Nice expand / collapse animations.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  12 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 132 ++++++++++++++----
 .../dialogs/ui/dialogs_stories_list.h         |  11 +-
 3 files changed, 125 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index de20a5fac..03679cfb8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1137,7 +1137,16 @@ void Widget::scrollToDefault(bool verytop) {
 	startScrollUpButtonAnimation(false);
 
 	const auto scroll = [=] {
-		_scroll->scrollToY(qRound(_scrollToAnimation.value(scrollTo)));
+		const auto animated = qRound(_scrollToAnimation.value(scrollTo));
+		const auto animatedDelta = animated - scrollTo;
+		const auto realDelta = _scroll->scrollTop() - scrollTo;
+		if (realDelta * animatedDelta < 0) {
+			// We scrolled manually to the other side of target 'scrollTo'.
+			_scrollToAnimation.stop();
+		} else if (std::abs(realDelta) > std::abs(animatedDelta)) {
+			// We scroll by animation only if it gets us closer to target.
+			_scroll->scrollToY(animated);
+		}
 	};
 
 	_scrollToAnimation.start(
@@ -2019,7 +2028,6 @@ void Widget::dropEvent(QDropEvent *e) {
 
 void Widget::listScrollUpdated() {
 	const auto scrollTop = _scroll->scrollTop();
-	PROFILE_LOG(("SCROLLED: %1").arg(scrollTop));
 	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
 	updateScrollUpVisibility();
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index b8d9c5a5b..f1490669f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -18,8 +18,12 @@ namespace Dialogs::Stories {
 namespace {
 
 constexpr auto kSmallThumbsShown = 3;
-constexpr auto kSummaryExpandLeft = 1.5;
+constexpr auto kSummaryExpandLeft = 1;
 constexpr auto kPreloadPages = 2;
+constexpr auto kExpandAfterRatio = 0.85;
+constexpr auto kCollapseAfterRatio = 0.72;
+constexpr auto kFrictionRatio = 0.15;
+constexpr auto kSnapExpandedTimeout = crl::time(200);
 
 [[nodiscard]] int AvailableNameWidth(const style::DialogsStoriesList &st) {
 	const auto &full = st.full;
@@ -33,6 +37,7 @@ constexpr auto kPreloadPages = 2;
 struct List::Layout {
 	int itemsCount = 0;
 	int shownHeight = 0;
+	float64 expandedRatio = 0.;
 	float64 ratio = 0.;
 	float64 thumbnailLeft = 0.;
 	float64 photoLeft = 0.;
@@ -56,7 +61,8 @@ List::List(
 	Fn<int()> shownHeight)
 : RpWidget(parent)
 , _st(st)
-, _shownHeight(shownHeight) {
+, _shownHeight(shownHeight)
+, _snapExpandedTimer([=] { requestExpanded(_expanded); }) {
 	setCursor(style::cur_default);
 
 	std::move(content) | rpl::start_with_next([=](Content &&content) {
@@ -251,6 +257,20 @@ rpl::producer<> List::loadMoreRequests() const {
 	return _loadMoreRequests.events();
 }
 
+void List::requestExpanded(bool expanded) {
+	_snapExpandedTimer.cancel();
+	if (_expanded != expanded) {
+		_expanded = expanded;
+		_expandedAnimation.start(
+			[=] { update(); },
+			_expanded ? 0. : 1.,
+			_expanded ? 1. : 0.,
+			st::slideWrapDuration,
+			anim::sineInOut);
+	}
+	_toggleExpandedRequests.fire_copy(_expanded);
+}
+
 void List::enterEventHook(QEnterEvent *e) {
 	_entered.fire({});
 }
@@ -259,12 +279,46 @@ void List::resizeEvent(QResizeEvent *e) {
 	updateScrollMax();
 }
 
-List::Layout List::computeLayout() const {
+void List::updateExpanding(int minHeight, int shownHeight, int fullHeight) {
+	Expects(shownHeight == minHeight || fullHeight > minHeight);
+
+	const auto ratio = (shownHeight == minHeight)
+		? 0.
+		: (float64(shownHeight - minHeight) / (fullHeight - minHeight));
+	if (_lastRatio == ratio) {
+		return;
+	}
+	const auto expanding = (ratio > _lastRatio);
+	_lastRatio = ratio;
+	const auto change = _expanded
+		? (!expanding && ratio < kCollapseAfterRatio)
+		: (expanding && ratio > kExpandAfterRatio);
+	if (change) {
+		requestExpanded(!_expanded);
+	}
+}
+
+List::Layout List::computeLayout() {
 	const auto &st = _st.small;
 	const auto &full = _st.full;
 	const auto shownHeight = std::max(_shownHeight(), st.height);
-	const auto ratio = float64(shownHeight - st.height)
+	if (_lastHeight != shownHeight) {
+		_lastHeight = shownHeight;
+		if (_lastHeight == st.height || _lastHeight == full.height) {
+			_snapExpandedTimer.cancel();
+		} else {
+			_snapExpandedTimer.callOnce(kSnapExpandedTimeout);
+		}
+	}
+	updateExpanding(st.height, shownHeight, full.height);
+
+	const auto expanded = _expandedAnimation.value(_expanded ? 1. : 0.);
+	const auto expandedRatio = float64(shownHeight - st.height)
 		/ (full.height - st.height);
+	const auto collapsedRatio = expandedRatio * kFrictionRatio;
+	const auto ratio = expandedRatio * expanded
+		+ collapsedRatio * (1. - expanded);
+
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * ratio;
 	};
@@ -304,6 +358,7 @@ List::Layout List::computeLayout() const {
 	return Layout{
 		.itemsCount = itemsCount,
 		.shownHeight = shownHeight,
+		.expandedRatio = expandedRatio,
 		.ratio = ratio,
 		.thumbnailLeft = thumbnailLeft,
 		.photoLeft = photoLeft,
@@ -326,14 +381,24 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto &full = _st.full;
 	const auto layout = computeLayout();
 	const auto ratio = layout.ratio;
+	const auto expandRatio = (ratio >= kCollapseAfterRatio)
+		? 1.
+		: (ratio <= kExpandAfterRatio * kFrictionRatio)
+		? 0.
+		: ((ratio - kExpandAfterRatio * kFrictionRatio)
+			/ (kCollapseAfterRatio - kExpandAfterRatio * kFrictionRatio));
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * ratio;
 	};
+	const auto elerp = [&](float64 a, float64 b) {
+		return a + (b - a) * expandRatio;
+	};
 	auto &rendering = _data.empty() ? _hidingData : _data;
-	const auto line = lerp(st.lineTwice, full.lineTwice) / 2.;
-	const auto lineRead = lerp(st.lineReadTwice, full.lineReadTwice) / 2.;
+	const auto line = elerp(st.lineTwice, full.lineTwice) / 2.;
+	const auto lineRead = elerp(st.lineReadTwice, full.lineReadTwice) / 2.;
 	const auto photoTopSmall = (st.height - st.photo) / 2.;
-	const auto photoTop = lerp(photoTopSmall, full.photoTop);
+	const auto photoTop = photoTopSmall
+		+ (full.photoTop - photoTopSmall) * layout.expandedRatio;
 	const auto photo = lerp(st.photo, full.photo);
 	const auto summaryTop = st.nameTop
 		- (st.photoTop + (st.photo / 2.))
@@ -343,15 +408,15 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto nameWidth = nameScale * AvailableNameWidth(_st);
 	const auto nameHeight = nameScale * full.nameStyle.font->height;
 	const auto nameLeft = layout.photoLeft + (photo - nameWidth) / 2.;
-	const auto readUserpicOpacity = lerp(_st.readOpacity, 1.);
-	const auto readUserpicAppearingOpacity = lerp(_st.readOpacity, 0.);
+	const auto readUserpicOpacity = elerp(_st.readOpacity, 1.);
+	const auto readUserpicAppearingOpacity = elerp(_st.readOpacity, 0.);
 
 	auto p = QPainter(this);
 	p.fillRect(e->rect(), _bgOverride.value_or(_st.bg));
 	p.translate(0, height() - layout.shownHeight);
 
-	const auto drawSmall = (ratio < 1.);
-	const auto drawFull = (ratio > 0.);
+	const auto drawSmall = (expandRatio < 1.);
+	const auto drawFull = (expandRatio > 0.);
 	auto hq = PainterHighQualityEnabler(p);
 
 	const auto count = std::max(
@@ -364,6 +429,7 @@ void List::paintEvent(QPaintEvent *e) {
 		Item *itemSmall = nullptr;
 		int indexFull = 0;
 		Item *itemFull = nullptr;
+		float64 photoTop = 0.;
 
 		explicit operator bool() const {
 			return itemSmall || itemFull;
@@ -372,6 +438,11 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto lookup = [&](int index) {
 		const auto indexSmall = layout.startIndexSmall + index;
 		const auto indexFull = layout.startIndexFull + index;
+		const auto ySmall = photoTopSmall
+			+ ((indexSmall - layout.smallSkip + 1)
+				* (photoTop - photoTopSmall) / 3.);
+		const auto y = elerp(ySmall, photoTop);
+
 		const auto small = (drawSmall
 			&& indexSmall < layout.endIndexSmall
 			&& indexSmall >= layout.smallSkip)
@@ -381,7 +452,7 @@ void List::paintEvent(QPaintEvent *e) {
 			? &rendering.items[indexFull]
 			: nullptr;
 		const auto x = layout.left + layout.single * index;
-		return Single{ x, indexSmall, small, indexFull, full };
+		return Single{ x, indexSmall, small, indexFull, full, y };
 	};
 	const auto hasUnread = [&](const Single &single) {
 		return (single.itemSmall && single.itemSmall->element.unread)
@@ -427,18 +498,23 @@ void List::paintEvent(QPaintEvent *e) {
 	enumerate([&](Single single) {
 		// Name.
 		if (const auto full = single.itemFull) {
-			p.setOpacity(ratio);
 			validateName(full);
-			p.drawImage(
-				QRectF(single.x + nameLeft, nameTop, nameWidth, nameHeight),
-				full->nameCache);
+			if (expandRatio > 0.) {
+				p.setOpacity(expandRatio);
+				p.drawImage(QRectF(
+					single.x + nameLeft,
+					nameTop,
+					nameWidth,
+					nameHeight
+				), full->nameCache);
+			}
 		}
 
 		// Unread gradient.
 		const auto x = single.x;
 		const auto userpic = QRectF(
 			x + layout.photoLeft,
-			photoTop,
+			single.photoTop,
 			photo,
 			photo);
 		const auto small = single.itemSmall;
@@ -448,9 +524,9 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto unreadOpacity = (smallUnread && fullUnread)
 			? 1.
 			: smallUnread
-			? (1. - ratio)
+			? (1. - expandRatio)
 			: fullUnread
-			? ratio
+			? expandRatio
 			: 0.;
 		if (unreadOpacity > 0.) {
 			p.setOpacity(unreadOpacity);
@@ -475,7 +551,7 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto x = single.x;
 		const auto userpic = QRectF(
 			x + layout.photoLeft,
-			photoTop,
+			single.photoTop,
 			photo,
 			photo);
 		const auto small = single.itemSmall;
@@ -487,7 +563,7 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto hasReadLine = (itemFull && !fullUnread);
 		if (hasReadLine) {
 			auto color = st::dialogsUnreadBgMuted->c;
-			color.setAlphaF(color.alphaF() * ratio);
+			color.setAlphaF(color.alphaF() * expandRatio);
 			auto pen = QPen(color);
 			pen.setWidthF(lineRead);
 			p.setPen(pen);
@@ -508,16 +584,18 @@ void List::paintEvent(QPaintEvent *e) {
 		} else {
 			if (small) {
 				p.setOpacity(smallUnread
-					? (itemFull ? 1. : (1. - ratio))
+					? (itemFull ? 1. : (1. - expandRatio))
 					: (itemFull
 						? _st.readOpacity
 						: readUserpicAppearingOpacity));
 				validateThumbnail(small);
-				const auto size = (ratio > 0.) ? full.photo : st.photo;
+				const auto size = (expandRatio > 0.)
+					? full.photo
+					: st.photo;
 				p.drawImage(userpic, small->element.thumbnail->image(size));
 			}
 			if (itemFull) {
-				p.setOpacity(ratio);
+				p.setOpacity(expandRatio);
 				validateThumbnail(itemFull);
 				const auto size = full.photo;
 				p.drawImage(
@@ -670,7 +748,7 @@ void List::wheelEvent(QWheelEvent *e) {
 	const auto used = now - delta;
 	const auto next = std::clamp(used, 0, _scrollLeftMax);
 	if (next != now) {
-		_toggleExpandedRequests.fire(true);
+		requestExpanded(true);
 		_scrollLeft = next;
 		updateSelected();
 		checkLoadMore();
@@ -698,7 +776,7 @@ void List::mouseMoveEvent(QMouseEvent *e) {
 		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
 			>= QApplication::startDragDistance()) {
 			if (_shownHeight() < _st.full.height) {
-				_toggleExpandedRequests.fire(true);
+				requestExpanded(true);
 			}
 			_dragging = true;
 			_startDraggingLeft = _scrollLeft;
@@ -742,7 +820,7 @@ void List::mouseReleaseEvent(QMouseEvent *e) {
 	updateSelected();
 	if (_selected == pressed) {
 		if (_selected < 0) {
-			_toggleExpandedRequests.fire(true);
+			requestExpanded(true);
 		} else if (_selected < _data.items.size()) {
 			_clicks.fire_copy(_data.items[_selected].element.id);
 		}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 1f1cabb45..1259a0beb 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/qt/qt_compare.h"
+#include "base/timer.h"
 #include "base/weak_ptr.h"
 #include "ui/rp_widget.h"
 
@@ -148,7 +149,9 @@ private:
 	void checkDragging();
 	bool finishDragging();
 	void checkLoadMore();
+	void requestExpanded(bool expanded);
 
+	void updateExpanding(int minHeight, int shownHeight, int fullHeight);
 	void updateHeight();
 	void toggleAnimated(bool shown);
 	void paintSummary(
@@ -157,7 +160,7 @@ private:
 		float64 summaryTop,
 		float64 hidden);
 
-	[[nodiscard]] Layout computeLayout() const;
+	[[nodiscard]] Layout computeLayout();
 
 	const style::DialogsStoriesList &_st;
 	Content _content;
@@ -181,6 +184,12 @@ private:
 	int _scrollLeftMax = 0;
 	bool _dragging = false;
 
+	Ui::Animations::Simple _expandedAnimation;
+	base::Timer _snapExpandedTimer;
+	float64 _lastRatio = 0.;
+	int _lastHeight = 0;
+	bool _expanded = false;
+
 	int _selected = -1;
 	int _pressed = -1;
 

From c61e1b9139e89c7b95b498d228d90436dbb1303d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 19:40:45 +0400
Subject: [PATCH 335/676] Don't scroll through from chats list to stories.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 03679cfb8..9268b4fcd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -73,11 +73,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qt/qt_common_adapters.h"
 
 #include <QtCore/QMimeData>
+#include <QtWidgets/QScrollBar>
 
 namespace Dialogs {
 namespace {
 
 constexpr auto kSearchPerPage = 50;
+constexpr auto kWaitTillAllowStoriesExpand = crl::time(200);
 
 } // namespace
 
@@ -208,6 +210,9 @@ Widget::Widget(
 , _cancelSearch(_searchControls, st::dialogsCancelSearch)
 , _lockUnlock(_searchControls, st::dialogsLock)
 , _scroll(this)
+, _allowStoriesExpandTimer([=] {
+	_scroll->verticalScrollBar()->setMinimum(0);
+})
 , _scrollToTop(_scroll, st::dialogsToUp)
 , _searchTimer([=] { searchMessages(); })
 , _singleMessageSearch(&controller->session()) {
@@ -319,6 +324,9 @@ Widget::Widget(
 	) | rpl::start_with_next([=] {
 		listScrollUpdated();
 	}, lifetime());
+	_scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
+		return customWheelProcess(e);
+	});
 
 	session().data().chatsListChanges(
 	) | rpl::filter([=](Data::Folder *folder) {
@@ -1122,6 +1130,9 @@ void Widget::jumpToTop(bool belowPinned) {
 }
 
 void Widget::scrollToDefault(bool verytop) {
+	if (verytop) {
+		_scroll->verticalScrollBar()->setMinimum(0);
+	}
 	_scrollToAnimation.stop();
 	auto scrollTop = _scroll->scrollTop();
 	const auto scrollTo = verytop ? 0 : _inner->defaultScrollTop();
@@ -2365,6 +2376,23 @@ void Widget::completeHashtag(QString tag) {
 	applyFilterUpdate(true);
 }
 
+bool Widget::customWheelProcess(not_null<QWheelEvent*> e) {
+	const auto now = _scroll->scrollTop();
+	const auto def = _inner->defaultScrollTop();
+	const auto bar = _scroll->verticalScrollBar();
+	const auto allow = (def <= 0)
+		|| (now < def)
+		|| (now == def && !_allowStoriesExpandTimer.isActive());
+	if (allow) {
+		_scroll->verticalScrollBar()->setMinimum(0);
+		_allowStoriesExpandTimer.cancel();
+	} else {
+		bar->setMinimum(def);
+		_allowStoriesExpandTimer.callOnce(kWaitTillAllowStoriesExpand);
+	}
+	return false;
+}
+
 void Widget::resizeEvent(QResizeEvent *e) {
 	updateControlsGeometry();
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 891afef3a..11a9e4648 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -136,6 +136,7 @@ private:
 	void cancelSearchInChat();
 	void filterCursorMoved();
 	void completeHashtag(QString tag);
+	bool customWheelProcess(not_null<QWheelEvent*> e);
 
 	[[nodiscard]] QString currentSearchQuery() const;
 	void clearSearchField();
@@ -245,6 +246,7 @@ private:
 	std::unique_ptr<HistoryView::ContactStatus> _forumReportBar;
 
 	object_ptr<Ui::ScrollArea> _scroll;
+	base::Timer _allowStoriesExpandTimer;
 	QPointer<InnerWidget> _inner;
 	class BottomButton;
 	object_ptr<BottomButton> _updateTelegram = { nullptr };
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index fc8d4d25d..8908c9b5c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit fc8d4d25dee6e3ded99749c06fd870e6df4615f8
+Subproject commit 8908c9b5c041f51176383a55e0b324588b28b68d

From a73490e5ad6fe2277299aca3d0503e60b198107b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 19:40:59 +0400
Subject: [PATCH 336/676] Add simple scroll control to Hidden Stories.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  3 +
 .../boxes/peer_list_controllers.cpp           | 61 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 66f10501a..2ceba422b 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1254,6 +1254,9 @@ void PeerListContent::initDecorateWidget(Ui::RpWidget *widget) {
 		}) | rpl::start_with_next([=] {
 			mouseLeftGeometry();
 		}, widget->lifetime());
+		widget->heightValue() | rpl::skip(1) | rpl::start_with_next([=] {
+			resizeToWidth(width());
+		}, widget->lifetime());
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 1e104b5a3..b1c87eaff 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -63,6 +63,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 			Stories::List *stories = nullptr;
 			QPointer<::Ui::IconButton> toggleSort;
 			Mode mode = ContactsBoxController::SortMode::Online;
+			::Ui::Animations::Simple scrollAnimation;
 		};
 
 		const auto stories = &sessionController->session().data().stories();
@@ -119,6 +120,66 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 			stories->loadMore(Data::StorySourcesList::Hidden);
 		}, raw->lifetime());
 
+		const auto defaultScrollTop = [=] {
+			return std::max(raw->height() - st::dialogsStories.height, 0);
+		};
+		const auto scrollToDefault = [=](bool verytop) {
+			if (state->scrollAnimation.animating()) {
+				return;
+			}
+			if (verytop) {
+				//_scroll->verticalScrollBar()->setMinimum(0);
+			}
+			state->scrollAnimation.stop();
+			auto scrollTop = box->scrollTop();
+			const auto scrollTo = verytop ? 0 : defaultScrollTop();
+			if (scrollTop == scrollTo) {
+				return;
+			}
+			const auto maxAnimatedDelta = box->height();
+			if (scrollTo + maxAnimatedDelta < scrollTop) {
+				scrollTop = scrollTo + maxAnimatedDelta;
+				box->scrollToY(scrollTop);
+			}
+
+			const auto scroll = [=] {
+				const auto animated = qRound(
+					state->scrollAnimation.value(scrollTo));
+				const auto animatedDelta = animated - scrollTo;
+				const auto realDelta = box->scrollTop() - scrollTo;
+				if (realDelta * animatedDelta < 0) {
+					// We scrolled manually to the other side of target 'scrollTo'.
+					state->scrollAnimation.stop();
+				} else if (std::abs(realDelta) > std::abs(animatedDelta)) {
+					// We scroll by animation only if it gets us closer to target.
+					box->scrollToY(animated);
+				}
+			};
+
+			state->scrollAnimation.start(
+				scroll,
+				scrollTop,
+				scrollTo,
+				st::slideDuration,
+				anim::sineInOut);
+		};
+		const auto top = box->scrollTop();
+		raw->toggleExpandedRequests(
+		) | rpl::start_with_next([=](bool expanded) {
+			if (expanded || box->scrollTop() < defaultScrollTop()) {
+				scrollToDefault(expanded);
+			}
+		}, raw->lifetime());
+
+		raw->heightValue(
+		) | rpl::filter([=] {
+			return (box->scrollHeight() > 0)
+				&& (defaultScrollTop() > box->scrollTop());
+		}) | rpl::start_with_next([=] {
+			//refreshForDefaultScroll();
+			box->scrollToY(defaultScrollTop());
+		}, raw->lifetime());
+
 		stories->incrementPreloadingHiddenSources();
 		raw->lifetime().add([=] {
 			stories->decrementPreloadingHiddenSources();

From b46659eb222c2a4f40cf01b78ce6ed4dc60120cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 20:26:00 +0400
Subject: [PATCH 337/676] Restore scroll to collapsed stories in chats list.

---
 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 7587706a8..6789e88de 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3342,7 +3342,8 @@ void InnerWidget::saveChatsFilterScrollState(FilterId filterId) {
 void InnerWidget::restoreChatsFilterScrollState(FilterId filterId) {
 	const auto it = _chatsFilterScrollStates.find(filterId);
 	if (it != end(_chatsFilterScrollStates)) {
-		_mustScrollTo.fire({ it->second, -1 });
+		const auto top = std::max(it->second, defaultScrollTop());
+		_mustScrollTo.fire({ top, -1 });
 	}
 }
 

From fda2f56fd80b29f9b5267127246272bf85a2b83a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 20:26:43 +0400
Subject: [PATCH 338/676] Don't copy empty selected text.

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

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 857803c17..cd2fa4685 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2341,7 +2341,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		const auto item = _dragStateItem;
 		const auto itemId = item ? item->fullId() : FullMsgId();
 		if (isUponSelected > 0) {
-			if (!hasCopyRestrictionForSelected()) {
+			if (!hasCopyRestrictionForSelected()
+				&& !getSelectedText().empty()) {
 				_menu->addAction(
 					(isUponSelected > 1
 						? tr::lng_context_copy_selected_items(tr::now)
@@ -2442,7 +2443,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			: QString();
 
 		if (isUponSelected > 0) {
-			if (!hasCopyRestrictionForSelected()) {
+			if (!hasCopyRestrictionForSelected()
+				&& !getSelectedText().empty()) {
 				_menu->addAction(
 					((isUponSelected > 1)
 						? tr::lng_context_copy_selected_items(tr::now)
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 4992cca85..be51f4b50 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -995,7 +995,9 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 		list,
 		st::popupMenuWithIcons);
 
-	if (request.overSelection && !list->hasCopyRestrictionForSelected()) {
+	if (request.overSelection
+		&& !list->hasCopyRestrictionForSelected()
+		&& !list->getSelectedText().empty()) {
 		const auto text = request.selectedItems.empty()
 			? tr::lng_context_copy_selected(tr::now)
 			: tr::lng_context_copy_selected_items(tr::now);

From fba1b7925246a26bc2007d8a6c9de331577ccae1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 20:27:02 +0400
Subject: [PATCH 339/676] Don't delete files on Shift+Drop on Windows.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp    | 3 ++-
 Telegram/SourceFiles/history/history_drag_area.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 9268b4fcd..11f72ace9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2024,7 +2024,8 @@ void Widget::dropEvent(QDropEvent *e) {
 	if (_scroll->geometry().contains(e->pos())) {
 		const auto point = mapToGlobal(e->pos());
 		if (const auto thread = _inner->updateFromParentDrag(point)) {
-			e->acceptProposedAction();
+			e->setDropAction(Qt::CopyAction);
+			e->accept();
 			controller()->content()->filesOrForwardDrop(
 				thread,
 				e->mimeData());
diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp
index 8b64a46bf..5c2cebf38 100644
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@@ -206,7 +206,8 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 
 		*attachDragState = DragState::None;
 		updateDragAreas();
-		e->acceptProposedAction();
+		e->setDropAction(Qt::CopyAction);
+		e->accept();
 	};
 
 	const auto processDragEvents = [=](not_null<QEvent*> event) {

From 71e341237de50072baacc20221d7d8738cd3439b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 21:25:36 +0400
Subject: [PATCH 340/676] Improve touchscreen chats list stories physics.

---
 .../dialogs/dialogs_inner_widget.cpp          |  4 +++
 .../dialogs/dialogs_inner_widget.h            |  1 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 25 +++++++++++++++++++
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  1 +
 .../dialogs/ui/dialogs_stories_list.cpp       | 13 +++++++++-
 .../dialogs/ui/dialogs_stories_list.h         |  2 ++
 Telegram/lib_ui                               |  2 +-
 7 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 6789e88de..35a19da9a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -479,6 +479,10 @@ rpl::producer<bool> InnerWidget::storiesExpandedRequests() const {
 		_storiesExpandedRequests.events());
 }
 
+void InnerWidget::setTouchScrollActive(bool active) {
+	_stories->setTouchScrollActive(active);
+}
+
 int InnerWidget::defaultScrollTop() const {
 	return storiesShown()
 		? std::max(_stories->height() - st::dialogsStories.height, 0)
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index ce70f3bb3..b23aefa0d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -104,6 +104,7 @@ public:
 		const QVector<MTPPeer> &my,
 		const QVector<MTPPeer> &result);
 
+	void setTouchScrollActive(bool active);
 	[[nodiscard]] rpl::producer<bool> storiesExpandedRequests() const;
 	[[nodiscard]] int defaultScrollTop() const;
 	void setViewportHeight(int viewportHeight);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 11f72ace9..74bbd6da8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -327,6 +327,9 @@ Widget::Widget(
 	_scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
 		return customWheelProcess(e);
 	});
+	_scroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
+		return customTouchProcess(e);
+	});
 
 	session().data().chatsListChanges(
 	) | rpl::filter([=](Data::Folder *folder) {
@@ -856,6 +859,7 @@ void Widget::changeOpenedSubsection(
 		}
 		oldContentCache = grabForFolderSlideAnimation();
 	}
+	_scroll->verticalScrollBar()->setMinimum(0);
 	_showAnimation = nullptr;
 	destroyChildListCanvas();
 	change();
@@ -2394,6 +2398,27 @@ bool Widget::customWheelProcess(not_null<QWheelEvent*> e) {
 	return false;
 }
 
+bool Widget::customTouchProcess(not_null<QTouchEvent*> e) {
+	const auto type = e->type();
+	const auto now = _scroll->scrollTop();
+	const auto def = _inner->defaultScrollTop();
+	const auto bar = _scroll->verticalScrollBar();
+	_allowStoriesExpandTimer.cancel();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate) {
+		_inner->setTouchScrollActive(true);
+		bar->setMinimum(0);
+	} else if (type == QEvent::TouchEnd || type == QEvent::TouchCancel) {
+		_inner->setTouchScrollActive(false);
+		if (def > 0 && now >= def) {
+			bar->setMinimum(def);
+		} else {
+			bar->setMinimum(0);
+		}
+	}
+	return false;
+}
+
 void Widget::resizeEvent(QResizeEvent *e) {
 	updateControlsGeometry();
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 11a9e4648..901f0c609 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -137,6 +137,7 @@ private:
 	void filterCursorMoved();
 	void completeHashtag(QString tag);
 	bool customWheelProcess(not_null<QWheelEvent*> e);
+	bool customTouchProcess(not_null<QTouchEvent*> e);
 
 	[[nodiscard]] QString currentSearchQuery() const;
 	void clearSearchField();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index f1490669f..a76cb5deb 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -306,7 +306,7 @@ List::Layout List::computeLayout() {
 		_lastHeight = shownHeight;
 		if (_lastHeight == st.height || _lastHeight == full.height) {
 			_snapExpandedTimer.cancel();
-		} else {
+		} else if (!_touchScrollActive) {
 			_snapExpandedTimer.callOnce(kSnapExpandedTimeout);
 		}
 	}
@@ -831,6 +831,17 @@ void List::setBgOverride(QBrush brush) {
 	_bgOverride = std::move(brush);
 }
 
+void List::setTouchScrollActive(bool active) {
+	if (_touchScrollActive != active) {
+		_touchScrollActive = active;
+		if (active) {
+			_snapExpandedTimer.cancel();
+		} else {
+			requestExpanded(_expanded);
+		}
+	}
+}
+
 void List::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 1259a0beb..e1bebe00f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -69,6 +69,7 @@ public:
 		Fn<int()> shownHeight);
 
 	void setBgOverride(QBrush brush);
+	void setTouchScrollActive(bool active);
 
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] rpl::producer<uint64> showProfileRequests() const;
@@ -189,6 +190,7 @@ private:
 	float64 _lastRatio = 0.;
 	int _lastHeight = 0;
 	bool _expanded = false;
+	bool _touchScrollActive = false;
 
 	int _selected = -1;
 	int _pressed = -1;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 8908c9b5c..6fe9e0838 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 8908c9b5c041f51176383a55e0b324588b28b68d
+Subproject commit 6fe9e0838685b0a799057a9218c4beca0cd7c52e

From 24012a76b34f250dc27e1b51ac0f1ca1affbe034 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Jun 2023 15:05:26 +0400
Subject: [PATCH 341/676] Fix stories snap-by-timeout on macOS.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 6fe9e0838..a6d472ee6 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 6fe9e0838685b0a799057a9218c4beca0cd7c52e
+Subproject commit a6d472ee686dd5465d3e1ab58bea11a21d0dd24a

From 1cd20ff5e2f524f12cab3bbf89666e33eb5d6e1c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Jun 2023 18:55:35 +0400
Subject: [PATCH 342/676] Implement custom scrolling using DirectManipulation.

Use it in Ui::RpWindow. This is an experiment.

Thanks Chromium and Firefox.
---
 Telegram/lib_base | 2 +-
 Telegram/lib_ui   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 4efa613fe..74be75339 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 4efa613fe3fb5e1db8a4c53b08852cfe538d2601
+Subproject commit 74be75339d474df1a2863028ec146744597bd0bb
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a6d472ee6..855f8f7b7 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a6d472ee686dd5465d3e1ab58bea11a21d0dd24a
+Subproject commit 855f8f7b75f83127642eb5bbb1457f2087b3f1de

From 75d4ba7be1b3fdfbce698f24f9b5ee4b872c2846 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Jun 2023 11:09:46 +0400
Subject: [PATCH 343/676] Use scroll phase information from wheel events.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 49 ++++++++++++-------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  1 +
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 74bbd6da8..e921e8ec1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2382,40 +2382,51 @@ void Widget::completeHashtag(QString tag) {
 }
 
 bool Widget::customWheelProcess(not_null<QWheelEvent*> e) {
-	const auto now = _scroll->scrollTop();
-	const auto def = _inner->defaultScrollTop();
-	const auto bar = _scroll->verticalScrollBar();
-	const auto allow = (def <= 0)
-		|| (now < def)
-		|| (now == def && !_allowStoriesExpandTimer.isActive());
-	if (allow) {
-		_scroll->verticalScrollBar()->setMinimum(0);
-		_allowStoriesExpandTimer.cancel();
-	} else {
-		bar->setMinimum(def);
-		_allowStoriesExpandTimer.callOnce(kWaitTillAllowStoriesExpand);
-	}
+	customScrollProcess(e->phase());
 	return false;
 }
 
-bool Widget::customTouchProcess(not_null<QTouchEvent*> e) {
-	const auto type = e->type();
+void Widget::customScrollProcess(Qt::ScrollPhase phase) {
 	const auto now = _scroll->scrollTop();
 	const auto def = _inner->defaultScrollTop();
 	const auto bar = _scroll->verticalScrollBar();
-	_allowStoriesExpandTimer.cancel();
-	if (type == QEvent::TouchBegin
-		|| type == QEvent::TouchUpdate) {
+	if (phase == Qt::ScrollBegin || phase == Qt::ScrollUpdate) {
+		_allowStoriesExpandTimer.cancel();
 		_inner->setTouchScrollActive(true);
 		bar->setMinimum(0);
-	} else if (type == QEvent::TouchEnd || type == QEvent::TouchCancel) {
+	} else if (phase == Qt::ScrollEnd || phase == Qt::ScrollMomentum) {
+		_allowStoriesExpandTimer.cancel();
 		_inner->setTouchScrollActive(false);
 		if (def > 0 && now >= def) {
 			bar->setMinimum(def);
 		} else {
 			bar->setMinimum(0);
 		}
+	} else {
+		const auto allow = (def <= 0)
+			|| (now < def)
+			|| (now == def && !_allowStoriesExpandTimer.isActive());
+		if (allow) {
+			_scroll->verticalScrollBar()->setMinimum(0);
+			_allowStoriesExpandTimer.cancel();
+		} else {
+			bar->setMinimum(def);
+			_allowStoriesExpandTimer.callOnce(kWaitTillAllowStoriesExpand);
+		}
 	}
+}
+
+bool Widget::customTouchProcess(not_null<QTouchEvent*> e) {
+	const auto type = e->type();
+	customScrollProcess([&] {
+		switch (e->type()) {
+		case QEvent::TouchBegin: return Qt::ScrollBegin;
+		case QEvent::TouchUpdate: return Qt::ScrollUpdate;
+		case QEvent::TouchEnd:
+		case QEvent::TouchCancel: return Qt::ScrollEnd;
+		}
+		Unexpected("Touch event type in Widdget::customTouchProcess.");
+	}());
 	return false;
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 901f0c609..686ce1b23 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -138,6 +138,7 @@ private:
 	void completeHashtag(QString tag);
 	bool customWheelProcess(not_null<QWheelEvent*> e);
 	bool customTouchProcess(not_null<QTouchEvent*> e);
+	void customScrollProcess(Qt::ScrollPhase phase);
 
 	[[nodiscard]] QString currentSearchQuery() const;
 	void clearSearchField();

From 3d795f2f67f07466271bc1949d3effbd14082c63 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Jun 2023 14:48:14 +0400
Subject: [PATCH 344/676] Implement story mention messages.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   5 +
 Telegram/SourceFiles/data/data_document.h     |   1 +
 .../SourceFiles/data/data_media_types.cpp     |  65 ++++++---
 Telegram/SourceFiles/data/data_media_types.h  |   8 +-
 Telegram/SourceFiles/data/data_story.cpp      |  19 ++-
 Telegram/SourceFiles/data/data_story.h        |   4 +-
 .../dialogs/ui/dialogs_stories_content.cpp    |  41 +++---
 .../dialogs/ui/dialogs_stories_content.h      |   7 +
 Telegram/SourceFiles/history/history_item.cpp |  59 +++++---
 Telegram/SourceFiles/history/history_item.h   |   2 +
 .../history/history_item_helpers.cpp          |   4 +-
 .../history/history_item_helpers.h            |   1 +
 .../history/view/history_view_element.cpp     |  13 +-
 .../view/media/history_view_premium_gift.cpp  |   4 +-
 .../view/media/history_view_premium_gift.h    |   2 +-
 .../view/media/history_view_service_box.cpp   |  12 +-
 .../view/media/history_view_service_box.h     |   2 +-
 .../view/media/history_view_story_mention.cpp | 134 ++++++++++++++++++
 .../view/media/history_view_story_mention.h   |  65 +++++++++
 .../media/history_view_theme_document.cpp     |   4 +-
 .../view/media/history_view_theme_document.h  |   2 +-
 .../media/history_view_userpic_suggestion.cpp |   4 +-
 .../media/history_view_userpic_suggestion.h   |   2 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   6 +-
 Telegram/lib_ui                               |   2 +-
 26 files changed, 386 insertions(+), 84 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_story_mention.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a4ac996e8..329e16226 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -700,6 +700,8 @@ PRIVATE
     history/view/media/history_view_sticker_player.cpp
     history/view/media/history_view_sticker_player.h
     history/view/media/history_view_sticker_player_abstract.h
+    history/view/media/history_view_story_mention.cpp
+    history/view/media/history_view_story_mention.h
     history/view/media/history_view_theme_document.cpp
     history/view/media/history_view_theme_document.h
     history/view/media/history_view_userpic_suggestion.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f0dddd290..23d4d4649 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1574,6 +1574,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_topic_icon_changed" = "{from} changed the {link} icon to {emoji}";
 "lng_action_topic_icon_removed" = "{from} removed the {link} icon";
 "lng_action_shared_chat_with_bot" = "You shared {chat} with {bot}";
+"lng_action_story_mention_me" = "You mentioned {user} in a story";
+"lng_action_story_mention" = "{user} mentioned you in a story";
+"lng_action_story_mention_button" = "View Story";
+"lng_action_story_mention_me_unavailable" = "The story where you mentioned {user} is no longer available.";
+"lng_action_story_mention_unavailable" = "The story where {user} mentioned you is no longer available.";
 
 "lng_premium_gift_duration_months#one" = "for {count} month";
 "lng_premium_gift_duration_months#other" = "for {count} months";
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index ded87abfd..9f013e373 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -301,6 +301,7 @@ private:
 		PossibleCoverThumbnail = 0x0400,
 		UseTextColor = 0x0800,
 		StoryDocument = 0x1000,
+		SilentVideo = 0x2000,
 	};
 	using Flags = base::flags<Flag>;
 	friend constexpr bool is_flag_type(Flag) { return true; };
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 79f99591d..ac5476a1b 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_slot_machine.h"
 #include "history/view/media/history_view_dice.h"
 #include "history/view/media/history_view_service_box.h"
+#include "history/view/media/history_view_story_mention.h"
 #include "history/view/media/history_view_premium_gift.h"
 #include "history/view/media/history_view_userpic_suggestion.h"
 #include "dialogs/ui/dialogs_message_view.h"
@@ -415,6 +416,10 @@ bool Media::storyExpired() const {
 	return false;
 }
 
+bool Media::storyMention() const {
+	return false;
+}
+
 bool Media::uploading() const {
 	return false;
 }
@@ -1979,20 +1984,31 @@ std::unique_ptr<HistoryView::Media> MediaWallPaper::createView(
 		std::make_unique<HistoryView::ThemeDocumentBox>(message, _paper));
 }
 
-MediaStory::MediaStory(not_null<HistoryItem*> parent, FullStoryId storyId)
+MediaStory::MediaStory(
+	not_null<HistoryItem*> parent,
+	FullStoryId storyId,
+	bool mention)
 : Media(parent)
-, _storyId(storyId) {
+, _storyId(storyId)
+, _mention(mention) {
 	const auto stories = &parent->history()->owner().stories();
 	if (const auto maybeStory = stories->lookup(storyId)) {
-		parent->setText((*maybeStory)->caption());
+		if (!_mention) {
+			parent->setText((*maybeStory)->caption());
+		}
 	} else {
 		if (maybeStory.error() == NoStory::Unknown) {
 			stories->resolve(storyId, crl::guard(this, [=] {
 				if (const auto maybeStory = stories->lookup(storyId)) {
-					parent->setText((*maybeStory)->caption());
+					if (!_mention) {
+						parent->setText((*maybeStory)->caption());
+					}
 				} else {
 					_expired = true;
 				}
+				if (_mention) {
+					parent->updateStoryMentionText();
+				}
 				parent->history()->owner().requestItemViewRefresh(parent);
 			}));
 		} else {
@@ -2002,7 +2018,7 @@ MediaStory::MediaStory(not_null<HistoryItem*> parent, FullStoryId storyId)
 }
 
 std::unique_ptr<Media> MediaStory::clone(not_null<HistoryItem*> parent) {
-	return std::make_unique<MediaStory>(parent, _storyId);
+	return std::make_unique<MediaStory>(parent, _storyId, false);
 }
 
 FullStoryId MediaStory::storyId() const {
@@ -2013,6 +2029,10 @@ bool MediaStory::storyExpired() const {
 	return _expired;
 }
 
+bool MediaStory::storyMention() const {
+	return _mention;
+}
+
 TextWithEntities MediaStory::notificationText() const {
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
@@ -2064,12 +2084,17 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
 	if (!maybeStory) {
-		realParent->setText(TextWithEntities());
+		if (!_mention) {
+			realParent->setText(TextWithEntities());
+		}
 		if (maybeStory.error() == Data::NoStory::Deleted) {
 			_expired = true;
 			return nullptr;
 		}
 		_expired = false;
+		if (_mention) {
+			return nullptr;
+		}
 		return std::make_unique<HistoryView::Photo>(
 			message,
 			realParent,
@@ -2078,19 +2103,25 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	}
 	_expired = false;
 	const auto story = *maybeStory;
-	realParent->setText(story->caption());
-	if (const auto photo = story->photo()) {
-		return std::make_unique<HistoryView::Photo>(
+	if (_mention) {
+		return std::make_unique<HistoryView::ServiceBox>(
 			message,
-			realParent,
-			photo,
-			spoiler);
+			std::make_unique<HistoryView::StoryMention>(message, story));
 	} else {
-		return std::make_unique<HistoryView::Gif>(
-			message,
-			realParent,
-			story->document(),
-			spoiler);
+		realParent->setText(story->caption());
+		if (const auto photo = story->photo()) {
+			return std::make_unique<HistoryView::Photo>(
+				message,
+				realParent,
+				photo,
+				spoiler);
+		} else {
+			return std::make_unique<HistoryView::Gif>(
+				message,
+				realParent,
+				story->document(),
+				spoiler);
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index a77e26e46..f60bc82a1 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -115,6 +115,7 @@ public:
 	virtual const WallPaper *paper() const;
 	virtual FullStoryId storyId() const;
 	virtual bool storyExpired() const;
+	virtual bool storyMention() const;
 
 	virtual bool uploading() const;
 	virtual Storage::SharedMediaTypesMask sharedMediaTypes() const;
@@ -570,12 +571,16 @@ private:
 
 class MediaStory final : public Media, public base::has_weak_ptr {
 public:
-	MediaStory(not_null<HistoryItem*> parent, FullStoryId storyId);
+	MediaStory(
+		not_null<HistoryItem*> parent,
+		FullStoryId storyId,
+		bool mention);
 
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
 	FullStoryId storyId() const override;
 	bool storyExpired() const override;
+	bool storyMention() const override;
 
 	TextWithEntities notificationText() const override;
 	QString pinnedTextSubstring() const override;
@@ -594,6 +599,7 @@ public:
 
 private:
 	const FullStoryId _storyId;
+	const bool _mention = false;
 	bool _expired = false;
 
 };
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index cf31749f4..dd11bcc0e 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -248,28 +248,24 @@ bool Story::pinned() const {
 	return _pinned;
 }
 
-void Story::setIsPublic(bool isPublic) {
-	_isPublic = isPublic;
-}
-
 bool Story::isPublic() const {
 	return _isPublic;
 }
 
-void Story::setCloseFriends(bool closeFriends) {
-	_closeFriends = closeFriends;
-}
-
 bool Story::closeFriends() const {
 	return _closeFriends;
 }
 
+bool Story::forbidsForward() const {
+	return _noForwards;
+}
+
 bool Story::canDownload() const {
-	return _peer->isSelf();
+	return !forbidsForward() || _peer->isSelf();
 }
 
 bool Story::canShare() const {
-	return isPublic() && (pinned() || !expired());
+	return isPublic() && !forbidsForward() && (pinned() || !expired());
 }
 
 bool Story::canDelete() const {
@@ -375,6 +371,7 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	const auto pinned = data.is_pinned();
 	const auto isPublic = data.is_public();
 	const auto closeFriends = data.is_close_friends();
+	const auto noForwards = data.is_noforwards();
 	auto caption = TextWithEntities{
 		data.vcaption().value_or_empty(),
 		Api::EntitiesFromMTP(
@@ -400,6 +397,7 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 		|| (_pinned != pinned)
 		|| (_isPublic != isPublic)
 		|| (_closeFriends != closeFriends)
+		|| (_noForwards != noForwards)
 		|| (_caption != caption)
 		|| (views >= 0 && _views != views)
 		|| (_recentViewers != recent);
@@ -410,6 +408,7 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	_pinned = pinned;
 	_isPublic = isPublic;
 	_closeFriends = closeFriends;
+	_noForwards = noForwards;
 	_caption = std::move(caption);
 	if (views >= 0) {
 		_views = views;
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 1f4801efd..183e46808 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -86,10 +86,9 @@ public:
 
 	void setPinned(bool pinned);
 	[[nodiscard]] bool pinned() const;
-	void setIsPublic(bool isPublic);
 	[[nodiscard]] bool isPublic() const;
-	void setCloseFriends(bool closeFriends);
 	[[nodiscard]] bool closeFriends() const;
+	[[nodiscard]] bool forbidsForward() const;
 
 	[[nodiscard]] bool canDownload() const;
 	[[nodiscard]] bool canShare() const;
@@ -128,6 +127,7 @@ private:
 	bool _pinned : 1 = false;
 	bool _isPublic : 1 = false;
 	bool _closeFriends : 1 = false;
+	bool _noForwards : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index acce7637e..e686811aa 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -144,11 +144,12 @@ QImage PeerUserpic::image(int size) {
 	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
 	const auto key = _peer->userpicUniqueKey(_subscribed->view);
 	if (!good || (_subscribed->key != key && !waitingUserpicLoad())) {
+		const auto ratio = style::DevicePixelRatio();
 		_subscribed->key = key;
 		_frame = QImage(
-			QSize(size, size) * style::DevicePixelRatio(),
+			QSize(size, size) * ratio,
 			QImage::Format_ARGB32_Premultiplied);
-		_frame.setDevicePixelRatio(style::DevicePixelRatio());
+		_frame.setDevicePixelRatio(ratio);
 		_frame.fill(Qt::transparent);
 
 		auto p = Painter(&_frame);
@@ -216,6 +217,7 @@ QImage StoryThumbnail::image(int size) {
 				Qt::SmoothTransformation);
 		}
 		_prepared = Images::Circle(std::move(_prepared));
+		_prepared.setDevicePixelRatio(ratio);
 	}
 	return _prepared;
 }
@@ -309,6 +311,7 @@ QImage EmptyThumbnail::image(int size) {
 			QSize(size, size) * ratio,
 			QImage::Format_ARGB32_Premultiplied);
 		_cached.fill(Qt::black);
+		_cached.setDevicePixelRatio(ratio);
 	}
 	return _cached;
 }
@@ -336,7 +339,7 @@ Content State::next() {
 		if (const auto i = _userpics.find(user); i != end(_userpics)) {
 			userpic = i->second;
 		} else {
-			userpic = std::make_shared<PeerUserpic>(user);
+			userpic = MakeUserpicThumbnail(user);
 			_userpics.emplace(user, userpic);
 		}
 		result.elements.push_back({
@@ -375,19 +378,6 @@ rpl::producer<Content> ContentForSession(
 	};
 }
 
-[[nodiscard]] std::shared_ptr<Thumbnail> PrepareThumbnail(
-		not_null<Data::Story*> story) {
-	using Result = std::shared_ptr<Thumbnail>;
-	const auto id = story->fullId();
-	return v::match(story->media().data, [](v::null_t) -> Result {
-		return std::make_shared<EmptyThumbnail>();
-	}, [&](not_null<PhotoData*> photo) -> Result {
-		return std::make_shared<PhotoThumbnail>(photo, id);
-	}, [&](not_null<DocumentData*> video) -> Result {
-		return std::make_shared<VideoThumbnail>(video, id);
-	});
-}
-
 rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 	using namespace rpl::mappers;
 
@@ -432,7 +422,7 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 							result.elements.reserve(ids.size());
 							result.elements.push_back({
 								.id = uint64(id),
-								.thumbnail = PrepareThumbnail(*maybe),
+								.thumbnail = MakeStoryThumbnail(*maybe),
 								.unread = (id > readTill),
 							});
 						}
@@ -459,4 +449,21 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 	}) | rpl::flatten_latest();
 }
 
+std::shared_ptr<Thumbnail> MakeUserpicThumbnail(not_null<PeerData*> peer) {
+	return std::make_shared<PeerUserpic>(peer);
+}
+
+std::shared_ptr<Thumbnail> MakeStoryThumbnail(
+		not_null<Data::Story*> story) {
+	using Result = std::shared_ptr<Thumbnail>;
+	const auto id = story->fullId();
+	return v::match(story->media().data, [](v::null_t) -> Result {
+		return std::make_shared<EmptyThumbnail>();
+	}, [&](not_null<PhotoData*> photo) -> Result {
+		return std::make_shared<PhotoThumbnail>(photo, id);
+	}, [&](not_null<DocumentData*> video) -> Result {
+		return std::make_shared<VideoThumbnail>(video, id);
+	});
+}
+
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
index 8b25c8313..bdbb3afea 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Data {
 enum class StorySourcesList : uchar;
+class Story;
 } // namespace Data
 
 namespace Main {
@@ -18,6 +19,7 @@ class Session;
 namespace Dialogs::Stories {
 
 struct Content;
+class Thumbnail;
 
 [[nodiscard]] rpl::producer<Content> ContentForSession(
 	not_null<Main::Session*> session,
@@ -25,4 +27,9 @@ struct Content;
 
 [[nodiscard]] rpl::producer<Content> LastForPeer(not_null<PeerData*> peer);
 
+[[nodiscard]] std::shared_ptr<Thumbnail> MakeUserpicThumbnail(
+	not_null<PeerData*> peer);
+[[nodiscard]] std::shared_ptr<Thumbnail> MakeStoryThumbnail(
+	not_null<Data::Story*> story);
+
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 039a7bc8d..72745e74d 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -294,7 +294,7 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 		return std::make_unique<Data::MediaStory>(item, FullStoryId{
 			peerFromUser(media.vuser_id()),
 			media.vid().v,
-		});
+		}, media.is_via_mention());
 	}, [](const MTPDmessageMediaEmpty &) -> Result {
 		return nullptr;
 	}, [](const MTPDmessageMediaUnsupported &) -> Result {
@@ -330,6 +330,10 @@ HistoryItem::HistoryItem(
 	} else if (checked == MediaCheckResult::HasTimeToLive) {
 		createServiceFromMtp(data);
 		applyTTL(data);
+	} else if (checked == MediaCheckResult::HasStoryMention) {
+		setMedia(*data.vmedia());
+		createServiceFromMtp(data);
+		applyTTL(data);
 	} else {
 		createComponents(data);
 		if (const auto media = data.vmedia()) {
@@ -1055,6 +1059,10 @@ void HistoryItem::updateServiceText(PreparedServiceText &&text) {
 	_history->owner().updateDependentMessages(this);
 }
 
+void HistoryItem::updateStoryMentionText() {
+	setServiceText(prepareStoryMentionText());
+}
+
 HistoryMessageReplyMarkup *HistoryItem::inlineReplyMarkup() {
 	if (const auto markup = Get<HistoryMessageReplyMarkup>()) {
 		if (markup->data.flags & ReplyMarkupFlag::Inline) {
@@ -3386,15 +3394,13 @@ void HistoryItem::refreshSentMedia(const MTPMessageMedia *media) {
 void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
 	AddComponents(HistoryServiceData::Bit());
 
+	const auto unread = message.is_media_unread();
 	const auto media = message.vmedia();
 	Assert(media != nullptr);
 
-	const auto mediaType = media->type();
-	switch (mediaType) {
-	case mtpc_messageMediaPhoto: {
-		if (message.is_media_unread()) {
-			const auto &photo = media->c_messageMediaPhoto();
-			const auto ttl = photo.vttl_seconds();
+	media->match([&](const MTPDmessageMediaPhoto &data) {
+		if (unread) {
+			const auto ttl = data.vttl_seconds();
 			Assert(ttl != nullptr);
 
 			setSelfDestruct(HistoryServiceSelfDestruct::Type::Photo, ttl->v);
@@ -3417,11 +3423,9 @@ void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
 				tr::lng_ttl_photo_expired(tr::now, Ui::Text::WithEntities)
 			});
 		}
-	} break;
-	case mtpc_messageMediaDocument: {
-		if (message.is_media_unread()) {
-			const auto &document = media->c_messageMediaDocument();
-			const auto ttl = document.vttl_seconds();
+	}, [&](const MTPDmessageMediaDocument &data) {
+		if (unread) {
+			const auto ttl = data.vttl_seconds();
 			Assert(ttl != nullptr);
 
 			setSelfDestruct(HistoryServiceSelfDestruct::Type::Video, ttl->v);
@@ -3444,10 +3448,11 @@ void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
 				tr::lng_ttl_video_expired(tr::now, Ui::Text::WithEntities)
 			});
 		}
-	} break;
-
-	default: Unexpected("Media type in HistoryItem::createServiceFromMtp()");
-	}
+	}, [&](const MTPDmessageMediaStory &data) {
+		setServiceText(prepareStoryMentionText());
+	}, [](const auto &) {
+		Unexpected("Media type in HistoryItem::createServiceFromMtp()");
+	});
 
 	if (const auto reactions = message.vreactions()) {
 		updateReactions(reactions);
@@ -4816,6 +4821,28 @@ PreparedServiceText HistoryItem::preparePaymentSentText() {
 	return result;
 }
 
+PreparedServiceText HistoryItem::prepareStoryMentionText() {
+	auto result = PreparedServiceText();
+	const auto peer = history()->peer;
+	result.links.push_back(peer->createOpenLink());
+	const auto phrase = (this->media() && this->media()->storyExpired())
+		? (out()
+			? tr::lng_action_story_mention_me_unavailable
+			: tr::lng_action_story_mention_unavailable)
+		: (out()
+			? tr::lng_action_story_mention_me
+			: tr::lng_action_story_mention);
+	result.text = phrase(
+		tr::now,
+		lt_user,
+		Ui::Text::Wrapped(
+			Ui::Text::Bold(peer->shortName()),
+			EntityType::CustomUrl,
+			u"internal:index"_q + QChar(1)),
+		Ui::Text::WithEntities);
+	return result;
+}
+
 PreparedServiceText HistoryItem::prepareCallScheduledText(
 		TimeId scheduleDate) {
 	const auto call = Get<HistoryServiceOngoingCall>();
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index a5bbb3ced..973141ba5 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -196,6 +196,7 @@ public:
 	void checkBuyButton();
 
 	void updateServiceText(PreparedServiceText &&text);
+	void updateStoryMentionText();
 
 	[[nodiscard]] UserData *viaBot() const;
 	[[nodiscard]] UserData *getMessageBot() const;
@@ -608,6 +609,7 @@ private:
 	[[nodiscard]] PreparedServiceText preparePinnedText();
 	[[nodiscard]] PreparedServiceText prepareGameScoreText();
 	[[nodiscard]] PreparedServiceText preparePaymentSentText();
+	[[nodiscard]] PreparedServiceText prepareStoryMentionText();
 	[[nodiscard]] PreparedServiceText prepareInvitedToCallText(
 		const std::vector<not_null<UserData*>> &users,
 		CallId linkCallId);
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index df971938c..c89788248 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -450,7 +450,9 @@ MediaCheckResult CheckMessageMedia(const MTPMessageMedia &media) {
 	}, [](const MTPDmessageMediaDice &) {
 		return Result::Good;
 	}, [](const MTPDmessageMediaStory &data) {
-		return Result::Good;
+		return data.is_via_mention()
+			? Result::HasStoryMention
+			: Result::Good;
 	}, [](const MTPDmessageMediaUnsupported &) {
 		return Result::Unsupported;
 	});
diff --git a/Telegram/SourceFiles/history/history_item_helpers.h b/Telegram/SourceFiles/history/history_item_helpers.h
index 2d9765886..e7ed74290 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.h
+++ b/Telegram/SourceFiles/history/history_item_helpers.h
@@ -44,6 +44,7 @@ enum class MediaCheckResult {
 	Unsupported,
 	Empty,
 	HasTimeToLive,
+	HasStoryMention,
 };
 [[nodiscard]] MediaCheckResult CheckMessageMedia(
 	const MTPMessageMedia &media);
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 6a3f78b8a..f20499bb9 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -841,13 +841,18 @@ 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;
-		if (_text.isEmpty()) {
-			setTextWithLinks(
-				Ui::Text::Italic(u"This story has expired"_q));
+		if (!storyMention) {
+			if (_text.isEmpty()) {
+				setTextWithLinks(
+					Ui::Text::Italic(u"This story has expired"_q));
+			}
+			return;
 		}
-	} else if (_text.isEmpty() == text.empty()) {
+	}
+	if (_text.isEmpty() == text.empty()) {
 	} else if (_flags & Flag::ServiceMessage) {
 		const auto contextDependentText = contextDependentServiceText();
 		const auto &markedText = contextDependentText.text.empty()
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index 252b1e621..ec292be93 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -54,8 +54,8 @@ QString PremiumGift::title() {
 	return tr::lng_premium_summary_title(tr::now);
 }
 
-QString PremiumGift::subtitle() {
-	return FormatGiftMonths(_gift->months());
+TextWithEntities PremiumGift::subtitle() {
+	return { FormatGiftMonths(_gift->months()) };
 }
 
 QString PremiumGift::button() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
index 53431ad2b..edb79ad52 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
@@ -26,7 +26,7 @@ public:
 	int top() override;
 	QSize size() override;
 	QString title() override;
-	QString subtitle() override;
+	TextWithEntities subtitle() override;
 	QString button() override;
 	void draw(
 		Painter &p,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
index e129d28f5..e425bdf65 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/text/text_utilities.h"
 #include "ui/painter.h"
 #include "styles/style_chat.h"
 #include "styles/style_premium.h"
@@ -57,8 +58,15 @@ ServiceBox::ServiceBox(
 	_maxWidth)
 , _subtitle(
 	st::premiumPreviewAbout.style,
-	_content->subtitle(),
-	kDefaultTextOptions,
+	Ui::Text::Filtered(
+		_content->subtitle(),
+		{
+			EntityType::Bold,
+			EntityType::StrikeOut,
+			EntityType::Underline,
+			EntityType::Italic,
+		}),
+	kMarkupTextOptions,
 	_maxWidth)
 , _size(
 	st::msgServiceGiftBoxSize.width(),
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.h b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
index a986b01a8..94347d401 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
@@ -22,7 +22,7 @@ public:
 	[[nodiscard]] virtual int top() = 0;
 	[[nodiscard]] virtual QSize size() = 0;
 	[[nodiscard]] virtual QString title() = 0;
-	[[nodiscard]] virtual QString subtitle() = 0;
+	[[nodiscard]] virtual TextWithEntities subtitle() = 0;
 	[[nodiscard]] virtual QString button() = 0;
 	virtual void draw(
 		Painter &p,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
new file mode 100644
index 000000000..fb9f62f29
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
@@ -0,0 +1,134 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_story_mention.h"
+
+#include "core/click_handler_types.h" // ClickHandlerContext
+#include "data/data_document.h"
+#include "data/data_photo.h"
+#include "data/data_user.h"
+#include "data/data_photo_media.h"
+#include "data/data_file_click_handler.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "dialogs/ui/dialogs_stories_content.h"
+#include "dialogs/ui/dialogs_stories_list.h"
+#include "editor/photo_editor_common.h"
+#include "editor/photo_editor_layer_widget.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/view/media/history_view_sticker_player_abstract.h"
+#include "history/view/history_view_element.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "window/window_session_controller.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/painter.h"
+#include "mainwidget.h"
+#include "apiwrap.h"
+#include "api/api_peer_photo.h"
+#include "settings/settings_information.h" // UpdatePhotoLocally
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+} // namespace
+
+StoryMention::StoryMention(
+	not_null<Element*> parent,
+	not_null<Data::Story*> story)
+: _parent(parent)
+, _story(story) {
+}
+
+StoryMention::~StoryMention() = default;
+
+int StoryMention::top() {
+	return st::msgServiceGiftBoxButtonMargins.top();
+}
+
+QSize StoryMention::size() {
+	return { st::msgServicePhotoWidth, st::msgServicePhotoWidth };
+}
+
+QString StoryMention::title() {
+	return QString();
+}
+
+QString StoryMention::button() {
+	return tr::lng_action_story_mention_button(tr::now);
+}
+
+TextWithEntities StoryMention::subtitle() {
+	return _parent->data()->notificationText();
+}
+
+ClickHandlerPtr StoryMention::createViewLink() {
+	const auto itemId = _parent->data()->fullId();
+	return std::make_shared<LambdaClickHandler>(crl::guard(this, [=](
+			ClickContext) {
+		if (const auto photo = _story->photo()) {
+			_parent->delegate()->elementOpenPhoto(photo, itemId);
+		} else if (const auto video = _story->document()) {
+			_parent->delegate()->elementOpenDocument(video, itemId);
+		}
+	}));
+}
+
+void StoryMention::draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) {
+	const auto showStory = !_story->forbidsForward();
+	if (!_thumbnail || _thumbnailFromStory != showStory) {
+		using namespace Dialogs::Stories;
+		const auto item = _parent->data();
+		const auto history = item->history();
+		_thumbnail = showStory
+			? MakeStoryThumbnail(_story)
+			: MakeUserpicThumbnail(item->out()
+				? history->session().user()
+				: history->peer);
+		_thumbnailFromStory = showStory;
+		_subscribed = false;
+	}
+	if (!_subscribed) {
+		_thumbnail->subscribeToUpdates([=] {
+			_parent->data()->history()->owner().requestViewRepaint(_parent);
+		});
+		_subscribed = true;
+	}
+
+	p.drawImage(
+		geometry.topLeft(),
+		_thumbnail->image(st::msgServicePhotoWidth));
+}
+
+void StoryMention::stickerClearLoopPlayed() {
+}
+
+std::unique_ptr<StickerPlayer> StoryMention::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return nullptr;
+}
+
+bool StoryMention::hasHeavyPart() {
+	return _subscribed;
+}
+
+void StoryMention::unloadHeavyPart() {
+	if (_subscribed) {
+		_subscribed = false;
+		_thumbnail->subscribeToUpdates(nullptr);
+	}
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.h b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
new file mode 100644
index 000000000..9cdacebcb
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/view/media/history_view_media.h"
+#include "history/view/media/history_view_media_unwrapped.h"
+#include "history/view/media/history_view_service_box.h"
+
+namespace Data {
+class Story;
+} // namespace Data
+
+namespace Dialogs::Stories {
+class Thumbnail;
+} // namespace Dialogs::Stories
+
+namespace HistoryView {
+
+class StoryMention final
+	: public ServiceBoxContent
+	, public base::has_weak_ptr {
+public:
+	StoryMention(not_null<Element*> parent, not_null<Data::Story*> story);
+	~StoryMention();
+
+	int top() override;
+	QSize size() override;
+	QString title() override;
+	TextWithEntities subtitle() override;
+	QString button() override;
+	void draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) override;
+	ClickHandlerPtr createViewLink() override;
+
+	bool hideServiceText() override {
+		return true;
+	}
+
+	void stickerClearLoopPlayed() override;
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+private:
+	using Thumbnail = Dialogs::Stories::Thumbnail;
+
+	const not_null<Element*> _parent;
+	const not_null<Data::Story*> _story;
+	std::shared_ptr<Thumbnail> _thumbnail;
+	bool _thumbnailFromStory = false;
+	bool _subscribed = false;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 0cd31f483..ad5dfcac1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -460,8 +460,8 @@ QString ThemeDocumentBox::title() {
 	return QString();
 }
 
-QString ThemeDocumentBox::subtitle() {
-	return _parent->data()->notificationText().text;
+TextWithEntities ThemeDocumentBox::subtitle() {
+	return _parent->data()->notificationText();
 }
 
 QString ThemeDocumentBox::button() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
index f923ca253..94549e951 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
@@ -99,7 +99,7 @@ public:
 	int top() override;
 	QSize size() override;
 	QString title() override;
-	QString subtitle() override;
+	TextWithEntities subtitle() override;
 	QString button() override;
 	void draw(
 		Painter &p,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
index 7056a7780..5c37ccb04 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
@@ -211,8 +211,8 @@ QString UserpicSuggestion::button() {
 		: tr::lng_action_suggested_photo_button(tr::now);
 }
 
-QString UserpicSuggestion::subtitle() {
-	return _photo.parent()->data()->notificationText().text;
+TextWithEntities UserpicSuggestion::subtitle() {
+	return _photo.parent()->data()->notificationText();
 }
 
 ClickHandlerPtr UserpicSuggestion::createViewLink() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
index bed87c324..42ad65f44 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
@@ -30,7 +30,7 @@ public:
 	int top() override;
 	QSize size() override;
 	QString title() override;
-	QString subtitle() override;
+	TextWithEntities subtitle() override;
 	QString button() override;
 	void draw(
 		Painter &p,
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index b9197b033..20a0dd4f4 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1135,7 +1135,7 @@ codeSettings#ad253d78 flags:# allow_flashcall:flags.0?true current_number:flags.
 
 wallPaperSettings#1dc1bca4 flags:# blur:flags.1?true motion:flags.2?true background_color:flags.0?int second_background_color:flags.4?int third_background_color:flags.5?int fourth_background_color:flags.6?int intensity:flags.3?int rotation:flags.4?int = WallPaperSettings;
 
-autoDownloadSettings#baa57628 flags:# disabled:flags.0?true video_preload_large:flags.1?true audio_preload_next:flags.2?true phonecalls_less_data:flags.3?true photo_size_max:int video_size_max:long file_size_max:long video_upload_maxbitrate:int small_queue_active_operations_max:int large_queue_active_operations_max:int = AutoDownloadSettings;
+autoDownloadSettings#baa57628 flags:# disabled:flags.0?true video_preload_large:flags.1?true audio_preload_next:flags.2?true phonecalls_less_data:flags.3?true stories_preload:flags.4?true photo_size_max:int video_size_max:long file_size_max:long video_upload_maxbitrate:int small_queue_active_operations_max:int large_queue_active_operations_max:int = AutoDownloadSettings;
 
 account.autoDownloadSettings#63cacf26 low:AutoDownloadSettings medium:AutoDownloadSettings high:AutoDownloadSettings = account.AutoDownloadSettings;
 
@@ -1530,7 +1530,7 @@ storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long>
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#693206a2 id:int date:int expire_date:int = StoryItem;
-storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
@@ -2087,7 +2087,7 @@ chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
 chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
-stories.sendStory#424cd47a flags:# pinned:flags.2?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int = Updates;
+stories.sendStory#424cd47a flags:# pinned:flags.2?true noforwards:flags.4?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int = Updates;
 stories.editStory#2aae7a41 flags:# id:int media:flags.0?InputMedia caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
 stories.deleteStories#b5d501d7 id:Vector<int> = Vector<int>;
 stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 855f8f7b7..ed00cd280 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 855f8f7b75f83127642eb5bbb1457f2087b3f1de
+Subproject commit ed00cd28098e1b04979e7b2dd3a582b7a8a6713a

From 1d5b57c39c4fd7db83662a65f4791463da6d9be5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Jun 2023 20:50:32 +0400
Subject: [PATCH 345/676] Add video story saved toast to viewer.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../media/view/media_view_overlay_widget.cpp  | 88 +++++++++++++------
 .../media/view/media_view_overlay_widget.h    |  9 +-
 Telegram/lib_ui                               |  2 +-
 4 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 23d4d4649..04a9b2710 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2502,6 +2502,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_title" = "Media viewer";
 "lng_mediaview_saved_to" = "Image was saved to your {downloads} folder";
 "lng_mediaview_saved_images_to" = "Images were saved to your {downloads} folder";
+"lng_mediaview_video_saved_to" = "Video file was saved to your {downloads} folder";
 "lng_mediaview_downloads" = "Downloads";
 "lng_mediaview_playback_speed" = "Playback speed: {speed}";
 "lng_mediaview_rotate_video" = "Rotate video";
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 6fc85848f..1c83f2d5c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -444,20 +444,8 @@ OverlayWidget::OverlayWidget()
 		? Core::App().settings().videoVolume()
 		: Core::Settings::kDefaultVolume;
 
-	const auto text = tr::lng_mediaview_saved_to(
-		tr::now,
-		lt_downloads,
-		Ui::Text::Link(
-			tr::lng_mediaview_downloads(tr::now),
-			"internal:show_saved_message"),
-		Ui::Text::WithEntities);
-	_saveMsgText.setMarkedText(st::mediaviewSaveMsgStyle, text);
-	_saveMsg = QRect(0, 0, _saveMsgText.maxWidth() + st::mediaviewSaveMsgPadding.left() + st::mediaviewSaveMsgPadding.right(), st::mediaviewSaveMsgStyle.font->height + st::mediaviewSaveMsgPadding.top() + st::mediaviewSaveMsgPadding.bottom());
-	_saveMsgImage = QImage(
-		_saveMsg.size() * cIntRetinaFactor(),
-		QImage::Format_ARGB32_Premultiplied);
 	_saveMsgTimer.setCallback([=, delay = st::mediaviewSaveMsgHiding] {
-		_saveMsgAnimation.start([=] { updateImage(); }, 1., 0., delay);
+		_saveMsgAnimation.start([=] { updateSaveMsg(); }, 1., 0., delay);
 	});
 
 	_docRectImage = QImage(
@@ -663,6 +651,40 @@ OverlayWidget::OverlayWidget()
 	orderWidgets();
 }
 
+void OverlayWidget::showSaveMsgToast(const QString &path, auto phrase) {
+	showSaveMsgToastWith(path, phrase(
+		tr::now,
+		lt_downloads,
+		Ui::Text::Link(
+			tr::lng_mediaview_downloads(tr::now),
+			"internal:show_saved_message"),
+		Ui::Text::WithEntities));
+}
+
+void OverlayWidget::showSaveMsgToastWith(
+		const QString &path,
+		const TextWithEntities &text) {
+	_saveMsgFilename = path;
+	_saveMsgText.setMarkedText(st::mediaviewSaveMsgStyle, text);
+	const auto w = _saveMsgText.maxWidth()
+		+ st::mediaviewSaveMsgPadding.left()
+		+ st::mediaviewSaveMsgPadding.right();
+	const auto h = st::mediaviewSaveMsgStyle.font->height
+		+ st::mediaviewSaveMsgPadding.top()
+		+ st::mediaviewSaveMsgPadding.bottom();
+	_saveMsg = QRect((width() - w) / 2, (height() - h) / 2, w, h);
+	const auto toIn = 1.;
+	const auto callback = [=](float64 value) {
+		updateSaveMsg();
+		if (!_saveMsgAnimation.animating()) {
+			_saveMsgTimer.callOnce(st::mediaviewSaveMsgShown);
+		}
+	};
+	const auto duration = st::mediaviewSaveMsgShowing;
+	_saveMsgAnimation.start(callback, 0., 1., duration);
+	updateSaveMsg();
+}
+
 void OverlayWidget::orderWidgets() {
 	_helper->orderWidgets();
 }
@@ -1104,6 +1126,13 @@ void OverlayWidget::documentUpdated(not_null<DocumentData*> document) {
 			: 0;
 		_streamed->controls->setLoadingProgress(ready, _document->size);
 	}
+	if (_stories
+		&& !_documentLoadingTo.isEmpty()
+		&& _document->location(true).isEmpty()) {
+		showSaveMsgToast(
+			base::take(_documentLoadingTo),
+			tr::lng_mediaview_video_saved_to);
+	}
 }
 
 void OverlayWidget::changingMsgId(FullMsgId newId, MsgId oldId) {
@@ -1995,6 +2024,7 @@ void OverlayWidget::assignMediaPointer(DocumentData *document) {
 		} else {
 			_documentMedia = nullptr;
 		}
+		_documentLoadingTo = QString();
 	}
 }
 
@@ -2002,6 +2032,7 @@ void OverlayWidget::assignMediaPointer(not_null<PhotoData*> photo) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 	_document = nullptr;
 	_documentMedia = nullptr;
+	_documentLoadingTo = QString();
 	if (_photo != photo) {
 		_photo = photo;
 		_photoMedia = _photo->createMediaView();
@@ -2349,6 +2380,9 @@ void OverlayWidget::downloadMedia() {
 					}, toName, manager.computeNextStartDate());
 				}
 			}
+			if (_stories && !toName.isEmpty()) {
+				showSaveMsgToast(toName, tr::lng_mediaview_video_saved_to);
+			}
 			location.accessDisable();
 		} else {
 			if (_document->filepath(true).isEmpty()
@@ -2357,7 +2391,15 @@ void OverlayWidget::downloadMedia() {
 					_message ? _message->fullId() : FullMsgId(),
 					_document,
 					DocumentSaveClickHandler::Mode::ToFile);
-				updateControls();
+				_documentLoadingTo = _document->loadingFilePath();
+				if (_stories && _documentLoadingTo.isEmpty()) {
+					toName = _document->filepath(true);
+					if (!toName.isEmpty()) {
+						showSaveMsgToast(
+							toName,
+							tr::lng_mediaview_video_saved_to);
+					}
+				}
 			} else {
 				_saveVisible = contentCanBeSaved();
 				update(_saveNavOver);
@@ -2393,19 +2435,9 @@ void OverlayWidget::downloadMedia() {
 		}
 	}
 	if (!toName.isEmpty()) {
-		_saveMsgFilename = toName;
-		const auto toIn = 1.;
-		_saveMsgAnimation.start(
-			[=](float64 value) {
-				updateImage();
-				if (value == toIn) {
-					_saveMsgTimer.callOnce(st::mediaviewSaveMsgShown);
-				}
-			},
-			0.,
-			toIn,
-			st::mediaviewSaveMsgShowing);
-		updateImage();
+		showSaveMsgToast(toName, (_stories && _document)
+			? tr::lng_mediaview_video_saved_to
+			: tr::lng_mediaview_saved_to);
 	}
 }
 
@@ -5879,7 +5911,7 @@ void OverlayWidget::handleTouchTimer() {
 	_touchRightButton = true;
 }
 
-void OverlayWidget::updateImage() {
+void OverlayWidget::updateSaveMsg() {
 	update(_saveMsg);
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index d323a640e..d90cf8a02 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -278,7 +278,12 @@ private:
 	void showDropdown();
 	void handleTouchTimer();
 	void handleDocumentClick();
-	void updateImage();
+
+	void showSaveMsgToast(const QString &path, auto phrase);
+	void showSaveMsgToastWith(
+		const QString &path,
+		const TextWithEntities &text);
+	void updateSaveMsg();
 
 	void clearBeforeHide();
 	void clearAfterHide();
@@ -533,6 +538,7 @@ private:
 	rpl::lifetime _sessionLifetime;
 	PhotoData *_photo = nullptr;
 	DocumentData *_document = nullptr;
+	QString _documentLoadingTo;
 	std::shared_ptr<Data::PhotoMedia> _photoMedia;
 	std::shared_ptr<Data::DocumentMedia> _documentMedia;
 	base::flat_set<std::shared_ptr<Data::PhotoMedia>> _preloadPhotos;
@@ -689,7 +695,6 @@ private:
 
 	QString _saveMsgFilename;
 	QRect _saveMsg;
-	QImage _saveMsgImage;
 	Ui::Text::String _saveMsgText;
 	SavePhotoVideo _savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 	// _saveMsgAnimation -> _saveMsgTimer -> _saveMsgAnimation.
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ed00cd280..08f805486 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ed00cd28098e1b04979e7b2dd3a582b7a8a6713a
+Subproject commit 08f80548668df2737905365b254624055642b937

From 074a4e3c929d84f57b4697be1af33a6ea19867bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 11:48:18 +0400
Subject: [PATCH 346/676] Track stories deletion and refresh views.

---
 .../SourceFiles/data/data_media_types.cpp     | 10 ++++++-
 Telegram/SourceFiles/data/data_media_types.h  |  1 +
 Telegram/SourceFiles/data/data_msg_id.h       |  9 +++++++
 Telegram/SourceFiles/data/data_session.cpp    | 27 +++++++++++++++++++
 Telegram/SourceFiles/data/data_session.h      |  6 +++++
 Telegram/SourceFiles/data/data_stories.cpp    | 17 ++++++++----
 6 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index ac5476a1b..1367970fc 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1991,7 +1991,10 @@ MediaStory::MediaStory(
 : Media(parent)
 , _storyId(storyId)
 , _mention(mention) {
-	const auto stories = &parent->history()->owner().stories();
+	const auto owner = &parent->history()->owner();
+	owner->registerStoryItem(storyId, parent);
+
+	const auto stories = &owner->stories();
 	if (const auto maybeStory = stories->lookup(storyId)) {
 		if (!_mention) {
 			parent->setText((*maybeStory)->caption());
@@ -2017,6 +2020,11 @@ MediaStory::MediaStory(
 	}
 }
 
+MediaStory::~MediaStory() {
+	const auto owner = &parent()->history()->owner();
+	owner->unregisterStoryItem(_storyId, parent());
+}
+
 std::unique_ptr<Media> MediaStory::clone(not_null<HistoryItem*> parent) {
 	return std::make_unique<MediaStory>(parent, _storyId, false);
 }
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index f60bc82a1..81e034c02 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -575,6 +575,7 @@ public:
 		not_null<HistoryItem*> parent,
 		FullStoryId storyId,
 		bool mention);
+	~MediaStory();
 
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
diff --git a/Telegram/SourceFiles/data/data_msg_id.h b/Telegram/SourceFiles/data/data_msg_id.h
index aa3bf1785..49357d88f 100644
--- a/Telegram/SourceFiles/data/data_msg_id.h
+++ b/Telegram/SourceFiles/data/data_msg_id.h
@@ -194,4 +194,13 @@ struct hash<MsgId> : private hash<int64> {
 	}
 };
 
+template <>
+struct hash<FullStoryId> {
+	size_t operator()(FullStoryId value) const {
+		return QtPrivate::QHashCombine().operator()(
+			std::hash<BareId>()(value.peer.value),
+			value.story);
+	}
+};
+
 } // namespace std
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 6c3100d4d..02437c67c 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3881,6 +3881,33 @@ void Session::destroyAllCallItems() {
 	}
 }
 
+void Session::registerStoryItem(
+		FullStoryId id,
+		not_null<HistoryItem*> item) {
+	_storyItems[id].emplace(item);
+}
+
+void Session::unregisterStoryItem(
+		FullStoryId id,
+		not_null<HistoryItem*> item) {
+	const auto i = _storyItems.find(id);
+	if (i != _storyItems.end()) {
+		auto &items = i->second;
+		if (items.remove(item) && items.empty()) {
+			_storyItems.erase(i);
+		}
+	}
+}
+
+void Session::refreshStoryItemViews(FullStoryId id) {
+	const auto i = _storyItems.find(id);
+	if (i != _storyItems.end()) {
+		for (const auto item : i->second) {
+			requestItemViewRefresh(item);
+		}
+	}
+}
+
 void Session::documentMessageRemoved(not_null<DocumentData*> document) {
 	if (_documentItems.find(document) != _documentItems.end()) {
 		return;
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index c287713d3..9ba13d1a9 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -637,6 +637,9 @@ public:
 		not_null<HistoryItem*> item);
 	void registerCallItem(not_null<HistoryItem*> item);
 	void unregisterCallItem(not_null<HistoryItem*> item);
+	void registerStoryItem(FullStoryId id, not_null<HistoryItem*> item);
+	void unregisterStoryItem(FullStoryId id, not_null<HistoryItem*> item);
+	void refreshStoryItemViews(FullStoryId id);
 
 	void documentMessageRemoved(not_null<DocumentData*> document);
 
@@ -949,6 +952,9 @@ private:
 		UserId,
 		base::flat_set<not_null<ViewElement*>>> _contactViews;
 	std::unordered_set<not_null<HistoryItem*>> _callItems;
+	std::unordered_map<
+		FullStoryId,
+		base::flat_set<not_null<HistoryItem*>>> _storyItems;
 
 	base::flat_set<not_null<WebPageData*>> _webpagesUpdated;
 	base::flat_set<not_null<GameData*>> _gamesUpdated;
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 86ee493e6..15710d021 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -331,6 +331,7 @@ Story *Stories::parseAndApply(
 		return nullptr;
 	}
 	const auto id = data.vid().v;
+	const auto fullId = FullStoryId{ peer->id, id };
 	auto &stories = _stories[peer->id];
 	const auto i = stories.find(id);
 	if (i != end(stories)) {
@@ -349,7 +350,6 @@ Story *Stories::parseAndApply(
 			}
 		}
 		if (mediaChanged) {
-			const auto fullId = result->fullId();
 			_preloaded.remove(fullId);
 			if (_preloading && _preloading->id() == fullId) {
 				_preloading = nullptr;
@@ -357,9 +357,11 @@ Story *Stories::parseAndApply(
 				rebuildPreloadSources(StorySourcesList::Hidden);
 				continuePreloading();
 			}
+			_owner->refreshStoryItemViews(fullId);
 		}
 		return result;
 	}
+	const auto wasDeleted = _deleted.remove(fullId);
 	const auto result = stories.emplace(id, std::make_unique<Story>(
 		id,
 		peer,
@@ -382,10 +384,14 @@ Story *Stories::parseAndApply(
 	}
 
 	if (expired) {
-		_expiring.remove(expires, result->fullId());
-		applyExpired(result->fullId());
+		_expiring.remove(expires, fullId);
+		applyExpired(fullId);
 	} else {
-		registerExpiring(expires, result->fullId());
+		registerExpiring(expires, fullId);
+	}
+
+	if (wasDeleted) {
+		_owner->refreshStoryItemViews(fullId);
 	}
 
 	return result;
@@ -605,7 +611,7 @@ void Stories::finalizeResolve(FullStoryId id) {
 void Stories::applyDeleted(FullStoryId id) {
 	applyRemovedFromActive(id);
 
-	_deleted.emplace(id);
+	_deleted.emplace(id).second;
 	const auto i = _stories.find(id.peer);
 	if (i != end(_stories)) {
 		const auto j = i->second.find(id.story);
@@ -639,6 +645,7 @@ void Stories::applyDeleted(FullStoryId id) {
 			if (_preloading && _preloading->id() == id) {
 				preloadFinished(id);
 			}
+			_owner->refreshStoryItemViews(id);
 			if (i->second.empty()) {
 				_stories.erase(i);
 			}

From 6c960243a922bcb4289937f8b9e4c4d3228e49be Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 12:48:42 +0400
Subject: [PATCH 347/676] Improve story source context menus.

---
 .../Resources/icons/menu/stories_archive.png  | Bin 0 -> 1847 bytes
 .../icons/menu/stories_archive@2x.png         | Bin 0 -> 2395 bytes
 .../icons/menu/stories_archive@3x.png         | Bin 0 -> 2952 bytes
 .../Resources/icons/menu/stories_saved.png    | Bin 0 -> 1935 bytes
 .../Resources/icons/menu/stories_saved@2x.png | Bin 0 -> 2521 bytes
 .../Resources/icons/menu/stories_saved@3x.png | Bin 0 -> 3136 bytes
 Telegram/Resources/langs/lang.strings         |   8 +--
 .../boxes/peer_list_controllers.cpp           |  22 +++----
 Telegram/SourceFiles/data/data_stories.cpp    |   3 +-
 Telegram/SourceFiles/data/data_stories.h      |   1 -
 .../dialogs/dialogs_inner_widget.cpp          |  14 +----
 .../dialogs/ui/dialogs_stories_content.cpp    |  59 ++++++++++++++++--
 .../dialogs/ui/dialogs_stories_content.h      |   9 +++
 .../dialogs/ui/dialogs_stories_list.cpp       |  48 +++++---------
 .../dialogs/ui/dialogs_stories_list.h         |  15 ++---
 Telegram/SourceFiles/ui/menu_icons.style      |   2 +
 16 files changed, 99 insertions(+), 82 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/stories_archive.png
 create mode 100644 Telegram/Resources/icons/menu/stories_archive@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_archive@3x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_saved.png
 create mode 100644 Telegram/Resources/icons/menu/stories_saved@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_saved@3x.png

diff --git a/Telegram/Resources/icons/menu/stories_archive.png b/Telegram/Resources/icons/menu/stories_archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..d86b5dc87df7c9354b102987cacf282e43efe99b
GIT binary patch
literal 1847
zcmbVNZEVzJ9Pf<{2V@R{FchPuB#Vdi?Rq!v8cue*-q^^BxLe@(BJ0|2*W6uO+TPoS
zun`cKL13C8*_@~(V1R(a7hnvQK%$XNKt%W;L0%$akco^T6NXQ3w+k4QNRzft+u!s1
z{omWXXyN?4@h^>sASkcAjHv|oY37-m1+L1JoqNG;oLaV2hoA|Q&C>$4e*_TOH>Ik8
z5nwB5UWs6wpwx(1BBBB`1kIh7P&qy%8gPwRC&_N4zw0OhOM)9&;$R6@^@>5MtX>oS
z^$V-``Vj9Dka=&wa}zWmh=>LUCn8~4rxR`@#Y=;=`5H&y6vPO*5sxVd2iQfhSJ6b+
zg^?&v5F|Xug>g>7KF2}LhHZq6!U+nuQ7GZ09Yr)X2TmUdkkf=(x{@hPi-9LM5;P2z
z#_@POj>RcV(duy0<#OSK4Y%1)fI#)6Y;Xxw)@P0~Frv<Dl4?kb44aHxjS@B72rzZT
zhlrY?mGyL-K*aC_r{W|=m_DU|0-wRDQ7xPj7kFF@ixE*abbuu@ST(2^iXK${g*x;3
zF#!-;md$89(UwRgBcU6<7;qyUkSC(`s-!C7m7=ahHD2_^fSEH*Z&cc=iJYNmRf-ZG
z&D5e%lVO`3D}rBJBFTah*R79i5E;%8-H4erlqf<eqKdT9b{lP@UMK7{L5x6IMUZNf
zPlQr5VSfw?YDVA;?x|pbr)w20!U2b+2v;ZKs$7S_nK05`C9G&b7+6Q8tYBHXT-FUv
z=EZWxjR2o9NfKx$!8@I`B!N1_A`T_(_8Qbl)Q~7a)YRGt&fy|Ca&$kV@KH0fqx*&b
zx&KW~0<Fb`pP9#OII|?^GD!!?N~Sx)FD_57!V;XS0-EE^>UJZ%nO0Fi(yygwj=%_Q
zJSYOv|48=;Ojl}+IH!r8IuNa=mJ<$)$IU(*@dN*-i>Ysq^z0}c3<7hR8A0G7GsHw0
zOfC(Ks5KQN13{Mla>i5ToWxg8t8ZMp))xqDX>M+=crY|H<lkO#aMi=%i$_;I1jk=@
z`$OmUL}Rg8R_mltc0s|p!^zvj_wVgr`C#b$`GD8!&B@8}`_Bvv40Jc#9Ui)~tE;P{
zt*x!mT2fMS?c2_-75DZvHCYzt3=R$!*WJ8$bZbY)^c~jT-rk168!qi?E{@}`oM0FR
zd;9PK`2t;9T6$wvrQg5o$O<clJzrpH4~9Z5*C)AL2k-V@obU5-WKQt@w)q=1U2pX@
zuDpNi%2z<xh(=F;|6yC(h3<xe7SGhFQ|GN3W(Hq4CH4GSxp?u%j?fR+PHr7DW=!kZ
z3Awq@w(pJ~&%W@<<;$0kt;?U;Qnp}0R$kWo#j#kd=v4cmL-bYERX-5qxEY5$-QC?M
zHlxSHi4&bPeI$9ikfJ8<fj&R7W5;u!av%;5TcJ%YXW?WrS=}BE279E5`S~Y*?(3Mb
z9eS}C+wSQ(&~WG1v+w3j|7qX(?y(h~2i1^JU5}z@-n8PrzP_(5Yp5^2EPQWW{;OI3
zo^yMbfq*t|Sh*Ye<>l(|&Rx4c*aTmKoz5+tot>Y}&a%EE|9D{e(166U>>m`G{rjz3
zmMc>N>vu2RUszZ;HbAuc*Y`BFww@liex_+N$lb=?)f>L?{nluK#$C!M-pXYi=C7^X
Lw~*OWQoZ_bTX&P*

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_archive@2x.png b/Telegram/Resources/icons/menu/stories_archive@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2c59be33802eaa0d1781a5f0b985d2794cc3840
GIT binary patch
literal 2395
zcmbVO3s4hx8jm(0<&9XBR}D)C0ZDd~5CSXV87O#!3e5qb)p5x#$(AG=vx^B2tpr+%
zZMj1cEa)iM6VV<Bh^Hb#rM=>`M*tP^C|ElR(xbI_AS$A_;Wh0|d!6gf?CyVefB)b2
zeZTK9Te2nbRXb}pYX*a17au21rtgsXv|34D2e)f_>D!CiI2p-c*f^Wd6^yDw>lh5?
z54bdqN|PkOazf2PP$C247}Q!C&0vIv8?=Z#3!_*Wm;%>`fctG701HP&K&n6jNwm?J
z5|7K(VXx;VO69p(@(>gV4`YQIV46UUQ3%VRR%uAsAOhxjVR~(T4Farr2$dxQBFzR_
zX_76hXhMgvLO5Ku9D=wkVF(8aMgxTcegKOH@%SLb2YGxp6buW3V7`#GcmT9H9hwOz
zi(?m!(N7{kNl{uD1oe77N6+UFIt9oL2?+rq9?0XdX#|_h(NKtits%Xa7{nMU*Wp?U
zCp0WGBa%U6QzC$Nbs+||c9~W~F6u-p1{x48$mKxhnC5|~d>N<B)~V)=qjC^aVQNf6
zku;XOjMXX$iXfH5uTU?4{+R(<TZv@Z#xMG!Rxg_%shFK~7>k1ZBAS%uXfZGuBZ+LC
z9E;gWyXkF?Mhi#lFoYs>Qi4z|WopZk%Pd|XCy3>nifd3pPx}32113f&Oaz#-#)g8}
zd`QaW!GS!O$KMDA!Vt6ol@KVNne!`9!Ox*|&7cT{{3aNc!<mFmjnDz(YD9s7T8#o=
zEz1Z;6DmSS8>YSE&wC+}!0{TALNszLUMvFWm^nC(!U&(w%Lt^)1cM+UJA@m^X9sin
zLbf0?1I2=bkbox;EbSK)@@#Wvm-eIo=l<7pINe%^>UZ;)8_rx3a2!t3$;w&mh}W?l
ziz^k*ny&&Fk(;Yq1jx;4#ZX}JHU7I5SfJG_F`D#$q<aBI5}A}9(P5DaTCLwKCy;g?
zH22{`9N>S4IREV@J-Y;_2Z4FHJc8(l<spV?=*gv{M-*!8rROBmIbIwoP3!tT?GL_F
zNo!^*X6}4cZUOLf!uP$pX5V2Y@a}<t*s^37z}?g+{%qxkzFy@Meoa`k?4a-c8AHde
zTVUNYN#--tN8DQ(yH7oTK0=!2hDnoX?CUIrqR=jAT|t7+`=zD!HZ~+lw%EU**U!|}
z0w2b<w6)DnO--db2!+Dx>gugqw~mjG+uPf_)U9@NgTum}6*Ap>dV12|ctaE#8qf-g
zL?V;P^i}@s>}+9S;q>(M=D+axd_D*^Ha9od*W<alPaZz3aM~mi{qfZG#Kgo=)VuP_
z)^xVy#|IDkhlbqOuKmL6{=~$gBS$(;pYH5Um&qn)W`qvamoG<Ue(vn-JSey=zuMoQ
zlA4N7jErnksXlQX%+Jq{@O*mw%o(ZCGB0oT?Af!8jiB%Owzl_6O3HeC{QWoAU5)I!
zawT4;Yxc9*$l>hH&ws^aV{2PpdwFOmPoY@l|4p|~GZI{Ocwk`Q8?^QdJw^47oRa#J
zo~5Isnf)a#ei~G(g=B`e-r5@-;OAH0-rnBQ!Ve4Ec69XaUF<~r#fwvulTMLJrP8Wv
zWMt%WSJzGS<jIrWw+d)ADk@yOs+uhS85|Jp>z<l=qqun02P@b?u1t8Z#RbCguQzYX
z(3iH&orYbn^z|j(OR9S@IXQU{U1M!=<<97+rG>?(uZ^!Q`9Qek?wvb-hQgRmZZE(5
zE^Ut+WmSAP-Y@LOe|`Hc4~93h$HvBFGMUE{WZl74`{w56j8=X4dRN!mJ1ura6<xS+
zVP;0JyHr)>R(iX;*KufM#6|p`$BCMn$N(?KCPQ|1%+|PeRY+@7Q`t&kxH|}f$*CzR
zJ_U|@3eUH;#<bIEj4iILtlYn+u5N=vO?P+P>VNd~RK&iQ(t7S(w^!#Q!Et`A=ifUU
zTCU6P@y@siy^hw_8kyGC)?(+)5=nbUhr+vv)AetY#LCZDyS}-(Z*SS#Upme@I5^nd
zJldyB-|k)1Y1L8FKo?F?5pz7zbM<QD>EkBL4&|C3qOD5Y-QBNUx^$^@5B^<K@rufd
zia77E;L<%_Ugg(Md{@6irLwKrCxjkOPfxDTi+ldqQePXNknr*Odg;lAhTXe%eGc}s
z3ET_Lwu+31VE7%bu8yve+`4h&#<{$M;peTHC+=<X@Gu@r;nqKOw0iSU(veR8w2c>6
zeA;WYsCtLhUewA=U_Wr}RL~;F3_GxOcEF>@kCSfa@7Pf=)N}yc%WO@T)UQ1ddMNeU
zlds-B;De&5ho@)RwsK;4c=+74^zWMr_Iy@U6!DUO<f-fSwzk&>1}e(SS;Wzlr|o0w
zES;R3_V3^S<cwkcCy%nCt`;0TF7+3<*?nzH9{ke=(Zo0?8h3rCv9a+@&fi9l)!79-
b?Rd0mLt_MWZ1Q7A^Y2f5Orp3UYP<120HT}I

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_archive@3x.png b/Telegram/Resources/icons/menu/stories_archive@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6369c74cd52818298a5dcf01c0280391ccde761
GIT binary patch
literal 2952
zcmbVO2~-o;8V)`{1kox|u(E`>fJ^p-kdZ|sNKhk70z?bNAu}N%kcmlvB%&xNi-H2B
zE>%#Z;!y;Ja}=uxNCN^Xh;0?csI?aQEC{F=K(KuiL{8h|dp)l?XEJy0eE0j;?@zLW
zHw9Q*eqxEiV5|e#tWfmMHeMDp(C_YpOFlwxvt;be3Jk`|#(0@vzC3P^!I%z+d3+_G
zvk?#=2?P*AVqk(QL589+7*8LS3=~LUB{l|*6-&KvgV*YDSTW><i=cBz9GM?160<dO
zn5)^u6KEs?CWQ0x#(Js%lpq0Cf>>2Tyi@_Gyl|7e0J=7A6LHu{h*IK(^EDd8@;Sj+
zKST~=nFKOkKq8T`3?>2efM^UlbrqIEqELw>Dv?6PlRN;rJ3wV%r#?8;oE#DYp{#XN
z#?U7(oJgsZ0YqYQaxx*AN<ieXL^6}fB$6mZ3I&fM@Cvn5399f?#p3r2ELb6si)BhN
zBE=dR!5Ab_>4igGeHTN5Y?@Z8n938HF`^2T5y=FSF{Vi%B$&p@66Nue#vuU_j)xOq
zsZxPr$<tVw2vH&m5%OQCr(gfc0GeA4XWGUGeMv}|Hla}ZC!t|XCFFx>1y3!5iJ`Cp
zNt6p<|0LAS#l~o4fS()&m57{&Ao1@j75v_1EQLmJ$GSy`r4W*=SpJ6tFbh<|UN~db
z@FaIUmBb@c02&3LP*;*@0EzSt%0VEpQ2jwD6`+&<1VwuW0+rz3f*}DQMC1t|8n8G4
zjD?9ZX)F#qokqY9iAUt9VbnY7q!%0x5GYkBL8$-^WO?Dxm<eJr1d!<<iSEvX@e~Gy
zhNs2QAUu=GbjLI39t<c(K#oBd@6WRkL87s;@6SX3=lLMH7?l<n|Brc$f-|-Rz!ode
zVyUMT!G*U?t>VSl$u0mufw8;2Z~|jlVF)+1E&j(Dct@Kof>F}{QSNsz1tL@?gL2q6
z7R}b*wi6L`o@mtJyEuq{4RP|_A2j<Ojt&Cja(V=z57R>omZFnOj*h4t>dg@h#(Yg6
z%a<p5^n8oNtr)Rqxa&&V#r6rWe7_6+`N+KH489vjM{;q=Jn}SU%qGUYbVuiw7rE_O
zZ2sjt2in2xd-BNq+~dmxlF{G0xyi|cL*9c5RrIf8J37bf9*tkU@OWH5lK8f=ukOwd
zOW1i>-!#)%Gkv+-@7vninwolE_UKGZOq`sY3<g74Sy@0qPHrwIE-r4v2Ax)`J>ip@
zG}74J-F@?*b9s5WpP%3B;o&)SXNBTbT3T9FRaKPPi}8`c%a<<?4Gld-L4@_Atva2K
z!C)khfhj2yZ(jG^JmARnI{mq8kPwFPc>LSG9)lq%IyyQkDr)D>osp3ap3Ud3sb2}@
za=E|1nbYlwiHYK2lI5b%FV5>9K8zI#A$_Alf*=PE9%PWoOqEA*PI<XREPmF~(o#PR
z06<Po4zFPa0B9tV{YkJ|J!W|R0Nr*tzxmTo8Sd@_{r#QhXUfX@`}+$60;8fFSMM`m
zW)D8PUVh=it?#Q#OP{{_<(632*VhMv;QDUfJ*Qzk^0>|`^|#txTvKy%0)a4pT$PhN
zpr2P{pJvj2uCC6BXLh2gu`xy@$|`mvlS5eH&z?O~cIsMN=OKjtJF&NlZ-3o!^JYNd
zQ8XCQ!fkzb@l_Es8+%Iw4z}d5R~$NYXvVE=Pa4gD%@6BSqnW!cxBT3+-wyh$<r6e1
zF0LYx2zz(CMnj{~3P0XsJ$v>^c1wR#Q&ZZ}B$*7mP^i&-nackquV?4P=napHRaKx+
zxGd*kWhLQdx<89`(P8hIFZ1(v*ABn#>x#JW+0vy;U#L4eVQnT_AFGD82M><%9qjG5
zo(-<D@lF}VmKMAjAHP+!`ewT|9$#_){^sU6G4?AK*J(eiO9}M6rg^<W7jo&+rR|pb
z!N>K{SC!evT+za7H*vW(kGHau><-!JLeLIbLdO1HtA5qnbs<{oTARV@UDlJ4nVCHg
z?U@1X%a<>+{M@|mmG7jipi*s4crcmyd$lLa$};>m&&ubl`s%B%WUhucuO+y9KOb^2
zy>a6Pq^T8p)9CaaBLj}@6*V<>C6O+vc_&+k1_q?`j`1&6xv*v!{x!0s*+R7NEc%-&
zmPpF;A|N_$KoS@CGB?xA%xof?yk^eH(+e#>&&&JB(42p=m49AM(B`SH9Q8P2FY9Tu
z<(*c7p?rSJcUKM{wp(~4FRx)QKP=3aToP<iup#F@zO=M-xH{#{@bbp9kx!eOn;|v~
zFSUzlZ*Tv0^v<2Iz2?;}=Es4=bJwpI^=4=rgb&VFRJ>>tTC8R{@AJ(G<iIdYW7K{j
zIibw+Fkd&nXkHcz*ZgC1?joPm-=N<Y7c^MR?MbmM|4Db4*uVN%dV2cIAN=>tPxr_;
z57zhFVlx_9w<{|$Gc&Q;VAI=0XGaDfTh%Ub_Ea?#hb1On!ftr+Q`3Isyjf_IS~`1%
za=9a`9b6jhhUmVAdzU0#?6DU9rVSfxR_ec*%ijH#|0FuzFndvqn?p@aO>0+pc=*KI
zw@sW*RQQzj$4$Jo^`im)?BJ{EGg5w=xZl>ceqlkIUO(~unV@04YX97^%<a5Rw{OI{
zqN1WRK_|kCE!NRot1-j{ahm4=vwenYkjJ8MTU*<f+xoUcXfGast-jNxrk03ombtlQ
zZ44@0{VVV4fk%41QLdXyTCLsP-Jv&k?}qat=Q?{A-mmQF=r|W|E&C?h#<jP%*I-q_
zzJUrUY#TL`dg|0E1JpF8TsLZ16x-sUMkRSl-V<-Vw6?*T>%D6ZYfno@M|1SQ`~A9p
z3dgfN3xi!)KI;mWKSJeKDC<3ylkPLa(Xl8ydsdm%U|-)#r<Fa9cPKK2qSVSdOG%bm
zEFYIeJs;eizR{+nqJraMyVCC5*K<tP=sE*-H#9b`4G;fV?iQpwSKF`_`ZOdY|6A*l
zu`%_6F8!XSk}Gmnx#}vH6Zgb5sCZ4%ai(IOv{R9oh+n>(8F^T1-!Q&?WFWut$NH`}
z!K)&|!g_jpo3+}lA&$9{9j3v3bUK}K_{jl-|Hh-$^%pOG6gKPOX=ZmsEWGRb?rO9B
zGL1&#QxNd1`c?7P$}@}EYsySbO;s9=)04hu^WTkg%8-xCi(`xTbk-REVPgXQH?b<$
HZcY0S{h81^

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_saved.png b/Telegram/Resources/icons/menu/stories_saved.png
new file mode 100644
index 0000000000000000000000000000000000000000..727dc35f301f8aa11736e35bbed1c896f5cb5f02
GIT binary patch
literal 1935
zcmbVN3ry5z96u4A!jKtaU~04}qKMwL_vEg69*jE$-62B~Krm9;@9rvh*Rw6&LnqE?
zHW`b17%@(VY;lQ;GB;!>Xg~#2Hs4G^nat@qVo+ibO*G)X!g0|>XJ(VOU)$gJ`~BbD
zl99eBB5ZP)L?VeuOEqS~dyIIF3xQX5(honv+jv)ME-#UUM~UYs$<AF65qh7=$`NwR
z?-La3kdZW72xK0I3!){G`38@Rq>6xm6ap*b)T6!i4Jg9UdNf;Y#?7u2U}I8!99ZT{
z&!T)ql#WIX3y}F90unfYKq4N8-N_RkJvzioz_s`qLy;kfP^3qbML{IToPngU96)q3
zxs<|jIg+T8ky=`ns8-HJ6u3f(;Yv)Ql;T=Kts#_&NZ>%B97kJ-Oyk0U7<|&BHbHO^
z80L1nWp1U6<*b-or_*7$0#hiY5FzEgPJ#4DoqX&FgAwo)$G8NBbs{1oS;!U(dK8*E
z?1RG<q;>LvIKhZv9@2%$Ww_|m5Rj&VI9D-e9}=f24A_AKI0YVJ<w2~=#tJNNV_!iX
z{QQCdjIG%m)Oe{a4o6Ue7ffrQ8-akl6wPOOT>#4jJX_3Bz_bRM87q3@B2qX&3M`k!
zvi6ZoWsI1NC{!{H5}(aDY1Ylper^LWk^<19V%DU%MykZK<O)KiA>^7lxQf8>VW^p<
z8H@K7P=)pdD6AQp6v)?tX^OD0oP&f8GY--UFqhMcBEc{cDXg94pfI#fIb?;|Or$w^
zfpk(J&8SDA&oYLg2})(r=zvZmRV8W@r7F3~BGt)Na;aQSYk)?fRO<>ABm0dkRV-$9
zWIz2s_b=rb*jl9hjd{d|6H9_fWq6n@Z=fTVfz^SPok51GfFLQcy7ed}rWMd=;5GBc
z5g4X*+W;i}k8}^ic-A7gNe(1iVYFUbP8c*E6Z>%35A5GA4t;yBXGh?05Qxj*2!ap6
zAqJdqa&d4(S<C*MFOh^SN;4*BX(v(zF^Z(z+#`n%doF%!s(1JPQd2XgG&ME#bZhIE
z1)J*Xp0s>6<=L}mC69VKwnWX^zJ2@R#fw9l^Oi4PKk!8DzMnsB+O!kjZ`!>1!>5lN
zXLqVsty*QvEGsLktgKx7sAtqQW8=2&?(Pah$;`O8iH9P)7ka(k9?s|UCDk^aIu&(m
zprxe+s&X7x_{H^_qG;T9F*G6~!hicVJ}EprykY%7T~*bD6(`!;V`4tH`8HII4jUXC
zm|`>F8!jBuYPE;!>%W`Q*4g=XnMIYnXY{P4-`H6;^3b|J>WYn~D>sg<os*DoA+&sM
z?xm|&-=gE=<MWSt9$ebHq_nj3bQrwsKXBlKhxrZb^)qLVEl*BrJbU)ontRvsYMnnF
zJlHtN-tlvsQW<4BfA4zj$&)7^#Ds?S_xDd<u&w}r&7bbiKcYxXj5eLGO!+u0Jbd-L
zP0h_Uh0Uez-W$4k^J3>*XlvUv!xt(Un}DmS$!%R-k-x3{``qq&Uw;Drc;W<mbaeUo
z3PWFCUu^gtzh7T6I5h@*t#SP2_nR&kTCL?36<eL}L`7Zp|5~1xmnT<7<6RPPv8}qg
zx~tyJ-fi2LGu40d=7U?OA|G})?XK-=D8W#4<BG{S8ApBnt(~2__9Q1or!84>Yunf-
zd#kJao<8nvY&vuN_(%Java{X&cYoh8d&0bNVPPS6ddjht=XU9o8qJk6XU5wM8B=r8
z2M3-;@5oT8RG&y^bhNi`s61%zP!#MR{ngfn2Ez<>Zf<VG?$!{=^tkT!F?RnA@t2uq
LN;g)$SFrIP<9Nc5

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_saved@2x.png b/Telegram/Resources/icons/menu/stories_saved@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e68c618230e69169da1a5630e61bec71deda642
GIT binary patch
literal 2521
zcmbVO2~-nj9*>H0xN%i1CBiOY)RhWJCMPgWbTL7Wbp$nXxo*udftX|_Bm)T%+GjX~
zbVWghRiV$KrLG0kS`>6ww~4kKUSJh;mAX_^+=}7>5-sc(uGj8sw{QEsH~GGq`ThU@
z-~XHx#jlE@dd>HuP$<-xXvrF|!>-F?D){Z(h+hGlr#?E_NTJO1c3o2_dn<e?6t_OL
zG>J??S0V~R$CN1vImR^W^Z-qv2$z}lGKB^s>2fSpjf<eir_VxkwNeBn@=+Moi?K9y
zw8em}wXBjVEE+|)5?Z#DE;J)Rfes^ObhA#28xgYz8r6${v+FSnqK`sIjR=Zx8Kftn
z@pLg^!06#jHbVi!Y<g%oQx>M=h4Q%}bPmknvS2QY!)3r>2w#A3L+RrS0_F@#6|zRM
zV%!+G6G3StsYh5WlgY$1ahZf6mBkJZ4`;y~7Kg(C2!=5WCuL>^Zd@>-L4p|-2DP44
z6FA+aQ6?ucND&06j`^U|PpZX@<8cBJW0_@o7MlsXd>RER6_Yr9hCw@OT&ZATT1<!G
zq!D1*lURKkK@!F^;wMy3zW#v$5L*<TwDF@{bh=3sMlv!JxG^4(A4MCbS$d4M1~U>F
z1_c(G31}{Gd80?f224g01}Q;kCo&a3L7C3sF$MIXL^ZA?OvbmqCxA(0BqoAfS!2Kg
z1{apHIS5aHum!;|4}sw^C`u^Rs;r-Y^7uc1f|^mvNZHSVl?p^f7<4k=uv#Ze#aMbg
z6{1gu5fKww!T<~dcHB`GD2l}3MpA|=uo#I50zNa<Y9+#E!+d@i#%IXG_$r2+$CER{
z*aAL-s|*Vls1))r6;ClCFCi2euFOuzEB{aVID;CrmQ4GL^|%_&RT4<F+6a=BHQo_x
zvGnniR!twR0z{^8RksLIxYCL#q4CG+UmSrkwWc%-DE%Ml9)lSP6={+gu!vL;t)DF?
z79h`Z_2HNwtp9d#^xgM*b^;Ctf$KOqg22t>5W{dVxeQ=L)xY#*fyq}ABZ-hEIUXe?
z2kB(<1eZCjLRDdLQ*L8k9_OHWhmc+x2sv{1K+wX-d!;MS?|h3EV2;0=|Erh}7mCB~
zZ9dy~>d`sTt8c&2HvanhRoa>QVPa&&+2OoiRx)%f;1%;~TU-B=CxykumztV_f`h$1
z+`e`=>~<(PScBtzLqkIye(N`E$eH;Eu;Stp6B9?4FA)d?xw*M#mv%ZFj=nzJVBq9F
z9~h`Ud+E|8o6W}K^Rud}YHM$Ib{6KV_mr2HpFe-TqQW1@=H%ogC*Lrcr%lVPto%(u
z|Ikq5>C<l$T7Q54zdQhQaNW9fNpUshHe0Mpb+4^$PIy9M;xotZf`T4&cU!HQCeyyX
zdt>j`9Xz;e*RH(Vd=9633o4PEyL#38kVn3~p`n2|a}AK_=;+vJv{)YY_BJPW0;ttG
zH8L`?`4*Xxk)HmKdjkVLds^T0(`YovccrCsn}zN(W;AgHg0e3+0J6)3LP_VVSDV4A
z!@)Xo<cMCAmUc(vZFe|&SFcWKbgo3v)%{o6+vQQtp`mNnuO}oVRPprpc?c3)k)54=
z?!Xj?#Bt`^bMs3Ca|d3&EL`z<$&R9;=B}=;o}Q0tYirG<(a7DMEfoyZd~B!Qy?Bw@
zwuvC_n{%YYzKfmi?(WiQH)O-Z!xB3PT}#U*g(CM1lfj_PpZ~Nhy>M0ffvT#`lEA>g
zJYHz%mx<(yl9D;j>4SwQW4H8)Z?CV>nxi}leAcI=#3tuIe8by&!HG{cHeR_BFNjA`
zs{PU9$M1hMTr!*XeE!Zg4LJe%6vZLEbVq0DUr(NVbAL}yPn>s^@ncC|{fQGc8>KSF
zH_fl4^}>Y<6t++pLJjnlw7-5WoU$Jtp-r(CQ!Ew>RQ`DvrLCi5@uI+_%uK<Q_`wm+
z!tL7^Q~p_du8YDJi5S#CUX9afahf)7ULO&$MKpEatpkS}>g!*qmq!;iH^&rgtE{X%
z<k8a70(KNdwXO4fe4yD2yYG91BZ$@QyICpP8%xx|J{eC!^6Yl|l@A_7`O{_<Z?zvf
zeAtV&y)Y=<-!nNSrCamvyGvKhIUMZi>6!g-cYlBSxef2Ule!grR@p7@X|;b|8W0em
zDC_yu3s2DNk5*JvnA7BPD01+{3oMEm67siwfBZ1G;ppnMYY#}hKhY0Y_3!`vk(!#L
z3j)86KUP;)2T$La^v#mRN@YuHYcCBhH5#H(bkWwPrs%FkA%^1id5`k{&E3DNt?Yw}
zifDvp<A3#AOUh?5&s$TcP3!IX;^xiygU9d4zhb7QrY;)DQ&vZTj9N4Q_5SRKJ_Q;o
zb=&2z!ROCm`>xiR1+37|{8aM1P0yY_b>3>-dFs@ulf?Fe_1)ca)vYc5cX+2?v$@>k
z#l^E)A|-d8)xUwe*{ED=#AWftql2p&Jo1-UYX=4gpJiu9J8U+uLnaj!7H53nd$YaW
z`ll7>wqr#_p4C=&H@EC{2{b=H@hLH!lYRAN-KR6%tS3$gnr+*7GkSKHmv>ydHvRVT
l#>OH%7cF%SjDT-L-JqJeYu5jLyX((aOynv_-SUmr{{S3>=r#ZV

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_saved@3x.png b/Telegram/Resources/icons/menu/stories_saved@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fc3db0d68c9d57901062163af4889d99e93d545
GIT binary patch
literal 3136
zcmbVO2~-o;8V+DU5y2`_5YQMvWXVES2n3!53K3b$5<roV3`q>hq{#pQ1S{AEMG$2d
zl%-{J305oM!;QKHrR=3FBBw4?<Ozx(MG-qe<h1X!ujh5nnYnl7e)nI$|DSun&&Okx
z_Ihmu0<ntW=@tNwo~nDfI{X|sY`z*ER){@Ar3l2zwW?bUaje7;fmk-q4`f12@9i`;
zD8#ZjU=)Cr3B@oPfpBt>iCJs`0HLA)E?-1PPc&Ucqxc*;I)v<v_ZGVXJice51o$k`
zCy<>eU^{ToF3u<?84VU71RxelCX5kDX)-!`K`srRt3Kn<s09clprf~{6rz~kekfN^
z0-zkQb{IAuZ-=5fU|IGY5|vD}MG^1>A`VZ)5r`PPJ&jDE5vi!f3k|E2aH44eZl5kH
zgWu?A9t4SLI9z;uJT{()1tnaZor8k|4o|=l2pAZFktT>BmJB13nthPq21wZwz8K<z
zB9uxZD+-K-=xEr~_dW>4OJYUR#W=wc!^v1;oE;Xg@@WCcVK3ptv67et<s3E+hyjFv
z2$I5ByCtlc2ST8f2mXcVrR6^;fMe_Jy`<w$Z4nBWR7fHBIM|KFfcz<18kiskZ~=f6
zjFqqf_c+*0GnF@DnyUn0L7*fM1Y<sA%I|~8C;|yfL2U`)i#TAs)arK|05=u{(9x=_
zVek|T5g%wrpphsvJBkgSM8o6XL%l%`KRV$rphWT?pfG1REQs~DU=EuW4N8P8*kQhq
z#RYI;5f_bG3M0)Gi~%LEV%R$3f)(E0G=@kDu|#Zu;YLTpK4bZO4viG;V8<cDwmT5*
z2pBs8iHwONvj7a9NQ60QPr~B?;KP15kR7Ya?1%lF|8u{ugb$Y%E9M`|Q5Bqu5;RY~
z6i!ycVnuuge7-n~;iDE<Kx460?53mHs<Z+e^x|j!KaRkAvGF_r7WzNZ{T?O-qoH_~
z1lY=jqxH9R!okMlRCV~?58QvdxUlxSn*9KW8-Z%N)Pmrbr6vZ5;Lat1TNJ6?JO+W#
z{FULhHIR4zSy+N+NcigB9$T;QN)lDy%G!%$fw%5@Add`->ieX;a$j!ca_ikl3(q54
zcYlOLYKzJ}S02bW+~;mlA6fr%Fw6L2IClEV%sAWrUg_P-zeG$VJEy#qm)T249Jy_+
zRH>q<h_O9tO-`Yk&9~>yO-@Zs&CKZO=;-L`Mx2do*4I1_jdnFQHg<J&RaI4$mzTR7
zf*`1GaM0JzNuf}Tj*f!&FU=Aa`}glp*I%W1{XDmQeE8~BaM)QO7<;$+o1jy{dAYfV
z4jq~+@*Ef(%>4Sro0*9zy<J!Kv?!H@WI=vgc1cMIVsvI=_?F>Ua(Ss!!qL*w()|4T
zz3=8t9pjcEk^TMs2W**4=G3cK2O*b~IYU!Zp-80AFh6}PJG-O1+ibG-)TyyMc{b@(
zwhp^xe5eV&G8;BKI))1ZDHO_2b-O;E?Hm|bziu5_I<j3it?x@SkE~0{Z}Q2%j&@sm
z`(r}SJsRz<KCN~9`0<vO7GiX(AJ2$oWNe(#YE|fND3IT2Z`U(sWQ&{HN?qzivF9#a
zKwc^=G<@u65kwIV^b8OC*1UfG`upqGtDWTH_;~KiNx9y}J$v?4Ii2i3&%L^5_NX5{
zWv;Ked8?OJ@9EI)zP@yV;YS~pM@QpuILkog&X*%Ubj!E`f#Ay@wKO$@PczH2I@enI
zthUxKd3?7(u#pfH6!gf|)%E(+Xm?)N)Z`=@ong`#I~Kfi{QK9_W1%T&mxD2ysM}el
z-7ik0b(~#c^f-68w_Z4?>}`sl=-4s3JZ64wwoLh`{l`-wv%*bpj+85vo)@30sj0cU
zyYo0=o5{&Z6I0W5QG@5Xdb2Obe!{h7Y8qMEOixcsF2-%!cChA%T87r`ko0G5#~o8I
z<mVgstbO94tj2`bE9s}c9XOw3>1#deVSwEsd-1@1nfkf)hv!Qiq<(hGLOOz5f^fFB
z=H~6CE*^VtMxCmuL2T;zrK-Zq(xt;s8C0#N=J#_5bfbcz<)mritrdwxA_JQYFk$8)
zZwDK|RNC{^$qp%V_Td@VoHR5vE@*0Ic>yO}hYSl*@G@6RZOdCY+P%7Y#l^;FlE?2k
ztlPIDr*vc_nqupp;IL&)SZqfb?DgFaJ42oCo+@@W^&mHM>W>{;Z!nmqrN==!sW&MU
zJ{@_@GY=m=<TIvLp43QVhJ{5miuc{@?d{!sx%uVu=ct>-RB&6YjiY06Pxg$ZMj=W|
zZ-a@63CE}mX6ucMEBP%opSn@ya`~*N)-6(9$TdQRF-%7GzdCc~O#f(MV8g+T4E`Lc
z|61#OQKs3<(XWjuG1=#qWrft|^x)XI*)KXFH*LIfpN7_QnCgZ4d8ICU1L(O=gHuwR
zk(V_s<EEbY-*9@d54fAp2u*F|d3eYJ8?F)f?`&;tH|rTHv<Ivy)CUHhJ5sC0>LM;5
zecD_5SvAjs%l(C+UN3tQb<#cc-sPl_*Ed|~^qrnyXJ@CAPT}D;@8vp=k1&f-@Bt)X
za+3`fi|sQt(iZ%rsGQa{rF}!gpEZiBI22*n;<{3iE-M?fr9Y`e6jOv@!NCSeez1)Z
z4Wi?5PK8ybOeQ9>57)8LASgMRK5RNt&|U4@J(<4!;?rGMQ`SNLYrecHOH4#3A6QeC
znVG4pv27AXr53!o_BjNTurUy>>&T6zaF@w#yghU2S8!KHSJx+PEy>TEr6aA(iLs%f
zp>4NXzJMm~)BBozePl7@yGo@W;U1@2p<SxqCtsFpv0*K5Rd)Jli^)*AZ7h7cdi8k4
z&mn$(h-=#N=I5Le-%r1}0~b?X>+*ly7Kh~I<gnT75XFw#xsmgkQEax^L9Oad|Dl<#
z@B6N}xVR|g!Ni2`k3sj{A_H4mTg}7uHaho=<)BRFGd{*Cb36`juzGt5S@~6$*`t9A
zf`21iXIcXALF#WN49gU{sjnDGku?+g^4-qe&xV=`-g@4N#PbegNTly7D$rzdo(uPo
zHMjkQMNC>++WHrt3l$&$R6a4o=23ldMUL?bUTV@<FXl?~!~Le_Cx_vRyKp@k0B!~g
z%j*tgWaJFaWf75EMP-!She)p@=H}+<8*Gb@9W&4R;TEf*57n9E9vWKI%Q7-Cx!2!s
z^`J2}HrC(Y-=r=toyP9cNvv)6;ALfHk%-Zib#)WBGL5&yU%7H6AdHceloXfh>wChO
zD(WGA4R_uHRlJIwpg^FZaZ;hcVlbxUjrNX?8CYRdR7F@pFjCe44o5SdG9Ns9M&DgP
z#^ayAo)+vN&X3C`Z!|Y=va+hJug_0ZXB!FpYTK!UCOrvoqf4*xD!`V@K^{-`Zax{-
n84+>62N4PXfo_<;bDUk7e>?K5%S9`>>Wt5D_i<Bv5}EoNc7hCC

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 04a9b2710..228366602 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3814,8 +3814,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_userpic_builder_emoji_subtitle" = "Choose sticker or emoji";
 
 "lng_stories_my_name" = "My Story";
-"lng_stories_hide_to_contacts" = "Archive";
-"lng_stories_show_in_chats" = "Unarchive";
+"lng_stories_hide_to_contacts" = "Hide";
+"lng_stories_show_in_chats" = "Show in Chats";
 "lng_stories_row_count#one" = "{count} Story";
 "lng_stories_row_count#other" = "{count} Stories";
 "lng_stories_row_unread_and_one" = "{accumulated}, {user}";
@@ -3832,8 +3832,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_title" = "Stories Archive";
 "lng_stories_archive_about" = "Only you can see archived stories unless you choose to save them to your profile.";
 "lng_stories_reply_sent" = "Message Sent";
-"lng_stories_hidden_to_contacts" = "Stories from {user} will now be shown in Contacts, not Chats.";
-"lng_stories_shown_in_chats" = "Stories from {user} will now be shown in Chats, not Contacts.";
+"lng_stories_hidden_to_contacts" = "Stories of {user} were moved to **Contacts**.";
+"lng_stories_shown_in_chats" = "Stories of {user} were moved above the **Chats List**.";
 "lng_stories_delete_one_sure" = "Are you sure you want to delete this story?";
 "lng_stories_delete_sure#one" = "Are you sure you want to delete {count} story?";
 "lng_stories_delete_sure#other" = "Are you sure you want to delete {count} stories?";
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index b1c87eaff..2bf72ee92 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -57,10 +57,10 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		&sessionController->session());
 	const auto raw = controller.get();
 	auto init = [=](not_null<PeerListBox*> box) {
-		using namespace Dialogs;
+		using namespace Dialogs::Stories;
 
 		struct State {
-			Stories::List *stories = nullptr;
+			List *stories = nullptr;
 			QPointer<::Ui::IconButton> toggleSort;
 			Mode mode = ContactsBoxController::SortMode::Online;
 			::Ui::Animations::Simple scrollAnimation;
@@ -82,10 +82,10 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		});
 		raw->setSortMode(Mode::Online);
 
-		auto list = object_ptr<Stories::List>(
+		auto list = object_ptr<List>(
 			box,
 			st::dialogsStoriesList,
-			Stories::ContentForSession(
+			ContentForSession(
 				&sessionController->session(),
 				Data::StorySourcesList::Hidden),
 			[=] { return state->stories->height() - box->scrollTop(); });
@@ -102,17 +102,9 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 				Data::StorySourcesList::Hidden);
 		}, raw->lifetime());
 
-		raw->showProfileRequests(
-		) | rpl::start_with_next([=](uint64 id) {
-			sessionController->showPeerInfo(PeerId(int64(id)));
-		}, raw->lifetime());
-
-		raw->toggleShown(
-		) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
-			stories->toggleHidden(
-				PeerId(int64(request.id)),
-				!request.shown,
-				sessionController->uiShow());
+		raw->showMenuRequests(
+		) | rpl::start_with_next([=](const ShowMenuRequest &request) {
+			FillSourceMenu(sessionController, request);
 		}, raw->lifetime());
 
 		raw->loadMoreRequests(
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 15710d021..61c41ffa3 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -76,7 +76,6 @@ StoriesSourceInfo StoriesSource::info() const {
 		.last = ids.empty() ? 0 : ids.back().date,
 		.unread = unread(),
 		.premium = user->isPremium(),
-		.hidden = hidden,
 	};
 }
 
@@ -943,7 +942,7 @@ void Stories::toggleHidden(
 				tr::now,
 				lt_user,
 				Ui::Text::Bold(name),
-				Ui::Text::WithEntities));
+				Ui::Text::RichLangValue));
 		}
 	});
 
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 648535187..630e8cc31 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -43,7 +43,6 @@ struct StoriesSourceInfo {
 	TimeId last = 0;
 	bool unread = false;
 	bool premium = false;
-	bool hidden = false;
 
 	friend inline bool operator==(
 		StoriesSourceInfo,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 35a19da9a..091ebaf16 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -347,17 +347,9 @@ InnerWidget::InnerWidget(
 			Data::StorySourcesList::NotHidden);
 	}, lifetime());
 
-	_stories->showProfileRequests(
-	) | rpl::start_with_next([=](uint64 id) {
-		_controller->showPeerInfo(PeerId(int64(id)));
-	}, lifetime());
-
-	_stories->toggleShown(
-	) | rpl::start_with_next([=](Stories::ToggleShownRequest request) {
-		session().data().stories().toggleHidden(
-			PeerId(int64(request.id)),
-			!request.shown,
-			_controller->uiShow());
+	_stories->showMenuRequests(
+	) | rpl::start_with_next([=](const Stories::ShowMenuRequest &request) {
+		FillSourceMenu(_controller, request);
 	}, lifetime());
 
 	_stories->loadMoreRequests(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index e686811aa..253b789ce 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -17,9 +17,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_stories.h"
 #include "data/data_user.h"
 #include "dialogs/ui/dialogs_stories_list.h"
+#include "info/stories/info_stories_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
 #include "ui/painter.h"
+#include "window/window_session_controller.h"
+#include "styles/style_menu_icons.h"
 
 namespace Dialogs::Stories {
 namespace {
@@ -325,9 +330,7 @@ State::State(not_null<Data::Stories*> data, Data::StorySourcesList list)
 }
 
 Content State::next() {
-	auto result = Content{
-		.hidden = (_list == Data::StorySourcesList::Hidden)
-	};
+	auto result = Content();
 	const auto &sources = _data->sources(_list);
 	result.elements.reserve(sources.size());
 	for (const auto &info : sources) {
@@ -349,9 +352,6 @@ Content State::next() {
 				: user->shortName()),
 			.thumbnail = std::move(userpic),
 			.unread = info.unread,
-			.suggestHide = !info.hidden,
-			.suggestUnhide = info.hidden,
-			.profile = true,
 			.skipSmall = user->isSelf(),
 		});
 	}
@@ -466,4 +466,51 @@ std::shared_ptr<Thumbnail> MakeStoryThumbnail(
 	});
 }
 
+void FillSourceMenu(
+		not_null<Window::SessionController*> controller,
+		const ShowMenuRequest &request) {
+	const auto owner = &controller->session().data();
+	const auto peer = owner->peer(PeerId(request.id));
+	const auto &add = request.callback;
+	if (peer->isSelf()) {
+		add(tr::lng_stories_archive_button(tr::now), [=] {
+			controller->showSection(Info::Stories::Make(
+				peer,
+				Info::Stories::Tab::Archive));
+		}, &st::menuIconStoriesArchive);
+		add(tr::lng_stories_my_title(tr::now), [=] {
+			controller->showSection(Info::Stories::Make(peer));
+		}, &st::menuIconStoriesSaved);
+	} else {
+		add(tr::lng_profile_send_message(tr::now), [=] {
+			controller->showPeerHistory(peer);
+		}, &st::menuIconChatBubble);
+		add(tr::lng_context_view_profile(tr::now), [=] {
+			controller->showPeerInfo(peer);
+		}, &st::menuIconProfile);
+		const auto in = [&](Data::StorySourcesList list) {
+			return ranges::contains(
+				owner->stories().sources(list),
+				peer->id,
+				&Data::StoriesSourceInfo::id);
+		};
+		const auto toggle = [=](bool shown) {
+			owner->stories().toggleHidden(
+				peer->id,
+				!shown,
+				controller->uiShow());
+		};
+		if (in(Data::StorySourcesList::NotHidden)) {
+			add(tr::lng_stories_hide_to_contacts(tr::now), [=] {
+				toggle(false);
+			}, &st::menuIconCancel);
+		}
+		if (in(Data::StorySourcesList::Hidden)) {
+			add(tr::lng_stories_show_in_chats(tr::now), [=] {
+				toggle(true);
+			}, &st::menuIconAddToFolder);
+		}
+	}
+}
+
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
index bdbb3afea..b42715d54 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.h
@@ -16,10 +16,15 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Dialogs::Stories {
 
 struct Content;
 class Thumbnail;
+struct ShowMenuRequest;
 
 [[nodiscard]] rpl::producer<Content> ContentForSession(
 	not_null<Main::Session*> session,
@@ -32,4 +37,8 @@ class Thumbnail;
 [[nodiscard]] std::shared_ptr<Thumbnail> MakeStoryThumbnail(
 	not_null<Data::Story*> story);
 
+void FillSourceMenu(
+	not_null<Window::SessionController*> controller,
+	const ShowMenuRequest &request);
+
 } // namespace Dialogs::Stories
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index a76cb5deb..b94ef43b1 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_stories_list.h"
 
 #include "lang/lang_keys.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
@@ -108,9 +109,6 @@ void List::showContent(Content &&content) {
 				item.nameCache = QImage();
 			}
 			item.element.unread = element.unread;
-			item.element.suggestHide = element.suggestHide;
-			item.element.suggestUnhide = element.suggestUnhide;
-			item.element.profile = element.profile;
 		} else {
 			_data.items.emplace_back(Item{ .element = element });
 		}
@@ -237,12 +235,8 @@ rpl::producer<uint64> List::clicks() const {
 	return _clicks.events();
 }
 
-rpl::producer<uint64> List::showProfileRequests() const {
-	return _showProfileRequests.events();
-}
-
-rpl::producer<ToggleShownRequest> List::toggleShown() const {
-	return _toggleShown.events();
+rpl::producer<ShowMenuRequest> List::showMenuRequests() const {
+	return _showMenuRequests.events();
 }
 
 rpl::producer<bool> List::toggleExpandedRequests() const {
@@ -852,24 +846,16 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 	if (_selected < 0 || _data.empty()) {
 		return;
 	}
-
-	auto &item = _data.items[_selected];
-	_menu = base::make_unique_q<Ui::PopupMenu>(this);
-
-	const auto id = item.element.id;
-	if (item.element.profile) {
-		_menu->addAction(tr::lng_context_view_profile(tr::now), [=] {
-			_showProfileRequests.fire_copy(id);
-		});
-	}
-	if (item.element.suggestHide) {
-		_menu->addAction(
-			tr::lng_stories_hide_to_contacts(tr::now),
-			[=] { _toggleShown.fire({ .id = id, .shown = false }); });
-	} else if (item.element.suggestUnhide) {
-		_menu->addAction(
-			tr::lng_stories_show_in_chats(tr::now),
-			[=] { _toggleShown.fire({ .id = id, .shown = true }); });
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	_showMenuRequests.fire({
+		_data.items[_selected].element.id,
+		Ui::Menu::CreateAddActionCallback(_menu),
+	});
+	if (_menu->empty()) {
+		_menu = nullptr;
+		return;
 	}
 	const auto updateAfterMenuDestroyed = [=] {
 		const auto globalPosition = QCursor::pos();
@@ -882,12 +868,8 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 		_menu.get(),
 		&QObject::destroyed,
 		crl::guard(&_menuGuard, updateAfterMenuDestroyed));
-	if (_menu->empty()) {
-		_menu = nullptr;
-	} else {
-		_menu->popup(e->globalPos());
-		e->accept();
-	}
+	_menu->popup(e->globalPos());
+	e->accept();
 }
 
 bool List::finishDragging() {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index e1bebe00f..49391432c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qt/qt_compare.h"
 #include "base/timer.h"
 #include "base/weak_ptr.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/rp_widget.h"
 
 class QPainter;
@@ -36,9 +37,6 @@ struct Element {
 	QString name;
 	std::shared_ptr<Thumbnail> thumbnail;
 	bool unread : 1 = false;
-	bool suggestHide : 1 = false;
-	bool suggestUnhide : 1 = false;
-	bool profile : 1 = false;
 	bool skipSmall : 1 = false;
 
 	friend inline bool operator==(
@@ -48,16 +46,15 @@ struct Element {
 
 struct Content {
 	std::vector<Element> elements;
-	bool hidden = false;
 
 	friend inline bool operator==(
 		const Content &a,
 		const Content &b) = default;
 };
 
-struct ToggleShownRequest {
+struct ShowMenuRequest {
 	uint64 id = 0;
-	bool shown = false;
+	Ui::Menu::MenuCallback callback;
 };
 
 class List final : public Ui::RpWidget {
@@ -72,8 +69,7 @@ public:
 	void setTouchScrollActive(bool active);
 
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
-	[[nodiscard]] rpl::producer<uint64> showProfileRequests() const;
-	[[nodiscard]] rpl::producer<ToggleShownRequest> toggleShown() const;
+	[[nodiscard]] rpl::producer<ShowMenuRequest> showMenuRequests() const;
 	[[nodiscard]] rpl::producer<bool> toggleExpandedRequests() const;
 	[[nodiscard]] rpl::producer<> entered() const;
 	[[nodiscard]] rpl::producer<> loadMoreRequests() const;
@@ -169,8 +165,7 @@ private:
 	Data _hidingData;
 	Fn<int()> _shownHeight = 0;
 	rpl::event_stream<uint64> _clicks;
-	rpl::event_stream<uint64> _showProfileRequests;
-	rpl::event_stream<ToggleShownRequest> _toggleShown;
+	rpl::event_stream<ShowMenuRequest> _showMenuRequests;
 	rpl::event_stream<bool> _toggleExpandedRequests;
 	rpl::event_stream<> _entered;
 	rpl::event_stream<> _loadMoreRequests;
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 7be43b08f..922cbaab8 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -104,6 +104,8 @@ menuIconNewWindow: icon {{ "menu/new_window", menuIconColor }};
 menuIconChatBubble: icon {{ "menu/chat_bubble", menuIconColor }};
 menuIconPhone: icon {{ "menu/phone", menuIconColor }};
 menuIconChannel: icon {{ "menu/channel", menuIconColor }};
+menuIconStoriesSaved: icon {{ "menu/stories_saved", menuIconColor }};
+menuIconStoriesArchive: icon {{ "menu/stories_archive", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);

From af0e578da5e61d4c7c6404fc3efa2f0146732fd8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 15:24:59 +0400
Subject: [PATCH 348/676] Save to Profile / Archive stories from the viewer.

---
 Telegram/Resources/langs/lang.strings         | 15 +++++
 Telegram/SourceFiles/data/data_stories.cpp    | 57 +++++++++++++++++++
 Telegram/SourceFiles/data/data_stories.h      |  3 +
 Telegram/SourceFiles/info/info.style          | 39 +++++++++++++
 .../stories/info_stories_inner_widget.cpp     |  1 +
 .../stories/media_stories_controller.cpp      | 42 ++++++++++++++
 .../media/stories/media_stories_controller.h  |  4 +-
 .../media/stories/media_stories_view.cpp      |  8 +++
 .../media/stories/media_stories_view.h        |  2 +
 .../SourceFiles/media/view/media_view.style   |  3 +
 .../media/view/media_view_overlay_widget.cpp  | 27 ++++++++-
 .../SourceFiles/settings/settings_common.cpp  |  1 +
 Telegram/SourceFiles/ui/menu_icons.style      |  2 +
 Telegram/lib_ui                               |  2 +-
 14 files changed, 203 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 228366602..fa47c0a99 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2477,6 +2477,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_copy" = "Copy";
 "lng_mediaview_forward" = "Forward";
 "lng_mediaview_delete" = "Delete";
+"lng_mediaview_save_to_profile" = "Save to Profile";
+"lng_mediaview_archive_story" = "Archive Story";
 "lng_mediaview_photos_all" = "View all photos";
 "lng_mediaview_files_all" = "View all files";
 "lng_mediaview_single_photo" = "Single Photo";
@@ -3837,6 +3839,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_delete_one_sure" = "Are you sure you want to delete this story?";
 "lng_stories_delete_sure#one" = "Are you sure you want to delete {count} story?";
 "lng_stories_delete_sure#other" = "Are you sure you want to delete {count} stories?";
+"lng_stories_save_sure" = "Do you want to save this story to your profile?";
+"lng_stories_save_sure_many#one" = "Do you want to save {count} story to your profile?";
+"lng_stories_save_sure_many#other" = "Do you want to save {count} stories to your profile?";
+"lng_stories_save_done" = "This story is saved to your profile.";
+"lng_stories_save_done_many#one" = "{count} story is saved to your profile.";
+"lng_stories_save_done_many#other" = "{count} stories are saved to your profile.";
+"lng_stories_save_done_about" = "Saved stories can be viewed by others on your profile until you remove them.";
+"lng_stories_archive_sure" = "Do you want to hide this story from your profile?";
+"lng_stories_archive_sure_many#one" = "Do you want to hide {count} story from your profile?";
+"lng_stories_archive_sure_many#other" = "Do you want to hide {count} stories from your profile?";
+"lng_stories_archive_done" = "This story is hidden from your profile.";
+"lng_stories_archive_done_many#one" = "{count} story is hidden from your profile.";
+"lng_stories_archive_done_many#other" = "{count} stories are hidden from your profile.";
 
 "lng_stories_link_invalid" = "This link is broken or has expired.";
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 61c41ffa3..a6db98e37 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1275,6 +1275,63 @@ void Stories::deleteList(const std::vector<FullStoryId> &ids) {
 	}
 }
 
+void Stories::togglePinnedList(
+		const std::vector<FullStoryId> &ids,
+		bool pinned) {
+	auto list = QVector<MTPint>();
+	list.reserve(ids.size());
+	const auto selfId = session().userPeerId();
+	for (const auto &id : ids) {
+		if (id.peer == selfId) {
+			list.push_back(MTP_int(id.story));
+		}
+	}
+	if (list.empty()) {
+		return;
+	}
+	const auto api = &_owner->session().api();
+	api->request(MTPstories_TogglePinned(
+		MTP_vector<MTPint>(list),
+		MTP_bool(pinned)
+	)).done([=](const MTPVector<MTPint> &result) {
+		auto &saved = _saved[selfId];
+		const auto loaded = saved.loaded;
+		const auto lastId = !saved.ids.list.empty()
+			? saved.ids.list.back()
+			: std::numeric_limits<StoryId>::max();
+		auto dirty = false;
+		for (const auto &id : result.v) {
+			if (const auto maybeStory = lookup({ selfId, id.v })) {
+				const auto story = *maybeStory;
+				story->setPinned(pinned);
+				if (pinned) {
+					const auto add = loaded || (id.v >= lastId);
+					if (!add) {
+						dirty = true;
+					} else if (saved.ids.list.emplace(id.v).second) {
+						if (saved.total >= 0) {
+							++saved.total;
+						}
+					}
+				} else if (saved.ids.list.remove(id.v)) {
+					if (saved.total > 0) {
+						--saved.total;
+					}
+				} else if (!loaded) {
+					dirty = true;
+				}
+			} else if (!loaded) {
+				dirty = true;
+			}
+		}
+		if (dirty) {
+			savedLoadMore(selfId);
+		} else {
+			_savedChanged.fire_copy(selfId);
+		}
+	}).send();
+}
+
 void Stories::report(
 		std::shared_ptr<Ui::Show> show,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 630e8cc31..6cb415977 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -121,6 +121,8 @@ public:
 	explicit Stories(not_null<Session*> owner);
 	~Stories();
 
+	static constexpr auto kPinnedToastDuration = 4 * crl::time(1000);
+
 	[[nodiscard]] Session &owner() const;
 	[[nodiscard]] Main::Session &session() const;
 
@@ -183,6 +185,7 @@ public:
 	void savedLoadMore(PeerId peerId);
 
 	void deleteList(const std::vector<FullStoryId> &ids);
+	void togglePinnedList(const std::vector<FullStoryId> &ids, bool pinned);
 	void report(
 		std::shared_ptr<Ui::Show> show,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index b6958d4fa..21687e562 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -28,6 +28,25 @@ InfoPeerBadge {
 	sizeTag: int;
 }
 
+InfoTopBar {
+	height: pixels;
+	back: IconButton;
+	title: FlatLabel;
+	titlePosition: point;
+	bg: color;
+	mediaCancel: IconButton;
+	mediaActionsSkip: pixels;
+	mediaForward: IconButton;
+	mediaDelete: IconButton;
+	storiesSave: IconButton;
+	storiesArchive: IconButton;
+	search: IconButton;
+	searchRow: SearchFieldRow;
+	highlightBg: color;
+	highlightDuration: int;
+	radius: pixels;
+}
+
 infoMediaHeaderFg: windowFg;
 
 infoToggle: InfoToggle {
@@ -156,6 +175,14 @@ infoTopBarDelete: IconButton(infoTopBarForward) {
 	icon: icon {{ "info/info_media_delete", boxTitleCloseFg }};
 	iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }};
 }
+infoTopBarSaveStories: IconButton(infoTopBarForward) {
+	icon: icon {{ "menu/stories_saved", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }};
+}
+infoTopBarArchiveStories: IconButton(infoTopBarForward) {
+	icon: icon {{ "menu/archive", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }};
+}
 infoTopBar: InfoTopBar {
 	height: infoTopBarHeight;
 	back: infoTopBarBack;
@@ -166,6 +193,8 @@ infoTopBar: InfoTopBar {
 	mediaActionsSkip: 4px;
 	mediaForward: infoTopBarForward;
 	mediaDelete: infoTopBarDelete;
+	storiesSave: infoTopBarSaveStories;
+	storiesArchive: infoTopBarArchiveStories;
 	search: infoTopBarSearch;
 	searchRow: infoTopBarSearchRow;
 	highlightBg: windowBgOver;
@@ -221,6 +250,14 @@ infoLayerTopBarDelete: IconButton(infoLayerTopBarForward) {
 	icon: icon {{ "info/info_media_delete", boxTitleCloseFg }};
 	iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }};
 }
+infoLayerTopBarSaveStories: IconButton(infoLayerTopBarForward) {
+	icon: icon {{ "menu/stories_saved", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }};
+}
+infoLayerTopBarArchiveStories: IconButton(infoLayerTopBarForward) {
+	icon: icon {{ "menu/archive", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }};
+}
 infoLayerTopBar: InfoTopBar(infoTopBar) {
 	height: infoLayerTopBarHeight;
 	back: infoLayerTopBarBack;
@@ -231,6 +268,8 @@ infoLayerTopBar: InfoTopBar(infoTopBar) {
 	mediaActionsSkip: 6px;
 	mediaForward: infoLayerTopBarForward;
 	mediaDelete: infoLayerTopBarDelete;
+	storiesSave: infoLayerTopBarSaveStories;
+	storiesArchive: infoLayerTopBarArchiveStories;
 	search: infoTopBarSearch;
 	searchRow: infoTopBarSearchRow;
 	radius: boxRadius;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 4f7af1f68..15473babc 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -172,6 +172,7 @@ void InnerWidget::createButtons() {
 			return !content.elements.empty();
 		}),
 		[] { return st::dialogsStories.height; });
+	thumbs->show();
 	rpl::combine(
 		recent->sizeValue(),
 		rpl::duplicate(last)
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index ab7e2ab48..3259f0958 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -39,6 +39,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/message_sending_animation_common.h"
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/layers/box_content.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/round_rect.h"
@@ -1254,8 +1256,16 @@ void Controller::deleteRequested() {
 		return;
 	}
 	const auto id = story->fullId();
+	const auto weak = base::make_weak(this);
 	const auto owner = &story->owner();
 	const auto confirmed = [=](Fn<void()> close) {
+		if (const auto strong = weak.get()) {
+			if (const auto story = strong->story()) {
+				if (story->fullId() == id) {
+					moveFromShown();
+				}
+			}
+		}
 		owner->stories().deleteList({ id });
 		close();
 	};
@@ -1290,6 +1300,38 @@ void Controller::reportRequested() {
 	}));
 }
 
+void Controller::togglePinnedRequested(bool pinned) {
+	const auto story = this->story();
+	if (!story || !story->peer()->isSelf()) {
+		return;
+	}
+	if (!pinned && v::is<Data::StoriesContextSaved>(_context.data)) {
+		moveFromShown();
+	}
+	story->owner().stories().togglePinnedList({ story->fullId() }, pinned);
+	uiShow()->showToast({
+		.text = (pinned
+			? tr::lng_stories_save_done(
+				tr::now,
+				Ui::Text::Bold).append(
+					'\n').append(
+						tr::lng_stories_save_done_about(tr::now))
+			: tr::lng_stories_archive_done(
+				tr::now,
+				Ui::Text::WithEntities)),
+		.st = &st::storiesActionToast,
+		.duration = (pinned
+			? Data::Stories::kPinnedToastDuration
+			: Ui::Toast::kDefaultDuration),
+	});
+}
+
+void Controller::moveFromShown() {
+	if (!subjumpFor(1)) {
+		[[maybe_unused]] const auto jumped = subjumpFor(-1);
+	}
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index c7137a250..87c588f37 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -91,7 +91,7 @@ struct ViewsSlice {
 	int left = 0;
 };
 
-class Controller final {
+class Controller final : public base::has_weak_ptr {
 public:
 	explicit Controller(not_null<Delegate*> delegate);
 	~Controller();
@@ -135,6 +135,7 @@ public:
 	void shareRequested();
 	void deleteRequested();
 	void reportRequested();
+	void togglePinnedRequested(bool pinned);
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
@@ -171,6 +172,7 @@ private:
 
 	void subjumpTo(int index);
 	void checkWaitingFor();
+	void moveFromShown();
 
 	void refreshViewsFromData();
 	bool sliceViewsTo(PeerId offset);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 79528eb11..6a6a0dbd4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -83,6 +83,10 @@ void View::contentPressed(bool pressed) {
 	_controller->contentPressed(pressed);
 }
 
+void View::menuShown(bool shown) {
+	_controller->setMenuShown(shown);
+}
+
 void View::shareRequested() {
 	_controller->shareRequested();
 }
@@ -95,6 +99,10 @@ void View::reportRequested() {
 	_controller->reportRequested();
 }
 
+void View::togglePinnedRequested(bool pinned) {
+	_controller->togglePinnedRequested(pinned);
+}
+
 SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index d2f62a0ac..24b58feed 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -75,10 +75,12 @@ public:
 	[[nodiscard]] bool paused() const;
 	void togglePaused(bool paused);
 	void contentPressed(bool pressed);
+	void menuShown(bool shown);
 
 	void shareRequested();
 	void deleteRequested();
 	void reportRequested();
+	void togglePinnedRequested(bool pinned);
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 85a2716d3..00db429d1 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -841,3 +841,6 @@ storiesReportBox: ReportBox(defaultReportBox) {
 	personal: icon {{ "menu/personal", storiesComposeWhiteText }};
 	other: icon {{ "menu/report", storiesComposeWhiteText }};
 }
+storiesActionToast: Toast(defaultToast) {
+	maxWidth: 320px;
+}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1c83f2d5c..12b6e0332 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1408,6 +1408,19 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			[=] { toMessage(); },
 			&st::mediaMenuIconShowInChat);
 	}
+	if (story && story->peer()->isSelf()) {
+		const auto pinned = story->pinned();
+		const auto text = pinned
+			? tr::lng_mediaview_archive_story(tr::now)
+			: tr::lng_mediaview_save_to_profile(tr::now);
+		addAction(text, [=] {
+			if (_stories) {
+				_stories->togglePinnedRequested(!pinned);
+			}
+		}, pinned
+			? &st::mediaMenuIconArchiveStory
+			: &st::mediaMenuIconSaveStory);
+	}
 	if ((!story || story->canDownload())
 		&& _document
 		&& !_document->filepath(true).isEmpty()) {
@@ -2156,6 +2169,9 @@ void OverlayWidget::hideControls(bool force) {
 
 void OverlayWidget::dropdownHidden() {
 	setFocus();
+	if (_stories) {
+		_stories->menuShown(false);
+	}
 	_ignoringDropdown = true;
 	_lastMouseMovePos = _widget->mapFromGlobal(QCursor::pos());
 	updateOver(_lastMouseMovePos);
@@ -5387,7 +5403,7 @@ void OverlayWidget::updateOverRect(Over state) {
 bool OverlayWidget::updateOverState(Over newState) {
 	bool result = true;
 	if (_over != newState) {
-		if (newState == Over::More && !_ignoringDropdown) {
+		if (!_stories && newState == Over::More && !_ignoringDropdown) {
 			_dropdownShowTimer.callOnce(0);
 		} else {
 			_dropdownShowTimer.cancel();
@@ -5637,7 +5653,13 @@ bool OverlayWidget::handleContextMenu(std::optional<QPoint> position) {
 	if (_menu->empty()) {
 		_menu = nullptr;
 	} else {
+		if (_stories) {
+			_stories->menuShown(true);
+		}
 		_menu->setDestroyedCallback(crl::guard(_widget, [=] {
+			if (_stories) {
+				_stories->menuShown(false);
+			}
 			activateControls();
 			_receiveMouse = false;
 			InvokeQueued(_widget, [=] { receiveMouse(); });
@@ -5905,6 +5927,9 @@ void OverlayWidget::showDropdown() {
 	_dropdown->moveToRight(0, height() - _dropdown->height());
 	_dropdown->showAnimated(Ui::PanelAnimation::Origin::BottomRight);
 	_dropdown->setFocus();
+	if (_stories) {
+		_stories->menuShown(true);
+	}
 }
 
 void OverlayWidget::handleTouchTimer() {
diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp
index f2144d1cc..e48d6b742 100644
--- a/Telegram/SourceFiles/settings/settings_common.cpp
+++ b/Telegram/SourceFiles/settings/settings_common.cpp
@@ -219,6 +219,7 @@ void CreateRightLabel(
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(
 		button.get(),
 		st.rightLabel);
+	name->show();
 	rpl::combine(
 		button->widthValue(),
 		std::move(buttonText),
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 922cbaab8..3c697f316 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -126,6 +126,8 @@ mediaMenuIconDelete: icon {{ "menu/delete", mediaviewMenuFg }};
 mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }};
 mediaMenuIconProfile: icon {{ "menu/profile", mediaviewMenuFg }};
 mediaMenuIconReport: icon {{ "menu/report", mediaviewMenuFg }};
+mediaMenuIconSaveStory: icon {{ "menu/stories_saved", mediaviewMenuFg }};
+mediaMenuIconArchiveStory: icon {{ "menu/archive", mediaviewMenuFg }};
 
 menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }};
 menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }};
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 08f805486..67dc933d7 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 08f80548668df2737905365b254624055642b937
+Subproject commit 67dc933d72fa5e20e6480bbff5a88a2c52d9d0d0

From 5f72a5238c6558fc77ac5211f2d693cd233e1e6b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 16:45:41 +0400
Subject: [PATCH 349/676] Save to Profile / Archive / Delete in list.

---
 Telegram/SourceFiles/data/data_stories.cpp    |  2 +
 .../SourceFiles/data/data_stories_ids.cpp     |  2 +-
 Telegram/SourceFiles/history/history_item.cpp |  2 +-
 Telegram/SourceFiles/info/info_top_bar.cpp    | 39 +++++++++-
 Telegram/SourceFiles/info/info_top_bar.h      |  6 ++
 .../SourceFiles/info/info_wrap_widget.cpp     |  2 +
 Telegram/SourceFiles/info/info_wrap_widget.h  |  2 +
 .../info/media/info_media_common.h            | 13 ++--
 .../info/media/info_media_list_section.cpp    |  4 +-
 .../info/media/info_media_list_widget.cpp     | 75 ++++++++++++++++++-
 .../info/media/info_media_list_widget.h       |  1 +
 .../info/stories/info_stories_provider.cpp    | 13 ++--
 .../stories/media_stories_controller.cpp      | 46 ++++++++----
 .../media/stories/media_stories_controller.h  |  8 ++
 14 files changed, 179 insertions(+), 36 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index a6db98e37..dfb5129e5 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1298,6 +1298,8 @@ void Stories::togglePinnedList(
 		const auto loaded = saved.loaded;
 		const auto lastId = !saved.ids.list.empty()
 			? saved.ids.list.back()
+			: saved.lastId
+			? saved.lastId
 			: std::numeric_limits<StoryId>::max();
 		auto dirty = false;
 		for (const auto &id : result.v) {
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index 31604f2eb..6a96f4e5f 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -44,7 +44,7 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 			const auto hasBefore = int(around - begin(saved->list));
 			const auto hasAfter = int(end(saved->list) - around);
 			if (hasAfter < limit) {
-				//stories->savedLoadMore(peer->id);
+				stories->savedLoadMore(peer->id);
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 72745e74d..c6ddbb4c4 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1988,7 +1988,7 @@ bool HistoryItem::canDelete() const {
 	if (isSponsored()) {
 		return false;
 	} else if (IsStoryMsgId(id)) {
-		return false && _history->peer->isSelf(); // #TODO stories
+		return false;
 	} else if (isService() && !isRegular()) {
 		return false;
 	} else if (topicRootId() == id) {
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 309ca167d..68aae3228 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -352,6 +352,10 @@ void TopBar::updateSelectionControlsGeometry(int newWidth) {
 		_delete->moveToRight(right, 0, newWidth);
 		right += _delete->width();
 	}
+	if (_canToggleStoryPin) {
+		_toggleStoryPin->moveToRight(right, 0, newWidth);
+		right += _toggleStoryPin->width();
+	}
 	if (_canForward) {
 		_forward->moveToRight(right, 0, newWidth);
 		right += _forward->width();
@@ -496,6 +500,10 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 	updateControlsVisibility(anim::type::instant);
 }
 
+void TopBar::setStoriesArchive(bool archive) {
+	_storiesArchive = archive;
+}
+
 void TopBar::setSelectedItems(SelectedItems &&items) {
 	auto wasSelectionMode = selectionMode();
 	_selectedItems = std::move(items);
@@ -523,13 +531,14 @@ rpl::producer<SelectionAction> TopBar::selectionActionRequests() const {
 }
 
 void TopBar::updateSelectionState() {
-	Expects(_selectionText && _delete && _forward);
+	Expects(_selectionText && _delete && _forward && _toggleStoryPin);
 
 	_canDelete = computeCanDelete();
 	_canForward = computeCanForward();
 	_selectionText->entity()->setValue(generateSelectedText());
 	_delete->toggle(_canDelete, anim::type::instant);
 	_forward->toggle(_canForward, anim::type::instant);
+	_toggleStoryPin->toggle(_canToggleStoryPin, anim::type::instant);
 
 	updateSelectionControlsGeometry(width());
 }
@@ -544,6 +553,7 @@ void TopBar::createSelectionControls() {
 	};
 	_canDelete = computeCanDelete();
 	_canForward = computeCanForward();
+	_canToggleStoryPin = computeCanToggleStoryPin();
 	_cancelSelection = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 		this,
 		object_ptr<Ui::IconButton>(this, _st.mediaCancel),
@@ -595,6 +605,24 @@ void TopBar::createSelectionControls() {
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
 	_delete->entity()->setVisible(_canDelete);
+	const auto archive =
+	_toggleStoryPin = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
+		this,
+		object_ptr<Ui::IconButton>(
+			this,
+			_storiesArchive ? _st.storiesSave : _st.storiesArchive),
+		st::infoTopBarScale));
+	registerToggleControlCallback(
+		_toggleStoryPin.data(),
+		[this] { return selectionMode() && _canToggleStoryPin; });
+	_toggleStoryPin->setDuration(st::infoTopBarDuration);
+	_toggleStoryPin->entity()->clicks(
+	) | rpl::map_to(
+		SelectionAction::ToggleStoryPin
+	) | rpl::start_to_stream(
+		_selectionActionRequests,
+		_cancelSelection->lifetime());
+	_toggleStoryPin->entity()->setVisible(_canToggleStoryPin);
 
 	updateControlsGeometry(width());
 }
@@ -607,6 +635,12 @@ bool TopBar::computeCanForward() const {
 	return ranges::all_of(_selectedItems.list, &SelectedItem::canForward);
 }
 
+bool TopBar::computeCanToggleStoryPin() const {
+	return ranges::all_of(
+		_selectedItems.list,
+		&SelectedItem::canToggleStoryPin);
+}
+
 Ui::StringWithNumbers TopBar::generateSelectedText() const {
 	using Type = Storage::SharedMediaType;
 	const auto phrase = [&] {
@@ -618,8 +652,7 @@ Ui::StringWithNumbers TopBar::generateSelectedText() const {
 		case Type::MusicFile: return tr::lng_media_selected_song;
 		case Type::Link: return tr::lng_media_selected_link;
 		case Type::RoundVoiceFile: return tr::lng_media_selected_audio;
-			// #TODO stories
-		case Type::PhotoVideo: return tr::lng_media_selected_photo;
+		case Type::PhotoVideo: return tr::lng_stories_row_count;
 		}
 		Unexpected("Type in TopBar::generateSelectedText()");
 	}();
diff --git a/Telegram/SourceFiles/info/info_top_bar.h b/Telegram/SourceFiles/info/info_top_bar.h
index b038e213a..c41125904 100644
--- a/Telegram/SourceFiles/info/info_top_bar.h
+++ b/Telegram/SourceFiles/info/info_top_bar.h
@@ -57,6 +57,7 @@ public:
 
 	void setTitle(rpl::producer<QString> &&title);
 	void setStories(rpl::producer<Dialogs::Stories::Content> content);
+	void setStoriesArchive(bool archive);
 	void enableBackButton();
 	void highlight();
 
@@ -120,11 +121,13 @@ private:
 	[[nodiscard]] Ui::StringWithNumbers generateSelectedText() const;
 	[[nodiscard]] bool computeCanDelete() const;
 	[[nodiscard]] bool computeCanForward() const;
+	[[nodiscard]] bool computeCanToggleStoryPin() const;
 	void updateSelectionState();
 	void createSelectionControls();
 
 	void performForward();
 	void performDelete();
+	void performToggleStoryPin();
 
 	void setSearchField(
 		base::unique_qptr<Ui::InputField> field,
@@ -163,10 +166,13 @@ private:
 	SelectedItems _selectedItems;
 	bool _canDelete = false;
 	bool _canForward = false;
+	bool _canToggleStoryPin = false;
+	bool _storiesArchive = false;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _cancelSelection;
 	QPointer<Ui::FadeWrap<Ui::LabelWithNumbers>> _selectionText;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _forward;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _delete;
+	QPointer<Ui::FadeWrap<Ui::IconButton>> _toggleStoryPin;
 	rpl::event_stream<SelectionAction> _selectionActionRequests;
 
 	QPointer<Ui::FadeWrap<Dialogs::Stories::List>> _stories;
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 2d8e2669a..214e191fb 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -585,6 +585,8 @@ void WrapWidget::finishShowContent() {
 	if (_topBar) {
 		_topBar->setTitle(_content->title());
 		_topBar->setStories(_content->titleStories());
+		_topBar->setStoriesArchive(
+			_controller->key().storiesTab() == Stories::Tab::Archive);
 	}
 	_desiredHeights.fire(desiredHeightForContent());
 	_desiredShadowVisibilities.fire(_content->desiredShadowVisibility());
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h
index a04c4d89c..47215d340 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.h
+++ b/Telegram/SourceFiles/info/info_wrap_widget.h
@@ -58,6 +58,7 @@ struct SelectedItem {
 	GlobalMsgId globalId;
 	bool canDelete = false;
 	bool canForward = false;
+	bool canToggleStoryPin = false;
 };
 
 struct SelectedItems {
@@ -73,6 +74,7 @@ enum class SelectionAction {
 	Clear,
 	Forward,
 	Delete,
+	ToggleStoryPin,
 };
 
 class WrapWidget final : public Window::SectionWidget {
diff --git a/Telegram/SourceFiles/info/media/info_media_common.h b/Telegram/SourceFiles/info/media/info_media_common.h
index 20c3051ca..27e8d4b9f 100644
--- a/Telegram/SourceFiles/info/media/info_media_common.h
+++ b/Telegram/SourceFiles/info/media/info_media_common.h
@@ -30,15 +30,12 @@ struct ListItemSelectionData {
 	TextSelection text;
 	bool canDelete = false;
 	bool canForward = false;
-};
+	bool canToggleStoryPin = false;
 
-inline bool operator==(
-		ListItemSelectionData a,
-		ListItemSelectionData b) {
-	return (a.text == b.text)
-		&& (a.canDelete == b.canDelete)
-		&& (a.canForward == b.canForward);
-}
+	friend inline bool operator==(
+		ListItemSelectionData,
+		ListItemSelectionData) = default;
+};
 
 using ListSelectedMap = base::flat_map<
 	not_null<const HistoryItem*>,
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.cpp b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
index ed70623ce..2bf957192 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
@@ -338,7 +338,7 @@ void ListSection::resizeToWidth(int newWidth) {
 	switch (_type) {
 	case Type::Photo:
 	case Type::Video:
-	case Type::PhotoVideo: // #TODO stories
+	case Type::PhotoVideo:
 	case Type::RoundFile: {
 		const auto skip = st::infoMediaSkip;
 		_itemsLeft = st::infoMediaLeft;
@@ -379,7 +379,7 @@ int ListSection::recountHeight() {
 	switch (_type) {
 	case Type::Photo:
 	case Type::Video:
-	case Type::PhotoVideo: // #TODO stories
+	case Type::PhotoVideo:
 	case Type::RoundFile: {
 		auto itemHeight = _itemHeight + st::infoMediaSkip;
 		auto index = 0;
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 7940bca59..985fde209 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_service_message.h"
+#include "media/stories/media_stories_controller.h" // ...TogglePinnedToast.
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
 #include "ui/widgets/popup_menu.h"
@@ -55,6 +56,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peer_list_controllers.h"
 #include "core/file_utilities.h"
 #include "core/application.h"
+#include "ui/toast/toast.h"
 #include "styles/style_overview.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
@@ -258,6 +260,7 @@ void ListWidget::selectionAction(SelectionAction action) {
 	case SelectionAction::Clear: clearSelected(); return;
 	case SelectionAction::Forward: forwardSelected(); return;
 	case SelectionAction::Delete: deleteSelected(); return;
+	case SelectionAction::ToggleStoryPin: toggleStoryPinSelected(); return;
 	}
 }
 
@@ -335,6 +338,7 @@ auto ListWidget::collectSelectedItems() const -> SelectedItems {
 		auto result = SelectedItem(item->globalId());
 		result.canDelete = selection.canDelete;
 		result.canForward = selection.canForward;
+		result.canToggleStoryPin = selection.canToggleStoryPin;
 		return result;
 	};
 	auto transformation = [&](const auto &item) {
@@ -349,6 +353,12 @@ auto ListWidget::collectSelectedItems() const -> SelectedItems {
 			std::back_inserter(items.list),
 			transformation);
 	}
+	if (_controller->storiesPeer() && items.list.size() > 1) {
+		// Don't allow forwarding more than one story.
+		for (auto &entry : items.list) {
+			entry.canForward = false;
+		}
+	}
 	return items;
 }
 
@@ -1126,6 +1136,43 @@ void ListWidget::deleteSelected() {
 	}));
 }
 
+void ListWidget::toggleStoryPinSelected() {
+	auto list = std::vector<FullStoryId>();
+	const auto confirmed = crl::guard(this, [=] {
+		clearSelected();
+	});
+	for (const auto &item : collectSelectedItems().list) {
+		const auto id = item.globalId.itemId;
+		if (IsStoryMsgId(id.msg)) {
+			list.push_back({ id.peer, StoryIdFromMsgId(id.msg) });
+		}
+	}
+	const auto count = int(list.size());
+	const auto pin = (_controller->storiesTab() == Stories::Tab::Archive);
+	const auto controller = _controller;
+	const auto sure = [=](Fn<void()> close) {
+		controller->session().data().stories().togglePinnedList(list, pin);
+		controller->showToast(
+			::Media::Stories::PrepareTogglePinnedToast(count, pin));
+		close();
+		confirmed();
+	};
+	const auto session = &_controller->session();
+	const auto onePhrase = pin
+		? tr::lng_stories_save_sure
+		: tr::lng_stories_archive_sure;
+	const auto manyPhrase = pin
+		? tr::lng_stories_save_sure_many
+		: tr::lng_stories_archive_sure_many;
+	_controller->parentController()->show(Ui::MakeConfirmBox({
+		.text = (count == 1
+			? onePhrase()
+			: manyPhrase(lt_count, rpl::single(count) | tr::to_count())),
+		.confirmed = sure,
+		.confirmText = tr::lng_box_ok(),
+	}));
+}
+
 void ListWidget::deleteItem(GlobalMsgId globalId) {
 	if (const auto item = MessageByGlobalId(globalId)) {
 		auto items = SelectedItems(_provider->type());
@@ -1134,7 +1181,6 @@ void ListWidget::deleteItem(GlobalMsgId globalId) {
 			item,
 			FullSelection);
 		items.list.back().canDelete = selectionData.canDelete;
-		items.list.back().canForward = selectionData.canForward;
 		deleteItems(std::move(items));
 	}
 }
@@ -1180,6 +1226,33 @@ void ListWidget::deleteItems(SelectedItems &&items, Fn<void()> confirmed) {
 			.confirmText = tr::lng_box_delete(tr::now),
 			.confirmStyle = &st::attentionBoxButton,
 		})));
+	} else if (_controller->storiesPeer()) {
+		auto list = std::vector<FullStoryId>();
+		for (const auto &item : items.list) {
+			const auto id = item.globalId.itemId;
+			if (IsStoryMsgId(id.msg)) {
+				list.push_back({ id.peer, StoryIdFromMsgId(id.msg) });
+			}
+		}
+		const auto session = &_controller->session();
+		const auto sure = [=](Fn<void()> close) {
+			session->data().stories().deleteList(list);
+			close();
+			if (confirmed) {
+				confirmed();
+			}
+		};
+		const auto count = int(list.size());
+		window->show(Ui::MakeConfirmBox({
+			.text = (count == 1
+				? tr::lng_stories_delete_one_sure()
+				: tr::lng_stories_delete_sure(
+					lt_count,
+					rpl::single(count) | tr::to_count())),
+			.confirmed = sure,
+			.confirmText = tr::lng_selected_delete(),
+			.confirmStyle = &st::attentionBoxButton,
+		}));
 	} else if (auto list = collectSelectedIds(items); !list.empty()) {
 		auto box = Box<DeleteMessagesBox>(
 			&_controller->session(),
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index 701754c13..b518e212e 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -189,6 +189,7 @@ private:
 	void forwardItem(GlobalMsgId globalId);
 	void forwardItems(MessageIdsList &&items);
 	void deleteSelected();
+	void toggleStoryPinSelected();
 	void deleteItem(GlobalMsgId globalId);
 	void deleteItems(SelectedItems &&items, Fn<void()> confirmed = nullptr);
 	void applyItemSelection(
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index 2c6621fff..c42569c8d 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -61,7 +61,7 @@ Type Provider::type() {
 }
 
 bool Provider::hasSelectRestriction() {
-	return true; // #TODO stories
+	return !_peer->isSelf();
 }
 
 rpl::producer<bool> Provider::hasSelectRestrictionChanges() {
@@ -312,8 +312,10 @@ ListItemSelectionData Provider::computeSelectionData(
 		not_null<const HistoryItem*> item,
 		TextSelection selection) {
 	auto result = ListItemSelectionData(selection);
-	result.canDelete = item->canDelete();
-	result.canForward = item->allowsForward();
+	const auto peer = item->history()->peer;
+	result.canDelete = peer->isSelf();
+	result.canForward = peer->isSelf();
+	result.canToggleStoryPin = peer->isSelf();
 	return result;
 }
 
@@ -334,9 +336,10 @@ void Provider::applyDragSelection(
 		}
 	}
 	for (auto &layoutItem : _layouts) {
-		const auto id = StoryIdToMsgId(layoutItem.first);
+		const auto storyId = layoutItem.first;
+		const auto id = StoryIdToMsgId(storyId);
 		if (id <= fromId && id > tillId) {
-			const auto i = _items.find(id);
+			const auto i = _items.find(storyId);
 			Assert(i != end(_items));
 			const auto item = i->second.get();
 			ChangeItemSelection(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 3259f0958..7ae534475 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1309,21 +1309,7 @@ void Controller::togglePinnedRequested(bool pinned) {
 		moveFromShown();
 	}
 	story->owner().stories().togglePinnedList({ story->fullId() }, pinned);
-	uiShow()->showToast({
-		.text = (pinned
-			? tr::lng_stories_save_done(
-				tr::now,
-				Ui::Text::Bold).append(
-					'\n').append(
-						tr::lng_stories_save_done_about(tr::now))
-			: tr::lng_stories_archive_done(
-				tr::now,
-				Ui::Text::WithEntities)),
-		.st = &st::storiesActionToast,
-		.duration = (pinned
-			? Data::Stories::kPinnedToastDuration
-			: Ui::Toast::kDefaultDuration),
-	});
+	uiShow()->showToast(PrepareTogglePinnedToast(1, pinned));
 }
 
 void Controller::moveFromShown() {
@@ -1375,4 +1361,34 @@ void Controller::startReactionAnimation(
 	}, layer->lifetime());
 }
 
+Ui::Toast::Config PrepareTogglePinnedToast(int count, bool pinned) {
+	return {
+		.text = (pinned
+			? (count == 1
+				? tr::lng_stories_save_done(
+					tr::now,
+					Ui::Text::Bold)
+				: tr::lng_stories_save_done_many(
+					tr::now,
+					lt_count,
+					count,
+					Ui::Text::Bold)).append(
+						'\n').append(
+							tr::lng_stories_save_done_about(tr::now))
+			: (count == 1
+				? tr::lng_stories_archive_done(
+					tr::now,
+					Ui::Text::WithEntities)
+				: tr::lng_stories_archive_done_many(
+					tr::now,
+					lt_count,
+					count,
+					Ui::Text::WithEntities))),
+		.st = &st::storiesActionToast,
+		.duration = (pinned
+			? Data::Stories::kPinnedToastDuration
+			: Ui::Toast::kDefaultDuration),
+	};
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 87c588f37..9bcbe4049 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -34,6 +34,10 @@ struct MessageSendingAnimationFrom;
 class EmojiFlyAnimation;
 } // namespace Ui
 
+namespace Ui::Toast {
+struct Config;
+} // namespace Ui::Toast
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -253,4 +257,8 @@ private:
 
 };
 
+[[nodiscard]] Ui::Toast::Config PrepareTogglePinnedToast(
+	int count,
+	bool pinned);
+
 } // namespace Media::Stories

From a733b836429e522abd1d366d4ca48a1dc4ecebe4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 17:04:11 +0400
Subject: [PATCH 350/676] Use stories ShareBox from the saved stories list.

---
 .../info/media/info_media_list_widget.cpp       | 12 +++++++++++-
 .../media/stories/media_stories_controller.cpp  |  2 +-
 .../media/stories/media_stories_share.cpp       | 17 ++++++++++-------
 .../media/stories/media_stories_share.h         |  3 ++-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 985fde209..ee7ee0ad3 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_service_message.h"
 #include "media/stories/media_stories_controller.h" // ...TogglePinnedToast.
+#include "media/stories/media_stories_share.h" // PrepareShareBox.
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
 #include "ui/widgets/popup_menu.h"
@@ -1104,7 +1105,16 @@ void ListWidget::contextMenuEvent(QContextMenuEvent *e) {
 }
 
 void ListWidget::forwardSelected() {
-	if (auto items = collectSelectedIds(); !items.empty()) {
+	if (_controller->storiesPeer()) {
+		const auto ids = collectSelectedIds();
+		if (ids.size() == 1 && IsStoryMsgId(ids.front().msg)) {
+			const auto id = ids.front();
+			_controller->parentController()->show(
+				::Media::Stories::PrepareShareBox(
+					_controller->parentController()->uiShow(),
+					{ id.peer, StoryIdFromMsgId(id.msg) }));
+		}
+	} else if (auto items = collectSelectedIds(); !items.empty()) {
 		forwardItems(std::move(items));
 	}
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 7ae534475..555611ea4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1245,7 +1245,7 @@ void Controller::unfocusReply() {
 
 void Controller::shareRequested() {
 	const auto show = _delegate->storiesShow();
-	if (auto box = PrepareShareBox(show, _shown)) {
+	if (auto box = PrepareShareBox(show, _shown, true)) {
 		show->show(std::move(box));
 	}
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index 4d1774ff8..0a9b87df5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -32,7 +32,8 @@ namespace Media::Stories {
 
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareShareBox(
 		std::shared_ptr<ChatHelpers::Show> show,
-		FullStoryId id) {
+		FullStoryId id,
+		bool viewerStyle) {
 	const auto session = &show->session();
 	const auto resolve = [=] {
 		const auto maybeStory = session->data().stories().lookup(id);
@@ -170,7 +171,7 @@ namespace Media::Stories {
 		}
 	};
 
-	const auto scheduleStyle = [&] {
+	const auto viewerScheduleStyle = [&] {
 		auto date = Ui::ChooseDateTimeStyleArgs();
 		date.labelStyle = &st::groupCallBoxLabel;
 		date.dateFieldStyle = &st::groupCallScheduleDateField;
@@ -191,11 +192,13 @@ namespace Media::Stories {
 		.copyCallback = std::move(copyLinkCallback),
 		.submitCallback = std::move(submitCallback),
 		.filterCallback = std::move(filterCallback),
-		.stMultiSelect = &st::groupCallMultiSelect,
-		.stComment = &st::groupCallShareBoxComment,
-		.st = &st::groupCallShareBoxList,
-		.stLabel = &st::groupCallField,
-		.scheduleBoxStyle = scheduleStyle(),
+		.stMultiSelect = viewerStyle ? &st::groupCallMultiSelect : nullptr,
+		.stComment = viewerStyle ? &st::groupCallShareBoxComment : nullptr,
+		.st = viewerStyle ? &st::groupCallShareBoxList : nullptr,
+		.stLabel = viewerStyle ? &st::groupCallField : nullptr,
+		.scheduleBoxStyle = (viewerStyle
+			? viewerScheduleStyle()
+			: HistoryView::ScheduleBoxStyleArgs()),
 	});
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.h b/Telegram/SourceFiles/media/stories/media_stories_share.h
index e3dab6245..efb633930 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.h
@@ -21,6 +21,7 @@ namespace Media::Stories {
 
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareShareBox(
 	std::shared_ptr<ChatHelpers::Show> show,
-	FullStoryId id);
+	FullStoryId id,
+	bool viewerStyle = false);
 
 } // namespace Media::Stories

From ac534780cc3b56eca7164ce1e9999ead49988c29 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 17:56:54 +0400
Subject: [PATCH 351/676] Implement context menu actions in stories list.

---
 .../info/media/info_media_list_widget.cpp     | 96 ++++++++++++++-----
 .../info/media/info_media_list_widget.h       |  3 +
 .../info/stories/info_stories_provider.cpp    | 16 +++-
 .../stories/media_stories_controller.cpp      | 37 ++++---
 .../media/stories/media_stories_controller.h  |  9 ++
 5 files changed, 116 insertions(+), 45 deletions(-)

diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index ee7ee0ad3..7fb64b9d2 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -915,6 +915,11 @@ void ListWidget::showContextMenu(
 	auto canForwardAll = [&] {
 		return ranges::none_of(_selected, [](auto &&item) {
 			return !item.second.canForward;
+		}) && (!_controller->key().storiesPeer() || _selected.size() == 1);
+	};
+	auto canToggleStoryPinAll = [&] {
+		return ranges::none_of(_selected, [](auto &&item) {
+			return !item.second.canToggleStoryPin;
 		});
 	};
 
@@ -1016,6 +1021,16 @@ void ListWidget::showContextMenu(
 		}
 	}
 	if (overSelected == SelectionState::OverSelectedItems) {
+		if (canToggleStoryPinAll()) {
+			const auto tab = _controller->key().storiesTab();
+			const auto pin = (tab == Stories::Tab::Archive);
+			_contextMenu->addAction(
+				(pin
+					? tr::lng_mediaview_save_to_profile
+					: tr::lng_archived_add)(tr::now),
+				crl::guard(this, [this] { toggleStoryPinSelected(); }),
+				(pin ? &st::menuIconStoriesSaved : &st::menuIconArchive));
+		}
 		if (canForwardAll()) {
 			_contextMenu->addAction(
 				tr::lng_context_forward_selected(tr::now),
@@ -1045,6 +1060,18 @@ void ListWidget::showContextMenu(
 			const auto selectionData = _provider->computeSelectionData(
 				item,
 				FullSelection);
+			if (selectionData.canToggleStoryPin) {
+				const auto tab = _controller->key().storiesTab();
+				const auto pin = (tab == Stories::Tab::Archive);
+				_contextMenu->addAction(
+					(pin
+						? tr::lng_mediaview_save_to_profile
+						: tr::lng_mediaview_archive_story)(tr::now),
+					crl::guard(this, [=] {
+						toggleStoryPin({ 1, globalId.itemId });
+					}),
+					(pin ? &st::menuIconStoriesSaved : &st::menuIconArchive));
+			}
 			if (selectionData.canForward) {
 				_contextMenu->addAction(
 					tr::lng_context_forward_msg(tr::now),
@@ -1066,6 +1093,20 @@ void ListWidget::showContextMenu(
 				}
 			}
 		}
+		if (const auto peer = _controller->key().storiesPeer()) {
+			if (!peer->isSelf() && IsStoryMsgId(globalId.itemId.msg)) {
+				const auto storyId = FullStoryId{
+					globalId.itemId.peer,
+					StoryIdFromMsgId(globalId.itemId.msg),
+				};
+				_contextMenu->addAction(
+					tr::lng_profile_report(tr::now),
+					[=] { ::Media::Stories::ReportRequested(
+						_controller->uiShow(),
+						storyId); },
+					&st::menuIconReport);
+			}
+		}
 		if (!_provider->hasSelectRestriction()) {
 			_contextMenu->addAction(
 				tr::lng_context_select_msg(tr::now),
@@ -1105,16 +1146,7 @@ void ListWidget::contextMenuEvent(QContextMenuEvent *e) {
 }
 
 void ListWidget::forwardSelected() {
-	if (_controller->storiesPeer()) {
-		const auto ids = collectSelectedIds();
-		if (ids.size() == 1 && IsStoryMsgId(ids.front().msg)) {
-			const auto id = ids.front();
-			_controller->parentController()->show(
-				::Media::Stories::PrepareShareBox(
-					_controller->parentController()->uiShow(),
-					{ id.peer, StoryIdFromMsgId(id.msg) }));
-		}
-	} else if (auto items = collectSelectedIds(); !items.empty()) {
+	if (auto items = collectSelectedIds(); !items.empty()) {
 		forwardItems(std::move(items));
 	}
 }
@@ -1129,15 +1161,25 @@ void ListWidget::forwardItem(GlobalMsgId globalId) {
 }
 
 void ListWidget::forwardItems(MessageIdsList &&items) {
-	auto callback = [weak = Ui::MakeWeak(this)] {
-		if (const auto strong = weak.data()) {
-			strong->clearSelected();
+	if (_controller->storiesPeer()) {
+		if (items.size() == 1 && IsStoryMsgId(items.front().msg)) {
+			const auto id = items.front();
+			_controller->parentController()->show(
+				::Media::Stories::PrepareShareBox(
+					_controller->parentController()->uiShow(),
+					{ id.peer, StoryIdFromMsgId(id.msg) }));
 		}
-	};
-	setActionBoxWeak(Window::ShowForwardMessagesBox(
-		_controller,
-		std::move(items),
-		std::move(callback)));
+	} else {
+		auto callback = [weak = Ui::MakeWeak(this)] {
+			if (const auto strong = weak.data()) {
+				strong->clearSelected();
+			}
+		};
+		setActionBoxWeak(Window::ShowForwardMessagesBox(
+			_controller,
+			std::move(items),
+			std::move(callback)));
+	}
 }
 
 void ListWidget::deleteSelected() {
@@ -1147,12 +1189,16 @@ void ListWidget::deleteSelected() {
 }
 
 void ListWidget::toggleStoryPinSelected() {
-	auto list = std::vector<FullStoryId>();
-	const auto confirmed = crl::guard(this, [=] {
+	toggleStoryPin(collectSelectedIds(), crl::guard(this, [=] {
 		clearSelected();
-	});
-	for (const auto &item : collectSelectedItems().list) {
-		const auto id = item.globalId.itemId;
+	}));
+}
+
+void ListWidget::toggleStoryPin(
+		MessageIdsList &&items,
+		Fn<void()> confirmed) {
+	auto list = std::vector<FullStoryId>();
+	for (const auto &id : items) {
 		if (IsStoryMsgId(id.msg)) {
 			list.push_back({ id.peer, StoryIdFromMsgId(id.msg) });
 		}
@@ -1165,7 +1211,9 @@ void ListWidget::toggleStoryPinSelected() {
 		controller->showToast(
 			::Media::Stories::PrepareTogglePinnedToast(count, pin));
 		close();
-		confirmed();
+		if (confirmed) {
+			confirmed();
+		}
 	};
 	const auto session = &_controller->session();
 	const auto onePhrase = pin
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index b518e212e..10984f27e 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -192,6 +192,9 @@ private:
 	void toggleStoryPinSelected();
 	void deleteItem(GlobalMsgId globalId);
 	void deleteItems(SelectedItems &&items, Fn<void()> confirmed = nullptr);
+	void toggleStoryPin(
+		MessageIdsList &&items,
+		Fn<void()> confirmed = nullptr);
 	void applyItemSelection(
 		HistoryItem *item,
 		TextSelection selection);
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index c42569c8d..b4cf680c6 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -314,7 +314,21 @@ ListItemSelectionData Provider::computeSelectionData(
 	auto result = ListItemSelectionData(selection);
 	const auto peer = item->history()->peer;
 	result.canDelete = peer->isSelf();
-	result.canForward = peer->isSelf();
+	result.canForward = [&] {
+		if (!peer->isSelf()) {
+			return false;
+		}
+		const auto id = item->id;
+		if (!IsStoryMsgId(id)) {
+			return false;
+		}
+		const auto maybeStory = peer->owner().stories().lookup(
+			{ peer->id, StoryIdFromMsgId(id) });
+		if (!maybeStory) {
+			return false;
+		}
+		return (*maybeStory)->canShare();
+	}();
 	result.canToggleStoryPin = peer->isSelf();
 	return result;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 555611ea4..e66172ee5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1278,26 +1278,7 @@ void Controller::deleteRequested() {
 }
 
 void Controller::reportRequested() {
-	const auto story = this->story();
-	if (!story) {
-		return;
-	}
-	const auto id = story->fullId();
-	const auto owner = &story->owner();
-	const auto confirmed = [=](Fn<void()> close) {
-		owner->stories().deleteList({ id });
-		close();
-	};
-	const auto show = uiShow();
-	const auto st = &st::storiesReportBox;
-	show->show(Box(Ui::ReportReasonBox, *st, Ui::ReportSource::Story, [=](
-			Ui::ReportReason reason) {
-		const auto done = [=](const QString &text) {
-			owner->stories().report(show, id, reason, text);
-			show->hideLayer();
-		};
-		show->showBox(Box(Ui::ReportDetailsBox, *st, done));
-	}));
+	ReportRequested(uiShow(), _shown, &st::storiesReportBox);
 }
 
 void Controller::togglePinnedRequested(bool pinned) {
@@ -1391,4 +1372,20 @@ Ui::Toast::Config PrepareTogglePinnedToast(int count, bool pinned) {
 	};
 }
 
+void ReportRequested(
+		std::shared_ptr<Main::SessionShow> show,
+		FullStoryId id,
+		const style::ReportBox *stOverride) {
+	const auto owner = &show->session().data();
+	const auto st = stOverride ? stOverride : &st::defaultReportBox;
+	show->show(Box(Ui::ReportReasonBox, *st, Ui::ReportSource::Story, [=](
+			Ui::ReportReason reason) {
+		const auto done = [=](const QString &text) {
+			owner->stories().report(show, id, reason, text);
+			show->hideLayer();
+		};
+		show->showBox(Box(Ui::ReportDetailsBox, *st, done));
+	}));
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 9bcbe4049..694082a04 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_stories.h"
 #include "ui/effects/animations.h"
 
+namespace style {
+struct ReportBox;
+} // namespace style
+
 namespace base {
 class PowerSaveBlocker;
 } // namespace base
@@ -40,6 +44,7 @@ struct Config;
 
 namespace Main {
 class Session;
+class SessionShow;
 } // namespace Main
 
 namespace Media::Player {
@@ -260,5 +265,9 @@ private:
 [[nodiscard]] Ui::Toast::Config PrepareTogglePinnedToast(
 	int count,
 	bool pinned);
+void ReportRequested(
+	std::shared_ptr<Main::SessionShow> show,
+	FullStoryId id,
+	const style::ReportBox *stOverride = nullptr);
 
 } // namespace Media::Stories

From fcc15dd52de878b33ff9c5c68cd24279f59d31b5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 19:00:52 +0400
Subject: [PATCH 352/676] Open profile on header click.

---
 .../stories/media_stories_controller.cpp      | 23 +++++++++++++++++
 .../media/stories/media_stories_controller.h  |  4 +++
 .../media/stories/media_stories_header.cpp    | 11 ++++++--
 .../stories/media_stories_recent_views.cpp    | 25 ++-----------------
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index e66172ee5..cf411bc7b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -10,7 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
 #include "base/qt_signal_producer.h"
+#include "boxes/peers/prepare_short_info_box.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "core/application.h"
 #include "core/update_checker.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
@@ -45,6 +47,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/round_rect.h"
 #include "ui/rp_widget.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
@@ -1388,4 +1392,23 @@ void ReportRequested(
 	}));
 }
 
+object_ptr<Ui::BoxContent> PrepareShortInfoBox(not_null<PeerData*> peer) {
+	const auto open = [=] {
+		if (const auto window = Core::App().windowFor(peer)) {
+			window->invokeForSessionController(
+				&peer->session().account(),
+				peer,
+				[&](not_null<Window::SessionController*> controller) {
+					Core::App().hideMediaView();
+					controller->showPeerHistory(peer);
+				});
+		}
+	};
+	return ::PrepareShortInfoBox(
+		peer,
+		open,
+		[] { return false; },
+		&st::storiesShortInfoBox);
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 694082a04..5463cdc83 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/object_ptr.h"
 #include "data/data_stories.h"
 #include "ui/effects/animations.h"
 
@@ -36,6 +37,7 @@ namespace Ui {
 class RpWidget;
 struct MessageSendingAnimationFrom;
 class EmojiFlyAnimation;
+class BoxContent;
 } // namespace Ui
 
 namespace Ui::Toast {
@@ -269,5 +271,7 @@ void ReportRequested(
 	std::shared_ptr<Main::SessionShow> show,
 	FullStoryId id,
 	const style::ReportBox *stOverride = nullptr);
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareShortInfoBox(
+	not_null<PeerData*> peer);
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index cbd67f5e6..dc33da5f4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -8,10 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_header.h"
 
 #include "base/unixtime.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_user.h"
 #include "media/stories/media_stories_controller.h"
 #include "lang/lang_keys.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/layers/box_content.h"
 #include "ui/text/format_values.h"
 #include "ui/widgets/labels.h"
 #include "ui/painter.h"
@@ -92,13 +94,16 @@ void Header::show(HeaderData data) {
 	if (userChanged) {
 		_date = nullptr;
 		const auto parent = _controller->wrap();
-		auto widget = std::make_unique<Ui::RpWidget>(parent);
+		auto widget = std::make_unique<Ui::AbstractButton>(parent);
 		const auto raw = widget.get();
-		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+		raw->setClickedCallback([=] {
+			_controller->uiShow()->show(PrepareShortInfoBox(_data->user));
+		});
 		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 			raw,
 			data.user,
 			st::storiesHeaderPhoto);
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 		userpic->show();
 		userpic->move(
 			st::storiesHeaderMargin.left(),
@@ -107,6 +112,7 @@ void Header::show(HeaderData data) {
 			raw,
 			data.user->firstName,
 			st::storiesHeaderName);
+		name->setAttribute(Qt::WA_TransparentForMouseEvents);
 		name->setOpacity(kNameOpacity);
 		name->move(st::storiesHeaderNamePosition);
 		raw->show();
@@ -122,6 +128,7 @@ void Header::show(HeaderData data) {
 		_widget.get(),
 		std::move(timestamp.text),
 		st::storiesHeaderDate);
+	_date->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_date->setOpacity(kDateOpacity);
 	_date->show();
 	_date->move(st::storiesHeaderDatePosition);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 306e1a1f0..5f24fe717 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -8,8 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_recent_views.h"
 
 #include "api/api_who_reacted.h" // FormatReadDate.
-#include "boxes/peers/prepare_short_info_box.h"
-#include "core/application.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_peer.h"
 #include "data/data_stories.h"
 #include "main/main_session.h"
@@ -22,8 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "ui/userpic_view.h"
-#include "window/window_controller.h"
-#include "window/window_session_controller.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
 
@@ -332,24 +329,6 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 	const auto show = _controller->uiShow();
 	const auto prepare = [&](Ui::PeerUserpicView &view) {
 		const auto size = st::storiesWhoViewed.photoSize;
-		auto callback = [=] {
-			const auto open = [=] {
-				if (const auto window = Core::App().windowFor(peer)) {
-					window->invokeForSessionController(
-						&peer->session().account(),
-						peer,
-						[&](not_null<Window::SessionController*> controller) {
-							Core::App().hideMediaView();
-							controller->showPeerHistory(peer);
-						});
-				}
-			};
-			show->show(PrepareShortInfoBox(
-				peer,
-				open,
-				[] { return false; },
-				&st::storiesShortInfoBox));
-		};
 		auto userpic = peer->generateUserpicImage(
 			view,
 			size * style::DevicePixelRatio());
@@ -358,7 +337,7 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 			.text = peer->name(),
 			.date = date,
 			.userpic = std::move(userpic),
-			.callback = std::move(callback),
+			.callback = [=] { show->show(PrepareShortInfoBox(peer)); },
 		};
 	};
 	if (_menuPlaceholderCount > 0) {

From e66d9d5d249d03fd64f5e45d0bad2a9770faf68b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 20:43:18 +0400
Subject: [PATCH 353/676] Fix jump to top on a new message send.

---
 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 e921e8ec1..6c3e2e059 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1111,7 +1111,7 @@ void Widget::jumpToTop(bool belowPinned) {
 		return;
 	}
 	if ((currentSearchQuery().trimmed().isEmpty() && !_searchInChat)) {
-		auto to = 0;
+		auto to = _inner->defaultScrollTop();
 		if (belowPinned) {
 			const auto list = _openedForum
 				? _openedForum->topicsList()

From ef1f1846a46e1764e4d18939db2b87041a85eea7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 21:12:44 +0400
Subject: [PATCH 354/676] Respect PowerSaver in TranslateBox.

---
 Telegram/SourceFiles/boxes/translate_box.cpp | 11 +++++++++++
 Telegram/lib_ui                              |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index 066ba855b..b21cf229c 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
+#include "ui/power_saving.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/multi_select.h"
@@ -131,6 +132,14 @@ void TranslateBox(
 	// 	container,
 	// 	tr::lng_translate_box_original());
 
+	const auto animationsPaused = [] {
+		using Which = FlatLabel::WhichAnimationsPaused;
+		const auto emoji = On(PowerSaving::kEmojiChat);
+		const auto spoiler = On(PowerSaving::kChatSpoiler);
+		return emoji
+			? (spoiler ? Which::All : Which::CustomEmoji)
+			: (spoiler ? Which::Spoiler : Which::None);
+	};
 	const auto original = box->addRow(object_ptr<SlideWrap<FlatLabel>>(
 		box,
 		object_ptr<FlatLabel>(box, stLabel)));
@@ -139,6 +148,7 @@ void TranslateBox(
 			original->entity()->setContextMenuHook([](auto&&) {
 			});
 		}
+		original->entity()->setAnimationsPausedCallback(animationsPaused);
 		original->entity()->setMarkedText(
 			text,
 			Core::MarkedTextContext{
@@ -194,6 +204,7 @@ void TranslateBox(
 		box,
 		object_ptr<FlatLabel>(box, stLabel)));
 	translated->entity()->setSelectable(!hasCopyRestriction);
+	translated->entity()->setAnimationsPausedCallback(animationsPaused);
 
 	constexpr auto kMaxLines = 3;
 	container->resizeToWidth(box->width());
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 67dc933d7..c3aab1bd1 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 67dc933d72fa5e20e6480bbff5a88a2c52d9d0d0
+Subproject commit c3aab1bd141101c32393edc07032113ae4f1122a

From f0ab6e5690deb3158e487bad6b1f990615edcf00 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jul 2023 11:33:28 +0400
Subject: [PATCH 355/676] Update main menu and stories icons.

---
 .../icons/info/info_stories_to_archive.png    | Bin 0 -> 671 bytes
 .../icons/info/info_stories_to_archive@2x.png | Bin 0 -> 1236 bytes
 .../icons/info/info_stories_to_archive@3x.png | Bin 0 -> 1869 bytes
 .../icons/info/info_stories_to_profile.png    | Bin 0 -> 770 bytes
 .../icons/info/info_stories_to_profile@2x.png | Bin 0 -> 1482 bytes
 .../icons/info/info_stories_to_profile@3x.png | Bin 0 -> 2200 bytes
 .../Resources/icons/menu/archive_open.png     | Bin 0 -> 473 bytes
 .../Resources/icons/menu/archive_open@2x.png  | Bin 0 -> 654 bytes
 .../Resources/icons/menu/archive_open@3x.png  | Bin 0 -> 952 bytes
 Telegram/Resources/icons/menu/channel.png     | Bin 610 -> 613 bytes
 Telegram/Resources/icons/menu/channel@2x.png  | Bin 1098 -> 1099 bytes
 Telegram/Resources/icons/menu/channel@3x.png  | Bin 1649 -> 1650 bytes
 Telegram/Resources/icons/menu/groups.png      | Bin 0 -> 685 bytes
 Telegram/Resources/icons/menu/groups@2x.png   | Bin 0 -> 1315 bytes
 Telegram/Resources/icons/menu/groups@3x.png   | Bin 0 -> 1946 bytes
 Telegram/Resources/icons/menu/night_mode.png  | Bin 0 -> 656 bytes
 .../Resources/icons/menu/night_mode@2x.png    | Bin 0 -> 1261 bytes
 .../Resources/icons/menu/night_mode@3x.png    | Bin 0 -> 1834 bytes
 Telegram/Resources/icons/menu/profile.png     | Bin 695 -> 602 bytes
 Telegram/Resources/icons/menu/profile@2x.png  | Bin 1430 -> 1306 bytes
 Telegram/Resources/icons/menu/profile@3x.png  | Bin 2186 -> 1961 bytes
 .../Resources/icons/menu/saved_messages.png   | Bin 0 -> 469 bytes
 .../icons/menu/saved_messages@2x.png          | Bin 0 -> 758 bytes
 .../icons/menu/saved_messages@3x.png          | Bin 0 -> 1076 bytes
 Telegram/Resources/icons/menu/settings.png    | Bin 567 -> 698 bytes
 Telegram/Resources/icons/menu/settings@2x.png | Bin 1189 -> 1256 bytes
 Telegram/Resources/icons/menu/settings@3x.png | Bin 1764 -> 2009 bytes
 .../Resources/icons/menu/stories_archive.png  | Bin 1847 -> 651 bytes
 .../icons/menu/stories_archive@2x.png         | Bin 2395 -> 1188 bytes
 .../icons/menu/stories_archive@3x.png         | Bin 2952 -> 1807 bytes
 .../icons/menu/stories_archive_section.png    | Bin 0 -> 1847 bytes
 .../icons/menu/stories_archive_section@2x.png | Bin 0 -> 2395 bytes
 .../icons/menu/stories_archive_section@3x.png | Bin 0 -> 2952 bytes
 .../Resources/icons/menu/stories_save.png     | Bin 0 -> 729 bytes
 .../Resources/icons/menu/stories_save@2x.png  | Bin 0 -> 1408 bytes
 .../Resources/icons/menu/stories_save@3x.png  | Bin 0 -> 2128 bytes
 .../Resources/icons/menu/stories_saved.png    | Bin 1935 -> 0 bytes
 .../Resources/icons/menu/stories_saved@2x.png | Bin 2521 -> 0 bytes
 .../Resources/icons/menu/stories_saved@3x.png | Bin 3136 -> 0 bytes
 .../icons/menu/stories_saved_section.png      | Bin 0 -> 774 bytes
 .../icons/menu/stories_saved_section@2x.png   | Bin 0 -> 1492 bytes
 .../icons/menu/stories_saved_section@3x.png   | Bin 0 -> 2223 bytes
 .../Resources/icons/menu/stories_to_chats.png | Bin 0 -> 793 bytes
 .../icons/menu/stories_to_chats@2x.png        | Bin 0 -> 1579 bytes
 .../icons/menu/stories_to_chats@3x.png        | Bin 0 -> 2274 bytes
 .../dialogs/ui/dialogs_stories_content.cpp    |   6 ++--
 Telegram/SourceFiles/info/info.style          |  16 +++++------
 .../info/media/info_media_list_widget.cpp     |   8 ++++--
 Telegram/SourceFiles/settings/settings.style  |   6 ----
 Telegram/SourceFiles/ui/menu_icons.style      |  13 +++++++--
 .../SourceFiles/window/window_main_menu.cpp   |  27 ++++++++----------
 51 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100644 Telegram/Resources/icons/info/info_stories_to_archive.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_to_archive@2x.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_to_archive@3x.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_to_profile.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_to_profile@2x.png
 create mode 100644 Telegram/Resources/icons/info/info_stories_to_profile@3x.png
 create mode 100644 Telegram/Resources/icons/menu/archive_open.png
 create mode 100644 Telegram/Resources/icons/menu/archive_open@2x.png
 create mode 100644 Telegram/Resources/icons/menu/archive_open@3x.png
 create mode 100644 Telegram/Resources/icons/menu/groups.png
 create mode 100644 Telegram/Resources/icons/menu/groups@2x.png
 create mode 100644 Telegram/Resources/icons/menu/groups@3x.png
 create mode 100644 Telegram/Resources/icons/menu/night_mode.png
 create mode 100644 Telegram/Resources/icons/menu/night_mode@2x.png
 create mode 100644 Telegram/Resources/icons/menu/night_mode@3x.png
 create mode 100644 Telegram/Resources/icons/menu/saved_messages.png
 create mode 100644 Telegram/Resources/icons/menu/saved_messages@2x.png
 create mode 100644 Telegram/Resources/icons/menu/saved_messages@3x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_archive_section.png
 create mode 100644 Telegram/Resources/icons/menu/stories_archive_section@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_archive_section@3x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_save.png
 create mode 100644 Telegram/Resources/icons/menu/stories_save@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_save@3x.png
 delete mode 100644 Telegram/Resources/icons/menu/stories_saved.png
 delete mode 100644 Telegram/Resources/icons/menu/stories_saved@2x.png
 delete mode 100644 Telegram/Resources/icons/menu/stories_saved@3x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_saved_section.png
 create mode 100644 Telegram/Resources/icons/menu/stories_saved_section@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_saved_section@3x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_to_chats.png
 create mode 100644 Telegram/Resources/icons/menu/stories_to_chats@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stories_to_chats@3x.png

diff --git a/Telegram/Resources/icons/info/info_stories_to_archive.png b/Telegram/Resources/icons/info/info_stories_to_archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9c81896eb1a9ab8a6470126e2e51693a1e9e5e0
GIT binary patch
literal 671
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfr-=8#WBP}
z@M*~Y(}jr=ZXzf9J-MD9f8}o0+3Rvr;bg)_!wB9S56OrrJZ#NZmHx4-8X0Ib^YDnU
zojU)$>i%cT=X;J<?hk(diT8fwxvw$bYva%VjX8h!@Z-Pr^DkzcNiq6cS8p`)Nzu;x
z5(@$}UVZ)bwyfGl?(xSRmtVFxDRN|Py>&J%SZk_^5a;%FaqH)wO`CptY1G;*6RE1k
z0F4|IsQ`Vk?vi<|r&Ekp<ZO@Le*3J@zePG?-Cj$7Y5r<I-u9w(p^{K158L5t)v{W3
zd&$WsOZLWTPvugc<F(Xpx$rsH=gf@^9y{D7F$uXY4s3J?(3|er#&AROol(oO%PS*v
z`i?(NF;ac<v7+s;;=9(KzpOgbPe-lYcKhuKnN^8%{mdnJPB5r@EWi9kW|i`ndb{~A
z4Vl(o&u&QD{B!Z{9;rF2ufI0*(D_+YXEyt2&AI2ryYKp`{rFqA{<^oGX2b6L@4xTJ
z=~|>X{q)wTwF$fjA4XlsTzz%X(me`g6?XGCM!az~`0us!Qr1?XHD}YDi!5Z))DnA@
zd)yWuO#<qPJak{v$5}<lG5-F`>!)6pByD;qlJ?~2-*59hRNj5Jes&<oY=8EH+=Iyz
z&Og8Jtm9)Kab(HES-bA$8O{9iv!;N(GHB(O3L7~-_Ok4VDHS#$VqC00SlvHvy`8JX
uE0nc$*4CEhBRi~R_}-N_J3pJ>V$ZO`<A7I*U`hxmad^7=xvX<aXaWG23K|Un

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_to_archive@2x.png b/Telegram/Resources/icons/info/info_stories_to_archive@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef905891c427675c553c682c341f4aa067b63afe
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGK1oDDR9Fe^SW76aQ4~J7Nb*i`
z^T=Bsr6eg*%1jY?zX#r7Aek`0KoQAAN=!^dN}>=GL_{Pqk`SR#-p_l#d)Kx7=lthv
z|Kk|la|Y+^z1I4^wa)t2UVHCfqcMF<88Btwdoy6BnBL9JEip0C+uQr+-_P0ESzTS-
z?d`2%LWMvV7nl0_`lY3%_xJZ-+Mnv`YK5fAVAj^w2<7VPN;`~yv)9+x`1p9njQnkE
zY#bjS=jZ1$p)m)sv9SjS2f|REpPy%DW?EZYD=I3IlaqaXe1!hW%gdSZ{QP`iV4zT|
zc3fCk`1JI|9PI4u;D0+hI&yfOoSb0BAm``j4h{|+dl{<c=4Qr=$}KG|wXm>|g151;
zX=`gkA_?y4=_v*Eg-uaW5sL;j;o;%&1wf<@2?=R$Z_m!o7HQ-QqNAf9A0H{8iHQkY
zTU+@Y#zP?CM@L5#4RV92@wgQ+H8eC(G^j@}FE2g^>H}RdG&GcNMp`6Zc7bD!uzpiq
zT>Pb*wY4=wkCHbxH|HBSH8sI<Z*R}u-kxu%rEP3%r1b3W?n+rxEP8$~fREYPSz<0J
zDbaGtpRBL16D%t$i*HF<=>b($RT1;z;-VDhKQ>s~gn4*)khrp>2juMR%zCV!pPx7;
zJ&!yoDT(aR^6&2M#27V_%gf7=kr86RDM3v2Lo5mo4kqE;+?-geUQ$z2gOkGQ>gvM6
zf|yNDK<@7DWQRT^2B?=HNd*N3hIsTmGM35H(^EsR@005Zh%Mdg>uZUQQT}Av*ViYn
z!H68_3FzYDg3Mf9T}Af#1!H4lq{zs~z&;Zh8L8h+nRIAqh?aeBZmvWID=Vws-d;lC
z8w<O(ww8m%PGDze$1%`Sb#!zPHTt!d;;Tt|dODsm3u}CQ99>5Y3JVLnzrRO;O5FQ2
zIXO8*Dx;Zxxb^k*#d>Bj;n4D-`TQLo9wvjz%F0hEXN01Dd3gcm?d?r^88JdjOUtgV
zE^@iOz0Kq_z%d3_CDH~31?gxFPSK+Y!!HGcc#S3@A)&LgGdw(8$0jv3m6*4-wscgy
zX<1nr!EmCGxSjFn1Ufo?fLvaIV%6;L?^8^m5D=;zVtq|dPmhj{%Ko2ud3h8N)^JQr
zjM_ld<8k(5>*eI+gzYElnUyo(q>LJ(JmJ=-b2nAas|JZ1G`s0xOTknwo4>#R;NalE
zz<}(7y&+F&X=!MzlqbAV!1jq335JY?a<m-Wda>^k7I#jeR@FEvDhg#py!gJkx#{li
zj*E-q+%XW%%E}6Z;KCUY5TGgu9WV~slarIo0S$0vo0^*H@9%GEX-P>*5kj!xGvnpu
z<%oy~q1I?)^k1AVm?xb<W@aYygyf-9Z*FelNtu}`e^18<4GzGLuzGrW4i67?0>WDx
ygD}YoRk7pEhVUIDo*ho_l3kk&O&R!4GVmKs-}PM~Xi32U0000<MNUMnLSTZ(**Fvc

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_to_archive@3x.png b/Telegram/Resources/icons/info/info_stories_to_archive@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc2fc30af1a0e8102a5e46ace761759182954d49
GIT binary patch
literal 1869
zcmV-T2eSByP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>w@E}nRA>e5T3JX{PZ&?l(riZ~
z$iOmF$-PoY(<l-_6wyL`kwVZA6qg4DgRqD4tp^uKXcLzf%@P%T&?l2jMNP#G(e_oz
zg|uA$|6kod<2dKsIp^MU@72ry+^275zVA2RH*@Z{%*>`u>Q7w(bp_NFP**@*0d)m7
z+zMD2Pa``!J6Bg%H#fIKhYs!BxpT*k9pAovD=sen^5u*1CN(0mkB`sw>(^hrc(J&+
z_>bT>GBUDd%N8R}Z*XX9YwMJhl-}N6fh}x@udlDcXEzq$g$ox(M@Lx;#M-m7vwQaJ
zVf4U9`|R1X`T6<Q)>eOie`a)jnx{^kYHMo~GlA{<@#DwKmoLwsKQB}?FE5X9FE1|_
z6&3B;wM)omq8<wiiyJp?5QP{5JM-kplS`K_g@lB-xVUWFwvD6Ky?gf<@sA%r#>U2S
zM2s~AMXRf;8Ew#n!+7xEK}1A^jg5``xr2j)fB*h1L`zRkmk(k9&I1PybaizJ^{A<-
zIePS{eiNKHaiY7so536y7|;(*A1MT-4<9}-8o<uer%&qxN6A=OS!HHs;u|L5jg5`e
zxG_n%FQG#(D=XW&b*rJKJ$Ue7Wo0Ei<f~V&jvP5+C|Dj2yaoILSxyiuD=Sy8UggP{
z#Taa$t%6^Ui;FW0&3Q_mIdca4LmQTplfx4*i!pqJ9UUFCRSzFNGz-lol)QNHB5f7?
zGC$yo!ks&J?&;H~B_$<}j*g-X{7(4H$jHc;m>7fQ(3>}J9v&X14Lf=ABwq>PsI#;4
zuV243Acze@2Faf1&!20=Q8z#(Nq%XDq@*O;s;a6gX&C{><;$08kiC2N3Rrj@SQlD6
zK0cnuEpv?CuBD|V6pk_lX}09#WLmTR`}fnMk~9heIAMZ-v|Ca{f&oPYfdg^p&K(H>
zEyD^818P%K6RnAdhliG_{_D2n4>OxyT3X8IH{R&|`}b*ZcoDj(Gu_wMN7iX_auTjd
zXNbQ7%6H7x))o~VQ3jrwuL*C*92^{u9Xm$k8yXt$p_8VG31p9tA3r9OqQW4wD8Vxf
zZXKbSh}G8C5_(;TTeog4EG%fIe)Q-OUk6@5z~LD!jO2rEnw}mU91I8uK(;VGJ}&uh
z=NZOSjh{Y!GQBa(jIaOxm`>3q?^DEojL1w)O(At4&5cj+48z$iF<>KX7g0tI!844`
zba6T@2TmIg<4$qFwtM$(ZOjJg=NU#^5N1-SM^8@=t!{L5Gy)Mk0o`dj8mCSqAb$S*
zS;@qfmX<h~A!r%`M{ZeJS#(5EGKCJZ$P9@p_?8qF3%GDWBqV@@sH>~9x3||pE#<5z
z{>k(pB!j)288b36NMT06-@kv4GgCR@etv!x6&1)EnNTE0c9jSJ1Tr^>(9qD;F$EM7
znz6Al8W}VSA{-Xsi{$|0e@@cHw{PF#euu-%8**}TqNgt?DByAHGKM<`Bz`owhR)B=
z=fGUKa)lOQ5+jbF$k4>Z1i^aq=8Xu4f-WeE)Ry3b;9qvOw6qXr2qNFtfAYI`?-DE!
z-rnB&V~I(6d3g;D4Us9@+uOys{`BqJw-28y;Y8i3jZ;>CSXdar0)cxYSz@{{;n=*e
zun;L*XJ;o}B{3MxcbJxz#xUsCL}iHxMr^~40i8hVhNX;~4iyN1l4|h05Hvyfx_$dL
zQEB`3?dx?|Pv3jMNQEihABzxJfkHM7Q3&3Wm})WtXY6xxb5H}y=yy^kqAG3{iD4kH
zVC#?v{q-Mb&z@D7wXQJ_p8<S5ZQHeL*Vb^DZzCZgfi?^`FHuoZ=4;Lx&CAQnY1?LI
zX7C7S4TqUF5a|(W7~8_b!_Cy3HEQF67+DW(8{z>H_BBk38^~{vzvEejySuw$Fxdb>
zK|!djY1=^KFbpY=Yz(c8cpU<_MCuyk2K4cSRxv{j1O^6v{rZ)$4S%`Z+*~DzDZCL5
z3>nzt$B!FIZCN;Y?a|-g&nST=N=9UHdX%JiQz1k{EH>$mX-r2(g42AVHt0bxz<aRl
z>}*d@Pvp3gONFp2#KG>NUY3+K3IkH))YMcu;S%bHp6TgnoK814H{;ap@ZrNkRp44_
zLHx&1aUw4ja+<UUTX*y3O{Qd|6{YES@7@Xjhqy1tOGOPEz5=|KGpPam$q)%}s`c~d
zPudJoTJ!_M=HmgN!3$Zw&N_@@_YxBm>+9?3w_db)C@8_B1ERjHtJh!pB8bc32njFs
z;5=~TLSAuy|Nb5CpgHxwIF{P0u7J7%>I$eUpsv9GZUz1YpfhfT!e^t800000NkvXX
Hu0mjfcdban

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_to_profile.png b/Telegram/Resources/icons/info/info_stories_to_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfe465c5b341a4f2b44c1ebf2c0b167dc98278f3
GIT binary patch
literal 770
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhot+#WBP}
z@M(yzM^d0f?JTaes0U7*syWIXZj-pWwhA5$xFFWJQ^X}kbjS1-v9+-~F6>>T<mi#1
zutQ+c-Xl370$Y#xE|^sRKxS8AsoUYiFy><M{?BuZ-<9wGzW2Rd+t2^gqSo@YAMWq(
zpXzn=_1AyC%w^@}!7H!in9cTEe*XOVmnFAy%#<hkEq`5NbueMV;fHI^ufCcUy*6zB
zeg0Obq>UAY%>f#FcJDsSXg5E9Vtiw&(aqPdv-ie@uME+C;(sc^K;d!uEAjc~pWnZK
zf2!A0Dfz=2Zss&PY`9fcRMfOdUtfP^&-E*>zustWbrJ~D6yR78Ut>4ls92!;XaHaT
zapqR_RnBp1<mY!MOgK_dQ^WJ@(W9h&^A|;}ZR2-2w0iaG{(k=5ck?zzcqlQnD0rUK
z5!0T0(n5xB*I#Z2iC#Bzb8{6xwaH6^IullgXifCs(3^gG0>{6%C)EtynomD{<RD}w
z#oOz)dGqGx4{zV{zGV>TbYW*_znV3*Vqb09?z<T#UMV|c?!Er{?*03hZ*p^TQZ`3U
zkPv+IvBE~;qUcMm)<dUHbBp@<`>Rjpbd#B?6st7xz=GW|dPxo&Gg#jVd_B*&Ps6U|
zV#bmyH*ZSb;pgYy8IxxtH-G;8;FB*)4%L*DxXiS?apz9X_S^pc{$ENLM6SJ-wz<<g
zdGpO@VQn{W-Evyz`b@mXxX{l=?l?;j<K2Uc9?ow92Je$Yuiw0VtNY&4#zsf1yKaAd
zWYob2Mf_~d4+}c{9{aZhs)Q%j*UP^>ZZcv2sjj)FMd~~!da&p^mqu*gzWu|3^1SWU
sKyY(^+rb^$B3zSCwgko`{}q2a-;9O#h__t&K2ZAeboFyt=akR{016;T7XSbN

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_to_profile@2x.png b/Telegram/Resources/icons/info/info_stories_to_profile@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e9990c2faa715e771ef297cee1833faa1118a65
GIT binary patch
literal 1482
zcmV;*1vUDKP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHG)Y83R9Fe^SXn4`YZNw5ndh-k
zW|>L(QD#wy+_*R)aw8WfE=(87bSoJWl0u4H5HejLQ=|+@<}ourGCSw_z4iXPz4y0$
z_WAyslYQ~E_FB)g-nHLht@VC#a^KJQ41CYPpPd1D(e9m{or8jc%+1X$EG$e+OeQ8K
zDk>^OdlOG|babq&tXyAT|A+Iqxw(n=D}rfiYFb}k|N8pMiR72!^z>9;U!S@S2nc{?
zZf?%s-=8XFDP(13-QM0ZL%F`bZf|cdDk@4(PmhX<Vn&03VIttSx3}8bT3uaTnMI?h
zs90TH%?zcluP-t(Qbk2YU<@B0pPxT}Qr6($paA#_CRJ6{fq?<)cX4qsG&EF7zNMvQ
zcXv18Zf<T$$@&D=+}uo~X>Dyqe4h|F=7@-hs;VkqUtf;p>x!J592!k=aq-t3$duvX
z;Xw~nU0t0_eT#C|-``KBXMB8ISy@?>4<3?+h6XZ%f`S5%O+XbK9898ld3mw7w--Qu
z)ig3P0?$Yal8F4JV`yk7EG!J1hK7dB%uE&;TRSc;&ehfR`T2Q!d%LTv>+$gs7<F~^
z#Kc4!8yjSV<>lp`o}Q<tCngse<nHcHO-&6-2L}hFd!|*Qtf!}kiNSXur=d=<aDIM%
zJ3BjM{>bme#l_zr&*kMMQx6!xEP7{WC&84Kma<F|UsF<22nV}|1#)q5xxc?>jw&nz
z3<}dpOiT=+?CtHz%k!@f6aP!@=;$Dv+}vE24JDnJW@l%Ul9FO$W1E_qFp)$Fp|P<M
zL&5|AQL?^DNlA%JFjiUGvx0O?e0h0!F$2P?6Ft(dj*bpBB_t$Zui%M~kEcoi03&!1
zsUCv2w>K6pBqW5X6p~L)PKYC8V`C;RIXRi=%gV}_ddPo$JS=5-c{#y@$TA7MDzR*s
zQX?ZHD3KM<&d!)toDuT+@bJLYLvCqlVQKJsb#+CQSW2!{l7^k2Fx6zQ-Q3*Z`<OIZ
zAW_MgdPy=}l-=E3Ntn;|$f5MiW44$Cm<|sQ5hcEud!Cs{$VkWU@9zNPGo(FDEEn|k
z;NXC)JvRwuXJ-==hA}iWq!gB5U|_JZu|bfi&@3xn&CJYLU(3b()}ZeszJC1p@mu>L
z!OPUt6tT|C%xGz8u>g40)YP1uoFtg}`FXnYC^9WA4OZj@WOk|)63{pkcf85e+S-~P
zLkz5~t<Cg>Xpnda9X&O`Oe<up`_a)60pQ-kvhu&uWV*Dp#EZbDCR-kUF`ZZ-0z=K2
zo}MOyq2uOl$^rue2>{zs+P#J1N9%*TyE|`8xJ%$v6W6P&tLRp7LBj{oXe8}=bdLlB
zf!8y?vaPL+(9qBGBjn^fJw55#?eFiSHW3O|3MNUc;o)Hd!&FJa@aS<Hr0pWEr#y%c
zm7Sg4*47pofc&CP3HMKkbzxzlq@+ZWPl<YTLSzhdJam_E(Kx_po(K}n7dKOIDIzs+
zO?S!Y=%{eo02tdy<Ve!fqNAf}Yk{^9?XdLRKZVT8%cENaSx&@?golTtmn|$Tlv#-Q
zuY<;f?1B)bye=YodRpNDy|&C^N=;2g|3$;XQOeKHcXDzP7yt+G{QR6!*4Eaf?GFW<
zGEJ!7D=RB>03zVpfaR#EsVOKZU}Zvd{S=HlIO(yN4rL&tOlD+c93LOkk(dImL{?T-
zbQqM8-rnA^u`zCirWn}>IBRH0u{mftBVpk@+S=Ow_c7!}yTEM_|KVZhqKe_qHMAx8
k<3_Z%Z{qh1{C{WQU*g;$z-B#3YXATM07*qoM6N<$f)M1Wxc~qF

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/info/info_stories_to_profile@3x.png b/Telegram/Resources/icons/info/info_stories_to_profile@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..414fa60a26a9a46289991f3b1c2cf71b03b406ca
GIT binary patch
literal 2200
zcmV;J2xs?+P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@0!c(cRA>e5nq{a}TM)<Zwfowg
zSWissRzwU`6csVSM0vI%iXT)g6!C)?7<l0#VxSlZ28w~AC<ZEaVq<sf`{C9(!`gAq
z*>|6VJofo=X3v`W&#bjq%*@&;Dd8_1fp7%E5eP>h9D#5I{<;xJO`J!iN|pNO*RMp0
z68ZDz&z(E>$&)8DGBSSt{FykTi9*hiBS+7kJ=d&RbL-YEI$;0Jo;^EJwiAR~zI^#*
z%a%QV{@mUf%{hPme1aSZ9yTp4ZNY*CA3uK79dM)9uU~KXpk>RJ*REZA{rdIt<;x2e
zENB-<HYa=b?Bm9bd-m*^TQ`LN{rmU(_wR4mu%TG7Vs<a@+_@u?j~_qo*RP*lCV8CF
zrAwbWbxIsEh?_TWE?&I2M~@zj8Z|0YrcBnXS=~IN>Fd|8hWfsJ`>Ir_;-->7e*OCO
zc>{(wJl?x^Z`Q0?b?erR%l68ZEA3D(U%sqVsZv}xnHBEUtJnMY?+sVpym>Qy`gHbm
zALyy6spH3w2f@IcGG&SnG@mLXM~?jQ<A?Tu#}zA96fa)fC*mKqvSrI|-MUpH_wC#F
zPh*1r+qP|MtcMRDKJ@9+CqT1ZyLRPBc=zrdJEX_T4A5dq#flZ5K7Fc3^x?yY><vNM
zNIq7cJbBKYJEwbf_3Bk7Px3tp*kXEmy6zQ+Y4z&W1GbTTxH@&}aKcK*pu2SGl6*IU
zx43K9F6k8n+j{Ueq9Kwi3>q{j$R*vXRV&@A3l}bA$&w|S8v(ahu3TBd>(Qe}2ZMg>
z*fHI)Zr!>CgBuSD$&UE&;>8PgvUs$eWScc>CWsJ6j~;cBitvcdi6M6H-hJuPr5iVH
z96We%&YU^5YuAoQq@=K7=gysb=+Gf@wkubz?Afzt;>3xC3Kh~a22H4~-5^LX1mb?=
zl+=i=TetRr7(RSB!>Q$k-nMNU#~{D$+qVl-6DXqY22L2Qcdyf@PrFIR#Ahw(6Z!V-
z+a78Q7cSI}+G&E?SFc{#`I<vs=VpQzt0fsDH_7OHLU@g}WXTdYogqVpXvxgbKsj0=
zNz<?sCQNV?i-|dT@??$GzI}T~HNxMwZ{KQ3mKJ;0m@#8kuU<_sshcdC<Y3jRRsa6_
zA*=<6@g3voT)A@T7rtoGB1dOpVs6^BNlXGtzU-(rZQ3*ugP1X6h88PQq=+$#c!a5C
zX3m_c5vER^s#}F7)3d|~#G5v4D*U(!9ULA$eArF@?Af#8)|M?>>|)unWuw$#$w2UE
zm(d9efOY|kGho1g`Sa&DZrs>SASS-fCO2-}=%~X6qsusM)0MZ)l;h|2+EJ9z0WkA1
zfWzQf9mtzEuRaIKP#inP!Nu&CCeALQHNoVe-UtUm^M&S26B<AYti;*E@j<wD3}_Aa
z=+PtnC^Y67X>xmuQ=mWrX)*}5dxN7N^@hP4%Ve)Wc8&UYW7;qWntl|TbMwK22l7Z@
zDRf*!yLRnF-feb>KrDo7#~3!P?@`BOmlMgcW5@bf9u&q$j2Iyx2M!z%I(ULfC94^N
zz{1UjUiV14ZPsq;@Hrv0tsrv~yHy7M%a<==Z{50eb{XO54B+$U&n;TCkfx{vClV@R
zh$3uMmCOnddW*gN`}cdmHE-Vh+qZ8b%z})uj!Q}O$&)9d$ck;!q=|>2QKLrf+_{qj
z-R;=$(2X?h*s()QvY=(_i%2Mn^hAUq?%usyp+W`K?m(6-S(1v7*768P(H}f`un2pE
z%MO+dmV_`CT*HP94FUZ~JVA;jh9M~5bGM{rG)=01`SN8gkGl7JIC0{H$U|$i_~<rm
z+6WLt)H^$pMLl~_;k}X7+pW^!>({Sqa2|~S($GRhSD?8WH3Z^#%$YN%j;aV9qbgHr
zH10B)!!>Kx)QVi+a(AJ770bMxG-;An>EFM<#*CZhMoYuRQcENSH2Ow%Oo_p=&3x9$
zE8yg>vD~U0KYm<1AucOgv}oL&(F)WL1rB2K=FPg*jV6;f)(>yKQ>RXxct+;N=25O(
zIX4{PGfVY6q`n|cJ_)u2;#%n&=nWb)hy{zA%QI)rh#~~K{4|I3M2CnTu<SHiF_=mj
zcR3oAyG9QWbQ7@)d5YH6^pPV+xV+Z#-t^L?OD%QIG4F%N8z<5ViZS-Rd-sksds1va
zq@KDz7R?E%lO0ctNFx`egek%F%0lhfv7>g5byBNVt%yNSiqMR*p)4&fzPP7M(#4mj
zW4{}TxOLw+d<z#Y9E+kQ!xb)}EkB*S#;%?~Ne(DJRM34Rdh{`!66m6DXkvC9hSN#T
z7QU164fq!+k`C&Z22IdFEj~aO*&Buq9m+{Xq)GxBAaWEaKA1B4#>Oyg*f1Z7v)xj)
zYSlPS1fMP5E|Vw@Bg$Qg*cO7Tel}0vR`cb{M<!xS^@|rT`Udo=IB?*=PoF+XuY}mU
zcQ4;F#Jj0fty-0cQ9y*?^AVr^Wk!v-RwuvW4Fr>usFG_0_EN{XuVL5vI#VM+Q(*V^
zosR+T=aFC+pNt65@Q-Ytnj|+`L>t_4IHr<}g4QBA=-$1%ABTd~saLNaXPWlRgXWVs
zyLD>uR%pW23>B+*XR;kINKWU@optK&);I3v9jy}Pcj(Z;@oPp$`D8Q6j_1vrN6_px
zKi95Zn;f5h*W3d)Mrz3JQlmx<l5VO|+ypSes2TE&2v>W7n+pNM5eP>h9D#5I!V&m?
ajlh5YJ1iXjyv^PK0000<MNUMnLSTZ$)h1K`

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/archive_open.png b/Telegram/Resources/icons/menu/archive_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e3090130c73ec24625663cd4d2ecfd3c8bb3dc7
GIT binary patch
literal 473
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%-Pe$F~maf
zZLnjXtAl{4k&22^l429{4UaW3jeD1_j@a2Oy@T0&!?r@^FeAavR*vA$(L8I9`K!%5
zd;ZI!($KwCf8*Q@&-}0Y#*}Y;;PW1hu8Mj0jlZ{N&f27-eR|S?h))kK)@g8^-t=yE
zf9PeC&o;~TubJe=h95TQyYPGSy4M$&tQ&K?rlmH{NZtNn9@E-=liwUqUYdE!gtu$A
znxpsq@3Ge>UQ$b(_uPP|_Wp9)cuqOV23AJ~-49PpT0Z$qKmSp5Po(wXeM*tjTmzSU
zdTh}otL5o5hhxh2Tx|}ftIRH4ixkQv*wmRcI^0DU>J-TPv9NCVFqzv+jkEs$<A9QS
z2bVM6lU!n3+gQqK*1vz*-nMJq>Q!BjD<s&q%vWht^%Oc@m~;DB;=0#N;ysTpvl=kS
rNBVVnIEG&R?a1i<yF+$o+}A&xX9{LYFPikW1Qe{Eu6{1-oD!M<c}%Tf

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/archive_open@2x.png b/Telegram/Resources/icons/menu/archive_open@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c95bd9f6628fd34aafbd0815ac240af8b843481b
GIT binary patch
literal 654
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuF_QTV~F(iWX
zZTQ}GjE)jp?*wf>+2-n`8m;MJ(>l-TC8x=6Hm}y8oj1h;yi{BkEfSlX7OvvedTOtF
z<jqI3Bdu@jyfgdahre^*zxkPVEJtgpofqTMhM)&~xiSLZ7VnH%7|_wR@5T4p{{<Eu
zO(NY#k0yQ8{kb_t&wJ@4f#pAI^k$ynm75dcRFcw`DAVu$gty)Kdg;w37n`|$%kRHu
zK4o%t#?7l)TN~;(-}G5xF1{pgJ$vkjW|bwKwR_{3`<DfN^jM}cS%~T5f?z9O=SdO*
z5x2g+<*F5IdMK2={r2?JtuB*|Hm+dSkn#99<MPWd+w@iI3%A?0$J@>S-`ZTbHL8%`
z?O)iTyqNXZ6>h&R+kRWO{p)7E)0<?DJC-iKcq7M5hbPuqg*j(Os*0}T<ae7`7S3<}
zW#MF~oIKxX_Svx2q1VoTeN(pk^UpK9u9ou3EM~v|#$EraVe!a*uHRIzr;2{{H7OO>
zigx~SR6gu-!1I;kheGAxmJ@a<K1&6ZISVyfI~00OhHLDJe6+Vyv+|@MQ=6{KL!0x5
zdCQDuc8GO6Wfa)J(C^j%r&zYvt@+@Bt67XmHgfiV9DJNJF2DZD(7|zFX2l%k$tTaG
z8B1QTIlyGI&R)OI==Qeeo2rL+0vPt3Z>vA4{^f(5ke-{6kh$TP4@>>`c%^EwPGR~V
a-zcA%bLpJt{Vf|nX~EOg&t;ucLK6Th)C(E_

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/archive_open@3x.png b/Telegram/Resources/icons/menu/archive_open@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..74687f9ec2864f74e9f4da3b3afd809b2279f2c5
GIT binary patch
literal 952
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}uH@<B7?Q#I
zHfnE{k)ud&ppc=&2Ei?x1a*CQ!Y0}@-TEyNm8Bdp<5>6x4wgxW{8oQaixp8mqR=#T
zfx-{wF2}RwiHB1+r<L73dqj3$%<A2nzdxT-oL+W4k&o|%JJ$rJB@CJlFzSyXtIn*N
z<c$$Z6D_Q*t?lftmHf+X|Ni~^^y$;HwnnWC>AAisYVG#z+vT19y?ggA$85G^-p!ma
zkD&PrigwQ7GJF=oVyiZ}^YFt7P1bYIl~{#(ZkZpweEIUa{qd`|#^^m1Qd_?7((~uf
zZ>&q&xI+Jj`QG*G*9%6d2qjLnO1b-?!lvT&$B%-!mwThuwn^-X)4#>l?3uIq=7QG`
z6)*GFx){&sSa`SNYEq(}>leYZ2||neI<Kwrx2a#B{I^cNy0Emgb=%7}nI4%XOcI}0
zGVu3Y%y?3?b4f$qc5AtQ(SyJDKl#wacHw1-RD3Iw)T{X+S&I(8ULB&v>A|UxS;u0$
zT*>HMiczbR<1Ukr-GO$T3&Vfb$O%fBJo;#1#+%a|Stqkhob7Yr|6~<4b%i7~bBFTE
zS2OZX`tTX-lHbI7`(=sS;){zHFJ5cCoA1E<KR{34%-NRRuu5J&>A<R+IlpS`u14K5
zuih({<5}?VSbFcldxy_QGUj_M+SI#Hx93bV|Hi7ld`YJ-Ntq~~{QP<I!3XOTYnCa!
zIn#Rh;px+-|L68LMjUwi@ZrPNS!r<}XLh9-C0tQU;z?|gUDn5WTZ+x#m4vfIV*ASE
zL)+RId#sKLxZOy6+qd?5woCq_PL9e<OO+$b47POgwmbJUUY5&ve{;fgIUY8dRrBY}
z(Gla$Jip~`-tD(#e4eGt8Wsga9b!oMpwoQLB>LUcB1!Y+{JgwxXLwIJ2C^_DY-6Z1
zUa+^E-*I8Uii;Ts9Az~R-oAbN?_XP)zm1c{?k{;_&hnZoEx~9e4+~RJSVXM2xcJ(z
z?&ygjTCKBYW-##NO)(HuiCr6(wz28b{zG1i*o%dhS=f1ha~1-cuhA>?KIzStV<Mdo
zEG2o^?&g`Vvub5t?;R2NVN+#o?cDRv_Y?)m1vQ8$uzD~;sK&XXKiH>T{w|&Tq2U22
O*Lb@6xvX<aXaWEdZId(r

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/channel.png b/Telegram/Resources/icons/menu/channel.png
index df2823788ff692575706e313d6689af80d8ffe11..d6caf71311d55353eeaf1d87e462c0c0b9831f65 100644
GIT binary patch
delta 494
zcmV<K0TKS<1my&ffq&0QL_t(I5#>`oj{#8>WoBg&Ux_HF6cULg643~qk47O9i9~d$
zM5ofBP^<g}ogn@KjY6Z+_>MxvM}&~zWQR9nk<BP~U-9P5x#ym_^X`2D!Jl0;-#?Sf
z<>7Exuh;i_z4Q6ZH~p%2I-TS3csiYKHk(qZ^rlNXojx26g?~bUrfG-6vE6PZ5()A8
zAcz4voz7yhh(w|vd?Jx>xm>|uu+eBB)bIDDQmIO%+U<6X^3Euq&u223#bR+h9=S#`
znQStd*lf1JV8G>{W1r85YEkoJxLU1dvso^$)oO9l*a=Ay<n?;%^?Iw-A`CCU8YvWt
z)oR5nnJZ?ExPR;$m^GTu=NgUX4GSiPHLBHWe!o8wiJ(WH_lu$^p-{-<8}WD?Ba3!C
zuGws6x7&%=W7kON3e0Bn>2$&<e0?trAxu3UPqA3s@At`MlF|Kc1YNV)#AGrFXeEpc
z1_NG0p%B_yE|--`Wgrm1(2B)kM)rJ<#bTq;2<L(@Zf6sWOePZ}g=4$j#<f7zxm@mf
zK4Ed#%jGhaN`X<U)i5#|jU)<SwOVlkT;?T?Mx&^_+wBgA!%nAz>;6)D3%qP9s&KpA
kxP6sMWxZbC^#AdB0W{3S+?bKzHUIzs07*qoM6N<$g5jg~CIA2c

delta 491
zcmV<H0Tlk_1mXmcfq%?NL_t(I5#>`mj{#v6wPs}zuS6773W>xLiD<-hLZc9gL?Sv=
zqEqQms8#-gP7r^AMxjw@ydnw_j|d@QPxj-R@yhNfcfVqsIrrS-&b{9iiT><ignpS)
zsSJn1Mx(LU>zz&~q3LJ6+wC5Y$CJrqy<V3}r59b&>GXcTFMkvY48yowuFYm6lgX&p
zJ4FN-3<jIcCXq;P_(USXvTQIIY&04O_4|FfT&~e*w%aXHUK!={`AjA=pU)461K&uY
zP~eLk4#!|H;Pa2M&*ww6sQErztyZ(yET7lw_2@L7loV6s^?K{|daKo<j3B@nsZ^@v
zaw#a8FXoK+?0*ZGGn&n2I-TwX3zEVa)oL}r-yexYFr$y_BNlVAU;R@&9$&3i7{~pY
zPNz<%le*kbjfT#^YPBAZM_h%^?}MFysmJ3f7K^*xE}2Xc-OonQHJeS`Op<_6!pLMY
z;WZQrVXWnHS*=zF0s&lFsZ>g2kDswvY&05?zF?bRWMr{eh!l?Pb{lJfs&l#A<9y1Z
z*^9*@l}drpYPB#jo6R%|V7J@R0Y38-N25_x-tBgW!(pe>!MZ<{UIK3yaQllY&|_?0
hrBcBtZ^QrT{R;-)#LYJI=Nte4002ovPDHLkV1j<Y^C18L

diff --git a/Telegram/Resources/icons/menu/channel@2x.png b/Telegram/Resources/icons/menu/channel@2x.png
index 68e65eadeaa29ba64f182f566bf3875115f60891..c68e6a6b0826f3ec261dfa9eabe9c8219c822d1b 100644
GIT binary patch
delta 984
zcmV;}11J2-2+IhNfq%70L_t(o3GG-*D0NX3#=Yc`S6uSSqZmkeCh87Q9(jZjd5kDg
z2I$@aB?AKk32_GuWM)Jr6p18Vc?~E<Qj`HMMatX%)vDcb?9MsY-S;1zJJ_wg*4p2<
z&N^qWz4rC+(0_Uc^bF`35T1dYoSeD2xxKx;t*xz|o*q9xKY!sAS^<50e8$GczJLDg
zc6(S@m{tgZe(~|~J3BiR%=Pv4`1ttJ(h^N)W@ZEuX@aV(th~R!C;IvM`QYGSS~fK`
z1?9)bhp(@%CLq_H3<kr{(9qY{7l_~9-nzQFq?m<;g%o94TAEbvE;%|ndUJD=C@(KB
z^Yim%OxfAlWPgPqGttz@)iNars;jG$lam7i0+>=ksHv%mh=_p0^73+XbF;(YP;hq6
z<mu_z+1dI0{7es|eZ=?C*Vl*TT)w|&XnK0OrKN>Hudc3cZ*RE-Oo^S0ZG~xZaq;^4
zI@600s;a6eC2MPINl8gsKoLDH@$&Lg@c(0muuTAZa({ACUS9tC`l>)6+{AgB$jHdl
z)KoByj*kB4Xh6ydC@Lz7p8M$NNO%HN0XYGove7b>HP!XP9XJ6A=Wq&84@fOtoD99Z
zywIwkpdhv7;_aM(P?tYHKS7n3mnWW34UrSj<KrXMeyi0Q8yl;JAlS}7?QyIg9v+5-
zgzWF{_kZ^GZftC*o@H+Dlv`U{QHQi2^2~E!U_jwGQ$5R+5}uivd2n#Rn6wKkD=Q|G
zi3_b75dW1C7T#J`R+i0XYj1BymxJ-?=}AU|k8F5&7|Q<s{?pUbwzf7jspvqkw!Xd|
z_a2$QfGOG!YLI2!F+r!Kq)_Gx3JRdXu`@V0NPqtC@9!3iMb@dQW=K=S=!(F4e0==d
zJ0T%~0xBsfVb-#;vb(!G(l0J9hK7bR6Ou>z#Kc6VbXsU=Xdsl|l?hEZnJOwOq_}Z$
zaogM5WV*PxFq_S=qA_1xU4_!sUK@9)hld9Mp|6#)LdM5SthKeZGLyHr_sGZySuviU
zpMN6`ns#@0%bcB_PE1Sy3pG=A{lE>7IO^)^xS$C1=H`ZcFyix?oSams3tSM65+#5@
zJ32a~W`BQw(l<3VN%c}WFfb516pw@&o12>}HMu0CUV|HH&&bGNK<p-3R8+*2t_b|w
z6BjW(Jsp3k7>!0W+6xN{XJ=>O;o*&qjZtU{aE-^V!3*UsbfdDgv=prLj@XELgBs{Y
zR%Pgzm>874-Q8VmW|ZdH+1cN<Kp8=|>KV{8pl9Gm2L1tr#HtUi+<6WF0000<MNUMn
GLSTZJI`Ieq

delta 983
zcmV;|11S8<2+9bMfq%3~L_t(o3GG-*D11>E_ZafXD~!DID6^3AY@#es9*q%JgjtOe
zWr0{wvaqm_5E~Y<vmzUcMAAfF3rdj`W#KhN%G>`}U!AV&bnhK==D)hLIDO~)zVrKi
z_q+Fe=R4!&rT_E{=o!#6AUp$kd3kelb9;MxTU%RQU0s2Jfq%j&v;zA3`;U!{egFJz
zZ*NCNMrwr+=$Dj~w6n8A!CYTokB^TpEiKV>W@bhpktQgs)%x)8K=kwT^I>6Ov}|f>
z3d)a<kAQ#xO+fBD`TF_}4Gn#LeS!Gx?X9DuLyB2kTuf1BWMoM7o|5C@;x;!oiSqLD
zvY?<q#*~|zOMg}fG80V=TrE?Apt`y`EiElLIG8CFgqoTfqtOV5<>h6Y&31o(ui)&O
z$=lnzy}kYU`I#O_`-tzOudffwxqN@m(Dd}Q-EJq)tE;Qq+gmOHQ(`A$TVYySTDrcz
z&h%o0s;VkV$=cdlYHF$$P()8le0+Qq{QsCCY!iT<oPV5HESA^TR|Nv$CeG8u#Kfeh
zr-Ny9bo4(*15!>vv9YoA+($=8!V{nh$O#CQjh3OTsje69zzIk=hf9EZKx*mYWa#DP
zg;s@zhN>+WZ|4Mry8QY1399`3eDQ>8h@5~PA0Mgq_w@86BqXRI2)6T2dmO8Whlk<e
z;rsjhy??#E8yg#{XPL(vuIA=u)FJJMJo6kF7*IIQRL?S{glA`G9~>MoChfw?%1U%}
zG#6SmApR>OEWEXxoSezY$+osObUCf9txr!+G8%kj!^6W+_V@Rno}RX}w4g~v2ZFWr
z_4T;-$ovIN(SA^aEbER5+GH|O=8B4npuw>-IDa@u{_pSa-QC@?PE9pKnj%J51lHr@
z<KN!N$;lK@Sy>sgR#a5n-QAIXad9ysB7&KaJkqD6q%ft+LPJ9Xq5Q5)Xu8Q%Sy?H?
zO-xL5I2>fUxVR`REQA$}`ReK_l<xN0*wRj?6F}%|rL2(g@e*roZLQ4Y=jS&vGD232
z=YQwth=Zn`ot-jgm!}gG6Tm{vlwCh?10;^Rx;ic>0=>DpAs>wRys%3Y>H-&pqeKZH
zQ0zFVIVdQI^i54oQoU3T2?@at#Ur7{n$2dZ$t@Z68r(>GR#p}RVmHx}k`ktLN8sO{
zxQLmVnfOb^U@)N3URYQ-J3EVtifU|ZL{L+JYdm%hUMP2=2bJaJ<zS_E#75K`)Ibli
zDnrM|$D{P^?(SkUqcqRX&i<|i$_Tnu&w!o*Jp(^7@DE|?stne@DaHT*002ovPDHLk
FV1niZ^aKC^

diff --git a/Telegram/Resources/icons/menu/channel@3x.png b/Telegram/Resources/icons/menu/channel@3x.png
index e3f8e50d3672e3d15187295bcbf0387b2e44f570..0ce3d46a9c4d71259a2a33eab7a1bd104b62778c 100644
GIT binary patch
delta 1539
zcmV+e2K@Q)4Dt++fq&ddL_t(&1?^f{EL~j`ZmGG58qyLqB!;F5;Zf+5A?Alhh$%vZ
z7Y~Azm_iysG{ln_qM8QLqzP?Pga;uWgz{i0O{t+`NX!js@&8}4)0K12z4x4Z?vEUQ
zju&gM{hhVHwf5d?PxsCp<xh!#5&<OwN(7V$C=pO1a8nVudw)|6Np8o)#KgzP=h34_
zhlht>zI-`8K9+1kZXevgf4`=tW`BSGpTB><fB$~__N{}1gWRY};N$P_|NZ;-zaFXl
zhu*`(LxL^&K(n*6&(6+NyiqOe?(W*#+slWrI1>!N&dyG*7e_}&)z#I{pFb}sDA?H8
zpsI$3261yTL4Q1b`gCDofv7{6nwoNVcPDy|j*jHp>FMdcd-teHzCvnh>aSnFxL!3i
zH6bPP7{7S&f-v6R-n?3Q6-`Y|TU%R+E`*bllf=YCjVxnhV+k1%5up(y3nlW~%*+gN
zg)loiE6^2DQBeejEDImhNyNp)Vc8|35IQ<K%+1Z!k$<F->X@`yXlrYWG!-5m?&|7_
zw0rliJ{uQ&h5ZCEMt;x9$-$T;jYdJgwltbjQ5qT=78Moo!psf1e)7`NlCQ6?N=sS_
zQhQ8`8CA8VrDcDAzkbvOzIylWot2f9YExQEQXLZ?iUtM-U0q#aVPV`hfBg7?mFME(
zf~ypjjem`eLqkIuY+zsjGfngpy#eBmVFE-(Mp6UK&CMkxCD_`KMt1?za%X3U;U_02
zb^lNgq=;kK>6Dh1l3gq^=shaRSuhYLhXjaB$S`l-ytyr2fv|{UG$jD7s;Ux>f~;yq
z9DDruF{6vUHd3>!s0))3ag4?xJNyaTl2xsUV}Hc;^74}8TOsJ`*sXAeOHy%+8;#o_
zD?N4_dWp+Xq{sgJ`NPl_78cyk<S&ajwzajze85Rw_=GDrS4A9~pPy%panOAB?3vuy
z3-A$fthcw9K5lGmG&3`!qRa&m$0jBw#>dB*4;YQz-QBdwlDT6d=P|I)&CMMf8#6L8
zf`1$n6EinAS6^QbhrfRPD)j`-4GIqCl0tJWmpPf4nF3cA`c?h>`P0S4MR(t%-g)R0
zww9I_oSkt`raKQ&B(CG9r>8+z6nX6c+$G`=E&R+QwfAsnz>|tDj|@_KO!AE<uHtaw
zeE9Go0*Qx4%r{!ZHHOyB%`GV@iB-LS|9_sXA1Ns*+;KQMI+~D>u(`RZ(E?LOM@RSd
z^^yGX<3|Coo>j%g#ndxtX=%b%f`WnwoSdA@zz-fg`0(Ka=^<=yZwChl3z(AHV>-<-
zUVE=!zovYck&(fx<rUGZq`|!+llS)akYEc73&{@NmvPfrUS2LWTaxjs5k7tTM1S%2
z^70Ze>gVT2$gHd^9uobD^hf{*gM)(_A7e3|2^JC(!n31Z)ThT_rLC=vY^A5CldLXq
zXCU<$!7#hv`S9>CX+Rp;GB7ZZG)&+Q)b;gsUhS0?v0md&mxT};Wr4Kj>FG(4&dbZw
z$N<ByqM`!Bl8^`oo-oNQW-{_8tAEAqx<(^crmU;0BOZ8e)Mgip1i>(=w85Z9Us15w
zCu?hK$b`J->G=3~0V7vX_2kJDVoZrx-L8|96T!;L%G3c|4Zs+jgjW}OdV09{>yoiQ
zW^JFJpL5^xxa}bm5Wkl%UvjH7${2otsc!=?P+z@zg=cGxUtO^hxt>UK-+wN+%~)Go
z6Q;JdmRlttJ3BjL>Br_96ZqS=Z}`1YKtO;1{)(&c7K7hzG2XZXXWJ288+LYf<XB~8
zC9n4Sih8DdMhL%NpiaP6>+|Q&*xK^AVj(6CoySRYeS+k@B996NJ?LUX$n*yX2kq_c
zBO@aaFbFYzaGYby7v>>S|9r~I3eSRki&#wI28}mu0;axvebB}XKZaUeUDf6i^g}~K
zn2_2&m$lx;#wI^Me|dSC=N>i+c(cCwt?hrEW4vI)0W92DyKudMNwv7Rh^rAEMky*0
pP$Hm2K#7170VM)T1paRk_!puwHq*#dT>Jn4002ovPDHLkV1kvT^|b&1

delta 1538
zcmV+d2L1W+4Dk$*fq&acL_t(&1?^f{EL~j`uA$~3#!xXPrbviB3Z7_Veh|^r5Fx^g
z2SE^1hzLT6r>2M!L5PPI(Mmlu#6uIqL(MS{p-q$`t?~cA{3l&G_uPBWx##}$KmHsq
z)?WKNYkzC)z1N=Zqet?e90553as=cE$PthuAV=U&ML_3IHGd?!9YaGye}8{RN5_+s
zlbM;B)6-MYCZzU(nVDH#UETNZ-~amkcX@f)-Q8_(Z!a~fBKSOg`gCn=?YBn?|DpHv
z^b}!BI?(Lw>|eirDR`q;`1b9aot>R@2n#d8@ayU6VSDl8$B)|D+W7eRf`WqG-Ce3`
zZf+JfClQ37pMT%t;v!LpFg-o(;o(8_o;-O%zWx09Q(s@7s-!EVrly{spR>Js_39N;
zB8PEdVIg6Be0(^y(kdDm8MU>w5nTvpXJ;>8zEsIFE-sFck&%%qF_KUszs=3f5myLb
zzI@^7is<NQ0z;OB56UDG5)!cN5>W`9ot-8oCdx?Ch<|lV+$^-Qu|b-Oh=_1=b3@wI
z(a~n(g0HZjAjZh=IXO8PlcZ58XxElXQwmBwJ-y=MVosRZA=ge`Sy>4P2vBHAO+jpr
zsWGFdHa9na|Ngyp)Oo%d7#OgyuuyDDZAq+S!b4G4SGTvf_xbbZ>^3(yH?i{E+}yC0
zg0g{u!GE)7&lngYg_$P!iPivN$1nk+qN1pQ*RNlfmX=~`LmJHmOv|rdzcP3%!J2=l
z1yaB<>~zY?%E&Gj8T1|%r7Y<3lS2YTCS)*OU0n~wD-afNjHU#jH8nN-QIJ%vfMYH$
zE(~4lwUL@7MV+6FfMYZcnZqByElJf1I7VD=Z+~w|eh`ADjy(ux*d%4g*wJ_hvfN`2
zp_kYk1$yl2>WV>|nwqjdlfEqA*ulX8;{#6e{3l$gxhmk;!omW>7zfSJ&`_zd=iwvZ
z*xR>n>Eo7`7Gq;$DoR`saP0Hv&r?%Vj1L%%eSLkj$&$EZ0_QQX&&|!9oSc08_%Y<z
z*nimh`T3@%COEvbv?TTf%?^s#%NenFjpCk}naOi?p<NZOtX*AQHERAJkk~s9fuYDW
z+}hfTvor3=H0L3RbaHZ<ot*_;LFByyaF>WfH2*V?*xtjT0Z%HLJTi#wG0``kxCL2V
zU3GA9Kp-zJF7T*Bi@3_rA{@!d$xPMY;C~?QwjigZq_D@~#Kgpl7cchr_f=Y8lrb?e
z@7}#5d3bo32drgPNl6LyOj=qRzm<@X5CW5j*4EZTLqnv8aCmqa78b^1N^Fm5G{-pY
zy?OJ7@?l0s2B(%&#Pcy}aIeV7M@L6Uuth~hWC!odA3l7jsHng-CgJ}BVPs^4;(zV!
z?ajj=FffpiSy@>eB>Ho2Z;t>F#>U1}KE@^`B@rw<Je*@kxu|7$+S}X7R(g6m$;twI
z22zg^46_TKkB^U&2BeWKgM))f!wBqwy0f#xslBrz)@$79G9ko9nJ2Azd3jN!^YZdk
zGQjYwtgOVaBqYLtCrmPnnT-6&)PLf3U8RvbQ#Ld-5Dz>zs<Vr%NH9z)buj4BR}?Jf
zlkM$oWJ1pKbYfy6kC8j5^7Zv4#*~Pa?P4J&Sb2H5GJvfC7=x4W%0hpCKO28vGWN$z
z+t=6E?6*92d&mUDue!RLU8PdS@B>VF8-Rh@*w~0?Yn5N!u@bqSNVDHA*niDfT3QmO
zzP_Ga#UndAJ7cSj%{L}6_5=96QBY725B`p;unWO&w;0~I1824)oHlH2ZOO5!swz(H
z{S~!L_Y5KYdVx9tub!i$qxhu>hbtCh($IOFH1{Wn-YasbV9<lEySqE1KR!P0=;-+L
z=@SGDLX00A=a}US^AM?jV|!zRV?nw_ET(XS#+y0;Q(wA1sAGm7Lv3wssdEYXj~_o`
zLaO^*(t0Z^tNi@@_4Rd*d)O%8&HB%8ZU5~Y;{+QHVByBvh3gGWs^#TnT#axra#4<e
o90553as=cE$Pthu@PCWI-%pV?&^=Ag0RR9107*qoM6N<$f+h9<cmMzZ

diff --git a/Telegram/Resources/icons/menu/groups.png b/Telegram/Resources/icons/menu/groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fc454a3642438a1bdadc85d721c9b133ce0bb03
GIT binary patch
literal 685
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl1uc#WBP}
z@NLNH?!rQeV<)`wq)mgwt~}W^X>RL{%uOkdSJtE{-qf5P5jo+|ss9OYue}LSvEF{B
zL*u$rigU_5eJj4j%g%rMUDtj2v)%ird-gxCJ-;yE-+XqF4G}s^gEIHVUC-L;pl~3;
zKu*Jnv;FYutEZk8Wtz;|zJ2@p_3M*1{`m6cOZnCit*d3bL$#*5NX<U`?)z`Q<)4oL
zwQs)procjki&e0geaGE*IcC+5KUD3V>BF`pLPw5=?QWj9?YlDTMZYxXx%oXV+Ijlv
zq%#c74+|_9Hb(H=@>CJp8kK7x;k0mqhsrKayV-7w3vJ{U*Ke|(e){O+LW2u_tFH>_
zok%yD$?=)%!pkpSOFw=5s3^kqFu`c%3np1k7N!|z(=O+2pD$Elb1!YPV|Mt@l*d1R
zT2A$n?LU4oW6S;b6MH!4Fy)v@PqLNkznZl+Y;~(squcJFwwUKVg+H%f58oM6XIybd
zb^iJ5ufJxPR4qO*SF1lTM9Eie^4|UX_wU(rr=*c#O_0${pXHYi1o&!AW!iH4t&39Q
zJ3rBL+TDc<(tCKUKmGjK*(tF6@=J%W2?iAwG7pYw>4<g5t#7yOa8Y_%Bssfu)z{}Y
zGfe)}{XhDzvBXMt+Jy7ZC)?W1Uw<_#R^mjP;X_{WS8}ubmRIea_vYX_Wx@G^CqDlX
zFq!Fd!qNU?fyI%xC;sG^%|8Epg{xZq@$&!bA+J(n_D}zDTzMZOr_8&&WrF&*KuN{Z
L)z4*}Q$iB}3d1PA

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/groups@2x.png b/Telegram/Resources/icons/menu/groups@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..986bc696db49038555c1e4b32a2c7eeee8e3d286
GIT binary patch
literal 1315
zcmV+;1>E|HP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGjY&j7R9Fe^S6L{nQ4~JMJcNh{
znL?2gq9~#$N~An^6fbx~Nhy*C<0JB5C?!f1nNma%N<w6MKx7P=XYS{&+GqRE`3JYt
zE%pBor?uDm*4pc=Y45GksGk}EH3Dh`en$j+eSNE{sumX)FD@<~A0KyjcYAtzGBYzx
zOicdwA22gBtE;Pfet!Nm^sTI{gocJ1(I>66ElW$wp`oF~#6-ZJo}NZVMi8X?`+FZB
zpVZXUfPet-A08euGBU=;$E8gfN7~WRL2;RxnF$OG<c*q|nwFH5AbkK_UtbHPJkn@%
zY-}ufGdMUXRx5FFaqsW%fFXEB+gQxdz`y`@IzK;mb#)cPfL~i%OMV9j2Mb^^F){u9
z{U;|UD8aqGy|%VCKR-VKM(NVZ%8JraUS2M(V`pcF@`6vLrKJpMVPVnG&_KZ>cj@=;
z?k+DckHLOGpeD#fLPCP9+Wh=H!0qkr3<+;Y{qXRxv9YnZxESSldwWaFtgI}CR7ylf
zMv`(^SeUHN*w`4reSLj|M5ZV<NV<cA15?K^TU}iR62r{R&5iLD5nf(i<WO2#nykY5
z`Z~bP&CP^F-C&8>@ZOLpBqZeJ<pt8RvNBn--vDSU6eBcSTU);g^cMd9{(#}j&CMkt
zDI!yP*e?d<cX)W%pj345e|&sU3bM1akphFtU~0A6mX;O}=p#%Af;l=mg23@YOTjPk
z2_q26EImCvF@^EhcXoEXy}k9(@TRh|@^5rLQN;|fzrPPAs+e(jg35>$950fmkp<ch
z4U(Uqk7i~%K|w*&)6*nfUS77fwPhmA8}OlmDrQU~l9Q83rJ$fdAX2(S$Fgy9b8|C0
zJBwp$dwZMg;&*9j$-~2gH;3tmc>@uGfhuMqcyoGs3jWsCmbJAt<Nuh5kB`T$%mYRs
zq1DyZHa0f;77<Q@p{G#A-QC@kDKOvO-lC(U^;L)?bJ{aCluJ}pR7y$;vH%azM+*xJ
z=#;CgD~1sen0`%7O-@cuJRhM&m(0!0@l2jp>JYD^oW}G+6{1PeQ^&{06B84tbeu@a
zEvQJn2#BT(LkP#JySux&xw)Q}0S1Z*2MF$Qs99c&2E=_5J%tM$K1h#_j;5xj4h{}@
zm=uiz2$^QB^dkZzF)1mDw>~*JY0yGvXQ!fJjT<|BXC^S*Fgawuv$HcCHB5`2+C@c0
zmzS5g<Klz|jNL#0MySHW!+Gz8G_Le(YiodF64uw(;|`B*7lK6A_V)I;_T!Ktx9~zT
z2!uf##x*rH$Q_WIo10P-5-%@la|ZX|nHW(xMqmWNkj_YYdOGceHx_R}N5glF3V?ch
zdv)BOQ^*4Cl#`Pqt=-kt1tjk5{0l;N{XkpMEe;PcX+zRd95VQ0z(hnuNFzr_M*(nl
zcE;8WsdESd;%;ngF!8?;WWmM7MOqz4ECJZoSn3>N_51qzDs4zsik|o~E%)pvn5Z=j
zK-42Xg_BU!kVaEcQGwzpEG(43K!m17knn+!MjAn?@KJ#%$_CO1-l!(j2&fTIBk-Fe
Z@CRb6SJ0@!iPr!C002ovPDHLkV1h2nJ~99R

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/groups@3x.png b/Telegram/Resources/icons/menu/groups@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..28ed4085f27c04d10d3ec4668687c8d5e78670bb
GIT binary patch
literal 1946
zcmV;L2W9w)P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?1W80eRA>e5T4_jCTNHLE%}TQz
zP;qEb8q^#r(g@K+2&B>!v<MRNhoIt*CPRN%L<2!T#70zbN-Y#Bh#<luGY3>K(Iz!b
zO(;p4v%&Yhw`sBOKKGvCUhVlF=l(dZz4w~-I%}`J);d~Q=|9~9x&?F#=oZi|pj$w<
zfNlZZ0>&+1ZG2kwY<PJ1_U+qaVq(0#y*)iWzkU1m`t|F+zP?+xZr!|jb9i`IHK$pF
z7#kbg*48#<`uFqa&&tZmWy_Y$8kLn4ad2?Ba^;HY9T}|P9cE@`DzTge>mD8+9UUD8
zx=&5Lef###ojVm36<4obefaPpHX|ThzI@rn#%30%Z$bsUtJc<5UTN$H2h7&imZxxZ
zblkglFHRbddFs?D9%pvJWo2cg>!(kjQd3i9^qV_(Zed{|;R8rXNs+<-*Onq9BT388
zpFc-LM5s~a$dMyNg&>J{u7=8T90M1UXIE8K<>%+eaQ5xnhk!1R&sG~78&|Db6%-VN
zp_7x-hYufc2xSQ2)tfhOj*E-ix^*k4+}zwoM@PSZ|1Lvf(Gs>qhKH`2czJnw!EYIP
zcXzib+9gYtoH=u5e0-b)F#z6yYh%TV6{ZL+n$O9}A$dD@?$pYwq@;w%0|El1<akBW
zEfEQT$;rtXxi;X3Ow8A>U+2%CFV#$b2H6Q|xqJ6+0U1H%$B!R`AOoB@aYCTAblA|)
zz~nu9_RI`kcuS=2fddD44q;(oa5h@~`0?YhW5+ga+O%}(QY^t!UcGuns{r=w*~61t
z3O|1Qm~ods`liG<J3Etd!iCn<)I>`U9z0mSe7V46(V|7=<>iF)=FJ-fApyty;k|qJ
z80#lbo|wS}N1rr1bm$Oqz|o@lfq{XA3m4Lo0NlQPn=o^8bA?suP;Hunn9GO}9_P)Q
zCuJl*vvTE1LKqntAvifXnP6NY@Ix93Kze#Qt_n8EQweCAhx_;MCxdO<woNPj#fuk-
zeD&(pMBdZW!{*gE0tGOTm=VB8r~$zH(%rjv4c3$fxMbhIe{XaH6B83`zP7ejiH+64
zg9jNho{HC+T319y+tSj)WN+EBB`GOMQ4c~mefl)gVm5@;X&wObNj6lITi{9{S|X$w
z^MUB-XfhbwJtQPV4X^C%Y@!+)8xz9A^XJdmDvAb0ZWk_GAXW&Kiuf83u3fuEtl>rR
z@$oXmD8P;%KTh}n($dlde0U&3`1R`-A7BJD3}F#89T@V97cZm;7R`WrS63IWYh7L4
zx^?RWrgnCAiHV7H^)dXSq9OqeLli#5?a`x0LS4t>pFe+|Fp*O7OVb1U`ug_v_L2++
z3=Iv{*Vmsrcdod&7#9wO3PP){t~RPPjtb0AXqPTslGZiW*4BKc`sK?P=rBE-5xC&u
zM+b_ukq6MyK}jZX;D>w~306;^KHafn2fHd+2}9W&6I4)8z>`luoRE+}w~(p5UB7-k
zFfdS2_R*t91r9iJNcIsbh4~vdZv2Vf2`q|GdG_qt&dyGxaL@*-AZNXQ|Nh~_hf!ZD
zZix_(8ROjw+YpAOrKLE%MDphV92lGjv*m5rutD%T+8A5|4x)*(`Fdy)qaNAc-ybO(
z${crh_jm8!4Gs<>8nw5#W0UHc=$N_%W{(9loH18dSM-}Goz=Pr91=uu)OA!=nc}c`
z@nQ%<$er`g4*+5kN;RZZh`pw$G|vYI2P2(9uajbwg#cRr`T6;1wi#6gNfsJXrbM7f
zMQNup|2E41?@45aXqzcsFQ$}`pGU+);xCnrJ5ZhwtGF=H1u-+hM?NNGv5NA{K!AQi
zWp(o8NtJw%vdWa3#?KfIQgd_jnl)?4qW%5-NM}$!$+RU1*(iW>;^N{G8XAh^kT*6G
z-;9h5A^{q5MIRp@cnT^@Jn_R;7c5x7t~fji8TxG8xDhX(W)uLll*w%P*p-);hhwZj
zqk0)PFG>O84`A1>T`H*&NYLa$f=}eAn^e+TtzW+$PRuCL_eG|omQo8IT4<!)%a<?h
z?d{c5uU)&AJ_djZK4Pe%<-3#UpQxhIjs%zEGefPP&a$$y$SyTCHOlhga`bTkUq)uM
zM!?Z0*FYtztQ>~{yU-V7)V0#AU+hxhBR}0Ra9;@KxJ@&N&KHzpOr`w=d0}{6IH(K<
zp-%e03F5}^zZ%35#Vo-y1ds@%8d^p0EgdPjxG}!pk5{Z!m{xoefoQJP?fHub<br5%
zW5V)(cPMU*&ro@IhIWXwka1@14NX!I@d=-YY0?0|4ahoBcmg(9n}I=8R22Jf7u+#g
z*&`CN#1c<wR5Z>_EuL{|ZL|0;h3}UL-`dE2W22b*4eEb&3+NWmEudRKw}5T|-2%D=
gbPMPf_+MJ!FNcR(B(lCtRsaA107*qoM6N<$f*@6QT>t<8

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/night_mode.png b/Telegram/Resources/icons/menu/night_mode.png
new file mode 100644
index 0000000000000000000000000000000000000000..531195e736bb99a2e4729cb1fcde1badb1fd74c2
GIT binary patch
literal 656
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?3bsDV~B;|
z-4NRo8v`Z2`KL^1RWZDgY9Q&eh{tQ9=Sd|o)l?IW$p`hg4QEcBp8`~)v&7&B@6iYE
z_wIYY_Op%c`_C`t-Z#GceAoKo(sQ-(-yeSb_vTUYUZ15wKWprE-?f{4)@bIL*Iyqc
z)g206dF5%5rCk5fq>lv_6*lwybFR(tQPZA&diULP@4tI54cZ!2yEiV^Oj>)Uum}gs
z+p=mKx!FF;@`cu!N%dOr7pP7;`Q&BEr3{mn3pr+&Uz*(fr#0d9)7x*&CVE`B*?dqz
zhVQcAx(Ej$zvZ9*)`@emHYrH(wTpGP_7xnRB4Bm*Wy!nm)^l%Vm^2++5Vm@0^BP0d
zC6`}{b+a~ytPT79w{C4%a>l~`Mh6ESG2wk3F8#-yRTgby;cs<X8kA`?Gek>t3Xj{@
zs=Z;Wzn1M@xbtStx7nU|Gj_&E^|}?!W0`&S*xNGq#euC(g55`B^uo8_ZgtrkXFmIE
ziyN!Px1Tj_oSGfhOuYO0U6gc0I$btJt$p;-!uuUN%l+iG4`<|O{%6qHeE)st+MAv>
zavU=hXUyyV!0$eL+2xn)x<BMvkK5D*Ir2Gk>)zqcPr1T<w(Y&4^V%?OlQx0h^)2R)
z_=B{jS{Tni|B$Eo;DZ8-A2oG)(@#JDeE#|8a3_U@-z++pUVq){^ss90yRTISR&}Cn
dN9NzJV|3~{nzVCD(M3>d@O1TaS?83{1OV*!5|{u0

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/night_mode@2x.png b/Telegram/Resources/icons/menu/night_mode@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1742270a361a72d7f56a1bca57a294b582d43239
GIT binary patch
literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGS4l)cR9Fe^mq{qKQ5eUsDP$fN
zrUj9(u`q6k44JYptqdD1l`Uo1D5We=iY+NbB14qOkW!LDrYH$XgiN{L&v&}_yS{tx
zJKTG}zRi6X_rC8r|L1@H=Q-y*=Xo?5`(yWj-2?yD15OsxJ2*JR$H!-8W(EWVoS&at
z%wq$??Ck83k&&C58?EkHUS9U_@UQ{3T8fgAlI`tnos1v<ZEbC8*{s6*`}>cMj_M^`
zTwHW@b>-*h`}z4TEG*Ezy1HuB0IG~rQc^B2FNK<egM;eoY8Mw5!Qkxde0q9H7jji`
zS`JQ4O?`NHV92kpFTCRF>T1YUSy?HB78Vv7w*Ra5goFg4=H=xjFE7t{n9a>i1nunX
z7<bveg@bc+bi{bi&(9oh;{jq~VuX9@>+6ksZQn9DI4H&|EiE<4-q_d(;N#=N$H&Jc
zz?O|{WT9qYV89&j(9jSVR?Qs1mhF?1lMHryd+X`xX^wYpZVt@&__#TM1?`R|ZQ|nM
zii?Zs>hA7-dU`U6q4DnSj^Dt*Kyv^K+D!{8FE8h+;$-#p^+}Ktoal{?js`3Nvq9JT
z`Z{YdJv}YWRZvg>j3+rcSsH0oueZ1N=jSKGG&D3w6A>gIA0I&u4-ZQtt?DJI_@1>^
z%R!SR>gebINf1v@PnQK-2*}ON{jEnE9v&`BK?D+c$o2JgL_~xv-V#7nRh1Cr?(VL{
zo*+(a!~{*!ej<^Yn3&kx+w1A+@$&LgLjH}ZsHhNvl*iwini`>rwPQaeB_$c2J5qz9
zqN0tB4M8h@7Z(?m3Q9{$6E?B2u}W<;8vJCKLtb57kw)T=-QC@{w>P~MlHIAPDe*}j
zp@=^+GEx|1Wo0Qc(1GwMdt975y#oEq$;nA=Z7tp+kc!5#vNE0NpMU2+uevwF9dqJH
zGlQk2C0(=pKZ#0HQ&W3;J2T11$OsJ$W$gR=d!)d#va&)nfh939QE(j}AIp;p#LUbL
zli1qYQfi<EN0tXUx1`}dlOZ6#!G;|g78WK0RoTswk&i=8-J-%YC@4srn%>@C6=n*c
z<m0H}$;ru405^d2_xEG={{9{n6=l$D)hqjQe}5lZYAMx3IElmq<Js9+M@Q31fm%|r
zd*GzLQ)~N;Z*6VGn5VO|(-QliHq;1gO4!E6#(wrF{&I41nxCKlElFEfSEty{1dy;v
zb_EqNg__d@LSd7yukYdEq0oe%EL%Gkh`I$50+o^sLPi^bTd#@zq-u|ok5eOv`JhJW
zT_K}Lqrp%5wd33o3uNOH*9cKtf4foNQFF=;qyoTxYH4W^=Z+b(J&EJZ&CT2r+`$Y_
zu0sCAijZfL`-(LZzM;O8C|y*DFoqHfh)*JBioqm)5lt;+gH2<s<F6KEakp^ay}rI0
z3*rV{TU#S!P)q$~sN~bC^2N=~jVnDQBqTUEm?%uf$a8jfMh2o}Y&*v80lNqOiwAxI
XLF@-_ApQ~(00000NkvXXu0mjfv{FDt

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/night_mode@3x.png b/Telegram/Resources/icons/menu/night_mode@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..601217161b8112e614ec4d8a97f0c0b5526032d4
GIT binary patch
literal 1834
zcmV+_2i5qAP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>lu1NERA>e5T1iM%Ul`A+94cy2
zj+E)b2vQSKa1jP#CfY(lDYx39h=NiQv0OMO;*disD1oAu3qeJ*l_SoI&_+>2G!2}~
z3Df_N|M~NEyZ3pA_wMuQzxx)C^UnFsH=XZ%(|M;(X&+4kng%otXd2KoplRSQ(}0DA
zg{7tC|3qjrGczwQuNN;~w6wJR`0?Z5-~iu6MMX|dPA65u%a<>wrlx-X{vE;yKNAxZ
zj*gBeOg1++x8maBt*tGgJlvVu+S(H%n3a`PMn=Zo-X2!~Hs0LaY;SKbC@7#a+}_^4
zaN)uUknP5e8^goHJdu`{m$S38@7%d_=FAx;Lt<hg!Cb$7{kRME<jE7B?aj>0Jb(V&
z&d!d<dUJC#6KsEfANP>Adc1xnCnwV(U;rD7kB`^s+2J7xva_@Ec!|N|=FOWo#4844
zV`DdO-sHj1&$_xg0*;7?p!s7rNJ&W{MlmQWD?5Gq^kG~&I5?1B`TF%MLfm1HCZ31N
zxl+A*_fDMGgoFfwkByBrG53d&N9wS&v_y>N=jR^=N%Q05;|zXdW8>`EvowE<1~{27
zU%rr3xH*!{A<rQA4<9~A!kY%*>C>mgCEU84IQ#J7L)!A-!2{FqEl$<i+InGOfpPik
z*RR{RZ;QjTRj%{AdiAQDEk_OW`0-=XJyIl@<V#9Q*e=9nogq#p9%F%lr|Icw#^TP-
zj<d6~OiFLxz9n^>KYw24F15hSB@snON4vVZGO((us=2v2$t?_Eetw=HkG>d_7L3vb
z+^(#wEaFviz!eO2jU@b$0-&~EU0r1s)z#Idh&FP6GDTF-iuM{EI3OT^m_y>Llpd;P
zwtaSXRy;>hidhm~!W4spg9$}jTN{mK4jLO98KjGgOH@>p%w0zTMx_+WM{{!tEeIL%
z_V$LaXNNX9If-&x2xFR=!NEbs*3i(9ejL=))Q~Z!r>E<OMEza38;mXV()7cA?b<a&
zKa%aZ<W|H}Wo4y)f??OISFcDgbQAQG4GIbj4D|5u(3_3l8!ukGNDO6WX8vAKKB}&+
zCR7-}CgtBZcxDt9bXPk%I<8!~qMQZJ4z6HwsxQt~{t#(&cXu~eHuw_cG~zM9&(H7E
zr%&8nY>ezjPI<v+f_@`QB&7BA^)#>F0J8DU4ajka5xYY}Lt$g*&Ygqfy>#gkjwmT9
ziToDvz#S;cfpjp;n(x4<H0{uV>)$EdH@df6M%kF`O}Nz4)AQ)jqi^57v8DC(b@9_a
zjDi2=(Sc%!rlzJOKxHo@Z$u0bk%1=_x<C}%b8~ZP6*omTO#vV*kRd|n5Vj;(*M9=B
zJ0~ZHaxP+*25W0;A3uH!3JT)V`26`Z1Niy#C-PYC5^pTg4?}mFqH1_}cvDjoZ@=L`
zkt=(8dZMmDj|A5Yjeb<?qobq!{rza&aq**PzOu4nV`GEK*4Ea0_wI35m5u%V{Yi!8
z<>ksYs|}6!0AdF3Zw8^~mMx2mi+ZGs29f`BGdv*)221{PQTeZmiV8v}vyG#ii1ZG;
zbx>Cm=4y~jWYi!G35E<nng!!PJbU(x*houDQ-KI{GcYhfNblags{&GmD3B_knaOxS
zwyD}%6!+G`U#VaQ3I%)l@+D~&Z^8<9i-MzUA=GhkaiXv)FXD{~QIt_f08qIvgiwPn
z6&VA<fXeJ2f(~y~l>LCZfklRHBBiCJbZBU;$?u%%Mkj9;?{7qOWMo9-ElwUjT~G-8
zy}i9e2HCf*t*tIV)#eHd3yB<j267bDQ1cMsg_4>DAPL!wcW!xkc_bAEc+2N8qw-H5
zA0PaIgGj<ARljd2BDpWup!NFoYn8>&iSGXW`&`*zB=D1J#Q@|36tbB5@EoO+4Wmrr
z+_*Lg4iMiAjNPzmyit+wWm4fS-zWlzAjN&-`Vz(maxSP`X|9aW^#1*OUS*BUFfuYy
zgaIQi!A~Lv@N^6bQ3s&L2@4AosZAj~dNp_tK+}Q#GQqTiZz#w>w<J+$%Fzm9Hwuc7
zkPsm-4gubUK1d*t=HaOA?d{Pg)LGj@Dadj0M+=B2L}-E;<dfW7nRG9IfOk{835y)E
z38Z2q;TUnjV1y{(<;#Qjw}ys>n3x!K->FqFMWG^5cl-MK;tX%yx`qGoxx2g5U*dLm
zcTpz7-tfT*qdC*p*N0mwL}K8KQ3Mn6gwsHy2J<*f;i@*HX+YC}rU6X@ng%ot{3ROr
Y2S*QX%mi+;(EtDd07*qoM6N<$g3Y>JA^-pY

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/profile.png b/Telegram/Resources/icons/menu/profile.png
index 962419484ce8c255ebcf99618b75c67eaefc4071..99861b419c3ef81f6b8ade583935df847ea3f3aa 100644
GIT binary patch
delta 484
zcmV<A0UQ3e1=<9VfPVqRNkl<ZI1$a1J&FQB5QQBNU}j{ZfhdB9P&UyC1rZ}L*ehrz
zo?#*b17i=MU@%@_Phc#9fw+i&iSD=4L)qiBGb}92R^qFw_sW{;>P{s7n^_SJC6mc~
zKA*{C;H=l{)oOLS-6HsgR5qI(jYiw;_I|&AdIrEHNXj5EhJX6~{`GpD&1Q{8Bb7=i
z4gi-Rsa~&V6b6Fh@p!k})oQgsRCDU}Is|B1EClHVQn6T+OfHvu_Y5FG2+&^k#mCdO
z-b<&`xm+$Eo&j*B7JWfB&x=7a0-@3Z;#RArA^=>yFUUxQ?*mSnLt&hf;DcyITmUXX
zi9kkzP(}P7_J1XvPA?V<;l%>TNDu~?)oPV>(L=GH1{n!LU6lwIA{{YoC8kiNQVA3)
z6bkIFte@oQD}4Ma3mFMQA%BDLumfq6^EB)SML&MavfAzTa=F}WHtZe-a9y|AY?4x%
z`Fw6TesXFd*)%W=#Dl@Ww(U310K?&Mzu!BK10iZ5NnNWe!cY!}L#b3E@?_<5`FK2b
zyIua~<rPsHZsX~6noK57CB&Uhr|0uI=F%#5>@xyE>c#-(#h8Bdu=z(|Ec^>kt+DPO
a1-}4Oj55Nl!(Lbb0000<MNUMnLSTa8tKIJa

delta 578
zcmV-I0=@m(1h)l{fPVrZNkl<ZI1$a1&8ulq7{)g#Qc5YssiP!P3}kjp=nlw4DJ3HV
zb2CHv2TV|uWNKh+BI%TW;0(-63@8IR<s%G^`#Wdf*4>+ZoJ?+a4R-JQyw9`N+V97b
zr2lQ{?p#Q(*Lyr3r_%{%xm?a>vyYFDJA93h%jIgdTC3ISa(}tJe=Q7LKtdV<O{i2V
z9goMsV31CyEf$N+!N3J11VK}%0^9BOdc9605-L>T5P|?rf!&xK1<B|0iHOx|&E;~%
zVlf;J3lIXdZ|}v=b8Y2aLZQ%Nu^`8<udjrv)vDMF8i;njNF*r`RE+6#+GsSW9d<An
z+-|qYWKs|yBYzR@9|JZ;A)O-d{QOL%Y&M%fI-O3vUKcK8B=RwUpQo|t7rWg)91dld
z@A-V@Ycv`KVltUzP(~mlK`02HMl2SiT~v@HO(v6mzi&31!Q=7x>2!)jB1#Stgi1t;
zMx(bIx!vx!x3}GHH=obhh1#h!l7s}I3iNutWJI)|h<_OjhL@L@R4V0gI0PsgkdYu%
z;kU_Fg|(ckWdEfo%dgYvvf1o-JZ4tuJr>4jG|FT$LZDrK!peqhHk*jc<uZ-)>uX_D
zDwWM<Q>)b=-)l(1@`w})1$xi#_lv`Y5eNkK`+Yv2=a_FtL}oLMP`ll(5MLR+Uhi-?
z{4lh#hC8E}BT_&*MI9f0M&!N77rB4vVf*>1eR_IgcljB3_^G|h%RhC012D}sSs29>
QzyJUM07*qoM6N<$f(OeHCIA2c

diff --git a/Telegram/Resources/icons/menu/profile@2x.png b/Telegram/Resources/icons/menu/profile@2x.png
index fe742a4124a1f47348e941648fae58851ca17421..14faac7683f2cafa71ee93f00d76efa4a451c56b 100644
GIT binary patch
delta 1194
zcmV;b1XcT%3z`a$fPVypNkl<ZSPAWzO(<<q6vtg(MHE9H1I3KOz{iNlzyt$D22y5*
zMq;36LWZVB%8-F5A?0JB7$A9~6a!Hv<b@IM{j%QO&Ruu!bI-lJ=k>a0aL)etum4(m
z@3q%n`=q2KpX3buXEP8=cs$wJ*>!bw#l^*ig@pwL1@PS5+<#nOUte8a?e6YAJv}AN
z9G_r*etv&{|Kj2zDt|g2x&QzJ93OjJ=&Y=);o;%?`+H@^-QC^yw}*o20*nZPaVZJ}
z?(XhpEsVbX{r%C=(dz1IrHm?#bOA761Q8FUCI~1sHFa`w(y%WrEmc%h1Q7%V*a$)b
zRS-cxOioUYA%8tPJ8NiY@I%}B8XFrC6tkd$(1r@u#(<19D=RB`d3nL)Gzvk)jZKNq
zlUb?h>FKnzG_5C|I^vLsP0+?88ph&=BG2Gl*5u~qj*X2S931?3dniz)G0YM1g~ZHL
zS65d=U(5=dMfMcS?^>zm=H|=GOEKE}rjahI3aG@NAb(fe(~5s@BzTApmlvb*_4O4D
z@8#v?Z*LC;)9A7ZLSaV5yFULC;Z>p^9&JUkC^9z;luhKtP?f0#;95J`D5wY;#|il|
z2v@wpQDknEHDVc!GEcy~wwf}u!jB@;=vUwvLV!@~0v#S60$_n$0J;F+<1T>2aTG-Z
zbm-&^Z+~fN0k^QQ5RI0W($Z22dwY8>fOM6WmAL>yjv~}4j5esgzFz#_<v>b4v8s@x
z2z81<8&p(OB#6_~Qw25E^Ye4cwY9aTMHQq=V5&>1hTNz#Fl`Xo7JY1i=jUewQUzK2
z*49>+Q`3cr)kTB~a#T<jb&5ZtIyE(gKa$==w0}lcKDh0L3>7FsT_kr(x~c<GEzwoZ
z33lxI`Z^Q7v9ZB{AYRN$F*l)52oeCmqGeS}Y;{9JLx9Nrlw@=@fuqAqBIzaSyp5J}
zZ*MOK@dP<*SUaL0VJXPr>Qx50XhEH~-BNC9Y7!`!sHOXpnjjY~s8f`BmvMuU{nggi
zrhlNHSQT;<p)NLU%%dYVMJ$BR(V=%4RK#^gz^rl#9v>e^lam*-iE!$Yl9K2n{o&!^
z;^KlmI5RV2y)Hs4{@`;uMJV-2KQc2j2L}glZ*Ro|{NG$;2L=Yx)AgAB(+~Sqn(S$O
zd>k{0#oOE4VsA!9#{B$zdwV-oOyMv;Ie$6f?o8PXh#<t}y1cx+va(Vd=jP^mdU{@7
zUZhHbwzaiId1Pc{Vq(Gw#wf5YRSL^h0c&JR*4Eals;c}cYHDgWH#Y^(+F>a8#8X&=
zRgzCyF6^_jvjOihWc6kY9UUE1S65esB*BZU_ZoC`bOaZ>!*v6(P8dEXXV%Wn&VNU*
zK`8KE6lG+cot;+2K8<~SeIhGwJUZY6+c~{gX%Yr&zG0UPw-Oy5A0Lf1AG%5lCj&BT
z2QNc(CI4X?et&_<4i{@6`Ow@bcHB_*ov`CfU-mo3SVk-$KCy6OlX-v54=ZC9ah!95
z^X?D*(z8cuqu!_B{pl&GF;Sa`l_UMDKRta+Om-z_;GdX*UnkH_$0EB(lK=n!07*qo
IM6N<$f>ZD_Z2$lO

delta 1319
zcmV+?1=#wU3YH6yfPV!5Nkl<ZSPAWzTPSU76vwyw{gR}}gS??oN)!?0K@{>Jr6|P{
zFD@m|idTvkMNy<kijpLk7uSbVNXf44l3bHZ6zBZfW3SKj&AH}Y3+J>uSr2P{V~qd!
zk1@Z?_{Ln{zI}bZX5fD|10L^wo`8UW^z`)D*x2ak=$M!ocz=$Mk55ic4i67kS63e%
z9^TFDo@01;cy)F4#Kgqi-QC|#K9~Ri1MD8VTWEiO|CW}PtE($5jf;zmzkYrgXePk8
z;OJH$m%!!a<v)J>Q1RB+*W26MQ&Lj={QQjmh$t}uP+%N!H^M$N_VDoN=;%=FlarH)
ziHWW-0t2iZA%B6&6-PTvP*9K}-Pzg6%F41sTiI~IQPP46LMxPOI!{kemCf|@bXZuJ
zYkoQkN8D9T@1G~NQoX&sB&Wx5N5&lz$q8C_Tpd`pq4@J~HreFo=Z}w%Q+^&FAE`hi
zBO@6Z84iv&zmTYTa(j<+P~}Xq{LWS?I5@bkuTPRTet$ndKX-O^YNt<9gG%-j<nGl1
ziigCo*~PQ7vx3>*-|z13ZftBMKUErrhlk(Hk3)b^ya?gY{qC3YD%Fo2?F?I2S0}tZ
zJw3)}4Gj$)8X6K)Sy`E-yBrikxLU_4`NHU|-uU|ZUSD5>nVXw49~mDXpUurptlz(X
zw@e6H;eRKPB|ukl4dJl1wx$~#a&B&}Fy`dsICO7*)qzM#N_t~(2#~`-Acx}hS3k_$
z;ROW+*lpG;E-nrLj2jypuS|xK(hJgH`85=B0ufHL>Iu<N1O^5Inwpx@ph|ptdSc9C
zIV-yyKmiL<IjVt>6Nqq1DFZzr`WrFq?(S+(C4VYYc6PQ>8VBlZDx}fMSm{+b4e%;9
zH#f5uG!m~WtI^)x9xx8Pd6FU{BTr9Hv97GFSh@bvNv}dU4WrKx?H>qwKMkjewY9Z`
zjE|3>pPx@iNKn?aw6ukVg{Y_~7OTF#Ug^yP2_fN(Ry`r3&1Sr~xY*Uz1%OQ;-5E!Q
zDu2xJk(1Td)`s4O!BvxsOD1#`6&2^_=S-FHb98i6SXlVmc(P<oO-&loTa#rbBO)TW
zjJPi~t0r=lvSg%{nVE^p+1c6h@-j-wriRo+$ibuJR@O|qNUf8{r4!X{pC>~uQOu=P
z-$T5?+~405y12Ob^AgaRgq%Qx(`{y1u73`?bhGKRH1Y~yd3ES}h>+Cvl9Cb*Ft_0L
z_O>|*YEMl~O<rCeH$zBBhz7X1xj8sE;NBe^9JG90gcfoMr1@HlHth#Dc|${k)IH<L
zvK({V=u*7AytFX(?T7Vy3EdN2A4FUZ92{Zv_Vykd8)Nbi$$%S_`6H?^9v2+90e__^
zH8oW_lhM)9%F4=@mluI?t1K-oF>Y;bl}cuGcRDt=uyn*w%S_D7%p@l#J9YkPU{R<D
zg75F|m*n2x!osO~8fo&CI503E?Dh#^WwF#V6crVHsL7XL#@C>&tt}px(_!-lVos4g
z#|45T%k<ILAlR7+*?=<he3zD%nt!9(YpSZMlsf|mU7TQRT28pi>GJYYH9FR4D=oG7
z_V!kCg38>kSUK71SR=J|@`%owe~kv1dKerbacj9XHeF;>t9LHgX*2Bqj*&KACI&~`
zb;gg&)B@_$pYn&5dLHUH?^9eu|I%N2)|Fa?w;8BEJ^9B|I#HS%+NuBgPasd56u(Sg
dGw?^uz&{O*Kwhn6{15;D002ovPDHLkV1jG4iP-=E

diff --git a/Telegram/Resources/icons/menu/profile@3x.png b/Telegram/Resources/icons/menu/profile@3x.png
index e2cf0366701129d76e51c5ae124840c5e42dbe13..f760db92b79e12bd5f38308fa60261afd5b14a45 100644
GIT binary patch
delta 1853
zcmV-D2g3M@5vdQ5fqxT8L_t(&1?`&KOIKMG$D2uw#E}rYXrxjxQA80$35rPck`eUa
zLn-tkMS=7(59WUm!VpB!<tagY2#Q3|=s~&(Jrq<>;U%#|i6V$5vb;3&8TYVQ>~r?{
z?ep`TiQ@Nr__5C3>+;>}?7jBdYo8@ca=)AhavsQeAm@Rc2Y-HC5B!o6^!4l4*Vfi<
z-n@C!rcD(U6~8U~u=Ur%@Ad1~LqkI^Uc9(}|Nhw6SV|a@R9jP1bK$~;@$vD$y?-zx
zf?$$3lG3$w>C%>#meJ8s@8N_nB90PNC4wq}sd(VPfzzi?Z`raX6ws$npI*Lv`QgI{
z<{%7A$rUSBY=79Wp{S@Rl>hnj=ci7c>h0|f?fst`ckSAB_wL=G^FMz4c=hVlrlzK~
zYuCD<&;<i*Fb6fD7UeG4blY27TW4oyHKw__xz5hcef#z;Tei&KHq3}1h`82<a!mN^
zNq{pyKmXFDOBw|9jT<+Jfs4_OI7%$F7{c6Q)cVSnmVcJszI|JpfAHWzf-wzMDAf8f
zhf!aA+3{guWMo8JJ$v?SQgKWmp%As&3Pw{L8&g8RtC^XZqeqVln#2i|V?u_9>9ppg
zURUqmzptySOMEbvLQG&t#s&b3A%RB%lo-H~u|~xfclhw(KNfxvt{pEFC5H5SOE^xl
zrRd1+Ie!C*<BY{xlg2wV(&f1;U`~7rj3oCry$iFfLtSe%?%usSW5x&rY?ff?qmCtj
z3FV31NX8@%BM|$<z{bYLFJHchR0IJV%o#CZRPO;m$|#b70gca|JriU;`xP%ikBZ52
z`SRt4hKAo4eh@tBi4C*Qd&9KA0FsY?qsB(MEr04r3!+#T`dBu427+Mc&YeLi8nwR=
z@mX&=F9BFkZHyK<iIB+oWK4tvaRktpFJJC5MwcENf-X*J2Y}?00F(CEgns)ZsXp=&
z1DR~0?@B9yLFOcay30iaLmcO`F2eP2uoW#N;NeWFl?_VxSxBnKNx~)~KKmOmgdccL
zy?@aivRXJY`K$ppU$IJ%h*oZTVG|L=Gl~F1&Tqhr;Q!UtM>VFhveNY4ym|BM*RL*4
zX)iA?7us_TXf`b_dMpAMfH9501Ej?ukIsQnV-hBxcqq(i6B>*LY1wrSOvk`GckWnX
zp^sBjQ_{Y1<3^z)2+gL&BSbV94bl>E4u6b#pkbvNGdVeFiG@BsdGbWs4<0-ybOfQ<
zw0MLFV1Q&81Y`ui-SzO{L$j<OKYncYxu4Sx_r@}i3^qWzusGisbuuGE<;*1<Y`=K%
zqG`;_%VW=p-k@QC&G3t0P-n13APLAIkF$jtZ@dz##FuJHC0K!Euz4;^5&W0PZhv41
z`Xs@U8G+9;3D)2iH83s>j8`Z&Xr(@M;>Q-tsFYp+X?10O%r1C{Uf!D|F2+H@e;9lY
zETU5gpWq?PHgWy>bpyrJ-0g0UXVzOHrGcO+AQ^0c4ECCq|AJDmTi!Ca2h`a;w=%7V
z^ykloAKC5p?b}Vp#L{KI;^skf#($y#BNrM1GKPjDM~=wk;r1YgWXi0~&CLP~kg=_i
zUy3|;BC+LD699|=i%5c_?91x+JhnvXN~kY^V+%<7`}++ZHuybz_9TRDQEGr8*@nOi
z)#wZ!aCdce9Y22Dh#fj~C|Z$dFDom<JO>I^`O1|mT?KdQyYJq;o0yomcYp8Rz`y{s
zXow(yA-%v8IyMojm{VO{eeK#comI$Uh$a|hcX#)W9Xq1&C05MAjA!|+xVV_=#kX(Y
zq6ZM&J3l{v=FFMG!a~>ZVwK-AT&`1>eERgMlv$WygM)*X;dSfQ_4V~_-MZCkfAi)I
z6O6ZEwVOx6026if>eW^+8Gq0I{rlg(eQUK-lj5Tg)5tcsZQC{+Ve!O!j4pAnS+j<(
zQS_^L_3G8JW5;OsF~d6K0!0#Tqi1+{xTK^+izi>=Hrid65(NbXx}?s*_T<Tvyb6uU
zhi3Y<x3^DEPm6<Y-MXcV*r{AffXsD`)YjG}P(FYDTwh=BGYl6GrGGem6?Wpp3B#G<
zH4+Ab7k{h}Nk&Nv_wL>6LhRqpc}IdO>ywz2?!})$W?j{uKYw0cSN28Oz@X2aJ11&8
zIyzFnss(^`xh}z-`g>JXRRCd@4XakIk_jm$7;1`_>mUt&4uQ!lSFU6^2!~itPmjDb
zLs0xm@pA|R0|Rn0H-A<iJ$jV=#YbRlsAA{T1H)YEqcSj<lX|@w5TpeWb=d&^kOstc
zZei47$dzq|s7R!VI4QSV1_S|(QsEE$k(l^}{Y~%PGJiO~efQ7$GUSRfh6v&({18({
zOZvk(K+ZVw>S7UyqeN#?qW}97#56W*sVVpj3}!?UjH|{A2{uf{P<K*h;fzC|`$;}e
r4;^H#G3SAt2XY?Bc_8P3v^?++HEl+72`ft`00000NkvXXu0mjf6TOn!

delta 2080
zcmV+*2;cXq4~h|xfq(Q#L_t(&1?`$gh*e7vhG)!Tj+hssGm1EhSwu{TsEDp~kP#6X
z7<D%yx)9yyLJ$+`O5GSSfG$)pA|eJ*M8Sjs%wo>j_dZ@TMR{&_pT75=^WGEgUCi|9
zuJCttpX#dWQ&d#=6)aG&K*0h93luEy=USjRCFotcbQwN;cz@5HJxfbVJ9qBfv}w~O
zO`4$V{rmUt-o1P9;K9wCH?Lp6e){z3`}gmsgds_>g9i^@zkdClJ9qvH{y_{2j7j21
zN>;5}wPwzo$sz<#$3h4@LJ*Y*ssy&;`0?XctXR>zcW)~oHs0;qx8J;Z!zP4)4cWYT
z^KRX`u{o{uSAVZwUAS=J;lqcmqyJK8|Ni|?oH&tbe5SE;=gw)<rnPI=&IN@b2q1$v
zQvzZU?&3|izpAS0`}gk}6OWrWZyq~#Y~8wb!*xRp3ycwI-@biAMYx;<DC^Xzvth#q
zJtf+E_wFqzDal7V><Ed7MG@-q5gW?evSrKT$B%3EXMfI|88T!@D1RIsq7bO%qYkBU
zeEE%|;Kq#`TI;G+t7_M-ouAYwHv$o>wV*V`xv?emT7CWcb=Is|QBcV}BODbnJyfT)
zC-r;v{Q2`?!-gd{3%ev#ph)Hh06Seiy*MaQfFZM*6_zHvVg(j0S~Pd=+{u$Cw`$cY
z5Dbd+x_>3?Cpl8IFAm><99Ee5)vH%x6w~<e;|E)7)TmJ*(?gxG10%`vO`pQN)*)!1
znLT^<hYueFleMvD&z{DO8^;RNz63C_^g#p@CQJ}aIO0GbNRTC5{su8rn>KCyP*AGR
z0D?F_ef%gP>6I&21X<vDHD}HoVWIK#=~LdW0e=Gqbm-8bM~@!Ur%yk5@}wppd8t>g
zo*xaWg#}3Y#>#}-B95@YuiK1v?b=np?z?vFvbqY~0AaBRU%Ys6tZ*Hd04$c?M<AI9
zZ*5@2w0-+_fxBhP7LW9iBS-%F^~(^yef!orf6Wd6@nHbdL)o?U>Jy}fFq4ePa*-N0
zYk$_v&$V{#TCqZiD+h+q=boFA*oqVaa6d#dI(6z)VZkfLvfvUwfBtM(4jw!hOAic@
z54>1<JAq{Qq)dUC$dV;XL@}<yF8BA|BS(%Hmb-WF{yt)P0*2&oz_U=)bUE{Isxi0$
zLw4xUAvSjni|>E?_U+9u^iQ5V@sZYyNq;d%cxy&1{}BrqGXOk5T8RGXa!!mONO%q$
zI3R6*gMDQP2%`cQxj};lhDCV&Dl`}kGQ#DY7?m?2J$34owEd08j~^R?;^N|7y?XhH
z&8QShgxAld!Dx^XF6YFk2O3fwF(+(<&GkrpAVV`|%#gOL(Wg(Jva&KWs(D@X^nU{e
zNQOW_dg!A==g*%v@ASos7o%hDX95CVEyGBpJ7~}#H*FEy72)D+!UHAYI(P1zN4|aN
z+O=y&<*{SO>=cgP>gsC2O0C!B8!^G^)vJZ_^5x6nQ4)|0BOo0p+}%{64fFo}``uKQ
zk^1%P-@0{65R<c1R8&Ohx_9rcgMV7$k1=D$L})yZKr-?H=^{(M07T?LD#<1>CD9fw
zT5R3Al~52f;~wbj*RLPJl=hj7lAgIBCfqMuF*lXOJMyy0>SZ=qtEEeqW(yriMpQ0a
zF*oO-A$IE2Y2UtmnUj$oO5c+vP0}oZ?Yx`^xvfD!2otE!N;Yudz;)}^5r6*t{Q1)e
zeEs@0FA0Z%-i=mXS10b?hytXG#@WAY*)lP$rv&fh&ln&JMoyzfjWR~E>p+MA1Eh=D
zc|hZ-g=fTw5z@}N!HRLVe*E|`X9<Q;gV7*E#S&kNVRr1;5z3Z69TzkL%o7CrfaH+2
z_{1eKmO$D947q(H5$5Dc0)JS(GAKn#Rxa?YLVXAHwr$(y&6{V~%FD}-9zALm5$SB(
zw(aQAqp9HH?y0M}Tp#E7ix)2l9Vk&zw0imSWkinkk-I|a=iHZe){U%+Ie7NnyLU^y
zMc#zi29pG(g!wL%i4}8D5LkZWW_jbrjZ$)oor#rzY+&Wel?@v<bbn1OtMXgS<vI~J
zaku1xLx&E{%oI9y>`1yEu{Y2kJ$l4u<HpqrlvtUKni>0FxNu?O#ECFQxG0&OJ$u%4
zQatY4w=Z^#&}8>Wnj{7$B#)H1d86*#yC(!Rc%(iRTeUVIIBh8#KYaL5OW<_k%L0uu
z`4YF0?z)t~G3e}rFMl7nC31NS4K&hb`z=_o;M1p1GCe$=PR~-glmG-bH|!|UD%VK!
z=g*f;E>=9HmB>u2kK@LTlVU4kD=RAvnZ8B>Mv~V^D9F6{qarQA=$9{F0x!F)Q<Bap
zQ>NfTjIo|Qdqz1m-HSh?IC531tJAp`Wo1q^jWui5$SzpEe1CcBSGDM+_97V`x+M)^
zd*m3i)l5eJZ{51JY)DaoI#dHdQzqHY{2T(6n>KAqQb$pdKCjH`rTaOALC@Uux}lg{
zJMcm<Wd4Y{bm@|rkNJzb6hHFNnAj5feKYDYbKnJ<7Ny&;XRZ~BQrv-By|nR@k+6`*
z1V0i(TF8x=;D1T7!I7fRZrMMSNytq@KI?-_u7!l124eF(uVP}w5Ht8c#N@0aVWoh>
z363<5CMu2p_YW~;+Jryk0g~fr+lRMdM~IH3ME-x@z^8FoOHCnURuIFIpkFmsNMI{k
z&B>8X=x9Dqr%l4f56VCF^K|PZ3!McE6f97%K*0h93mK$kfxiJd?JRh{46JDY0000<
KMNUMnLSTaM5(e}D

diff --git a/Telegram/Resources/icons/menu/saved_messages.png b/Telegram/Resources/icons/menu/saved_messages.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b8ba1eb7e084458e9598f0afbecf8dc3c34ad6e
GIT binary patch
literal 469
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%-++*F~mYJ
zIYDAugW%cpn3$NWSFfHscW%#~JsCj)@7~|vuOGYX%8eTp-`~Ziu)bi+y}vIuEUfI-
zmdyF~^=@J8>6<rgs;aKOee>qa7cchI{1npbJ9Oc~g&)7aub(nSq)Wr>+)U&2uCA^L
zsWT>6dU<)}-`i99?TzFng)p-V<qk(r1Zl7_s{Z@`zh9@fn>Xaxi4Gy17i<qNc?Q&6
zQD|~JVzB7&iCed<6crtPe0VJ9TnJJQ;EI>{`Rms_i^8P$_x5hxy7l|}`|n@A6ciV4
zmuR2KxIyB`ks~5<a&;dc9esLwy1ZqPOJHDNWTd5uiO7t{@9*wz&ym?A9e5)yF7E!m
z+TE3(pZ)&+e)g<cEv>DAOC%*4xcuf?ef|3S`tg2w|CvUtzG4TbPME+j&0SPfw5Fzp
pBalbz!j7}E&8@Ahl1}jWGcveGW-V(wqQMUeQcqVumvv4FO#u5*xC;OP

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/saved_messages@2x.png b/Telegram/Resources/icons/menu/saved_messages@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b89a0923115d5af330f366328cce81904c3f9a25
GIT binary patch
literal 758
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz?9(W;usRa
z`8HzjX~#s7?^7FnpU4|1xS9oei7oXIbd^+D+#@!b=hQQPg8;V3HD;=w6Kjqw$YE<f
z_~3D^zwOT0b-!)CSM9xB%zn=HdHK1|yZ2Ym+x2{+#|u}{1zdmDGX*I=eOgqhAW*RT
zZq?p6waJ{GiOJ`le@@$+xi#wZ&pB`ZUoe~L12pXU`RiY+bj7;8mI|G3UNGTcf<*uE
ztgTY3Wcb)Cj+}nlwEjeImWfpN(WVt!ZoduCIC7NZ(}CMBzg8)neOcnABGgn=;c#H(
z%^anvk3U-QcRl%5wReS!)>Ng$lZ6>a9u{!0hOZWt{3{lyA)+836|^v54{Jy1vdfuY
zTB6oY(-+^K8X%P;@WOpxP2j($MV%k4=Jx3ex^uk!@cZw%={ncyci#=@3OTiVW<kr5
zb>Bs8R9z-b)N&D3(sby$EVqbjqKLxLO#Z-D53UK1wzRKsQepM@sQ+cc`RA*zzutV4
zr|oHm$*+TJe3gE7gs%>r5v4Zy<l&EB_~l<2H21kFo7^<m-+fd`tb6a$rzKW`XL8K!
zuO{8CStQVtX;7==`KHV|<o4ULtx>!-3DUjC+!iyM$?INwrR2NL$zcBB4cqVLN!lh{
z@lu<dF^T2up@$zztWp>0XK@B{9G~dxu{0=k^Uc3?=XKcH1txm5{LV7i5~C;naq2|Q
zwbx(Q*zvo|^GvPV|Ni^$!kI!RqobY{{p4<ukV`1p9ov7rdHJEfqRfR^1<#JOac(u9
z$#Zzw<(C#Rd<$ou-yt4#{IQ_a14*Sfe0%{#J7bmxZH!ub$f!VLfhZ4~_tHsc(+)q(
h=+SZz{gKXE$5=RTyWEw<_YQ&5oTsaw%Q~loCICjbKw<y@

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/saved_messages@3x.png b/Telegram/Resources/icons/menu/saved_messages@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fa7627de4c722a75e51ddfe45ee702c2a9fd117
GIT binary patch
literal 1076
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}KF`y|F(iZa
zZIq!$QJ{$4X^#ynCNOy_hHykH@hCNIYinzZ%F?<usfCR*X46I~<!G5%Sz1v-J&U45
zq?9_^xK@^Uv~zi_oU-Nrf$r0fQ~z79e}36oX8G&t=XK9(?ti}*YO#D(m)#NuO$V+C
zOhD?uT&Am8T1GQ{nwy*7zJ2TK>wER;ss%?<Yiet4ZEcS}{y2H^<Pt00eM^7t+P&La
zgsZl$&PniA?WUV=u3ejUHtq79{s{-3e}4M8^6d|g3HEk&YU=8y&$sQ_qvIJfZ@sax
zan}ybYQtm4j&0k%J+f)_>eXMre%-uz^Y7o)3y!Z_9rL2Zs{QcA+qbRF&C|_hvzk=A
zVP|9W^Y;&J62BQ29$sEve*6z73lmV2>m#pn&T~uV&Xt{JDAYNHFS^CV%IZ{+jJ*8x
z4-z7(6ZIUeEA%4n&6_8e+4AeXw6wHN<K>qj{2eY5a&l>vf9vdvrZ;WKFws(}sHq9r
z;9HuJoSeKcKp^Pw%l;#m6(1|C*}659W8a=VN8Sg?|NQl9mWK+9Ojxtd8m6SJTemXF
z{K-4@Xqs6=YKrNJN7@Q%-A6+i1RtN`b1{4(;iR(8>4f3BHx44seTpuRv|3~+lGrD$
zk-B2#;>FCjS`C;A>gxXe`Lm|f?X0}(ix+)8Jr0*YeEU|Gpa1^D2ZNbDd3kwdWo21s
zdAs#{*c{Re>+9t=FJHDSt)}MBqeo4qQAfFFh%|mvnRM^#*R31G(@G6iPCfdd^X1oH
zFJHc#JzLsv@}g{&y{CkYC3t{wav}1sCv(lb88bdq*ldjODGHw!r`l<1VshsE`Q<^H
zo)<5O-@kjebZ5+)j}2w7uUwg;R5exc+NDdIcI@C_pW7mI=F$Phi&w86)#w!OdNFl&
zM0E7+Q>VCm?s;lB>f1>0+<IFEvF?-L=BTyV+1c;kzZde#&(8;@34?<XQ;y|}r@oxp
zdE@kHZ@uZ01DY~>mM&HOBXi7u(*K3WFJ%_p=~h2-WKDupNn#=++pfB6zuL9;UlcZy
zla>9;7@X#9AtUy=(ezLIhpN49iv!b^f4aT@VzZ{x(}W`HU%!7p6cyTWuz&0Ax7VuH
z_&f1Wiqa9=X|(^nw)7E}I|~;sY;SLGZf3SPJJB+v?O^=oef#!3dzMyl&}e3lm&q+Z
gNIn5&7txRh@@KT>C955AjR56XPgg&ebxsLQ0F<TNQUCw|

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/settings.png b/Telegram/Resources/icons/menu/settings.png
index 4453866e9baa53cc1b74cc0c15d796e633700f66..27b0cbcd623e1dea9150ed2dfe56813a64754302 100644
GIT binary patch
delta 581
zcmV-L0=oUT1iA%~fPVrcNkl<ZI1$a1JFjU$6vsEmvm=B=B1(@+B3g}zFCdXfC=?Q+
z6A^_<q0xHeq80HSG}NL)bRrZY9*t*k|L&Y@%eLL*bY}|wv(|6Tp0#GpaNKVjlK*T-
zqtPT135&%7W;&gg%jNBM`-%U!kW?z|_xnnvve)Y&*yHgWkAFv(%XPcmKCLBgcQ_pP
z``u_XGB*UKFpAS0_p&3i*__Mev|8<8Fo?(F`~BW(wepdp(MY9IRVo#?+r8Or^7;I1
zHsifdfh>l@VYl0@R;wUVsgy#Yc)B?bKsKA5&*uP;FJJ-i4QDbLR8*~2)8J1U7+{15
z0hvs;TCKw2uz$c22n7E88xR5)V1yu$*`@4HE|;S;i^YP{&1SP!tKpb1ATXs~zz9Jg
zH9j=Z<#HK`M3^HO46fH})<m#CU<xDidc9u2*ejd9{GxFRg#v2Htc^yaR4P#dQy7^A
zWT(?X2oF3JGf^K8y$h5E`M%p9mLH|&^ZAe(LWFDKIDhd4WKJEZE*cMAg8?BZHsI^^
z%D2mRYM09ewKSPbbfHiv6pO`>ECvLo)C(A^Baj*&nl_}!p}yiD8xk13BD>wLUauPr
z1{yArNTSi`WHP~Zd%q&jQ#+kbe!qV_9_w_vbUJOf+i^?jLb!&-VzJd~>GgWJ0H4oi
z3W#f)%|7=2j5wW6aa!<<PzVM7(ZlvdgQ>=L+U+(9hX)sS<dsY&4~GL~ez*P$G-4xU
TL4Yo(00000NkvXXu0mjfi+vHV

delta 449
zcmV;y0Y3h^1-Ar{fPVp@Nkl<ZI1$}cyNbd<6iqfDD5SI4uwZG5h)sfElhTjy6Jldy
zB}wTg1oQ(0Tk`?2u~B>@5*xA7La-A-h<k8gOhyt@*z8Vq&bjB#%$>P29QSVrA75Fi
zR4Nn-@T^v=@pv3>j*Ql7wcG7Bo6Y9)IRI#+H73CG{BpUh*MIB80{{v!CM6WAR4R+b
z0##rmr_)K(G!j--6?8NjAp`?#p)`&QtsqH~=XthmUoIC>6kDy<`Fy4c*=)AiY(mLo
zGKOKuvV1rkXfy;mosR3eA&KLD9)l5KYq#5s_@w*&zFMtPp3CKi!{Plg06=L7Hkc`8
zLATr8Y&PX`nSTV3-0%0l9|HiC=x7MoU}p0vPp8wpUJu6%1qER%n1n<DKp}!!mNlJD
zVWx=yUqM3f+dCEn!T0^w#HW(5v|_RNrnHY8cJk{V3<k{gM>eFQD5hy{w_92{`moVx
z;K)fs=JWaE@kpaApijhcoa^<f>pF4Z%6GdR`abH3usRb3`D8K)KHBwqol2#GhNPH&
rBj~KR-$>|;URU_c$M!n!pHhASvY7p-G<uub00000NkvXXu0mjfj)>Sa

diff --git a/Telegram/Resources/icons/menu/settings@2x.png b/Telegram/Resources/icons/menu/settings@2x.png
index e255fb46a70d25847d08592593c0ff4965f82587..76e0fbbe4befb934e1f37ac0c4d4c468ac01abdd 100644
GIT binary patch
delta 1142
zcmV-+1d02l3Frxsfqzm-L_t(o3GJ9mD0NX3$FJ*=kUYQgijkp`fjsh_Fr;MgWgvu<
zD2gHjWg;11Vqj!wNK(qgz(64(6HG`V<WZjAkCknA&OPVed+x`lK4)<6+H3vSf9<pP
z+Iz2kT&|zzX9NNpfuO+LUGeep>FMb~L9aY7FE59Ohi7MJ0e^BjbT2P2-`?J)6NU#R
zCWoYs-D+xTo}Zr$T~SR;0GyFKnX-t8h=YTJ#Kc4<sJFLwZ*Nb<&dkgl9v)^APft%X
zGBR#&Z<Xm2g~Gx@8H~KVJaZV7Vg+WldeykSBFup7>}*l4uCAJ`N~vIGjB^e1QeR)+
z(a}*<ROEKMS$|VwV`KOC_lyCFV#O=z1#D<&C@LxnN8BNS3PLL{@A{seo|~H+m8xXS
z#l?j*udc4Ty1J|=+S}U!2=e6QgoINh5O#NWTRGb4o12@3<>~3^`ubWi(wv^2PEJm?
zb9T8>Q&VSWXO$NMB>0M^sj11{-DrhQI<dC4hRnWKS$|o%wY9adu#lCNWkg%IN$}<6
zWgKybBrPosLg`#eN{Y3g$ucuDgBwY}GFC>}j#bllL3e~uQjie7GUVsy%fOC|jQHx~
z4-Q)4Cy-Bm^YimKkc`pM(Ow-wLPFSYe!o2kG`+e&3ppX?=H|SDT`@5+GNhfIo%U$<
z>%qan^MCVmd0qLXi4v2&FDn#0fe2@hd|e$vT~bnF10_8-Ha7IG=rSe%HtwaRrGh7%
z4eZqv9v*&ocL#cMa?%PK85y~`xhafGOG{N%RlnXI1e&4;0L+R3a$p1^oE7FnKR!M#
zq$~uFi<A9V0R8>_`U--ACQ7ja`yhRnAe1ExhJQfsYTN&~xVV*-6(MCeYHe-R;bCE6
zmzS4V7Z(?Gy)I({01U9MM;2eKgdmW?YT0BYM@L5`yYbX<Wo2d3*NTb?U9ZcS1VgUq
zdT2$@Ao(;|x-;^`#036igRXCAXb{ra*jQb!%a{ZMSl1^cB#6Gcx?0!kvR(PX(E~I%
zIDc4o2t-yh$k<!)c<zu)SxZX`Zk*4$Ge@^Hb8>QYy)G-${{FtMXIV+Jwzk%fDKjK>
zTU(n>8c0&JkE_DLkEGU@y~i>mkYx{{f6Jbc{9YTQIyww1R-ZNGuRA)_;c8Q%O6NEk
zzT$8t7*zqg#TS$x)H#NM_uTw;1sdIyg@3^IrI)bmkT$!s=a(~Sos_VUklG%Ld@eTw
z0|Pd7g`opUNl8;vQ|s&Nffo7jT3v%kujAw6y1F_;Y(q0NG?Z(<ey!sTonM25-EdLl
z(2#Ol4oI7nEGQ`8>Laj+hliu1Ba!)aeo>S@Q3>i-X_Upq#XCDYP}^LkA0Hp32X7Qc
zB+XyDN*iWDH5(fnB_5HKQVA%<%6A#1^j+}4=+$|5cULgExw&SrQu=huG5H7d!HTTv
z>+AdXAFOz*&-<ij8Zw_1pY+kw$&~4R{zjjL^=|#h|MLj^0r8e>ehnRwtN;K207*qo
IM6N<$g8lI=zW@LL

delta 1075
zcmV-31kC&B38e{;fqxH4L_t(o3GJ9mD0NX3$M3zw#Pcg7!a%~%z@vns%rKR{!kDDY
z7%2>t$H<t(#K1EnVj!;~$}5zTC{mO{_`aXJvOAq~?mqV()GhZ6So^=$`tQBhUVHDg
zug4SlA`ys0;Fm?f`<3~Ym6g@i)#c^oMMp=&^ZNRFaBwg&F@LeLvho#Lm%bex9q;e&
z|12LMDwm`lkIM)Z6cntjt@(Vu^YioN<z-^S2#8a8d3k1LCSxitF5cYSbUmz)9lN``
z3C-2jRYF37(U~S7Dh!Nx@Uky>Q)L+&8(UghN^^UA`{Ch1;RrMV5ip2}i7~2zls}SD
z|D~j)w6(Pr6@L{m@0ppIySuxtt}fOEueY~1tFM41B_+GNyPch#X=!QI)zx0FcYS?*
zU|`_p=Emw00+ODdetCImN!$-$YHA9tl`Azh6_u?ERJJZw5_^PcZEbA{_2lH_+}xaO
ztDT*l%F0T6pHH-=rsnAA2wz-q#9esEbZ9@VLj2#<)PE!_&CSi?T3A?EUtiDW3Wg~v
zDypHOfwdN6NQ4dAVBF0%@$vE3*Vj;NY;3rnlYtcys33$Ea)Tx~kwnIsfD;vs2i<Tc
z{q=tc`k_N5iw?Pl(_Y2#&w!?<r|s2#l)Zg&a)O!qXv&EY$O}S@HFrzEY>?~e{{B7?
zHTMH&bbnS>meGJFpyuijLLoOgI?F>tLrjGTvl>=w!XUvvJ3Fhbt^MQw5NL{*ZJeMI
zuff4VE2jg(fp&X)D{Ha1xR{%ps~kuaSt+_Vr6)}p69%Sy;!qVfXdzc@Aqd&o+57wZ
z!ZJKOtUO6x0SSo$l>jJO%oK?5`1lBZcz6h{5q}R&X0bWSAQ~GRQ=UX#x=c<^R-h69
zMQdDZjxGTk8yl6Stq?G&l{G}joN@}$3#OG4W0l1(FE4s`-GGQK7o<d<fGeWo<71Jj
z7!{}lmCnix72_bC5!iq(m&}yZ)TydVcS*glupq1EGO0t__T&xU&u;tG)m0`mIy$NX
zV}B9|z8oqtZ}k^Yb1*`PCFCYH)eM+JQYI%RCMr{tK#@uXeR_Io#AyO*>er;CB<zLU
z=;$nm-Q^l~<p(jeEztV=`!g~!oFnYFsHmt=)k{lDi{zQh0u4g8w;a<D8B5rwr>DNY
zzPPwJ&9HKEa%7*A<KI@o(x0Ztzqq)ls(-4oj)_MS&ywfoXSMH?@YNz;I^!AC+uOUe
zw8Wj?+S<ysKQb~Reaz0zS_d>fJ}z2HpZ4~4TyVs_r>6%htNr&N^3a)|pSRKhGN8S^
zJ>ElBts@ff9MXGImSB*dpKpCi1EL~$ERdeWR_pSK#Eq-}v4PhQZ#vs9e+qPWbu2iJ
t#$|+rH@tqZa-3_#AQFK{1i~`{{{hF<d5QQg0_Ok#002ovPDHLkV1mld6&?Tp

diff --git a/Telegram/Resources/icons/menu/settings@3x.png b/Telegram/Resources/icons/menu/settings@3x.png
index 79b2cf6d2b06d849c2403c761e86764f7cecdd78..5135a603e8d2730da6b01384152a71f69e9df44f 100644
GIT binary patch
delta 1902
zcmV-!2a)*X4cQNnfPV)=Nkl<ZXa((?S*T837{`xuWUgbLPe)|9Ktfz7Q(U;ATqtAb
zPFzS_o{piYPcmJ|l%YhX3*1O3PD*475pEDZ^N?BizF*e&{w;g2z2CLBeRzAn_q{lt
z{jC4<JpZ-!8lJV*R#sN}m0F<G0;LuxwZQ+N1sXM69fuAbI)822wEq43w{6=t5aq>-
z7uT*`+r4}D`Sa%kMFsuXym|9AYu0@I`t_gK9{^y03%W8Q*SK-xvuDr7*661~z?jH9
zE1@DQNAgowS2un7bUnU$_3HZd>kl73{5$u1^ym?9sadmT2GgxuH(uSTQ>SE7h(c9W
z)#uNj%^P|5?tdL)tWhJ!Fh)t`0T?7E7#3oE#A(i)IqGNg=FOAdDF6@{LnkJ+vOKk=
z)3A5%-qP>ew@<QDumQHA6P#3;WyR=VJ$m#o40sicrFb>~fEi46b#*+r!AmPDD*E>A
zJAC-?UcGwR!C19UpFXXw_3hg?yEIA$CX*8<P6XZ?A%6%&ID$rb$UxtsMT-Rs7BIhw
z%7X_FYHMp*f_LuRX;TF7{P}aAka&<cgioJ7tzNyF*N$7eh@gaqfRE2)nC{)X-@SX+
zCJ`l5!yP+zbnMvCCqSDvZMJUR8s#dWhX6Eu-1=fFD=V*Fy&4GPe7tbs!iW(geEsHd
zqeqXvd4Kb!(_ugf4anr|e)-?Md-o~;3+~F5D`(H1y?OKIH*elZPjk+iHOskb`NVJ9
zwCTcy3&|nn5a)y-5a9?aJ!E_w=Esa0HA+sOJb7Zz8C|+`q1T~=6U_4a%7@@>EM2<v
z<;$12#kt@FC5mW_963@&DTVU#^2?Vm%j1+OQ-8vaGM}=XsUx99<I<%|5DPO&prI$o
z-5*cqARsajOHhpfv~}y&PoF+DzQ|Jt4H^^x{N_gpXe$IU=%pmEeED*<(8i4$Q+mmn
zF|+f_J*E72)22<Lv~1b3G+yY$&z?OqUKq{o+qX~QrC+~(Oa>P(Ui|RkgK>qxBT9-=
zIDhQWp#x-$E9j*eX#)lfP}{6syEZ9_&Ye4N+qO+TN3JAL1OQl4&+FE$lM|Ajq~>K~
z$Bvc#j2SZ$*$*2w%ua~pCoBL1oXGjinKR{Q%$PAzwvl^s)<oIZYnPN!0%_~XlP9%7
z21ed^{P^)ZckUpQ2aX#zu3fu!#=L9Su7AvRWF8z47){>4HksG2U+2XK0Wecy!Q$w-
z!-Xg(0BTW^*P5D|z(U6(N;{dx1j8T$*E2M<QbW&fJ{LSfM@A!x^qEPMCPe^$s7do>
zLf&X+4?jTPC5iwDj9~x}euRMC!<iw&7%xqyPMsb<eyrFC^r)Ee%6y~E%l-TJ^M6hZ
z0Du|)7-Akpi|$8gn+e3A7lqHS$K$PAw``AJzI>TGcdpZN#flX|a*X4|1eCyJf_b1+
zk8IBbLx57xo;_8XQedDTI&{ePyKC1jr>`3~ZWtKj$1}|broo1}(=AH7$qpVosJSN!
zpFq!4_V(>t!~5{z!(mIN1g%=zw|{RB1EMs5ja$qE(~L~kuU~I4^cN}P1>YQ*F3#L#
ze6?!TD(sXVuROra>|u;kBQWMs!$uKFT%1nAO5ciMsn&9CE5fcb)M#24hrG^xD@Ir3
zEZVqx|Ned0FVhq=o6+kKE({B61jZaEVE~$sA3qv>mNyvT$>YF*1J3XbH-C9-*s#Hj
zG5#`>`Ai;p-Wb#UnKNf5PMoNkFvRQY>-A_0np9YPr%s(}7e&dyw1~?*3?|8t5;9P-
z6Dt+@3gHF%*s)`OWP$F}rw^g^(hz=WfiBLJs%Vqo!Gj0u)h}7H#JBsFm9cHne%W|n
ztGj2<p1;2T5VSEjrGPQ<_kRx=5rd?^;eSZ>aI$A_m&m>lHky&MBF8|g%#a~NB>M>G
z&Yi=ATuCci*oq<mzyOC!V>C7yUVaSHT~xG(IaJp^eoMcr%e7nP$8XTf`A+z6(H@x6
z4#j!IO~n{#+yH2LbY4nu^x33IlZ3q?F+Af-3F32Sql$4tWG88)d4JsZFu!p*#=(>J
zV~JT?2II$%=L0JyOy!Ui5>$s%kjda0$wc(I_#+<IjT0tJut+8o2M!!~^ypDFV${VS
zOMEiFF=+p*T4?Rxzu)taP!U_UY`JRHDmIa-Rg{qNRV@r+F4sBe)oF(z!~t#8NtP-j
zfo;gWd-tMhV(YWNTz@wtqCSV<K!RR$<j4`5L`=@1Dk1QCZ7bv}SFTXi-}gC$*l>{K
z{D1|(<jIqDzU^5t`&Bcj=FgvRA5<}CkRLbr2P~>vjId?P7V`!?D+bKqIquH(8;-~%
zIEH;pk@oPMg!&wD>s*yP7mmAQJSQ#6xMH_&-xdSsYOYcQ8)sk}+L%I-i}piI8hG*I
z#b(%;zg!tJen=+t<5Bm>2D50<qC$ByF+2+7W9Jx#>5B^C^K{3T$muKevt<$fhk~Cg
oSb8e8K&b^vEl_HKKi>lX0uCfU{ijndr2qf`07*qoM6N<$f(8Av4*&oF

delta 1655
zcmV--28j9D59AGyfPV%~Nkl<ZXa((BODLva80T-~e!p8Nmt2c%WTB)OsaZ@-u~3YJ
z6iZ1`l$}e-#>Ti?2-!?7$;K2r5s9Ly8FwM$GLzx||Mfrh^muRI`+eX0jq&xqtLL2a
zd#>l4=iFWw7xObCU`D`<fEfWZ0%iov2>huCxH?*qudi=ZRDaZ)H*ZMM@87?Vj*f0_
zZm8y!5!u<<U%q^Ke0=;@_Ms9@0K77nU~XGm8+u0O(X$Ew0DDcoefaR<nFpE$fF0qR
z@pBB5YJYz}EG$fzJ3BkOxVU(Ke^1tXd3ojM=NA<fiJG&sv$(jpS1{#xclGr2kUtUv
zP1KQ&=(K+%`hV;%CM6}2klx;2q9p`x;w%!_-%<<;3R+lLpsw)q^HZ}7O$3{tpZE9o
zS3}xXZ{r+GPfsr^D+><~_wn)B*w`2v8ag;QsHv%GZEXz+2_aKpz1rkK)AjW=ArB7^
z8yg$P$H!x0V#>?QA^-OF_Vo00cz77{3Fbfo22D>-KYu+vQM^GQaew>vjn{x)US4*0
zcULn7OE&LY!MnG&Cs`z*2<o6zO^z}3um;0M;()w}NLN%;xVl;%4j(^$JU>5|OOVt+
zDc`#o;|!P5)z!sSe*gac>gtNu{QC6^n83h5&ZSLbVd(Ggmvj`wLO7S)+1aTr$M)8g
zl$3{u2Y;aqGpC@S0J1RHDl03GkB>2C#>U2CV`FVokeZr0GcyC>5Cwr^48MK*7Bfv~
zglZUIn{W$Ub8~YP!rIzejz&&POH1Q5w$T|G8Itq}MWhr4*d|ts>)pF|q+or0-ObHS
z3vFB*6hR%Sh8f1mc5%VP-QC?K>3Mm1MoPCN3xDcJHOw$Fi<Fd<km$+DNlTVIYlj`M
ztf{F9TMc|5P_))KC?x}6%rgb{6h=o!g<NEa`1p98qC7o48yXrEvpF`tXaYc|C@7_s
zb7W*hCzoZ|=g*&oW82%?meKzsuwmca+@vro5&!_EQy^3eAuvV{i>^)Z#l?k?6%i4k
zCx6T^cXf4Dk|%L$#>Z^}05CniK`B%VUNVM@vXRCvjzZqo*QcElVFd3hth^l^9ayHo
zg%1RZd^rYKJ6Pa?QZfL>*yx6wEg&G^^74{IBmZh7Mob<;;>4Mil_eL5N;DA+EOLyf
zfg+ynVFrv*1KUzxU0qGnR~R%kH5C~dDSwfLbce(s0O%G)uLKL4sNcY%m?z)Ae^1VX
zfB{uiRT7N`6pM?CfByW*HQ{_Ak&6Hm07FjFDk%a$V8tO&S64>>sD=R&2^vLR$wTl@
zOiW~EW@4jF;^d=(->3}?3=mS0-~i4@U|gRNotv8r1E^?`u);COLe9l`goJX%qJJ_v
zI$97&fIB-ogj6H|pgc*89LeSDUulE{>l_0QCI;zNoEX$<KjGowK|*jKB3ch&ontsS
z@P!{|3W*M!@I?)Bw8bkL000wsV&nobuc(N1f@nR26^>!<uC1*V78a7+A3uH&EeI^Q
zRKo`?RdRv@I3r>1?(T?QSy{0vd4CY21wt|1%O{4h>AtkIl(HfS<I}y<F3?W9r9#3G
zLjoI6?R}jX(Ad}FqKc0q&`78FB$a^a+yq0l;N{s%WB%w$9>KxELImvKnMzGA_JLS%
zx3;!8011$Cpr{7`Fn~Esk%m&J7ENS~BGS4_>M=}TYY&>Vb>w~Zw;VKI{C{cy8*Yk=
zkyisq;?8-QgMsUu*KcA*YG0V*W|L0u*3Dps4h;>JygxYn!W7!IuedP>aPN)Ba*1Wk
zY%S8;+q<Qu1rJO7iW|4+{E9m{Iay1DJ#7{rCE(u4$%*^`s;v}TCp@oFdI0f9A0=QM
zvWT8%Bv`hzw3L{bsO=A06MqsC<gaAhLqR+I840GSJ^bOaR`R5TKLzlEfSPZ3J;SXq
zFx(9cX36dZE2nJ_f0p0o6fKiK)qef@6_2#-?d^E5r6)f`LFZE~-23$DQ*(1OV(~Ih
zwTgc7%I@xN>I98Mf+m7tk<7`-;X>@Eb?p_cQiIES!fPx5ylHT75OBX%5tku^@s9C3
zocj8DH7j`&XHmmjTW{kW(@^8IzZ}75{?`#rBsIbj{~Kw<-QFhW{H;$!1&7EN{1Mam
zIVS0AOgU%!bynh`Su`VHM!<}K838i_W(3R#{0Hn3mqU$joml_?002ovPDHLkV1o4z
B2POaj

diff --git a/Telegram/Resources/icons/menu/stories_archive.png b/Telegram/Resources/icons/menu/stories_archive.png
index d86b5dc87df7c9354b102987cacf282e43efe99b..a98e8583cb2206f57959c777e5adeb62591be291 100644
GIT binary patch
delta 626
zcmdna*UdUXrJk`k$lZxy-8q?;3=9k|sS%!OzP=1vKsE;hV|yk83y{SK#8N=az`(qK
zk%1XVGlIkxFu`Rd7BC~&Acc=iOV<LGef4y446zWr8{)m%F;L{0jL0iD&q`j8lZz#0
zdwLlfO*$h{&mqh#7|i@sU1R1CMz$^<6=PLTCBq4g?wXn>9p1f~ckbSt<9kcpw^yq@
zkG}tX?bUnPZ}+k`)&HJYV?EhxX`_R}M2{nnKOTQ<IRE_5IU@cWQkxWlR$fWlyz*+6
zRBzhWsI}L#H%wHy`TDEUL=NlL=831Do=y8)U~$07MM?1RL?5+!{psE&QmG%#1Zapj
zO?_FCWgsy_N>*EhYh#3uyUqU+t6Cemo1rQ~oc?U$x|2^X@X`@W?uc72e(i+9*)-!V
z|4TD>+^pL#f9Gq}+=-t*el<Mtwrq9S>gIzAj|vs%pTC~BJ@JyqZ?-${zt`B++s&WI
zex5bTScY%n2jvxEtJllzQL2A&@oic4RgFC{dJj!fH%HFUjCSSG+j9HumMC2zff;Ah
z76xccKfN_dcdA!w#q6_b8zTZb9MvXE_PSZrxmWG2Gmt2;l6Cq1`>)f&1}7dLHQ|z5
zFH4eM$sW8Ks5MoDU7X=e+3vr0o!oof7T<nbcc1%~_Jg%dd~^M_-+zDlsZr7YY`GnG
z^DJZwbRPO`Tz#O=YiW>$Oq#b$&($p1{^QFpuMApQVI#NrVuzXaOdqlC*3(ZPc|2aS
zVEu=82llML{`&Jz9kK2yXCD^qxu<_FCQeB0Xx)s8yY(JFSd_jj@akQ9FBy~=JYD@<
J);T3K0RXrT3HSg2

literal 1847
zcmbVNZEVzJ9Pf<{2V@R{FchPuB#Vdi?Rq!v8cue*-q^^BxLe@(BJ0|2*W6uO+TPoS
zun`cKL13C8*_@~(V1R(a7hnvQK%$XNKt%W;L0%$akco^T6NXQ3w+k4QNRzft+u!s1
z{omWXXyN?4@h^>sASkcAjHv|oY37-m1+L1JoqNG;oLaV2hoA|Q&C>$4e*_TOH>Ik8
z5nwB5UWs6wpwx(1BBBB`1kIh7P&qy%8gPwRC&_N4zw0OhOM)9&;$R6@^@>5MtX>oS
z^$V-``Vj9Dka=&wa}zWmh=>LUCn8~4rxR`@#Y=;=`5H&y6vPO*5sxVd2iQfhSJ6b+
zg^?&v5F|Xug>g>7KF2}LhHZq6!U+nuQ7GZ09Yr)X2TmUdkkf=(x{@hPi-9LM5;P2z
z#_@POj>RcV(duy0<#OSK4Y%1)fI#)6Y;Xxw)@P0~Frv<Dl4?kb44aHxjS@B72rzZT
zhlrY?mGyL-K*aC_r{W|=m_DU|0-wRDQ7xPj7kFF@ixE*abbuu@ST(2^iXK${g*x;3
zF#!-;md$89(UwRgBcU6<7;qyUkSC(`s-!C7m7=ahHD2_^fSEH*Z&cc=iJYNmRf-ZG
z&D5e%lVO`3D}rBJBFTah*R79i5E;%8-H4erlqf<eqKdT9b{lP@UMK7{L5x6IMUZNf
zPlQr5VSfw?YDVA;?x|pbr)w20!U2b+2v;ZKs$7S_nK05`C9G&b7+6Q8tYBHXT-FUv
z=EZWxjR2o9NfKx$!8@I`B!N1_A`T_(_8Qbl)Q~7a)YRGt&fy|Ca&$kV@KH0fqx*&b
zx&KW~0<Fb`pP9#OII|?^GD!!?N~Sx)FD_57!V;XS0-EE^>UJZ%nO0Fi(yygwj=%_Q
zJSYOv|48=;Ojl}+IH!r8IuNa=mJ<$)$IU(*@dN*-i>Ysq^z0}c3<7hR8A0G7GsHw0
zOfC(Ks5KQN13{Mla>i5ToWxg8t8ZMp))xqDX>M+=crY|H<lkO#aMi=%i$_;I1jk=@
z`$OmUL}Rg8R_mltc0s|p!^zvj_wVgr`C#b$`GD8!&B@8}`_Bvv40Jc#9Ui)~tE;P{
zt*x!mT2fMS?c2_-75DZvHCYzt3=R$!*WJ8$bZbY)^c~jT-rk168!qi?E{@}`oM0FR
zd;9PK`2t;9T6$wvrQg5o$O<clJzrpH4~9Z5*C)AL2k-V@obU5-WKQt@w)q=1U2pX@
zuDpNi%2z<xh(=F;|6yC(h3<xe7SGhFQ|GN3W(Hq4CH4GSxp?u%j?fR+PHr7DW=!kZ
z3Awq@w(pJ~&%W@<<;$0kt;?U;Qnp}0R$kWo#j#kd=v4cmL-bYERX-5qxEY5$-QC?M
zHlxSHi4&bPeI$9ikfJ8<fj&R7W5;u!av%;5TcJ%YXW?WrS=}BE279E5`S~Y*?(3Mb
z9eS}C+wSQ(&~WG1v+w3j|7qX(?y(h~2i1^JU5}z@-n8PrzP_(5Yp5^2EPQWW{;OI3
zo^yMbfq*t|Sh*Ye<>l(|&Rx4c*aTmKoz5+tot>Y}&a%EE|9D{e(166U>>m`G{rjz3
zmMc>N>vu2RUszZ;HbAuc*Y`BFww@liex_+N$lb=?)f>L?{nluK#$C!M-pXYi=C7^X
Lw~*OWQoZ_bTX&P*

diff --git a/Telegram/Resources/icons/menu/stories_archive@2x.png b/Telegram/Resources/icons/menu/stories_archive@2x.png
index f2c59be33802eaa0d1781a5f0b985d2794cc3840..5c56025698df7450116ad533cc0a292b071791b3 100644
GIT binary patch
delta 1168
zcmV;B1aJG>5~K-`B!2;OQb$4nuFf3k0000)WmrjOO-%qQ0000800D<-00aO400961
z02%-Q00003paB2_0000100961paK8{000010000mpaTE|000010000m00000+c#_s
z000CINkl<ZSPAV|Nhqyh7(R|M%5cn=B(ZP|A(E7-Y?L7^6o2Xz8y1EP*;t4aN+e4|
zNF)ogAreYtWkZRS*oX|tJlv=I=G^1|zW<zmIHy~;^DX%Q_kG^yd%o%Y-v4Mc_GX^}
z`wZB21{~DT`}p{Tg@yh4(+&?0x3{;|uqls?jErn)X+ig&pPygf?d|Q&-``(3sj^5&
znVXyY*6{cL$A8Di%F2qPqoXNpQ&UrKZ?COXy1BUx3=F)!zLE+&KtWASO=@atXlSUD
zlar|wJbQV05%T)_y1KgB!9msD5Rhwvf`WE;cd3Jihlh@i4(uKwh<R^sZ-0M(r>ODq
zamKII5EmDBc6LU*)6>(z!NJm*5)%_?B>VgO(xc2F(SQBL#Rb%0mtZ5CgNpdHT5VQV
zRzN_2h+mG`#l;0jiPV&ol*kFS4R&yFkXB0B+*nyuR8$mF3k1!~%t)b@wYQ`Y3Nf>@
zvrvOG6&M&O^fB)^{{Z*&^e`TwAwE9-<m9BQt4ruG|E|~TDGPUYcA7_$cVc1!g0{A{
zEP|`5s(*mQ+>4D<%cUqSEk!DOdV1>X>*E3x8<&@tF;pbd^73*n313h_K>^TfYisxS
z_uMeW#`E)Y&?4MmFmOpYf^c~!B_#p9xVXrTQE40=9tMM_rze+3cn1L#9UV<q&-(g0
zH%6s#VPPRRH}~}Pl*_{rgc%|zax^zay>WGQRey|xvt*P}Zf|d~sl~!<XXgm=_Vz}9
z5G1`<l8$RQFE3AelvHG6V<V+RsR0^IMn(pubsTAA3TJ0$>9LlPWo2a$geG<nxD@H>
z>BcH$XJ;ooJe&(tV#IJs5SBnzyiTV>rl8oHo15a|Vs1FH;?&gC*w`4?%Q2$*q*ArH
zxqq4Cwq(MJzr4JVtjfwt7H(VtKR-X#%eUZIf^l<mlkc`<O-@e64GM<t?rs)4KR*xG
z!NCFR61CLT)gcBIF+RIQL1rBu9v<1**=+F-`{Uyy$WfS^CHUzK2?=?Aen!~n=;%+6
z+P8>^2+-m%#>B+P<LdA4r%A$1A}`Vs8h`hEQBjd46ywK^ySuxCCY)hcS69aWFAVkd
z^$>(6<A~Z?=j7xhX_8%Z+DI9`p!fFnNE51kyvpqel?*auety2(KvBG}ukXgj25G_v
zXiiR!D3o!;#>S$kqFC#ED^eHuV#N6;Ui@8JTFT7K6#Uk~h|ypR(v6D{l&x0&y?+7y
zRa8_MuTS)Gd3iZ9GE!SxTUc0_l9Ixn#G|7lz);3CG&Haok{y5&3-(Z3Tieyu6?zgh
zl$Y-A?xv(^X=$ykt=3#AQ+Cs53>Q0TXlUs8_}KW15oSVGxnfFa&1dWk%t1mz0%{Ly
i^4huVGw}b+z;Ay&K6%8}xRw9_00{s|MNUMnLSTXe8YpD|

literal 2395
zcmbVO3s4hx8jm(0<&9XBR}D)C0ZDd~5CSXV87O#!3e5qb)p5x#$(AG=vx^B2tpr+%
zZMj1cEa)iM6VV<Bh^Hb#rM=>`M*tP^C|ElR(xbI_AS$A_;Wh0|d!6gf?CyVefB)b2
zeZTK9Te2nbRXb}pYX*a17au21rtgsXv|34D2e)f_>D!CiI2p-c*f^Wd6^yDw>lh5?
z54bdqN|PkOazf2PP$C247}Q!C&0vIv8?=Z#3!_*Wm;%>`fctG701HP&K&n6jNwm?J
z5|7K(VXx;VO69p(@(>gV4`YQIV46UUQ3%VRR%uAsAOhxjVR~(T4Farr2$dxQBFzR_
zX_76hXhMgvLO5Ku9D=wkVF(8aMgxTcegKOH@%SLb2YGxp6buW3V7`#GcmT9H9hwOz
zi(?m!(N7{kNl{uD1oe77N6+UFIt9oL2?+rq9?0XdX#|_h(NKtits%Xa7{nMU*Wp?U
zCp0WGBa%U6QzC$Nbs+||c9~W~F6u-p1{x48$mKxhnC5|~d>N<B)~V)=qjC^aVQNf6
zku;XOjMXX$iXfH5uTU?4{+R(<TZv@Z#xMG!Rxg_%shFK~7>k1ZBAS%uXfZGuBZ+LC
z9E;gWyXkF?Mhi#lFoYs>Qi4z|WopZk%Pd|XCy3>nifd3pPx}32113f&Oaz#-#)g8}
zd`QaW!GS!O$KMDA!Vt6ol@KVNne!`9!Ox*|&7cT{{3aNc!<mFmjnDz(YD9s7T8#o=
zEz1Z;6DmSS8>YSE&wC+}!0{TALNszLUMvFWm^nC(!U&(w%Lt^)1cM+UJA@m^X9sin
zLbf0?1I2=bkbox;EbSK)@@#Wvm-eIo=l<7pINe%^>UZ;)8_rx3a2!t3$;w&mh}W?l
ziz^k*ny&&Fk(;Yq1jx;4#ZX}JHU7I5SfJG_F`D#$q<aBI5}A}9(P5DaTCLwKCy;g?
zH22{`9N>S4IREV@J-Y;_2Z4FHJc8(l<spV?=*gv{M-*!8rROBmIbIwoP3!tT?GL_F
zNo!^*X6}4cZUOLf!uP$pX5V2Y@a}<t*s^37z}?g+{%qxkzFy@Meoa`k?4a-c8AHde
zTVUNYN#--tN8DQ(yH7oTK0=!2hDnoX?CUIrqR=jAT|t7+`=zD!HZ~+lw%EU**U!|}
z0w2b<w6)DnO--db2!+Dx>gugqw~mjG+uPf_)U9@NgTum}6*Ap>dV12|ctaE#8qf-g
zL?V;P^i}@s>}+9S;q>(M=D+axd_D*^Ha9od*W<alPaZz3aM~mi{qfZG#Kgo=)VuP_
z)^xVy#|IDkhlbqOuKmL6{=~$gBS$(;pYH5Um&qn)W`qvamoG<Ue(vn-JSey=zuMoQ
zlA4N7jErnksXlQX%+Jq{@O*mw%o(ZCGB0oT?Af!8jiB%Owzl_6O3HeC{QWoAU5)I!
zawT4;Yxc9*$l>hH&ws^aV{2PpdwFOmPoY@l|4p|~GZI{Ocwk`Q8?^QdJw^47oRa#J
zo~5Isnf)a#ei~G(g=B`e-r5@-;OAH0-rnBQ!Ve4Ec69XaUF<~r#fwvulTMLJrP8Wv
zWMt%WSJzGS<jIrWw+d)ADk@yOs+uhS85|Jp>z<l=qqun02P@b?u1t8Z#RbCguQzYX
z(3iH&orYbn^z|j(OR9S@IXQU{U1M!=<<97+rG>?(uZ^!Q`9Qek?wvb-hQgRmZZE(5
zE^Ut+WmSAP-Y@LOe|`Hc4~93h$HvBFGMUE{WZl74`{w56j8=X4dRN!mJ1ura6<xS+
zVP;0JyHr)>R(iX;*KufM#6|p`$BCMn$N(?KCPQ|1%+|PeRY+@7Q`t&kxH|}f$*CzR
zJ_U|@3eUH;#<bIEj4iILtlYn+u5N=vO?P+P>VNd~RK&iQ(t7S(w^!#Q!Et`A=ifUU
zTCU6P@y@siy^hw_8kyGC)?(+)5=nbUhr+vv)AetY#LCZDyS}-(Z*SS#Upme@I5^nd
zJldyB-|k)1Y1L8FKo?F?5pz7zbM<QD>EkBL4&|C3qOD5Y-QBNUx^$^@5B^<K@rufd
zia77E;L<%_Ugg(Md{@6irLwKrCxjkOPfxDTi+ldqQePXNknr*Odg;lAhTXe%eGc}s
z3ET_Lwu+31VE7%bu8yve+`4h&#<{$M;peTHC+=<X@Gu@r;nqKOw0iSU(veR8w2c>6
zeA;WYsCtLhUewA=U_Wr}RL~;F3_GxOcEF>@kCSfa@7Pf=)N}yc%WO@T)UQ1ddMNeU
zlds-B;De&5ho@)RwsK;4c=+74^zWMr_Iy@U6!DUO<f-fSwzk&>1}e(SS;Wzlr|o0w
zES;R3_V3^S<cwkcCy%nCt`;0TF7+3<*?nzH9{ke=(Zo0?8h3rCv9a+@&fi9l)!79-
b?Rd0mLt_MWZ1Q7A^Y2f5Orp3UYP<120HT}I

diff --git a/Telegram/Resources/icons/menu/stories_archive@3x.png b/Telegram/Resources/icons/menu/stories_archive@3x.png
index f6369c74cd52818298a5dcf01c0280391ccde761..715f241bae049b810aa947e4530be9ffb2a2f45e 100644
GIT binary patch
delta 1791
zcmV<b1_1ep7mp5*B!2;OQb$4nuFf3k0000)WmrjOO-%qQ0000800D<-00aO400961
z02%-Q00003paB2_0000100961paK8{000010000;paTE|000010000;00000kTFK@
z000JgNkl<ZXa((BSx8k~6i(C1G_4d-P|Kl2GZR8c96&9hG=K4-#D`KbFd;|~Qt>U7
z!a^*N1VJM~5TPI&Gy)5JXd*RpNKF&LBpaMkbMAx9zc}~a<C*R`_vX*J54z7jYkh0j
z(^_kvEnD=T?g8Bcx(9R*=pN8L@XvW*s|7ULv17-cJ$pPoJ=fRQ|NQx50f}0PaB*=-
zPENjc>sD)P>wnj;UttgXEiNveJ$qIwsoLRg-@ZLHHTB7pCo3x}|Jh>vAEs)jfcnU`
zwzlc%>7%2g#&(!ImzI|DiVq75!>bb~PVl}}&}pN9$B5<l@#8md-h^gG{doNL?ORVz
z&%nUIj~_o~XJ^rP`0yc&HKN1{92psLc6LVp{rmTGbANNk#>R|jEc)o`>iX!>Ba=~C
z@9yp{DJeO6^r%E_4jnqg1(}(dfo)s2T4H14(J&||==0~#T!mIwS8Ho)4<0<oLoL=-
zQ&Yo*Li_dW*K7>MSXF(WkdQDnHN{os*|TS%p`qpoNlHq>gydpoW@efLD4X}<#f#j1
z59{aDsee<lQTP}f9UX7nxUsyv%*>09j^?A%rY|uu5mS!*+S}Xf@9(d!sNmpWEYXuE
zPpS(mgccYW$en?hemIMT7&gT_*wEkKPh-{8)MT}dOI?3)cXrG`D{NWn+QZPWv}mj*
zCnpaaIG}|TOJgEp`tacc8K!s-jEIO(eWx+Y7k}r@og=F-A(dg>xpM~~I46|(<;amE
zh|UlasCEWy+qP|Zc$gW6jsEcA!^#Z%_3IY{L3E-3;lYCkj2-4lVYd|}N=r-g_4Q?B
z_4V~1KYkQt;U$2BSU<8GUIO9HiHQkDfKx6!JY1Mq(%a|HpVM%Wg_1Z8iGKh7&2Zoy
z!+$rDo?>ER7(4z}R#r;l5g_vL@Sr&3)vH$ml%lW9G|a}vW@u=L+4l42Pa6M?<cds1
z<XYGg88c4gjZiGm50mQZ>X@Ltd-t9`eOg$kh+(m@vBYm(!=MHXgLzD!fPer}Oi2S<
z5F33=110<%9y6yRLn<#XUt3#4cH`sY!+*h+*+eLax)L)C8M{nwV{%mt11RbUc6N5g
z=qArX6#Mt@r!_i0K5oKmoel(aQUnXFF?V-&f<SqY+MA*wWZ14<yU2!rXT(S);f9c5
zJ9q9R=I`IXQ(IXBQ6ghJcI+4mLCQd+a|s#7t+Vgmy<0jcFJ)(EC+qj~^LzL1U4KSK
z1}~W<IwK<^*_MdESFT(!QzXiab8~Y9hz8CjRBz0LRl<%5LwZzHR49Qk<UwYD)SEET
z`1I)$@)1KS?Vk{aQ=r(;(4dMy4AI@Yce%DLEG*>Y<VXicEnS5rN|{(kM~8ITqLk;)
zpGPU5YhGhxqm+VIVPPTTGPjlrd4D9{%gaktW9bB_<Y7A@a5Rt|Bbg9DK)`{`nXx>6
z{8)ezuY`6*yngZG1@Vgp)I=$zfl40s{i>=eB1Sm`BT0{@4MgN_Zf>mq{rmT(1TuPX
z!$3}LZf=&rDVg-lnKM*`MJ-H#ue!RLlnDt55ulXxs=d9P!Qog#04j+`CV!E)w|7xd
zk?@Q_L{9Utudh$01U~Y-ygc&L_3PL9NG#EZ;uNV-TwJVzNQ@E!Y6glE7MK4jfXau6
zi;E+}a8W1<AbxAe0xQ%AfMsuQ@8skpx+957RY36N%NKlBfn%_&tW0rj(^#&9g99#w
znZs~-rNY8BmSDZ-?Cfls34eowgXYJ?)-%OWG7iVCt}e2zrKN?cSB8X}@CgSfm8oGN
z?o>CS5gVwC4@|hX&#>+PGj7~t4daFnQnbjaP@u<e1NUmyjR21p8ybjZQO{CK8e)80
z$1r?Z>5MuG<mcy8ss<(I=jX3oyJqI)EvoZbSy}i>iM;mm<x6$cm4AhT5BI1B%2dHk
z&!tP3aEQyoVZ?~G-@JK4Cb7ol%a;{EslbA)o-$F=2|MS#d-qaOQgEzGmw^wA2muX%
zShLy#y%FXV6ckY2!Bq}{CB9w6&UxX&1=txMAHQ$kzKu+!O9ISrq$iYjZA5ROe&})g
z_U)ymC9YwnZ77XZ#CWSyR8-X4w{M?5eJcH%IbIx1I&p#{LZztE)G+jLQ*up|&<+$C
zA+A-gUcK7Z);2voZDby*G1`gdBCGI)DHqPPjr<Ka*EpSU6Mzc<SZhk7_vjwbJ)nC)
h_kivJ-2;Xm_zOJq_faMK>CpfH002ovPDHLkV1k(tP{IHJ

literal 2952
zcmbVO2~-o;8V)`{1kox|u(E`>fJ^p-kdZ|sNKhk70z?bNAu}N%kcmlvB%&xNi-H2B
zE>%#Z;!y;Ja}=uxNCN^Xh;0?csI?aQEC{F=K(KuiL{8h|dp)l?XEJy0eE0j;?@zLW
zHw9Q*eqxEiV5|e#tWfmMHeMDp(C_YpOFlwxvt;be3Jk`|#(0@vzC3P^!I%z+d3+_G
zvk?#=2?P*AVqk(QL589+7*8LS3=~LUB{l|*6-&KvgV*YDSTW><i=cBz9GM?160<dO
zn5)^u6KEs?CWQ0x#(Js%lpq0Cf>>2Tyi@_Gyl|7e0J=7A6LHu{h*IK(^EDd8@;Sj+
zKST~=nFKOkKq8T`3?>2efM^UlbrqIEqELw>Dv?6PlRN;rJ3wV%r#?8;oE#DYp{#XN
z#?U7(oJgsZ0YqYQaxx*AN<ieXL^6}fB$6mZ3I&fM@Cvn5399f?#p3r2ELb6si)BhN
zBE=dR!5Ab_>4igGeHTN5Y?@Z8n938HF`^2T5y=FSF{Vi%B$&p@66Nue#vuU_j)xOq
zsZxPr$<tVw2vH&m5%OQCr(gfc0GeA4XWGUGeMv}|Hla}ZC!t|XCFFx>1y3!5iJ`Cp
zNt6p<|0LAS#l~o4fS()&m57{&Ao1@j75v_1EQLmJ$GSy`r4W*=SpJ6tFbh<|UN~db
z@FaIUmBb@c02&3LP*;*@0EzSt%0VEpQ2jwD6`+&<1VwuW0+rz3f*}DQMC1t|8n8G4
zjD?9ZX)F#qokqY9iAUt9VbnY7q!%0x5GYkBL8$-^WO?Dxm<eJr1d!<<iSEvX@e~Gy
zhNs2QAUu=GbjLI39t<c(K#oBd@6WRkL87s;@6SX3=lLMH7?l<n|Brc$f-|-Rz!ode
zVyUMT!G*U?t>VSl$u0mufw8;2Z~|jlVF)+1E&j(Dct@Kof>F}{QSNsz1tL@?gL2q6
z7R}b*wi6L`o@mtJyEuq{4RP|_A2j<Ojt&Cja(V=z57R>omZFnOj*h4t>dg@h#(Yg6
z%a<p5^n8oNtr)Rqxa&&V#r6rWe7_6+`N+KH489vjM{;q=Jn}SU%qGUYbVuiw7rE_O
zZ2sjt2in2xd-BNq+~dmxlF{G0xyi|cL*9c5RrIf8J37bf9*tkU@OWH5lK8f=ukOwd
zOW1i>-!#)%Gkv+-@7vninwolE_UKGZOq`sY3<g74Sy@0qPHrwIE-r4v2Ax)`J>ip@
zG}74J-F@?*b9s5WpP%3B;o&)SXNBTbT3T9FRaKPPi}8`c%a<<?4Gld-L4@_Atva2K
z!C)khfhj2yZ(jG^JmARnI{mq8kPwFPc>LSG9)lq%IyyQkDr)D>osp3ap3Ud3sb2}@
za=E|1nbYlwiHYK2lI5b%FV5>9K8zI#A$_Alf*=PE9%PWoOqEA*PI<XREPmF~(o#PR
z06<Po4zFPa0B9tV{YkJ|J!W|R0Nr*tzxmTo8Sd@_{r#QhXUfX@`}+$60;8fFSMM`m
zW)D8PUVh=it?#Q#OP{{_<(632*VhMv;QDUfJ*Qzk^0>|`^|#txTvKy%0)a4pT$PhN
zpr2P{pJvj2uCC6BXLh2gu`xy@$|`mvlS5eH&z?O~cIsMN=OKjtJF&NlZ-3o!^JYNd
zQ8XCQ!fkzb@l_Es8+%Iw4z}d5R~$NYXvVE=Pa4gD%@6BSqnW!cxBT3+-wyh$<r6e1
zF0LYx2zz(CMnj{~3P0XsJ$v>^c1wR#Q&ZZ}B$*7mP^i&-nackquV?4P=napHRaKx+
zxGd*kWhLQdx<89`(P8hIFZ1(v*ABn#>x#JW+0vy;U#L4eVQnT_AFGD82M><%9qjG5
zo(-<D@lF}VmKMAjAHP+!`ewT|9$#_){^sU6G4?AK*J(eiO9}M6rg^<W7jo&+rR|pb
z!N>K{SC!evT+za7H*vW(kGHau><-!JLeLIbLdO1HtA5qnbs<{oTARV@UDlJ4nVCHg
z?U@1X%a<>+{M@|mmG7jipi*s4crcmyd$lLa$};>m&&ubl`s%B%WUhucuO+y9KOb^2
zy>a6Pq^T8p)9CaaBLj}@6*V<>C6O+vc_&+k1_q?`j`1&6xv*v!{x!0s*+R7NEc%-&
zmPpF;A|N_$KoS@CGB?xA%xof?yk^eH(+e#>&&&JB(42p=m49AM(B`SH9Q8P2FY9Tu
z<(*c7p?rSJcUKM{wp(~4FRx)QKP=3aToP<iup#F@zO=M-xH{#{@bbp9kx!eOn;|v~
zFSUzlZ*Tv0^v<2Iz2?;}=Es4=bJwpI^=4=rgb&VFRJ>>tTC8R{@AJ(G<iIdYW7K{j
zIibw+Fkd&nXkHcz*ZgC1?joPm-=N<Y7c^MR?MbmM|4Db4*uVN%dV2cIAN=>tPxr_;
z57zhFVlx_9w<{|$Gc&Q;VAI=0XGaDfTh%Ub_Ea?#hb1On!ftr+Q`3Isyjf_IS~`1%
za=9a`9b6jhhUmVAdzU0#?6DU9rVSfxR_ec*%ijH#|0FuzFndvqn?p@aO>0+pc=*KI
zw@sW*RQQzj$4$Jo^`im)?BJ{EGg5w=xZl>ceqlkIUO(~unV@04YX97^%<a5Rw{OI{
zqN1WRK_|kCE!NRot1-j{ahm4=vwenYkjJ8MTU*<f+xoUcXfGast-jNxrk03ombtlQ
zZ44@0{VVV4fk%41QLdXyTCLsP-Jv&k?}qat=Q?{A-mmQF=r|W|E&C?h#<jP%*I-q_
zzJUrUY#TL`dg|0E1JpF8TsLZ16x-sUMkRSl-V<-Vw6?*T>%D6ZYfno@M|1SQ`~A9p
z3dgfN3xi!)KI;mWKSJeKDC<3ylkPLa(Xl8ydsdm%U|-)#r<Fa9cPKK2qSVSdOG%bm
zEFYIeJs;eizR{+nqJraMyVCC5*K<tP=sE*-H#9b`4G;fV?iQpwSKF`_`ZOdY|6A*l
zu`%_6F8!XSk}Gmnx#}vH6Zgb5sCZ4%ai(IOv{R9oh+n>(8F^T1-!Q&?WFWut$NH`}
z!K)&|!g_jpo3+}lA&$9{9j3v3bUK}K_{jl-|Hh-$^%pOG6gKPOX=ZmsEWGRb?rO9B
zGL1&#QxNd1`c?7P$}@}EYsySbO;s9=)04hu^WTkg%8-xCi(`xTbk-REVPgXQH?b<$
HZcY0S{h81^

diff --git a/Telegram/Resources/icons/menu/stories_archive_section.png b/Telegram/Resources/icons/menu/stories_archive_section.png
new file mode 100644
index 0000000000000000000000000000000000000000..d86b5dc87df7c9354b102987cacf282e43efe99b
GIT binary patch
literal 1847
zcmbVNZEVzJ9Pf<{2V@R{FchPuB#Vdi?Rq!v8cue*-q^^BxLe@(BJ0|2*W6uO+TPoS
zun`cKL13C8*_@~(V1R(a7hnvQK%$XNKt%W;L0%$akco^T6NXQ3w+k4QNRzft+u!s1
z{omWXXyN?4@h^>sASkcAjHv|oY37-m1+L1JoqNG;oLaV2hoA|Q&C>$4e*_TOH>Ik8
z5nwB5UWs6wpwx(1BBBB`1kIh7P&qy%8gPwRC&_N4zw0OhOM)9&;$R6@^@>5MtX>oS
z^$V-``Vj9Dka=&wa}zWmh=>LUCn8~4rxR`@#Y=;=`5H&y6vPO*5sxVd2iQfhSJ6b+
zg^?&v5F|Xug>g>7KF2}LhHZq6!U+nuQ7GZ09Yr)X2TmUdkkf=(x{@hPi-9LM5;P2z
z#_@POj>RcV(duy0<#OSK4Y%1)fI#)6Y;Xxw)@P0~Frv<Dl4?kb44aHxjS@B72rzZT
zhlrY?mGyL-K*aC_r{W|=m_DU|0-wRDQ7xPj7kFF@ixE*abbuu@ST(2^iXK${g*x;3
zF#!-;md$89(UwRgBcU6<7;qyUkSC(`s-!C7m7=ahHD2_^fSEH*Z&cc=iJYNmRf-ZG
z&D5e%lVO`3D}rBJBFTah*R79i5E;%8-H4erlqf<eqKdT9b{lP@UMK7{L5x6IMUZNf
zPlQr5VSfw?YDVA;?x|pbr)w20!U2b+2v;ZKs$7S_nK05`C9G&b7+6Q8tYBHXT-FUv
z=EZWxjR2o9NfKx$!8@I`B!N1_A`T_(_8Qbl)Q~7a)YRGt&fy|Ca&$kV@KH0fqx*&b
zx&KW~0<Fb`pP9#OII|?^GD!!?N~Sx)FD_57!V;XS0-EE^>UJZ%nO0Fi(yygwj=%_Q
zJSYOv|48=;Ojl}+IH!r8IuNa=mJ<$)$IU(*@dN*-i>Ysq^z0}c3<7hR8A0G7GsHw0
zOfC(Ks5KQN13{Mla>i5ToWxg8t8ZMp))xqDX>M+=crY|H<lkO#aMi=%i$_;I1jk=@
z`$OmUL}Rg8R_mltc0s|p!^zvj_wVgr`C#b$`GD8!&B@8}`_Bvv40Jc#9Ui)~tE;P{
zt*x!mT2fMS?c2_-75DZvHCYzt3=R$!*WJ8$bZbY)^c~jT-rk168!qi?E{@}`oM0FR
zd;9PK`2t;9T6$wvrQg5o$O<clJzrpH4~9Z5*C)AL2k-V@obU5-WKQt@w)q=1U2pX@
zuDpNi%2z<xh(=F;|6yC(h3<xe7SGhFQ|GN3W(Hq4CH4GSxp?u%j?fR+PHr7DW=!kZ
z3Awq@w(pJ~&%W@<<;$0kt;?U;Qnp}0R$kWo#j#kd=v4cmL-bYERX-5qxEY5$-QC?M
zHlxSHi4&bPeI$9ikfJ8<fj&R7W5;u!av%;5TcJ%YXW?WrS=}BE279E5`S~Y*?(3Mb
z9eS}C+wSQ(&~WG1v+w3j|7qX(?y(h~2i1^JU5}z@-n8PrzP_(5Yp5^2EPQWW{;OI3
zo^yMbfq*t|Sh*Ye<>l(|&Rx4c*aTmKoz5+tot>Y}&a%EE|9D{e(166U>>m`G{rjz3
zmMc>N>vu2RUszZ;HbAuc*Y`BFww@liex_+N$lb=?)f>L?{nluK#$C!M-pXYi=C7^X
Lw~*OWQoZ_bTX&P*

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_archive_section@2x.png b/Telegram/Resources/icons/menu/stories_archive_section@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2c59be33802eaa0d1781a5f0b985d2794cc3840
GIT binary patch
literal 2395
zcmbVO3s4hx8jm(0<&9XBR}D)C0ZDd~5CSXV87O#!3e5qb)p5x#$(AG=vx^B2tpr+%
zZMj1cEa)iM6VV<Bh^Hb#rM=>`M*tP^C|ElR(xbI_AS$A_;Wh0|d!6gf?CyVefB)b2
zeZTK9Te2nbRXb}pYX*a17au21rtgsXv|34D2e)f_>D!CiI2p-c*f^Wd6^yDw>lh5?
z54bdqN|PkOazf2PP$C247}Q!C&0vIv8?=Z#3!_*Wm;%>`fctG701HP&K&n6jNwm?J
z5|7K(VXx;VO69p(@(>gV4`YQIV46UUQ3%VRR%uAsAOhxjVR~(T4Farr2$dxQBFzR_
zX_76hXhMgvLO5Ku9D=wkVF(8aMgxTcegKOH@%SLb2YGxp6buW3V7`#GcmT9H9hwOz
zi(?m!(N7{kNl{uD1oe77N6+UFIt9oL2?+rq9?0XdX#|_h(NKtits%Xa7{nMU*Wp?U
zCp0WGBa%U6QzC$Nbs+||c9~W~F6u-p1{x48$mKxhnC5|~d>N<B)~V)=qjC^aVQNf6
zku;XOjMXX$iXfH5uTU?4{+R(<TZv@Z#xMG!Rxg_%shFK~7>k1ZBAS%uXfZGuBZ+LC
z9E;gWyXkF?Mhi#lFoYs>Qi4z|WopZk%Pd|XCy3>nifd3pPx}32113f&Oaz#-#)g8}
zd`QaW!GS!O$KMDA!Vt6ol@KVNne!`9!Ox*|&7cT{{3aNc!<mFmjnDz(YD9s7T8#o=
zEz1Z;6DmSS8>YSE&wC+}!0{TALNszLUMvFWm^nC(!U&(w%Lt^)1cM+UJA@m^X9sin
zLbf0?1I2=bkbox;EbSK)@@#Wvm-eIo=l<7pINe%^>UZ;)8_rx3a2!t3$;w&mh}W?l
ziz^k*ny&&Fk(;Yq1jx;4#ZX}JHU7I5SfJG_F`D#$q<aBI5}A}9(P5DaTCLwKCy;g?
zH22{`9N>S4IREV@J-Y;_2Z4FHJc8(l<spV?=*gv{M-*!8rROBmIbIwoP3!tT?GL_F
zNo!^*X6}4cZUOLf!uP$pX5V2Y@a}<t*s^37z}?g+{%qxkzFy@Meoa`k?4a-c8AHde
zTVUNYN#--tN8DQ(yH7oTK0=!2hDnoX?CUIrqR=jAT|t7+`=zD!HZ~+lw%EU**U!|}
z0w2b<w6)DnO--db2!+Dx>gugqw~mjG+uPf_)U9@NgTum}6*Ap>dV12|ctaE#8qf-g
zL?V;P^i}@s>}+9S;q>(M=D+axd_D*^Ha9od*W<alPaZz3aM~mi{qfZG#Kgo=)VuP_
z)^xVy#|IDkhlbqOuKmL6{=~$gBS$(;pYH5Um&qn)W`qvamoG<Ue(vn-JSey=zuMoQ
zlA4N7jErnksXlQX%+Jq{@O*mw%o(ZCGB0oT?Af!8jiB%Owzl_6O3HeC{QWoAU5)I!
zawT4;Yxc9*$l>hH&ws^aV{2PpdwFOmPoY@l|4p|~GZI{Ocwk`Q8?^QdJw^47oRa#J
zo~5Isnf)a#ei~G(g=B`e-r5@-;OAH0-rnBQ!Ve4Ec69XaUF<~r#fwvulTMLJrP8Wv
zWMt%WSJzGS<jIrWw+d)ADk@yOs+uhS85|Jp>z<l=qqun02P@b?u1t8Z#RbCguQzYX
z(3iH&orYbn^z|j(OR9S@IXQU{U1M!=<<97+rG>?(uZ^!Q`9Qek?wvb-hQgRmZZE(5
zE^Ut+WmSAP-Y@LOe|`Hc4~93h$HvBFGMUE{WZl74`{w56j8=X4dRN!mJ1ura6<xS+
zVP;0JyHr)>R(iX;*KufM#6|p`$BCMn$N(?KCPQ|1%+|PeRY+@7Q`t&kxH|}f$*CzR
zJ_U|@3eUH;#<bIEj4iILtlYn+u5N=vO?P+P>VNd~RK&iQ(t7S(w^!#Q!Et`A=ifUU
zTCU6P@y@siy^hw_8kyGC)?(+)5=nbUhr+vv)AetY#LCZDyS}-(Z*SS#Upme@I5^nd
zJldyB-|k)1Y1L8FKo?F?5pz7zbM<QD>EkBL4&|C3qOD5Y-QBNUx^$^@5B^<K@rufd
zia77E;L<%_Ugg(Md{@6irLwKrCxjkOPfxDTi+ldqQePXNknr*Odg;lAhTXe%eGc}s
z3ET_Lwu+31VE7%bu8yve+`4h&#<{$M;peTHC+=<X@Gu@r;nqKOw0iSU(veR8w2c>6
zeA;WYsCtLhUewA=U_Wr}RL~;F3_GxOcEF>@kCSfa@7Pf=)N}yc%WO@T)UQ1ddMNeU
zlds-B;De&5ho@)RwsK;4c=+74^zWMr_Iy@U6!DUO<f-fSwzk&>1}e(SS;Wzlr|o0w
zES;R3_V3^S<cwkcCy%nCt`;0TF7+3<*?nzH9{ke=(Zo0?8h3rCv9a+@&fi9l)!79-
b?Rd0mLt_MWZ1Q7A^Y2f5Orp3UYP<120HT}I

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_archive_section@3x.png b/Telegram/Resources/icons/menu/stories_archive_section@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6369c74cd52818298a5dcf01c0280391ccde761
GIT binary patch
literal 2952
zcmbVO2~-o;8V)`{1kox|u(E`>fJ^p-kdZ|sNKhk70z?bNAu}N%kcmlvB%&xNi-H2B
zE>%#Z;!y;Ja}=uxNCN^Xh;0?csI?aQEC{F=K(KuiL{8h|dp)l?XEJy0eE0j;?@zLW
zHw9Q*eqxEiV5|e#tWfmMHeMDp(C_YpOFlwxvt;be3Jk`|#(0@vzC3P^!I%z+d3+_G
zvk?#=2?P*AVqk(QL589+7*8LS3=~LUB{l|*6-&KvgV*YDSTW><i=cBz9GM?160<dO
zn5)^u6KEs?CWQ0x#(Js%lpq0Cf>>2Tyi@_Gyl|7e0J=7A6LHu{h*IK(^EDd8@;Sj+
zKST~=nFKOkKq8T`3?>2efM^UlbrqIEqELw>Dv?6PlRN;rJ3wV%r#?8;oE#DYp{#XN
z#?U7(oJgsZ0YqYQaxx*AN<ieXL^6}fB$6mZ3I&fM@Cvn5399f?#p3r2ELb6si)BhN
zBE=dR!5Ab_>4igGeHTN5Y?@Z8n938HF`^2T5y=FSF{Vi%B$&p@66Nue#vuU_j)xOq
zsZxPr$<tVw2vH&m5%OQCr(gfc0GeA4XWGUGeMv}|Hla}ZC!t|XCFFx>1y3!5iJ`Cp
zNt6p<|0LAS#l~o4fS()&m57{&Ao1@j75v_1EQLmJ$GSy`r4W*=SpJ6tFbh<|UN~db
z@FaIUmBb@c02&3LP*;*@0EzSt%0VEpQ2jwD6`+&<1VwuW0+rz3f*}DQMC1t|8n8G4
zjD?9ZX)F#qokqY9iAUt9VbnY7q!%0x5GYkBL8$-^WO?Dxm<eJr1d!<<iSEvX@e~Gy
zhNs2QAUu=GbjLI39t<c(K#oBd@6WRkL87s;@6SX3=lLMH7?l<n|Brc$f-|-Rz!ode
zVyUMT!G*U?t>VSl$u0mufw8;2Z~|jlVF)+1E&j(Dct@Kof>F}{QSNsz1tL@?gL2q6
z7R}b*wi6L`o@mtJyEuq{4RP|_A2j<Ojt&Cja(V=z57R>omZFnOj*h4t>dg@h#(Yg6
z%a<p5^n8oNtr)Rqxa&&V#r6rWe7_6+`N+KH489vjM{;q=Jn}SU%qGUYbVuiw7rE_O
zZ2sjt2in2xd-BNq+~dmxlF{G0xyi|cL*9c5RrIf8J37bf9*tkU@OWH5lK8f=ukOwd
zOW1i>-!#)%Gkv+-@7vninwolE_UKGZOq`sY3<g74Sy@0qPHrwIE-r4v2Ax)`J>ip@
zG}74J-F@?*b9s5WpP%3B;o&)SXNBTbT3T9FRaKPPi}8`c%a<<?4Gld-L4@_Atva2K
z!C)khfhj2yZ(jG^JmARnI{mq8kPwFPc>LSG9)lq%IyyQkDr)D>osp3ap3Ud3sb2}@
za=E|1nbYlwiHYK2lI5b%FV5>9K8zI#A$_Alf*=PE9%PWoOqEA*PI<XREPmF~(o#PR
z06<Po4zFPa0B9tV{YkJ|J!W|R0Nr*tzxmTo8Sd@_{r#QhXUfX@`}+$60;8fFSMM`m
zW)D8PUVh=it?#Q#OP{{_<(632*VhMv;QDUfJ*Qzk^0>|`^|#txTvKy%0)a4pT$PhN
zpr2P{pJvj2uCC6BXLh2gu`xy@$|`mvlS5eH&z?O~cIsMN=OKjtJF&NlZ-3o!^JYNd
zQ8XCQ!fkzb@l_Es8+%Iw4z}d5R~$NYXvVE=Pa4gD%@6BSqnW!cxBT3+-wyh$<r6e1
zF0LYx2zz(CMnj{~3P0XsJ$v>^c1wR#Q&ZZ}B$*7mP^i&-nackquV?4P=napHRaKx+
zxGd*kWhLQdx<89`(P8hIFZ1(v*ABn#>x#JW+0vy;U#L4eVQnT_AFGD82M><%9qjG5
zo(-<D@lF}VmKMAjAHP+!`ewT|9$#_){^sU6G4?AK*J(eiO9}M6rg^<W7jo&+rR|pb
z!N>K{SC!evT+za7H*vW(kGHau><-!JLeLIbLdO1HtA5qnbs<{oTARV@UDlJ4nVCHg
z?U@1X%a<>+{M@|mmG7jipi*s4crcmyd$lLa$};>m&&ubl`s%B%WUhucuO+y9KOb^2
zy>a6Pq^T8p)9CaaBLj}@6*V<>C6O+vc_&+k1_q?`j`1&6xv*v!{x!0s*+R7NEc%-&
zmPpF;A|N_$KoS@CGB?xA%xof?yk^eH(+e#>&&&JB(42p=m49AM(B`SH9Q8P2FY9Tu
z<(*c7p?rSJcUKM{wp(~4FRx)QKP=3aToP<iup#F@zO=M-xH{#{@bbp9kx!eOn;|v~
zFSUzlZ*Tv0^v<2Iz2?;}=Es4=bJwpI^=4=rgb&VFRJ>>tTC8R{@AJ(G<iIdYW7K{j
zIibw+Fkd&nXkHcz*ZgC1?joPm-=N<Y7c^MR?MbmM|4Db4*uVN%dV2cIAN=>tPxr_;
z57zhFVlx_9w<{|$Gc&Q;VAI=0XGaDfTh%Ub_Ea?#hb1On!ftr+Q`3Isyjf_IS~`1%
za=9a`9b6jhhUmVAdzU0#?6DU9rVSfxR_ec*%ijH#|0FuzFndvqn?p@aO>0+pc=*KI
zw@sW*RQQzj$4$Jo^`im)?BJ{EGg5w=xZl>ceqlkIUO(~unV@04YX97^%<a5Rw{OI{
zqN1WRK_|kCE!NRot1-j{ahm4=vwenYkjJ8MTU*<f+xoUcXfGast-jNxrk03ombtlQ
zZ44@0{VVV4fk%41QLdXyTCLsP-Jv&k?}qat=Q?{A-mmQF=r|W|E&C?h#<jP%*I-q_
zzJUrUY#TL`dg|0E1JpF8TsLZ16x-sUMkRSl-V<-Vw6?*T>%D6ZYfno@M|1SQ`~A9p
z3dgfN3xi!)KI;mWKSJeKDC<3ylkPLa(Xl8ydsdm%U|-)#r<Fa9cPKK2qSVSdOG%bm
zEFYIeJs;eizR{+nqJraMyVCC5*K<tP=sE*-H#9b`4G;fV?iQpwSKF`_`ZOdY|6A*l
zu`%_6F8!XSk}Gmnx#}vH6Zgb5sCZ4%ai(IOv{R9oh+n>(8F^T1-!Q&?WFWut$NH`}
z!K)&|!g_jpo3+}lA&$9{9j3v3bUK}K_{jl-|Hh-$^%pOG6gKPOX=ZmsEWGRb?rO9B
zGL1&#QxNd1`c?7P$}@}EYsySbO;s9=)04hu^WTkg%8-xCi(`xTbk-REVPgXQH?b<$
HZcY0S{h81^

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_save.png b/Telegram/Resources/icons/menu/stories_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..68d2a12f43ea6df9c2eed221de4d6bf723cfa913
GIT binary patch
literal 729
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfyvp^#WBP}
z@NS5I$IC#Gc@rxuT3wWsv$+?#OjO#qahAPy>a{gfY*QDmaP*qEX<I<pHhnRTuBmF>
zfy)-&$e4BVv--z<cV0e!{_~}8{^wVBua@t7Kd1Qo-sg9!3qRgpce+?zn1dy6`|YHS
zC!T%^(F$FE{d}d+yi%=Vi#Y)rCUX7q^70eky?mKzB6ZMLYwEQu)9I&6r4Ai9u={2X
zA6xV7+qX}jUR)Ka6Q&{*xi&0p^;E@4euX>ll<n@#byX6ayF9tm<<o7plCQ##b^g}H
zYls+S#4lgBe*N^*OAkL>;FMw{>5;_r;F{*iyzPq%PT4RWOxSSytq|AI=S4f;mhHa%
zw(gBM!<ig2?{lrTX0v<a)-Ml|+4Zc%N_#4o;Jf$l-@kjeC2DQd+JD>P8LZ~^efTib
zN9|!j#ooB!PQC@#U)$Q)2v|?_5b1Vp+W%hs;L;$?nLct!87~3^`;SNKh`Cf%RvJq1
zgolS4)V~vFn0?kvs`vc)^IHnkZe*A+H8KSLsIhA^n0)erY#_IXM~lf!AFkG>cON=0
zzbx4qvyA1=iQm7gZRFH_Or-w)_~GC><#2(;mkOIHl?-OHdD|VVHMpwJrERXU>*w3I
zckj%zX<mo!CLcL}PB$)XVZeetj3!dP%P${{SkPP|=iCre@{HqfwcY&RfBz|ed*3sA
zw)B~D9WiHNf8&m$NhJ))wOWP-Kbk-MijR-~c&%}&mulgm??!X|qSsFITAIX>yu{#)
z-Td`YYah9NwAd4;U+Ap;|IZgmW2HCV|Jjm1*sIkuityiD+0b}c36!inUHx3vIVCg!
E02IwMNdN!<

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_save@2x.png b/Telegram/Resources/icons/menu/stories_save@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..327054159704b82183b222c48723f6fbe254f219
GIT binary patch
literal 1408
zcmV-`1%LX9P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG>PbXFR9Fe^SXn4;Q4}`Mga_ef
z9z!xjbft_%8A9SkhEmF#SIO`oL&idp;sFolcrj#nP{s#ShGfc^v4l(9`(@vD$3Evj
z{^`0e|9SY^d#!JMYn^rWS!<nNO-*&FGN8)9zs-QUBJ|eQ);~Tj3k!?!@$voreMQ*h
zv{hGE4-O8lsHoW4+4;@6R##W$WK_f~EG%q!d6^T&-{sTOQ(0LVm)X$Ju(r0gprAlo
zTbnCa+S=CEc4TCPhH`&@-__NXmX_w@<Adjgv@xFI<Kqc<b8|B^G?dXQx(x~nIzK-r
z4vvnFGBPrBbacc?b#--zhK7jA`}=!#cD6WP1})NnCj#o%*Vn?rLVbOG>5WrTQcg}z
zVB65pAib3s5{CwHfbsVBHZn3&3@SlqWMmW_9sOlSC0KtJJ2*I8U0op>JTG^5_s`02
z-)U%QtgNgcnwOWCkdTmX_s?^fnVE@baOLIY@s!^#z&mnyc!+2g7Z;W5JS!^;%yDsX
zve6<dAKCdG5fLG1iQ|=!kPs6S<Lc_l1-QAn#m2@aCMG&MI&$T7-Pzd*=C!poDv@e2
zIXMZlxw$z$+RV(Xudk1UOMa)Pr+<E2Sa9Wl0n9L@r>7H)zrR1DlDIWBH6^b)3O@rf
zFfhQ)alMlDuaAo_2N)(?5|pvKyE`Cds7$DYgxbZ$h0BF?Wo0E%H8(fg+uK`NS>@*D
zUR+!dAr{zLT3XuK*#SU=Fkwj0<Dly3=wRd$w`h|vK!s%xnwpw7H#blX3=D8pI4%bV
z2beu@u()!-0EP(+xpF-{y`-chV`F2kP;A}S)&`>a`FRH9<m3c7uH@uoM&;@0>EYqQ
z2mvE_7&0o6trlO0u?xbpvol6TZ}jo;kx^}IY%mgRaaM@%?d^@Pl_b&ND{!bGq;wQ;
ze0==;{EV%yuP+sfEXdS>LVtRCDgygjH8?nkRF961@}Wcp2P9}dfJ)5G%`Y!6!PC>z
zLxplK$P0o-#<vd$2*7XyH~szn{Gp8Eq3Z4J1q|T8z(6XOb5T@O1g`7rYeARQ)z#4A
zs;jG$<bYO(#>PfI#>U2GYHBJ!KcBA>mZ0_%m&gYnfysteWPXhSzP!Agn9t122#!H5
zEiC}7udnmTg(c{$4-XHpVdi#<#sMOe2{0(QG?7@;)YOn@mX?<IeFF@5Rms_EYHFf{
zUoS|v+S=N}R3wPTnZ+PLe4}4#X=%YzdwaWhG@uF(4<{JRqJqrALR!->&kG~e)J#lF
z@K6Z*#Kgqd*ce&Q&dx$5$qLgxU?_65s!2kAk|X)ZIV{l=1kV9MqY04yKtjRq@bIws
zR{+@1v;F-1KKYYo6BQLj+=#qQ;K7X+7Z+pbMrSQ8Eyc5whFneziVcYg<E)$%$~8kn
z#&;)TLdTGK=u~bfl+D@M8DC_G2@R4zuThxD0^emAlDxgWMKH3d&`Qx($+N=|Mu^he
zBd>dVd$2{OrMLPTiOFzbVS&Vi?p<GB&!2u67995O?rvg&UmSb}py(Dab4f`Fso=!T
z_V#vFRaH(-4!%9Syu26(7^(<tcXt=Ph|wx-i&V9?w&IM_Tc-<5CX5?=VBqwKlraV`
z{}yjwYHBK;2nsHlMi3SnxcrPtv_vJuIDwC>fAvq95@S_SsWR|?GVliyLs;TDjFTJy
O0000<MNUMnLSTaNXMhj@

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_save@3x.png b/Telegram/Resources/icons/menu/stories_save@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e97dac0abd2bce4a30d6e3f66ef1d63ade31d358
GIT binary patch
literal 2128
zcmV-W2(R~vP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?x=BPqRA>e5nt6ziT@=S>?1mR1
z`#Pj-iHt}{QMN1@4W+zDwrp9_Xe6>EBwMlzkwKI-dnmi?`!bVdG}-s{eLuOc)AcO(
zd7k<Ge#7)Wzkhz`x%Yd{J?Adxo^zfjE-w6qGZ4-|I0NAfgfkG%z#lgQ@wuSUUq60D
zix$nu$oTs8Yc7l!t08LFu0440;Pva*pF4N%&6_v>{QTX%eY<SgvauR9c5<s!sgjzS
zdgI28pN2U6_v_a$b_zsaGV8E#;lj_KKRcMBH36t!zrKC=`1p7XPD@LxTD7XZ_xH3E
zDN<zO#EGw7z0&mmkNo!S+qG-gwr$%sckbNDlP8ZFHL5{_298<|7%)Kbuy4nV8IwPM
zen(jDHMVQlE;BRJV$!EipLXxwJ!sIN^5x6>RAu(;*}9Mm7cMkw*32hw^kGAX4*l}w
zi>}bqr%#6uA6}wFiJ*hks8Qq2ojbZHR-5A*R8FLLw#tG93v@l+zkfe{`gFW{jzuRV
zB+QyMOFyO1g$fnQvB1ELXs~zhUfrtw`}gAy0}FCu;1C`^eq0IXZosKHp<>gvapOka
zswGR76ev(2ibG*cN=nL<DO0LfuO3CQ9-?r7VihsOh!G<^81h7Sr%s(X(_&cf-o5jL
z+8#<KCMLdo`BJRHRd_JumF~@(H;Yv}ckaxWFJE5K+@xpIrcJ+p|E>(<!pXr+Ws?3I
z`*7&8T*=AFzeSUA<HivH?Ao=fSg~T!QGmEftU7)AbaaFUlv1ixDe+t5$B*~J?R^6t
zI&`RQ+qOy;MjkwP&@7kus6&SiHEY%+ZXl98di3b|^XDxr?Cmyf+ElAnjqu{$y?fmF
z_wV1gVD!g=1q(iV_Dn@K1lEozf{yp52`S`s9X@>6%m8@PrcHvEbtXgW)2EN(g}8b1
zrgSL+78uRp%gU82g)1p3$*hTYFY7MiNQw;%jT<+9{P?ke?Zo!&+js2PVQ-ff*b(A3
zMC;bA1-WR^A~%@dc5xd_YURq6-PkHrsF0nVEd%G6KnS87M<LX@d-txA%(jduK8BgF
zUCBCo_N?Q0s!?AGCZ3#<eMPX>v13PaGmD+f5zdWs$Qfg@Mvfe*FEygv1|nM(QT~%X
z2Wf0&5rj|&#E+&rb?ON0#fumAlg+sz`&1YRId38m78pec0;NkQC_r4lejV8A)vNXP
zz;xffePyt&UAwyR6Nw9~XV0FFu=efS;{f^LR~-Rdk0Jztju;w=c*>M1<JRl9ed^Sy
zG8hipjcv=8Eeb~E!%(jH`^V2s2#l{^zgBV(=mzuOZc3%fl`AKLo;-OXw1ucxv7&0>
z*5Vqq^vdI!HEV>n6EHq}_^@u>x^(H|+L1n6OtGw_`W$z{88?YU{i;jwZb);x*pro&
zWk&kxH5o<~K#AaF8%om>G~fm+RjTA?R6B;XlEd@p(IYz`Xp70Pj~_oOaV1NZG?X9q
z?Aaru4jVR1=s?7fAwvYeZ{I$lV?r!nzFeG#>=XM))J)kt3i<BcI|}!9jJbv7lKX%c
z7g0&}Oe@9(FA9l=kQO0W*qJkDsz-M3h7B7qReC*%!i5WSFG(apxWtk6<cbI|aNs~$
zF=7aVER?%^`LckiWEr-uMGg}oj90H-C6KoO^he%Bkrt4}=#7EtR;^mekfTSBHuE=Z
z*pQ_Y{Nlxn&3M&IkyKdNjm?`kH*itsyL9Oicy@k7Ar<ahir5DZ954*2y88F;FIqy(
zn>WwQGHu#49S^%1->q9W!T0Lb%MAADJ$dq^l0`IxZ}dRN#aVRaz_{&6%Zms(rG_DR
zlPHE!H8UW+yC}1XET4tM`Sa%s3&g5bt1NLAPH*Ybr8>q>e#J4CmsPwd^;X@C;N*w~
zRN%~D>9yF#D>Bqlz4!)_WswO1SQrfiQMhnXkTxLwc3r%9QAs46t5>g{Pd3Y*q;SHC
zrNG4HEBZmqm@&hrK)p0jt5z+aTqYPVQAHKfdlU56J_=^sNWx1hg*TT+hzS!W{K{c^
zTDx|w;yrWbj0xwzk0WvA$`w(lMT-{xdC647uZjc+B2O+!|8hVQh?0y`^J>(nQ6NSW
zSl{2gzp^+36K7mpmo8n1vvjLIeE874dv`Ne?)9EHaYB@vGiOeqfpN_^9&S}~ACkx%
z1e1Y=3kGHfvVX)jss_RM|70{DDu`ihCquE|PqxBYH*rl^NbFBM>Ws^Ct>h!8PMwl<
zBhCuy-29l#B~JWZx^!tj;HY6Jaaz8~z?YbFjX+~l%v4`vQ5DYZFOVos9654C)(zs;
zty?{M^ax~t9ZWrR*|KHwx(KnJ@xEP1q%ADbiWMt#+n|pfJ7!L(45Jd?Jb(UN7f1z(
zOWD8@!>+Mo$8yYcZJ-HL2o#$%Y2triY94y<g%Hvuw?emnu@ND;ZPU}!Ew-u02M->s
zTeoh~q)8O(J9qBfvSrKS#fv)*#?2uTxWw6kZdsfodkh=7zV*;Vw6qYsRdFjkQm?0K
z!UuqU(%BeV;wYLgT()lADupzQRqBzj*pW96G;;s&F%<rdJjD{)zkT~Q*8)ZFm+O(t
zCC-zikeVb}CYL)dffpB%2n>0{83<<}oPlr#!WsB~%)q}(a#YeK$b41+0000<MNUMn
GLSTZXp!?bY

literal 0
HcmV?d00001

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

literal 1935
zcmbVN3ry5z96u4A!jKtaU~04}qKMwL_vEg69*jE$-62B~Krm9;@9rvh*Rw6&LnqE?
zHW`b17%@(VY;lQ;GB;!>Xg~#2Hs4G^nat@qVo+ibO*G)X!g0|>XJ(VOU)$gJ`~BbD
zl99eBB5ZP)L?VeuOEqS~dyIIF3xQX5(honv+jv)ME-#UUM~UYs$<AF65qh7=$`NwR
z?-La3kdZW72xK0I3!){G`38@Rq>6xm6ap*b)T6!i4Jg9UdNf;Y#?7u2U}I8!99ZT{
z&!T)ql#WIX3y}F90unfYKq4N8-N_RkJvzioz_s`qLy;kfP^3qbML{IToPngU96)q3
zxs<|jIg+T8ky=`ns8-HJ6u3f(;Yv)Ql;T=Kts#_&NZ>%B97kJ-Oyk0U7<|&BHbHO^
z80L1nWp1U6<*b-or_*7$0#hiY5FzEgPJ#4DoqX&FgAwo)$G8NBbs{1oS;!U(dK8*E
z?1RG<q;>LvIKhZv9@2%$Ww_|m5Rj&VI9D-e9}=f24A_AKI0YVJ<w2~=#tJNNV_!iX
z{QQCdjIG%m)Oe{a4o6Ue7ffrQ8-akl6wPOOT>#4jJX_3Bz_bRM87q3@B2qX&3M`k!
zvi6ZoWsI1NC{!{H5}(aDY1Ylper^LWk^<19V%DU%MykZK<O)KiA>^7lxQf8>VW^p<
z8H@K7P=)pdD6AQp6v)?tX^OD0oP&f8GY--UFqhMcBEc{cDXg94pfI#fIb?;|Or$w^
zfpk(J&8SDA&oYLg2})(r=zvZmRV8W@r7F3~BGt)Na;aQSYk)?fRO<>ABm0dkRV-$9
zWIz2s_b=rb*jl9hjd{d|6H9_fWq6n@Z=fTVfz^SPok51GfFLQcy7ed}rWMd=;5GBc
z5g4X*+W;i}k8}^ic-A7gNe(1iVYFUbP8c*E6Z>%35A5GA4t;yBXGh?05Qxj*2!ap6
zAqJdqa&d4(S<C*MFOh^SN;4*BX(v(zF^Z(z+#`n%doF%!s(1JPQd2XgG&ME#bZhIE
z1)J*Xp0s>6<=L}mC69VKwnWX^zJ2@R#fw9l^Oi4PKk!8DzMnsB+O!kjZ`!>1!>5lN
zXLqVsty*QvEGsLktgKx7sAtqQW8=2&?(Pah$;`O8iH9P)7ka(k9?s|UCDk^aIu&(m
zprxe+s&X7x_{H^_qG;T9F*G6~!hicVJ}EprykY%7T~*bD6(`!;V`4tH`8HII4jUXC
zm|`>F8!jBuYPE;!>%W`Q*4g=XnMIYnXY{P4-`H6;^3b|J>WYn~D>sg<os*DoA+&sM
z?xm|&-=gE=<MWSt9$ebHq_nj3bQrwsKXBlKhxrZb^)qLVEl*BrJbU)ontRvsYMnnF
zJlHtN-tlvsQW<4BfA4zj$&)7^#Ds?S_xDd<u&w}r&7bbiKcYxXj5eLGO!+u0Jbd-L
zP0h_Uh0Uez-W$4k^J3>*XlvUv!xt(Un}DmS$!%R-k-x3{``qq&Uw;Drc;W<mbaeUo
z3PWFCUu^gtzh7T6I5h@*t#SP2_nR&kTCL?36<eL}L`7Zp|5~1xmnT<7<6RPPv8}qg
zx~tyJ-fi2LGu40d=7U?OA|G})?XK-=D8W#4<BG{S8ApBnt(~2__9Q1or!84>Yunf-
zd#kJao<8nvY&vuN_(%Java{X&cYoh8d&0bNVPPS6ddjht=XU9o8qJk6XU5wM8B=r8
z2M3-;@5oT8RG&y^bhNi`s61%zP!#MR{ngfn2Ez<>Zf<VG?$!{=^tkT!F?RnA@t2uq
LN;g)$SFrIP<9Nc5

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

literal 2521
zcmbVO2~-nj9*>H0xN%i1CBiOY)RhWJCMPgWbTL7Wbp$nXxo*udftX|_Bm)T%+GjX~
zbVWghRiV$KrLG0kS`>6ww~4kKUSJh;mAX_^+=}7>5-sc(uGj8sw{QEsH~GGq`ThU@
z-~XHx#jlE@dd>HuP$<-xXvrF|!>-F?D){Z(h+hGlr#?E_NTJO1c3o2_dn<e?6t_OL
zG>J??S0V~R$CN1vImR^W^Z-qv2$z}lGKB^s>2fSpjf<eir_VxkwNeBn@=+Moi?K9y
zw8em}wXBjVEE+|)5?Z#DE;J)Rfes^ObhA#28xgYz8r6${v+FSnqK`sIjR=Zx8Kftn
z@pLg^!06#jHbVi!Y<g%oQx>M=h4Q%}bPmknvS2QY!)3r>2w#A3L+RrS0_F@#6|zRM
zV%!+G6G3StsYh5WlgY$1ahZf6mBkJZ4`;y~7Kg(C2!=5WCuL>^Zd@>-L4p|-2DP44
z6FA+aQ6?ucND&06j`^U|PpZX@<8cBJW0_@o7MlsXd>RER6_Yr9hCw@OT&ZATT1<!G
zq!D1*lURKkK@!F^;wMy3zW#v$5L*<TwDF@{bh=3sMlv!JxG^4(A4MCbS$d4M1~U>F
z1_c(G31}{Gd80?f224g01}Q;kCo&a3L7C3sF$MIXL^ZA?OvbmqCxA(0BqoAfS!2Kg
z1{apHIS5aHum!;|4}sw^C`u^Rs;r-Y^7uc1f|^mvNZHSVl?p^f7<4k=uv#Ze#aMbg
z6{1gu5fKww!T<~dcHB`GD2l}3MpA|=uo#I50zNa<Y9+#E!+d@i#%IXG_$r2+$CER{
z*aAL-s|*Vls1))r6;ClCFCi2euFOuzEB{aVID;CrmQ4GL^|%_&RT4<F+6a=BHQo_x
zvGnniR!twR0z{^8RksLIxYCL#q4CG+UmSrkwWc%-DE%Ml9)lSP6={+gu!vL;t)DF?
z79h`Z_2HNwtp9d#^xgM*b^;Ctf$KOqg22t>5W{dVxeQ=L)xY#*fyq}ABZ-hEIUXe?
z2kB(<1eZCjLRDdLQ*L8k9_OHWhmc+x2sv{1K+wX-d!;MS?|h3EV2;0=|Erh}7mCB~
zZ9dy~>d`sTt8c&2HvanhRoa>QVPa&&+2OoiRx)%f;1%;~TU-B=CxykumztV_f`h$1
z+`e`=>~<(PScBtzLqkIye(N`E$eH;Eu;Stp6B9?4FA)d?xw*M#mv%ZFj=nzJVBq9F
z9~h`Ud+E|8o6W}K^Rud}YHM$Ib{6KV_mr2HpFe-TqQW1@=H%ogC*Lrcr%lVPto%(u
z|Ikq5>C<l$T7Q54zdQhQaNW9fNpUshHe0Mpb+4^$PIy9M;xotZf`T4&cU!HQCeyyX
zdt>j`9Xz;e*RH(Vd=9633o4PEyL#38kVn3~p`n2|a}AK_=;+vJv{)YY_BJPW0;ttG
zH8L`?`4*Xxk)HmKdjkVLds^T0(`YovccrCsn}zN(W;AgHg0e3+0J6)3LP_VVSDV4A
z!@)Xo<cMCAmUc(vZFe|&SFcWKbgo3v)%{o6+vQQtp`mNnuO}oVRPprpc?c3)k)54=
z?!Xj?#Bt`^bMs3Ca|d3&EL`z<$&R9;=B}=;o}Q0tYirG<(a7DMEfoyZd~B!Qy?Bw@
zwuvC_n{%YYzKfmi?(WiQH)O-Z!xB3PT}#U*g(CM1lfj_PpZ~Nhy>M0ffvT#`lEA>g
zJYHz%mx<(yl9D;j>4SwQW4H8)Z?CV>nxi}leAcI=#3tuIe8by&!HG{cHeR_BFNjA`
zs{PU9$M1hMTr!*XeE!Zg4LJe%6vZLEbVq0DUr(NVbAL}yPn>s^@ncC|{fQGc8>KSF
zH_fl4^}>Y<6t++pLJjnlw7-5WoU$Jtp-r(CQ!Ew>RQ`DvrLCi5@uI+_%uK<Q_`wm+
z!tL7^Q~p_du8YDJi5S#CUX9afahf)7ULO&$MKpEatpkS}>g!*qmq!;iH^&rgtE{X%
z<k8a70(KNdwXO4fe4yD2yYG91BZ$@QyICpP8%xx|J{eC!^6Yl|l@A_7`O{_<Z?zvf
zeAtV&y)Y=<-!nNSrCamvyGvKhIUMZi>6!g-cYlBSxef2Ule!grR@p7@X|;b|8W0em
zDC_yu3s2DNk5*JvnA7BPD01+{3oMEm67siwfBZ1G;ppnMYY#}hKhY0Y_3!`vk(!#L
z3j)86KUP;)2T$La^v#mRN@YuHYcCBhH5#H(bkWwPrs%FkA%^1id5`k{&E3DNt?Yw}
zifDvp<A3#AOUh?5&s$TcP3!IX;^xiygU9d4zhb7QrY;)DQ&vZTj9N4Q_5SRKJ_Q;o
zb=&2z!ROCm`>xiR1+37|{8aM1P0yY_b>3>-dFs@ulf?Fe_1)ca)vYc5cX+2?v$@>k
z#l^E)A|-d8)xUwe*{ED=#AWftql2p&Jo1-UYX=4gpJiu9J8U+uLnaj!7H53nd$YaW
z`ll7>wqr#_p4C=&H@EC{2{b=H@hLH!lYRAN-KR6%tS3$gnr+*7GkSKHmv>ydHvRVT
l#>OH%7cF%SjDT-L-JqJeYu5jLyX((aOynv_-SUmr{{S3>=r#ZV

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

literal 3136
zcmbVO2~-o;8V+DU5y2`_5YQMvWXVES2n3!53K3b$5<roV3`q>hq{#pQ1S{AEMG$2d
zl%-{J305oM!;QKHrR=3FBBw4?<Ozx(MG-qe<h1X!ujh5nnYnl7e)nI$|DSun&&Okx
z_Ihmu0<ntW=@tNwo~nDfI{X|sY`z*ER){@Ar3l2zwW?bUaje7;fmk-q4`f12@9i`;
zD8#ZjU=)Cr3B@oPfpBt>iCJs`0HLA)E?-1PPc&Ucqxc*;I)v<v_ZGVXJice51o$k`
zCy<>eU^{ToF3u<?84VU71RxelCX5kDX)-!`K`srRt3Kn<s09clprf~{6rz~kekfN^
z0-zkQb{IAuZ-=5fU|IGY5|vD}MG^1>A`VZ)5r`PPJ&jDE5vi!f3k|E2aH44eZl5kH
zgWu?A9t4SLI9z;uJT{()1tnaZor8k|4o|=l2pAZFktT>BmJB13nthPq21wZwz8K<z
zB9uxZD+-K-=xEr~_dW>4OJYUR#W=wc!^v1;oE;Xg@@WCcVK3ptv67et<s3E+hyjFv
z2$I5ByCtlc2ST8f2mXcVrR6^;fMe_Jy`<w$Z4nBWR7fHBIM|KFfcz<18kiskZ~=f6
zjFqqf_c+*0GnF@DnyUn0L7*fM1Y<sA%I|~8C;|yfL2U`)i#TAs)arK|05=u{(9x=_
zVek|T5g%wrpphsvJBkgSM8o6XL%l%`KRV$rphWT?pfG1REQs~DU=EuW4N8P8*kQhq
z#RYI;5f_bG3M0)Gi~%LEV%R$3f)(E0G=@kDu|#Zu;YLTpK4bZO4viG;V8<cDwmT5*
z2pBs8iHwONvj7a9NQ60QPr~B?;KP15kR7Ya?1%lF|8u{ugb$Y%E9M`|Q5Bqu5;RY~
z6i!ycVnuuge7-n~;iDE<Kx460?53mHs<Z+e^x|j!KaRkAvGF_r7WzNZ{T?O-qoH_~
z1lY=jqxH9R!okMlRCV~?58QvdxUlxSn*9KW8-Z%N)Pmrbr6vZ5;Lat1TNJ6?JO+W#
z{FULhHIR4zSy+N+NcigB9$T;QN)lDy%G!%$fw%5@Add`->ieX;a$j!ca_ikl3(q54
zcYlOLYKzJ}S02bW+~;mlA6fr%Fw6L2IClEV%sAWrUg_P-zeG$VJEy#qm)T249Jy_+
zRH>q<h_O9tO-`Yk&9~>yO-@Zs&CKZO=;-L`Mx2do*4I1_jdnFQHg<J&RaI4$mzTR7
zf*`1GaM0JzNuf}Tj*f!&FU=Aa`}glp*I%W1{XDmQeE8~BaM)QO7<;$+o1jy{dAYfV
z4jq~+@*Ef(%>4Sro0*9zy<J!Kv?!H@WI=vgc1cMIVsvI=_?F>Ua(Ss!!qL*w()|4T
zz3=8t9pjcEk^TMs2W**4=G3cK2O*b~IYU!Zp-80AFh6}PJG-O1+ibG-)TyyMc{b@(
zwhp^xe5eV&G8;BKI))1ZDHO_2b-O;E?Hm|bziu5_I<j3it?x@SkE~0{Z}Q2%j&@sm
z`(r}SJsRz<KCN~9`0<vO7GiX(AJ2$oWNe(#YE|fND3IT2Z`U(sWQ&{HN?qzivF9#a
zKwc^=G<@u65kwIV^b8OC*1UfG`upqGtDWTH_;~KiNx9y}J$v?4Ii2i3&%L^5_NX5{
zWv;Ked8?OJ@9EI)zP@yV;YS~pM@QpuILkog&X*%Ubj!E`f#Ay@wKO$@PczH2I@enI
zthUxKd3?7(u#pfH6!gf|)%E(+Xm?)N)Z`=@ong`#I~Kfi{QK9_W1%T&mxD2ysM}el
z-7ik0b(~#c^f-68w_Z4?>}`sl=-4s3JZ64wwoLh`{l`-wv%*bpj+85vo)@30sj0cU
zyYo0=o5{&Z6I0W5QG@5Xdb2Obe!{h7Y8qMEOixcsF2-%!cChA%T87r`ko0G5#~o8I
z<mVgstbO94tj2`bE9s}c9XOw3>1#deVSwEsd-1@1nfkf)hv!Qiq<(hGLOOz5f^fFB
z=H~6CE*^VtMxCmuL2T;zrK-Zq(xt;s8C0#N=J#_5bfbcz<)mritrdwxA_JQYFk$8)
zZwDK|RNC{^$qp%V_Td@VoHR5vE@*0Ic>yO}hYSl*@G@6RZOdCY+P%7Y#l^;FlE?2k
ztlPIDr*vc_nqupp;IL&)SZqfb?DgFaJ42oCo+@@W^&mHM>W>{;Z!nmqrN==!sW&MU
zJ{@_@GY=m=<TIvLp43QVhJ{5miuc{@?d{!sx%uVu=ct>-RB&6YjiY06Pxg$ZMj=W|
zZ-a@63CE}mX6ucMEBP%opSn@ya`~*N)-6(9$TdQRF-%7GzdCc~O#f(MV8g+T4E`Lc
z|61#OQKs3<(XWjuG1=#qWrft|^x)XI*)KXFH*LIfpN7_QnCgZ4d8ICU1L(O=gHuwR
zk(V_s<EEbY-*9@d54fAp2u*F|d3eYJ8?F)f?`&;tH|rTHv<Ivy)CUHhJ5sC0>LM;5
zecD_5SvAjs%l(C+UN3tQb<#cc-sPl_*Ed|~^qrnyXJ@CAPT}D;@8vp=k1&f-@Bt)X
za+3`fi|sQt(iZ%rsGQa{rF}!gpEZiBI22*n;<{3iE-M?fr9Y`e6jOv@!NCSeez1)Z
z4Wi?5PK8ybOeQ9>57)8LASgMRK5RNt&|U4@J(<4!;?rGMQ`SNLYrecHOH4#3A6QeC
znVG4pv27AXr53!o_BjNTurUy>>&T6zaF@w#yghU2S8!KHSJx+PEy>TEr6aA(iLs%f
zp>4NXzJMm~)BBozePl7@yGo@W;U1@2p<SxqCtsFpv0*K5Rd)Jli^)*AZ7h7cdi8k4
z&mn$(h-=#N=I5Le-%r1}0~b?X>+*ly7Kh~I<gnT75XFw#xsmgkQEax^L9Oad|Dl<#
z@B6N}xVR|g!Ni2`k3sj{A_H4mTg}7uHaho=<)BRFGd{*Cb36`juzGt5S@~6$*`t9A
zf`21iXIcXALF#WN49gU{sjnDGku?+g^4-qe&xV=`-g@4N#PbegNTly7D$rzdo(uPo
zHMjkQMNC>++WHrt3l$&$R6a4o=23ldMUL?bUTV@<FXl?~!~Le_Cx_vRyKp@k0B!~g
z%j*tgWaJFaWf75EMP-!She)p@=H}+<8*Gb@9W&4R;TEf*57n9E9vWKI%Q7-Cx!2!s
z^`J2}HrC(Y-=r=toyP9cNvv)6;ALfHk%-Zib#)WBGL5&yU%7H6AdHceloXfh>wChO
zD(WGA4R_uHRlJIwpg^FZaZ;hcVlbxUjrNX?8CYRdR7F@pFjCe44o5SdG9Ns9M&DgP
z#^ayAo)+vN&X3C`Z!|Y=va+hJug_0ZXB!FpYTK!UCOrvoqf4*xD!`V@K^{-`Zax{-
n84+>62N4PXfo_<;bDUk7e>?K5%S9`>>Wt5D_i<Bv5}EoNc7hCC

diff --git a/Telegram/Resources/icons/menu/stories_saved_section.png b/Telegram/Resources/icons/menu/stories_saved_section.png
new file mode 100644
index 0000000000000000000000000000000000000000..31a29d96b181bd09de6973730957e6121a0671b5
GIT binary patch
literal 774
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfvLdL#WBP}
z@M_3@?^TH+X6scvA1&xmQx#g#-Q>d3r7HMROvO?|$)erq-J%)wjU5&*9y}0f%*zyX
zwctz=;>)sN32I_pG)3ypa*@i~{W<%-&puZ<@AL0H&yzR)o1I@<d-wV0r9mre?D9>d
z0=K&;MaIU?z0NS(b4AE1AGP51*WZ@?e*HRIZ+bJ&=Esj8yDgsRp)zgy^qFxcNt<u}
z`up$Z&6z<fm+WY5ZC$*0@#)jvDT_3sN-bpM<>m9X&sLMz6{0ou^i!T6(igI}t~mO%
z=&#TDMF$fEa`kj|&mOujmDYGMsKsx2baeD$hZRl>H{8wp{kLw`ts6Hac-W@!uVS{4
z;hQMWyr{-UZSu{WWe#B)B8O&aim<vVO`JPdR>j`l{(o)c<gc&4{#w0STT5W}SvN~_
zbMx7=XIF%^Iyo*3m|&)^uFlq+*yF>rcFh_aTic0lOYY>DO<WnaIyNSzz+#T(*4?|i
zMbEM@^*#yaUUuR2*LUyVA5Ai})M>c9WAcZ!Vcf2Ue~)wYANN+9{QLLsu+>w~h;y*q
zyLa!H+2m`do_^XAZ6x#Q@xFKO-kC`8s=1!s7`1j0)1`S^w{Hgq8!HoIXO)fIjl|TO
zIn&NRpDgm^?c3b-*S#BcbXEkdY&o1b$-&Y>?+$N-Q2UvuMZf@Cd{Lvdex+FV)4zZJ
z9%q|*ZAb1O2^S^7$-kWZ{QcwO;<jzuR=12(MD%2e5mUln#i_t(QRzIIG=Kj5qe+D(
zQWJGjdSu=zc&!XM<fAz)jGv#s@aFmR=Ra25d0F!4>Oo<*AO1=Q-@aWNwRTzUvzOi7
z-7}o5=GIkIyeP3^XJ_AVB>T|sdCxz+e^}3WUhMsS^PTFSL21y_)z4*}Q$iB}6o^b6

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_saved_section@2x.png b/Telegram/Resources/icons/menu/stories_saved_section@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..02a9f4687e8b66db0e7c1f7ec8f08225009d6de3
GIT binary patch
literal 1492
zcmV;_1uOcAP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHK1oDDR9Fe^SXn5wT@*IYGK<gf
z88SpflDUNN$&}(ka)Ag@Qid{QDpLrh$Pgu&!W9uA7hEXA4H;7?WQfn~{~z{$-t#)%
z^Pcw{=f86<&e><J=UIF0{jR;%+OLev&*x_czPAIi64P~bbZl*HO-xLF{raV^uRk&}
zvazutu{Ftw=H}+v+1azRvo9|%|Ij|m%gc15>FMd2nVIV9>U5!$$5vKW0|NszAO0IY
zK0fa3?4+cmQ1f|vdlTK+*;!#>p{AxLrIOA-TU)!au@MuKX<lDn7Zw(Ba&lZ;T=1}D
zWd)zRfq}vH_BQ4E#l?l2o11i8ffYMDJIeaszke$$D>0u)>nbWLSy@>}M@Pi1s;VlH
z6i$GkprFgkOJcOUyBi_QiN*sdDJdl<Cu4VwjEs1)Z~R6^Mm|43!<+m2`}p|yZ&;EB
z)zQ)M=H>?8oSvR~dU{I3<hza3)YSa^d__e?@eJzf>f+$Qo4dO^M6P&b;b==sOY-zf
zN=k&Im^A(U{e&487ssTRP$n-ge|UHZ%MT9^NUB_|xVpN&y}g0f(9pn@!x<M55kZ!U
z)XJ4KH8lkel82U-7CXn!&#$JYrlO((sev6y*P_S}pL~3L=yK*UKm?teo6C&gNs$=I
zMgsrz^n^me(}?&*?c3emy}G)xwzd`lg}S-9851DoBeSuf5%nZ-19^LUOV-fd-p=v(
zz&N{o{?z;X`>>82$QLn<{Qdoj6VA@g78Vw3Yis21;^LyAp&=7PA{nd`yV23n>;^(Z
zLkZH%%nV3W_2J=RBEdP5TBbntfl)jQk!^#3L+}YDwzRaAL>01EY-}w1l2BDJ-Jd^y
z*kIMw)o^HUZ;uW1q5J9(p~S?*P$7lW_q7qAEF;5VE+iy@V3MN{7#JHH<NNsdm@X7+
zJUTjxX6WGH0IZ^-qSn?{VRRB|%F4=Y4&gw8e{ymn%nBFz`ue)NyZik7Jir+l8R#$>
zS=bvQNBX7%KJAdIsw#A-?R10$<MZ?Lv9U2i)YH>rw7|(BvNzxCU9jT%`g-(0@B^Kl
zu+AS&6GstAbdMG2e~3fm!O`X1$7puZcZY<8fC6vA!^3eGV5HB@&2@Ek;RGPHG6LR(
z1qB807cHVt1W&<u%Ixj!x3;!m0iVgqNjS%YOZrQdVibIK8($p?3kySeBHrMU34|)U
zHKAGrHQIO>MT!#&`cO~~{r>$Mg1o#uTtz@cs3s;RvUA1Lj*pMS?&|6)JI%qtfouk<
z9&!&EBY}B%c(4<R7D*^LI9N{Z(-~(bCM6{i>%P9e%m|(onT8<AH*T&RPlKA88VNO#
z9nSkyKx3hpV`*uLH#PGw+PB``-s|gY+yZb}6G*tsoDXSPSs7UauH-B*zA7y(jS!-u
zqWDrNjSzDrOws3XU4w#x0@+feC2?<tBHixn>?Es285RlV0|EmB$;*wEl@+e*;Ir9A
z)6>&%Xl7=H4aBHJ%S@IsI5>#jg%Klx5DgtJ*BTlc5^!aDdU}XYXiT}hV31@Eu{dZ}
zs2d}?HZLzPvFHSh8&X|e9sTW*1V%nlii?Y>>(0>75U0D#hXGSl(~gb~5{s}P&DT~q
z5lA-V@!<-Fem)@~fxUKug1(AS@ZHzf_i2^i|AR0rFE2;;PR#+&kezW2ZE0yiEh9yZ
znrLETf*^qj2ne9$QXZh`M(e)0xk<T24Foc~lao_hTbp>v=EGUR*Ml5aU}Iy0JdP5J
u`h^ePG&VIg)z;Q>r2oKvcHn>9fqwzyfmkWzWnJ?C0000<MNUMnLSTYgVYll5

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_saved_section@3x.png b/Telegram/Resources/icons/menu/stories_saved_section@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8de09fb323c02b8875d8a464b6417403d3aa5d6f
GIT binary patch
literal 2223
zcmV;g2vGNlP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@8A(JzRA>e5n|EjzOAyCnY_V%p
z>;**xJ2nJGMMXrg7i?HSMZ}JvVg(f}s9+Zb1qCaL6-BWIV#kIZ>|*b|z4v)<UncwZ
z?tZ!3yI(~3<&R`;Z|1u*b9*~wFG)#>pM(bz9!Pi~;ekvK<j5rBK;_PzyK?2q#flXx
zRH#tiym?QZI`#79%Q(!FEs)i#S06rn_|~mkuV26Z{rmU7w4WzWo|G(EGF!BWZjwrs
zDovR(<>t+snjtP^hYlT#Ioq{sck$xI<HwH=7%+gRYTW&umv!pY*|KHJ&!0bC?D+rC
zg9i_a7cXw;%HkBRXV0EZojSEZfdU4P#bu~>tbF<M3l}cz-o1N{93~ESUbt}K+O=ye
zNLJwc_wQf5dUg8r>38qm>00K@ne*-2w}vH;A3w&twQJX6u+E$vG?t7VI~H}t*@{5R
zHEY(e-U=5k>{E}vefwgqfx{&(^NA1{TmJm{w{6>IsB-V#y+MNp<;$1PVj8?Kdi3a9
zw{Gc}JU0s{dy#VG%AGrRPS@bgn>Q0COh`#du?PKEl4Ut`=up<J0$;y=eMrCn;*A<L
z!jWRtuV23wFJA224+0=MSc!O;H)P0=@SbvDdknN{)#}ryPh!=_j~}~r>*m4x=L}b=
zQbpgFA3l6ozkdBcM|}@X3l=PR<;oR#R%gzfDO0A52X9=48#Zis_3Bl^V2>U>BAbAn
zeaDU+VikKAxnE@H{(z1hJEj!){P}aunl=3iWyLjP#tgBFfK#JJjjSZ1zkl%HLD7M@
zpC?bAuyfR|U0V`a_P~xEJBCHHl5gI;IkSsx_}U6a6OuIm=(K6mv^&{NlF*1@Y{-OD
zdkwmD=^|LSZ{Mc4vd0Q7nVOnPiY)q&N!mlQ`w395UcG_>HEr5-)22-nGQ1VbmMtq=
zwro%YgTG(DexlFUuU{=4-KI?&K{<c^yfc3{W;HG+PMl~IG9NyC=-IQU!4~v#|Ni|-
ztGjpa29^DfpAt(9YumPMAQYaJVU<A5oH;Y7kMyZalqj)c#R?VzyP7`kmo8GI2oXbR
zbN1|6zhW7D8#itgOD<iy^ytwexrErcb0-O525<KMrAil7C@6wXE)4>#LY6wxD09eT
z$kBqrM!>&e!v<v-(W6wUQb7@4ym+C+u}8_W{H9NzuE!!W&(^J52SpCcPmZfJV?(pR
zavG*Ux_0f#79wkb&_8nINDF*R5jue~_o79MEKs}*1B%YiojZ2~AA-nhks?v5lLpnT
zTQ`7u^uuK0K7INGkj!9>VHhmzY)6h9ktrb3($WGgcouegdb&agknfKgHA-fsUdYfk
zz~9)00hB9OuI0;@%PbK0@89=d;8m?!Rb=<<+2g8NvU8NBD1#I!LPtpa`0;~o@vvdT
zc+C`Sg$fl;oH#-2!OtvTzI+k3(xpoatrISWN#~3pOFK>Hj+S1vY8Cm-^XJbMEX}X&
z+qd&Dvz&z$Av|6^a~H!Tda{Fwe4Ge6+dL&&+zOu#ELlsIbCD?0eNk-W60ZC%hRGiF
z?b|n3nJfnbB~3IWmo8l@m_EyMdUZ;KWhJsY;bNFPD5LYNi^ZmSvtu*pcgKtwvvTE1
zHG&{5as93rEvdb{r3Pm#!&vm<7(*<QOU_m(s|b}ci#mMr11?MP_3PKJ{4R#+XLI3;
zDA!pTWH&o{^yt8W1BK!6;luPv<uW!gckWymScmiH&yUTSc~{SX?b5j{;~3#lvNjcw
zmMmG~XFtr;GAXHI#fn~gz0Q_NH)+yD!rzDyBQkIJreYgLHlufx+2RHd9_$-C1S4^b
z0IF=;ym_+)l9yr0$;or(%n`3aJbn7KS+iyqQ&@^fw}Xi-AY2W@U!*^}RdgIkI4tn(
zMdr<$CmOIag94FEC~;cIO14_HYMgEgCIoANT{kFlSbiFmqJ$njed5Xk=h2Z#@KUiU
z3n1m@<jIqLLb<Zp9WVX^Me0BsNU4HyK_fL=u$W;GG|9uXlQD^?04BdJ&6_oAmgvM$
zx2xy8294&X;Lvpqd8D8pBoLOo6o@rW51EZv=|qlCbr_4=agSb&e)7cfqmP2Y4#ofj
zh@*+P$@$5MU#!)uR||?okAOspca`I5j$Uiks^xc9Z$7>w5Pdi<BY1f8#=L{q<)KmA
z=>=#^xwzbH+_<qsSIi605pY#!_Uzf>q?0F4{;p4gc=(quUlvXH*ep<G<YF43Mz%+A
z*R5OU!W93Z7A;zcRV<=N7IqSAfOROiluz+D#GHZnF6%JLW4iwR`-@>rK!47hIsVt3
zI(4GyKWWk=`#r-|$ps4*h;6hCvMC>TRVCU%Uf%-;4v1|KY`zgYFItWLqZKV$)ac;u
z-MiPTN#q~a$w>uC^y}TbxARuKMrfhvQJd#RT|?_LXz}Z%AK`?(LCR2z6D%)eU*mkK
zXdGD5TI$@nvoB!}CNf$aWSm#fKlNab+i?5#?fIHdf90S#DBzPt>9_iyoK>fP5ujj6
zFMrQRXf&`W77g3D<RgsTyLS`r8Z>C&r<9~e%{FV`kU+O=+0wsjqUWUfE+;yMa$Mqd
zj#0>f4jno~&(L*0pgW)o^3skQH!iA|Hmt#zw{PD*Ne*;H4Z2>vdd|tHvN+4XapMNB
znPvIt1dVWnZ~exPAJ11xQWF?fap~2l44c$C%rHMIcQDut@M_WO;8P6#Yl1Y70+Ahs
xvyNT6cG0NBJR8u2Ou_>R4<tO0@IVL;{0&@(Z)HI&Wy$~m002ovPDHLkV1ndK8zKMz

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_to_chats.png b/Telegram/Resources/icons/menu/stories_to_chats.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5129521c857d6d123bf9d5c46eb00d1489357eb
GIT binary patch
literal 793
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfvMTk#WBP}
zFgZb@s$uTjx%21G_bE3vHm<I$TpPLh*~`nz|Nr~@`~Uy{+w<@9$=S@9KmYvU!_I3K
zW@Tk9_nZ6c$H&KOA~*l}^QWY=bn4WpZ{NIm_3BmL-CbWF9qs<`q2N%OrG-V!-(RIK
zFD+$aVw$lkG9sd=sHpDGkBb*BG-!4UT)c9n=KsH1UteA)4(ZdkZb@ZCdU<h~d2Wb^
ziHRvMH{WD(;RVnQ`8PK$-L`Go?Ag+KqN1X#Cf-3oLV8X8iCI}(Uyi=Iy1H>;G0=u?
zaeby_fprfrEOZuD_iHH*l&GqznmBP{!NR+{%l+rsNFI9n<jJ1u?|D^KRxxHuN{?=C
zPVedIDG+2ieCpJz=jZ1;@H@3M6!Q0&?)Y-3m3!h`1q}@jAF)-dRu!;n^t^bHu^@8Z
zym<~6V|SM=+^M0f%NzL>sOjz7w~9(S4q1m<IN8|P3Pkzk?P7M9t?laa3Jtyb@Nj#h
zV%5)2PaiyZpdY`FL6$YV?HGgPmh$)aj`zzutIU`&<I&^CjcK(%J}^qKw6(QWR#vL1
zsU1*w|N1qvmDsv?4-bwRry8>!C~5Rmetu?K^~J-@jm=d=nms;&Ir#YP?fH$F>?;h-
z%*uX$dt3hQ4x^hG%N&csMQhjc&bxkLk-X}sA3uIHNXouAyKbFc!j5m>zsK*dla(+P
zVDIeeTDEN2rcIleYNbR(Sk81F(5U|R$I|S1)6s@Y`|JO+Epzh`m64HgSiIbKwwpq?
zL&>zMQ}@>V3<Ac_Wrc)gcXyS(zQ4boGbO6SPg!|!@$++x#_R^u8HKGTbjS4UsrtHV
z(<Y(Id~=izd}4{%aCc9o@C)CHgJA&y4E#BBtO`9DoTvX;BsP8F7XfyLE?bq%<1e<{
P03}OLS3j3^P6<r_PHb1b

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_to_chats@2x.png b/Telegram/Resources/icons/menu/stories_to_chats@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..575fcc811a8eb29b71f4211668ff24f3dec87d5e
GIT binary patch
literal 1579
zcmV+`2Gse9P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHl}SWFR9Fe^SZOF{YZ$lAScXBy
zXv{=eiXtJ|CygoF2g3(DA)kaoQTQM=mXIW-6p}5<ZlWmB9VE&!*|O_4Mn;TvX1Mp)
zee`xZ|NlAv#qHkP&G~S8-{<{3&-<L`eYW?gs60Fm7Wki8K=q#Aqo$_z?Af!YPoHXP
zYJU0h<>=_>o&uF&hY~(MJ{1)eQ&Ust=jVTLp6l!D?d|Q3j*jT)XhTCoWuz;_qo=2r
znVGq}yUWo*aQO4*&;I^?M@L76wou^6-oAa?(9mFJW=0!aTwHwo_;Gf2c4cMd`1lyx
zo0^)wc=5u*!Xh9bz|PK&V9>X<wKXp<50+C%GcmB1mR4nD<?Zb)Sz~f?GC4UJ))L{d
zva-s}&HeW68?l_6oCF64i{KSldiCnn=g*%>?#|ARudlEC%mxMq#l^*!mzQ9_xw*;7
z$&sH|IuhZtw6sLpG&eV6Djg?Eb#`{%+uI`{B_$=ISkXm9^62O&2}(&x5yi?_eE$47
z4w^*8$H&V+3oSP`Hj;?<@81hy<fp^BaDNEAy1H_AcbA{>4ymiFOJ3a4(xR#=7K{k1
zq@<+${QUIvbWcxDWGSJ|;OXS%a03yT5W7lRT3TUY;iE^7gb+`jJo)h916h&1=jP@d
z92|sL!o$M}nV6U;gi(@?gtWD_#q>ZbVtE1iIw~qkNbdCXG`RNn_qDaPg)qv{hlYkA
z7fMuBRUtJ%1Ts@hOw8foA?T;4r{?D7QstuT&}YC}QUQWQxQ<YqM@B}H(2R@>9>2A<
zH5ItNzCPX(o35^|g1xP+jZx$pzy^qj*w|P}bWcwYBrY#6OZClyf&#3fnCR>4OY(w(
zYy<$(w}^vEVf^&z6Uhw>4CF0C6)e@&)$!;wee>oGR`Cc`R)jqP5S2U$f*}eVG8h~}
zLqnspv(wGZjmL?pcsc+8yGn9_g0Lq#IUg4zrqKHOI_mb>*_n=x&cMKct*tHNgcD%w
z<>e*y$X>sGja3{O!jQ3W2j9PchgeY19dPM#jnQ==jPb2#gI>OTNjwn|5oGhMtSp`s
z8yg#P>fYX7-V%38eqB~p#wB8`L38Yc9#1GSpw9{o4TX8(<~TciTzh*v4%FY@zqGUz
z;SITH1mMCUAtC4_VNryAYHBKPGX<tyU0w9WGT(7=aU>UsadUH%;Sn<2#E85gzCBJ2
zypmbtjtl%78ymk1JO>8{KYsiGKi;er1Sd*IO-&8cgOo!LX>V^Yt_@NsfpPTWNGYpm
zvKAH=z>kfQh$Rs?G885>si=L3XQ^(^<MQzEAcZ8uo`>X5(Y%h2j}x<?dHGDT=Sn6<
zb#?Xb?rzcs&MSK#xe+3z<1Wgiih>e|8Z0$6HDzaKGYs50EG*2$#l^(L1WGeH8=&Bz
zXB`<C85|r$%3yRFAWI=NV2t|1TaqzFVuX1h6v>*P7@%p#eq=V8Z(MzXf`WM4h_@eN
ztsqj4tE(#t7Oo8tib4qG{QUfA14Jb%0OF3fAErh|MovynbaRE$=*MeoYYB#y133(1
zG@14F^^&{_P^zn|$s}WAW0sbdGC6UqU%!3@%dcO*yuH1FXD#gF;-WmkD7FO(8RSAb
zZmTkDDiefu8z~!HGcz-2t*A%9i7V6OGoduV#RGCtq}WxO2N0U#yugTOetw<?EY}OM
z$VI1YgtuI14hSDWdeHk`7e$U(75w;tM6^drT&1bD;QcpTrI}9X(b$I$4-db4_m1TP
zhT#r)KO4{+B_t$p0YYQ3u;=k0V#~|RnGeBczy0-~3&R+$`p^B2VVdDOi;iq<ZH-w=
zWB{uu@xzMkrN97T4^Jv8Dw>#>pkFOat^5DdQ{c#?s!Vq`V`JmTk01YQKRu;t_CS2F
dz<<R8e*&JJNyHuN_KW}k002ovPDHLkV1jKT-LL=v

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stories_to_chats@3x.png b/Telegram/Resources/icons/menu/stories_to_chats@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..00f6b959b4a327ff51ebf6d8133cffb42a02694b
GIT binary patch
literal 2274
zcmV<82p#u{P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@Oi4sRRA>e5nq|lpO%#Cb?r!W3
zRM5{r5d#cFvBmlnQGX}~*o7@9w!$l7w}OS;9Y1Uo8xdQvJHCf^@i6b~-n+AVcl{LZ
z{d3REoO9-!*_l%_$&$r?@fC=#Kzs$_D-d6Szjp<ahb?;Q)T#65&z~*vmoa0;_wV1o
zef#$L^XCs9Jox$ZXLz%RqFBL#1zWakS+i!%DpjhKFJC@QnlyF=K79Ca^XAR7XU`rw
zbm-v0gHN73vE%$HJ$#iRLx!9_efr0bAAAk--}mp|4;(nqqeqVn88ZAS%2;v~DN<zC
ztXb?ab7dScA3l88r%#_$sZzzRUaVU&ZQ8UWMvNFfd^mt64d3m?jT;v)Uc7qs>WddI
zUcY|L0ppuw&YYQrC{w0PwQALh6)UDu(S&N`$dQ{jZ?+Hprk(~38gNduwSV{S-G&Vt
zI(6!lHEUK^IVx7HIBL`=PMUr9o;r1^Xwjms9D+v}Hf-3pZ{Jj{9zA-*N@vfW-N$5w
z3Kd$oaN*alUsZ<Bo;|ByzrGJ{K1tH2Prq^FMpc53A3u&BJ=(q-y-rZ7R4Kl;`t`ni
z`O>#<U$1=p;HOKMZr{Frs#X}Z;>C;m;T3@fKXK>I9d(KY3l=0#9;-QsFk50bTJ71h
zN1bxov}q|*ri@18Yb<BZocK3&qDhk``Ql_ow07-UnT+#*g)pP@gN4!OL&<aiVNKV+
ze}9<<v(c_yJ3sPzq!~MQtW3&Du2G|gM+R=_aO51z99_G1b)yJueD&(pGA|yS$TKk3
zFj~2CrEs4!XO36aDN>}sDb=oByH1@tIAxmV95~o#&YY3imo8muPV0^-TjKcf;{@#P
z1ivuKl`FS+@nT|JkqqGJ)2B<8EU8eT!Y?eBf4&mm%Hlv^S*cPb7XtHPOkcl#{cy@A
z@r1>epnmS$xtbGK)k8#_vZ43u)~%b+?%K7>T=IZ12?&oJJ0_w;0ZyJgX|h=C-U}Bl
z2%m-x8wM<~2|I+?v15k_0dVWqt*KL|cJJPug`YBIiWXt+-o4wz88&IsM0m0sCXxh<
z!=@Dp*otVP<(f1nOqifXh64r+FcCrxddLq<NCLwll2lDa$BrE%v2N3*jp$Fjn<-PK
zNSM-(j~0^2lP61mOaPJl)~#EcHf<W6OY7FHW$tzB)<s8Fy-54^?V}?z%4rmLdinBY
zSA2H_5tsebym|8|1Q>Tw%r&7RTaj3P*|KF(*vgOus}SbNlSleBz|>KSQ6_{Vv#3?8
zmc~e$k`&*)d-vYGd(!U+P^-d_SVKbSh$)?0wrsIr;{AH{>Pf!_m@2ku(<W+37BT5P
zMi0-c@v@q^a^<oBj*TON)+uO2^xBYPbN~MR(oYFYU=1);4CBUbJb(VYMV})_4z>gv
zNn=NonxWMhWuK^2f<|3L?T-YLs&UM$(XwUBMndz}pEqyb+qZAa5u!?CF9akcBnX1*
z?kZfkuppZUf!D8Jx2R5>IN?o!DA*-Rlu)fXtg-JZeydikMAr4|*Q-NzSdHAx^B}yl
zHN~Y%m+U<K_fR%_^X836zkU05wGxP)j~_pl(axPaN16#u1dXtm0(c}$tzQfy_DLI(
zW|Gn*XNC`AQe7B7e*E<5(=B~kv}nQh>)ErX#gufA(M5|ES<MwIR#dKBdEB^hpFe+=
zS&2O889H>R^h}&Mk*cFKg9NCyt1*tOr6JI}cW;q~SaI97Z7Lxro`v`~@kg12&`}-T
zxpSvUtSJ1wZN)Wf)~J(th4BY6F#ys1kt0V;n2_LQ$&y8-b%nhd53+p|IU?Z<9z0kR
zh<tSR?AcLv0WM_Tym?xDtTC}S`L^t8OAJ1S9l`2JQmm_5wW^_Kz>bd@Glrzy;)4Ca
z%aJ(Rry&MMXZCr%eEDP)yUJeW9^=}zYtm^5P*kP3Zy|F~$r20+-O);xEU8+2_L64t
z?JO`zTtxhn_yh1%^U%1dIZ@lTZM9MVO%`7D(O0fqvHNKM+zlwj)<+M54LB(%oN}Tn
zIcE3o-*=3v6pDaBHEjvZI}_j&2a8t3gpuOlfVENBnJ1b_9JIng2RS6GR;}Vf%o^YZ
z8Ncj!^mFIV-MDdMGBIjqt`-mb#^n>)&ECCxO@d$v0}un(uS@Bptww-Y@Mg`L*_qU>
zTbG*`Y@>Wta{$wiZc)-arVFK*BYS`&OQlKEiZCxm|1L|geED)m8yi;n4YxRd{`_<2
z&QU_sv?7;LEsBWf8(<d6R%Nc=T`<L>NaSW|a`fm?gy4+19x#Lk2VYMJN&2HM#Noq-
z)k1oRC2m<c4VW=wh6u#9dWQ}jGz9Zzmo8nfNy1I4YvEo>ILgOok+AL4r%zm_IHH+%
za+NOCHI(Fq5437B8vHeqqi{24&XffnG-!|`j@M3JjR;Rl$a2d=XDAncj`B%tMHS8D
zL^(3iI@x#<h`xOJQj`P;>#A0hfPEsfl6`2Su{70^t4!hba^1B2W*4+TfdbM=^dNBT
zz^hlUG$vf5ktJ!JVKphW%W@Kna30L7F_C1l9<T^o0671q2P`5Jep!p2IB8s5s0pPY
zy8>hh_9sVZ)u>S;SK8nau+G{O8f%TIe^6R8x!#ZRNQ`KPl9_LzlavO0a3MYzIB+0F
z+3|J@wTVke+lbsrbErnjv%b=$OINR6-LX{s|3B-Kg}{&yN%A65Jsv*b03TwCYykim
zk6yic@%YfIN}ScepU%d*6&=@uat*ne_2V&zW9cUB$IhWBrfQ2;RC`E6_)$egA7W+h
w#KL}_uF4RH<0}wff%po<S0KIuf7=TD2kP{7QG~8vUjP6A07*qoM6N<$f~T7|egFUf

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 253b789ce..243c36b43 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -477,10 +477,10 @@ void FillSourceMenu(
 			controller->showSection(Info::Stories::Make(
 				peer,
 				Info::Stories::Tab::Archive));
-		}, &st::menuIconStoriesArchive);
+		}, &st::menuIconStoriesArchiveSection);
 		add(tr::lng_stories_my_title(tr::now), [=] {
 			controller->showSection(Info::Stories::Make(peer));
-		}, &st::menuIconStoriesSaved);
+		}, &st::menuIconStoriesSavedSection);
 	} else {
 		add(tr::lng_profile_send_message(tr::now), [=] {
 			controller->showPeerHistory(peer);
@@ -508,7 +508,7 @@ void FillSourceMenu(
 		if (in(Data::StorySourcesList::Hidden)) {
 			add(tr::lng_stories_show_in_chats(tr::now), [=] {
 				toggle(true);
-			}, &st::menuIconAddToFolder);
+			}, &st::menuIconStoriesToChats);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 21687e562..eb746c3c5 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -176,12 +176,12 @@ infoTopBarDelete: IconButton(infoTopBarForward) {
 	iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }};
 }
 infoTopBarSaveStories: IconButton(infoTopBarForward) {
-	icon: icon {{ "menu/stories_saved", boxTitleCloseFg }};
-	iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }};
+	icon: icon {{ "info/info_stories_to_profile", boxTitleCloseFg }};
+	iconOver: icon {{ "info/info_stories_to_profile", boxTitleCloseFgOver }};
 }
 infoTopBarArchiveStories: IconButton(infoTopBarForward) {
-	icon: icon {{ "menu/archive", boxTitleCloseFg }};
-	iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }};
+	icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }};
+	iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }};
 }
 infoTopBar: InfoTopBar {
 	height: infoTopBarHeight;
@@ -251,12 +251,12 @@ infoLayerTopBarDelete: IconButton(infoLayerTopBarForward) {
 	iconOver: icon {{ "info/info_media_delete", boxTitleCloseFgOver }};
 }
 infoLayerTopBarSaveStories: IconButton(infoLayerTopBarForward) {
-	icon: icon {{ "menu/stories_saved", boxTitleCloseFg }};
-	iconOver: icon {{ "menu/stories_saved", boxTitleCloseFgOver }};
+	icon: icon {{ "info/info_stories_to_profile", boxTitleCloseFg }};
+	iconOver: icon {{ "info/info_stories_to_profile", boxTitleCloseFgOver }};
 }
 infoLayerTopBarArchiveStories: IconButton(infoLayerTopBarForward) {
-	icon: icon {{ "menu/archive", boxTitleCloseFg }};
-	iconOver: icon {{ "menu/archive", boxTitleCloseFgOver }};
+	icon: icon {{ "info/info_stories_to_archive", boxTitleCloseFg }};
+	iconOver: icon {{ "info/info_stories_to_archive", boxTitleCloseFgOver }};
 }
 infoLayerTopBar: InfoTopBar(infoTopBar) {
 	height: infoLayerTopBarHeight;
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 7fb64b9d2..8a06efa5c 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -1029,7 +1029,9 @@ void ListWidget::showContextMenu(
 					? tr::lng_mediaview_save_to_profile
 					: tr::lng_archived_add)(tr::now),
 				crl::guard(this, [this] { toggleStoryPinSelected(); }),
-				(pin ? &st::menuIconStoriesSaved : &st::menuIconArchive));
+				(pin
+					? &st::menuIconStoriesSave
+					: &st::menuIconStoriesArchive));
 		}
 		if (canForwardAll()) {
 			_contextMenu->addAction(
@@ -1070,7 +1072,9 @@ void ListWidget::showContextMenu(
 					crl::guard(this, [=] {
 						toggleStoryPin({ 1, globalId.itemId });
 					}),
-					(pin ? &st::menuIconStoriesSaved : &st::menuIconArchive));
+					(pin
+						? &st::menuIconStoriesSave
+						: &st::menuIconStoriesArchive));
 			}
 			if (selectionData.canForward) {
 				_contextMenu->addAction(
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 853af9e43..2fd6327a4 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -93,13 +93,7 @@ settingsIconThemes: icon {{ "settings/palette", settingsIconFg }};
 settingsIconGroup: icon {{ "settings/group", settingsIconFg }};
 settingsIconChannel: icon {{ "settings/channel", settingsIconFg }};
 settingsIconUser: icon {{ "settings/user", settingsIconFg }};
-settingsIconSavedMessages: icon {{ "settings/saved_messages", settingsIconFg }};
-settingsIconStories: icon {{ "settings/stories", settingsIconFg }};
 settingsIconKey: icon {{ "settings/key", settingsIconFg }};
-settingsIconReload: icon {{ "settings/reload", settingsIconFg }};
-settingsIconNight: icon {{ "settings/night", settingsIconFg }};
-settingsIconSettings: icon {{ "settings/settings", settingsIconFg }};
-settingsIconArchive: icon {{ "settings/archive", settingsIconFg }};
 settingsIconPlus: icon {{ "settings/plus", settingsIconFg }};
 settingsIconMinus: icon {{ "settings/minus", settingsIconFg }};
 settingsIconTimer: icon {{ "settings/timer", settingsIconFg }};
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 3c697f316..183026881 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -104,8 +104,15 @@ menuIconNewWindow: icon {{ "menu/new_window", menuIconColor }};
 menuIconChatBubble: icon {{ "menu/chat_bubble", menuIconColor }};
 menuIconPhone: icon {{ "menu/phone", menuIconColor }};
 menuIconChannel: icon {{ "menu/channel", menuIconColor }};
-menuIconStoriesSaved: icon {{ "menu/stories_saved", menuIconColor }};
+menuIconStoriesSavedSection: icon {{ "menu/stories_saved_section", menuIconColor }};
+menuIconStoriesArchiveSection: icon {{ "menu/stories_archive_section", menuIconColor }};
+menuIconStoriesSave: icon {{ "menu/stories_save", menuIconColor }};
 menuIconStoriesArchive: icon {{ "menu/stories_archive", menuIconColor }};
+menuIconArchiveOpen: icon {{ "menu/archive_open", menuIconColor }};
+menuIconGroups: icon {{ "menu/groups", menuIconColor }};
+menuIconSavedMessages: icon {{ "menu/saved_messages", menuIconColor }};
+menuIconNightMode: icon {{ "menu/night_mode", menuIconColor }};
+menuIconStoriesToChats: icon {{ "menu/stories_to_chats", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
@@ -126,8 +133,8 @@ mediaMenuIconDelete: icon {{ "menu/delete", mediaviewMenuFg }};
 mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }};
 mediaMenuIconProfile: icon {{ "menu/profile", mediaviewMenuFg }};
 mediaMenuIconReport: icon {{ "menu/report", mediaviewMenuFg }};
-mediaMenuIconSaveStory: icon {{ "menu/stories_saved", mediaviewMenuFg }};
-mediaMenuIconArchiveStory: icon {{ "menu/archive", mediaviewMenuFg }};
+mediaMenuIconSaveStory: icon {{ "menu/stories_save", mediaviewMenuFg }};
+mediaMenuIconArchiveStory: icon {{ "menu/stories_archive", mediaviewMenuFg }};
 
 menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }};
 menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }};
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 13f4e45bf..14f9a1cd1 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -587,7 +587,7 @@ void MainMenu::setupArchive() {
 		inner,
 		tr::lng_archived_name(),
 		st::mainMenuButton,
-		{ &st::settingsIconArchive, kIconGray });
+		{ &st::menuIconArchiveOpen });
 	inner->add(
 		object_ptr<Ui::PlainShadow>(inner),
 		{ 0, st::mainMenuSkip, 0, st::mainMenuSkip });
@@ -734,13 +734,13 @@ void MainMenu::setupMenu() {
 	if (!_controller->session().supportMode()) {
 		addAction(
 			tr::lng_create_group_title(),
-			{ &st::settingsIconGroup, kIconLightBlue }
+			{ &st::menuIconGroups }
 		)->setClickedCallback([=] {
 			controller->showNewGroup();
 		});
 		addAction(
 			tr::lng_create_channel_title(),
-			{ &st::settingsIconChannel, kIconLightOrange }
+			{ &st::menuIconChannel }
 		)->setClickedCallback([=] {
 			controller->showNewChannel();
 		});
@@ -752,10 +752,7 @@ void MainMenu::setupMenu() {
 					_menu,
 					tr::lng_menu_my_stories(),
 					st::mainMenuButton,
-					IconDescriptor{
-						&st::settingsIconStories,
-						kIconDarkBlue
-					})));
+					IconDescriptor{ &st::menuIconStoriesSavedSection })));
 		const auto stories = &controller->session().data().stories();
 		if (stories->archiveCount() > 0) {
 			wrap->toggle(true, anim::type::instant);
@@ -776,32 +773,32 @@ void MainMenu::setupMenu() {
 
 		addAction(
 			tr::lng_menu_contacts(),
-			{ &st::settingsIconUser, kIconRed }
+			{ &st::menuIconProfile }
 		)->setClickedCallback([=] {
 			controller->show(PrepareContactsBox(controller));
 		});
 		addAction(
 			tr::lng_menu_calls(),
-			{ &st::settingsIconCalls, kIconGreen }
+			{ &st::menuIconPhone }
 		)->setClickedCallback([=] {
 			ShowCallsBox(controller);
 		});
 		addAction(
 			tr::lng_saved_messages(),
-			{ &st::settingsIconSavedMessages, kIconLightBlue }
+			{ &st::menuIconSavedMessages }
 		)->setClickedCallback([=] {
 			controller->showPeerHistory(controller->session().user());
 		});
 	} else {
 		addAction(
 			tr::lng_profile_add_contact(),
-			{ &st::settingsIconUser, kIconRed }
+			{ &st::menuIconProfile }
 		)->setClickedCallback([=] {
 			controller->showAddContact();
 		});
 		addAction(
 			rpl::single(u"Fix chats order"_q),
-			{ &st::settingsIconPin, kIconGreen }
+			{ &st::menuIconPin }
 		)->toggleOn(rpl::single(
 			_controller->session().settings().supportFixChatsOrder()
 		))->toggledChanges(
@@ -811,21 +808,21 @@ void MainMenu::setupMenu() {
 		}, _menu->lifetime());
 		addAction(
 			rpl::single(u"Reload templates"_q),
-			{ &st::settingsIconReload, kIconLightBlue }
+			{ &st::menuIconRestore }
 		)->setClickedCallback([=] {
 			_controller->session().supportTemplates().reload();
 		});
 	}
 	addAction(
 		tr::lng_menu_settings(),
-		{ &st::settingsIconSettings, kIconPurple }
+		{ &st::menuIconSettings }
 	)->setClickedCallback([=] {
 		controller->showSettings();
 	});
 
 	_nightThemeToggle = addAction(
 		tr::lng_menu_night_mode(),
-		{ &st::settingsIconNight, kIconDarkBlue }
+		{ &st::menuIconNightMode }
 	)->toggleOn(_nightThemeSwitches.events_starting_with(
 		Window::Theme::IsNightMode()
 	));

From a79deb89cebaaed08ea862591796926714df10c6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Jul 2023 11:40:29 +0400
Subject: [PATCH 356/676] Update API scheme on laydr 160.

---
 Telegram/SourceFiles/boxes/reactions_settings_box.cpp | 3 ++-
 Telegram/SourceFiles/data/data_session.cpp            | 3 ++-
 Telegram/SourceFiles/data/data_stories.cpp            | 2 +-
 Telegram/SourceFiles/main/main_account.cpp            | 3 ++-
 Telegram/SourceFiles/mtproto/scheme/api.tl            | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
index 7ddcd57ab..f0282306b 100644
--- a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
@@ -62,7 +62,8 @@ PeerId GenerateUser(not_null<History*> history, const QString &name) {
 		MTPstring(), // bot placeholder
 		MTPstring(), // lang code
 		MTPEmojiStatus(),
-		MTPVector<MTPUsername>()));
+		MTPVector<MTPUsername>(),
+		MTPint())); // stories_max_id
 	return peerId;
 }
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 02437c67c..ea176d2bf 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4258,7 +4258,8 @@ void Session::serviceNotification(
 			MTPstring(), // bot_inline_placeholder
 			MTPstring(), // lang_code
 			MTPEmojiStatus(),
-			MTPVector<MTPUsername>()));
+			MTPVector<MTPUsername>(),
+			MTPint())); // stories_max_id
 	}
 	const auto history = this->history(PeerData::kServiceNotificationsId);
 	if (!history->folderKnown()) {
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index dfb5129e5..b5dee6659 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -610,7 +610,7 @@ void Stories::finalizeResolve(FullStoryId id) {
 void Stories::applyDeleted(FullStoryId id) {
 	applyRemovedFromActive(id);
 
-	_deleted.emplace(id).second;
+	_deleted.emplace(id);
 	const auto i = _stories.find(id.peer);
 	if (i != end(_stories)) {
 		const auto j = i->second.find(id.story);
diff --git a/Telegram/SourceFiles/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp
index adef5d1c3..0eae6e91b 100644
--- a/Telegram/SourceFiles/main/main_account.cpp
+++ b/Telegram/SourceFiles/main/main_account.cpp
@@ -171,7 +171,8 @@ void Account::createSession(
 			MTPstring(), // bot_inline_placeholder
 			MTPstring(), // lang_code
 			MTPEmojiStatus(),
-			MTPVector<MTPUsername>()),
+			MTPVector<MTPUsername>(),
+			MTPint()), // stories_max_id
 		serialized,
 		streamVersion,
 		std::move(settings));
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 20a0dd4f4..b8771b61c 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -81,7 +81,7 @@ storage.fileMp4#b3cea0e4 = storage.FileType;
 storage.fileWebp#1081464c = storage.FileType;
 
 userEmpty#d3bc4b7a id:long = User;
-user#8f97c628 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_available:flags2.3?true stories_unavailable:flags2.4?true stories_hidden:flags2.5?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> = User;
+user#abb5f120 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_hidden:flags2.3?true stories_unavailable:flags2.4?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> stories_max_id:flags2.5?int = User;
 
 userProfilePhotoEmpty#4f11bae1 = UserProfilePhoto;
 userProfilePhoto#82d1f706 flags:# has_video:flags.0?true personal:flags.2?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = UserProfilePhoto;
@@ -2097,6 +2097,7 @@ stories.getPinnedStories#b471137 user_id:InputUser offset_id:int limit:int = sto
 stories.getStoriesArchive#1f5bc5d2 offset_id:int limit:int = stories.Stories;
 stories.getStoriesByID#6a15cf46 user_id:InputUser id:Vector<int> = stories.Stories;
 stories.toggleAllStoriesHidden#7c2557c4 hidden:Bool = Bool;
+stories.getAllReadUserStories#729c562c = Updates;
 stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
 stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
 stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;

From 451c4e3101c0eefac461a679ce2aa728f4a88f35 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Jul 2023 00:05:11 +0400
Subject: [PATCH 357/676] Implement vertical list of hidden story sources.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 Telegram/SourceFiles/boxes/boxes.style        |  10 +
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   9 +-
 Telegram/SourceFiles/boxes/peer_list_box.h    |   3 +
 .../boxes/peer_list_controllers.cpp           | 404 +++++++++++++-----
 Telegram/SourceFiles/data/data_stories.cpp    |  21 +-
 Telegram/SourceFiles/data/data_stories.h      |   7 +-
 .../dialogs/ui/dialogs_stories_content.cpp    |   8 +-
 .../dialogs/ui/dialogs_stories_list.cpp       |  19 +-
 .../dialogs/ui/dialogs_stories_list.h         |   5 +-
 .../stories/info_stories_inner_widget.cpp     |   2 +-
 .../SourceFiles/ui/effects/round_checkbox.cpp |  56 ++-
 .../SourceFiles/ui/effects/round_checkbox.h   |  10 +-
 13 files changed, 417 insertions(+), 140 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index fa47c0a99..a816e9883 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2407,6 +2407,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_add_contact" = "Create";
 "lng_add_contact_button" = "New contact";
 "lng_contacts_header" = "Contacts";
+"lng_contacts_by_online" = "Sorted by last seen time";
+"lng_contacts_by_name" = "Sorted by name";
+"lng_contacts_hidden_stories" = "Hidden Stories";
 "lng_contact_not_joined" = "Unfortunately {name} has not joined Telegram yet, but you can send them an invitation.\n\nWe will notify you about any of your contacts who join Telegram.";
 "lng_try_other_contact" = "Try someone else";
 "lng_create_group_link" = "Link";
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 4dba7e723..4ba5c01b5 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -942,6 +942,16 @@ requestsBoxList: PeerList(peerListBox) {
 	padding: margins(0px, 12px, 0px, 12px);
 	item: requestsBoxItem;
 }
+contactsWithStories: PeerList(peerListBox) {
+	item: PeerListItem(peerListBoxItem) {
+		checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+			check: RoundCheckbox(defaultPeerListCheck) {
+				size: 0px;
+			}
+		}
+		nameFgChecked: contactsNameFg;
+	}
+}
 requestsAcceptButton: RoundButton(defaultActiveButton) {
 	width: -28px;
 	height: 30px;
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 2ceba422b..95920addc 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -33,8 +33,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_dialogs.h"
 #include "styles/style_widgets.h"
 
-#include <rpl/range.h>
-
 PaintRoundImageCallback PaintUserpicCallback(
 		not_null<PeerData*> peer,
 		bool respectSavedMessagesChat) {
@@ -887,6 +885,13 @@ void PeerListRow::setCheckedInternal(bool checked, anim::type animated) {
 	_checkbox->setChecked(checked, animated);
 }
 
+void PeerListRow::setCustomizedCheckSegments(
+		std::vector<Ui::RoundImageCheckboxSegment> segments) {
+	Expects(_checkbox != nullptr);
+
+	_checkbox->setCustomizedSegments(std::move(segments));
+}
+
 void PeerListRow::finishCheckedAnimation() {
 	_checkbox->setChecked(_checkbox->checked(), anim::type::instant);
 }
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 28cb69534..cfa5b66bc 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -36,6 +36,7 @@ class SlideWrap;
 class FlatLabel;
 struct ScrollToRequest;
 class PopupMenu;
+struct RoundImageCheckboxSegment;
 } // namespace Ui
 
 using PaintRoundImageCallback = Fn<void(
@@ -202,6 +203,8 @@ public:
 		}
 		setCheckedInternal(checked, animated);
 	}
+	void setCustomizedCheckSegments(
+		std::vector<Ui::RoundImageCheckboxSegment> segments);
 	void setHidden(bool hidden) {
 		_hidden = hidden;
 	}
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 2bf72ee92..6c0343b80 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -9,8 +9,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_chat_participants.h"
 #include "base/random.h"
+#include "boxes/filters/edit_filter_chats_list.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/effects/round_checkbox.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
@@ -32,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "dialogs/dialogs_main_list.h"
+#include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h" // showAddContact()
 #include "base/unixtime.h"
 #include "styles/style_boxes.h"
@@ -42,12 +47,302 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_stories_list.h"
 
-
 namespace {
 
 constexpr auto kSortByOnlineThrottle = 3 * crl::time(1000);
 constexpr auto kSearchPerPage = 50;
 
+class StoriesRow final : public PeerListRow {
+public:
+	StoriesRow(
+		not_null<Main::Session*> session,
+		const QBrush &unread,
+		const Dialogs::Stories::Element &element,
+		int position);
+
+	void applySegments(const Dialogs::Stories::Element &element);
+	void updateGradient(QBrush unread);
+
+	int position = 0;
+
+private:
+	void refreshSegments();
+
+	QBrush _unread;
+	int _count = 0;
+	int _unreadCount = 0;
+
+};
+
+class StoriesController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	using Content = Dialogs::Stories::Content;
+	using Row = StoriesRow;
+
+	StoriesController(
+		not_null<Window::SessionController*> window,
+		rpl::producer<Content> content,
+		Fn<void(uint64)> open,
+		Fn<void()> loadMore);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void loadMoreRows() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+
+private:
+	void refresh(const Content &content);
+
+	const not_null<Window::SessionController*> _window;
+	QBrush _unread;
+	rpl::producer<Content> _content;
+	Fn<void(uint64)> _open;
+	Fn<void()> _loadMore;
+	bool _positionPositive = false;
+
+	rpl::lifetime _lifetime;
+
+};
+
+StoriesRow::StoriesRow(
+	not_null<Main::Session*> session,
+	const QBrush &unread,
+	const Dialogs::Stories::Element &element,
+	int position)
+: PeerListRow(session->data().peer(PeerId(element.id)))
+, position(position)
+, _unread(unread) {
+}
+
+void StoriesRow::applySegments(const Dialogs::Stories::Element &element) {
+	Expects(element.unreadCount <= element.count);
+
+	_count = std::max(element.count, 1);
+	_unreadCount = element.unreadCount;
+	refreshSegments();
+}
+
+void StoriesRow::updateGradient(QBrush unread) {
+	_unread = std::move(unread);
+	refreshSegments();
+}
+
+void StoriesRow::refreshSegments() {
+	Expects(_unreadCount <= _count);
+	Expects(_count > 0);
+
+	auto segments = std::vector<Ui::RoundImageCheckboxSegment>();
+	const auto add = [&](bool unread) {
+		segments.push_back({
+			.brush = unread ? _unread : st::dialogsUnreadBgMuted->b,
+			.width = (unread
+				? st::dialogsStoriesFull.lineTwice / 2.
+				: st::dialogsStoriesFull.lineReadTwice / 2.),
+		});
+	};
+	segments.reserve(_count);
+	for (auto i = 0, count = _count - _unreadCount; i != count; ++i) {
+		add(false);
+	}
+	for (auto i = 0; i != _unreadCount; ++i) {
+		add(true);
+	}
+	setCustomizedCheckSegments(std::move(segments));
+}
+
+StoriesController::StoriesController(
+	not_null<Window::SessionController*> window,
+	rpl::producer<Content> content,
+	Fn<void(uint64)> open,
+	Fn<void()> loadMore)
+: _window(window)
+, _content(std::move(content))
+, _open(std::move(open))
+, _loadMore(std::move(loadMore)) {
+	const auto createGradient = [=] {
+		auto gradient = QLinearGradient(
+			QPoint(10, 0),
+			QPoint(0, 10));
+		gradient.setStops({
+			{ 0., st::groupCallLive1->c },
+			{ 1., st::groupCallMuted1->c },
+		});
+		_unread = QBrush(gradient);
+	};
+	createGradient();
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		createGradient();
+		for (auto i = 0, count = int(delegate()->peerListFullRowsCount())
+			; i != count
+			; ++i) {
+			const auto row = delegate()->peerListRowAt(i).get();
+			static_cast<Row*>(row)->updateGradient(_unread);
+		}
+	}, _lifetime);
+}
+
+Main::Session &StoriesController::session() const {
+	return _window->session();
+}
+
+void StoriesController::prepare() {
+	if (_loadMore) {
+		_loadMore();
+	}
+	std::move(
+		_content
+	) | rpl::start_with_next([=](Content content) {
+		refresh(content);
+	}, _lifetime);
+}
+
+void StoriesController::loadMoreRows() {
+	if (_loadMore) {
+		_loadMore();
+	}
+}
+
+void StoriesController::rowClicked(not_null<PeerListRow*> row) {
+	if (_open) {
+		_open(row->id());
+	}
+}
+
+base::unique_qptr<Ui::PopupMenu> StoriesController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	auto result = base::make_unique_q<Ui::PopupMenu>(parent);
+
+	Dialogs::Stories::FillSourceMenu(_window, {
+		.id = row->id(),
+		.callback = Ui::Menu::CreateAddActionCallback(result.get()),
+	});
+
+	if (result->empty()) {
+		return nullptr;
+	}
+	return result;
+}
+
+void StoriesController::refresh(const Content &content) {
+	const auto session = &_window->session();
+	const auto positive = _positionPositive = !_positionPositive;
+	auto position = positive ? 1 : -int(content.elements.size());
+	for (const auto &element : content.elements) {
+		if (const auto row = delegate()->peerListFindRow(element.id)) {
+			static_cast<Row*>(row)->position = position;
+			static_cast<Row*>(row)->applySegments(element);
+		} else {
+			auto added = std::make_unique<Row>(
+				session,
+				_unread,
+				element,
+				position);
+			const auto raw = added.get();
+			delegate()->peerListAppendRow(std::move(added));
+			delegate()->peerListSetRowChecked(raw, true);
+			raw->applySegments(element);
+		}
+		++position;
+	}
+	auto count = delegate()->peerListFullRowsCount();
+	for (auto i = 0; i != count;) {
+		const auto row = delegate()->peerListRowAt(i);
+		const auto position = static_cast<Row*>(row.get())->position;
+		if (positive ? (position > 0) : (position < 0)) {
+			++i;
+		} else {
+			delegate()->peerListRemoveRow(row);
+			--count;
+		}
+	}
+	delegate()->peerListSortRows([](
+			const PeerListRow &a,
+			const PeerListRow &b) {
+		return static_cast<const Row&>(a).position
+			< static_cast<const Row&>(b).position;
+	});
+	delegate()->peerListRefreshRows();
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> PrepareHiddenStoriesList(
+		not_null<PeerListBox*> box,
+		not_null<Window::SessionController*> sessionController,
+		rpl::producer<ContactsBoxController::SortMode> mode) {
+	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		box,
+		object_ptr<Ui::VerticalLayout>(box));
+	const auto container = result->entity();
+	const auto stories = &sessionController->session().data().stories();
+
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_contacts_hidden_stories()));
+
+	auto &lifetime = container->lifetime();
+	auto list = Dialogs::Stories::ContentForSession(
+		&sessionController->session(),
+		Data::StorySourcesList::Hidden
+	) | rpl::start_spawning(lifetime);
+	const auto delegate = lifetime.make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto open = [=](uint64 id) {
+		sessionController->openPeerStories(
+			PeerId(int64(id)),
+			Data::StorySourcesList::Hidden);
+	};
+	const auto loadMore = [=] {
+		stories->loadMore(Data::StorySourcesList::Hidden);
+	};
+	const auto controller = lifetime.make_state<StoriesController>(
+		sessionController,
+		rpl::duplicate(
+			list
+		) | rpl::filter([](const Dialogs::Stories::Content &list) {
+			return !list.elements.empty();
+		}),
+		open,
+		loadMore);
+	controller->setStyleOverrides(&st::contactsWithStories);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		rpl::conditional(
+			std::move(
+				mode
+			) | rpl::map(
+				rpl::mappers::_1 == ContactsBoxController::SortMode::Online
+			),
+			tr::lng_contacts_by_online(),
+			tr::lng_contacts_by_name())));
+
+	stories->incrementPreloadingHiddenSources();
+	lifetime.add([=] {
+		stories->decrementPreloadingHiddenSources();
+	});
+
+	result->toggleOn(rpl::duplicate(
+		list
+	) | rpl::map([](const Dialogs::Stories::Content &list) {
+		return !list.elements.empty();
+	}));
+	result->finishAnimating();
+
+	return result;
+}
+
 } // namespace
 
 object_ptr<Ui::BoxContent> PrepareContactsBox(
@@ -55,14 +350,14 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 	using Mode = ContactsBoxController::SortMode;
 	auto controller = std::make_unique<ContactsBoxController>(
 		&sessionController->session());
+	controller->setStyleOverrides(&st::contactsWithStories);
 	const auto raw = controller.get();
 	auto init = [=](not_null<PeerListBox*> box) {
 		using namespace Dialogs::Stories;
 
 		struct State {
-			List *stories = nullptr;
 			QPointer<::Ui::IconButton> toggleSort;
-			Mode mode = ContactsBoxController::SortMode::Online;
+			rpl::variable<Mode> mode = Mode::Online;
 			::Ui::Animations::Simple scrollAnimation;
 		};
 
@@ -73,109 +368,20 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 			tr::lng_profile_add_contact(),
 			[=] { sessionController->showAddContact(); });
 		state->toggleSort = box->addTopButton(st::contactsSortButton, [=] {
-			const auto online = (state->mode == Mode::Online);
-			state->mode = online ? Mode::Alphabet : Mode::Online;
-			raw->setSortMode(state->mode);
+			const auto online = (state->mode.current() == Mode::Online);
+			const auto mode = online ? Mode::Alphabet : Mode::Online;
+			state->mode = mode;
+			raw->setSortMode(mode);
 			state->toggleSort->setIconOverride(
 				online ? &st::contactsSortOnlineIcon : nullptr,
 				online ? &st::contactsSortOnlineIconOver : nullptr);
 		});
 		raw->setSortMode(Mode::Online);
 
-		auto list = object_ptr<List>(
+		box->peerListSetAboveWidget(PrepareHiddenStoriesList(
 			box,
-			st::dialogsStoriesList,
-			ContentForSession(
-				&sessionController->session(),
-				Data::StorySourcesList::Hidden),
-			[=] { return state->stories->height() - box->scrollTop(); });
-		const auto raw = state->stories = list.data();
-		box->peerListSetAboveWidget(object_ptr<::Ui::PaddingWrap<>>(
-			box,
-			std::move(list),
-			style::margins(0, st::membersMarginTop, 0, 0)));
-
-		raw->clicks(
-		) | rpl::start_with_next([=](uint64 id) {
-			sessionController->openPeerStories(
-				PeerId(int64(id)),
-				Data::StorySourcesList::Hidden);
-		}, raw->lifetime());
-
-		raw->showMenuRequests(
-		) | rpl::start_with_next([=](const ShowMenuRequest &request) {
-			FillSourceMenu(sessionController, request);
-		}, raw->lifetime());
-
-		raw->loadMoreRequests(
-		) | rpl::start_with_next([=] {
-			stories->loadMore(Data::StorySourcesList::Hidden);
-		}, raw->lifetime());
-
-		const auto defaultScrollTop = [=] {
-			return std::max(raw->height() - st::dialogsStories.height, 0);
-		};
-		const auto scrollToDefault = [=](bool verytop) {
-			if (state->scrollAnimation.animating()) {
-				return;
-			}
-			if (verytop) {
-				//_scroll->verticalScrollBar()->setMinimum(0);
-			}
-			state->scrollAnimation.stop();
-			auto scrollTop = box->scrollTop();
-			const auto scrollTo = verytop ? 0 : defaultScrollTop();
-			if (scrollTop == scrollTo) {
-				return;
-			}
-			const auto maxAnimatedDelta = box->height();
-			if (scrollTo + maxAnimatedDelta < scrollTop) {
-				scrollTop = scrollTo + maxAnimatedDelta;
-				box->scrollToY(scrollTop);
-			}
-
-			const auto scroll = [=] {
-				const auto animated = qRound(
-					state->scrollAnimation.value(scrollTo));
-				const auto animatedDelta = animated - scrollTo;
-				const auto realDelta = box->scrollTop() - scrollTo;
-				if (realDelta * animatedDelta < 0) {
-					// We scrolled manually to the other side of target 'scrollTo'.
-					state->scrollAnimation.stop();
-				} else if (std::abs(realDelta) > std::abs(animatedDelta)) {
-					// We scroll by animation only if it gets us closer to target.
-					box->scrollToY(animated);
-				}
-			};
-
-			state->scrollAnimation.start(
-				scroll,
-				scrollTop,
-				scrollTo,
-				st::slideDuration,
-				anim::sineInOut);
-		};
-		const auto top = box->scrollTop();
-		raw->toggleExpandedRequests(
-		) | rpl::start_with_next([=](bool expanded) {
-			if (expanded || box->scrollTop() < defaultScrollTop()) {
-				scrollToDefault(expanded);
-			}
-		}, raw->lifetime());
-
-		raw->heightValue(
-		) | rpl::filter([=] {
-			return (box->scrollHeight() > 0)
-				&& (defaultScrollTop() > box->scrollTop());
-		}) | rpl::start_with_next([=] {
-			//refreshForDefaultScroll();
-			box->scrollToY(defaultScrollTop());
-		}, raw->lifetime());
-
-		stories->incrementPreloadingHiddenSources();
-		raw->lifetime().add([=] {
-			stories->decrementPreloadingHiddenSources();
-		});
+			sessionController,
+			state->mode.value()));
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(init));
 }
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index b5dee6659..8f27352a0 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -37,6 +37,7 @@ constexpr auto kSavedFirstPerPage = 30;
 constexpr auto kSavedPerPage = 100;
 constexpr auto kMaxPreloadSources = 10;
 constexpr auto kStillPreloadFromFirst = 3;
+constexpr auto kMaxSegmentsCount = 180;
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -74,13 +75,15 @@ StoriesSourceInfo StoriesSource::info() const {
 	return {
 		.id = user->id,
 		.last = ids.empty() ? 0 : ids.back().date,
-		.unread = unread(),
-		.premium = user->isPremium(),
+		.count = std::min(int(ids.size()), kMaxSegmentsCount),
+		.unreadCount = std::min(unreadCount(), kMaxSegmentsCount),
+		.premium = user->isPremium() ? 1 : 0,
 	};
 }
 
-bool StoriesSource::unread() const {
-	return !ids.empty() && readTill < ids.back().id;
+int StoriesSource::unreadCount() const {
+	const auto i = ids.lower_bound(StoryIdDates{ .id = readTill + 1 });
+	return int(end(ids) - i);
 }
 
 StoryIdDates StoriesSource::toOpen() const {
@@ -724,7 +727,7 @@ void Stories::sort(StorySourcesList list) {
 		const auto key = int64(info.last)
 			+ (info.premium ? (int64(1) << 47) : 0)
 			+ ((info.id == changelogSenderId) ? (int64(1) << 47) : 0)
-			+ (info.unread ? (int64(1) << 49) : 0)
+			+ ((info.unreadCount > 0) ? (int64(1) << 49) : 0)
 			+ ((info.id == self) ? (int64(1) << 50) : 0);
 		return std::make_pair(key, info.id);
 	};
@@ -895,10 +898,10 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 		sendMarkAsReadRequests();
 	}
 	_markReadPending.emplace(id.peer);
-	const auto wasUnread = i->second.unread();
+	const auto wasUnreadCount = i->second.unreadCount();
 	i->second.readTill = id.story;
-	const auto nowUnread = i->second.unread();
-	if (wasUnread != nowUnread) {
+	const auto nowUnreadCount = i->second.unreadCount();
+	if (wasUnreadCount != nowUnreadCount) {
 		const auto refreshInList = [&](StorySourcesList list) {
 			auto &sources = _sources[static_cast<int>(list)];
 			const auto i = ranges::find(
@@ -906,7 +909,7 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 				id.peer,
 				&StoriesSourceInfo::id);
 			if (i != end(sources)) {
-				i->unread = nowUnread;
+				i->unreadCount = nowUnreadCount;
 				sort(list);
 			}
 		};
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 6cb415977..437a26a7b 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -41,8 +41,9 @@ struct StoriesIds {
 struct StoriesSourceInfo {
 	PeerId id = 0;
 	TimeId last = 0;
-	bool unread = false;
-	bool premium = false;
+	int count : 15 = 0;
+	int unreadCount : 15 = 0;
+	int premium : 1 = 0;
 
 	friend inline bool operator==(
 		StoriesSourceInfo,
@@ -56,7 +57,7 @@ struct StoriesSource {
 	bool hidden = false;
 
 	[[nodiscard]] StoriesSourceInfo info() const;
-	[[nodiscard]] bool unread() const;
+	[[nodiscard]] int unreadCount() const;
 	[[nodiscard]] StoryIdDates toOpen() const;
 
 	friend inline bool operator==(StoriesSource, StoriesSource) = default;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 243c36b43..329f61296 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -351,8 +351,9 @@ Content State::next() {
 				? tr::lng_stories_my_name(tr::now)
 				: user->shortName()),
 			.thumbnail = std::move(userpic),
-			.unread = info.unread,
-			.skipSmall = user->isSelf(),
+			.count = info.count,
+			.unreadCount = info.unreadCount,
+			.skipSmall = user->isSelf() ? 1 : 0,
 		});
 	}
 	return result;
@@ -423,7 +424,8 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 							result.elements.push_back({
 								.id = uint64(id),
 								.thumbnail = MakeStoryThumbnail(*maybe),
-								.unread = (id > readTill),
+								.count = 1,
+								.unreadCount = (id > readTill) ? 1 : 0,
 							});
 						}
 					} else if (maybe.error() == Data::NoStory::Unknown) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index b94ef43b1..23da7e9c8 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -108,7 +108,8 @@ void List::showContent(Content &&content) {
 				item.element.name = element.name;
 				item.nameCache = QImage();
 			}
-			item.element.unread = element.unread;
+			item.element.count = element.count;
+			item.element.unreadCount = element.unreadCount;
 		} else {
 			_data.items.emplace_back(Item{ .element = element });
 		}
@@ -129,7 +130,7 @@ List::Summaries List::ComposeSummaries(Data &data) {
 	auto unreadInFirst = 0;
 	auto unreadTotal = 0;
 	for (auto i = skip; i != total; ++i) {
-		if (data.items[i].element.unread) {
+		if (data.items[i].element.unreadCount > 0) {
 			++unreadTotal;
 			if (i < skip + kSmallThumbsShown) {
 				++unreadInFirst;
@@ -162,7 +163,7 @@ List::Summaries List::ComposeSummaries(Data &data) {
 	}
 	if (unreadInFirst > 0 && unreadInFirst == unreadTotal) {
 		for (auto i = skip; i != total; ++i) {
-			if (data.items[i].element.unread) {
+			if (data.items[i].element.unreadCount > 0) {
 				append(result.unreadNames.string, i, !--unreadTotal);
 			}
 		}
@@ -449,8 +450,8 @@ void List::paintEvent(QPaintEvent *e) {
 		return Single{ x, indexSmall, small, indexFull, full, y };
 	};
 	const auto hasUnread = [&](const Single &single) {
-		return (single.itemSmall && single.itemSmall->element.unread)
-			|| (single.itemFull && single.itemFull->element.unread);
+		return (single.itemSmall && single.itemSmall->element.unreadCount)
+			|| (single.itemFull && single.itemFull->element.unreadCount);
 	};
 	const auto enumerate = [&](auto &&paintGradient, auto &&paintOther) {
 		auto nextGradientPainted = false;
@@ -513,8 +514,8 @@ void List::paintEvent(QPaintEvent *e) {
 			photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
-		const auto smallUnread = small && small->element.unread;
-		const auto fullUnread = itemFull && itemFull->element.unread;
+		const auto smallUnread = small && small->element.unreadCount;
+		const auto fullUnread = itemFull && itemFull->element.unreadCount;
 		const auto unreadOpacity = (smallUnread && fullUnread)
 			? 1.
 			: smallUnread
@@ -550,8 +551,8 @@ void List::paintEvent(QPaintEvent *e) {
 			photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
-		const auto smallUnread = small && small->element.unread;
-		const auto fullUnread = itemFull && itemFull->element.unread;
+		const auto smallUnread = small && small->element.unreadCount;
+		const auto fullUnread = itemFull && itemFull->element.unreadCount;
 
 		// White circle with possible read gray line.
 		const auto hasReadLine = (itemFull && !fullUnread);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 49391432c..9bbca05b0 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -36,8 +36,9 @@ struct Element {
 	uint64 id = 0;
 	QString name;
 	std::shared_ptr<Thumbnail> thumbnail;
-	bool unread : 1 = false;
-	bool skipSmall : 1 = false;
+	int count : 15 = 0;
+	int unreadCount : 15 = 0;
+	int skipSmall : 1 = 0;
 
 	friend inline bool operator==(
 		const Element &a,
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 15473babc..b6fc6254f 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -160,7 +160,7 @@ void InnerWidget::createButtons() {
 		self
 	) | rpl::map([=](Content &&content) {
 		for (auto &element : content.elements) {
-			element.unread = false;
+			element.unreadCount = 0;
 		}
 		return std::move(content);
 	}) | rpl::start_spawning(recentWrap->lifetime());
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index 74c51e144..4d2a03f77 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -389,26 +389,49 @@ void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 	}
 
 	if (selectionLevel > 0) {
-		const auto radius = _roundingRadius
-			? _roundingRadius(_st.imageRadius * 2)
-			: std::optional<int>();
 		PainterHighQualityEnabler hq(p);
 		p.setOpacity(std::clamp(selectionLevel, 0., 1.));
 		p.setBrush(Qt::NoBrush);
-		const auto pen = QPen(
-			_fgOverride ? (*_fgOverride) : _st.selectFg->b,
-			_st.selectWidth);
-		p.setPen(pen);
+		const auto segments = int(_segments.size());
 		const auto rect = style::rtlrect(
 			x,
 			y,
 			_st.imageRadius * 2,
 			_st.imageRadius * 2,
 			outerWidth);
-		if (!radius) {
-			p.drawEllipse(rect);
+		if (segments < 2) {
+			const auto radius = _roundingRadius
+				? _roundingRadius(_st.imageRadius * 2)
+				: std::optional<int>();
+			const auto pen = QPen(
+				segments ? _segments.front().brush : _st.selectFg->b,
+				segments ? _segments.front().width : _st.selectWidth);
+			p.setPen(pen);
+			if (!radius) {
+				p.drawEllipse(rect);
+			} else {
+				p.drawRoundedRect(rect, *radius, *radius);
+			}
 		} else {
-			p.drawRoundedRect(rect, *radius, *radius);
+			const auto small = 160;
+			const auto full = arc::kFullLength;
+			const auto separator = (full > 2 * small * segments)
+				? small
+				: full / (segments * 2);
+			const auto left = full - (separator * segments);
+			const auto length = left / float64(segments);
+			auto start = 0. + (arc::kQuarterLength + (separator / 2));
+			for (const auto &segment : ranges::views::reverse(_segments)) {
+				p.setPen(QPen(
+					segment.brush,
+					segment.width,
+					Qt::SolidLine,
+					Qt::RoundCap));
+				const auto from = int(base::SafeRound(start));
+				const auto till = int(base::SafeRound(start + length));
+				p.drawArc(rect, from, till - from);
+				start += length + separator;
+			}
 		}
 		p.setOpacity(1.);
 	}
@@ -474,7 +497,18 @@ void RoundImageCheckbox::prepareWideCache() {
 }
 
 void RoundImageCheckbox::setColorOverride(std::optional<QBrush> fg) {
-	_fgOverride = fg;
+	if (fg) {
+		setCustomizedSegments({
+			{ .brush = *fg, .width = float64(_st.selectWidth) }
+		});
+	} else {
+		setCustomizedSegments({});
+	}
+}
+
+void RoundImageCheckbox::setCustomizedSegments(
+		std::vector<Segment> segments) {
+	_segments = std::move(segments);
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h
index 461244f95..9247c226e 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.h
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h
@@ -45,8 +45,14 @@ private:
 
 };
 
+struct RoundImageCheckboxSegment {
+	QBrush brush;
+	float64 width = 0.;
+};
+
 class RoundImageCheckbox {
 public:
+	using Segment = RoundImageCheckboxSegment;
 	using PaintRoundImage = Fn<void(Painter &p, int x, int y, int outerWidth, int size)>;
 	RoundImageCheckbox(
 		const style::RoundImageCheckbox &st,
@@ -58,6 +64,7 @@ public:
 	float64 checkedAnimationRatio() const;
 
 	void setColorOverride(std::optional<QBrush> fg);
+	void setCustomizedSegments(std::vector<Segment> segments);
 
 	bool checked() const {
 		return _check.checked();
@@ -83,7 +90,8 @@ private:
 
 	RoundCheckbox _check;
 
-	std::optional<QBrush> _fgOverride;
+	//std::optional<QBrush> _fgOverride;
+	std::vector<Segment> _segments;
 
 };
 

From 9a29807276323d37b52126cbd60642905b463f3b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Jul 2023 12:29:40 +0400
Subject: [PATCH 358/676] Show stories segments in contacts list.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  34 +++-
 Telegram/SourceFiles/boxes/peer_list_box.h    |   8 +
 .../boxes/peer_list_controllers.cpp           | 171 ++++++++++++++----
 .../SourceFiles/boxes/peer_list_controllers.h |  19 ++
 4 files changed, 197 insertions(+), 35 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 95920addc..777e952b9 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -261,15 +261,23 @@ void PeerListBox::peerListSetRowChecked(
 		not_null<PeerListRow*> row,
 		bool checked) {
 	if (checked) {
-		addSelectItem(row, anim::type::normal);
+		if (_controller->trackSelectedList()) {
+			addSelectItem(row, anim::type::normal);
+		}
 		PeerListContentDelegate::peerListSetRowChecked(row, checked);
 		peerListUpdateRow(row);
 
 		// This call deletes row from _searchRows.
-		_select->entity()->clearQuery();
+		if (_select) {
+			_select->entity()->clearQuery();
+		}
 	} else {
 		// The itemRemovedCallback will call changeCheckState() here.
-		_select->entity()->removeItem(row->id());
+		if (_select) {
+			_select->entity()->removeItem(row->id());
+		} else {
+			PeerListContentDelegate::peerListSetRowChecked(row, checked);
+		}
 		peerListUpdateRow(row);
 	}
 }
@@ -1131,6 +1139,24 @@ PeerListRow *PeerListContent::findRow(PeerListRowId id) {
 	return (it == _rowsById.cend()) ? nullptr : it->second.get();
 }
 
+std::optional<QPoint> PeerListContent::lastRowMousePosition() const {
+	if (!_lastMousePosition) {
+		return std::nullopt;
+	}
+	const auto point = mapFromGlobal(*_lastMousePosition);
+	auto in = parentWidget()->rect().contains(
+		parentWidget()->mapFromGlobal(*_lastMousePosition));
+	auto rowsPointY = point.y() - rowsTop();
+	const auto index = (in
+		&& rowsPointY >= 0
+		&& rowsPointY < shownRowsCount() * _rowHeight)
+		? (rowsPointY / _rowHeight)
+		: -1;
+	return (index >= 0 && index == _selected.index.value)
+		? QPoint(point.x(), rowsPointY)
+		: std::optional<QPoint>();
+}
+
 void PeerListContent::removeRow(not_null<PeerListRow*> row) {
 	auto index = row->absoluteIndex();
 	auto isSearchResult = row->isSearchResult();
@@ -1998,10 +2024,12 @@ void PeerListContent::setSearchQuery(
 
 bool PeerListContent::submitted() {
 	if (const auto row = getRow(_selected.index)) {
+		_lastMousePosition = std::nullopt;
 		_controller->rowClicked(row);
 		return true;
 	} else if (showingSearch()) {
 		if (const auto row = getRow(RowIndex(0))) {
+			_lastMousePosition = std::nullopt;
 			_controller->rowClicked(row);
 			return true;
 		}
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index cfa5b66bc..4252b5fa2 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -327,6 +327,7 @@ public:
 	virtual void peerListScrollToTop() = 0;
 	virtual int peerListFullRowsCount() = 0;
 	virtual PeerListRow *peerListFindRow(PeerListRowId id) = 0;
+	virtual std::optional<QPoint> peerListLastRowMousePosition() = 0;
 	virtual void peerListSortRows(Fn<bool(const PeerListRow &a, const PeerListRow &b)> compare) = 0;
 	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 	virtual void peerListShowBox(
@@ -503,6 +504,9 @@ public:
 		return delegate()->peerListIsRowChecked(row);
 	}
 
+	virtual bool trackSelectedList() {
+		return true;
+	}
 	virtual bool searchInLocal() {
 		return true;
 	}
@@ -612,6 +616,7 @@ public:
 	void prependRow(std::unique_ptr<PeerListRow> row);
 	void prependRowFromSearchResult(not_null<PeerListRow*> row);
 	PeerListRow *findRow(PeerListRowId id);
+	std::optional<QPoint> lastRowMousePosition() const;
 	void updateRow(not_null<PeerListRow*> row) {
 		updateRow(row, RowIndex());
 	}
@@ -866,6 +871,9 @@ public:
 	PeerListRow *peerListFindRow(PeerListRowId id) override {
 		return _content->findRow(id);
 	}
+	std::optional<QPoint> peerListLastRowMousePosition() override {
+		return _content->lastRowMousePosition();
+	}
 	void peerListUpdateRow(not_null<PeerListRow*> row) override {
 		_content->updateRow(row);
 	}
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 6c0343b80..745e5eef8 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/ui_utility.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
@@ -109,6 +110,46 @@ private:
 
 };
 
+[[nodiscard]] std::vector<Ui::RoundImageCheckboxSegment> PrepareSegments(
+		int count,
+		int unread,
+		const QBrush &unreadBrush) {
+	Expects(unread <= count);
+	Expects(count > 0);
+
+	auto result = std::vector<Ui::RoundImageCheckboxSegment>();
+	const auto add = [&](bool unread) {
+		result.push_back({
+			.brush = unread ? unreadBrush : st::dialogsUnreadBgMuted->b,
+			.width = (unread
+				? st::dialogsStoriesFull.lineTwice / 2.
+				: st::dialogsStoriesFull.lineReadTwice / 2.),
+		});
+	};
+	result.reserve(count);
+	for (auto i = 0, till = count - unread; i != till; ++i) {
+		add(false);
+	}
+	for (auto i = 0; i != unread; ++i) {
+		add(true);
+	}
+	return result;
+}
+
+[[nodiscard]] QBrush CreateStoriesGradient() {
+	const auto &st = st::contactsWithStories.item;
+	const auto left = st.photoPosition.x();
+	const auto top = st.photoPosition.y();
+	auto gradient = QLinearGradient(
+		QPoint(left + st.photoSize, top),
+		QPoint(left, top + st.photoSize));
+	gradient.setStops({
+		{ 0., st::groupCallLive1->c },
+		{ 1., st::groupCallMuted1->c },
+	});
+	return QBrush(gradient);
+}
+
 StoriesRow::StoriesRow(
 	not_null<Main::Session*> session,
 	const QBrush &unread,
@@ -133,26 +174,8 @@ void StoriesRow::updateGradient(QBrush unread) {
 }
 
 void StoriesRow::refreshSegments() {
-	Expects(_unreadCount <= _count);
-	Expects(_count > 0);
-
-	auto segments = std::vector<Ui::RoundImageCheckboxSegment>();
-	const auto add = [&](bool unread) {
-		segments.push_back({
-			.brush = unread ? _unread : st::dialogsUnreadBgMuted->b,
-			.width = (unread
-				? st::dialogsStoriesFull.lineTwice / 2.
-				: st::dialogsStoriesFull.lineReadTwice / 2.),
-		});
-	};
-	segments.reserve(_count);
-	for (auto i = 0, count = _count - _unreadCount; i != count; ++i) {
-		add(false);
-	}
-	for (auto i = 0; i != _unreadCount; ++i) {
-		add(true);
-	}
-	setCustomizedCheckSegments(std::move(segments));
+	setCustomizedCheckSegments(
+		PrepareSegments(_count, _unreadCount, _unread));
 }
 
 StoriesController::StoriesController(
@@ -164,20 +187,10 @@ StoriesController::StoriesController(
 , _content(std::move(content))
 , _open(std::move(open))
 , _loadMore(std::move(loadMore)) {
-	const auto createGradient = [=] {
-		auto gradient = QLinearGradient(
-			QPoint(10, 0),
-			QPoint(0, 10));
-		gradient.setStops({
-			{ 0., st::groupCallLive1->c },
-			{ 1., st::groupCallMuted1->c },
-		});
-		_unread = QBrush(gradient);
-	};
-	createGradient();
+	_unread = CreateStoriesGradient();
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
-		createGradient();
+		_unread = CreateStoriesGradient();
 		for (auto i = 0, count = int(delegate()->peerListFullRowsCount())
 			; i != count
 			; ++i) {
@@ -248,6 +261,7 @@ void StoriesController::refresh(const Content &content) {
 			delegate()->peerListAppendRow(std::move(added));
 			delegate()->peerListSetRowChecked(raw, true);
 			raw->applySegments(element);
+			raw->finishCheckedAnimation();
 		}
 		++position;
 	}
@@ -351,6 +365,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 	auto controller = std::make_unique<ContactsBoxController>(
 		&sessionController->session());
 	controller->setStyleOverrides(&st::contactsWithStories);
+	controller->setStoriesShown(true);
 	const auto raw = controller.get();
 	auto init = [=](not_null<PeerListBox*> box) {
 		using namespace Dialogs::Stories;
@@ -647,6 +662,33 @@ void ContactsBoxController::prepare() {
 
 	prepareViewHook();
 
+	if (_storiesShown) {
+		_storiesUnread = CreateStoriesGradient();
+		style::PaletteChanged() | rpl::start_with_next([=] {
+			_storiesUnread = CreateStoriesGradient();
+			for (auto &entry : _storiesCounts) {
+				entry.second.count = entry.second.unread = -1;
+			}
+			updateStories();
+		}, lifetime());
+
+		const auto stories = &session().data().stories();
+		rpl::merge(
+			rpl::single(rpl::empty),
+			stories->sourcesChanged(Data::StorySourcesList::NotHidden),
+			stories->sourcesChanged(Data::StorySourcesList::Hidden)
+		) | rpl::start_with_next([=] {
+			updateStories();
+		}, lifetime());
+		stories->sourceChanged() | rpl::start_with_next([=](PeerId id) {
+			const auto source = stories->source(id);
+			const auto info = source
+				? source->info()
+				: Data::StoriesSourceInfo();
+			updateStoriesFor(id.value, info.count, info.unreadCount);
+		}, lifetime());
+	}
+
 	session().data().contactsLoaded().value(
 	) | rpl::start_with_next([=] {
 		rebuildRows();
@@ -692,6 +734,14 @@ std::unique_ptr<PeerListRow> ContactsBoxController::createSearchRow(
 void ContactsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
 	if (const auto window = peer->session().tryResolveWindow()) {
+		if (_storiesShown) {
+			const auto point = delegate()->peerListLastRowMousePosition();
+			const auto &st = st::contactsWithStories.item;
+			if (point && point->x() < st.photoPosition.x() + st.photoSize) {
+				window->openPeerStories(peer->id);
+				return;
+			}
+		}
 		window->showPeerHistory(row->peer());
 	}
 }
@@ -717,6 +767,55 @@ void ContactsBoxController::setSortMode(SortMode mode) {
 	}
 }
 
+void ContactsBoxController::setStoriesShown(bool shown) {
+	_storiesShown = shown;
+}
+
+void ContactsBoxController::updateStories() {
+	const auto stories = &_session->data().stories();
+	const auto &a = stories->sources(Data::StorySourcesList::NotHidden);
+	const auto &b = stories->sources(Data::StorySourcesList::Hidden);
+	auto checked = base::flat_set<PeerListRowId>();
+	for (const auto &info : ranges::views::concat(a, b)) {
+		const auto id = info.id.value;
+		checked.emplace(id);
+		updateStoriesFor(id, info.count, info.unreadCount);
+	}
+	for (auto i = begin(_storiesCounts); i != end(_storiesCounts); ++i) {
+		if (i->second.count && !checked.contains(i->first)) {
+			updateStoriesFor(i->first, 0, 0);
+		}
+	}
+}
+
+void ContactsBoxController::updateStoriesFor(
+		uint64 id,
+		int count,
+		int unread) {
+	if (const auto row = delegate()->peerListFindRow(id)) {
+		applyRowStories(row, count, unread);
+		delegate()->peerListUpdateRow(row);
+	}
+}
+
+void ContactsBoxController::applyRowStories(
+		not_null<PeerListRow*> row,
+		int count,
+		int unread,
+		bool force) {
+	auto &counts = _storiesCounts[row->id()];
+	if (!force && counts.count == count && counts.unread == unread) {
+		return;
+	}
+	counts.count = count;
+	counts.unread = unread;
+	delegate()->peerListSetRowChecked(row, count > 0);
+	if (count > 0) {
+		row->setCustomizedCheckSegments(
+			PrepareSegments(count, unread, _storiesUnread));
+	}
+}
+
 void ContactsBoxController::sort() {
 	switch (_sortMode) {
 	case SortMode::Alphabet: sortByName(); break;
@@ -762,7 +861,15 @@ bool ContactsBoxController::appendRow(not_null<UserData*> user) {
 		return false;
 	}
 	if (auto row = createRow(user)) {
+		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
+		if (_storiesShown) {
+			const auto stories = &session().data().stories();
+			if (const auto source = stories->source(user->id)) {
+				const auto info = source->info();
+				applyRowStories(raw, info.count, info.unreadCount, true);
+			}
+		}
 		return true;
 	}
 	return false;
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h
index 00106c392..46d1a184c 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.h
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h
@@ -128,12 +128,16 @@ public:
 	[[nodiscard]] std::unique_ptr<PeerListRow> createSearchRow(
 		not_null<PeerData*> peer) override final;
 	void rowClicked(not_null<PeerListRow*> row) override;
+	bool trackSelectedList() override {
+		return !_storiesShown;
+	}
 
 	enum class SortMode {
 		Alphabet,
 		Online,
 	};
 	void setSortMode(SortMode mode);
+	void setStoriesShown(bool shown);
 
 protected:
 	virtual std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user);
@@ -143,18 +147,33 @@ protected:
 	}
 
 private:
+	struct StoriesCount {
+		int count = 0;
+		int unread = 0;
+	};
 	void sort();
 	void sortByName();
 	void sortByOnline();
 	void rebuildRows();
+	void updateStories();
 	void checkForEmptyRows();
 	bool appendRow(not_null<UserData*> user);
+	void updateStoriesFor(uint64 id, int count, int unread);
+	void applyRowStories(
+		not_null<PeerListRow*> row,
+		int count,
+		int unread,
+		bool force = false);
 
 	const not_null<Main::Session*> _session;
 	SortMode _sortMode = SortMode::Alphabet;
 	base::Timer _sortByOnlineTimer;
 	rpl::lifetime _sortByOnlineLifetime;
 
+	QBrush _storiesUnread;
+	base::flat_map<uint64, StoriesCount> _storiesCounts;
+	bool _storiesShown = false;
+
 };
 
 class ChooseRecipientBoxController

From d7d8847c1d185cc2c215a1d891a88f3753f174a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Jul 2023 20:13:56 +0400
Subject: [PATCH 359/676] Show stories in chats list userpics.

---
 Telegram/SourceFiles/api/api_updates.cpp      |  4 +
 Telegram/SourceFiles/data/data_session.cpp    | 14 ++++
 Telegram/SourceFiles/data/data_stories.cpp    | 84 +++++++++++++++++--
 Telegram/SourceFiles/data/data_stories.h      | 16 ++++
 Telegram/SourceFiles/data/data_user.cpp       | 33 ++++++++
 Telegram/SourceFiles/data/data_user.h         | 12 +++
 .../dialogs/dialogs_inner_widget.cpp          | 26 +++---
 .../dialogs/dialogs_inner_widget.h            |  6 +-
 Telegram/SourceFiles/dialogs/dialogs_row.cpp  | 80 +++++++++++++++---
 Telegram/SourceFiles/dialogs/dialogs_row.h    |  9 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  8 ++
 11 files changed, 259 insertions(+), 33 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 55a15d2a7..3d7584a64 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -2524,6 +2524,10 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		_session->data().stories().apply(update.c_updateStory());
 	} break;
 
+	case mtpc_updateReadStories: {
+		_session->data().stories().apply(update.c_updateReadStories());
+	} break;
+
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index ea176d2bf..ca39658a6 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -525,6 +525,13 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 				| Flag::DiscardMinPhoto
 				| Flag::StoriesHidden
 				: Flag());
+		const auto storiesState = minimal
+			? std::optional<Data::Stories::PeerSourceState>()
+			: data.is_stories_unavailable()
+			? Data::Stories::PeerSourceState()
+			: !data.vstories_max_id()
+			? std::optional<Data::Stories::PeerSourceState>()
+			: stories().peerSourceState(result, data.vstories_max_id()->v);
 		const auto flagsSet = (data.is_deleted() ? Flag::Deleted : Flag())
 			| (data.is_verified() ? Flag::Verified : Flag())
 			| (data.is_scam() ? Flag::Scam : Flag())
@@ -551,6 +558,13 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 					MTP_long(data.vaccess_hash().value_or_empty()));
 			}
 		} else {
+			if (storiesState) {
+				result->setStoriesState(!storiesState->maxId
+					? UserData::StoriesState::None
+					: (storiesState->maxId > storiesState->readTill)
+					? UserData::StoriesState::HasUnread
+					: UserData::StoriesState::HasRead);
+			}
 			if (data.is_self()) {
 				result->input = MTP_inputPeerSelf();
 				result->inputUser = MTP_inputUserSelf();
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 8f27352a0..5b265f8a7 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -136,7 +136,7 @@ void Stories::apply(const MTPDupdateStory &data) {
 	i->second.ids.emplace(idDates);
 	const auto nowInfo = i->second.info();
 	if (user->isSelf() && i->second.readTill < idDates.id) {
-		i->second.readTill = idDates.id;
+		_readTill[user->id] = i->second.readTill = idDates.id;
 	}
 	if (wasInfo == nowInfo) {
 		return;
@@ -158,6 +158,11 @@ void Stories::apply(const MTPDupdateStory &data) {
 		refreshInList(StorySourcesList::NotHidden);
 	}
 	_sourceChanged.fire_copy(peerId);
+	updateUserStoriesState(user);
+}
+
+void Stories::apply(const MTPDupdateReadStories &data) {
+	bumpReadTill(peerFromUser(data.vuser_id()), data.vmax_id().v);
 }
 
 void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
@@ -166,6 +171,7 @@ void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
 		applyDeletedFromSources(peer->id, StorySourcesList::Hidden);
 		_all.erase(peer->id);
 		_sourceChanged.fire_copy(peer->id);
+		updateUserStoriesState(peer);
 	} else {
 		parseAndApply(*data);
 	}
@@ -281,6 +287,7 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 	} else if (user->isSelf()) {
 		result.readTill = result.ids.back().id;
 	}
+	_readTill[peerId] = result.readTill;
 	const auto info = result.info();
 	const auto i = _all.find(peerId);
 	if (i != end(_all)) {
@@ -317,6 +324,7 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 		applyDeletedFromSources(peerId, StorySourcesList::Hidden);
 	}
 	_sourceChanged.fire_copy(peerId);
+	updateUserStoriesState(result.user);
 }
 
 Story *Stories::parseAndApply(
@@ -684,12 +692,14 @@ void Stories::applyRemovedFromActive(FullStoryId id) {
 		const auto j = i->second.ids.lower_bound(StoryIdDates{ id.story });
 		if (j != end(i->second.ids) && j->id == id.story) {
 			i->second.ids.erase(j);
+			const auto user = i->second.user;
 			if (i->second.ids.empty()) {
 				_all.erase(i);
 				removeFromList(StorySourcesList::NotHidden);
 				removeFromList(StorySourcesList::Hidden);
 			}
 			_sourceChanged.fire_copy(id.peer);
+			updateUserStoriesState(user);
 		}
 	}
 }
@@ -891,22 +901,35 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 			_incrementViewsTimer.callOnce(kIncrementViewsDelay);
 		}
 	}
-	const auto i = _all.find(id.peer);
-	if (i == end(_all) || i->second.readTill >= id.story) {
+	if (!bumpReadTill(id.peer, id.story)) {
 		return;
-	} else if (!_markReadPending.contains(id.peer)) {
+	}
+	if (!_markReadPending.contains(id.peer)) {
 		sendMarkAsReadRequests();
 	}
 	_markReadPending.emplace(id.peer);
+	_markReadTimer.callOnce(kMarkAsReadDelay);
+}
+
+bool Stories::bumpReadTill(PeerId peerId, StoryId maxReadTill) {
+	auto &till = _readTill[peerId];
+	if (till < maxReadTill) {
+		till = maxReadTill;
+		updateUserStoriesState(_owner->peer(peerId));
+	}
+	const auto i = _all.find(peerId);
+	if (i == end(_all) || i->second.readTill >= maxReadTill) {
+		return false;
+	}
 	const auto wasUnreadCount = i->second.unreadCount();
-	i->second.readTill = id.story;
+	i->second.readTill = maxReadTill;
 	const auto nowUnreadCount = i->second.unreadCount();
 	if (wasUnreadCount != nowUnreadCount) {
 		const auto refreshInList = [&](StorySourcesList list) {
 			auto &sources = _sources[static_cast<int>(list)];
 			const auto i = ranges::find(
 				sources,
-				id.peer,
+				peerId,
 				&StoriesSourceInfo::id);
 			if (i != end(sources)) {
 				i->unreadCount = nowUnreadCount;
@@ -916,7 +939,7 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 		refreshInList(StorySourcesList::NotHidden);
 		refreshInList(StorySourcesList::Hidden);
 	}
-	_markReadTimer.callOnce(kMarkAsReadDelay);
+	return true;
 }
 
 void Stories::toggleHidden(
@@ -1408,6 +1431,53 @@ void Stories::setPreloadingInViewer(std::vector<FullStoryId> ids) {
 	}
 }
 
+std::optional<Stories::PeerSourceState> Stories::peerSourceState(
+		not_null<PeerData*> peer,
+		StoryId storyMaxId) {
+	const auto i = _readTill.find(peer->id);
+	if (_readTillReceived || (i != end(_readTill))) {
+		return PeerSourceState{
+			.maxId = storyMaxId,
+			.readTill = std::min(
+				storyMaxId,
+				(i != end(_readTill)) ? i->second : 0),
+		};
+	}
+	if (!_readTillsRequestId) {
+		const auto api = &_owner->session().api();
+		_readTillsRequestId = api->request(MTPstories_GetAllReadUserStories(
+		)).done([=](const MTPUpdates &result) {
+			_readTillReceived = true;
+			api->applyUpdates(result);
+			for (auto &[peer, maxId] : base::take(_pendingUserStateMaxId)) {
+				updateUserStoriesState(peer);
+			}
+		}).send();
+	}
+	_pendingUserStateMaxId[peer] = storyMaxId;
+	return std::nullopt;
+}
+
+void Stories::updateUserStoriesState(not_null<PeerData*> peer) {
+	const auto till = _readTill.find(peer->id);
+	const auto readTill = (till != end(_readTill)) ? till->second : 0;
+	const auto pendingMaxId = [&] {
+		const auto j = _pendingUserStateMaxId.find(peer);
+		return (j != end(_pendingUserStateMaxId)) ? j->second : 0;
+	};
+	const auto i = _all.find(peer->id);
+	const auto max = (i != end(_all))
+		? (i->second.ids.empty() ? 0 : i->second.ids.back().id)
+		: pendingMaxId();
+	if (const auto user = peer->asUser()) {
+		user->setStoriesState(!max
+			? UserData::StoriesState::None
+			: (max <= readTill)
+			? UserData::StoriesState::HasRead
+			: UserData::StoriesState::HasUnread);
+	}
+}
+
 void Stories::preloadSourcesChanged(StorySourcesList list) {
 	if (rebuildPreloadSources(list)) {
 		continuePreloading();
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 437a26a7b..c15b1fc6b 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -137,6 +137,7 @@ public:
 
 	void loadMore(StorySourcesList list);
 	void apply(const MTPDupdateStory &data);
+	void apply(const MTPDupdateReadStories &data);
 	void apply(not_null<PeerData*> peer, const MTPUserStories *data);
 	Story *applyFromWebpage(PeerId peerId, const MTPstoryItem &story);
 	void loadAround(FullStoryId id, StoriesContext context);
@@ -199,6 +200,14 @@ public:
 	void decrementPreloadingHiddenSources();
 	void setPreloadingInViewer(std::vector<FullStoryId> ids);
 
+	struct PeerSourceState {
+		StoryId maxId = 0;
+		StoryId readTill = 0;
+	};
+	[[nodiscard]] std::optional<PeerSourceState> peerSourceState(
+		not_null<PeerData*> peer,
+		StoryId storyMaxId);
+
 private:
 	struct Saved {
 		StoriesIds ids;
@@ -222,6 +231,7 @@ private:
 		const QVector<MTPStoryItem> &list);
 	void sendResolveRequests();
 	void finalizeResolve(FullStoryId id);
+	void updateUserStoriesState(not_null<PeerData*> peer);
 
 	void applyDeleted(FullStoryId id);
 	void applyExpired(FullStoryId id);
@@ -230,6 +240,7 @@ private:
 	void removeDependencyStory(not_null<Story*> story);
 	void savedStateUpdated(not_null<Story*> story);
 	void sort(StorySourcesList list);
+	bool bumpReadTill(PeerId peerId, StoryId maxReadTill);
 
 	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
 		not_null<Story*> story);
@@ -317,6 +328,11 @@ private:
 	int _preloadingHiddenSourcesCounter = 0;
 	int _preloadingMainSourcesCounter = 0;
 
+	base::flat_map<PeerId, StoryId> _readTill;
+	base::flat_map<not_null<PeerData*>, StoryId> _pendingUserStateMaxId;
+	mtpRequestId _readTillsRequestId = 0;
+	bool _readTillReceived = false;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index be4a9fa6f..d25f37780 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user_names.h"
 #include "data/data_wall_paper.h"
 #include "data/notify/data_notify_settings.h"
+#include "history/history.h"
 #include "api/api_peer_photo.h"
 #include "apiwrap.h"
 #include "ui/text/text_options.h"
@@ -125,6 +126,38 @@ void UserData::setPrivateForwardName(const QString &name) {
 	_privateForwardName = name;
 }
 
+bool UserData::hasActiveStories() const {
+	return flags() & UserDataFlag::HasActiveStories;
+}
+
+bool UserData::hasUnreadStories() const {
+	return flags() & UserDataFlag::HasUnreadStories;
+}
+
+void UserData::setStoriesState(StoriesState state) {
+	Expects(state != StoriesState::Unknown);
+
+	const auto was = flags();
+	using Flag = UserDataFlag;
+	switch (state) {
+	case StoriesState::None:
+		_flags.remove(Flag::HasActiveStories | Flag::HasUnreadStories);
+		break;
+	case StoriesState::HasRead:
+		_flags.set(
+			(flags() & ~Flag::HasUnreadStories) | Flag::HasActiveStories);
+		break;
+	case StoriesState::HasUnread:
+		_flags.add(Flag::HasActiveStories | Flag::HasUnreadStories);
+		break;
+	}
+	if (flags() != was) {
+		if (const auto history = owner().historyLoaded(this)) {
+			history->updateChatListEntryPostponed();
+		}
+	}
+}
+
 void UserData::setName(const QString &newFirstName, const QString &newLastName, const QString &newPhoneName, const QString &newUsername) {
 	bool changeName = !newFirstName.isEmpty() || !newLastName.isEmpty();
 
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index 37005d124..ad6d0b7ae 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -63,6 +63,8 @@ enum class UserDataFlag {
 	VoiceMessagesForbidden = (1 << 16),
 	PersonalPhoto = (1 << 17),
 	StoriesHidden = (1 << 18),
+	HasActiveStories = (1 << 19),
+	HasUnreadStories = (1 << 20),
 };
 inline constexpr bool is_flag_type(UserDataFlag) { return true; };
 using UserDataFlags = base::flags<UserDataFlag>;
@@ -174,6 +176,16 @@ public:
 	[[nodiscard]] QString privateForwardName() const;
 	void setPrivateForwardName(const QString &name);
 
+	enum class StoriesState {
+		Unknown,
+		None,
+		HasRead,
+		HasUnread,
+	};
+	[[nodiscard]] bool hasActiveStories() const;
+	[[nodiscard]] bool hasUnreadStories() const;
+	void setStoriesState(StoriesState state);
+
 private:
 	auto unavailableReasons() const
 		-> const std::vector<Data::UnavailableReason> & override;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 091ebaf16..6b2b7efe7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1294,6 +1294,7 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 	}
 	_mouseSelection = true;
 	_lastMousePosition = globalPosition;
+	_lastRowLocalMouseX = local.x();
 
 	const auto w = width();
 	const auto mouseY = local.y();
@@ -2209,6 +2210,7 @@ FilterId InnerWidget::filterId() const {
 void InnerWidget::clearSelection() {
 	_mouseSelection = false;
 	_lastMousePosition = std::nullopt;
+	_lastRowLocalMouseX = -1;
 	if (isSelected()) {
 		updateSelectedRow();
 		_collapsedSelected = -1;
@@ -2907,6 +2909,7 @@ void InnerWidget::resizeEmptyLabel() {
 void InnerWidget::clearMouseSelection(bool clearSelection) {
 	_mouseSelection = false;
 	_lastMousePosition = std::nullopt;
+	_lastRowLocalMouseX = -1;
 	if (clearSelection) {
 		if (_state == WidgetState::Default) {
 			_collapsedSelected = -1;
@@ -3375,29 +3378,30 @@ ChosenRow InnerWidget::computeChosenRow() const {
 	if (_state == WidgetState::Default) {
 		if (_selected) {
 			return {
-				_selected->key(),
-				Data::UnreadMessagePosition
+				.key = _selected->key(),
+				.message = Data::UnreadMessagePosition,
 			};
 		}
 	} else if (_state == WidgetState::Filtered) {
 		if (base::in_range(_filteredSelected, 0, _filterResults.size())) {
 			return {
-				_filterResults[_filteredSelected].key(),
-				Data::UnreadMessagePosition,
-				true
+				.key = _filterResults[_filteredSelected].key(),
+				.message = Data::UnreadMessagePosition,
+				.filteredRow = true,
 			};
 		} else if (base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())) {
+			const auto peer = _peerSearchResults[_peerSearchSelected]->peer;
 			return {
-				session().data().history(_peerSearchResults[_peerSearchSelected]->peer),
-				Data::UnreadMessagePosition
+				.key = session().data().history(peer),
+				.message = Data::UnreadMessagePosition
 			};
 		} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
 			const auto result = _searchResults[_searchedSelected].get();
 			const auto topic = result->topic();
 			const auto item = result->item();
 			return {
-				(topic ? (Entry*)topic : (Entry*)item->history()),
-				item->position()
+				.key = (topic ? (Entry*)topic : (Entry*)item->history()),
+				.message = item->position()
 			};
 		}
 	}
@@ -3413,10 +3417,12 @@ bool InnerWidget::chooseRow(
 	} else if (chooseHashtag()) {
 		return true;
 	}
-	const auto modifyChosenRow = [](
+	const auto modifyChosenRow = [&](
 			ChosenRow row,
 			Qt::KeyboardModifiers modifiers) {
 		row.newWindow = (modifiers & Qt::ControlModifier);
+		row.userpicClick = (_lastRowLocalMouseX >= 0)
+			&& (_lastRowLocalMouseX < _st->nameLeft);
 		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 b23aefa0d..c72d9667f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -65,8 +65,9 @@ class IndexedList;
 struct ChosenRow {
 	Key key;
 	Data::MessagePosition message;
-	bool filteredRow = false;
-	bool newWindow = false;
+	bool userpicClick : 1 = false;
+	bool filteredRow : 1 = false;
+	bool newWindow : 1 = false;
 };
 
 enum class SearchRequestType {
@@ -416,6 +417,7 @@ private:
 	FilterId _filterId = 0;
 	bool _mouseSelection = false;
 	std::optional<QPoint> _lastMousePosition;
+	int _lastRowLocalMouseX = -1;
 	Qt::MouseButton _pressButton = Qt::LeftButton;
 
 	Data::Folder *_openedFolder = nullptr;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index c5145c368..77f9aca72 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum.h"
 #include "data/data_session.h"
 #include "data/data_peer_values.h"
+#include "data/data_user.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
@@ -330,6 +331,7 @@ void Row::ensureCornerBadgeUserpic() const {
 
 void Row::PaintCornerBadgeFrame(
 		not_null<CornerBadgeUserpic*> data,
+		int framePadding,
 		not_null<PeerData*> peer,
 		Ui::VideoUserpic *videoUserpic,
 		Ui::PeerUserpicView &view,
@@ -337,6 +339,19 @@ void Row::PaintCornerBadgeFrame(
 	data->frame.fill(Qt::transparent);
 
 	Painter q(&data->frame);
+	q.translate(framePadding, framePadding);
+	auto hq = std::optional<PainterHighQualityEnabler>();
+	if (data->storiesShown) {
+		hq.emplace(q);
+		const auto line = st::dialogsStoriesFull.lineTwice / 2.;
+		const auto skip = line * 3 / 2.;
+		const auto scale = 1. - (2 * skip / context.st->photoSize);
+		const auto center = context.st->photoSize / 2.;
+		q.save();
+		q.translate(center, center);
+		q.scale(scale, scale);
+		q.translate(-center, -center);
+	}
 	PaintUserpic(
 		q,
 		peer,
@@ -347,9 +362,37 @@ void Row::PaintCornerBadgeFrame(
 		data->frame.width() / data->frame.devicePixelRatio(),
 		context.st->photoSize,
 		context.paused);
+	if (data->storiesShown) {
+		q.restore();
+
+		const auto st = context.st;
+		const auto storiesUnreadBrush = [&] {
+			const auto left = st->padding.left();
+			const auto top = st->padding.top();
+			auto gradient = QLinearGradient(
+				QPoint(left + st->photoSize, top),
+				QPoint(left, top + st->photoSize));
+			gradient.setStops({
+				{ 0., st::groupCallLive1->c },
+				{ 1., st::groupCallMuted1->c },
+			});
+			return QBrush(gradient);
+		};
+		const auto storiesBrush = data->storiesUnread
+			? storiesUnreadBrush()
+			: context.active
+			? st::dialogsUnreadBgMutedActive->b
+			: st::dialogsUnreadBgMuted->b;
+		const auto storiesLine = data->storiesUnread
+			? (st::dialogsStoriesFull.lineTwice / 2.)
+			: (st::dialogsStoriesFull.lineReadTwice / 2.);
+		const auto pen = QPen(storiesBrush, storiesLine);
+		q.setPen(pen);
+		q.drawEllipse(0, 0, st->photoSize, st->photoSize);
+	}
 
 	const auto &manager = data->layersManager;
-	if (const auto p = manager.progressForLayer(kBottomLayer); p) {
+	if (const auto p = manager.progressForLayer(kBottomLayer); p > 0.) {
 		const auto size = context.st->photoSize;
 		if (data->cacheTTL.isNull() && peer->messagesTTL()) {
 			data->cacheTTL = CornerBadgeTTL(peer, view, size);
@@ -364,7 +407,9 @@ void Row::PaintCornerBadgeFrame(
 		return;
 	}
 
-	PainterHighQualityEnabler hq(q);
+	if (!hq) {
+		hq.emplace(q);
+	}
 	q.setCompositionMode(QPainter::CompositionMode_Source);
 
 	const auto size = peer->isUser()
@@ -401,7 +446,14 @@ void Row::paintUserpic(
 	const auto cornerBadgeShown = !_cornerBadgeUserpic
 		? _cornerBadgeShown
 		: !_cornerBadgeUserpic->layersManager.isDisplayedNone();
-	if (!historyForCornerBadge || !cornerBadgeShown) {
+	const auto storiesUser = historyForCornerBadge
+		? historyForCornerBadge->peer->asUser()
+		: nullptr;
+	const auto storiesShown = (storiesUser
+		&& storiesUser->hasActiveStories()) ? 1 : 0;
+	const auto storiesUnread = (storiesShown
+		&& storiesUser->hasUnreadStories()) ? 1 : 0;
+	if (!historyForCornerBadge || (!cornerBadgeShown && !storiesShown)) {
 		BasicRow::paintUserpic(
 			p,
 			peer,
@@ -415,12 +467,12 @@ void Row::paintUserpic(
 	}
 	ensureCornerBadgeUserpic();
 	const auto ratio = style::DevicePixelRatio();
-	const auto added = std::max({
+	const auto framePadding = std::max({
 		-st::dialogsCallBadgeSkip.x(),
 		-st::dialogsCallBadgeSkip.y(),
-		0 });
-	const auto frameSide = (context.st->photoSize + added)
-		* style::DevicePixelRatio();
+		st::lineWidth * 2 });
+	const auto frameSide = (2 * framePadding + context.st->photoSize)
+		* ratio;
 	const auto frameSize = QSize(frameSide, frameSide);
 	if (_cornerBadgeUserpic->frame.size() != frameSize) {
 		_cornerBadgeUserpic->frame = QImage(
@@ -432,6 +484,7 @@ void Row::paintUserpic(
 	key.first += peer->messagesTTL();
 	const auto frameIndex = videoUserpic ? videoUserpic->frameIndex() : -1;
 	const auto paletteVersion = style::PaletteVersion();
+	const auto active = context.active ? 1 : 0;
 	const auto keyChanged = (_cornerBadgeUserpic->key != key)
 		|| (_cornerBadgeUserpic->paletteVersion != paletteVersion);
 	if (keyChanged) {
@@ -439,24 +492,29 @@ void Row::paintUserpic(
 	}
 	if (keyChanged
 		|| !_cornerBadgeUserpic->layersManager.isFinished()
-		|| _cornerBadgeUserpic->active != context.active
+		|| _cornerBadgeUserpic->active != active
 		|| _cornerBadgeUserpic->frameIndex != frameIndex
+		|| _cornerBadgeUserpic->storiesShown != storiesShown
+		|| _cornerBadgeUserpic->storiesUnread != storiesUnread
 		|| videoUserpic) {
 		_cornerBadgeUserpic->key = key;
 		_cornerBadgeUserpic->paletteVersion = paletteVersion;
-		_cornerBadgeUserpic->active = context.active;
+		_cornerBadgeUserpic->active = active;
+		_cornerBadgeUserpic->storiesShown = storiesShown;
+		_cornerBadgeUserpic->storiesUnread = storiesUnread;
 		_cornerBadgeUserpic->frameIndex = frameIndex;
 		_cornerBadgeUserpic->layersManager.markFrameShown();
 		PaintCornerBadgeFrame(
 			_cornerBadgeUserpic.get(),
+			framePadding,
 			peer,
 			videoUserpic,
 			userpicView(),
 			context);
 	}
 	p.drawImage(
-		context.st->padding.left(),
-		context.st->padding.top(),
+		context.st->padding.left() - framePadding,
+		context.st->padding.top() - framePadding,
 		_cornerBadgeUserpic->frame);
 	if (historyForCornerBadge->peer->isUser()) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h
index d79c2efdf..735b03004 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.h
@@ -167,11 +167,13 @@ private:
 	struct CornerBadgeUserpic {
 		InMemoryKey key;
 		CornerLayersManager layersManager;
-		int paletteVersion = 0;
-		int frameIndex = -1;
-		bool active = false;
 		QImage frame;
 		QImage cacheTTL;
+		int frameIndex = -1;
+		int paletteVersion : 24 = 0;
+		int storiesShown : 1 = 0;
+		int storiesUnread : 1 = 0;
+		int active : 1 = 0;
 	};
 
 	void setCornerBadgeShown(
@@ -180,6 +182,7 @@ private:
 	void ensureCornerBadgeUserpic() const;
 	static void PaintCornerBadgeFrame(
 		not_null<CornerBadgeUserpic*> data,
+		int framePadding,
 		not_null<PeerData*> peer,
 		Ui::VideoUserpic *videoUserpic,
 		Ui::PeerUserpicView &view,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6c3e2e059..72e8b9ea9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -503,6 +503,14 @@ void Widget::chosenRow(const ChosenRow &row) {
 		return;
 	} else if (history) {
 		const auto peer = history->peer;
+		if (const auto user = history->peer->asUser()) {
+			if (row.message.fullId.msg == ShowAtUnreadMsgId) {
+				if (row.userpicClick && user->hasActiveStories()) {
+					controller()->openPeerStories(user->id);
+					return;
+				}
+			}
+		}
 		const auto showAtMsgId = controller()->uniqueChatsInSearchResults()
 			? ShowAtUnreadMsgId
 			: row.message.fullId.msg;

From a0ffa1588597db999dcdf49f532b03a822883141 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 11:55:16 +0400
Subject: [PATCH 360/676] Update story mention layout, add outline.

Also use uint32 for bool-bitfields, otherwise:

int a : 1 = 0;
...
const auto test = true;
const auto b = test ? 1 : 0;
if (a != b) {
    a = b;
    ...
}
Assert(a == b); // Violation, because a == -1, not 1 (after a = b).
---
 .../boxes/peer_list_controllers.cpp           |  2 +-
 Telegram/SourceFiles/data/data_stories.cpp    | 63 ++++++++++++++-----
 Telegram/SourceFiles/data/data_stories.h      |  9 ++-
 Telegram/SourceFiles/dialogs/dialogs_row.cpp  |  3 +
 Telegram/SourceFiles/dialogs/dialogs_row.h    | 14 ++---
 .../dialogs/ui/dialogs_stories_content.cpp    |  6 +-
 .../dialogs/ui/dialogs_stories_list.h         |  6 +-
 .../history/view/media/history_view_photo.cpp |  4 +-
 .../history/view/media/history_view_photo.h   |  8 +--
 .../view/media/history_view_service_box.cpp   |  8 ++-
 .../view/media/history_view_service_box.h     |  4 ++
 .../view/media/history_view_story_mention.cpp | 55 +++++++++++++---
 .../view/media/history_view_story_mention.h   |  8 ++-
 Telegram/SourceFiles/ui/chat/chat.style       |  9 ++-
 Telegram/SourceFiles/ui/userpic_view.h        |  4 +-
 15 files changed, 151 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 745e5eef8..5137b5c99 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -163,7 +163,7 @@ StoriesRow::StoriesRow(
 void StoriesRow::applySegments(const Dialogs::Stories::Element &element) {
 	Expects(element.unreadCount <= element.count);
 
-	_count = std::max(element.count, 1);
+	_count = int(std::max(element.count, 1U));
 	_unreadCount = element.unreadCount;
 	refreshSegments();
 }
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 5b265f8a7..6c6991bd5 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -75,9 +75,9 @@ StoriesSourceInfo StoriesSource::info() const {
 	return {
 		.id = user->id,
 		.last = ids.empty() ? 0 : ids.back().date,
-		.count = std::min(int(ids.size()), kMaxSegmentsCount),
-		.unreadCount = std::min(unreadCount(), kMaxSegmentsCount),
-		.premium = user->isPremium() ? 1 : 0,
+		.count = uint32(std::min(int(ids.size()), kMaxSegmentsCount)),
+		.unreadCount = uint32(std::min(unreadCount(), kMaxSegmentsCount)),
+		.premium = user->isPremium() ? 1U : 0U,
 	};
 }
 
@@ -913,9 +913,25 @@ void Stories::markAsRead(FullStoryId id, bool viewed) {
 
 bool Stories::bumpReadTill(PeerId peerId, StoryId maxReadTill) {
 	auto &till = _readTill[peerId];
+	auto refreshItems = std::vector<StoryId>();
+	const auto guard = gsl::finally([&] {
+		for (const auto id : refreshItems) {
+			_owner->refreshStoryItemViews({ peerId, id });
+		}
+	});
 	if (till < maxReadTill) {
+		const auto from = till;
 		till = maxReadTill;
 		updateUserStoriesState(_owner->peer(peerId));
+		const auto i = _stories.find(peerId);
+		if (i != end(_stories)) {
+			refreshItems = ranges::make_subrange(
+				i->second.lower_bound(from + 1),
+				i->second.lower_bound(till + 1)
+			) | ranges::views::transform([](const auto &pair) {
+				return pair.first;
+			}) | ranges::to_vector;
+		}
 	}
 	const auto i = _all.find(peerId);
 	if (i == end(_all) || i->second.readTill >= maxReadTill) {
@@ -1443,21 +1459,40 @@ std::optional<Stories::PeerSourceState> Stories::peerSourceState(
 				(i != end(_readTill)) ? i->second : 0),
 		};
 	}
-	if (!_readTillsRequestId) {
-		const auto api = &_owner->session().api();
-		_readTillsRequestId = api->request(MTPstories_GetAllReadUserStories(
-		)).done([=](const MTPUpdates &result) {
-			_readTillReceived = true;
-			api->applyUpdates(result);
-			for (auto &[peer, maxId] : base::take(_pendingUserStateMaxId)) {
-				updateUserStoriesState(peer);
-			}
-		}).send();
-	}
+	requestReadTills();
 	_pendingUserStateMaxId[peer] = storyMaxId;
 	return std::nullopt;
 }
 
+void Stories::requestReadTills() {
+	if (_readTillReceived || _readTillsRequestId) {
+		return;
+	}
+	const auto api = &_owner->session().api();
+	_readTillsRequestId = api->request(MTPstories_GetAllReadUserStories(
+	)).done([=](const MTPUpdates &result) {
+		_readTillReceived = true;
+		api->applyUpdates(result);
+		for (auto &[peer, maxId] : base::take(_pendingUserStateMaxId)) {
+			updateUserStoriesState(peer);
+		}
+		for (const auto &storyId : base::take(_pendingReadTillItems)) {
+			_owner->refreshStoryItemViews(storyId);
+		}
+	}).send();
+}
+
+bool Stories::isUnread(not_null<Story*> story) {
+	const auto till = _readTill.find(story->peer()->id);
+	if (till == end(_readTill) && !_readTillReceived) {
+		requestReadTills();
+		_pendingReadTillItems.emplace(story->fullId());
+		return false;
+	}
+	const auto readTill = (till != end(_readTill)) ? till->second : 0;
+	return (story->id() > readTill);
+}
+
 void Stories::updateUserStoriesState(not_null<PeerData*> peer) {
 	const auto till = _readTill.find(peer->id);
 	const auto readTill = (till != end(_readTill)) ? till->second : 0;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index c15b1fc6b..e1bb0dcb6 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -41,9 +41,9 @@ struct StoriesIds {
 struct StoriesSourceInfo {
 	PeerId id = 0;
 	TimeId last = 0;
-	int count : 15 = 0;
-	int unreadCount : 15 = 0;
-	int premium : 1 = 0;
+	uint32 count : 15 = 0;
+	uint32 unreadCount : 15 = 0;
+	uint32 premium : 1 = 0;
 
 	friend inline bool operator==(
 		StoriesSourceInfo,
@@ -207,6 +207,7 @@ public:
 	[[nodiscard]] std::optional<PeerSourceState> peerSourceState(
 		not_null<PeerData*> peer,
 		StoryId storyMaxId);
+	[[nodiscard]] bool isUnread(not_null<Story*> story);
 
 private:
 	struct Saved {
@@ -241,6 +242,7 @@ private:
 	void savedStateUpdated(not_null<Story*> story);
 	void sort(StorySourcesList list);
 	bool bumpReadTill(PeerId peerId, StoryId maxReadTill);
+	void requestReadTills();
 
 	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
 		not_null<Story*> story);
@@ -329,6 +331,7 @@ private:
 	int _preloadingMainSourcesCounter = 0;
 
 	base::flat_map<PeerId, StoryId> _readTill;
+	base::flat_set<FullStoryId> _pendingReadTillItems;
 	base::flat_map<not_null<PeerData*>, StoryId> _pendingUserStateMaxId;
 	mtpRequestId _readTillsRequestId = 0;
 	bool _readTillReceived = false;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 77f9aca72..326ec6db4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -367,6 +367,9 @@ void Row::PaintCornerBadgeFrame(
 
 		const auto st = context.st;
 		const auto storiesUnreadBrush = [&] {
+			if (context.active) {
+				return st::dialogsUnreadBgActive->b;
+			}
 			const auto left = st->padding.left();
 			const auto top = st->padding.top();
 			auto gradient = QLinearGradient(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h
index 735b03004..78e638093 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.h
@@ -170,10 +170,10 @@ private:
 		QImage frame;
 		QImage cacheTTL;
 		int frameIndex = -1;
-		int paletteVersion : 24 = 0;
-		int storiesShown : 1 = 0;
-		int storiesUnread : 1 = 0;
-		int active : 1 = 0;
+		uint32 paletteVersion : 24 = 0;
+		uint32 storiesShown : 1 = 0;
+		uint32 storiesUnread : 1 = 0;
+		uint32 active : 1 = 0;
 	};
 
 	void setCornerBadgeShown(
@@ -192,9 +192,9 @@ private:
 	mutable std::unique_ptr<CornerBadgeUserpic> _cornerBadgeUserpic;
 	int _top = 0;
 	int _height = 0;
-	int _index : 30 = 0;
-	int _cornerBadgeShown : 1 = 0;
-	int _topicJumpRipple : 1 = 0;
+	uint32 _index : 30 = 0;
+	uint32 _cornerBadgeShown : 1 = 0;
+	uint32 _topicJumpRipple : 1 = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 329f61296..b882842ca 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -353,7 +353,7 @@ Content State::next() {
 			.thumbnail = std::move(userpic),
 			.count = info.count,
 			.unreadCount = info.unreadCount,
-			.skipSmall = user->isSelf() ? 1 : 0,
+			.skipSmall = user->isSelf() ? 1U : 0U,
 		});
 	}
 	return result;
@@ -424,8 +424,8 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 							result.elements.push_back({
 								.id = uint64(id),
 								.thumbnail = MakeStoryThumbnail(*maybe),
-								.count = 1,
-								.unreadCount = (id > readTill) ? 1 : 0,
+								.count = 1U,
+								.unreadCount = (id > readTill) ? 1U : 0U,
 							});
 						}
 					} else if (maybe.error() == Data::NoStory::Unknown) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 9bbca05b0..a3b44d04a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -36,9 +36,9 @@ struct Element {
 	uint64 id = 0;
 	QString name;
 	std::shared_ptr<Thumbnail> thumbnail;
-	int count : 15 = 0;
-	int unreadCount : 15 = 0;
-	int skipSmall : 1 = 0;
+	uint32 count : 15 = 0;
+	uint32 unreadCount : 15 = 0;
+	uint32 skipSmall : 1 = 0;
 
 	friend inline bool operator==(
 		const Element &a,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 960a4cd16..a7f08a50d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -164,7 +164,7 @@ void Photo::unloadHeavyPart() {
 
 QSize Photo::countOptimalSize() {
 	if (_serviceWidth > 0) {
-		return { _serviceWidth, _serviceWidth };
+		return { int(_serviceWidth), int(_serviceWidth) };
 	}
 
 	if (_parent->media() != this) {
@@ -209,7 +209,7 @@ QSize Photo::countOptimalSize() {
 
 QSize Photo::countCurrentSize(int newWidth) {
 	if (_serviceWidth) {
-		return { _serviceWidth, _serviceWidth };
+		return { int(_serviceWidth), int(_serviceWidth) };
 	}
 	const auto thumbMaxWidth = qMin(newWidth, st::maxMediaSize);
 	const auto minWidth = std::clamp(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 31d2b08bc..f6d7062f0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -167,10 +167,10 @@ private:
 	const std::unique_ptr<MediaSpoiler> _spoiler;
 	mutable QImage _imageCache;
 	mutable std::optional<Ui::BubbleRounding> _imageCacheRounding;
-	int _serviceWidth : 29 = 0;
-	mutable int _imageCacheForum : 1 = 0;
-	mutable int _imageCacheBlurred : 1 = 0;
-	mutable int _story : 1 = 0;
+	uint32 _serviceWidth : 29 = 0;
+	mutable uint32 _imageCacheForum : 1 = 0;
+	mutable uint32 _imageCacheBlurred : 1 = 0;
+	mutable uint32 _story : 1 = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
index e425bdf65..57369d1fa 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
@@ -81,8 +81,7 @@ ServiceBox::ServiceBox(
 		+ _subtitle.countHeight(_maxWidth)
 		+ (_button.empty()
 			? 0
-			: (st::msgServiceGiftBoxButtonMargins.top()
-				+ _button.size.height()))
+			: (_content->buttonSkip() + _button.size.height()))
 		+ st::msgServiceGiftBoxButtonMargins.bottom()))
 , _innerSize(_size - QSize(0, st::msgServiceGiftBoxTopSkip)) {
 }
@@ -165,6 +164,11 @@ TextState ServiceBox::textState(QPoint point, StateRequest request) const {
 		if (rect.contains(point)) {
 			result.link = _button.link;
 			_button.lastPoint = point - rect.topLeft();
+		} else if (contentRect().contains(point)) {
+			if (!_contentLink) {
+				_contentLink = _content->createViewLink();
+			}
+			result.link = _contentLink;
 		}
 	}
 	return result;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.h b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
index 94347d401..1ae0c30ea 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
@@ -23,6 +23,9 @@ public:
 	[[nodiscard]] virtual QSize size() = 0;
 	[[nodiscard]] virtual QString title() = 0;
 	[[nodiscard]] virtual TextWithEntities subtitle() = 0;
+	[[nodiscard]] virtual int buttonSkip() {
+		return top();
+	}
 	[[nodiscard]] virtual QString button() = 0;
 	virtual void draw(
 		Painter &p,
@@ -84,6 +87,7 @@ private:
 
 	const not_null<Element*> _parent;
 	const std::unique_ptr<ServiceBoxContent> _content;
+	mutable ClickHandlerPtr _contentLink;
 
 	struct Button {
 		void drawBg(QPainter &p) const;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
index fb9f62f29..a4d255fd2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/chat/chat_style.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/painter.h"
@@ -39,13 +40,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 namespace {
 
+constexpr auto kReadOutlineAlpha = 0.5;
+
 } // namespace
 
 StoryMention::StoryMention(
 	not_null<Element*> parent,
 	not_null<Data::Story*> story)
 : _parent(parent)
-, _story(story) {
+, _story(story)
+, _unread(story->owner().stories().isUnread(story) ? 1 : 0) {
 }
 
 StoryMention::~StoryMention() = default;
@@ -62,6 +66,10 @@ QString StoryMention::title() {
 	return QString();
 }
 
+int StoryMention::buttonSkip() {
+	return st::storyMentionButtonSkip;
+}
+
 QString StoryMention::button() {
 	return tr::lng_action_story_mention_button(tr::now);
 }
@@ -86,7 +94,7 @@ void StoryMention::draw(
 		Painter &p,
 		const PaintContext &context,
 		const QRect &geometry) {
-	const auto showStory = !_story->forbidsForward();
+	const auto showStory = _story->forbidsForward() ? 0 : 1;
 	if (!_thumbnail || _thumbnailFromStory != showStory) {
 		using namespace Dialogs::Stories;
 		const auto item = _parent->data();
@@ -97,18 +105,49 @@ void StoryMention::draw(
 				? history->session().user()
 				: history->peer);
 		_thumbnailFromStory = showStory;
-		_subscribed = false;
+		_subscribed = 0;
 	}
 	if (!_subscribed) {
 		_thumbnail->subscribeToUpdates([=] {
 			_parent->data()->history()->owner().requestViewRepaint(_parent);
 		});
-		_subscribed = true;
+		_subscribed = 1;
 	}
 
+	const auto padding = (geometry.width() - st::storyMentionSize) / 2;
+	const auto size = geometry.width() - 2 * padding;
 	p.drawImage(
-		geometry.topLeft(),
-		_thumbnail->image(st::msgServicePhotoWidth));
+		geometry.topLeft() + QPoint(padding, padding),
+		_thumbnail->image(size));
+
+	const auto thumbnail = geometry.marginsRemoved(
+		QMargins(padding, padding, padding, padding));
+	const auto added = 0.5 * (_unread
+		? st::storyMentionUnreadSkipTwice
+		: st::storyMentionReadSkipTwice);
+	const auto outline = thumbnail.marginsAdded(
+		QMargins(added, added, added, added));
+	if (_unread && _paletteVersion != style::PaletteVersion()) {
+		_paletteVersion = style::PaletteVersion();
+		auto gradient = QLinearGradient(
+			outline.topRight(),
+			outline.bottomLeft());
+		gradient.setStops({
+			{ 0., st::groupCallLive1->c },
+			{ 1., st::groupCallMuted1->c },
+		});
+		_unreadBrush = QBrush(gradient);
+	}
+	auto readColor = context.st->msgServiceFg()->c;
+	readColor.setAlphaF(std::min(readColor.alphaF(), kReadOutlineAlpha));
+	p.setPen(QPen(
+		_unread ? _unreadBrush : QBrush(readColor),
+		0.5 * (_unread
+			? st::storyMentionUnreadStrokeTwice
+			: st::storyMentionReadStrokeTwice)));
+	p.setBrush(Qt::NoBrush);
+	auto hq = PainterHighQualityEnabler(p);
+	p.drawEllipse(outline);
 }
 
 void StoryMention::stickerClearLoopPlayed() {
@@ -121,12 +160,12 @@ std::unique_ptr<StickerPlayer> StoryMention::stickerTakePlayer(
 }
 
 bool StoryMention::hasHeavyPart() {
-	return _subscribed;
+	return _subscribed != 0;
 }
 
 void StoryMention::unloadHeavyPart() {
 	if (_subscribed) {
-		_subscribed = false;
+		_subscribed = 0;
 		_thumbnail->subscribeToUpdates(nullptr);
 	}
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.h b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
index 9cdacebcb..fea24787f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
@@ -32,6 +32,7 @@ public:
 	QSize size() override;
 	QString title() override;
 	TextWithEntities subtitle() override;
+	int buttonSkip() override;
 	QString button() override;
 	void draw(
 		Painter &p,
@@ -57,8 +58,11 @@ private:
 	const not_null<Element*> _parent;
 	const not_null<Data::Story*> _story;
 	std::shared_ptr<Thumbnail> _thumbnail;
-	bool _thumbnailFromStory = false;
-	bool _subscribed = false;
+	QBrush _unreadBrush;
+	uint32 _paletteVersion : 29 = 0;
+	uint32 _thumbnailFromStory : 1 = 0;
+	uint32 _subscribed : 1 = 0;
+	uint32 _unread : 1 = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 56f84a8e6..4119099de 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -841,7 +841,7 @@ searchInChatPeerList: PeerList(defaultPeerList) {
 }
 
 msgServiceGiftBoxSize: size(206px, 231px); // Plus msgServiceGiftBoxTopSkip.
-msgServiceGiftBoxRadius: 12px;
+msgServiceGiftBoxRadius: 20px;
 msgServiceGiftBoxTopSkip: 4px;
 msgServiceGiftBoxButtonHeight: 32px;
 msgServiceGiftBoxButtonPadding: margins(2px, 0px, 2px, 0px);
@@ -915,3 +915,10 @@ backgroundSwitchToLight: IconButton(backgroundSwitchToDark) {
 	icon: icon {{ "menu/header_mode_day", boxTitleCloseFg }};
 	iconOver: icon {{ "menu/header_mode_day", boxTitleCloseFgOver }};
 }
+
+storyMentionSize: 80px;
+storyMentionUnreadSkipTwice: 8px;
+storyMentionUnreadStrokeTwice: 6px;
+storyMentionReadSkipTwice: 7px;
+storyMentionReadStrokeTwice: 3px;
+storyMentionButtonSkip: 5px;
diff --git a/Telegram/SourceFiles/ui/userpic_view.h b/Telegram/SourceFiles/ui/userpic_view.h
index e05162f95..6e50127d7 100644
--- a/Telegram/SourceFiles/ui/userpic_view.h
+++ b/Telegram/SourceFiles/ui/userpic_view.h
@@ -25,8 +25,8 @@ struct PeerUserpicView {
 	QImage cached;
 	std::shared_ptr<QImage> cloud;
 	base::weak_ptr<const EmptyUserpic> empty;
-	int paletteVersion : 31 = 0;
-	int forum : 1 = 0;
+	uint32 paletteVersion : 31 = 0;
+	uint32 forum : 1 = 0;
 };
 
 [[nodiscard]] bool PeerUserpicLoading(const PeerUserpicView &view);

From e41dba5fb259abc441215a1d22e04f800c490080 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 11:58:59 +0400
Subject: [PATCH 361/676] Cache title controls layout.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index c3aab1bd1..6abad69ca 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit c3aab1bd141101c32393edc07032113ae4f1122a
+Subproject commit 6abad69ca6de8b592d23902b7bc2bf4190af2dcb

From 57b7391f534211f18c1b9e41140fc19c6f6e5c97 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 12:55:22 +0400
Subject: [PATCH 362/676] Improve design of contacts according to mockups.

---
 Telegram/SourceFiles/boxes/boxes.style                | 11 +++++++++++
 .../boxes/filters/edit_filter_chats_list.cpp          |  2 +-
 Telegram/SourceFiles/boxes/peer_list_controllers.cpp  |  4 +++-
 Telegram/SourceFiles/dialogs/dialogs_row.cpp          |  2 +-
 Telegram/SourceFiles/ui/effects/round_checkbox.cpp    |  9 ++++++---
 Telegram/SourceFiles/window/window.style              |  7 ++++---
 Telegram/lib_ui                                       |  2 +-
 7 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 4ba5c01b5..3758d8a61 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -943,8 +943,17 @@ requestsBoxList: PeerList(peerListBox) {
 	item: requestsBoxItem;
 }
 contactsWithStories: PeerList(peerListBox) {
+	padding: margins(0px, 0px, 0px, 0px);
 	item: PeerListItem(peerListBoxItem) {
+		height: 52px;
+		photoPosition: point(18px, 5px);
+		namePosition: point(70px, 7px);
+		statusPosition: point(70px, 27px);
+
 		checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+			selectExtendTwice: 1px;
+			imageRadius: 21px;
+			imageSmallRadius: 19px;
 			check: RoundCheckbox(defaultPeerListCheck) {
 				size: 0px;
 			}
@@ -952,6 +961,8 @@ contactsWithStories: PeerList(peerListBox) {
 		nameFgChecked: contactsNameFg;
 	}
 }
+storiesReadLineTwice: 2px;
+storiesUnreadLineTwice: 4px;
 requestsAcceptButton: RoundButton(defaultActiveButton) {
 	width: -28px;
 	height: 30px;
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index 8e393c583..6cce77d60 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -309,7 +309,7 @@ object_ptr<Ui::RpWidget> CreatePeerListSectionSubtitle(
 		rpl::producer<QString> text) {
 	auto result = object_ptr<Ui::FixedHeightWidget>(
 		parent,
-		st::searchedBarHeight);
+		st::windowFilterChatsSectionSubtitleHeight);
 
 	const auto raw = result.data();
 	raw->paintRequest(
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 5137b5c99..3ea891511 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -230,7 +230,9 @@ void StoriesController::rowClicked(not_null<PeerListRow*> row) {
 base::unique_qptr<Ui::PopupMenu> StoriesController::rowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row) {
-	auto result = base::make_unique_q<Ui::PopupMenu>(parent);
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
 
 	Dialogs::Stories::FillSourceMenu(_window, {
 		.id = row->id(),
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 326ec6db4..102ad6dd5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -368,7 +368,7 @@ void Row::PaintCornerBadgeFrame(
 		const auto st = context.st;
 		const auto storiesUnreadBrush = [&] {
 			if (context.active) {
-				return st::dialogsUnreadBgActive->b;
+				return st::dialogsUnreadBgMutedActive->b;
 			}
 			const auto left = st->padding.left();
 			const auto top = st->padding.top();
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index 4d2a03f77..8a6b7f4c2 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -399,6 +399,9 @@ void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 			_st.imageRadius * 2,
 			_st.imageRadius * 2,
 			outerWidth);
+		const auto add = _st.selectExtendTwice / 2.;
+		const auto outline = QRectF(rect).marginsAdded({
+			add, add, add, add });
 		if (segments < 2) {
 			const auto radius = _roundingRadius
 				? _roundingRadius(_st.imageRadius * 2)
@@ -408,9 +411,9 @@ void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 				segments ? _segments.front().width : _st.selectWidth);
 			p.setPen(pen);
 			if (!radius) {
-				p.drawEllipse(rect);
+				p.drawEllipse(outline);
 			} else {
-				p.drawRoundedRect(rect, *radius, *radius);
+				p.drawRoundedRect(outline, *radius, *radius);
 			}
 		} else {
 			const auto small = 160;
@@ -429,7 +432,7 @@ void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 					Qt::RoundCap));
 				const auto from = int(base::SafeRound(start));
 				const auto till = int(base::SafeRound(start + length));
-				p.drawArc(rect, from, till - from);
+				p.drawArc(outline, from, till - from);
 				start += length + separator;
 			}
 		}
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index b2acd7367..2d4abf372 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -165,7 +165,7 @@ mainMenuVersionLabel: FlatLabel(mainMenuTelegramLabel) {
 mainMenuVersionBottom: 17px;
 
 mainMenuToggleSize: 6px;
-mainMenuToggleFourStrokes: 4px;
+mainMenuToggleFourStrokes: 3px;
 mainMenuTogglePosition: point(30px, 30px);
 
 themeEditorSampleSize: size(90px, 51px);
@@ -305,13 +305,14 @@ windowFilterTypeBots: icon {{ "folders/folders_type_bots", historyPeerUserpicFg
 windowFilterTypeNoMuted: icon {{ "folders/folders_type_muted", historyPeerUserpicFg }};
 windowFilterTypeNoArchived: icon {{ "folders/folders_type_archived", historyPeerUserpicFg }};
 windowFilterTypeNoRead: icon {{ "folders/folders_type_read", historyPeerUserpicFg }};
+windowFilterChatsSectionSubtitleHeight: 28px;
 windowFilterChatsSectionSubtitle: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
-		font: searchedBarFont;
+		font: semiboldFont;
 	}
 	textFg: searchedBarFg;
 }
-windowFilterChatsSectionSubtitlePadding: margins(17px, 7px, 17px, 7px);
+windowFilterChatsSectionSubtitlePadding: margins(22px, 5px, 22px, 5px);
 
 windowArchiveToast: Toast(defaultToast) {
 	minWidth: boxWideWidth;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 6abad69ca..d431d803c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 6abad69ca6de8b592d23902b7bc2bf4190af2dcb
+Subproject commit d431d803c8b347c192d1bc9b6a206d2622a10748

From ee507722bada71de17a3afe87f92cec8e2b5118b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 13:12:38 +0400
Subject: [PATCH 363/676] Add stories counter to hidden stories sources.

---
 Telegram/Resources/langs/lang.strings                | 4 ++++
 Telegram/SourceFiles/boxes/peer_list_controllers.cpp | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index a816e9883..3130497ee 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2410,6 +2410,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_contacts_by_online" = "Sorted by last seen time";
 "lng_contacts_by_name" = "Sorted by name";
 "lng_contacts_hidden_stories" = "Hidden Stories";
+"lng_contacts_stories_status#one" = "{count} story";
+"lng_contacts_stories_status#other" = "{count} stories";
+"lng_contacts_stories_status_new#one" = "{count} new story";
+"lng_contacts_stories_status_new#other" = "{count} new stories";
 "lng_contact_not_joined" = "Unfortunately {name} has not joined Telegram yet, but you can send them an invitation.\n\nWe will notify you about any of your contacts who join Telegram.";
 "lng_try_other_contact" = "Try someone else";
 "lng_create_group_link" = "Link";
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 3ea891511..7090a018d 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -166,6 +166,12 @@ void StoriesRow::applySegments(const Dialogs::Stories::Element &element) {
 	_count = int(std::max(element.count, 1U));
 	_unreadCount = element.unreadCount;
 	refreshSegments();
+	setCustomStatus(_unreadCount
+		? tr::lng_contacts_stories_status_new(
+			tr::now,
+			lt_count,
+			_unreadCount)
+		: tr::lng_contacts_stories_status(tr::now, lt_count, _count));
 }
 
 void StoriesRow::updateGradient(QBrush unread) {

From 12fe0a836a5216e0932534dd677f0c2134b38bf9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 16:18:55 +0400
Subject: [PATCH 364/676] Apply editions in realtime, show badge.

---
 Telegram/SourceFiles/data/data_story.cpp      |  7 +++++++
 Telegram/SourceFiles/data/data_story.h        |  2 ++
 .../stories/media_stories_controller.cpp      | 20 +++++++++++++++----
 .../media/stories/media_stories_delegate.h    |  2 ++
 .../media/stories/media_stories_header.cpp    | 13 ++++++++++--
 .../media/stories/media_stories_header.h      |  1 +
 .../media/view/media_view_overlay_widget.cpp  | 14 +++++++++++++
 .../media/view/media_view_overlay_widget.h    |  1 +
 8 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index dd11bcc0e..af8b50c8a 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -260,6 +260,10 @@ bool Story::forbidsForward() const {
 	return _noForwards;
 }
 
+bool Story::edited() const {
+	return _edited;
+}
+
 bool Story::canDownload() const {
 	return !forbidsForward() || _peer->isSelf();
 }
@@ -369,6 +373,7 @@ void Story::applyViewsSlice(
 
 bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	const auto pinned = data.is_pinned();
+	const auto edited = data.is_edited();
 	const auto isPublic = data.is_public();
 	const auto closeFriends = data.is_close_friends();
 	const auto noForwards = data.is_noforwards();
@@ -395,6 +400,7 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 
 	const auto changed = (_media != media)
 		|| (_pinned != pinned)
+		|| (_edited != edited)
 		|| (_isPublic != isPublic)
 		|| (_closeFriends != closeFriends)
 		|| (_noForwards != noForwards)
@@ -405,6 +411,7 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 		return false;
 	}
 	_media = std::move(media);
+	_edited = edited;
 	_pinned = pinned;
 	_isPublic = isPublic;
 	_closeFriends = closeFriends;
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 183e46808..d80272e67 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -89,6 +89,7 @@ public:
 	[[nodiscard]] bool isPublic() const;
 	[[nodiscard]] bool closeFriends() const;
 	[[nodiscard]] bool forbidsForward() const;
+	[[nodiscard]] bool edited() const;
 
 	[[nodiscard]] bool canDownload() const;
 	[[nodiscard]] bool canShare() const;
@@ -128,6 +129,7 @@ private:
 	bool _isPublic : 1 = false;
 	bool _closeFriends : 1 = false;
 	bool _noForwards : 1 = false;
+	bool _edited : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index cf411bc7b..e1e6cc875 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -741,20 +741,24 @@ void Controller::show(
 		_slider->raise();
 	}
 
-	if (_shown == storyId) {
+	_captionText = story->caption();
+	_captionFullView = nullptr;
+	_header->show({
+		.user = user,
+		.date = story->date(),
+		.edited = story->edited(),
+	});
+	if (_shown == storyId && _session == &story->session()) {
 		return;
 	}
 	_shown = storyId;
 	_viewed = false;
-	_captionText = story->caption();
-	_captionFullView = nullptr;
 	invalidate_weak_ptrs(&_viewsLoadGuard);
 	_reactions->hide();
 	if (_replyFocused) {
 		unfocusReply();
 	}
 
-	_header->show({ .user = user, .date = story->date() });
 	_replyArea->show({
 		.user = unsupported ? nullptr : user,
 		.id = story->id(),
@@ -781,6 +785,14 @@ void Controller::show(
 				checkWaitingFor();
 			}
 		}, _sessionLifetime);
+		session->changes().storyUpdates(
+			Data::StoryUpdate::Flag::Edited
+		) | rpl::filter([=](const Data::StoryUpdate &update) {
+			return (update.story == this->story());
+		}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+			show(update.story, _context);
+			_delegate->storiesRedisplay(update.story);
+		}, _sessionLifetime);
 		_sessionLifetime.add([=] {
 			session->data().stories().setPreloadingInViewer({});
 		});
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index 6dfbf3acd..f42e3c463 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -13,6 +13,7 @@ struct FileChosen;
 } // namespace ChatHelpers
 
 namespace Data {
+class Story;
 struct StoriesContext;
 } // namespace Data
 
@@ -49,6 +50,7 @@ public:
 		-> 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,
 		FullStoryId id,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index dc33da5f4..fd8f21b33 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -75,6 +75,15 @@ struct Timestamp {
 	return { Ui::FormatDateTime(whenFull) };
 }
 
+[[nodiscard]] Timestamp ComposeDetails(HeaderData data, TimeId now) {
+	auto result = ComposeTimestamp(data.date, now);
+	if (data.edited) {
+		result.text.append(
+			QString::fromUtf8(" \xE2\x80\xA2 ") + tr::lng_edited(tr::now));
+	}
+	return result;
+}
+
 } // namespace
 
 Header::Header(not_null<Controller*> controller)
@@ -123,7 +132,7 @@ void Header::show(HeaderData data) {
 			raw->setGeometry(layout.header);
 		}, raw->lifetime());
 	}
-	auto timestamp = ComposeTimestamp(data.date, base::unixtime::now());
+	auto timestamp = ComposeDetails(data, base::unixtime::now());
 	_date = std::make_unique<Ui::FlatLabel>(
 		_widget.get(),
 		std::move(timestamp.text),
@@ -148,7 +157,7 @@ void Header::updateDateText() {
 	if (!_date || !_data || !_data->date) {
 		return;
 	}
-	auto timestamp = ComposeTimestamp(_data->date, base::unixtime::now());
+	auto timestamp = ComposeDetails(*_data, base::unixtime::now());
 	_date->setText(timestamp.text);
 	if (timestamp.changes > 0) {
 		_dateUpdateTimer.callOnce(timestamp.changes * crl::time(1000));
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 97d62b250..cab943464 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -22,6 +22,7 @@ class Controller;
 struct HeaderData {
 	not_null<UserData*> user;
 	TimeId date = 0;
+	bool edited = false;
 
 	friend inline auto operator<=>(HeaderData, HeaderData) = default;
 	friend inline bool operator==(HeaderData, HeaderData) = default;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 12b6e0332..9690f150e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4167,6 +4167,20 @@ void OverlayWidget::storiesJumpTo(
 	});
 }
 
+void OverlayWidget::storiesRedisplay(not_null<Data::Story*> story) {
+	Expects(_stories != nullptr);
+
+	clearStreaming();
+	_streamingStartPaused = false;
+	v::match(story->media().data, [&](not_null<PhotoData*> photo) {
+		displayPhoto(photo, anim::activation::background);
+	}, [&](not_null<DocumentData*> document) {
+		displayDocument(document, anim::activation::background);
+	}, [&](v::null_t) {
+		displayDocument(nullptr, anim::activation::background);
+	});
+}
+
 void OverlayWidget::storiesClose() {
 	close();
 }
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index d90cf8a02..b5be1b16c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -250,6 +250,7 @@ private:
 		-> 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,
 		FullStoryId id,

From 5ccb97668c7acd4c76802238ae06f80823d250cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 19:52:22 +0400
Subject: [PATCH 365/676] Add short-polling of stories.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 108 ++++++++++++++++--
 Telegram/SourceFiles/data/data_stories.h      |  27 ++++-
 Telegram/SourceFiles/data/data_story.cpp      |  11 +-
 Telegram/SourceFiles/data/data_story.h        |   7 +-
 .../history/view/media/history_view_gif.cpp   |  20 ++++
 .../history/view/media/history_view_gif.h     |   3 +
 .../history/view/media/history_view_photo.cpp |  21 ++++
 .../history/view/media/history_view_photo.h   |   5 +-
 .../view/media/history_view_story_mention.cpp |  29 ++++-
 .../view/media/history_view_story_mention.h   |   2 +
 .../info/stories/info_stories_provider.cpp    |  24 +++-
 .../info/stories/info_stories_provider.h      |   2 +
 .../stories/media_stories_controller.cpp      |  99 ++++++++++------
 .../media/stories/media_stories_controller.h  |   2 +
 14 files changed, 308 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 6c6991bd5..e0ff8ca26 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -38,6 +38,8 @@ constexpr auto kSavedPerPage = 100;
 constexpr auto kMaxPreloadSources = 10;
 constexpr auto kStillPreloadFromFirst = 3;
 constexpr auto kMaxSegmentsCount = 180;
+constexpr auto kPollingIntervalChat = 5 * TimeId(60);
+constexpr auto kPollingIntervalViewer = 1 * TimeId(60);
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -98,10 +100,12 @@ Stories::Stories(not_null<Session*> owner)
 : _owner(owner)
 , _expireTimer([=] { processExpired(); })
 , _markReadTimer([=] { sendMarkAsReadRequests(); })
-, _incrementViewsTimer([=] { sendIncrementViewsRequests(); }) {
+, _incrementViewsTimer([=] { sendIncrementViewsRequests(); })
+, _pollingTimer([=] { sendPollingRequests(); }) {
 }
 
 Stories::~Stories() {
+	Expects(_pollingSettings.empty());
 }
 
 Session &Stories::owner() const {
@@ -348,7 +352,7 @@ Story *Stories::parseAndApply(
 		const auto result = i->second.get();
 		const auto pinned = result->pinned();
 		const auto mediaChanged = (result->media() != *media);
-		if (result->applyChanges(*media, data)) {
+		if (result->applyChanges(*media, data, now)) {
 			if (result->pinned() != pinned) {
 				savedStateUpdated(result);
 			}
@@ -358,6 +362,11 @@ Story *Stories::parseAndApply(
 			if (const auto item = lookupItem(result)) {
 				item->applyChanges(result);
 			}
+			_owner->refreshStoryItemViews(fullId);
+		}
+		const auto j = _pollingSettings.find(result);
+		if (j != end(_pollingSettings)) {
+			maybeSchedulePolling(result, j->second, now);
 		}
 		if (mediaChanged) {
 			_preloaded.remove(fullId);
@@ -378,7 +387,7 @@ Story *Stories::parseAndApply(
 		StoryMedia{ *media },
 		data.vdate().v,
 		data.vexpire_date().v)).first->second.get();
-	result->applyChanges(*media, data);
+	result->applyChanges(*media, data, now);
 	if (result->pinned()) {
 		savedStateUpdated(result);
 	}
@@ -656,6 +665,7 @@ void Stories::applyDeleted(FullStoryId id) {
 				preloadFinished(id);
 			}
 			_owner->refreshStoryItemViews(id);
+			Assert(!_pollingSettings.contains(story.get()));
 			if (i->second.empty()) {
 				_stories.erase(i);
 			}
@@ -818,13 +828,15 @@ base::expected<not_null<Story*>, NoStory> Stories::lookup(
 		_deleted.contains(id) ? NoStory::Deleted : NoStory::Unknown);
 }
 
-void Stories::resolve(FullStoryId id, Fn<void()> done) {
-	const auto already = lookup(id);
-	if (already.has_value() || already.error() != NoStory::Unknown) {
-		if (done) {
-			done();
+void Stories::resolve(FullStoryId id, Fn<void()> done, bool force) {
+	if (!force) {
+		const auto already = lookup(id);
+		if (already.has_value() || already.error() != NoStory::Unknown) {
+			if (done) {
+				done();
+			}
+			return;
 		}
-		return;
 	}
 	if (const auto i = _resolveSent.find(id.peer); i != end(_resolveSent)) {
 		if (const auto j = i->second.find(id.story); j != end(i->second)) {
@@ -1493,6 +1505,84 @@ bool Stories::isUnread(not_null<Story*> story) {
 	return (story->id() > readTill);
 }
 
+void Stories::registerPolling(not_null<Story*> story, Polling polling) {
+	auto &settings = _pollingSettings[story];
+	switch (polling) {
+	case Polling::Chat: ++settings.chat; break;
+	case Polling::Viewer: ++settings.viewer; break;
+	}
+	maybeSchedulePolling(story, settings, base::unixtime::now());
+}
+
+void Stories::unregisterPolling(not_null<Story*> story, Polling polling) {
+	const auto i = _pollingSettings.find(story);
+	Assert(i != end(_pollingSettings));
+
+	switch (polling) {
+	case Polling::Chat:
+		Assert(i->second.chat > 0);
+		--i->second.chat;
+		break;
+	case Polling::Viewer:
+		Assert(i->second.viewer > 0);
+		--i->second.viewer;
+		break;
+	}
+	if (!i->second.chat && !i->second.viewer) {
+		_pollingSettings.erase(i);
+	}
+}
+
+bool Stories::registerPolling(FullStoryId id, Polling polling) {
+	if (const auto maybeStory = lookup(id)) {
+		registerPolling(*maybeStory, polling);
+		return true;
+	}
+	return false;
+}
+
+void Stories::unregisterPolling(FullStoryId id, Polling polling) {
+	const auto maybeStory = lookup(id);
+	Assert(maybeStory.has_value());
+	unregisterPolling(*maybeStory, polling);
+}
+
+int Stories::pollingInterval(const PollingSettings &settings) const {
+	return settings.viewer ? kPollingIntervalViewer : kPollingIntervalChat;
+}
+
+void Stories::maybeSchedulePolling(
+		not_null<Story*> story,
+		const PollingSettings &settings,
+		TimeId now) {
+	const auto last = story->lastUpdateTime();
+	const auto next = last + pollingInterval(settings);
+	const auto left = std::max(next - now, 0) * crl::time(1000) + 1;
+	if (!_pollingTimer.isActive() || _pollingTimer.remainingTime() > left) {
+		_pollingTimer.callOnce(left);
+	}
+}
+
+void Stories::sendPollingRequests() {
+	auto min = 0;
+	const auto now = base::unixtime::now();
+	for (const auto &[story, settings] : _pollingSettings) {
+		const auto last = story->lastUpdateTime();
+		const auto next = last + pollingInterval(settings);
+		if (now >= next) {
+			resolve(story->fullId(), nullptr, true);
+		} else {
+			const auto left = (next - now) * crl::time(1000) + 1;
+			if (!min || left < min) {
+				min = left;
+			}
+		}
+	}
+	if (min > 0) {
+		_pollingTimer.callOnce(min);
+	}
+}
+
 void Stories::updateUserStoriesState(not_null<PeerData*> peer) {
 	const auto till = _readTill.find(peer->id);
 	const auto readTill = (till != end(_readTill)) ? till->second : 0;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index e1bb0dcb6..579ec7b89 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -153,7 +153,7 @@ public:
 
 	[[nodiscard]] base::expected<not_null<Story*>, NoStory> lookup(
 		FullStoryId id) const;
-	void resolve(FullStoryId id, Fn<void()> done);
+	void resolve(FullStoryId id, Fn<void()> done, bool force = false);
 	[[nodiscard]] std::shared_ptr<HistoryItem> resolveItem(FullStoryId id);
 	[[nodiscard]] std::shared_ptr<HistoryItem> resolveItem(
 		not_null<Story*> story);
@@ -209,6 +209,16 @@ public:
 		StoryId storyMaxId);
 	[[nodiscard]] bool isUnread(not_null<Story*> story);
 
+	enum class Polling {
+		Chat,
+		Viewer,
+	};
+	void registerPolling(not_null<Story*> story, Polling polling);
+	void unregisterPolling(not_null<Story*> story, Polling polling);
+
+	bool registerPolling(FullStoryId id, Polling polling);
+	void unregisterPolling(FullStoryId id, Polling polling);
+
 private:
 	struct Saved {
 		StoriesIds ids;
@@ -217,6 +227,10 @@ private:
 		bool loaded = false;
 		mtpRequestId requestId = 0;
 	};
+	struct PollingSettings {
+		int chat = 0;
+		int viewer = 0;
+	};
 
 	void parseAndApply(const MTPUserStories &stories);
 	[[nodiscard]] Story *parseAndApply(
@@ -265,6 +279,14 @@ private:
 	void startPreloading(not_null<Story*> story);
 	void preloadFinished(FullStoryId id, bool markAsPreloaded = false);
 
+	[[nodiscard]] int pollingInterval(
+		const PollingSettings &settings) const;
+	void maybeSchedulePolling(
+		not_null<Story*> story,
+		const PollingSettings &settings,
+		TimeId now);
+	void sendPollingRequests();
+
 	const not_null<Session*> _owner;
 	std::unordered_map<
 		PeerId,
@@ -336,6 +358,9 @@ private:
 	mtpRequestId _readTillsRequestId = 0;
 	bool _readTillReceived = false;
 
+	base::flat_map<not_null<Story*>, PollingSettings> _pollingSettings;
+	base::Timer _pollingTimer;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index af8b50c8a..3a57400c0 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -371,7 +371,12 @@ void Story::applyViewsSlice(
 	}
 }
 
-bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
+bool Story::applyChanges(
+		StoryMedia media,
+		const MTPDstoryItem &data,
+		TimeId now) {
+	_lastUpdateTime = now;
+
 	const auto pinned = data.is_pinned();
 	const auto edited = data.is_edited();
 	const auto isPublic = data.is_public();
@@ -424,6 +429,10 @@ bool Story::applyChanges(StoryMedia media, const MTPDstoryItem &data) {
 	return true;
 }
 
+TimeId Story::lastUpdateTime() const {
+	return _lastUpdateTime;
+}
+
 StoryPreload::StoryPreload(not_null<Story*> story, Fn<void()> done)
 : _story(story)
 , _done(std::move(done)) {
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index d80272e67..ed6254a09 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -113,7 +113,11 @@ public:
 		const std::vector<StoryView> &slice,
 		int total);
 
-	bool applyChanges(StoryMedia media, const MTPDstoryItem &data);
+	bool applyChanges(
+		StoryMedia media,
+		const MTPDstoryItem &data,
+		TimeId now);
+	[[nodiscard]] TimeId lastUpdateTime() const;
 
 private:
 	const StoryId _id = 0;
@@ -125,6 +129,7 @@ private:
 	int _views = 0;
 	const TimeId _date = 0;
 	const TimeId _expires = 0;
+	TimeId _lastUpdateTime = 0;
 	bool _pinned : 1 = false;
 	bool _isPublic : 1 = false;
 	bool _closeFriends : 1 = false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index e1c78f8b5..d3040ce07 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -42,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/spoiler_mess.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_streaming.h"
 #include "data/data_document.h"
 #include "data/data_file_click_handler.h"
@@ -134,6 +135,7 @@ Gif::~Gif() {
 			_parent->checkHeavyPart();
 		}
 	}
+	togglePollingStory(false);
 }
 
 bool Gif::CanPlayInline(not_null<DocumentData*> document) {
@@ -1432,6 +1434,22 @@ void Gif::dataMediaCreated() const {
 		_dataMedia->videoThumbnailWanted(_realParent->fullId());
 	}
 	history()->owner().registerHeavyViewPart(_parent);
+	togglePollingStory(true);
+}
+
+void Gif::togglePollingStory(bool enabled) const {
+	if (!_story || _pollingStory == enabled) {
+		return;
+	}
+	const auto polling = Data::Stories::Polling::Chat;
+	const auto media = _parent->data()->media();
+	const auto id = media ? media->storyId() : FullStoryId();
+	if (!enabled) {
+		_data->owner().stories().unregisterPolling(id, polling);
+	} else if (!_data->owner().stories().registerPolling(id, polling)) {
+		return;
+	}
+	_pollingStory = enabled;
 }
 
 bool Gif::uploading() const {
@@ -1686,6 +1704,7 @@ void Gif::unloadHeavyPart() {
 	_thumbCache = QImage();
 	_videoThumbnailFrame = nullptr;
 	_caption.unloadPersistentAnimation();
+	togglePollingStory(false);
 }
 
 void Gif::refreshParentId(not_null<HistoryItem*> realParent) {
@@ -1815,6 +1834,7 @@ void Gif::setStreamed(std::unique_ptr<Streamed> value) {
 	_streamed = std::move(value);
 	if (set) {
 		history()->owner().registerHeavyViewPart(_parent);
+		togglePollingStory(true);
 	} else if (removed) {
 		_parent->checkHeavyPart();
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 6a8fca3b5..50c5583ac 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -208,6 +208,8 @@ private:
 		StateRequest request,
 		QPoint position) const;
 
+	void togglePollingStory(bool enabled) const;
+
 	const not_null<DocumentData*> _data;
 	Ui::Text::String _caption;
 	std::unique_ptr<Streamed> _streamed;
@@ -222,6 +224,7 @@ private:
 	mutable bool _thumbCacheBlurred : 1 = false;
 	mutable bool _thumbIsEllipse : 1 = false;
 	mutable bool _story : 1 = false;
+	mutable bool _pollingStory : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index a7f08a50d..ed5c49ac9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_streaming.h"
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
@@ -101,6 +102,7 @@ Photo::~Photo() {
 			_parent->checkHeavyPart();
 		}
 	}
+	togglePollingStory(false);
 }
 
 void Photo::create(FullMsgId contextId, PeerData *chat) {
@@ -145,6 +147,7 @@ void Photo::dataMediaCreated() const {
 		_dataMedia->wanted(PhotoSize::Small, _realParent->fullId());
 	}
 	history()->owner().registerHeavyViewPart(_parent);
+	togglePollingStory(true);
 }
 
 bool Photo::hasHeavyPart() const {
@@ -160,6 +163,23 @@ void Photo::unloadHeavyPart() {
 	}
 	_imageCache = QImage();
 	_caption.unloadPersistentAnimation();
+	togglePollingStory(false);
+}
+
+void Photo::togglePollingStory(bool enabled) const {
+	const auto pollingStory = (enabled ? 1 : 0);
+	if (!_story || _pollingStory == pollingStory) {
+		return;
+	}
+	const auto polling = Data::Stories::Polling::Chat;
+	const auto media = _parent->data()->media();
+	const auto id = media ? media->storyId() : FullStoryId();
+	if (!enabled) {
+		_data->owner().stories().unregisterPolling(id, polling);
+	} else if (!_data->owner().stories().registerPolling(id, polling)) {
+		return;
+	}
+	_pollingStory = pollingStory;
 }
 
 QSize Photo::countOptimalSize() {
@@ -926,6 +946,7 @@ void Photo::setStreamed(std::unique_ptr<Streamed> value) {
 	_streamed = std::move(value);
 	if (set) {
 		history()->owner().registerHeavyViewPart(_parent);
+		togglePollingStory(true);
 	} else if (removed) {
 		_parent->checkHeavyPart();
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index f6d7062f0..94404ddbe 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -160,6 +160,8 @@ private:
 
 	[[nodiscard]] QSize photoSize() const;
 
+	void togglePollingStory(bool enabled) const;
+
 	const not_null<PhotoData*> _data;
 	Ui::Text::String _caption;
 	mutable std::shared_ptr<Data::PhotoMedia> _dataMedia;
@@ -167,10 +169,11 @@ private:
 	const std::unique_ptr<MediaSpoiler> _spoiler;
 	mutable QImage _imageCache;
 	mutable std::optional<Ui::BubbleRounding> _imageCacheRounding;
-	uint32 _serviceWidth : 29 = 0;
+	uint32 _serviceWidth : 28 = 0;
 	mutable uint32 _imageCacheForum : 1 = 0;
 	mutable uint32 _imageCacheBlurred : 1 = 0;
 	mutable uint32 _story : 1 = 0;
+	mutable uint32 _pollingStory : 1 = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
index a4d255fd2..15d8925b5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
@@ -52,7 +52,9 @@ StoryMention::StoryMention(
 , _unread(story->owner().stories().isUnread(story) ? 1 : 0) {
 }
 
-StoryMention::~StoryMention() = default;
+StoryMention::~StoryMention() {
+	changeSubscribedTo(0);
+}
 
 int StoryMention::top() {
 	return st::msgServiceGiftBoxButtonMargins.top();
@@ -105,13 +107,12 @@ void StoryMention::draw(
 				? history->session().user()
 				: history->peer);
 		_thumbnailFromStory = showStory;
-		_subscribed = 0;
+		changeSubscribedTo(0);
 	}
-	if (!_subscribed) {
+	if (changeSubscribedTo(1)) {
 		_thumbnail->subscribeToUpdates([=] {
 			_parent->data()->history()->owner().requestViewRepaint(_parent);
 		});
-		_subscribed = 1;
 	}
 
 	const auto padding = (geometry.width() - st::storyMentionSize) / 2;
@@ -164,10 +165,26 @@ bool StoryMention::hasHeavyPart() {
 }
 
 void StoryMention::unloadHeavyPart() {
-	if (_subscribed) {
-		_subscribed = 0;
+	if (changeSubscribedTo(0)) {
 		_thumbnail->subscribeToUpdates(nullptr);
 	}
 }
 
+bool StoryMention::changeSubscribedTo(uint32 value) {
+	Expects(value == 0 || value == 1);
+
+	if (_subscribed == value) {
+		return false;
+	}
+	_subscribed = value;
+	const auto stories = &_parent->history()->owner().stories();
+	if (value) {
+		_parent->history()->owner().registerHeavyViewPart(_parent);
+		stories->registerPolling(_story, Data::Stories::Polling::Chat);
+	} else {
+		stories->unregisterPolling(_story, Data::Stories::Polling::Chat);
+	}
+	return true;
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.h b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
index fea24787f..51704d440 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
@@ -55,6 +55,8 @@ public:
 private:
 	using Thumbnail = Dialogs::Stories::Thumbnail;
 
+	bool changeSubscribedTo(uint32 value);
+
 	const not_null<Element*> _parent;
 	const not_null<Data::Story*> _story;
 	std::shared_ptr<Thumbnail> _thumbnail;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index b4cf680c6..fbe81ebc5 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -56,6 +56,10 @@ Provider::Provider(not_null<AbstractController*> controller)
 	}, _lifetime);
 }
 
+Provider::~Provider() {
+	clear();
+}
+
 Type Provider::type() {
 	return Type::PhotoVideo;
 }
@@ -90,11 +94,20 @@ std::optional<int> Provider::fullCount() {
 	return _slice.fullCount();
 }
 
-void Provider::restart() {
+void Provider::clear() {
+	for (const auto &[storyId, _] : _layouts) {
+		_peer->owner().stories().unregisterPolling(
+			{ _peer->id, storyId },
+			Data::Stories::Polling::Chat);
+	}
 	_layouts.clear();
 	_aroundId = kDefaultAroundId;
 	_idsLimit = kMinimalIdsLimit;
 	_slice = Data::StoriesIdsSlice();
+}
+
+void Provider::restart() {
+	clear();
 	refreshViewer();
 }
 
@@ -210,6 +223,9 @@ void Provider::markLayoutsStale() {
 void Provider::clearStaleLayouts() {
 	for (auto i = _layouts.begin(); i != _layouts.end();) {
 		if (i->second.stale) {
+			_peer->owner().stories().unregisterPolling(
+				{ _peer->id, i->first },
+				Data::Stories::Polling::Chat);
 			_layoutRemoved.fire(i->second.item.get());
 			const auto taken = _items.take(i->first);
 			i = _layouts.erase(i);
@@ -240,6 +256,9 @@ bool Provider::isAfter(
 void Provider::itemRemoved(not_null<const HistoryItem*> item) {
 	const auto id = StoryIdFromMsgId(item->id);
 	if (const auto i = _layouts.find(id); i != end(_layouts)) {
+		_peer->owner().stories().unregisterPolling(
+			{ _peer->id, id },
+			Data::Stories::Polling::Chat);
 		_layoutRemoved.fire(i->second.item.get());
 		_layouts.erase(i);
 	}
@@ -253,6 +272,9 @@ BaseLayout *Provider::getLayout(
 		if (auto layout = createLayout(id, delegate)) {
 			layout->initDimensions();
 			it = _layouts.emplace(id, std::move(layout)).first;
+			_peer->owner().stories().registerPolling(
+				{ _peer->id, id },
+				Data::Stories::Polling::Chat);
 		} else {
 			return nullptr;
 		}
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.h b/Telegram/SourceFiles/info/stories/info_stories_provider.h
index f1fb535d3..390234128 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.h
@@ -30,6 +30,7 @@ class Provider final
 	, public base::has_weak_ptr {
 public:
 	explicit Provider(not_null<AbstractController*> controller);
+	~Provider();
 
 	Media::Type type() override;
 	bool hasSelectRestriction() override;
@@ -99,6 +100,7 @@ private:
 	void itemRemoved(not_null<const HistoryItem*> item);
 	void markLayoutsStale();
 	void clearStaleLayouts();
+	void clear();
 
 	[[nodiscard]] HistoryItem *ensureItem(StoryId id);
 	[[nodiscard]] Media::BaseLayout *getLayout(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index e1e6cc875..d05aa292c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -302,7 +302,9 @@ Controller::Controller(not_null<Delegate*> delegate)
 	_contentFadeAnimation.stop();
 }
 
-Controller::~Controller() = default;
+Controller::~Controller() {
+	changeShown(nullptr);
+}
 
 void Controller::updateContentFaded() {
 	if (_contentFaded == _replyActive) {
@@ -480,6 +482,9 @@ void Controller::initLayout() {
 }
 
 Data::Story *Controller::story() const {
+	if (!_session) {
+		return nullptr;
+	}
 	const auto maybeStory = _session->data().stories().lookup(_shown);
 	return maybeStory ? maybeStory->get() : nullptr;
 }
@@ -748,10 +753,9 @@ void Controller::show(
 		.date = story->date(),
 		.edited = story->edited(),
 	});
-	if (_shown == storyId && _session == &story->session()) {
+	if (!changeShown(story)) {
 		return;
 	}
-	_shown = storyId;
 	_viewed = false;
 	invalidate_weak_ptrs(&_viewsLoadGuard);
 	_reactions->hide();
@@ -769,41 +773,72 @@ void Controller::show(
 		.valid = user->isSelf(),
 	});
 
-	const auto session = &story->session();
-	if (_session != session) {
-		_session = session;
-		_sessionLifetime = session->changes().storyUpdates(
-			Data::StoryUpdate::Flag::Destroyed
-		) | rpl::start_with_next([=](Data::StoryUpdate update) {
-			if (update.story->fullId() == _shown) {
-				_delegate->storiesClose();
-			}
-		});
-		session->data().stories().itemsChanged(
-		) | rpl::start_with_next([=](PeerId peerId) {
-			if (_waitingForId.peer == peerId) {
-				checkWaitingFor();
-			}
-		}, _sessionLifetime);
-		session->changes().storyUpdates(
-			Data::StoryUpdate::Flag::Edited
-		) | rpl::filter([=](const Data::StoryUpdate &update) {
-			return (update.story == this->story());
-		}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
-			show(update.story, _context);
-			_delegate->storiesRedisplay(update.story);
-		}, _sessionLifetime);
-		_sessionLifetime.add([=] {
-			session->data().stories().setPreloadingInViewer({});
-		});
-	}
-
 	stories.loadAround(storyId, context);
 
 	updatePlayingAllowed();
 	user->updateFull();
 }
 
+bool Controller::changeShown(Data::Story *story) {
+	const auto id = story ? story->fullId() : FullStoryId();
+	const auto session = story ? &story->session() : nullptr;
+	const auto sessionChanged = (_session != session);
+	if (_shown == id && !sessionChanged) {
+		return false;
+	}
+	if (const auto now = this->story()) {
+		now->owner().stories().unregisterPolling(
+			now,
+			Data::Stories::Polling::Viewer);
+	}
+	if (sessionChanged) {
+		_sessionLifetime.destroy();
+	}
+	_shown = id;
+	_session = session;
+	if (sessionChanged) {
+		subscribeToSession();
+	}
+	if (story) {
+		story->owner().stories().registerPolling(
+			story,
+			Data::Stories::Polling::Viewer);
+	}
+	return true;
+}
+
+void Controller::subscribeToSession() {
+	Expects(!_sessionLifetime);
+
+	if (!_session) {
+		return;
+	}
+	_session->changes().storyUpdates(
+		Data::StoryUpdate::Flag::Destroyed
+	) | rpl::start_with_next([=](Data::StoryUpdate update) {
+		if (update.story->fullId() == _shown) {
+			_delegate->storiesClose();
+		}
+	}, _sessionLifetime);
+	_session->data().stories().itemsChanged(
+	) | rpl::start_with_next([=](PeerId peerId) {
+		if (_waitingForId.peer == peerId) {
+			checkWaitingFor();
+		}
+	}, _sessionLifetime);
+	_session->changes().storyUpdates(
+		Data::StoryUpdate::Flag::Edited
+	) | rpl::filter([=](const Data::StoryUpdate &update) {
+		return (update.story == this->story());
+	}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+		show(update.story, _context);
+		_delegate->storiesRedisplay(update.story);
+	}, _sessionLifetime);
+	_sessionLifetime.add([=] {
+		_session->data().stories().setPreloadingInViewer({});
+	});
+}
+
 void Controller::updatePlayingAllowed() {
 	if (!_shown) {
 		return;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 5463cdc83..37d7b60fb 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -164,6 +164,8 @@ private:
 	class Unsupported;
 
 	void initLayout();
+	bool changeShown(Data::Story *story);
+	void subscribeToSession();
 	void updatePhotoPlayback(const Player::TrackState &state);
 	void updatePlayback(const Player::TrackState &state);
 	void updatePowerSaveBlocker(const Player::TrackState &state);

From 6a118888523d33349554d75c33214080ef641acc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 21:02:57 +0400
Subject: [PATCH 366/676] Poll views for my story that is viewed.

---
 Telegram/SourceFiles/data/data_changes.h      |   3 +-
 Telegram/SourceFiles/data/data_stories.cpp    |  68 ++++++----
 Telegram/SourceFiles/data/data_stories.h      |  11 +-
 Telegram/SourceFiles/data/data_story.cpp      | 123 +++++++++++++-----
 Telegram/SourceFiles/data/data_story.h        |  15 ++-
 .../stories/media_stories_controller.cpp      |  13 +-
 6 files changed, 161 insertions(+), 72 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index ee8ff6075..754f12ef3 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -223,8 +223,9 @@ struct StoryUpdate {
 		Edited = (1U << 0),
 		Destroyed = (1U << 1),
 		NewAdded = (1U << 2),
+		ViewsAdded = (1U << 3),
 
-		LastUsedBit = (1U << 2),
+		LastUsedBit = (1U << 3),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index e0ff8ca26..fa3ff6b58 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -40,6 +40,8 @@ constexpr auto kStillPreloadFromFirst = 3;
 constexpr auto kMaxSegmentsCount = 180;
 constexpr auto kPollingIntervalChat = 5 * TimeId(60);
 constexpr auto kPollingIntervalViewer = 1 * TimeId(60);
+constexpr auto kPollViewsInterval = 10 * crl::time(1000);
+constexpr auto kPollingViewsPerPage = Story::kRecentViewersMax;
 
 using UpdateFlag = StoryUpdate::Flag;
 
@@ -101,11 +103,13 @@ Stories::Stories(not_null<Session*> owner)
 , _expireTimer([=] { processExpired(); })
 , _markReadTimer([=] { sendMarkAsReadRequests(); })
 , _incrementViewsTimer([=] { sendIncrementViewsRequests(); })
-, _pollingTimer([=] { sendPollingRequests(); }) {
+, _pollingTimer([=] { sendPollingRequests(); })
+, _pollingViewsTimer([=] { sendPollingViewsRequests(); }) {
 }
 
 Stories::~Stories() {
 	Expects(_pollingSettings.empty());
+	Expects(_pollingViews.empty());
 }
 
 Session &Stories::owner() const {
@@ -350,20 +354,9 @@ Story *Stories::parseAndApply(
 	const auto i = stories.find(id);
 	if (i != end(stories)) {
 		const auto result = i->second.get();
-		const auto pinned = result->pinned();
 		const auto mediaChanged = (result->media() != *media);
-		if (result->applyChanges(*media, data, now)) {
-			if (result->pinned() != pinned) {
-				savedStateUpdated(result);
-			}
-			session().changes().storyUpdated(
-				result,
-				UpdateFlag::Edited);
-			if (const auto item = lookupItem(result)) {
-				item->applyChanges(result);
-			}
-			_owner->refreshStoryItemViews(fullId);
-		}
+		const auto pinned = result->pinned();
+		result->applyChanges(*media, data, now);
 		const auto j = _pollingSettings.find(result);
 		if (j != end(_pollingSettings)) {
 			maybeSchedulePolling(result, j->second, now);
@@ -385,12 +378,9 @@ Story *Stories::parseAndApply(
 		id,
 		peer,
 		StoryMedia{ *media },
-		data.vdate().v,
-		data.vexpire_date().v)).first->second.get();
-	result->applyChanges(*media, data, now);
-	if (result->pinned()) {
-		savedStateUpdated(result);
-	}
+		data,
+		now
+	)).first->second.get();
 
 	if (peer->isSelf()) {
 		const auto added = _archive.list.emplace(id).second;
@@ -479,7 +469,7 @@ void Stories::unregisterDependentMessage(
 	}
 }
 
-void Stories::savedStateUpdated(not_null<Story*> story) {
+void Stories::savedStateChanged(not_null<Story*> story) {
 	const auto id = story->id();
 	const auto peer = story->peer()->id;
 	const auto pinned = story->pinned();
@@ -1132,14 +1122,20 @@ void Stories::loadViewsSlice(
 		StoryId id,
 		std::optional<StoryView> offset,
 		Fn<void(std::vector<StoryView>)> done) {
-	_viewsDone = std::move(done);
-	if (_viewsStoryId == id && _viewsOffset == offset) {
+	if (_viewsStoryId == id
+		&& _viewsOffset == offset
+		&& (offset || _viewsRequestId)) {
+		if (_viewsRequestId) {
+			_viewsDone = std::move(done);
+		}
 		return;
 	}
 	_viewsStoryId = id;
 	_viewsOffset = offset;
+	_viewsDone = std::move(done);
 
 	const auto api = &_owner->session().api();
+	const auto perPage = _viewsDone ? kViewsPerPage : kPollingViewsPerPage;
 	api->request(_viewsRequestId).cancel();
 	_viewsRequestId = api->request(MTPstories_GetStoryViewsList(
 		MTP_int(id),
@@ -1509,7 +1505,13 @@ void Stories::registerPolling(not_null<Story*> story, Polling polling) {
 	auto &settings = _pollingSettings[story];
 	switch (polling) {
 	case Polling::Chat: ++settings.chat; break;
-	case Polling::Viewer: ++settings.viewer; break;
+	case Polling::Viewer:
+		++settings.viewer;
+		if (story->peer()->isSelf()
+			&& _pollingViews.emplace(story).second) {
+			sendPollingViewsRequests();
+		}
+		break;
 	}
 	maybeSchedulePolling(story, settings, base::unixtime::now());
 }
@@ -1525,7 +1527,12 @@ void Stories::unregisterPolling(not_null<Story*> story, Polling polling) {
 		break;
 	case Polling::Viewer:
 		Assert(i->second.viewer > 0);
-		--i->second.viewer;
+		if (!--i->second.viewer) {
+			_pollingViews.remove(story);
+			if (_pollingViews.empty()) {
+				_pollingViewsTimer.cancel();
+			}
+		}
 		break;
 	}
 	if (!i->second.chat && !i->second.viewer) {
@@ -1583,6 +1590,17 @@ void Stories::sendPollingRequests() {
 	}
 }
 
+void Stories::sendPollingViewsRequests() {
+	if (_pollingViews.empty()) {
+		return;
+	} else if (!_viewsRequestId) {
+		Assert(_viewsDone == nullptr);
+		const auto one = _pollingViews.front();
+		loadViewsSlice(_pollingViews.front()->id(), std::nullopt, nullptr);
+	}
+	_pollingViewsTimer.callOnce(kPollViewsInterval);
+}
+
 void Stories::updateUserStoriesState(not_null<PeerData*> peer) {
 	const auto till = _readTill.find(peer->id);
 	const auto readTill = (till != end(_readTill)) ? till->second : 0;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 579ec7b89..2bdd27d1c 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -219,6 +219,10 @@ public:
 	bool registerPolling(FullStoryId id, Polling polling);
 	void unregisterPolling(FullStoryId id, Polling polling);
 
+	void savedStateChanged(not_null<Story*> story);
+	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
+		not_null<Story*> story);
+
 private:
 	struct Saved {
 		StoriesIds ids;
@@ -253,14 +257,10 @@ private:
 	void applyRemovedFromActive(FullStoryId id);
 	void applyDeletedFromSources(PeerId id, StorySourcesList list);
 	void removeDependencyStory(not_null<Story*> story);
-	void savedStateUpdated(not_null<Story*> story);
 	void sort(StorySourcesList list);
 	bool bumpReadTill(PeerId peerId, StoryId maxReadTill);
 	void requestReadTills();
 
-	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
-		not_null<Story*> story);
-
 	void sendMarkAsReadRequests();
 	void sendMarkAsReadRequest(not_null<PeerData*> peer, StoryId tillId);
 	void sendIncrementViewsRequests();
@@ -286,6 +286,7 @@ private:
 		const PollingSettings &settings,
 		TimeId now);
 	void sendPollingRequests();
+	void sendPollingViewsRequests();
 
 	const not_null<Session*> _owner;
 	std::unordered_map<
@@ -359,7 +360,9 @@ private:
 	bool _readTillReceived = false;
 
 	base::flat_map<not_null<Story*>, PollingSettings> _pollingSettings;
+	base::flat_set<not_null<Story*>> _pollingViews;
 	base::Timer _pollingTimer;
+	base::Timer _pollingViewsTimer;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 3a57400c0..59f672a11 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -10,12 +10,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "api/api_text_entities.h"
 #include "data/data_document.h"
+#include "data/data_changes.h"
 #include "data/data_file_origin.h"
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_thread.h"
+#include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "media/streaming/media_streaming_reader.h"
@@ -23,6 +26,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 
 namespace Data {
+namespace {
+
+using UpdateFlag = StoryUpdate::Flag;
+
+} // namespace
 
 class StoryPreload::LoadTask final : private Storage::DownloadMtprotoTask {
 public:
@@ -103,7 +111,7 @@ bool StoryPreload::LoadTask::feedPart(
 		&& _requestedOffsets.empty()) {
 		_finished = true;
 		removeFromQueue();
-		auto result = Media::Streaming::SerializeComplexPartsMap(_parts);
+		auto result = ::Media::Streaming::SerializeComplexPartsMap(_parts);
 		if (result.size() == _full) {
 			// Make sure it is parsed as a complex map.
 			result.push_back(char(0));
@@ -130,13 +138,13 @@ Story::Story(
 	StoryId id,
 	not_null<PeerData*> peer,
 	StoryMedia media,
-	TimeId date,
-	TimeId expires)
+	const MTPDstoryItem &data,
+	TimeId now)
 : _id(id)
 , _peer(peer)
-, _media(std::move(media))
-, _date(date)
-, _expires(expires) {
+, _date(data.vdate().v)
+, _expires(data.vexpire_date().v) {
+	applyFields(std::move(media), data, now, true);
 }
 
 Session &Story::owner() const {
@@ -318,13 +326,6 @@ const TextWithEntities &Story::caption() const {
 	return unsupported() ? empty : _caption;
 }
 
-void Story::setViewsData(
-		std::vector<not_null<PeerData*>> recent,
-		int total) {
-	_recentViewers = std::move(recent);
-	_views = total;
-}
-
 const std::vector<not_null<PeerData*>> &Story::recentViewers() const {
 	return _recentViewers;
 }
@@ -341,6 +342,7 @@ void Story::applyViewsSlice(
 		const std::optional<StoryView> &offset,
 		const std::vector<StoryView> &slice,
 		int total) {
+	const auto changed = (_views != total);
 	_views = total;
 	if (!offset) {
 		const auto i = _viewsList.empty()
@@ -369,12 +371,42 @@ void Story::applyViewsSlice(
 			}
 		}
 	}
+	const auto known = int(_viewsList.size());
+	if (known >= _recentViewers.size()) {
+		const auto take = std::min(known, kRecentViewersMax);
+		auto viewers = _viewsList
+			| ranges::views::take(take)
+			| ranges::views::transform(&StoryView::peer)
+			| ranges::to_vector;
+		if (_recentViewers != viewers) {
+			_recentViewers = std::move(viewers);
+			if (!changed) {
+				// Count not changed, but list of recent viewers changed.
+				_peer->session().changes().storyUpdated(
+					this,
+					UpdateFlag::ViewsAdded);
+			}
+		}
+	}
+	if (changed) {
+		_peer->session().changes().storyUpdated(
+			this,
+			UpdateFlag::ViewsAdded);
+	}
 }
 
-bool Story::applyChanges(
+void Story::applyChanges(
 		StoryMedia media,
 		const MTPDstoryItem &data,
 		TimeId now) {
+	applyFields(std::move(media), data, now, false);
+}
+
+void Story::applyFields(
+		StoryMedia media,
+		const MTPDstoryItem &data,
+		TimeId now,
+		bool initial) {
 	_lastUpdateTime = now;
 
 	const auto pinned = data.is_pinned();
@@ -388,45 +420,64 @@ bool Story::applyChanges(
 			&owner().session(),
 			data.ventities().value_or_empty()),
 	};
-	auto views = -1;
-	auto recent = std::vector<not_null<PeerData*>>();
+	auto views = _views;
+	auto viewers = std::vector<not_null<PeerData*>>();
 	if (!data.is_min()) {
 		if (const auto info = data.vviews()) {
 			views = info->data().vviews_count().v;
 			if (const auto list = info->data().vrecent_viewers()) {
-				recent.reserve(list->v.size());
+				viewers.reserve(list->v.size());
 				auto &owner = _peer->owner();
-				for (const auto &id : list->v) {
-					recent.push_back(owner.peer(peerFromUser(id)));
+				auto &&cut = list->v
+					| ranges::views::take(kRecentViewersMax);
+				for (const auto &id : cut) {
+					viewers.push_back(owner.peer(peerFromUser(id)));
 				}
 			}
 		}
 	}
 
-	const auto changed = (_media != media)
-		|| (_pinned != pinned)
-		|| (_edited != edited)
-		|| (_isPublic != isPublic)
-		|| (_closeFriends != closeFriends)
-		|| (_noForwards != noForwards)
-		|| (_caption != caption)
-		|| (views >= 0 && _views != views)
-		|| (_recentViewers != recent);
-	if (!changed) {
-		return false;
-	}
-	_media = std::move(media);
+	const auto pinnedChanged = (_pinned != pinned);
+	const auto editedChanged = (_edited != edited);
+	const auto mediaChanged = (_media != media);
+	const auto captionChanged = (_caption != caption);
+	const auto viewsChanged = (_views != views)
+		|| (_recentViewers != viewers);
+
+	_isPublic = isPublic;
+	_closeFriends = closeFriends;
+	_noForwards = noForwards;
 	_edited = edited;
 	_pinned = pinned;
 	_isPublic = isPublic;
 	_closeFriends = closeFriends;
 	_noForwards = noForwards;
-	_caption = std::move(caption);
-	if (views >= 0) {
+	if (viewsChanged) {
 		_views = views;
+		_recentViewers = std::move(viewers);
+	}
+	if (mediaChanged) {
+		_media = std::move(media);
+	}
+	if (captionChanged) {
+		_caption = std::move(caption);
+	}
+
+	const auto changed = (editedChanged || captionChanged || mediaChanged);
+	if (!initial && (changed || viewsChanged)) {
+		_peer->session().changes().storyUpdated(this, UpdateFlag()
+			| (changed ? UpdateFlag::Edited : UpdateFlag())
+			| (viewsChanged ? UpdateFlag::ViewsAdded : UpdateFlag()));
+	}
+	if (!initial && (captionChanged || mediaChanged)) {
+		if (const auto item = _peer->owner().stories().lookupItem(this)) {
+			item->applyChanges(this);
+		}
+		_peer->owner().refreshStoryItemViews(fullId());
+	}
+	if (pinnedChanged) {
+		_peer->owner().stories().savedStateChanged(this);
 	}
-	_recentViewers = std::move(recent);
-	return true;
 }
 
 TimeId Story::lastUpdateTime() const {
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index ed6254a09..d95c4dd40 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -61,8 +61,10 @@ public:
 		StoryId id,
 		not_null<PeerData*> peer,
 		StoryMedia media,
-		TimeId date,
-		TimeId expires);
+		const MTPDstoryItem &data,
+		TimeId now);
+
+	static constexpr int kRecentViewersMax = 3;
 
 	[[nodiscard]] Session &owner() const;
 	[[nodiscard]] Main::Session &session() const;
@@ -103,7 +105,6 @@ public:
 	void setCaption(TextWithEntities &&caption);
 	[[nodiscard]] const TextWithEntities &caption() const;
 
-	void setViewsData(std::vector<not_null<PeerData*>> recent, int total);
 	[[nodiscard]] auto recentViewers() const
 		-> const std::vector<not_null<PeerData*>> &;
 	[[nodiscard]] const std::vector<StoryView> &viewsList() const;
@@ -113,13 +114,19 @@ public:
 		const std::vector<StoryView> &slice,
 		int total);
 
-	bool applyChanges(
+	void applyChanges(
 		StoryMedia media,
 		const MTPDstoryItem &data,
 		TimeId now);
 	[[nodiscard]] TimeId lastUpdateTime() const;
 
 private:
+	void applyFields(
+		StoryMedia media,
+		const MTPDstoryItem &data,
+		TimeId now,
+		bool initial);
+
 	const StoryId _id = 0;
 	const not_null<PeerData*> _peer;
 	StoryMedia _media;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index d05aa292c..788806bdd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -828,11 +828,20 @@ void Controller::subscribeToSession() {
 	}, _sessionLifetime);
 	_session->changes().storyUpdates(
 		Data::StoryUpdate::Flag::Edited
+		| Data::StoryUpdate::Flag::ViewsAdded
 	) | rpl::filter([=](const Data::StoryUpdate &update) {
 		return (update.story == this->story());
 	}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
-		show(update.story, _context);
-		_delegate->storiesRedisplay(update.story);
+		if (update.flags & Data::StoryUpdate::Flag::Edited) {
+			show(update.story, _context);
+			_delegate->storiesRedisplay(update.story);
+		} else {
+			_recentViews->show({
+				.list = update.story->recentViewers(),
+				.total = update.story->views(),
+				.valid = update.story->peer()->isSelf(),
+			});
+		}
 	}, _sessionLifetime);
 	_sessionLifetime.add([=] {
 		_session->data().stories().setPreloadingInViewer({});

From 1c914e40bb4e75c6b8d992786e959b148eecbf5a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 21:05:32 +0400
Subject: [PATCH 367/676] Closed alpha version 4.8.4.1.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 475e3ee7e..e9ff08323 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.8.4.0" />
+    Version="4.8.4.1" />
   <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 6f39c1168..c90e04576 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,8,4,0
- PRODUCTVERSION 4,8,4,0
+ FILEVERSION 4,8,4,1
+ PRODUCTVERSION 4,8,4,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.4.0"
+            VALUE "FileVersion", "4.8.4.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.0"
+            VALUE "ProductVersion", "4.8.4.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 732642486..1292b3215 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,8,4,0
- PRODUCTVERSION 4,8,4,0
+ FILEVERSION 4,8,4,1
+ PRODUCTVERSION 4,8,4,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.4.0"
+            VALUE "FileVersion", "4.8.4.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.0"
+            VALUE "ProductVersion", "4.8.4.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 0058d08cf..9e9f695db 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004001ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/updates.py b/Telegram/build/updates.py
index 3f5cd81a5..85dbda59a 100644
--- a/Telegram/build/updates.py
+++ b/Telegram/build/updates.py
@@ -53,9 +53,9 @@ outputFolder = 'updates/' + today
 archive = 'tdesktop_macOS_' + today + '.zip'
 
 if building:
-    print('Building debug version for OS X 10.12+..')
+    print('Building Release version for OS X 10.12+..')
 
-    if os.path.exists('../out/Debug/' + outputFolder):
+    if os.path.exists('../out/Release/' + outputFolder):
         finish(1, 'Todays updates version exists.')
 
     if uuid == '':
@@ -65,11 +65,11 @@ if building:
 
     os.chdir('../out')
     if uuid == '':
-        result = subprocess.call('cmake --build . --config Debug --target Telegram', shell=True)
+        result = subprocess.call('cmake --build . --config Release --target Telegram', shell=True)
         if result != 0:
             finish(1, 'While building Telegram.')
 
-    os.chdir('Debug')
+    os.chdir('Release')
     if uuid == '':
         if not os.path.exists('Telegram.app'):
             finish(1, 'Telegram.app not found.')
@@ -106,7 +106,7 @@ if building:
             finish(1, 'Adding tdesktop to archive.')
 
         print('Beginning notarization process.')
-        lines = subprocess.check_output('xcrun altool --notarize-app --primary-bundle-id "com.tdesktop.TelegramDebug" --username "' + username + '" --password "@keychain:AC_PASSWORD" --file "' + archive + '"', stderr=subprocess.STDOUT, shell=True).decode('utf-8')
+        lines = subprocess.check_output('xcrun altool --notarize-app --primary-bundle-id "com.tdesktop.Telegram" --username "' + username + '" --password "@keychain:AC_PASSWORD" --file "' + archive + '"', stderr=subprocess.STDOUT, shell=True).decode('utf-8')
         print('Response received.')
         uuid = ''
         for line in lines.split('\n'):
@@ -193,7 +193,7 @@ if building:
         print('NB! Notarization log not found.')
     finish(0)
 
-commandPath = scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt'
+commandPath = scriptPath + '/../../out/Release/' + outputFolder + '/command.txt'
 
 if composing:
     templatePath = scriptPath + '/../../../DesktopPrivate/updates_template.txt'
@@ -235,7 +235,7 @@ if composing:
             for line in template:
                 if line.startswith('//'):
                     continue
-                line = line.replace('{path}', scriptPath + '/../../out/Debug/' + outputFolder + '/' + archive)
+                line = line.replace('{path}', scriptPath + '/../../out/Release/' + outputFolder + '/' + archive)
                 line = line.replace('{caption}', 'TDesktop at ' + today.replace('_', '.') + ':\n\n' + changelog)
                 f.write(line)
     print('\n\nEdit:\n')
@@ -262,9 +262,9 @@ if len(caption) > 1024:
     print('vi ' + commandPath)
     finish(1, 'Too large.')
 
-if not os.path.exists('../out/Debug/' + outputFolder + '/' + archive):
+if not os.path.exists('../out/Release/' + outputFolder + '/' + archive):
     finish(1, 'Not built yet.')
 
-subprocess.call(scriptPath + '/../../out/Debug/Telegram.app/Contents/MacOS/Telegram -sendpath interpret://' + scriptPath + '/../../out/Debug/' + outputFolder + '/command.txt', shell=True)
+subprocess.call(scriptPath + '/../../out/Release/Telegram.app/Contents/MacOS/Telegram -sendpath interpret://' + scriptPath + '/../../out/Release/' + outputFolder + '/command.txt', shell=True)
 
 finish(0)
diff --git a/Telegram/build/version b/Telegram/build/version
index e74e8988d..ac52ec62e 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.8
 AppVersionStrSmall 4.8.4
 AppVersionStr      4.8.4
 BetaChannel        0
-AlphaVersion       0
-AppVersionOriginal 4.8.4
+AlphaVersion       4008004001
+AppVersionOriginal 4.8.4.1

From 08ee386b2817d438263496e33344a3b028d0d0cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Jul 2023 00:05:34 +0400
Subject: [PATCH 368/676] Fix build for macOS.

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

diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
index 15d8925b5..8615aec4b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
@@ -140,7 +140,7 @@ void StoryMention::draw(
 		_unreadBrush = QBrush(gradient);
 	}
 	auto readColor = context.st->msgServiceFg()->c;
-	readColor.setAlphaF(std::min(readColor.alphaF(), kReadOutlineAlpha));
+	readColor.setAlphaF(std::min(1. * readColor.alphaF(), kReadOutlineAlpha));
 	p.setPen(QPen(
 		_unread ? _unreadBrush : QBrush(readColor),
 		0.5 * (_unread

From dc806d42868de6bd55599eea2de94f94b4e0e685 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Jul 2023 22:49:30 +0400
Subject: [PATCH 369/676] Try ElasticScroll in Dialogs::Widget.

---
 .../dialogs/dialogs_inner_widget.cpp          |  1 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 30 ++++++++++++-------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  4 +--
 Telegram/lib_ui                               |  2 +-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 6b2b7efe7..2c0ff4141 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_options.h"
 #include "ui/painter.h"
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 72e8b9ea9..8fc7250ee 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_group_call_bar.h"
 #include "boxes/peers/edit_peer_requests_box.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/effects/radial_animation.h"
@@ -211,7 +212,7 @@ Widget::Widget(
 , _lockUnlock(_searchControls, st::dialogsLock)
 , _scroll(this)
 , _allowStoriesExpandTimer([=] {
-	_scroll->verticalScrollBar()->setMinimum(0);
+	//_scroll->verticalScrollBar()->setMinimum(0);
 })
 , _scrollToTop(_scroll, st::dialogsToUp)
 , _searchTimer([=] { searchMessages(); })
@@ -269,7 +270,9 @@ Widget::Widget(
 	_inner->storiesExpandedRequests(
 	) | rpl::start_with_next([=](bool expanded) {
 		if (expanded || _scroll->scrollTop() < _inner->defaultScrollTop()) {
-			scrollToDefaultChecked(expanded);
+			if (_scroll->scrollTop() > 0) {
+				scrollToDefaultChecked(expanded);
+			}
 		}
 	}, lifetime());
 
@@ -427,6 +430,7 @@ Widget::Widget(
 	setupSupportMode();
 	setupScrollUpButton();
 
+	_scroll->setOverscrollBg(st::dialogsBg->c);
 	if (_layout != Layout::Child) {
 		setupConnectingWidget();
 
@@ -449,7 +453,11 @@ Widget::Widget(
 		}, lifetime());
 
 		_childListShown.changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::start_with_next([=](float64 value) {
+			_scroll->setOverscrollBg(anim::color(
+				st::dialogsBg,
+				st::dialogsBgOver,
+				value));
 			updateControlsGeometry();
 		}, lifetime());
 
@@ -867,7 +875,7 @@ void Widget::changeOpenedSubsection(
 		}
 		oldContentCache = grabForFolderSlideAnimation();
 	}
-	_scroll->verticalScrollBar()->setMinimum(0);
+	//_scroll->verticalScrollBar()->setMinimum(0);
 	_showAnimation = nullptr;
 	destroyChildListCanvas();
 	change();
@@ -1143,7 +1151,7 @@ void Widget::jumpToTop(bool belowPinned) {
 
 void Widget::scrollToDefault(bool verytop) {
 	if (verytop) {
-		_scroll->verticalScrollBar()->setMinimum(0);
+		//_scroll->verticalScrollBar()->setMinimum(0);
 	}
 	_scrollToAnimation.stop();
 	auto scrollTop = _scroll->scrollTop();
@@ -2397,28 +2405,28 @@ bool Widget::customWheelProcess(not_null<QWheelEvent*> e) {
 void Widget::customScrollProcess(Qt::ScrollPhase phase) {
 	const auto now = _scroll->scrollTop();
 	const auto def = _inner->defaultScrollTop();
-	const auto bar = _scroll->verticalScrollBar();
+	//const auto bar = _scroll->verticalScrollBar();
 	if (phase == Qt::ScrollBegin || phase == Qt::ScrollUpdate) {
 		_allowStoriesExpandTimer.cancel();
 		_inner->setTouchScrollActive(true);
-		bar->setMinimum(0);
+		//bar->setMinimum(0);
 	} else if (phase == Qt::ScrollEnd || phase == Qt::ScrollMomentum) {
 		_allowStoriesExpandTimer.cancel();
 		_inner->setTouchScrollActive(false);
 		if (def > 0 && now >= def) {
-			bar->setMinimum(def);
+			//bar->setMinimum(def);
 		} else {
-			bar->setMinimum(0);
+			//bar->setMinimum(0);
 		}
 	} else {
 		const auto allow = (def <= 0)
 			|| (now < def)
 			|| (now == def && !_allowStoriesExpandTimer.isActive());
 		if (allow) {
-			_scroll->verticalScrollBar()->setMinimum(0);
+			//_scroll->verticalScrollBar()->setMinimum(0);
 			_allowStoriesExpandTimer.cancel();
 		} else {
-			bar->setMinimum(def);
+			//bar->setMinimum(def);
 			_allowStoriesExpandTimer.callOnce(kWaitTillAllowStoriesExpand);
 		}
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 686ce1b23..ee3861fdb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/dialogs_key.h"
 #include "window/section_widget.h"
 #include "ui/effects/animations.h"
-#include "ui/widgets/scroll_area.h"
 #include "mtproto/sender.h"
 #include "api/api_single_message_search.h"
 
@@ -46,6 +45,7 @@ class GroupCallBar;
 class RequestsBar;
 class MoreChatsBar;
 class JumpDownButton;
+class ElasticScroll;
 template <typename Widget>
 class FadeWrapScaled;
 } // namespace Ui
@@ -247,7 +247,7 @@ private:
 	std::unique_ptr<Ui::RequestsBar> _forumRequestsBar;
 	std::unique_ptr<HistoryView::ContactStatus> _forumReportBar;
 
-	object_ptr<Ui::ScrollArea> _scroll;
+	object_ptr<Ui::ElasticScroll> _scroll;
 	base::Timer _allowStoriesExpandTimer;
 	QPointer<InnerWidget> _inner;
 	class BottomButton;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d431d803c..7135f3ed8 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d431d803c8b347c192d1bc9b6a206d2622a10748
+Subproject commit 7135f3ed87ee1a6d89cebe6510a2250ffedfb1a9

From e0c10e7cc2112ab1fb89418486570ae0f5794ab0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 10 Jul 2023 11:07:21 +0400
Subject: [PATCH 370/676] Fix scroll-to-top in chats list visibility.

---
 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 8fc7250ee..687aa38cc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -227,6 +227,7 @@ Widget::Widget(
 			_childListPeerId.value(),
 			_childListShown.value(),
 			makeChildListShown)));
+	_scrollToTop->raise();
 
 	_inner->updated(
 	) | rpl::start_with_next([=] {

From 85795aa376cd9d69e4af2a7e8322f0f1a8299d43 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 11:15:32 +0400
Subject: [PATCH 371/676] Working stories in overscroll.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  13 +-
 .../dialogs/dialogs_inner_widget.cpp          |  95 +---------
 .../dialogs/dialogs_inner_widget.h            |  15 --
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 170 +++++++++---------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  13 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 150 +++++++++++-----
 .../dialogs/ui/dialogs_stories_list.h         |  32 ++--
 Telegram/SourceFiles/info/info_top_bar.cpp    |   3 +-
 .../stories/info_stories_inner_widget.cpp     |   3 +-
 Telegram/lib_ui                               |   2 +-
 10 files changed, 232 insertions(+), 264 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 8e9f09232..6a20b6cf7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -246,7 +246,7 @@ dialogsSearchForNarrowFilters: IconButton(dialogsMenuToggle) {
 dialogsFilter: InputField(defaultInputField) {
 	textBg: filterInputInactiveBg;
 	textBgActive: filterInputActiveBg;
-	textMargins: margins(12px, 7px, 30px, 3px);
+	textMargins: margins(12px, 8px, 30px, 5px);
 
 	placeholderFg: placeholderFg;
 	placeholderFgActive: placeholderFgActive;
@@ -257,16 +257,16 @@ dialogsFilter: InputField(defaultInputField) {
 	placeholderFont: normalFont;
 
 	borderFg: filterInputInactiveBg;
-	borderFgActive: filterInputBorderFg;
+	borderFgActive: windowBgRipple;
 	borderFgError: activeLineFgError;
 
 	border: 2px;
 	borderActive: 2px;
-	borderRadius: roundRadiusSmall;
+	borderRadius: 18px;
 
 	font: normalFont;
 
-	heightMin: 32px;
+	heightMin: 35px;
 }
 dialogsCancelSearchInPeer: IconButton(dialogsMenuToggle) {
 	icon: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFg }};
@@ -511,8 +511,9 @@ DialogsStoriesList {
 dialogsStories: DialogsStories {
 	left: 4px;
 	height: 35px;
-	photo: 24px;
-	photoLeft: 10px;
+	photo: 21px;
+	photoTop: 4px;
+	photoLeft: 4px;
 	shift: 16px;
 	lineTwice: 3px;
 	lineReadTwice: 0px;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 2c0ff4141..0a01ddda7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -141,13 +141,6 @@ InnerWidget::InnerWidget(
 	rpl::producer<ChildListShown> childListShown)
 : RpWidget(parent)
 , _controller(controller)
-, _stories(std::make_unique<Stories::List>(
-	this,
-	st::dialogsStoriesList,
-	Stories::ContentForSession(
-		&controller->session(),
-		Data::StorySourcesList::NotHidden),
-	[=] { return _stories->height() - _visibleTop; }))
 , _shownList(controller->session().data().chatsList()->indexed())
 , _st(&st::defaultDialogRow)
 , _pinnedShiftAnimation([=](crl::time now) {
@@ -328,37 +321,6 @@ InnerWidget::InnerWidget(
 		switchToFilter(filterId);
 	}, lifetime());
 
-	_stories->heightValue(
-	) | rpl::filter([=] {
-		return (_viewportHeight > 0) && (defaultScrollTop() > _visibleTop);
-	}) | rpl::start_with_next([=] {
-		refreshForDefaultScroll();
-		jumpToTop();
-	}, lifetime());
-
-	_stories->entered(
-	) | rpl::start_with_next([=] {
-		clearSelection();
-	}, lifetime());
-
-	_stories->clicks(
-	) | rpl::start_with_next([=](uint64 id) {
-		_controller->openPeerStories(
-			PeerId(int64(id)),
-			Data::StorySourcesList::NotHidden);
-	}, lifetime());
-
-	_stories->showMenuRequests(
-	) | rpl::start_with_next([=](const Stories::ShowMenuRequest &request) {
-		FillSourceMenu(_controller, request);
-	}, lifetime());
-
-	_stories->loadMoreRequests(
-	) | rpl::start_with_next([=] {
-		session().data().stories().loadMore(
-			Data::StorySourcesList::NotHidden);
-	}, lifetime());
-
 	session().data().stories().incrementPreloadingMainSources();
 
 	handleChatListEntryRefreshes();
@@ -450,14 +412,8 @@ int InnerWidget::skipTopHeight() const {
 		: 0;
 }
 
-bool InnerWidget::storiesShown() const {
-	return (_state == WidgetState::Default)
-		&& !_openedFolder
-		&& !_openedForum;
-}
-
 int InnerWidget::collapsedRowsOffset() const {
-	return storiesShown() ? _stories->height() : 0;
+	return 0;
 }
 
 int InnerWidget::dialogsOffset() const {
@@ -466,22 +422,6 @@ int InnerWidget::dialogsOffset() const {
 		- skipTopHeight();
 }
 
-rpl::producer<bool> InnerWidget::storiesExpandedRequests() const {
-	return rpl::merge(
-		_stories->toggleExpandedRequests(),
-		_storiesExpandedRequests.events());
-}
-
-void InnerWidget::setTouchScrollActive(bool active) {
-	_stories->setTouchScrollActive(active);
-}
-
-int InnerWidget::defaultScrollTop() const {
-	return storiesShown()
-		? std::max(_stories->height() - st::dialogsStories.height, 0)
-		: 0;
-}
-
 int InnerWidget::fixedOnTopCount() const {
 	auto result = 0;
 	for (const auto &row : *_shownList) {
@@ -564,7 +504,6 @@ void InnerWidget::changeOpenedFolder(Data::Folder *folder) {
 	stopReorderPinned();
 	clearSelection();
 	_openedFolder = folder;
-	_stories->setVisible(storiesShown());
 	refreshShownList();
 	refreshWithCollapsedRows(true);
 	if (_loadMoreCallback) {
@@ -591,7 +530,6 @@ void InnerWidget::changeOpenedForum(Data::Forum *forum) {
 	}
 	_openedForum = forum;
 	_st = forum ? &st::forumTopicRow : &st::defaultDialogRow;
-	_stories->setVisible(storiesShown());
 	refreshShownList();
 
 	_openedForumLifetime.destroy();
@@ -642,7 +580,6 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		.paused = videoPaused,
 		.narrow = (fullWidth < st::columnMinimalWidthLeft / 2),
 	};
-	_stories->setBgOverride(context.currentBg);
 	const auto fillGuard = gsl::finally([&] {
 		// We translate painter down, but it'll be cropped below rect.
 		p.fillRect(rect(), context.currentBg);
@@ -1759,13 +1696,6 @@ void InnerWidget::mousePressReleased(
 	}
 }
 
-void InnerWidget::setViewportHeight(int viewportHeight) {
-	if (_viewportHeight != viewportHeight) {
-		_viewportHeight = viewportHeight;
-		refreshForDefaultScroll();
-	}
-}
-
 void InnerWidget::setCollapsedPressed(int pressed) {
 	if (_collapsedPressed != pressed) {
 		if (_collapsedPressed >= 0) {
@@ -1836,7 +1766,6 @@ void InnerWidget::setSearchedPressed(int pressed) {
 }
 
 void InnerWidget::resizeEvent(QResizeEvent *e) {
-	_stories->resizeToWidth(width());
 	resizeEmptyLabel();
 	moveCancelSearchButtons();
 }
@@ -2597,7 +2526,6 @@ void InnerWidget::visibleTopBottomUpdated(
 		int visibleBottom) {
 	_visibleTop = visibleTop;
 	_visibleBottom = visibleBottom;
-	_stories->update();
 	preloadRowsData();
 	const auto loadTill = _visibleTop
 		+ PreloadHeightsCount * (_visibleBottom - _visibleTop);
@@ -2793,12 +2721,6 @@ void InnerWidget::editOpenedFilter() {
 	}
 }
 
-void InnerWidget::refreshForDefaultScroll() {
-	if (height() < defaultScrollTop() + _viewportHeight) {
-		refresh();
-	}
-}
-
 void InnerWidget::refresh(bool toTop) {
 	if (!_geometryInited) {
 		return;
@@ -2820,9 +2742,6 @@ void InnerWidget::refresh(bool toTop) {
 			h = searchedOffset() + (_searchResults.size() * _st->height);
 		}
 	}
-	if (const auto storiesSkip = defaultScrollTop()) {
-		accumulate_max(h, storiesSkip + _viewportHeight);
-	}
 	resize(width(), h);
 	if (toTop) {
 		stopReorderPinned();
@@ -3033,10 +2952,7 @@ void InnerWidget::clearFilter() {
 }
 
 void InnerWidget::setState(WidgetState state) {
-	if (_state != state) {
-		_state = state;
-		_stories->setVisible(storiesShown());
-	}
+	_state = state;
 }
 
 void InnerWidget::selectSkip(int32 direction) {
@@ -3331,8 +3247,7 @@ void InnerWidget::switchToFilter(FilterId filterId) {
 }
 
 void InnerWidget::jumpToTop() {
-	const auto to = defaultScrollTop();
-	_mustScrollTo.fire({ to, -1 });
+	_mustScrollTo.fire({ 0, -1 });
 }
 
 void InnerWidget::saveChatsFilterScrollState(FilterId filterId) {
@@ -3342,8 +3257,7 @@ void InnerWidget::saveChatsFilterScrollState(FilterId filterId) {
 void InnerWidget::restoreChatsFilterScrollState(FilterId filterId) {
 	const auto it = _chatsFilterScrollStates.find(filterId);
 	if (it != end(_chatsFilterScrollStates)) {
-		const auto top = std::max(it->second, defaultScrollTop());
-		_mustScrollTo.fire({ top, -1 });
+		_mustScrollTo.fire({ std::max(it->second, 0), -1 });
 	}
 }
 
@@ -3412,7 +3326,6 @@ ChosenRow InnerWidget::computeChosenRow() const {
 bool InnerWidget::chooseRow(
 		Qt::KeyboardModifiers modifiers,
 		MsgId pressedTopicRootId) {
-	_storiesExpandedRequests.fire(false);
 	if (chooseCollapsedRow()) {
 		return true;
 	} else if (chooseHashtag()) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index c72d9667f..608513c85 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -52,10 +52,6 @@ struct PaintContext;
 struct TopicJumpCache;
 } // namespace Dialogs::Ui
 
-namespace Dialogs::Stories {
-class List;
-} // namespace Dialogs::Stories
-
 namespace Dialogs {
 
 class Row;
@@ -105,11 +101,6 @@ public:
 		const QVector<MTPPeer> &my,
 		const QVector<MTPPeer> &result);
 
-	void setTouchScrollActive(bool active);
-	[[nodiscard]] rpl::producer<bool> storiesExpandedRequests() const;
-	[[nodiscard]] int defaultScrollTop() const;
-	void setViewportHeight(int viewportHeight);
-
 	[[nodiscard]] FilterId filterId() const;
 
 	void clearSelection();
@@ -124,7 +115,6 @@ public:
 
 	void clearFilter();
 	void refresh(bool toTop = false);
-	void refreshForDefaultScroll();
 	void refreshEmptyLabel();
 	void resizeEmptyLabel();
 
@@ -322,7 +312,6 @@ private:
 	void fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu);
 
 	void refreshShownList();
-	[[nodiscard]] bool storiesShown() const;
 	[[nodiscard]] int skipTopHeight() const;
 	[[nodiscard]] int collapsedRowsOffset() const;
 	[[nodiscard]] int dialogsOffset() const;
@@ -409,10 +398,6 @@ private:
 
 	const not_null<Window::SessionController*> _controller;
 
-	const std::unique_ptr<Stories::List> _stories;
-	rpl::event_stream<bool> _storiesExpandedRequests;
-	int _viewportHeight = 0;
-
 	not_null<IndexedList*> _shownList;
 	FilterId _filterId = 0;
 	bool _mouseSelection = false;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 687aa38cc..10046fa6e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/dialogs_widget.h"
 
+#include "dialogs/ui/dialogs_stories_content.h"
+#include "dialogs/ui/dialogs_stories_list.h"
 #include "dialogs/dialogs_inner_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
 #include "dialogs/dialogs_key.h"
@@ -64,6 +66,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_download_manager.h"
 #include "data/data_chat_filters.h"
+#include "data/data_stories.h"
 #include "info/downloads/info_downloads_widget.h"
 #include "info/info_memento.h"
 #include "styles/style_dialogs.h"
@@ -211,15 +214,21 @@ Widget::Widget(
 , _cancelSearch(_searchControls, st::dialogsCancelSearch)
 , _lockUnlock(_searchControls, st::dialogsLock)
 , _scroll(this)
-, _allowStoriesExpandTimer([=] {
-	//_scroll->verticalScrollBar()->setMinimum(0);
-})
 , _scrollToTop(_scroll, st::dialogsToUp)
+, _stories(std::make_unique<Stories::List>(
+	this,
+	st::dialogsStoriesList,
+	Stories::ContentForSession(
+		&controller->session(),
+		Data::StorySourcesList::NotHidden)))
 , _searchTimer([=] { searchMessages(); })
 , _singleMessageSearch(&controller->session()) {
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
 	};
+	_scroll->setOverscrollTypes(
+		Ui::ElasticScroll::OverscrollType::Virtual,
+		Ui::ElasticScroll::OverscrollType::Real);
 	_inner = _scroll->setOwnedWidget(object_ptr<InnerWidget>(
 		this,
 		controller,
@@ -228,6 +237,22 @@ Widget::Widget(
 			_childListShown.value(),
 			makeChildListShown)));
 	_scrollToTop->raise();
+	rpl::combine(
+		_scroll->positionValue(),
+		_scroll->movementValue()
+	) | rpl::start_with_next([=](
+			Ui::ElasticScrollPosition position,
+			Ui::ElasticScrollMovement movement) {
+		const auto overscrollTop = std::max(-position.overscroll, 0);
+		if (_overscrollTop != overscrollTop) {
+			_overscrollTop = overscrollTop;
+			updateControlsGeometry();
+		}
+		using Phase = Ui::ElasticScrollMovement;
+		_stories->setExpandedHeight(
+			_overscrollTop,
+			(movement == Phase::Momentum || movement == Phase::Returning));
+	}, lifetime());
 
 	_inner->updated(
 	) | rpl::start_with_next([=] {
@@ -268,15 +293,6 @@ Widget::Widget(
 		}
 	}, lifetime());
 
-	_inner->storiesExpandedRequests(
-	) | rpl::start_with_next([=](bool expanded) {
-		if (expanded || _scroll->scrollTop() < _inner->defaultScrollTop()) {
-			if (_scroll->scrollTop() > 0) {
-				scrollToDefaultChecked(expanded);
-			}
-		}
-	}, lifetime());
-
 	_inner->mustScrollTo(
 	) | rpl::start_with_next([=](const Ui::ScrollToRequest &data) {
 		if (_scroll) {
@@ -328,12 +344,6 @@ Widget::Widget(
 	) | rpl::start_with_next([=] {
 		listScrollUpdated();
 	}, lifetime());
-	_scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
-		return customWheelProcess(e);
-	});
-	_scroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
-		return customTouchProcess(e);
-	});
 
 	session().data().chatsListChanges(
 	) | rpl::filter([=](Data::Folder *folder) {
@@ -383,6 +393,7 @@ Widget::Widget(
 
 	setupMainMenuToggle();
 	setupShortcuts();
+	setupStories();
 
 	_searchForNarrowFilters->setClickedCallback([=] {
 		_filter->setFocusFast();
@@ -589,7 +600,7 @@ void Widget::setupMoreChatsBar() {
 	}
 	controller()->activeChatsFilter(
 	) | rpl::start_with_next([=](FilterId id) {
-		if (!id) {
+		if (!id && false) { // #TODO stories testing
 			_moreChatsBar = nullptr;
 			updateControlsGeometry();
 			return;
@@ -770,6 +781,38 @@ void Widget::setupMainMenuToggle() {
 	}, _mainMenu.toggle->lifetime());
 }
 
+void Widget::setupStories() {
+	_stories->clicks(
+	) | rpl::start_with_next([=](uint64 id) {
+		controller()->openPeerStories(
+			PeerId(int64(id)),
+			Data::StorySourcesList::NotHidden);
+	}, lifetime());
+
+	_stories->showMenuRequests(
+	) | rpl::start_with_next([=](const Stories::ShowMenuRequest &request) {
+		FillSourceMenu(controller(), request);
+	}, lifetime());
+
+	_stories->loadMoreRequests(
+	) | rpl::start_with_next([=] {
+		session().data().stories().loadMore(
+			Data::StorySourcesList::NotHidden);
+	}, lifetime());
+
+	_stories->toggleExpandedRequests(
+	) | rpl::start_with_next([=](bool expanded) {
+		if (expanded) {
+			if (!_scrollToAnimation.animating() || _scrollAnimationTo) {
+				scrollToDefault();
+			}
+		}
+		_scroll->setOverscrollDefaults(
+			expanded ? -st::dialogsStoriesFull.height : 0,
+			0);
+	}, lifetime());
+}
+
 void Widget::setupShortcuts() {
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
@@ -1128,7 +1171,7 @@ void Widget::jumpToTop(bool belowPinned) {
 		return;
 	}
 	if ((currentSearchQuery().trimmed().isEmpty() && !_searchInChat)) {
-		auto to = _inner->defaultScrollTop();
+		auto to = 0;
 		if (belowPinned) {
 			const auto list = _openedForum
 				? _openedForum->topicsList()
@@ -1156,7 +1199,7 @@ void Widget::scrollToDefault(bool verytop) {
 	}
 	_scrollToAnimation.stop();
 	auto scrollTop = _scroll->scrollTop();
-	const auto scrollTo = verytop ? 0 : _inner->defaultScrollTop();
+	const auto scrollTo = 0;
 	if (scrollTop == scrollTo) {
 		return;
 	}
@@ -1172,7 +1215,7 @@ void Widget::scrollToDefault(bool verytop) {
 		const auto animated = qRound(_scrollToAnimation.value(scrollTo));
 		const auto animatedDelta = animated - scrollTo;
 		const auto realDelta = _scroll->scrollTop() - scrollTo;
-		if (realDelta * animatedDelta < 0) {
+		if (base::OppositeSigns(realDelta, animatedDelta)) {
 			// We scrolled manually to the other side of target 'scrollTo'.
 			_scrollToAnimation.stop();
 		} else if (std::abs(realDelta) > std::abs(animatedDelta)) {
@@ -1181,6 +1224,7 @@ void Widget::scrollToDefault(bool verytop) {
 		}
 	};
 
+	_scrollAnimationTo = scrollTo;
 	_scrollToAnimation.start(
 		scroll,
 		scrollTop,
@@ -2398,55 +2442,6 @@ void Widget::completeHashtag(QString tag) {
 	applyFilterUpdate(true);
 }
 
-bool Widget::customWheelProcess(not_null<QWheelEvent*> e) {
-	customScrollProcess(e->phase());
-	return false;
-}
-
-void Widget::customScrollProcess(Qt::ScrollPhase phase) {
-	const auto now = _scroll->scrollTop();
-	const auto def = _inner->defaultScrollTop();
-	//const auto bar = _scroll->verticalScrollBar();
-	if (phase == Qt::ScrollBegin || phase == Qt::ScrollUpdate) {
-		_allowStoriesExpandTimer.cancel();
-		_inner->setTouchScrollActive(true);
-		//bar->setMinimum(0);
-	} else if (phase == Qt::ScrollEnd || phase == Qt::ScrollMomentum) {
-		_allowStoriesExpandTimer.cancel();
-		_inner->setTouchScrollActive(false);
-		if (def > 0 && now >= def) {
-			//bar->setMinimum(def);
-		} else {
-			//bar->setMinimum(0);
-		}
-	} else {
-		const auto allow = (def <= 0)
-			|| (now < def)
-			|| (now == def && !_allowStoriesExpandTimer.isActive());
-		if (allow) {
-			//_scroll->verticalScrollBar()->setMinimum(0);
-			_allowStoriesExpandTimer.cancel();
-		} else {
-			//bar->setMinimum(def);
-			_allowStoriesExpandTimer.callOnce(kWaitTillAllowStoriesExpand);
-		}
-	}
-}
-
-bool Widget::customTouchProcess(not_null<QTouchEvent*> e) {
-	const auto type = e->type();
-	customScrollProcess([&] {
-		switch (e->type()) {
-		case QEvent::TouchBegin: return Qt::ScrollBegin;
-		case QEvent::TouchUpdate: return Qt::ScrollUpdate;
-		case QEvent::TouchEnd:
-		case QEvent::TouchCancel: return Qt::ScrollEnd;
-		}
-		Unexpected("Touch event type in Widdget::customTouchProcess.");
-	}());
-	return false;
-}
-
 void Widget::resizeEvent(QResizeEvent *e) {
 	updateControlsGeometry();
 }
@@ -2526,11 +2521,9 @@ void Widget::updateControlsGeometry() {
 		? st::dialogsFilterSkip
 		: (st::dialogsFilterPadding.x() + _mainMenu.toggle->width()))
 		+ st::dialogsFilterPadding.x();
-	auto filterRight = (session().domain().local().hasLocalPasscode()
-		? (st::dialogsFilterPadding.x() + _lockUnlock->width())
-		: st::dialogsFilterSkip) + st::dialogsFilterPadding.x();
-	auto filterWidth = qMax(ratiow, smallw) - filterLeft - filterRight;
-	auto filterAreaHeight = st::topBarHeight;
+	const auto filterRight = st::dialogsFilterSkip + st::dialogsFilterPadding.x();
+	const auto filterWidth = qMax(ratiow, smallw) - filterLeft - filterRight;
+	const auto filterAreaHeight = st::topBarHeight;
 	_searchControls->setGeometry(0, filterAreaTop, ratiow, filterAreaHeight);
 	if (_subsectionTopBar) {
 		_subsectionTopBar->setGeometryWithNarrowRatio(
@@ -2542,6 +2535,7 @@ void Widget::updateControlsGeometry() {
 	auto filterTop = (filterAreaHeight - _filter->height()) / 2;
 	filterLeft = anim::interpolate(filterLeft, _narrowWidth, narrowRatio);
 	_filter->setGeometryToLeft(filterLeft, filterTop, filterWidth, _filter->height());
+
 	auto mainMenuLeft = anim::interpolate(
 		st::dialogsFilterPadding.x(),
 		(_narrowWidth - _mainMenu.toggle->width()) / 2,
@@ -2567,14 +2561,21 @@ void Widget::updateControlsGeometry() {
 	right -= _chooseFromUser->width(); _chooseFromUser->moveToLeft(right, _filter->y());
 
 	const auto barw = width();
+	const auto expandedStoriesTop = filterAreaTop + filterAreaHeight;
+	const auto storiesHeight = 2 * st::dialogsStories.photoTop
+		+ st::dialogsStories.photo;
+	const auto added = (st::dialogsFilter.heightMin - storiesHeight) / 2;
+	_stories->setLayoutConstraints(
+		{ filterLeft + filterWidth, filterTop + added },
+		{ 0, expandedStoriesTop, barw, st::dialogsStoriesFull.height });
 	if (_forumTopShadow) {
 		_forumTopShadow->setGeometry(
 			0,
-			filterAreaTop + filterAreaHeight,
+			expandedStoriesTop,
 			barw,
 			st::lineWidth);
 	}
-	const auto moreChatsBarTop = filterAreaTop + filterAreaHeight;
+	const auto moreChatsBarTop = expandedStoriesTop + _overscrollTop;
 	if (_moreChatsBar) {
 		_moreChatsBar->move(0, moreChatsBarTop);
 		_moreChatsBar->resizeToWidth(barw);
@@ -2599,8 +2600,7 @@ void Widget::updateControlsGeometry() {
 	auto scrollTop = forumReportTop
 		+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
 	const auto wasScrollTop = _scroll->scrollTop();
-	const auto newScrollTop = (_topDelta < 0
-		&& wasScrollTop <= _inner->defaultScrollTop())
+	const auto newScrollTop = (_topDelta < 0 && wasScrollTop <= 0)
 		? wasScrollTop
 		: (wasScrollTop + _topDelta);
 	auto scrollHeight = height() - scrollTop;
@@ -2626,19 +2626,13 @@ void Widget::updateControlsGeometry() {
 
 	const auto scrollw = _childList ? _narrowWidth : barw;
 	const auto wasScrollHeight = _scroll->height();
-	if (scrollHeight >= wasScrollHeight) {
-		_inner->setViewportHeight(scrollHeight);
-	}
 	_scroll->setGeometry(0, scrollTop, scrollw, scrollHeight);
-	if (scrollHeight < wasScrollHeight) {
-		_inner->setViewportHeight(scrollHeight);
-	}
 	_inner->resize(scrollw, _inner->height());
 	_inner->setNarrowRatio(narrowRatio);
 	if (scrollHeight != wasScrollHeight) {
 		controller()->floatPlayerAreaUpdated();
 	}
-	const auto startWithTop = _inner->defaultScrollTop();
+	const auto startWithTop = 0;
 	if (wasScrollHeight < startWithTop && scrollHeight >= startWithTop) {
 		_scroll->scrollToY(startWithTop);
 	} else if (newScrollTop != wasScrollTop) {
@@ -2718,7 +2712,7 @@ void Widget::paintEvent(QPaintEvent *e) {
 		p.fillRect(above.intersected(r), bg);
 	}
 
-	auto belowTop = _scroll->y() + qMin(_scroll->height(), _inner->height());
+	auto belowTop = _scroll->y() + _scroll->height();
 	if (!_widthAnimationCache.isNull()) {
 		p.drawPixmapLeft(0, _scroll->y(), width(), _widthAnimationCache);
 		belowTop = _scroll->y() + (_widthAnimationCache.height() / cIntRetinaFactor());
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ee3861fdb..13ca38398 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -56,6 +56,10 @@ class ConnectionState;
 struct SectionShow;
 } // namespace Window
 
+namespace Dialogs::Stories {
+class List;
+} // namespace Dialogs::Stories
+
 namespace Dialogs {
 
 struct RowDescriptor;
@@ -136,9 +140,6 @@ private:
 	void cancelSearchInChat();
 	void filterCursorMoved();
 	void completeHashtag(QString tag);
-	bool customWheelProcess(not_null<QWheelEvent*> e);
-	bool customTouchProcess(not_null<QTouchEvent*> e);
-	void customScrollProcess(Qt::ScrollPhase phase);
 
 	[[nodiscard]] QString currentSearchQuery() const;
 	void clearSearchField();
@@ -165,6 +166,7 @@ private:
 	void setupMoreChatsBar();
 	void setupDownloadBar();
 	void setupShortcuts();
+	void setupStories();
 	[[nodiscard]] bool searchForPeersRequired(const QString &query) const;
 	[[nodiscard]] bool searchForTopicsRequired(const QString &query) const;
 	bool setSearchInChat(Key chat, PeerData *from = nullptr);
@@ -248,7 +250,6 @@ private:
 	std::unique_ptr<HistoryView::ContactStatus> _forumReportBar;
 
 	object_ptr<Ui::ElasticScroll> _scroll;
-	base::Timer _allowStoriesExpandTimer;
 	QPointer<InnerWidget> _inner;
 	class BottomButton;
 	object_ptr<BottomButton> _updateTelegram = { nullptr };
@@ -257,6 +258,7 @@ private:
 	std::unique_ptr<Window::ConnectionState> _connecting;
 
 	Ui::Animations::Simple _scrollToAnimation;
+	int _scrollAnimationTo = 0;
 	std::unique_ptr<Window::SlideAnimation> _showAnimation;
 	rpl::variable<float64> _shownProgressValue;
 
@@ -265,6 +267,9 @@ private:
 	bool _scrollToTopIsShown = false;
 	bool _forumSearchRequested = false;
 
+	int _overscrollTop = 0;
+	std::unique_ptr<Stories::List> _stories;
+
 	Data::Folder *_openedFolder = nullptr;
 	Data::Forum *_openedForum = nullptr;
 	Dialogs::Key _searchInChat;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 23da7e9c8..d7d62b416 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -24,7 +24,7 @@ constexpr auto kPreloadPages = 2;
 constexpr auto kExpandAfterRatio = 0.85;
 constexpr auto kCollapseAfterRatio = 0.72;
 constexpr auto kFrictionRatio = 0.15;
-constexpr auto kSnapExpandedTimeout = crl::time(200);
+constexpr auto kExpandCatchUpDuration = crl::time(200);
 
 [[nodiscard]] int AvailableNameWidth(const style::DialogsStoriesList &st) {
 	const auto &full = st.full;
@@ -37,7 +37,6 @@ constexpr auto kSnapExpandedTimeout = crl::time(200);
 
 struct List::Layout {
 	int itemsCount = 0;
-	int shownHeight = 0;
 	float64 expandedRatio = 0.;
 	float64 ratio = 0.;
 	float64 thumbnailLeft = 0.;
@@ -58,12 +57,9 @@ struct List::Layout {
 List::List(
 	not_null<QWidget*> parent,
 	const style::DialogsStoriesList &st,
-	rpl::producer<Content> content,
-	Fn<int()> shownHeight)
+	rpl::producer<Content> content)
 : RpWidget(parent)
-, _st(st)
-, _shownHeight(shownHeight)
-, _snapExpandedTimer([=] { requestExpanded(_expanded); }) {
+, _st(st) {
 	setCursor(style::cur_default);
 
 	std::move(content) | rpl::start_with_next([=](Content &&content) {
@@ -87,6 +83,7 @@ void List::showContent(Content &&content) {
 		return;
 	}
 	const auto hidden = _content.elements.empty();
+	const auto wasCount = int((hidden ? _hidingData : _data).items.size());
 	_content = std::move(content);
 	auto items = base::take(
 		_data.items.empty() ? _hidingData.items : _data.items);
@@ -114,6 +111,9 @@ void List::showContent(Content &&content) {
 			_data.items.emplace_back(Item{ .element = element });
 		}
 	}
+	if (int(_data.items.size()) != wasCount) {
+		updateGeometry();
+	}
 	updateScrollMax();
 	updateSummary(_data);
 	update();
@@ -253,7 +253,6 @@ rpl::producer<> List::loadMoreRequests() const {
 }
 
 void List::requestExpanded(bool expanded) {
-	_snapExpandedTimer.cancel();
 	if (_expanded != expanded) {
 		_expanded = expanded;
 		_expandedAnimation.start(
@@ -274,12 +273,12 @@ void List::resizeEvent(QResizeEvent *e) {
 	updateScrollMax();
 }
 
-void List::updateExpanding(int minHeight, int shownHeight, int fullHeight) {
-	Expects(shownHeight == minHeight || fullHeight > minHeight);
+void List::updateExpanding(int expandingHeight, int expandedHeight) {
+	Expects(!expandingHeight || expandedHeight > 0);
 
-	const auto ratio = (shownHeight == minHeight)
+	const auto ratio = !expandingHeight
 		? 0.
-		: (float64(shownHeight - minHeight) / (fullHeight - minHeight));
+		: (float64(expandingHeight) / expandedHeight);
 	if (_lastRatio == ratio) {
 		return;
 	}
@@ -296,20 +295,12 @@ void List::updateExpanding(int minHeight, int shownHeight, int fullHeight) {
 List::Layout List::computeLayout() {
 	const auto &st = _st.small;
 	const auto &full = _st.full;
-	const auto shownHeight = std::max(_shownHeight(), st.height);
-	if (_lastHeight != shownHeight) {
-		_lastHeight = shownHeight;
-		if (_lastHeight == st.height || _lastHeight == full.height) {
-			_snapExpandedTimer.cancel();
-		} else if (!_touchScrollActive) {
-			_snapExpandedTimer.callOnce(kSnapExpandedTimeout);
-		}
-	}
-	updateExpanding(st.height, shownHeight, full.height);
+	const auto use = _lastExpandedHeight
+		* _expandCatchUpAnimation.value(1.);
+	updateExpanding(use, full.height);
 
 	const auto expanded = _expandedAnimation.value(_expanded ? 1. : 0.);
-	const auto expandedRatio = float64(shownHeight - st.height)
-		/ (full.height - st.height);
+	const auto expandedRatio = _lastRatio;
 	const auto collapsedRatio = expandedRatio * kFrictionRatio;
 	const auto ratio = expandedRatio * expanded
 		+ collapsedRatio * (1. - expanded);
@@ -323,7 +314,7 @@ List::Layout List::computeLayout() {
 	const auto narrowWidth = st::defaultDialogRow.padding.left()
 		+ st::defaultDialogRow.photoSize
 		+ st::defaultDialogRow.padding.left();
-	const auto narrow = (width() <= narrowWidth);
+	const auto narrow = false;// (width() <= narrowWidth);
 	const auto smallSkip = (itemsCount > 1
 		&& rendering.items[0].element.skipSmall)
 		? 1
@@ -352,7 +343,6 @@ List::Layout List::computeLayout() {
 	const auto photoLeft = lerp(st.photoLeft, full.photoLeft);
 	return Layout{
 		.itemsCount = itemsCount,
-		.shownHeight = shownHeight,
 		.expandedRatio = expandedRatio,
 		.ratio = ratio,
 		.thumbnailLeft = thumbnailLeft,
@@ -391,14 +381,14 @@ void List::paintEvent(QPaintEvent *e) {
 	auto &rendering = _data.empty() ? _hidingData : _data;
 	const auto line = elerp(st.lineTwice, full.lineTwice) / 2.;
 	const auto lineRead = elerp(st.lineReadTwice, full.lineReadTwice) / 2.;
-	const auto photoTopSmall = (st.height - st.photo) / 2.;
+	const auto photoTopSmall = st.photoTop;
 	const auto photoTop = photoTopSmall
 		+ (full.photoTop - photoTopSmall) * layout.expandedRatio;
 	const auto photo = lerp(st.photo, full.photo);
 	const auto summaryTop = st.nameTop
 		- (st.photoTop + (st.photo / 2.))
 		+ (photoTop + (photo / 2.));
-	const auto nameScale = layout.shownHeight / float64(full.height);
+	const auto nameScale = _lastRatio;
 	const auto nameTop = nameScale * full.nameTop;
 	const auto nameWidth = nameScale * AvailableNameWidth(_st);
 	const auto nameHeight = nameScale * full.nameStyle.font->height;
@@ -407,8 +397,18 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto readUserpicAppearingOpacity = elerp(_st.readOpacity, 0.);
 
 	auto p = QPainter(this);
-	p.fillRect(e->rect(), _bgOverride.value_or(_st.bg));
-	p.translate(0, height() - layout.shownHeight);
+
+	if (_state == State::Changing) {
+		const auto left = anim::interpolate(
+			_changingGeometryFrom.x(),
+			_geometryFull.x(),
+			layout.expandedRatio);
+		const auto top = anim::interpolate(
+			_changingGeometryFrom.y(),
+			_geometryFull.y(),
+			layout.expandedRatio);
+		p.translate(QPoint(left, top) - pos());
+	}
 
 	const auto drawSmall = (expandRatio < 1.);
 	const auto drawFull = (expandRatio > 0.);
@@ -691,6 +691,7 @@ void List::paintSummary(
 		Data &data,
 		float64 summaryTop,
 		float64 hidden) {
+#if 0 // #TODO stories to-remove
 	const auto total = int(data.items.size());
 	auto &summary = ChooseSummary(
 		_st.small,
@@ -723,6 +724,7 @@ void List::paintSummary(
 	p.drawImage(
 		QRectF(left, summaryTop, summaryWidth, summaryHeight),
 		summary.cache);
+#endif
 }
 
 void List::wheelEvent(QWheelEvent *e) {
@@ -767,12 +769,9 @@ void List::mouseMoveEvent(QMouseEvent *e) {
 	_lastMousePosition = e->globalPos();
 	updateSelected();
 
-	if (!_dragging && _mouseDownPosition) {
+	if (!_dragging && _mouseDownPosition && _state == State::Full) {
 		if ((_lastMousePosition - *_mouseDownPosition).manhattanLength()
 			>= QApplication::startDragDistance()) {
-			if (_shownHeight() < _st.full.height) {
-				requestExpanded(true);
-			}
 			_dragging = true;
 			_startDraggingLeft = _scrollLeft;
 		}
@@ -822,19 +821,82 @@ void List::mouseReleaseEvent(QMouseEvent *e) {
 	}
 }
 
-void List::setBgOverride(QBrush brush) {
-	_bgOverride = std::move(brush);
+void List::setExpandedHeight(int height, bool momentum) {
+	height = std::clamp(height, 0, _st.full.height);
+	if (_lastExpandedHeight == height) {
+		return;
+	} else if (momentum && _expandIgnored) {
+		return;
+	} else if (momentum && height > 0 && !_lastExpandedHeight) {
+		_expandIgnored = true;
+		return;
+	} else if (!momentum && _expandIgnored && height > 0) {
+		_expandIgnored = false;
+		_expandCatchUpAnimation.start([=] {
+			update();
+			if (!_expandCatchUpAnimation.animating()
+				&& _lastExpandedHeight == _st.full.height) {
+				setState(State::Full);
+			}
+		}, 0., 1., kExpandCatchUpDuration);
+	} else if (!height && _expandCatchUpAnimation.animating()) {
+		_expandCatchUpAnimation.stop();
+	}
+	_lastExpandedHeight = height;
+	setState(!height
+		? State::Small
+		: (height < _st.full.height
+			|| _expandCatchUpAnimation.animating()
+			|| _expandedAnimation.animating())
+		? State::Changing
+		: State::Full);
+	update();
 }
 
-void List::setTouchScrollActive(bool active) {
-	if (_touchScrollActive != active) {
-		_touchScrollActive = active;
-		if (active) {
-			_snapExpandedTimer.cancel();
-		} else {
-			requestExpanded(_expanded);
-		}
+void List::setLayoutConstraints(QPoint topRightSmall, QRect geometryFull) {
+	_topRightSmall = topRightSmall;
+	_geometryFull = geometryFull;
+	updateGeometry();
+	update();
+}
+
+void List::updateGeometry() {
+	switch (_state) {
+	case State::Small: setGeometry(countSmallGeometry()); break;
+	case State::Changing: {
+		_changingGeometryFrom = countSmallGeometry();
+		setGeometry(_geometryFull.united(_changingGeometryFrom));
+	} break;
+	case State::Full: setGeometry(_geometryFull);
 	}
+	update();
+}
+
+QRect List::countSmallGeometry() const {
+	const auto &st = _st.small;
+	const auto layout = const_cast<List*>(this)->computeLayout();
+	const auto count = layout.endIndexSmall - layout.startIndexSmall;
+	const auto width = st.left
+		+ st.photoLeft
+		+ st.photo + (count - 1) * st.shift
+		+ st.photoLeft
+		+ st.left;
+	return QRect(
+		_topRightSmall.x() - width,
+		_topRightSmall.y(),
+		width,
+		st.photoTop + st.photo + st.photoTop);
+}
+
+void List::setState(State state) {
+	if (_state == state) {
+		return;
+	}
+	_state = state;
+	setAttribute(
+		Qt::WA_TransparentForMouseEvents,
+		state == State::Changing);
+	updateGeometry();
 }
 
 void List::contextMenuEvent(QContextMenuEvent *e) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index a3b44d04a..0bf355bdb 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -63,11 +63,10 @@ public:
 	List(
 		not_null<QWidget*> parent,
 		const style::DialogsStoriesList &st,
-		rpl::producer<Content> content,
-		Fn<int()> shownHeight);
+		rpl::producer<Content> content);
 
-	void setBgOverride(QBrush brush);
-	void setTouchScrollActive(bool active);
+	void setExpandedHeight(int height, bool momentum = false);
+	void setLayoutConstraints(QPoint topRightSmall, QRect geometryFull);
 
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] rpl::producer<ShowMenuRequest> showMenuRequests() const;
@@ -77,6 +76,11 @@ public:
 
 private:
 	struct Layout;
+	enum class State {
+		Small,
+		Changing,
+		Full,
+	};
 	struct Item {
 		Element element;
 		QImage nameCache;
@@ -149,7 +153,10 @@ private:
 	void checkLoadMore();
 	void requestExpanded(bool expanded);
 
-	void updateExpanding(int minHeight, int shownHeight, int fullHeight);
+	void setState(State state);
+	void updateGeometry();
+	[[nodiscard]] QRect countSmallGeometry() const;
+	void updateExpanding(int expandingHeight, int expandedHeight);
 	void updateHeight();
 	void toggleAnimated(bool shown);
 	void paintSummary(
@@ -164,14 +171,17 @@ private:
 	Content _content;
 	Data _data;
 	Data _hidingData;
-	Fn<int()> _shownHeight = 0;
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<ShowMenuRequest> _showMenuRequests;
 	rpl::event_stream<bool> _toggleExpandedRequests;
 	rpl::event_stream<> _entered;
 	rpl::event_stream<> _loadMoreRequests;
 
-	std::optional<QBrush> _bgOverride;
+	QPoint _topRightSmall;
+	QRect _geometryFull;
+	QRect _changingGeometryFrom;
+	State _state = State::Small;
+
 	Ui::Animations::Simple _shownAnimation;
 
 	QPoint _lastMousePosition;
@@ -182,11 +192,11 @@ private:
 	bool _dragging = false;
 
 	Ui::Animations::Simple _expandedAnimation;
-	base::Timer _snapExpandedTimer;
+	Ui::Animations::Simple _expandCatchUpAnimation;
 	float64 _lastRatio = 0.;
-	int _lastHeight = 0;
-	bool _expanded = false;
-	bool _touchScrollActive = false;
+	int _lastExpandedHeight = 0;
+	bool _expandIgnored : 1 = false;
+	bool _expanded : 1 = false;
 
 	int _selected = -1;
 	int _pressed = -1;
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 68aae3228..81f4dd685 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -465,8 +465,7 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 					last
 				) | rpl::filter([](const Content &content) {
 					return !content.elements.empty();
-				}),
-				[] { return st::dialogsStories.height; }),
+				})),
 				st::infoTopBarScale);
 		registerToggleControlCallback(
 			stories,
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index b6fc6254f..8abc39d8d 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -170,8 +170,7 @@ void InnerWidget::createButtons() {
 		st::dialogsStoriesListMine,
 		rpl::duplicate(last) | rpl::filter([](const Content &content) {
 			return !content.elements.empty();
-		}),
-		[] { return st::dialogsStories.height; });
+		}));
 	thumbs->show();
 	rpl::combine(
 		recent->sizeValue(),
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 7135f3ed8..80308cea4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7135f3ed87ee1a6d89cebe6510a2250ffedfb1a9
+Subproject commit 80308cea4f57fd13e73abec121325f174ba21883

From 61b8aac7c422474ab6d85733bf9a859f1d381b7b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 12:21:50 +0400
Subject: [PATCH 372/676] Allow manually toggle stories expand state.

---
 .../SourceFiles/data/data_chat_filters.cpp    |   1 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 167 ++++++++++++------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |   8 +-
 .../dialogs/ui/dialogs_stories_list.cpp       |   4 +-
 Telegram/lib_ui                               |   2 +-
 5 files changed, 121 insertions(+), 61 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 26c6b6287..90ef0bebe 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -905,6 +905,7 @@ rpl::producer<> ChatFilters::suggestedUpdated() const {
 
 rpl::producer<Ui::MoreChatsBarContent> ChatFilters::moreChatsContent(
 		FilterId id) {
+	return rpl::single(Ui::MoreChatsBarContent{ .count = 10 }); // #TODO stories testing
 	if (!id) {
 		return rpl::single(Ui::MoreChatsBarContent{ .count = 0 });
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 10046fa6e..74fbf9e6c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -83,7 +83,7 @@ namespace Dialogs {
 namespace {
 
 constexpr auto kSearchPerPage = 50;
-constexpr auto kWaitTillAllowStoriesExpand = crl::time(200);
+constexpr auto kStoriesExpandDuration = crl::time(200);
 
 } // namespace
 
@@ -239,19 +239,43 @@ Widget::Widget(
 	_scrollToTop->raise();
 	rpl::combine(
 		_scroll->positionValue(),
-		_scroll->movementValue()
+		_scroll->movementValue(),
+		_storiesExplicitExpandValue.value()
 	) | rpl::start_with_next([=](
 			Ui::ElasticScrollPosition position,
-			Ui::ElasticScrollMovement movement) {
+			Ui::ElasticScrollMovement movement,
+			int explicitlyExpanded) {
 		const auto overscrollTop = std::max(-position.overscroll, 0);
-		if (_overscrollTop != overscrollTop) {
-			_overscrollTop = overscrollTop;
-			updateControlsGeometry();
+		if (overscrollTop > 0 && _storiesExplicitExpand) {
+			_scroll->setOverscrollDefaults(
+				-st::dialogsStoriesFull.height,
+				0,
+				true);
+		}
+		if (explicitlyExpanded > 0 && explicitlyExpanded < overscrollTop) {
+			_storiesExplicitExpandAnimation.stop();
+			_storiesExplicitExpand = false;
+			_storiesExplicitExpandValue = 0;
+			return;
+		}
+		const auto above = std::max(explicitlyExpanded, overscrollTop);
+		if (_aboveScrollAdded != above) {
+			_aboveScrollAdded = above;
+			if (_updateScrollGeometryCached) {
+				_updateScrollGeometryCached();
+			}
 		}
 		using Phase = Ui::ElasticScrollMovement;
 		_stories->setExpandedHeight(
-			_overscrollTop,
-			(movement == Phase::Momentum || movement == Phase::Returning));
+			_aboveScrollAdded,
+			(movement == Phase::Momentum || movement == Phase::Returning)
+				&& (explicitlyExpanded < above));
+		if (position.overscroll > 0
+			|| (position.value
+				> (_storiesExplicitExpandScrollTop
+					+ st::dialogsRowHeight))) {
+			storiesToggleExplicitExpand(false);
+		}
 	}, lifetime());
 
 	_inner->updated(
@@ -487,6 +511,8 @@ Widget::Widget(
 }
 
 void Widget::chosenRow(const ChosenRow &row) {
+	storiesToggleExplicitExpand(false);
+
 	const auto history = row.key.history();
 	const auto topicJump = history
 		? history->peer->forumTopicFor(row.message.fullId.msg)
@@ -600,6 +626,8 @@ void Widget::setupMoreChatsBar() {
 	}
 	controller()->activeChatsFilter(
 	) | rpl::start_with_next([=](FilterId id) {
+		storiesToggleExplicitExpand(false);
+
 		if (!id && false) { // #TODO stories testing
 			_moreChatsBar = nullptr;
 			updateControlsGeometry();
@@ -802,17 +830,36 @@ void Widget::setupStories() {
 
 	_stories->toggleExpandedRequests(
 	) | rpl::start_with_next([=](bool expanded) {
-		if (expanded) {
-			if (!_scrollToAnimation.animating() || _scrollAnimationTo) {
-				scrollToDefault();
-			}
+		const auto position = _scroll->position();
+		if (!expanded) {
+			_scroll->setOverscrollDefaults(0, 0);
+		} else if (position.value > 0 || position.overscroll >= 0) {
+			storiesToggleExplicitExpand(true);
+			_scroll->setOverscrollDefaults(0, 0);
+		} else {
+			_scroll->setOverscrollDefaults(
+				-st::dialogsStoriesFull.height,
+				0);
 		}
-		_scroll->setOverscrollDefaults(
-			expanded ? -st::dialogsStoriesFull.height : 0,
-			0);
 	}, lifetime());
 }
 
+void Widget::storiesToggleExplicitExpand(bool expand) {
+	if (_storiesExplicitExpand == expand) {
+		return;
+	}
+	_storiesExplicitExpand = expand;
+	if (!expand) {
+		_scroll->setOverscrollDefaults(0, 0, true);
+	}
+	const auto height = st::dialogsStoriesFull.height;
+	const auto duration = kStoriesExpandDuration;
+	_storiesExplicitExpandScrollTop = _scroll->position().value;
+	_storiesExplicitExpandAnimation.start([=](float64 value) {
+		_storiesExplicitExpandValue = int(base::SafeRound(value));
+	}, expand ? 0 : height, expand ? height : 0, duration, anim::sineInOut);
+}
+
 void Widget::setupShortcuts() {
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
@@ -957,6 +1004,7 @@ void Widget::changeOpenedFolder(Data::Folder *folder, anim::type animated) {
 		controller()->closeForum();
 		_openedFolder = folder;
 		_inner->changeOpenedFolder(folder);
+		storiesToggleExplicitExpand(false);
 	}, (folder != nullptr), animated);
 }
 
@@ -970,6 +1018,7 @@ void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 		_openedForum = forum;
 		_api.request(base::take(_topicSearchRequest)).cancel();
 		_inner->changeOpenedForum(forum);
+		storiesToggleExplicitExpand(false);
 	}, (forum != nullptr), animated);
 }
 
@@ -2575,42 +2624,15 @@ void Widget::updateControlsGeometry() {
 			barw,
 			st::lineWidth);
 	}
-	const auto moreChatsBarTop = expandedStoriesTop + _overscrollTop;
-	if (_moreChatsBar) {
-		_moreChatsBar->move(0, moreChatsBarTop);
-		_moreChatsBar->resizeToWidth(barw);
-	}
-	const auto forumGroupCallTop = moreChatsBarTop
-		+ (_moreChatsBar ? _moreChatsBar->height() : 0);
-	if (_forumGroupCallBar) {
-		_forumGroupCallBar->move(0, forumGroupCallTop);
-		_forumGroupCallBar->resizeToWidth(barw);
-	}
-	const auto forumRequestsTop = forumGroupCallTop
-		+ (_forumGroupCallBar ? _forumGroupCallBar->height() : 0);
-	if (_forumRequestsBar) {
-		_forumRequestsBar->move(0, forumRequestsTop);
-		_forumRequestsBar->resizeToWidth(barw);
-	}
-	const auto forumReportTop = forumRequestsTop
-		+ (_forumRequestsBar ? _forumRequestsBar->height() : 0);
-	if (_forumReportBar) {
-		_forumReportBar->bar().move(0, forumReportTop);
-	}
-	auto scrollTop = forumReportTop
-		+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
-	const auto wasScrollTop = _scroll->scrollTop();
-	const auto newScrollTop = (_topDelta < 0 && wasScrollTop <= 0)
-		? wasScrollTop
-		: (wasScrollTop + _topDelta);
-	auto scrollHeight = height() - scrollTop;
+
+	auto bottomSkip = 0;
 	const auto putBottomButton = [&](auto &button) {
 		if (button && !button->isHidden()) {
 			const auto buttonHeight = button->height();
-			scrollHeight -= buttonHeight;
+			bottomSkip += buttonHeight;
 			button->setGeometry(
 				0,
-				scrollTop + scrollHeight,
+				height() - bottomSkip,
 				barw,
 				buttonHeight);
 		}
@@ -2618,24 +2640,55 @@ void Widget::updateControlsGeometry() {
 	putBottomButton(_updateTelegram);
 	putBottomButton(_downloadBar);
 	putBottomButton(_loadMoreChats);
-	const auto bottomSkip = (height() - scrollTop) - scrollHeight;
 	if (_connecting) {
 		_connecting->setBottomSkip(bottomSkip);
 	}
 	controller()->setConnectingBottomSkip(bottomSkip);
 
+	const auto wasScrollTop = _scroll->scrollTop();
+	const auto newScrollTop = (_topDelta < 0 && wasScrollTop <= 0)
+		? wasScrollTop
+		: (wasScrollTop + _topDelta);
+
 	const auto scrollw = _childList ? _narrowWidth : barw;
-	const auto wasScrollHeight = _scroll->height();
-	_scroll->setGeometry(0, scrollTop, scrollw, scrollHeight);
+	_updateScrollGeometryCached = [=] {
+		const auto moreChatsBarTop = expandedStoriesTop + _aboveScrollAdded;
+		if (_moreChatsBar) {
+			_moreChatsBar->move(0, moreChatsBarTop);
+			_moreChatsBar->resizeToWidth(barw);
+		}
+		const auto forumGroupCallTop = moreChatsBarTop
+			+ (_moreChatsBar ? _moreChatsBar->height() : 0);
+		if (_forumGroupCallBar) {
+			_forumGroupCallBar->move(0, forumGroupCallTop);
+			_forumGroupCallBar->resizeToWidth(barw);
+		}
+		const auto forumRequestsTop = forumGroupCallTop
+			+ (_forumGroupCallBar ? _forumGroupCallBar->height() : 0);
+		if (_forumRequestsBar) {
+			_forumRequestsBar->move(0, forumRequestsTop);
+			_forumRequestsBar->resizeToWidth(barw);
+		}
+		const auto forumReportTop = forumRequestsTop
+			+ (_forumRequestsBar ? _forumRequestsBar->height() : 0);
+		if (_forumReportBar) {
+			_forumReportBar->bar().move(0, forumReportTop);
+		}
+		auto scrollTop = forumReportTop
+			+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
+		auto scrollHeight = height() - scrollTop;
+
+		const auto wasScrollHeight = _scroll->height();
+		_scroll->setGeometry(0, scrollTop, scrollw, scrollHeight);
+		if (scrollHeight != wasScrollHeight) {
+			controller()->floatPlayerAreaUpdated();
+		}
+	};
+	_updateScrollGeometryCached();
+
 	_inner->resize(scrollw, _inner->height());
 	_inner->setNarrowRatio(narrowRatio);
-	if (scrollHeight != wasScrollHeight) {
-		controller()->floatPlayerAreaUpdated();
-	}
-	const auto startWithTop = 0;
-	if (wasScrollHeight < startWithTop && scrollHeight >= startWithTop) {
-		_scroll->scrollToY(startWithTop);
-	} else if (newScrollTop != wasScrollTop) {
+	if (newScrollTop != wasScrollTop) {
 		_scroll->scrollToY(newScrollTop);
 	} else {
 		listScrollUpdated();
@@ -2646,7 +2699,7 @@ void Widget::updateControlsGeometry() {
 
 	if (_childList) {
 		const auto childw = std::max(_narrowWidth, width() - scrollw);
-		const auto childh = scrollTop + scrollHeight;
+		const auto childh = _scroll->y() + _scroll->height();
 		const auto childx = width() - childw;
 		_childList->setGeometryWithTopMoved(
 			{ childx, 0, childw, childh },
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 13ca38398..ca83fefa1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -167,6 +167,7 @@ private:
 	void setupDownloadBar();
 	void setupShortcuts();
 	void setupStories();
+	void storiesToggleExplicitExpand(bool expand);
 	[[nodiscard]] bool searchForPeersRequired(const QString &query) const;
 	[[nodiscard]] bool searchForTopicsRequired(const QString &query) const;
 	bool setSearchInChat(Key chat, PeerData *from = nullptr);
@@ -267,8 +268,13 @@ private:
 	bool _scrollToTopIsShown = false;
 	bool _forumSearchRequested = false;
 
-	int _overscrollTop = 0;
+	Fn<void()> _updateScrollGeometryCached;
 	std::unique_ptr<Stories::List> _stories;
+	Ui::Animations::Simple _storiesExplicitExpandAnimation;
+	rpl::variable<int> _storiesExplicitExpandValue = 0;
+	int _storiesExplicitExpandScrollTop = 0;
+	int _aboveScrollAdded = 0;
+	bool _storiesExplicitExpand = false;
 
 	Data::Folder *_openedFolder = nullptr;
 	Data::Forum *_openedForum = nullptr;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index d7d62b416..2d3ca0d76 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -813,7 +813,7 @@ void List::mouseReleaseEvent(QMouseEvent *e) {
 	}
 	updateSelected();
 	if (_selected == pressed) {
-		if (_selected < 0) {
+		if (!_expanded) {
 			requestExpanded(true);
 		} else if (_selected < _data.items.size()) {
 			_clicks.fire_copy(_data.items[_selected].element.id);
@@ -906,7 +906,7 @@ void List::contextMenuEvent(QContextMenuEvent *e) {
 		_lastMousePosition = e->globalPos();
 		updateSelected();
 	}
-	if (_selected < 0 || _data.empty()) {
+	if (_selected < 0 || _data.empty() || !_expanded) {
 		return;
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 80308cea4..763b3a37c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 80308cea4f57fd13e73abec121325f174ba21883
+Subproject commit 763b3a37c34fd7819f9d553b94387c4fe16554ff

From 70ca3d4f1ac78f25020dde44fd0425fd80575bdb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 19:22:18 +0400
Subject: [PATCH 373/676] Show hidden stories in archive.

---
 Telegram/Resources/langs/lang.strings         |   8 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 233 ++++++++++++------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  18 +-
 .../dialogs/ui/dialogs_stories_content.cpp    |   8 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 113 ++++-----
 .../dialogs/ui/dialogs_stories_list.h         |  13 +-
 Telegram/SourceFiles/ui/chat/more_chats_bar.h |   4 +
 Telegram/SourceFiles/ui/menu_icons.style      |   1 -
 Telegram/lib_ui                               |   2 +-
 9 files changed, 241 insertions(+), 159 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3130497ee..d360b8957 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3823,8 +3823,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_userpic_builder_emoji_subtitle" = "Choose sticker or emoji";
 
 "lng_stories_my_name" = "My Story";
-"lng_stories_hide_to_contacts" = "Hide";
-"lng_stories_show_in_chats" = "Show in Chats";
+"lng_stories_archive" = "Archive";
+"lng_stories_unarchive" = "Unarchive";
 "lng_stories_row_count#one" = "{count} Story";
 "lng_stories_row_count#other" = "{count} Stories";
 "lng_stories_row_unread_and_one" = "{accumulated}, {user}";
@@ -3841,8 +3841,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_title" = "Stories Archive";
 "lng_stories_archive_about" = "Only you can see archived stories unless you choose to save them to your profile.";
 "lng_stories_reply_sent" = "Message Sent";
-"lng_stories_hidden_to_contacts" = "Stories of {user} were moved to **Contacts**.";
-"lng_stories_shown_in_chats" = "Stories of {user} were moved above the **Chats List**.";
+"lng_stories_hidden_to_contacts" = "Stories of {user} were moved to **Archive**.";
+"lng_stories_shown_in_chats" = "Stories of {user} were moved to the **Chats List**.";
 "lng_stories_delete_one_sure" = "Are you sure you want to delete this story?";
 "lng_stories_delete_sure#one" = "Are you sure you want to delete {count} story?";
 "lng_stories_delete_sure#other" = "Are you sure you want to delete {count} stories?";
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 74fbf9e6c..fb92cbf1e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -215,12 +215,12 @@ Widget::Widget(
 , _lockUnlock(_searchControls, st::dialogsLock)
 , _scroll(this)
 , _scrollToTop(_scroll, st::dialogsToUp)
-, _stories(std::make_unique<Stories::List>(
-	this,
-	st::dialogsStoriesList,
-	Stories::ContentForSession(
-		&controller->session(),
-		Data::StorySourcesList::NotHidden)))
+, _stories((_layout != Layout::Child)
+	? std::make_unique<Stories::List>(
+		this,
+		st::dialogsStoriesList,
+		_storiesContents.events() | rpl::flatten_latest())
+	: nullptr)
 , _searchTimer([=] { searchMessages(); })
 , _singleMessageSearch(&controller->session()) {
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
@@ -237,46 +237,6 @@ Widget::Widget(
 			_childListShown.value(),
 			makeChildListShown)));
 	_scrollToTop->raise();
-	rpl::combine(
-		_scroll->positionValue(),
-		_scroll->movementValue(),
-		_storiesExplicitExpandValue.value()
-	) | rpl::start_with_next([=](
-			Ui::ElasticScrollPosition position,
-			Ui::ElasticScrollMovement movement,
-			int explicitlyExpanded) {
-		const auto overscrollTop = std::max(-position.overscroll, 0);
-		if (overscrollTop > 0 && _storiesExplicitExpand) {
-			_scroll->setOverscrollDefaults(
-				-st::dialogsStoriesFull.height,
-				0,
-				true);
-		}
-		if (explicitlyExpanded > 0 && explicitlyExpanded < overscrollTop) {
-			_storiesExplicitExpandAnimation.stop();
-			_storiesExplicitExpand = false;
-			_storiesExplicitExpandValue = 0;
-			return;
-		}
-		const auto above = std::max(explicitlyExpanded, overscrollTop);
-		if (_aboveScrollAdded != above) {
-			_aboveScrollAdded = above;
-			if (_updateScrollGeometryCached) {
-				_updateScrollGeometryCached();
-			}
-		}
-		using Phase = Ui::ElasticScrollMovement;
-		_stories->setExpandedHeight(
-			_aboveScrollAdded,
-			(movement == Phase::Momentum || movement == Phase::Returning)
-				&& (explicitlyExpanded < above));
-		if (position.overscroll > 0
-			|| (position.value
-				> (_storiesExplicitExpandScrollTop
-					+ st::dialogsRowHeight))) {
-			storiesToggleExplicitExpand(false);
-		}
-	}, lifetime());
 
 	_inner->updated(
 	) | rpl::start_with_next([=] {
@@ -417,7 +377,9 @@ Widget::Widget(
 
 	setupMainMenuToggle();
 	setupShortcuts();
-	setupStories();
+	if (_stories) {
+		setupStories();
+	}
 
 	_searchForNarrowFilters->setClickedCallback([=] {
 		_filter->setFocusFast();
@@ -609,14 +571,8 @@ void Widget::scrollToDefaultChecked(bool verytop) {
 
 void Widget::setupScrollUpButton() {
 	_scrollToTop->setClickedCallback([=] { scrollToDefaultChecked(); });
-	base::install_event_filter(_scrollToTop, [=](not_null<QEvent*> event) {
-		if (event->type() != QEvent::Wheel) {
-			return base::EventFilterResult::Continue;
-		}
-		return _scroll->viewportEvent(event)
-			? base::EventFilterResult::Cancel
-			: base::EventFilterResult::Continue;
-	});
+	trackScroll(_scrollToTop);
+	trackScroll(this);
 	updateScrollUpVisibility();
 }
 
@@ -628,7 +584,7 @@ void Widget::setupMoreChatsBar() {
 	) | rpl::start_with_next([=](FilterId id) {
 		storiesToggleExplicitExpand(false);
 
-		if (!id && false) { // #TODO stories testing
+		if (!id) {
 			_moreChatsBar = nullptr;
 			updateControlsGeometry();
 			return;
@@ -638,6 +594,8 @@ void Widget::setupMoreChatsBar() {
 			this,
 			filters->moreChatsContent(id));
 
+		trackScroll(_moreChatsBar->wrap());
+
 		_moreChatsBar->barClicks(
 		) | rpl::start_with_next([=] {
 			if (const auto missing = filters->moreChats(id)
@@ -810,11 +768,64 @@ void Widget::setupMainMenuToggle() {
 }
 
 void Widget::setupStories() {
+	trackScroll(_stories.get());
+
+	_storiesContents.fire(Stories::ContentForSession(
+		&controller()->session(),
+		Data::StorySourcesList::NotHidden));
+
+	const auto currentSource = [=] {
+		using List = Data::StorySourcesList;
+		return _openedFolder ? List::Hidden : List::NotHidden;
+	};
+
+	rpl::combine(
+		_scroll->positionValue(),
+		_scroll->movementValue(),
+		_storiesExplicitExpandValue.value()
+	) | rpl::start_with_next([=](
+			Ui::ElasticScrollPosition position,
+			Ui::ElasticScrollMovement movement,
+			int explicitlyExpanded) {
+		if (_stories->isHidden()) {
+			return;
+		}
+		const auto overscrollTop = std::max(-position.overscroll, 0);
+		if (overscrollTop > 0 && _storiesExplicitExpand) {
+			_scroll->setOverscrollDefaults(
+				-st::dialogsStoriesFull.height,
+				0,
+				true);
+		}
+		if (explicitlyExpanded > 0 && explicitlyExpanded < overscrollTop) {
+			_storiesExplicitExpandAnimation.stop();
+			_storiesExplicitExpand = false;
+			_storiesExplicitExpandValue = 0;
+			return;
+		}
+		const auto above = std::max(explicitlyExpanded, overscrollTop);
+		if (_aboveScrollAdded != above) {
+			_aboveScrollAdded = above;
+			if (_updateScrollGeometryCached) {
+				_updateScrollGeometryCached();
+			}
+		}
+		using Phase = Ui::ElasticScrollMovement;
+		_stories->setExpandedHeight(
+			_aboveScrollAdded,
+			(movement == Phase::Momentum || movement == Phase::Returning)
+				&& (explicitlyExpanded < above));
+		if (position.overscroll > 0
+			|| (position.value
+				> (_storiesExplicitExpandScrollTop
+					+ st::dialogsRowHeight))) {
+			storiesToggleExplicitExpand(false);
+		}
+	}, lifetime());
+
 	_stories->clicks(
 	) | rpl::start_with_next([=](uint64 id) {
-		controller()->openPeerStories(
-			PeerId(int64(id)),
-			Data::StorySourcesList::NotHidden);
+		controller()->openPeerStories(PeerId(int64(id)), currentSource());
 	}, lifetime());
 
 	_stories->showMenuRequests(
@@ -824,8 +835,7 @@ void Widget::setupStories() {
 
 	_stories->loadMoreRequests(
 	) | rpl::start_with_next([=] {
-		session().data().stories().loadMore(
-			Data::StorySourcesList::NotHidden);
+		session().data().stories().loadMore(currentSource());
 	}, lifetime());
 
 	_stories->toggleExpandedRequests(
@@ -860,6 +870,20 @@ void Widget::storiesToggleExplicitExpand(bool expand) {
 	}, expand ? 0 : height, expand ? height : 0, duration, anim::sineInOut);
 }
 
+void Widget::trackScroll(not_null<Ui::RpWidget*> widget) {
+	widget->events(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::TouchBegin
+			|| type == QEvent::TouchUpdate
+			|| type == QEvent::TouchEnd
+			|| type == QEvent::TouchCancel
+			|| type == QEvent::Wheel) {
+			_scroll->viewportEvent(e);
+		}
+	}, widget->lifetime());
+}
+
 void Widget::setupShortcuts() {
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
@@ -902,6 +926,7 @@ void Widget::fullSearchRefreshOn(rpl::producer<> events) {
 void Widget::updateControlsVisibility(bool fast) {
 	updateLoadMoreChatsVisibility();
 	_scroll->show();
+	updateStoriesVisibility();
 	if ((_openedFolder || _openedForum) && _filter->hasFocus()) {
 		setInnerFocus();
 	}
@@ -1002,9 +1027,16 @@ void Widget::changeOpenedFolder(Data::Folder *folder, anim::type animated) {
 		cancelSearch();
 		closeChildList(anim::type::instant);
 		controller()->closeForum();
+		const auto was = (_openedFolder != nullptr);
 		_openedFolder = folder;
 		_inner->changeOpenedFolder(folder);
 		storiesToggleExplicitExpand(false);
+		if (was != (_openedFolder != nullptr)) {
+			using List = Data::StorySourcesList;
+			_storiesContents.fire(Stories::ContentForSession(
+				&controller()->session(),
+				folder ? List::Hidden : List::NotHidden));
+		}
 	}, (folder != nullptr), animated);
 }
 
@@ -1019,6 +1051,7 @@ void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 		_api.request(base::take(_topicSearchRequest)).cancel();
 		_inner->changeOpenedForum(forum);
 		storiesToggleExplicitExpand(false);
+		updateStoriesVisibility();
 	}, (forum != nullptr), animated);
 }
 
@@ -1032,6 +1065,9 @@ void Widget::refreshTopBars() {
 	if (_openedFolder || _openedForum) {
 		if (!_subsectionTopBar) {
 			_subsectionTopBar.create(this, controller());
+			if (_stories) {
+				_stories->raise();
+			}
 			_subsectionTopBar->searchCancelled(
 			) | rpl::start_with_next([=] {
 				escape();
@@ -1306,6 +1342,7 @@ void Widget::startWidthAnimation() {
 	_widthAnimationCache = Ui::PixmapFromImage(std::move(image));
 	_scroll->setGeometry(scrollGeometry);
 	_scroll->hide();
+	updateStoriesVisibility();
 }
 
 void Widget::stopWidthAnimation() {
@@ -1313,9 +1350,41 @@ void Widget::stopWidthAnimation() {
 	if (!_showAnimation) {
 		_scroll->show();
 	}
+	updateStoriesVisibility();
 	update();
 }
 
+void Widget::updateStoriesVisibility() {
+	if (!_stories) {
+		return;
+	}
+	const auto hidden = (_showAnimation != nullptr)
+		|| _openedForum
+		|| !_widthAnimationCache.isNull()
+		|| _childList
+		|| !_filter->getLastText().isEmpty()
+		|| _searchInChat;
+	if (_stories->isHidden() != hidden) {
+		_stories->setVisible(!hidden);
+		using Type = Ui::ElasticScroll::OverscrollType;
+		if (hidden) {
+			_scroll->setOverscrollDefaults(0, 0);
+			_scroll->setOverscrollTypes(Type::Real, Type::Real);
+			if (_scroll->position().overscroll < 0) {
+				_scroll->scrollToY(0);
+			}
+		} else {
+			_scroll->setOverscrollDefaults(0, 0);
+			_scroll->setOverscrollTypes(Type::Virtual, Type::Real);
+			_storiesExplicitExpandValue.force_assign(
+				_storiesExplicitExpandValue.current());
+		}
+		if (_aboveScrollAdded > 0 && _updateScrollGeometryCached) {
+			_updateScrollGeometryCached();
+		}
+	}
+}
+
 void Widget::showFast() {
 	if (isHidden()) {
 		_inner->clearSelection();
@@ -1358,6 +1427,9 @@ void Widget::startSlideAnimation(
 		QPixmap newContentCache,
 		Window::SlideDirection direction) {
 	_scroll->hide();
+	if (_stories) {
+		_stories->hide();
+	}
 	_searchControls->hide();
 	if (_subsectionTopBar) {
 		_subsectionTopBar->hide();
@@ -2166,6 +2238,7 @@ void Widget::applyFilterUpdate(bool force) {
 		return;
 	}
 
+	updateStoriesVisibility();
 	const auto filterText = currentSearchQuery();
 	_inner->applyFilterUpdate(filterText, force);
 	if (filterText.isEmpty() && !_searchFromAuthor) {
@@ -2319,6 +2392,7 @@ void Widget::closeChildList(anim::type animated) {
 	} else {
 		_childListShadow = nullptr;
 	}
+	updateStoriesVisibility();
 }
 
 void Widget::searchInChat(Key chat) {
@@ -2372,6 +2446,7 @@ bool Widget::setSearchInChat(Key chat, PeerData *from) {
 		_searchInChat = chat;
 		controller()->searchInChat = _searchInChat;
 		updateJumpToDateVisibility();
+		updateStoriesVisibility();
 	}
 	if (searchFromUpdated) {
 		updateSearchFromVisibility();
@@ -2614,9 +2689,11 @@ void Widget::updateControlsGeometry() {
 	const auto storiesHeight = 2 * st::dialogsStories.photoTop
 		+ st::dialogsStories.photo;
 	const auto added = (st::dialogsFilter.heightMin - storiesHeight) / 2;
-	_stories->setLayoutConstraints(
-		{ filterLeft + filterWidth, filterTop + added },
-		{ 0, expandedStoriesTop, barw, st::dialogsStoriesFull.height });
+	if (_stories) {
+		_stories->setLayoutConstraints(
+			{ filterLeft + filterWidth, filterTop + added },
+			{ 0, expandedStoriesTop, barw, st::dialogsStoriesFull.height });
+	}
 	if (_forumTopShadow) {
 		_forumTopShadow->setGeometry(
 			0,
@@ -2650,43 +2727,49 @@ void Widget::updateControlsGeometry() {
 		? wasScrollTop
 		: (wasScrollTop + _topDelta);
 
-	const auto scrollw = _childList ? _narrowWidth : barw;
+	const auto scrollWidth = _childList ? _narrowWidth : barw;
+	if (_moreChatsBar) {
+		_moreChatsBar->resizeToWidth(barw);
+	}
+	if (_forumGroupCallBar) {
+		_forumGroupCallBar->resizeToWidth(barw);
+	}
+	if (_forumRequestsBar) {
+		_forumRequestsBar->resizeToWidth(barw);
+	}
 	_updateScrollGeometryCached = [=] {
-		const auto moreChatsBarTop = expandedStoriesTop + _aboveScrollAdded;
+		const auto moreChatsBarTop = expandedStoriesTop
+			+ ((!_stories || _stories->isHidden()) ? 0 : _aboveScrollAdded);
 		if (_moreChatsBar) {
 			_moreChatsBar->move(0, moreChatsBarTop);
-			_moreChatsBar->resizeToWidth(barw);
 		}
 		const auto forumGroupCallTop = moreChatsBarTop
 			+ (_moreChatsBar ? _moreChatsBar->height() : 0);
 		if (_forumGroupCallBar) {
 			_forumGroupCallBar->move(0, forumGroupCallTop);
-			_forumGroupCallBar->resizeToWidth(barw);
 		}
 		const auto forumRequestsTop = forumGroupCallTop
 			+ (_forumGroupCallBar ? _forumGroupCallBar->height() : 0);
 		if (_forumRequestsBar) {
 			_forumRequestsBar->move(0, forumRequestsTop);
-			_forumRequestsBar->resizeToWidth(barw);
 		}
 		const auto forumReportTop = forumRequestsTop
 			+ (_forumRequestsBar ? _forumRequestsBar->height() : 0);
 		if (_forumReportBar) {
 			_forumReportBar->bar().move(0, forumReportTop);
 		}
-		auto scrollTop = forumReportTop
+		const auto scrollTop = forumReportTop
 			+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
-		auto scrollHeight = height() - scrollTop;
-
+		const auto scrollHeight = height() - scrollTop;
 		const auto wasScrollHeight = _scroll->height();
-		_scroll->setGeometry(0, scrollTop, scrollw, scrollHeight);
+		_scroll->setGeometry(0, scrollTop, scrollWidth, scrollHeight);
 		if (scrollHeight != wasScrollHeight) {
 			controller()->floatPlayerAreaUpdated();
 		}
 	};
 	_updateScrollGeometryCached();
 
-	_inner->resize(scrollw, _inner->height());
+	_inner->resize(scrollWidth, _inner->height());
 	_inner->setNarrowRatio(narrowRatio);
 	if (newScrollTop != wasScrollTop) {
 		_scroll->scrollToY(newScrollTop);
@@ -2698,7 +2781,7 @@ void Widget::updateControlsGeometry() {
 	}
 
 	if (_childList) {
-		const auto childw = std::max(_narrowWidth, width() - scrollw);
+		const auto childw = std::max(_narrowWidth, width() - scrollWidth);
 		const auto childh = _scroll->y() + _scroll->height();
 		const auto childx = width() - childw;
 		_childList->setGeometryWithTopMoved(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ca83fefa1..245998392 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -58,6 +58,7 @@ struct SectionShow;
 
 namespace Dialogs::Stories {
 class List;
+struct Content;
 } // namespace Dialogs::Stories
 
 namespace Dialogs {
@@ -168,6 +169,7 @@ private:
 	void setupShortcuts();
 	void setupStories();
 	void storiesToggleExplicitExpand(bool expand);
+	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 = nullptr);
@@ -179,6 +181,7 @@ private:
 	void updateControlsVisibility(bool fast = false);
 	void updateLockUnlockVisibility();
 	void updateLoadMoreChatsVisibility();
+	void updateStoriesVisibility();
 	void updateJumpToDateVisibility(bool fast = false);
 	void updateSearchFromVisibility(bool fast = false);
 	void updateControlsGeometry();
@@ -268,6 +271,14 @@ private:
 	bool _scrollToTopIsShown = false;
 	bool _forumSearchRequested = false;
 
+	Data::Folder *_openedFolder = nullptr;
+	Data::Forum *_openedForum = nullptr;
+	Dialogs::Key _searchInChat;
+	History *_searchInMigrated = nullptr;
+	PeerData *_searchFromAuthor = nullptr;
+	QString _lastFilterText;
+
+	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
 	Fn<void()> _updateScrollGeometryCached;
 	std::unique_ptr<Stories::List> _stories;
 	Ui::Animations::Simple _storiesExplicitExpandAnimation;
@@ -276,13 +287,6 @@ private:
 	int _aboveScrollAdded = 0;
 	bool _storiesExplicitExpand = false;
 
-	Data::Folder *_openedFolder = nullptr;
-	Data::Forum *_openedForum = nullptr;
-	Dialogs::Key _searchInChat;
-	History *_searchInMigrated = nullptr;
-	PeerData *_searchFromAuthor = nullptr;
-	QString _lastFilterText;
-
 	base::Timer _searchTimer;
 
 	QString _peerSearchQuery;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index b882842ca..2f6c55dd1 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -503,14 +503,14 @@ void FillSourceMenu(
 				controller->uiShow());
 		};
 		if (in(Data::StorySourcesList::NotHidden)) {
-			add(tr::lng_stories_hide_to_contacts(tr::now), [=] {
+			add(tr::lng_stories_archive(tr::now), [=] {
 				toggle(false);
-			}, &st::menuIconCancel);
+			}, &st::menuIconArchive);
 		}
 		if (in(Data::StorySourcesList::Hidden)) {
-			add(tr::lng_stories_show_in_chats(tr::now), [=] {
+			add(tr::lng_stories_unarchive(tr::now), [=] {
 				toggle(true);
-			}, &st::menuIconStoriesToChats);
+			}, &st::menuIconUnarchive);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 2d3ca0d76..dc6384a8d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -21,8 +21,8 @@ namespace {
 constexpr auto kSmallThumbsShown = 3;
 constexpr auto kSummaryExpandLeft = 1;
 constexpr auto kPreloadPages = 2;
-constexpr auto kExpandAfterRatio = 0.85;
-constexpr auto kCollapseAfterRatio = 0.72;
+constexpr auto kExpandAfterRatio = 0.72;
+constexpr auto kCollapseAfterRatio = 0.68;
 constexpr auto kFrictionRatio = 0.15;
 constexpr auto kExpandCatchUpDuration = crl::time(200);
 
@@ -66,7 +66,6 @@ List::List(
 		showContent(std::move(content));
 	}, lifetime());
 
-	_shownAnimation.stop();
 	setMouseTracking(true);
 	resize(0, _data.empty() ? 0 : st.full.height);
 }
@@ -76,18 +75,13 @@ void List::showContent(Content &&content) {
 		return;
 	}
 	if (content.elements.empty()) {
-		_hidingData = base::take(_data);
-		if (!_hidingData.empty()) {
-			toggleAnimated(false);
-		}
+		_data = {};
+		_empty = true;
 		return;
 	}
-	const auto hidden = _content.elements.empty();
-	const auto wasCount = int((hidden ? _hidingData : _data).items.size());
+	const auto wasCount = int(_data.items.size());
 	_content = std::move(content);
-	auto items = base::take(
-		_data.items.empty() ? _hidingData.items : _data.items);
-	_hidingData = {};
+	auto items = base::take(_data.items);
 	_data.items.reserve(_content.elements.size());
 	for (const auto &element : _content.elements) {
 		const auto id = element.id;
@@ -117,8 +111,8 @@ void List::showContent(Content &&content) {
 	updateScrollMax();
 	updateSummary(_data);
 	update();
-	if (hidden) {
-		toggleAnimated(true);
+	if (!wasCount) {
+		_empty = false;
 	}
 }
 
@@ -204,24 +198,6 @@ void List::updateSummary(Data &data) {
 	Populate(_st.small, data.summaries);
 }
 
-void List::toggleAnimated(bool shown) {
-	_shownAnimation.start(
-		[=] { updateHeight(); },
-		shown ? 0. : 1.,
-		shown ? 1. : 0.,
-		st::slideWrapDuration);
-}
-
-void List::updateHeight() {
-	const auto shown = _shownAnimation.value(_data.empty() ? 0. : 1.);
-	resize(
-		width(),
-		anim::interpolate(0, _st.full.height, shown));
-	if (_data.empty() && shown == 0.) {
-		_hidingData = {};
-	}
-}
-
 void List::updateScrollMax() {
 	const auto &full = _st.full;
 	const auto singleFull = full.photoLeft * 2 + full.photo;
@@ -256,7 +232,7 @@ void List::requestExpanded(bool expanded) {
 	if (_expanded != expanded) {
 		_expanded = expanded;
 		_expandedAnimation.start(
-			[=] { update(); },
+			[=] { checkForFullState(); update(); },
 			_expanded ? 0. : 1.,
 			_expanded ? 1. : 0.,
 			st::slideWrapDuration,
@@ -308,15 +284,14 @@ List::Layout List::computeLayout() {
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * ratio;
 	};
-	auto &rendering = _data.empty() ? _hidingData : _data;
 	const auto singleFull = full.photoLeft * 2 + full.photo;
-	const auto itemsCount = int(rendering.items.size());
+	const auto itemsCount = int(_data.items.size());
 	const auto narrowWidth = st::defaultDialogRow.padding.left()
 		+ st::defaultDialogRow.photoSize
 		+ st::defaultDialogRow.padding.left();
 	const auto narrow = false;// (width() <= narrowWidth);
 	const auto smallSkip = (itemsCount > 1
-		&& rendering.items[0].element.skipSmall)
+		&& _data.items[0].element.skipSmall)
 		? 1
 		: 0;
 	const auto smallCount = std::min(
@@ -378,7 +353,6 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto elerp = [&](float64 a, float64 b) {
 		return a + (b - a) * expandRatio;
 	};
-	auto &rendering = _data.empty() ? _hidingData : _data;
 	const auto line = elerp(st.lineTwice, full.lineTwice) / 2.;
 	const auto lineRead = elerp(st.lineReadTwice, full.lineReadTwice) / 2.;
 	const auto photoTopSmall = st.photoTop;
@@ -389,7 +363,8 @@ void List::paintEvent(QPaintEvent *e) {
 		- (st.photoTop + (st.photo / 2.))
 		+ (photoTop + (photo / 2.));
 	const auto nameScale = _lastRatio;
-	const auto nameTop = nameScale * full.nameTop;
+	const auto nameTop = full.nameTop
+		+ (photoTop + photo - full.photoTop - full.photo);
 	const auto nameWidth = nameScale * AvailableNameWidth(_st);
 	const auto nameHeight = nameScale * full.nameStyle.font->height;
 	const auto nameLeft = layout.photoLeft + (photo - nameWidth) / 2.;
@@ -402,11 +377,11 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto left = anim::interpolate(
 			_changingGeometryFrom.x(),
 			_geometryFull.x(),
-			layout.expandedRatio);
+			layout.ratio);
 		const auto top = anim::interpolate(
 			_changingGeometryFrom.y(),
 			_geometryFull.y(),
-			layout.expandedRatio);
+			layout.ratio);
 		p.translate(QPoint(left, top) - pos());
 	}
 
@@ -433,18 +408,19 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto lookup = [&](int index) {
 		const auto indexSmall = layout.startIndexSmall + index;
 		const auto indexFull = layout.startIndexFull + index;
+		const auto k = (photoTop - photoTopSmall);
 		const auto ySmall = photoTopSmall
-			+ ((indexSmall - layout.smallSkip + 1)
-				* (photoTop - photoTopSmall) / 3.);
+			+ ((photoTop - photoTopSmall)
+				* (kSmallThumbsShown - indexSmall + layout.smallSkip) / 0.5);
 		const auto y = elerp(ySmall, photoTop);
 
 		const auto small = (drawSmall
 			&& indexSmall < layout.endIndexSmall
 			&& indexSmall >= layout.smallSkip)
-			? &rendering.items[indexSmall]
+			? &_data.items[indexSmall]
 			: nullptr;
 		const auto full = (drawFull && indexFull < layout.endIndexFull)
-			? &rendering.items[indexFull]
+			? &_data.items[indexFull]
 			: nullptr;
 		const auto x = layout.left + layout.single * index;
 		return Single{ x, indexSmall, small, indexFull, full, y };
@@ -556,9 +532,16 @@ void List::paintEvent(QPaintEvent *e) {
 
 		// White circle with possible read gray line.
 		const auto hasReadLine = (itemFull && !fullUnread);
+		p.setOpacity((small && itemFull)
+			? 1.
+			: small
+			? (1. - expandRatio)
+			: expandRatio);
 		if (hasReadLine) {
 			auto color = st::dialogsUnreadBgMuted->c;
-			color.setAlphaF(color.alphaF() * expandRatio);
+			if (small) {
+				color.setAlphaF(color.alphaF() * expandRatio);
+			}
 			auto pen = QPen(color);
 			pen.setWidthF(lineRead);
 			p.setPen(pen);
@@ -601,7 +584,7 @@ void List::paintEvent(QPaintEvent *e) {
 		p.setOpacity(1.);
 	});
 
-	paintSummary(p, rendering, summaryTop, ratio);
+	paintSummary(p, _data, summaryTop, ratio);
 }
 
 void List::validateThumbnail(not_null<Item*> item) {
@@ -729,7 +712,7 @@ void List::paintSummary(
 
 void List::wheelEvent(QWheelEvent *e) {
 	const auto horizontal = (e->angleDelta().x() != 0);
-	if (!horizontal) {
+	if (!horizontal || _state == State::Small) {
 		e->ignore();
 		return;
 	}
@@ -757,6 +740,10 @@ void List::wheelEvent(QWheelEvent *e) {
 void List::mousePressEvent(QMouseEvent *e) {
 	if (e->button() != Qt::LeftButton) {
 		return;
+	} else if (_state == State::Small) {
+		requestExpanded(true);
+	} else if (_state != State::Full) {
+		return;
 	}
 	_lastMousePosition = e->globalPos();
 	updateSelected();
@@ -834,25 +821,28 @@ void List::setExpandedHeight(int height, bool momentum) {
 		_expandIgnored = false;
 		_expandCatchUpAnimation.start([=] {
 			update();
-			if (!_expandCatchUpAnimation.animating()
-				&& _lastExpandedHeight == _st.full.height) {
-				setState(State::Full);
-			}
+			checkForFullState();
 		}, 0., 1., kExpandCatchUpDuration);
 	} else if (!height && _expandCatchUpAnimation.animating()) {
 		_expandCatchUpAnimation.stop();
 	}
 	_lastExpandedHeight = height;
-	setState(!height
-		? State::Small
-		: (height < _st.full.height
-			|| _expandCatchUpAnimation.animating()
-			|| _expandedAnimation.animating())
-		? State::Changing
-		: State::Full);
+	if (!checkForFullState()) {
+		setState(!height ? State::Small : State::Changing);
+	}
 	update();
 }
 
+bool List::checkForFullState() {
+	if (_expandCatchUpAnimation.animating()
+		|| _expandedAnimation.animating()
+		|| _lastExpandedHeight < _st.full.height) {
+		return false;
+	}
+	setState(State::Full);
+	return true;
+}
+
 void List::setLayoutConstraints(QPoint topRightSmall, QRect geometryFull) {
 	_topRightSmall = topRightSmall;
 	_geometryFull = geometryFull;
@@ -875,7 +865,9 @@ void List::updateGeometry() {
 QRect List::countSmallGeometry() const {
 	const auto &st = _st.small;
 	const auto layout = const_cast<List*>(this)->computeLayout();
-	const auto count = layout.endIndexSmall - layout.startIndexSmall;
+	const auto count = layout.endIndexSmall
+		- layout.startIndexSmall
+		- layout.smallSkip;
 	const auto width = st.left
 		+ st.photoLeft
 		+ st.photo + (count - 1) * st.shift
@@ -893,9 +885,6 @@ void List::setState(State state) {
 		return;
 	}
 	_state = state;
-	setAttribute(
-		Qt::WA_TransparentForMouseEvents,
-		state == State::Changing);
 	updateGeometry();
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 0bf355bdb..7a02db40f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -68,6 +68,12 @@ public:
 	void setExpandedHeight(int height, bool momentum = false);
 	void setLayoutConstraints(QPoint topRightSmall, QRect geometryFull);
 
+	[[nodiscard]] bool empty() const {
+		return _empty.current();
+	}
+	[[nodiscard]] rpl::producer<bool> emptyValue() const {
+		return _empty.value();
+	}
 	[[nodiscard]] rpl::producer<uint64> clicks() const;
 	[[nodiscard]] rpl::producer<ShowMenuRequest> showMenuRequests() const;
 	[[nodiscard]] rpl::producer<bool> toggleExpandedRequests() const;
@@ -153,12 +159,11 @@ private:
 	void checkLoadMore();
 	void requestExpanded(bool expanded);
 
+	bool checkForFullState();
 	void setState(State state);
 	void updateGeometry();
 	[[nodiscard]] QRect countSmallGeometry() const;
 	void updateExpanding(int expandingHeight, int expandedHeight);
-	void updateHeight();
-	void toggleAnimated(bool shown);
 	void paintSummary(
 		QPainter &p,
 		Data &data,
@@ -170,7 +175,6 @@ private:
 	const style::DialogsStoriesList &_st;
 	Content _content;
 	Data _data;
-	Data _hidingData;
 	rpl::event_stream<uint64> _clicks;
 	rpl::event_stream<ShowMenuRequest> _showMenuRequests;
 	rpl::event_stream<bool> _toggleExpandedRequests;
@@ -181,8 +185,7 @@ private:
 	QRect _geometryFull;
 	QRect _changingGeometryFrom;
 	State _state = State::Small;
-
-	Ui::Animations::Simple _shownAnimation;
+	rpl::variable<bool> _empty = true;
 
 	QPoint _lastMousePosition;
 	std::optional<QPoint> _mouseDownPosition;
diff --git a/Telegram/SourceFiles/ui/chat/more_chats_bar.h b/Telegram/SourceFiles/ui/chat/more_chats_bar.h
index 5536349c8..f920e4832 100644
--- a/Telegram/SourceFiles/ui/chat/more_chats_bar.h
+++ b/Telegram/SourceFiles/ui/chat/more_chats_bar.h
@@ -31,6 +31,10 @@ public:
 		rpl::producer<MoreChatsBarContent> content);
 	~MoreChatsBar();
 
+	[[nodiscard]] not_null<RpWidget*> wrap() {
+		return &_wrap;
+	}
+
 	void show();
 	void hide();
 	void raise();
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 183026881..f1b1a2029 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -112,7 +112,6 @@ menuIconArchiveOpen: icon {{ "menu/archive_open", menuIconColor }};
 menuIconGroups: icon {{ "menu/groups", menuIconColor }};
 menuIconSavedMessages: icon {{ "menu/saved_messages", menuIconColor }};
 menuIconNightMode: icon {{ "menu/night_mode", menuIconColor }};
-menuIconStoriesToChats: icon {{ "menu/stories_to_chats", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 763b3a37c..427fc4c8f 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 763b3a37c34fd7819f9d553b94387c4fe16554ff
+Subproject commit 427fc4c8f7c8b92cca900e0270718f83fcb16e35

From 7b911897fc5dd89ed1b59cf639105fce13fbfefc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 19:41:04 +0400
Subject: [PATCH 374/676] Remove legacy summaries from stories list.

---
 Telegram/Resources/langs/lang.strings         |   2 -
 .../dialogs/ui/dialogs_stories_list.cpp       | 177 ------------------
 .../dialogs/ui/dialogs_stories_list.h         |  44 -----
 3 files changed, 223 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d360b8957..81a75e5a6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3827,8 +3827,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_unarchive" = "Unarchive";
 "lng_stories_row_count#one" = "{count} Story";
 "lng_stories_row_count#other" = "{count} Stories";
-"lng_stories_row_unread_and_one" = "{accumulated}, {user}";
-"lng_stories_row_unread_and_last" = "{accumulated} and {user}";
 "lng_stories_views#one" = "{count} view";
 "lng_stories_views#other" = "{count} views";
 "lng_stories_no_views" = "No views";
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index dc6384a8d..0fd70644d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -109,95 +109,12 @@ void List::showContent(Content &&content) {
 		updateGeometry();
 	}
 	updateScrollMax();
-	updateSummary(_data);
 	update();
 	if (!wasCount) {
 		_empty = false;
 	}
 }
 
-List::Summaries List::ComposeSummaries(Data &data) {
-	const auto total = int(data.items.size());
-	const auto skip = (total > 1 && data.items[0].element.skipSmall)
-		? 1
-		: 0;
-	auto unreadInFirst = 0;
-	auto unreadTotal = 0;
-	for (auto i = skip; i != total; ++i) {
-		if (data.items[i].element.unreadCount > 0) {
-			++unreadTotal;
-			if (i < skip + kSmallThumbsShown) {
-				++unreadInFirst;
-			}
-		}
-	}
-	auto result = Summaries{ .skipOne = (skip > 0) };
-	result.total.string
-		= tr::lng_stories_row_count(tr::now, lt_count, total);
-	const auto append = [&](QString &to, int index, bool last) {
-		if (to.isEmpty()) {
-			to = data.items[index].element.name;
-		} else {
-			to = (last
-				? tr::lng_stories_row_unread_and_last
-				: tr::lng_stories_row_unread_and_one)(
-					tr::now,
-					lt_accumulated,
-					to,
-					lt_user,
-					data.items[index].element.name);
-		}
-	};
-	if (!total) {
-		return result;
-	} else if (total <= skip + kSmallThumbsShown) {
-		for (auto i = skip; i != total; ++i) {
-			append(result.allNames.string, i, i == total - 1);
-		}
-	}
-	if (unreadInFirst > 0 && unreadInFirst == unreadTotal) {
-		for (auto i = skip; i != total; ++i) {
-			if (data.items[i].element.unreadCount > 0) {
-				append(result.unreadNames.string, i, !--unreadTotal);
-			}
-		}
-	}
-	return result;
-}
-
-bool List::StringsEqual(const Summaries &a, const Summaries &b) {
-	return (a.total.string == b.total.string)
-		&& (a.allNames.string == b.allNames.string)
-		&& (a.unreadNames.string == b.unreadNames.string);
-}
-
-void List::Populate(
-		const style::DialogsStories &st,
-		Summary &summary) {
-	if (summary.empty()) {
-		return;
-	}
-	summary.cache = QImage();
-	summary.text = Ui::Text::String(st.nameStyle, summary.string);
-}
-
-void List::Populate(
-		const style::DialogsStories &st,
-		Summaries &summaries) {
-	Populate(st, summaries.total);
-	Populate(st, summaries.allNames);
-	Populate(st, summaries.unreadNames);
-}
-
-void List::updateSummary(Data &data) {
-	auto summaries = ComposeSummaries(data);
-	if (StringsEqual(summaries, data.summaries)) {
-		return;
-	}
-	data.summaries = std::move(summaries);
-	Populate(_st.small, data.summaries);
-}
-
 void List::updateScrollMax() {
 	const auto &full = _st.full;
 	const auto singleFull = full.photoLeft * 2 + full.photo;
@@ -583,8 +500,6 @@ void List::paintEvent(QPaintEvent *e) {
 		}
 		p.setOpacity(1.);
 	});
-
-	paintSummary(p, _data, summaryTop, ratio);
 }
 
 void List::validateThumbnail(not_null<Item*> item) {
@@ -618,98 +533,6 @@ void List::validateName(not_null<Item*> item) {
 	text.drawElided(p, 0, 0, available, 1, style::al_top);
 }
 
-List::Summary &List::ChooseSummary(
-		const style::DialogsStories &st,
-		Summaries &summaries,
-		int totalItems,
-		int fullWidth) {
-	const auto used = std::min(
-		totalItems - (summaries.skipOne ? 1 : 0),
-		kSmallThumbsShown);
-	const auto taken = st.left
-		+ st.photoLeft
-		+ st.photo
-		+ (used - 1) * st.shift
-		+ st.nameLeft
-		+ st.nameRight;
-	const auto available = fullWidth - taken;
-	const auto prepare = [&](Summary &summary) {
-		if (!summary.empty() && (summary.text.maxWidth() <= available)) {
-			summary.available = available;
-			return true;
-		}
-		return false;
-	};
-	if (prepare(summaries.unreadNames)) {
-		return summaries.unreadNames;
-	} else if (prepare(summaries.allNames)) {
-		return summaries.allNames;
-	}
-	prepare(summaries.total);
-	return summaries.total;
-}
-
-void List::PrerenderSummary(
-		const style::DialogsStories &st,
-		Summary &summary) {
-	if (!summary.cache.isNull()
-		&& summary.cacheForWidth == summary.available
-		&& summary.cacheColor == st::dialogsNameFg->c) {
-		return;
-	}
-	const auto use = std::min(summary.text.maxWidth(), summary.available);
-	const auto ratio = style::DevicePixelRatio();
-	summary.cache = QImage(
-		QSize(use, st.nameStyle.font->height) * ratio,
-		QImage::Format_ARGB32_Premultiplied);
-	summary.cache.setDevicePixelRatio(ratio);
-	summary.cache.fill(Qt::transparent);
-	auto p = Painter(&summary.cache);
-	p.setPen(st::dialogsNameFg);
-	summary.text.drawElided(p, 0, 0, summary.available);
-}
-
-void List::paintSummary(
-		QPainter &p,
-		Data &data,
-		float64 summaryTop,
-		float64 hidden) {
-#if 0 // #TODO stories to-remove
-	const auto total = int(data.items.size());
-	auto &summary = ChooseSummary(
-		_st.small,
-		data.summaries,
-		total,
-		width());
-	PrerenderSummary(_st.small, summary);
-	const auto lerp = [&](float64 from, float64 to) {
-		return from + (to - from) * hidden;
-	};
-	const auto &st = _st.small;
-	const auto &full = _st.full;
-	const auto used = std::min(
-		total - (data.summaries.skipOne ? 1 : 0),
-		kSmallThumbsShown);
-	const auto fullLeft = st.left
-		+ st.photoLeft
-		+ st.photo
-		+ (used - 1) * st.shift
-		+ st.nameLeft;
-	const auto leftFinal = std::min(
-		full.left + (full.photoLeft * 2 + full.photo) * total,
-		width()) * kSummaryExpandLeft;
-	const auto left = lerp(fullLeft, leftFinal);
-	const auto ratio = summary.cache.devicePixelRatio();
-	const auto summaryWidth = lerp(summary.cache.width() / ratio, 0.);
-	const auto summaryHeight = lerp(summary.cache.height() / ratio, 0.);
-	summaryTop += ((summary.cache.height() / ratio) - summaryHeight) / 2.;
-	p.setOpacity(1. - hidden);
-	p.drawImage(
-		QRectF(left, summaryTop, summaryWidth, summaryHeight),
-		summary.cache);
-#endif
-}
-
 void List::wheelEvent(QWheelEvent *e) {
 	const auto horizontal = (e->angleDelta().x() != 0);
 	if (!horizontal || _state == State::Small) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 7a02db40f..7e0028822 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -93,52 +93,14 @@ private:
 		QColor nameCacheColor;
 		bool subscribed = false;
 	};
-	struct Summary {
-		QString string;
-		Ui::Text::String text;
-		int available = 0;
-		QImage cache;
-		QColor cacheColor;
-		int cacheForWidth = 0;
-
-		[[nodiscard]] bool empty() const {
-			return string.isEmpty();
-		}
-	};
-	struct Summaries {
-		Summary total;
-		Summary allNames;
-		Summary unreadNames;
-		bool skipOne = false;
-	};
 	struct Data {
 		std::vector<Item> items;
-		Summaries summaries;
 
 		[[nodiscard]] bool empty() const {
 			return items.empty();
 		}
 	};
 
-	[[nodiscard]] static Summaries ComposeSummaries(Data &data);
-	[[nodiscard]] static bool StringsEqual(
-		const Summaries &a,
-		const Summaries &b);
-	static void Populate(
-		const style::DialogsStories &st,
-		Summary &summary);
-	static void Populate(
-		const style::DialogsStories &st,
-		Summaries &summaries);
-	[[nodiscard]] static Summary &ChooseSummary(
-		const style::DialogsStories &st,
-		Summaries &summaries,
-		int totalItems,
-		int fullWidth);
-	static void PrerenderSummary(
-		const style::DialogsStories &st,
-		Summary &summary);
-
 	void showContent(Content &&content);
 	void enterEventHook(QEnterEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
@@ -152,7 +114,6 @@ private:
 	void validateThumbnail(not_null<Item*> item);
 	void validateName(not_null<Item*> item);
 	void updateScrollMax();
-	void updateSummary(Data &data);
 	void updateSelected();
 	void checkDragging();
 	bool finishDragging();
@@ -164,11 +125,6 @@ private:
 	void updateGeometry();
 	[[nodiscard]] QRect countSmallGeometry() const;
 	void updateExpanding(int expandingHeight, int expandedHeight);
-	void paintSummary(
-		QPainter &p,
-		Data &data,
-		float64 summaryTop,
-		float64 hidden);
 
 	[[nodiscard]] Layout computeLayout();
 

From 06469270d029be0528e094f2a83e8bf37c8bb202 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 19:41:23 +0400
Subject: [PATCH 375/676] Remove hidden stories from contacts box.

---
 .../boxes/peer_list_controllers.cpp           | 278 ------------------
 1 file changed, 278 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 7090a018d..2019f0c50 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -53,63 +53,6 @@ namespace {
 constexpr auto kSortByOnlineThrottle = 3 * crl::time(1000);
 constexpr auto kSearchPerPage = 50;
 
-class StoriesRow final : public PeerListRow {
-public:
-	StoriesRow(
-		not_null<Main::Session*> session,
-		const QBrush &unread,
-		const Dialogs::Stories::Element &element,
-		int position);
-
-	void applySegments(const Dialogs::Stories::Element &element);
-	void updateGradient(QBrush unread);
-
-	int position = 0;
-
-private:
-	void refreshSegments();
-
-	QBrush _unread;
-	int _count = 0;
-	int _unreadCount = 0;
-
-};
-
-class StoriesController final
-	: public PeerListController
-	, public base::has_weak_ptr {
-public:
-	using Content = Dialogs::Stories::Content;
-	using Row = StoriesRow;
-
-	StoriesController(
-		not_null<Window::SessionController*> window,
-		rpl::producer<Content> content,
-		Fn<void(uint64)> open,
-		Fn<void()> loadMore);
-
-	Main::Session &session() const override;
-	void prepare() override;
-	void loadMoreRows() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
-	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
-		QWidget *parent,
-		not_null<PeerListRow*> row) override;
-
-private:
-	void refresh(const Content &content);
-
-	const not_null<Window::SessionController*> _window;
-	QBrush _unread;
-	rpl::producer<Content> _content;
-	Fn<void(uint64)> _open;
-	Fn<void()> _loadMore;
-	bool _positionPositive = false;
-
-	rpl::lifetime _lifetime;
-
-};
-
 [[nodiscard]] std::vector<Ui::RoundImageCheckboxSegment> PrepareSegments(
 		int count,
 		int unread,
@@ -150,221 +93,6 @@ private:
 	return QBrush(gradient);
 }
 
-StoriesRow::StoriesRow(
-	not_null<Main::Session*> session,
-	const QBrush &unread,
-	const Dialogs::Stories::Element &element,
-	int position)
-: PeerListRow(session->data().peer(PeerId(element.id)))
-, position(position)
-, _unread(unread) {
-}
-
-void StoriesRow::applySegments(const Dialogs::Stories::Element &element) {
-	Expects(element.unreadCount <= element.count);
-
-	_count = int(std::max(element.count, 1U));
-	_unreadCount = element.unreadCount;
-	refreshSegments();
-	setCustomStatus(_unreadCount
-		? tr::lng_contacts_stories_status_new(
-			tr::now,
-			lt_count,
-			_unreadCount)
-		: tr::lng_contacts_stories_status(tr::now, lt_count, _count));
-}
-
-void StoriesRow::updateGradient(QBrush unread) {
-	_unread = std::move(unread);
-	refreshSegments();
-}
-
-void StoriesRow::refreshSegments() {
-	setCustomizedCheckSegments(
-		PrepareSegments(_count, _unreadCount, _unread));
-}
-
-StoriesController::StoriesController(
-	not_null<Window::SessionController*> window,
-	rpl::producer<Content> content,
-	Fn<void(uint64)> open,
-	Fn<void()> loadMore)
-: _window(window)
-, _content(std::move(content))
-, _open(std::move(open))
-, _loadMore(std::move(loadMore)) {
-	_unread = CreateStoriesGradient();
-	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
-		_unread = CreateStoriesGradient();
-		for (auto i = 0, count = int(delegate()->peerListFullRowsCount())
-			; i != count
-			; ++i) {
-			const auto row = delegate()->peerListRowAt(i).get();
-			static_cast<Row*>(row)->updateGradient(_unread);
-		}
-	}, _lifetime);
-}
-
-Main::Session &StoriesController::session() const {
-	return _window->session();
-}
-
-void StoriesController::prepare() {
-	if (_loadMore) {
-		_loadMore();
-	}
-	std::move(
-		_content
-	) | rpl::start_with_next([=](Content content) {
-		refresh(content);
-	}, _lifetime);
-}
-
-void StoriesController::loadMoreRows() {
-	if (_loadMore) {
-		_loadMore();
-	}
-}
-
-void StoriesController::rowClicked(not_null<PeerListRow*> row) {
-	if (_open) {
-		_open(row->id());
-	}
-}
-
-base::unique_qptr<Ui::PopupMenu> StoriesController::rowContextMenu(
-		QWidget *parent,
-		not_null<PeerListRow*> row) {
-	auto result = base::make_unique_q<Ui::PopupMenu>(
-		parent,
-		st::popupMenuWithIcons);
-
-	Dialogs::Stories::FillSourceMenu(_window, {
-		.id = row->id(),
-		.callback = Ui::Menu::CreateAddActionCallback(result.get()),
-	});
-
-	if (result->empty()) {
-		return nullptr;
-	}
-	return result;
-}
-
-void StoriesController::refresh(const Content &content) {
-	const auto session = &_window->session();
-	const auto positive = _positionPositive = !_positionPositive;
-	auto position = positive ? 1 : -int(content.elements.size());
-	for (const auto &element : content.elements) {
-		if (const auto row = delegate()->peerListFindRow(element.id)) {
-			static_cast<Row*>(row)->position = position;
-			static_cast<Row*>(row)->applySegments(element);
-		} else {
-			auto added = std::make_unique<Row>(
-				session,
-				_unread,
-				element,
-				position);
-			const auto raw = added.get();
-			delegate()->peerListAppendRow(std::move(added));
-			delegate()->peerListSetRowChecked(raw, true);
-			raw->applySegments(element);
-			raw->finishCheckedAnimation();
-		}
-		++position;
-	}
-	auto count = delegate()->peerListFullRowsCount();
-	for (auto i = 0; i != count;) {
-		const auto row = delegate()->peerListRowAt(i);
-		const auto position = static_cast<Row*>(row.get())->position;
-		if (positive ? (position > 0) : (position < 0)) {
-			++i;
-		} else {
-			delegate()->peerListRemoveRow(row);
-			--count;
-		}
-	}
-	delegate()->peerListSortRows([](
-			const PeerListRow &a,
-			const PeerListRow &b) {
-		return static_cast<const Row&>(a).position
-			< static_cast<const Row&>(b).position;
-	});
-	delegate()->peerListRefreshRows();
-}
-
-[[nodiscard]] object_ptr<Ui::RpWidget> PrepareHiddenStoriesList(
-		not_null<PeerListBox*> box,
-		not_null<Window::SessionController*> sessionController,
-		rpl::producer<ContactsBoxController::SortMode> mode) {
-	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-		box,
-		object_ptr<Ui::VerticalLayout>(box));
-	const auto container = result->entity();
-	const auto stories = &sessionController->session().data().stories();
-
-	container->add(CreatePeerListSectionSubtitle(
-		container,
-		tr::lng_contacts_hidden_stories()));
-
-	auto &lifetime = container->lifetime();
-	auto list = Dialogs::Stories::ContentForSession(
-		&sessionController->session(),
-		Data::StorySourcesList::Hidden
-	) | rpl::start_spawning(lifetime);
-	const auto delegate = lifetime.make_state<
-		PeerListContentDelegateSimple
-	>();
-	const auto open = [=](uint64 id) {
-		sessionController->openPeerStories(
-			PeerId(int64(id)),
-			Data::StorySourcesList::Hidden);
-	};
-	const auto loadMore = [=] {
-		stories->loadMore(Data::StorySourcesList::Hidden);
-	};
-	const auto controller = lifetime.make_state<StoriesController>(
-		sessionController,
-		rpl::duplicate(
-			list
-		) | rpl::filter([](const Dialogs::Stories::Content &list) {
-			return !list.elements.empty();
-		}),
-		open,
-		loadMore);
-	controller->setStyleOverrides(&st::contactsWithStories);
-	const auto content = container->add(object_ptr<PeerListContent>(
-		container,
-		controller));
-	delegate->setContent(content);
-	controller->setDelegate(delegate);
-
-	container->add(CreatePeerListSectionSubtitle(
-		container,
-		rpl::conditional(
-			std::move(
-				mode
-			) | rpl::map(
-				rpl::mappers::_1 == ContactsBoxController::SortMode::Online
-			),
-			tr::lng_contacts_by_online(),
-			tr::lng_contacts_by_name())));
-
-	stories->incrementPreloadingHiddenSources();
-	lifetime.add([=] {
-		stories->decrementPreloadingHiddenSources();
-	});
-
-	result->toggleOn(rpl::duplicate(
-		list
-	) | rpl::map([](const Dialogs::Stories::Content &list) {
-		return !list.elements.empty();
-	}));
-	result->finishAnimating();
-
-	return result;
-}
-
 } // namespace
 
 object_ptr<Ui::BoxContent> PrepareContactsBox(
@@ -384,7 +112,6 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 			::Ui::Animations::Simple scrollAnimation;
 		};
 
-		const auto stories = &sessionController->session().data().stories();
 		const auto state = box->lifetime().make_state<State>();
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 		box->addLeftButton(
@@ -400,11 +127,6 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 				online ? &st::contactsSortOnlineIconOver : nullptr);
 		});
 		raw->setSortMode(Mode::Online);
-
-		box->peerListSetAboveWidget(PrepareHiddenStoriesList(
-			box,
-			sessionController,
-			state->mode.value()));
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(init));
 }

From dfd1aa5cd6cde38c0da6b78ec6685132b3232e2e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 19:41:33 +0400
Subject: [PATCH 376/676] Fix empty stories list hiding.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index fb92cbf1e..a994d4571 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -852,6 +852,10 @@ void Widget::setupStories() {
 				0);
 		}
 	}, lifetime());
+
+	_stories->emptyValue() | rpl::skip(1) | rpl::start_with_next([=] {
+		updateStoriesVisibility();
+	}, lifetime());
 }
 
 void Widget::storiesToggleExplicitExpand(bool expand) {
@@ -1363,7 +1367,8 @@ void Widget::updateStoriesVisibility() {
 		|| !_widthAnimationCache.isNull()
 		|| _childList
 		|| !_filter->getLastText().isEmpty()
-		|| _searchInChat;
+		|| _searchInChat
+		|| _stories->empty();
 	if (_stories->isHidden() != hidden) {
 		_stories->setVisible(!hidden);
 		using Type = Ui::ElasticScroll::OverscrollType;

From 05cf8d034ec9ffc705307ea4fa069c985242f59e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 21:42:08 +0400
Subject: [PATCH 377/676] Improve touch-screen stories overscroll.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp | 3 +--
 Telegram/lib_ui                                          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 0fd70644d..2141540a1 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -689,8 +689,7 @@ QRect List::countSmallGeometry() const {
 	const auto &st = _st.small;
 	const auto layout = const_cast<List*>(this)->computeLayout();
 	const auto count = layout.endIndexSmall
-		- layout.startIndexSmall
-		- layout.smallSkip;
+		- std::max(layout.startIndexSmall, layout.smallSkip);
 	const auto width = st.left
 		+ st.photoLeft
 		+ st.photo + (count - 1) * st.shift
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 427fc4c8f..6af98c080 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 427fc4c8f7c8b92cca900e0270718f83fcb16e35
+Subproject commit 6af98c08025027cc3e7833e068db47670aa34dab

From 35e34541b0050ff9784a690447e8615849a44db7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 22:05:42 +0400
Subject: [PATCH 378/676] Closed alpha version 4.8.4.2.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index e9ff08323..6f1bf2f9b 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.8.4.1" />
+    Version="4.8.4.2" />
   <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 c90e04576..03e4f6943 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,8,4,1
- PRODUCTVERSION 4,8,4,1
+ FILEVERSION 4,8,4,2
+ PRODUCTVERSION 4,8,4,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.4.1"
+            VALUE "FileVersion", "4.8.4.2"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.1"
+            VALUE "ProductVersion", "4.8.4.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 1292b3215..dd8f3c39a 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,8,4,1
- PRODUCTVERSION 4,8,4,1
+ FILEVERSION 4,8,4,2
+ PRODUCTVERSION 4,8,4,2
  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.8.4.1"
+            VALUE "FileVersion", "4.8.4.2"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.1"
+            VALUE "ProductVersion", "4.8.4.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 9e9f695db..b3dccc6e6 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004001ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004002ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index ac52ec62e..3cbfb66f9 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.8
 AppVersionStrSmall 4.8.4
 AppVersionStr      4.8.4
 BetaChannel        0
-AlphaVersion       4008004001
-AppVersionOriginal 4.8.4.1
+AlphaVersion       4008004002
+AppVersionOriginal 4.8.4.2

From 641a03c98887c5d2633f7ded8de7888cb7456abc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 10:21:22 +0400
Subject: [PATCH 379/676] Fix crash on mention story opening.

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

diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
index 8615aec4b..8aefb319b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
@@ -53,7 +53,10 @@ StoryMention::StoryMention(
 }
 
 StoryMention::~StoryMention() {
-	changeSubscribedTo(0);
+	if (_subscribed) {
+		changeSubscribedTo(0);
+		_parent->checkHeavyPart();
+	}
 }
 
 int StoryMention::top() {

From 8726884b214548f61512b9c2c99db916277358bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 10:28:38 +0400
Subject: [PATCH 380/676] Fix media rotation animation.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 96da6d8ff..04a9d025f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -526,7 +526,13 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 		geometry.controlsOpacity,
 		1.f - float(geometry.fade)));
 	if (!fillTransparentBackground) {
-		program->setUniformValue("roundRect", Uniform(rect));
+		program->setUniformValue(
+			"roundRect",
+			geometry.roundRadius ? Uniform(rect) : QVector4D(
+				0,
+				0,
+				_uniformViewport.x(),
+				_uniformViewport.y()));
 		program->setUniformValue(
 			"roundRadius",
 			GLfloat(geometry.roundRadius * _factor));

From b0403553fa0df05c1f109022b30a111d90039f87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 12:21:20 +0400
Subject: [PATCH 381/676] Remove testing more chats bar.

---
 Telegram/SourceFiles/data/data_chat_filters.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 90ef0bebe..26c6b6287 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -905,7 +905,6 @@ rpl::producer<> ChatFilters::suggestedUpdated() const {
 
 rpl::producer<Ui::MoreChatsBarContent> ChatFilters::moreChatsContent(
 		FilterId id) {
-	return rpl::single(Ui::MoreChatsBarContent{ .count = 10 }); // #TODO stories testing
 	if (!id) {
 		return rpl::single(Ui::MoreChatsBarContent{ .count = 0 });
 	}

From f7cbac1f469c77a960ed180dac655dd799f45e1e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 12:21:30 +0400
Subject: [PATCH 382/676] Try different function in overscroll.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 6af98c080..d04a38e15 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 6af98c08025027cc3e7833e068db47670aa34dab
+Subproject commit d04a38e15d957ab0dacfe825396c199541097443

From 6607848abc8921dd03d3eed7e0faaf5c80279fcd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 22:22:40 +0400
Subject: [PATCH 383/676] Fix build with GCC.

---
 Telegram/SourceFiles/data/data_message_reactions.cpp   |  1 -
 Telegram/SourceFiles/data/data_poll.cpp                |  3 ---
 Telegram/SourceFiles/data/data_stories.cpp             |  8 ++------
 Telegram/SourceFiles/data/data_story.cpp               |  1 -
 .../SourceFiles/dialogs/ui/dialogs_stories_list.cpp    |  1 -
 Telegram/SourceFiles/export/data/export_data_types.cpp |  1 -
 .../SourceFiles/info/media/info_media_list_widget.cpp  |  1 -
 .../media/stories/media_stories_controller.cpp         |  1 -
 .../media/stories/media_stories_reactions.cpp          |  1 -
 .../SourceFiles/media/stories/media_stories_share.cpp  | 10 ----------
 .../media/stories/media_stories_sibling.cpp            |  1 -
 .../media/view/media_view_overlay_widget.cpp           |  1 -
 Telegram/SourceFiles/overview/overview_layout.cpp      |  1 -
 13 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index c0e7d9b87..e4279cbb3 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -1194,7 +1194,6 @@ bool MessageReactions::change(
 			}
 		}
 	}
-	const auto selfId = owner.session().userPeerId();
 	auto parsed = base::flat_map<ReactionId, std::vector<RecentReaction>>();
 	for (const auto &reaction : recent) {
 		reaction.match([&](const MTPDmessagePeerReaction &data) {
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index efe928960..f781f95bc 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -132,9 +132,6 @@ bool PollData::applyResults(const MTPPollResults &results) {
 			}
 		}
 		if (const auto recent = results.vrecent_voters()) {
-			const auto bareProj = [](not_null<UserData*> user) {
-				return peerToUser(user->id).bare;
-			};
 			const auto recentChanged = !ranges::equal(
 				recentVoters,
 				recent->v,
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index fa3ff6b58..add13494f 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -273,7 +273,6 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 	const auto &data = stories.data();
 	const auto peerId = peerFromUser(data.vuser_id());
 	const auto readTill = data.vmax_read_id().value_or_empty();
-	const auto count = int(data.vstories().v.size());
 	const auto user = _owner->peer(peerId)->asUser();
 	auto result = StoriesSource{
 		.user = user,
@@ -355,7 +354,6 @@ Story *Stories::parseAndApply(
 	if (i != end(stories)) {
 		const auto result = i->second.get();
 		const auto mediaChanged = (result->media() != *media);
-		const auto pinned = result->pinned();
 		result->applyChanges(*media, data, now);
 		const auto j = _pollingSettings.find(result);
 		if (j != end(_pollingSettings)) {
@@ -577,7 +575,7 @@ void Stories::sendResolveRequests() {
 			finish(peerId);
 			continue;
 		}
-		const auto requestId = api->request(MTPstories_GetStoriesByID(
+		api->request(MTPstories_GetStoriesByID(
 			user->inputUser,
 			MTP_vector<MTPint>(prepared)
 		)).done([=](const MTPstories_Stories &result) {
@@ -1083,7 +1081,6 @@ void Stories::sendIncrementViewsRequests() {
 		return;
 	}
 	auto ids = QVector<MTPint>();
-	auto peer = PeerId();
 	struct Prepared {
 		PeerId peer = 0;
 		QVector<MTPint> ids;
@@ -1141,7 +1138,7 @@ void Stories::loadViewsSlice(
 		MTP_int(id),
 		MTP_int(offset ? offset->date : 0),
 		MTP_long(offset ? peerToUser(offset->peer->id).bare : 0),
-		MTP_int(kViewsPerPage)
+		MTP_int(perPage)
 	)).done([=](const MTPstories_StoryViewsList &result) {
 		_viewsRequestId = 0;
 
@@ -1595,7 +1592,6 @@ void Stories::sendPollingViewsRequests() {
 		return;
 	} else if (!_viewsRequestId) {
 		Assert(_viewsDone == nullptr);
-		const auto one = _pollingViews.front();
 		loadViewsSlice(_pollingViews.front()->id(), std::nullopt, nullptr);
 	}
 	_pollingViewsTimer.callOnce(kPollViewsInterval);
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 59f672a11..210e4a8f4 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -104,7 +104,6 @@ bool StoryPreload::LoadTask::feedPart(
 	Expects(bytes.size() <= Storage::kDownloadPartSize);
 
 	const auto part = Storage::kDownloadPartSize;
-	const auto index = offset / part;
 	_requestedOffsets.remove(int(offset));
 	_parts[offset] = bytes;
 	if ((_nextRequestOffset + part >= _parts.size() * part)
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 2141540a1..14e37d4d9 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -761,7 +761,6 @@ void List::updateSelected() {
 		return;
 	}
 	const auto &st = _st.small;
-	const auto &full = _st.full;
 	const auto p = mapFromGlobal(_lastMousePosition);
 	const auto layout = computeLayout();
 	const auto firstRightFull = layout.leftFull
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index e2bc9fde2..6b9fc2997 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -623,7 +623,6 @@ StoriesSlice ParseStoriesSlice(
 		++result.skipped;
 		story.match([&](const MTPDstoryItem &data) {
 			const auto date = data.vdate().v;
-			const auto expires = data.vexpire_date().v;
 			auto media = Media();
 			data.vmedia().match([&](const MTPDmessageMediaPhoto &data) {
 				const auto suggestedPath = "stories/"
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 8a06efa5c..459f1408c 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -1219,7 +1219,6 @@ void ListWidget::toggleStoryPin(
 			confirmed();
 		}
 	};
-	const auto session = &_controller->session();
 	const auto onePhrase = pin
 		? tr::lng_stories_save_sure
 		: tr::lng_stories_archive_sure;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 788806bdd..973473de1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -454,7 +454,6 @@ void Controller::initLayout() {
 		const auto nameBoundingRect = [&](QRect geometry, bool left) {
 			const auto skipSmall = nameFontSize;
 			const auto skipBig = skipSmall - std::min(xLeft, 0);
-			const auto top = userpic(geometry).y() + innerHeight;
 			return QRect(
 				left ? skipBig : skipSmall,
 				(geometry.height() - innerHeight) / 2,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index fb94bc026..9d4265758 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -131,7 +131,6 @@ void Reactions::create() {
 		}
 	}, _parent->lifetime());
 
-	const auto withSearch = reactions.customAllowed;
 	_selector = std::make_unique<HistoryView::Reactions::Selector>(
 		_parent.get(),
 		st::storiesReactionsPan,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index 0a9b87df5..413fbf3d1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -105,12 +105,8 @@ namespace Media::Stories {
 			return;
 		}
 
-		const auto generateRandom = [&] {
-			return base::RandomValue<MTPlong>();
-		};
 		const auto api = &story->owner().session().api();
 		auto &histories = story->owner().histories();
-		const auto requestType = Data::Histories::RequestType::Send;
 		for (const auto thread : result) {
 			const auto action = Api::SendAction(thread, options);
 			if (!comment.text.isEmpty()) {
@@ -119,11 +115,6 @@ namespace Media::Stories {
 				message.action.clearDraft = false;
 				api->sendMessage(std::move(message));
 			}
-			const auto topicRootId = thread->topicRootId();
-			const auto kGeneralId = Data::ForumTopic::kGeneralId;
-			const auto topMsgId = (topicRootId == kGeneralId)
-				? MsgId(0)
-				: topicRootId;
 			const auto peer = thread->peer();
 			const auto threadHistory = thread->owningHistory();
 			const auto randomId = base::RandomValue<uint64>();
@@ -131,7 +122,6 @@ namespace Media::Stories {
 			if (action.replyTo) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
 			}
-			const auto anonymousPost = peer->amAnonymous();
 			const auto silentPost = ShouldSendSilent(peer, action.options);
 			if (silentPost) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index c95674a0b..b8eda7d4a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -252,7 +252,6 @@ void Sibling::checkStory() {
 		return;
 	}
 	const auto story = *maybeStory;
-	const auto &data = story->media().data;
 	const auto origin = Data::FileOrigin();
 	v::match(story->media().data, [&](not_null<PhotoData*> photo) {
 		_loader = std::make_unique<LoaderPhoto>(photo, origin, [=] {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 9690f150e..379c341c0 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -673,7 +673,6 @@ void OverlayWidget::showSaveMsgToastWith(
 		+ st::mediaviewSaveMsgPadding.top()
 		+ st::mediaviewSaveMsgPadding.bottom();
 	_saveMsg = QRect((width() - w) / 2, (height() - h) / 2, w, h);
-	const auto toIn = 1.;
 	const auto callback = [=](float64 value) {
 		updateSaveMsg();
 		if (!_saveMsgAnimation.animating()) {
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 603963621..2f8609ace 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -517,7 +517,6 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 	if ((blurred || thumbnail || good)
 		&& ((_pix.width() != _width * cIntRetinaFactor())
 			|| (_pixBlurred && (thumbnail || good)))) {
-		auto size = _width * cIntRetinaFactor();
 		auto img = good
 			? good->original()
 			: thumbnail

From bbe431201724ea284106cf9a4a7827526e87dd3a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 21:59:18 +0400
Subject: [PATCH 384/676] Use GSL from a desktop-app fork.

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

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

From 66532aaac549e7ae6c6d022c32fe767017516d94 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 22:03:10 +0400
Subject: [PATCH 385/676] Workaround for std::variant bug in libstdc++.

---
 Telegram/ThirdParty/GSL | 2 +-
 cmake                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/ThirdParty/GSL b/Telegram/ThirdParty/GSL
index a35345671..09938e870 160000
--- a/Telegram/ThirdParty/GSL
+++ b/Telegram/ThirdParty/GSL
@@ -1 +1 @@
-Subproject commit a3534567187d2edc428efd3f13466ff75fe5805c
+Subproject commit 09938e870420b69a01f55c755207c871bc20b4e5
diff --git a/cmake b/cmake
index f20e647e2..982546b16 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit f20e647e297b6dd006e77f288465e6a1cdab10e9
+Subproject commit 982546b169df3d479e6511425870327559b38a89

From 196447ac19017ed32f1b0a3c540fe4bc446d8387 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 22:03:26 +0400
Subject: [PATCH 386/676] Fix build with GCC.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 14e37d4d9..3b3917807 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -19,7 +19,6 @@ namespace Dialogs::Stories {
 namespace {
 
 constexpr auto kSmallThumbsShown = 3;
-constexpr auto kSummaryExpandLeft = 1;
 constexpr auto kPreloadPages = 2;
 constexpr auto kExpandAfterRatio = 0.72;
 constexpr auto kCollapseAfterRatio = 0.68;
@@ -276,9 +275,6 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto photoTop = photoTopSmall
 		+ (full.photoTop - photoTopSmall) * layout.expandedRatio;
 	const auto photo = lerp(st.photo, full.photo);
-	const auto summaryTop = st.nameTop
-		- (st.photoTop + (st.photo / 2.))
-		+ (photoTop + (photo / 2.));
 	const auto nameScale = _lastRatio;
 	const auto nameTop = full.nameTop
 		+ (photoTop + photo - full.photoTop - full.photo);
@@ -325,7 +321,6 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto lookup = [&](int index) {
 		const auto indexSmall = layout.startIndexSmall + index;
 		const auto indexFull = layout.startIndexFull + index;
-		const auto k = (photoTop - photoTopSmall);
 		const auto ySmall = photoTopSmall
 			+ ((photoTop - photoTopSmall)
 				* (kSmallThumbsShown - indexSmall + layout.smallSkip) / 0.5);

From 51027a0bc25e10e22244dedd0349ed939188f190 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 22:05:58 +0400
Subject: [PATCH 387/676] Workaround Wayland popup menu bug.

When hiding a child popup first the app receives ApplicationDeactivate
event and in a short time (a couple of ms) ApplicationActivate.

But the first event hides all popups, so the parent popup gets closed too.

Delay handling of ApplicationDeactivate event in this specific case.
---
 Telegram/SourceFiles/core/sandbox.cpp | 12 +++++++++++-
 Telegram/lib_ui                       |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 6c332bbc1..d477101f4 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qthelp_regex.h"
 #include "ui/ui_utility.h"
 #include "ui/effects/animations.h"
+#include "ui/platform/ui_platform_utility.h"
 
 #include <QtCore/QLockFile>
 #include <QtGui/QSessionManager>
@@ -580,9 +581,18 @@ void Sandbox::registerEnterFromEventLoop() {
 }
 
 bool Sandbox::notifyOrInvoke(QObject *receiver, QEvent *e) {
-	if (e->type() == base::InvokeQueuedEvent::kType) {
+	const auto type = e->type();
+	if (type == base::InvokeQueuedEvent::kType) {
 		static_cast<base::InvokeQueuedEvent*>(e)->invoke();
 		return true;
+	} else if (receiver == this) {
+		if (type == QEvent::ApplicationDeactivate) {
+			if (Ui::Platform::SkipApplicationDeactivateEvent()) {
+				return true;
+			}
+		} else if (type == QEvent::ApplicationActivate) {
+			Ui::Platform::GotApplicationActivateEvent();
+		}
 	}
 	return QApplication::notify(receiver, e);
 }
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d04a38e15..8db6dcf12 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d04a38e15d957ab0dacfe825396c199541097443
+Subproject commit 8db6dcf125da5c767d36a696794d4a51d82c7955

From 2664d984d9786db268a1d440ad4059a4e24443c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 23:01:27 +0400
Subject: [PATCH 388/676] Ignore wrong wheel direction in ElasticScroll.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 8db6dcf12..b6cb6cb77 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 8db6dcf125da5c767d36a696794d4a51d82c7955
+Subproject commit b6cb6cb770236a49bffdf572427faa477f00ccc0

From ebd8380019e7befd922bd77fe36c5935179939d8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 23:17:08 +0400
Subject: [PATCH 389/676] Use correct reply placeholder in stories view.

---
 Telegram/Resources/langs/lang.strings                    | 1 +
 .../view/controls/history_view_compose_controls.cpp      | 9 +++++++--
 .../view/controls/history_view_compose_controls.h        | 2 ++
 .../SourceFiles/media/stories/media_stories_reply.cpp    | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 81a75e5a6..68a00520e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2044,6 +2044,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_broadcast_ph" = "Broadcast a message...";
 "lng_broadcast_silent_ph" = "Silent broadcast...";
 "lng_send_anonymous_ph" = "Send anonymously...";
+"lng_story_reply_ph" = "Reply privately...";
 "lng_send_text_no" = "Text not allowed.";
 "lng_send_text_no_about" = "The admins of this group only allow sending {types}.";
 "lng_send_text_type_and_last" = "{types} and {last}";
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 089767c2c..e1b32aa7d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -971,12 +971,15 @@ ComposeControls::ComposeControls(
 , _tabbedSelectorToggle(Ui::CreateChild<Ui::EmojiButton>(
 	_wrap.get(),
 	_st.emoji))
+, _fieldCustomPlaceholder(std::move(descriptor.customPlaceholder))
 , _field(
 	Ui::CreateChild<Ui::InputField>(
 		_wrap.get(),
 		_st.field,
 		Ui::InputField::Mode::MultiLine,
-		tr::lng_message_ph()))
+		(_fieldCustomPlaceholder
+			? rpl::duplicate(_fieldCustomPlaceholder)
+			: tr::lng_message_ph())))
 , _botCommandStart(_features.botCommandSend
 	? Ui::CreateChild<Ui::IconButton>(
 		_wrap.get(),
@@ -1816,7 +1819,9 @@ void ComposeControls::updateFieldPlaceholder() {
 	}
 
 	_field->setPlaceholder([&] {
-		if (isEditingMessage()) {
+		if (_fieldCustomPlaceholder) {
+			return rpl::duplicate(_fieldCustomPlaceholder);
+		} else if (isEditingMessage()) {
 			return tr::lng_edit_message_text();
 		} else if (!_history) {
 			return tr::lng_message_ph();
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 fa63a8b3d..518782954 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -102,6 +102,7 @@ struct ComposeControlsDescriptor {
 	SendMenu::Type sendMenuType = {};
 	Window::SessionController *regularWindow = nullptr;
 	rpl::producer<ChatHelpers::FileChosen> stickerOrEmojiChosen;
+	rpl::producer<QString> customPlaceholder;
 	bool voiceLockFromBottom = false;
 	ChatHelpers::ComposeFeatures features;
 };
@@ -353,6 +354,7 @@ private:
 	const not_null<Ui::IconButton*> _attachToggle;
 	std::unique_ptr<Ui::IconButton> _replaceMedia;
 	const not_null<Ui::EmojiButton*> _tabbedSelectorToggle;
+	rpl::producer<QString> _fieldCustomPlaceholder;
 	const not_null<Ui::InputField*> _field;
 	Ui::IconButton * const _botCommandStart = nullptr;
 	std::unique_ptr<Ui::SendAsButton> _sendAs;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index d032533b3..9fa53b529 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -85,6 +85,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 		.mode = HistoryView::ComposeControlsMode::Normal,
 		.sendMenuType = SendMenu::Type::SilentOnly,
 		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
+		.customPlaceholder = tr::lng_story_reply_ph(),
 		.voiceLockFromBottom = true,
 		.features = {
 			.sendAs = false,

From 8a974273b9f6b5377059423882a24325258a7ecd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 09:12:05 +0400
Subject: [PATCH 390/676] Fix possible crash in click handling.

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

diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index bbf6273c5..fa21af469 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -385,7 +385,7 @@ const SponsoredMessages::Entry *SponsoredMessages::find(
 	}
 	auto &list = it->second;
 	const auto entryIt = ranges::find_if(list.entries, [&](const Entry &e) {
-		return e.item->fullId() == fullId;
+		return e.item && e.item->fullId() == fullId;
 	});
 	if (entryIt == end(list.entries)) {
 		return nullptr;

From 91cc5f5284de4ccde0d63d42f7a95f58fc97a2cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 11:15:37 +0400
Subject: [PATCH 391/676] Fix small stories thumbnails in profile / my stories.

---
 .../SourceFiles/boxes/peer_list_controllers.cpp |  2 --
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp |  1 +
 .../dialogs/ui/dialogs_stories_list.cpp         | 17 +++++++++++++----
 .../dialogs/ui/dialogs_stories_list.h           |  8 ++++++--
 Telegram/SourceFiles/info/info_top_bar.cpp      |  5 ++---
 .../info/stories/info_stories_inner_widget.cpp  | 16 +++++++---------
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 2019f0c50..18d2d514f 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -104,8 +104,6 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 	controller->setStoriesShown(true);
 	const auto raw = controller.get();
 	auto init = [=](not_null<PeerListBox*> box) {
-		using namespace Dialogs::Stories;
-
 		struct State {
 			QPointer<::Ui::IconButton> toggleSort;
 			rpl::variable<Mode> mode = Mode::Online;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a994d4571..957589a90 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2697,6 +2697,7 @@ void Widget::updateControlsGeometry() {
 	if (_stories) {
 		_stories->setLayoutConstraints(
 			{ filterLeft + filterWidth, filterTop + added },
+			style::al_right,
 			{ 0, expandedStoriesTop, barw, st::dialogsStoriesFull.height });
 	}
 	if (_forumTopShadow) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 3b3917807..e7c0a6bfb 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -661,8 +661,12 @@ bool List::checkForFullState() {
 	return true;
 }
 
-void List::setLayoutConstraints(QPoint topRightSmall, QRect geometryFull) {
-	_topRightSmall = topRightSmall;
+void List::setLayoutConstraints(
+		QPoint positionSmall,
+		style::align alignSmall,
+		QRect geometryFull) {
+	_positionSmall = positionSmall;
+	_alignSmall = alignSmall;
 	_geometryFull = geometryFull;
 	updateGeometry();
 	update();
@@ -690,9 +694,14 @@ QRect List::countSmallGeometry() const {
 		+ st.photo + (count - 1) * st.shift
 		+ st.photoLeft
 		+ st.left;
+	const auto left = ((_alignSmall & Qt::AlignRight) == Qt::AlignRight)
+		? (_positionSmall.x() - width)
+		: ((_alignSmall & Qt::AlignCenter) == Qt::AlignCenter)
+		? (_positionSmall.x() - (width / 2))
+		: _positionSmall.x();
 	return QRect(
-		_topRightSmall.x() - width,
-		_topRightSmall.y(),
+		left,
+		_positionSmall.y(),
 		width,
 		st.photoTop + st.photo + st.photoTop);
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 7e0028822..85d7fd5e8 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -66,7 +66,10 @@ public:
 		rpl::producer<Content> content);
 
 	void setExpandedHeight(int height, bool momentum = false);
-	void setLayoutConstraints(QPoint topRightSmall, QRect geometryFull);
+	void setLayoutConstraints(
+		QPoint positionSmall,
+		style::align alignSmall,
+		QRect geometryFull = QRect());
 
 	[[nodiscard]] bool empty() const {
 		return _empty.current();
@@ -137,7 +140,8 @@ private:
 	rpl::event_stream<> _entered;
 	rpl::event_stream<> _loadMoreRequests;
 
-	QPoint _topRightSmall;
+	QPoint _positionSmall;
+	style::align _alignSmall = {};
 	QRect _geometryFull;
 	QRect _changingGeometryFrom;
 	State _state = State::Small;
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 81f4dd685..7dcb56ab3 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -389,11 +389,10 @@ void TopBar::updateStoriesGeometry(int newWidth) {
 	}
 	const auto left = (_back ? _st.back.width : _st.titlePosition.x())
 		- st::dialogsStories.left - st::dialogsStories.photoLeft;
-	const auto top = st::dialogsStories.height
-		- st::dialogsStoriesFull.height
-		+ (_st.height - st::dialogsStories.height) / 2;
+	const auto top = (_st.height - st::dialogsStories.height) / 2;
 	_stories->resizeToWidth(newWidth - left - right);
 	_stories->moveToLeft(left, top, newWidth);
+	_stories->entity()->setLayoutConstraints({ 0, 0 }, style::al_left);
 }
 
 void TopBar::paintEvent(QPaintEvent *e) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 8abc39d8d..49bb41022 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -179,19 +179,17 @@ void InnerWidget::createButtons() {
 		if (content.elements.empty()) {
 			return;
 		}
-		const auto width = st::defaultDialogRow.padding.left()
-			+ st::defaultDialogRow.photoSize
-			+ st::defaultDialogRow.padding.left();
 		const auto &small = st::dialogsStories;
 		const auto count = int(content.elements.size());
 		const auto smallWidth = small.photo + (count - 1) * small.shift;
 		const auto real = smallWidth;
-		const auto top = st::dialogsStories.height
-			- st::dialogsStoriesFull.height
-			+ (size.height() - st::dialogsStories.height) / 2;
-		const auto right = st::settingsButtonRightSkip - (width - real) / 2;
-		thumbs->resizeToWidth(width);
-		thumbs->moveToRight(right, top);
+		const auto height = small.photo + 2 * small.photoTop;
+		const auto top = (size.height() - height) / 2;
+		const auto right = st::settingsButtonRightSkip
+			- small.left
+			- small.photoLeft;
+		const auto left = size.width() - right;
+		thumbs->setLayoutConstraints({ left, top }, style::al_right);
 	}, thumbs->lifetime());
 	thumbs->setAttribute(Qt::WA_TransparentForMouseEvents);
 	recent->addClickHandler([=] {

From 21a5e26250957ea4c3ededfd801062eeb6a4fd08 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 12:39:18 +0400
Subject: [PATCH 392/676] Add current stories label to profile top bar.

---
 Telegram/SourceFiles/info/info_top_bar.cpp | 93 ++++++++++++++++------
 Telegram/SourceFiles/info/info_top_bar.h   |  4 +-
 2 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 7dcb56ab3..f15a6b549 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -124,6 +124,9 @@ void TopBar::enableBackButton() {
 	if (_title) {
 		_title->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
+	if (_storiesWrap) {
+		_storiesWrap->raise();
+	}
 	updateControlsGeometry(width());
 }
 
@@ -387,12 +390,16 @@ void TopBar::updateStoriesGeometry(int newWidth) {
 		button->moveToRight(right, 0, newWidth);
 		right += button->width();
 	}
-	const auto left = (_back ? _st.back.width : _st.titlePosition.x())
-		- st::dialogsStories.left - st::dialogsStories.photoLeft;
-	const auto top = (_st.height - st::dialogsStories.height) / 2;
-	_stories->resizeToWidth(newWidth - left - right);
-	_stories->moveToLeft(left, top, newWidth);
-	_stories->entity()->setLayoutConstraints({ 0, 0 }, style::al_left);
+	const auto &small = st::dialogsStories;
+	const auto wrapLeft = (_back ? _st.back.width : 0);
+	const auto left = _back
+		? 0
+		: (_st.titlePosition.x() - small.left - small.photoLeft);
+	const auto height = small.photo + 2 * small.photoTop;
+	const auto top = _st.titlePosition.y()
+		+ (_st.title.style.font->height - height) / 2;
+	_stories->setLayoutConstraints({ left, top }, style::al_left);
+	_storiesWrap->move(wrapLeft, 0);
 }
 
 void TopBar::paintEvent(QPaintEvent *e) {
@@ -447,36 +454,61 @@ void TopBar::updateControlsVisibility(anim::type animated) {
 
 void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 	_storiesLifetime.destroy();
+	delete _storiesWrap.data();
 	if (content) {
 		using namespace Dialogs::Stories;
 
 		auto last = std::move(
 			content
 		) | rpl::start_spawning(_storiesLifetime);
-		delete _stories;
 
-		const auto stories = Ui::CreateChild<Ui::FadeWrap<List>>(
-			this,
-			object_ptr<List>(
-				this,
-				st::dialogsStoriesListInfo,
-				rpl::duplicate(
-					last
-				) | rpl::filter([](const Content &content) {
-					return !content.elements.empty();
-				})),
-				st::infoTopBarScale);
+		_storiesWrap = _storiesLifetime.make_state<
+			Ui::FadeWrap<Ui::AbstractButton>
+		>(this, object_ptr<Ui::AbstractButton>(this), st::infoTopBarScale);
 		registerToggleControlCallback(
-			stories,
+			_storiesWrap.data(),
 			[this] { return _storiesCount > 0; });
-		stories->toggle(false, anim::type::instant);
-		stories->setDuration(st::infoTopBarDuration);
+		_storiesWrap->toggle(false, anim::type::instant);
+		_storiesWrap->setDuration(st::infoTopBarDuration);
+
+		const auto button = _storiesWrap->entity();
+		const auto stories = Ui::CreateChild<List>(
+			button,
+			st::dialogsStoriesListInfo,
+			rpl::duplicate(
+				last
+			) | rpl::filter([](const Content &content) {
+				return !content.elements.empty();
+			}));
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			button,
+			QString(),
+			_st.title);
+		stories->setAttribute(Qt::WA_TransparentForMouseEvents);
+		label->setAttribute(Qt::WA_TransparentForMouseEvents);
+		stories->geometryValue(
+		) | rpl::start_with_next([=](QRect geometry) {
+			const auto skip = _st.title.style.font->spacew;
+			label->move(
+				geometry.x() + geometry.width() + skip,
+				_st.titlePosition.y());
+		}, label->lifetime());
+		rpl::combine(
+			_storiesWrap->positionValue(),
+			label->geometryValue()
+		) | rpl::start_with_next([=] {
+			button->resize(
+				label->x() + label->width() + _st.titlePosition.x(),
+				_st.height);
+		}, button->lifetime());
+
 		_stories = stories;
-		_stories->entity()->clicks(
+		_stories->clicks(
 		) | rpl::start_to_stream(_storyClicks, _stories->lifetime());
-		if (_back) {
-			_back->raise();
-		}
+
+		button->setClickedCallback([=] {
+			_storyClicks.fire({});
+		});
 
 		rpl::duplicate(
 			last
@@ -489,9 +521,20 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 				if (was != now) {
 					updateControlsVisibility(anim::type::normal);
 				}
+				if (now) {
+					label->setText(
+						tr::lng_contacts_stories_status(
+							tr::now,
+							lt_count,
+							_storiesCount));
+				}
 				updateControlsGeometry(width());
 			}
 		}, _storiesLifetime);
+
+		_storiesLifetime.add([weak = QPointer<QWidget>(label)] {
+			delete weak.data();
+		});
 	} else {
 		_storiesCount = 0;
 	}
diff --git a/Telegram/SourceFiles/info/info_top_bar.h b/Telegram/SourceFiles/info/info_top_bar.h
index c41125904..496166954 100644
--- a/Telegram/SourceFiles/info/info_top_bar.h
+++ b/Telegram/SourceFiles/info/info_top_bar.h
@@ -28,6 +28,7 @@ class SessionNavigation;
 } // namespace Window
 
 namespace Ui {
+class AbstractButton;
 class IconButton;
 class FlatLabel;
 class InputField;
@@ -175,7 +176,8 @@ private:
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _toggleStoryPin;
 	rpl::event_stream<SelectionAction> _selectionActionRequests;
 
-	QPointer<Ui::FadeWrap<Dialogs::Stories::List>> _stories;
+	QPointer<Ui::FadeWrap<Ui::AbstractButton>> _storiesWrap;
+	QPointer<Dialogs::Stories::List> _stories;
 	rpl::lifetime _storiesLifetime;
 	int _storiesCount = 0;
 

From 7d98acb4a38948dfb040b892dbb629ef4d04cdc0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 13:37:13 +0400
Subject: [PATCH 393/676] Closed alpha version 4.8.4.3.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 6f1bf2f9b..d47902e9b 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.8.4.2" />
+    Version="4.8.4.3" />
   <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 03e4f6943..f3aa8d4f8 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,8,4,2
- PRODUCTVERSION 4,8,4,2
+ FILEVERSION 4,8,4,3
+ PRODUCTVERSION 4,8,4,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.4.2"
+            VALUE "FileVersion", "4.8.4.3"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.2"
+            VALUE "ProductVersion", "4.8.4.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index dd8f3c39a..4820d2c10 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,8,4,2
- PRODUCTVERSION 4,8,4,2
+ FILEVERSION 4,8,4,3
+ PRODUCTVERSION 4,8,4,3
  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.8.4.2"
+            VALUE "FileVersion", "4.8.4.3"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.2"
+            VALUE "ProductVersion", "4.8.4.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index b3dccc6e6..caff68b46 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004002ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004003ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index 3cbfb66f9..ed59e5ebe 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.8
 AppVersionStrSmall 4.8.4
 AppVersionStr      4.8.4
 BetaChannel        0
-AlphaVersion       4008004002
-AppVersionOriginal 4.8.4.2
+AlphaVersion       4008004003
+AppVersionOriginal 4.8.4.3

From 39a1743e7e392362fff7938bb4beb0be4714bc4d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 16:54:18 +0400
Subject: [PATCH 394/676] Fix overscroll in topics list.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 957589a90..bcf81a3b4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -226,9 +226,10 @@ Widget::Widget(
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
 	};
+	using OverscrollType = Ui::ElasticScroll::OverscrollType;
 	_scroll->setOverscrollTypes(
-		Ui::ElasticScroll::OverscrollType::Virtual,
-		Ui::ElasticScroll::OverscrollType::Real);
+		_stories ? OverscrollType::Virtual : OverscrollType::Real,
+		OverscrollType::Real);
 	_inner = _scroll->setOwnedWidget(object_ptr<InnerWidget>(
 		this,
 		controller,

From 5d234d31035285b9e34a35c9d78103523827c87d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 19:33:57 +0400
Subject: [PATCH 395/676] Update API scheme on layer 160.

---
 .../SourceFiles/api/api_global_privacy.cpp    | 33 +++++++++++++++----
 Telegram/SourceFiles/api/api_global_privacy.h | 12 +++++++
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  4 +--
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_global_privacy.cpp b/Telegram/SourceFiles/api/api_global_privacy.cpp
index c940dbe86..89e1d57da 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_global_privacy.cpp
@@ -56,6 +56,15 @@ rpl::producer<bool> GlobalPrivacy::archiveAndMute() const {
 	return _archiveAndMute.value();
 }
 
+UnarchiveOnNewMessage GlobalPrivacy::unarchiveOnNewMessageCurrent() const {
+	return _unarchiveOnNewMessage.current();
+}
+
+auto GlobalPrivacy::unarchiveOnNewMessage() const
+-> rpl::producer<UnarchiveOnNewMessage> {
+	return _unarchiveOnNewMessage.value();
+}
+
 rpl::producer<bool> GlobalPrivacy::showArchiveAndMute() const {
 	using namespace rpl::mappers;
 
@@ -78,11 +87,20 @@ void GlobalPrivacy::dismissArchiveAndMuteSuggestion() {
 void GlobalPrivacy::update(bool archiveAndMute) {
 	using Flag = MTPDglobalPrivacySettings::Flag;
 
+	const auto unarchive = unarchiveOnNewMessageCurrent();
 	_api.request(_requestId).cancel();
+	const auto flags = Flag()
+		| (archiveAndMute
+			? Flag::f_archive_and_mute_new_noncontact_peers
+			: Flag())
+		| (unarchive == UnarchiveOnNewMessage::AnyUnmuted
+			? Flag::f_keep_archived_unmuted
+			: Flag())
+		| (unarchive != UnarchiveOnNewMessage::None
+			? Flag::f_keep_archived_folders
+			: Flag());
 	_requestId = _api.request(MTPaccount_SetGlobalPrivacySettings(
-		MTP_globalPrivacySettings(
-			MTP_flags(Flag::f_archive_and_mute_new_noncontact_peers),
-			MTP_bool(archiveAndMute))
+		MTP_globalPrivacySettings(MTP_flags(flags))
 	)).done([=](const MTPGlobalPrivacySettings &result) {
 		_requestId = 0;
 		apply(result);
@@ -94,9 +112,12 @@ void GlobalPrivacy::update(bool archiveAndMute) {
 
 void GlobalPrivacy::apply(const MTPGlobalPrivacySettings &data) {
 	data.match([&](const MTPDglobalPrivacySettings &data) {
-		_archiveAndMute = data.varchive_and_mute_new_noncontact_peers()
-			? mtpIsTrue(*data.varchive_and_mute_new_noncontact_peers())
-			: false;
+		_archiveAndMute = data.is_archive_and_mute_new_noncontact_peers();
+		_unarchiveOnNewMessage = data.is_keep_archived_unmuted()
+			? UnarchiveOnNewMessage::AnyUnmuted
+			: data.is_keep_archived_folders()
+			? UnarchiveOnNewMessage::NotInFoldersUnmuted
+			: UnarchiveOnNewMessage::None;
 	});
 }
 
diff --git a/Telegram/SourceFiles/api/api_global_privacy.h b/Telegram/SourceFiles/api/api_global_privacy.h
index a1a693499..f569951ca 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.h
+++ b/Telegram/SourceFiles/api/api_global_privacy.h
@@ -17,6 +17,12 @@ class Session;
 
 namespace Api {
 
+enum class UnarchiveOnNewMessage {
+	None,
+	NotInFoldersUnmuted,
+	AnyUnmuted,
+};
+
 class GlobalPrivacy final {
 public:
 	explicit GlobalPrivacy(not_null<ApiWrap*> api);
@@ -26,6 +32,10 @@ public:
 
 	[[nodiscard]] bool archiveAndMuteCurrent() const;
 	[[nodiscard]] rpl::producer<bool> archiveAndMute() const;
+	[[nodiscard]] auto unarchiveOnNewMessageCurrent() const
+		-> UnarchiveOnNewMessage;
+	[[nodiscard]] auto unarchiveOnNewMessage() const
+		-> rpl::producer<UnarchiveOnNewMessage>;
 	[[nodiscard]] rpl::producer<bool> showArchiveAndMute() const;
 	[[nodiscard]] rpl::producer<> suggestArchiveAndMute() const;
 	void dismissArchiveAndMuteSuggestion();
@@ -37,6 +47,8 @@ private:
 	MTP::Sender _api;
 	mtpRequestId _requestId = 0;
 	rpl::variable<bool> _archiveAndMute = false;
+	rpl::variable<UnarchiveOnNewMessage> _unarchiveOnNewMessage
+		= UnarchiveOnNewMessage::None;
 	rpl::variable<bool> _showArchiveAndMute = false;
 	std::vector<Fn<void()>> _callbacks;
 
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index b8771b61c..18c9bcd5b 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1238,7 +1238,7 @@ statsGroupTopInviter#535f779d user_id:long invitations:int = StatsGroupTopInvite
 
 stats.megagroupStats#ef7ff916 period:StatsDateRangeDays members:StatsAbsValueAndPrev messages:StatsAbsValueAndPrev viewers:StatsAbsValueAndPrev posters:StatsAbsValueAndPrev growth_graph:StatsGraph members_graph:StatsGraph new_members_by_source_graph:StatsGraph languages_graph:StatsGraph messages_graph:StatsGraph actions_graph:StatsGraph top_hours_graph:StatsGraph weekdays_graph:StatsGraph top_posters:Vector<StatsGroupTopPoster> top_admins:Vector<StatsGroupTopAdmin> top_inviters:Vector<StatsGroupTopInviter> users:Vector<User> = stats.MegagroupStats;
 
-globalPrivacySettings#bea2f424 flags:# archive_and_mute_new_noncontact_peers:flags.0?Bool = GlobalPrivacySettings;
+globalPrivacySettings#734c4ccb flags:# archive_and_mute_new_noncontact_peers:flags.0?true keep_archived_unmuted:flags.1?true keep_archived_folders:flags.2?true = GlobalPrivacySettings;
 
 help.countryCode#4203c5ef flags:# country_code:string prefixes:flags.0?Vector<string> patterns:flags.1?Vector<string> = help.CountryCode;
 
@@ -1529,7 +1529,7 @@ sponsoredWebPage#3db8ec63 flags:# url:string site_name:string photo:flags.0?Phot
 storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long> = StoryViews;
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
-storyItemSkipped#693206a2 id:int date:int expire_date:int = StoryItem;
+storyItemSkipped#ffadc913 flags:# close_friends:flags.8?true id:int date:int expire_date:int = StoryItem;
 storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;

From 5368507259d3c2ee31a174b356964f3b1a54f2e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 20:49:08 +0400
Subject: [PATCH 396/676] Improve lock/unlock icon behavior.

---
 Telegram/SourceFiles/dialogs/dialogs.style    | 17 ++---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 49 +++++++++++--
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  1 +
 .../dialogs/ui/dialogs_stories_list.cpp       | 69 +++++++++++++------
 .../dialogs/ui/dialogs_stories_list.h         |  8 +++
 5 files changed, 111 insertions(+), 33 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 6a20b6cf7..d8b405e7c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -221,19 +221,20 @@ dialogsMenuToggleUnreadMuted: icon {
 dialogsLock: IconButton(dialogsMenuToggle) {
 	icon: icon {{ "dialogs/dialogs_lock", dialogsMenuIconFg }};
 	iconOver: icon {{ "dialogs/dialogs_lock", dialogsMenuIconFgOver }};
+	ripple: emptyRippleAnimation;
 }
 dialogsUnlockIcon: icon {{ "dialogs/dialogs_unlock", dialogsMenuIconFg }};
 dialogsUnlockIconOver: icon {{ "dialogs/dialogs_unlock", dialogsMenuIconFgOver }};
 dialogsCalendar: IconButton {
-	width: 29px;
-	height: 32px;
+	width: 32px;
+	height: 35px;
 
 	icon: icon {{ "dialogs/dialogs_calendar", dialogsMenuIconFg }};
 	iconOver: icon {{ "dialogs/dialogs_calendar", dialogsMenuIconFgOver }};
-	iconPosition: point(0px, 5px);
+	iconPosition: point(1px, 6px);
 }
 dialogsSearchFrom: IconButton(dialogsCalendar) {
-	width: 26px;
+	width: 29px;
 	icon: icon {{ "dialogs/dialogs_search_from", dialogsMenuIconFg }};
 	iconOver: icon {{ "dialogs/dialogs_search_from", dialogsMenuIconFgOver }};
 }
@@ -276,12 +277,12 @@ dialogsCancelSearchInPeer: IconButton(dialogsMenuToggle) {
 	rippleAreaSize: 34px;
 }
 dialogsCancelSearch: CrossButton {
-	width: 32px;
-	height: 32px;
+	width: 35px;
+	height: 35px;
 
 	cross: CrossAnimation {
-		size: 32px;
-		skip: 10px;
+		size: 35px;
+		skip: 12px;
 		stroke: 1.5;
 		minScale: 0.3;
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index bcf81a3b4..984d5b647 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -814,14 +814,20 @@ void Widget::setupStories() {
 		using Phase = Ui::ElasticScrollMovement;
 		_stories->setExpandedHeight(
 			_aboveScrollAdded,
-			(movement == Phase::Momentum || movement == Phase::Returning)
-				&& (explicitlyExpanded < above));
+			((movement == Phase::Momentum || movement == Phase::Returning)
+				&& (explicitlyExpanded < above)));
 		if (position.overscroll > 0
 			|| (position.value
 				> (_storiesExplicitExpandScrollTop
 					+ st::dialogsRowHeight))) {
 			storiesToggleExplicitExpand(false);
 		}
+		updateLockUnlockPosition();
+	}, lifetime());
+
+	_stories->collapsedGeometryChanged(
+	) | rpl::start_with_next([=] {
+		updateLockUnlockPosition();
 	}, lifetime());
 
 	_stories->clicks(
@@ -857,6 +863,10 @@ void Widget::setupStories() {
 	_stories->emptyValue() | rpl::skip(1) | rpl::start_with_next([=] {
 		updateStoriesVisibility();
 	}, lifetime());
+
+	_stories->widthValue() | rpl::start_with_next([=] {
+		updateLockUnlockPosition();
+	}, lifetime());
 }
 
 void Widget::storiesToggleExplicitExpand(bool expand) {
@@ -977,6 +987,23 @@ void Widget::updateControlsVisibility(bool fast) {
 	if (_childList && _filter->hasFocus()) {
 		setInnerFocus();
 	}
+	updateLockUnlockPosition();
+}
+
+void Widget::updateLockUnlockPosition() {
+	if (_lockUnlock->isHidden()) {
+		return;
+	}
+	const auto stories = (_stories && !_stories->isHidden())
+		? _stories->collapsedGeometryCurrent()
+		: Stories::List::CollapsedGeometry();
+	const auto simple = _filter->x() + _filter->width();
+	const auto right = stories.geometry.isEmpty()
+		? simple
+		: anim::interpolate(stories.geometry.x(), simple, stories.expanded);
+	_lockUnlock->move(
+		right - _lockUnlock->width(),
+		st::dialogsFilterPadding.y());
 }
 
 void Widget::changeOpenedSubsection(
@@ -1388,6 +1415,8 @@ void Widget::updateStoriesVisibility() {
 		if (_aboveScrollAdded > 0 && _updateScrollGeometryCached) {
 			_updateScrollGeometryCached();
 		}
+		updateLockUnlockVisibility();
+		updateLockUnlockPosition();
 	}
 }
 
@@ -2253,6 +2282,7 @@ void Widget::applyFilterUpdate(bool force) {
 	_cancelSearch->toggle(!filterText.isEmpty(), anim::type::normal);
 	updateLoadMoreChatsVisibility();
 	updateJumpToDateVisibility();
+	updateLockUnlockPosition();
 
 	if (filterText.isEmpty()) {
 		_peerSearchCache.clear();
@@ -2458,6 +2488,7 @@ bool Widget::setSearchInChat(Key chat, PeerData *from) {
 		updateSearchFromVisibility();
 		clearSearchCache();
 	}
+	updateLockUnlockPosition();
 	if (_searchInChat && _layout == Layout::Main) {
 		controller()->closeFolder();
 	}
@@ -2580,9 +2611,18 @@ void Widget::updateLockUnlockVisibility() {
 	if (_showAnimation) {
 		return;
 	}
-	const auto hidden = !session().domain().local().hasLocalPasscode();
+	const auto hidden = !session().domain().local().hasLocalPasscode()
+		|| (_showAnimation != nullptr)
+		|| _openedForum
+		|| !_widthAnimationCache.isNull()
+		|| _childList
+		|| !_filter->getLastText().isEmpty()
+		|| _searchInChat;
 	if (_lockUnlock->isHidden() != hidden) {
 		_lockUnlock->setVisible(!hidden);
+		if (!hidden) {
+			updateLockUnlockPosition();
+		}
 		updateControlsGeometry();
 	}
 }
@@ -2685,7 +2725,6 @@ void Widget::updateControlsGeometry() {
 	_searchForNarrowFilters->moveToLeft(searchLeft, st::dialogsFilterPadding.y());
 
 	auto right = filterLeft + filterWidth;
-	_lockUnlock->moveToLeft(right + st::dialogsFilterPadding.x(), st::dialogsFilterPadding.y());
 	_cancelSearch->moveToLeft(right - _cancelSearch->width(), _filter->y());
 	right -= _jumpToDate->width(); _jumpToDate->moveToLeft(right, _filter->y());
 	right -= _chooseFromUser->width(); _chooseFromUser->moveToLeft(right, _filter->y());
@@ -2709,6 +2748,8 @@ void Widget::updateControlsGeometry() {
 			st::lineWidth);
 	}
 
+	updateLockUnlockPosition();
+
 	auto bottomSkip = 0;
 	const auto putBottomButton = [&](auto &button) {
 		if (button && !button->isHidden()) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 245998392..48760b630 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -224,6 +224,7 @@ private:
 	void updateScrollUpVisibility();
 	void startScrollUpButtonAnimation(bool shown);
 	void updateScrollUpPosition();
+	void updateLockUnlockPosition();
 
 	MTP::Sender _api;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index e7c0a6bfb..685cc767d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtWidgets/QApplication>
 
+#include "base/debug_log.h"
+
 namespace Dialogs::Stories {
 namespace {
 
@@ -36,6 +38,7 @@ constexpr auto kExpandCatchUpDuration = crl::time(200);
 
 struct List::Layout {
 	int itemsCount = 0;
+	QPointF geometryShift;
 	float64 expandedRatio = 0.;
 	float64 ratio = 0.;
 	float64 thumbnailLeft = 0.;
@@ -147,12 +150,13 @@ rpl::producer<> List::loadMoreRequests() const {
 void List::requestExpanded(bool expanded) {
 	if (_expanded != expanded) {
 		_expanded = expanded;
-		_expandedAnimation.start(
-			[=] { checkForFullState(); update(); },
-			_expanded ? 0. : 1.,
-			_expanded ? 1. : 0.,
-			st::slideWrapDuration,
-			anim::sineInOut);
+		const auto from = _expanded ? 0. : 1.;
+		const auto till = _expanded ? 1. : 0.;
+		_expandedAnimation.start([=] {
+			checkForFullState();
+			update();
+			_collapsedGeometryChanged.fire({});
+		}, from, till, st::slideWrapDuration, anim::sineInOut);
 	}
 	_toggleExpandedRequests.fire_copy(_expanded);
 }
@@ -185,13 +189,15 @@ void List::updateExpanding(int expandingHeight, int expandedHeight) {
 }
 
 List::Layout List::computeLayout() {
+	updateExpanding(
+		_lastExpandedHeight * _expandCatchUpAnimation.value(1.),
+		_st.full.height);
+	return computeLayout(_expandedAnimation.value(_expanded ? 1. : 0.));
+}
+
+List::Layout List::computeLayout(float64 expanded) const {
 	const auto &st = _st.small;
 	const auto &full = _st.full;
-	const auto use = _lastExpandedHeight
-		* _expandCatchUpAnimation.value(1.);
-	updateExpanding(use, full.height);
-
-	const auto expanded = _expandedAnimation.value(_expanded ? 1. : 0.);
 	const auto expandedRatio = _lastRatio;
 	const auto collapsedRatio = expandedRatio * kFrictionRatio;
 	const auto ratio = expandedRatio * expanded
@@ -234,6 +240,13 @@ List::Layout List::computeLayout() {
 	const auto photoLeft = lerp(st.photoLeft, full.photoLeft);
 	return Layout{
 		.itemsCount = itemsCount,
+		.geometryShift = QPointF(
+			(_state == State::Changing
+				? (lerp(_changingGeometryFrom.x(), _geometryFull.x()) - x())
+				: 0.),
+			(_state == State::Changing
+				? (lerp(_changingGeometryFrom.y(), _geometryFull.y()) - y())
+				: 0.)),
 		.expandedRatio = expandedRatio,
 		.ratio = ratio,
 		.thumbnailLeft = thumbnailLeft,
@@ -287,15 +300,7 @@ void List::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
 	if (_state == State::Changing) {
-		const auto left = anim::interpolate(
-			_changingGeometryFrom.x(),
-			_geometryFull.x(),
-			layout.ratio);
-		const auto top = anim::interpolate(
-			_changingGeometryFrom.y(),
-			_geometryFull.y(),
-			layout.ratio);
-		p.translate(QPoint(left, top) - pos());
+		p.translate(layout.geometryShift);
 	}
 
 	const auto drawSmall = (expandRatio < 1.);
@@ -672,6 +677,28 @@ void List::setLayoutConstraints(
 	update();
 }
 
+List::CollapsedGeometry List::collapsedGeometryCurrent() const {
+	const auto expanded = _expandedAnimation.value(_expanded ? 1. : 0.);
+	if (expanded == 1.) {
+		return { QRect(), 1. };
+	}
+	const auto layout = computeLayout(0.);
+	const auto small = countSmallGeometry();
+	const auto index = layout.smallSkip - layout.startIndexSmall;
+	const auto shift = x() + layout.geometryShift.x();
+	const auto left = int(base::SafeRound(
+		shift + layout.left + layout.single * index));
+	const auto width = small.x() + small.width() - left;
+	return {
+		QRect(left, small.y(), width, small.height()),
+		expanded,
+	};
+}
+
+rpl::producer<> List::collapsedGeometryChanged() const {
+	return _collapsedGeometryChanged.events();
+}
+
 void List::updateGeometry() {
 	switch (_state) {
 	case State::Small: setGeometry(countSmallGeometry()); break;
@@ -686,7 +713,7 @@ void List::updateGeometry() {
 
 QRect List::countSmallGeometry() const {
 	const auto &st = _st.small;
-	const auto layout = const_cast<List*>(this)->computeLayout();
+	const auto layout = computeLayout(0.);
 	const auto count = layout.endIndexSmall
 		- std::max(layout.startIndexSmall, layout.smallSkip);
 	const auto width = st.left
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 85d7fd5e8..d0ecc1428 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -70,6 +70,12 @@ public:
 		QPoint positionSmall,
 		style::align alignSmall,
 		QRect geometryFull = QRect());
+	struct CollapsedGeometry {
+		QRect geometry;
+		float64 expanded = 0.;
+	};
+	[[nodiscard]] CollapsedGeometry collapsedGeometryCurrent() const;
+	[[nodiscard]] rpl::producer<> collapsedGeometryChanged() const;
 
 	[[nodiscard]] bool empty() const {
 		return _empty.current();
@@ -130,6 +136,7 @@ private:
 	void updateExpanding(int expandingHeight, int expandedHeight);
 
 	[[nodiscard]] Layout computeLayout();
+	[[nodiscard]] Layout computeLayout(float64 expanded) const;
 
 	const style::DialogsStoriesList &_st;
 	Content _content;
@@ -139,6 +146,7 @@ private:
 	rpl::event_stream<bool> _toggleExpandedRequests;
 	rpl::event_stream<> _entered;
 	rpl::event_stream<> _loadMoreRequests;
+	rpl::event_stream<> _collapsedGeometryChanged;
 
 	QPoint _positionSmall;
 	style::align _alignSmall = {};

From ac136638a4ebb2a204305039e1f85f01eda10317 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 20:51:14 +0400
Subject: [PATCH 397/676] Closed alpha version 4.8.4.4.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index d47902e9b..1553b95ad 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.8.4.3" />
+    Version="4.8.4.4" />
   <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 f3aa8d4f8..1c0a03179 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,8,4,3
- PRODUCTVERSION 4,8,4,3
+ FILEVERSION 4,8,4,4
+ PRODUCTVERSION 4,8,4,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.4.3"
+            VALUE "FileVersion", "4.8.4.4"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.3"
+            VALUE "ProductVersion", "4.8.4.4"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 4820d2c10..87a38fb0b 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,8,4,3
- PRODUCTVERSION 4,8,4,3
+ FILEVERSION 4,8,4,4
+ PRODUCTVERSION 4,8,4,4
  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.8.4.3"
+            VALUE "FileVersion", "4.8.4.4"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.3"
+            VALUE "ProductVersion", "4.8.4.4"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index caff68b46..79690f889 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004003ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004004ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index ed59e5ebe..8b47580b7 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.8
 AppVersionStrSmall 4.8.4
 AppVersionStr      4.8.4
 BetaChannel        0
-AlphaVersion       4008004003
-AppVersionOriginal 4.8.4.3
+AlphaVersion       4008004004
+AppVersionOriginal 4.8.4.4

From 74014d18a52b586d6e78f7dd1eff2e0251ba2d3b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 13 Jul 2023 21:23:30 +0400
Subject: [PATCH 398/676] Fix build with GCC.

---
 .../SourceFiles/info/stories/info_stories_inner_widget.cpp     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 49bb41022..7c572746d 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -180,9 +180,6 @@ void InnerWidget::createButtons() {
 			return;
 		}
 		const auto &small = st::dialogsStories;
-		const auto count = int(content.elements.size());
-		const auto smallWidth = small.photo + (count - 1) * small.shift;
-		const auto real = smallWidth;
 		const auto height = small.photo + 2 * small.photoTop;
 		const auto top = (size.height() - height) / 2;
 		const auto right = st::settingsButtonRightSkip

From 3c28e7b5851fdd808994df0e7564626fb4568960 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 11:24:13 +0400
Subject: [PATCH 399/676] Mark as read recent stories in profile top bar.

---
 Telegram/SourceFiles/data/data_changes.h      | 45 ++++++++++---------
 Telegram/SourceFiles/data/data_stories.cpp    |  5 ++-
 .../dialogs/ui/dialogs_stories_content.cpp    | 34 +++++++++++++-
 3 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index 754f12ef3..3f0e587dd 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -148,19 +148,19 @@ struct TopicUpdate {
 	enum class Flag : uint32 {
 		None = 0,
 
-		UnreadView = (1U << 1),
-		UnreadMentions = (1U << 2),
+		UnreadView      = (1U << 1),
+		UnreadMentions  = (1U << 2),
 		UnreadReactions = (1U << 3),
-		Notifications = (1U << 4),
-		Title = (1U << 5),
-		IconId = (1U << 6),
-		ColorId = (1U << 7),
-		CloudDraft = (1U << 8),
-		Closed = (1U << 9),
-		Creator = (1U << 10),
-		Destroyed = (1U << 11),
+		Notifications   = (1U << 4),
+		Title           = (1U << 5),
+		IconId          = (1U << 6),
+		ColorId         = (1U << 7),
+		CloudDraft      = (1U << 8),
+		Closed          = (1U << 9),
+		Creator         = (1U << 10),
+		Destroyed       = (1U << 11),
 
-		LastUsedBit = (1U << 11),
+		LastUsedBit     = (1U << 11),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
@@ -199,14 +199,14 @@ struct EntryUpdate {
 	enum class Flag : uint32 {
 		None = 0,
 
-		Repaint = (1U << 0),
+		Repaint           = (1U << 0),
 		HasPinnedMessages = (1U << 1),
-		ForwardDraft = (1U << 2),
-		LocalDraftSet = (1U << 3),
-		Height = (1U << 4),
-		Destroyed = (1U << 5),
+		ForwardDraft      = (1U << 2),
+		LocalDraftSet     = (1U << 3),
+		Height            = (1U << 4),
+		Destroyed         = (1U << 5),
 
-		LastUsedBit = (1U << 5),
+		LastUsedBit       = (1U << 5),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
@@ -220,12 +220,13 @@ struct StoryUpdate {
 	enum class Flag : uint32 {
 		None = 0,
 
-		Edited = (1U << 0),
-		Destroyed = (1U << 1),
-		NewAdded = (1U << 2),
-		ViewsAdded = (1U << 3),
+		Edited      = (1U << 0),
+		Destroyed   = (1U << 1),
+		NewAdded    = (1U << 2),
+		ViewsAdded  = (1U << 3),
+		MarkRead    = (1U << 4),
 
-		LastUsedBit = (1U << 3),
+		LastUsedBit = (1U << 4),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index add13494f..19ff73eb2 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -928,7 +928,10 @@ bool Stories::bumpReadTill(PeerId peerId, StoryId maxReadTill) {
 			refreshItems = ranges::make_subrange(
 				i->second.lower_bound(from + 1),
 				i->second.lower_bound(till + 1)
-			) | ranges::views::transform([](const auto &pair) {
+			) | ranges::views::transform([=](const auto &pair) {
+				_owner->session().changes().storyUpdated(
+					pair.second.get(),
+					StoryUpdate::Flag::MarkRead);
 				return pair.first;
 			}) | ranges::to_vector;
 		}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index 2f6c55dd1..ed723b55e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -402,17 +402,25 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 		}
 		return rpl::make_producer<Content>([=](auto consumer) {
 			auto lifetime = rpl::lifetime();
+			if (ids.empty()) {
+				consumer.put_next(Content());
+				consumer.put_done();
+				return lifetime;
+			}
 
 			struct State {
 				Fn<void()> check;
 				base::has_weak_ptr guard;
+				int readTill = StoryId();
 				bool pushed = false;
 			};
 			const auto state = lifetime.make_state<State>();
+			state->readTill = readTill;
 			state->check = [=] {
 				if (state->pushed) {
 					return;
 				}
+				auto done = true;
 				auto resolving = false;
 				auto result = Content{};
 				for (const auto id : ids) {
@@ -420,13 +428,17 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 					const auto maybe = stories->lookup(storyId);
 					if (maybe) {
 						if (!resolving) {
+							const auto unread = (id > state->readTill);
 							result.elements.reserve(ids.size());
 							result.elements.push_back({
 								.id = uint64(id),
 								.thumbnail = MakeStoryThumbnail(*maybe),
 								.count = 1U,
-								.unreadCount = (id > readTill) ? 1U : 0U,
+								.unreadCount = unread ? 1U : 0U,
 							});
+							if (unread) {
+								done = false;
+							}
 						}
 					} else if (maybe.error() == Data::NoStory::Unknown) {
 						resolving = true;
@@ -440,12 +452,30 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 				}
 				state->pushed = true;
 				consumer.put_next(std::move(result));
-				consumer.put_done();
+				if (done) {
+					consumer.put_done();
+				}
 			};
+
 			rpl::single(peerId) | rpl::then(
 				stories->itemsChanged() | rpl::filter(_1 == peerId)
 			) | rpl::start_with_next(state->check, lifetime);
 
+			stories->session().changes().storyUpdates(
+				Data::StoryUpdate::Flag::MarkRead
+			) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+				if (update.story->peer()->id == peerId) {
+					if (update.story->id() > state->readTill) {
+						state->readTill = update.story->id();
+						if (ranges::contains(ids, state->readTill)
+							|| state->readTill > ids.front()) {
+							state->pushed = false;
+							state->check();
+						}
+					}
+				}
+			}, lifetime);
+
 			return lifetime;
 		});
 	}) | rpl::flatten_latest();

From 10f65c63e7f6aa3ef08f174b29f3fbfe68e035c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 12:02:04 +0400
Subject: [PATCH 400/676] Allow opening unknown stories from chats list.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 22 +++++++++++++++----
 Telegram/SourceFiles/data/data_stories.h      |  8 +++++--
 .../window/window_session_controller.cpp      | 13 +++++++++--
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 19ff73eb2..20db4a13a 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -196,21 +196,34 @@ Story *Stories::applyFromWebpage(PeerId peerId, const MTPstoryItem &story) {
 	return value ? value->get() : nullptr;
 }
 
-void Stories::requestUserStories(not_null<UserData*> user) {
-	if (!_requestingUserStories.emplace(user).second) {
+void Stories::requestUserStories(
+		not_null<UserData*> user,
+		Fn<void()> done) {
+	const auto [i, ok] = _requestingUserStories.emplace(user);
+	if (done) {
+		i->second.push_back(std::move(done));
+	}
+	if (!ok) {
 		return;
 	}
+	const auto finish = [=] {
+		if (const auto callbacks = _requestingUserStories.take(user)) {
+			for (const auto &callback : *callbacks) {
+				callback();
+			}
+		}
+	};
 	_owner->session().api().request(MTPstories_GetUserStories(
 		user->inputUser
 	)).done([=](const MTPstories_UserStories &result) {
-		_requestingUserStories.remove(user);
 		const auto &data = result.data();
 		_owner->processUsers(data.vusers());
 		parseAndApply(data.vstories());
+		finish();
 	}).fail([=] {
-		_requestingUserStories.remove(user);
 		applyDeletedFromSources(user->id, StorySourcesList::NotHidden);
 		applyDeletedFromSources(user->id, StorySourcesList::Hidden);
+		finish();
 	}).send();
 }
 
@@ -290,6 +303,7 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 	if (result.ids.empty()) {
 		applyDeletedFromSources(peerId, StorySourcesList::NotHidden);
 		applyDeletedFromSources(peerId, StorySourcesList::Hidden);
+		user->setStoriesState(UserData::StoriesState::None);
 		return;
 	} else if (user->isSelf()) {
 		result.readTill = result.ids.back().id;
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 2bdd27d1c..848227a5d 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -218,6 +218,9 @@ public:
 
 	bool registerPolling(FullStoryId id, Polling polling);
 	void unregisterPolling(FullStoryId id, Polling polling);
+	void requestUserStories(
+		not_null<UserData*> user,
+		Fn<void()> done = nullptr);
 
 	void savedStateChanged(not_null<Story*> story);
 	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
@@ -266,7 +269,6 @@ private:
 	void sendIncrementViewsRequests();
 	void checkQuitPreventFinished();
 
-	void requestUserStories(not_null<UserData*> user);
 	void registerExpiring(TimeId expires, FullStoryId id);
 	void scheduleExpireTimer();
 	void processExpired();
@@ -335,7 +337,9 @@ private:
 	base::flat_set<PeerId> _markReadPending;
 	base::Timer _markReadTimer;
 	base::flat_set<PeerId> _markReadRequests;
-	base::flat_set<not_null<UserData*>> _requestingUserStories;
+	base::flat_map<
+		not_null<UserData*>,
+		std::vector<Fn<void()>>> _requestingUserStories;
 
 	base::flat_map<PeerId, base::flat_set<StoryId>> _incrementViewsPending;
 	base::Timer _incrementViewsTimer;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index e35e83d03..1a89da1b1 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2528,9 +2528,10 @@ void SessionController::openPeerStory(
 	if (from) {
 		window().openInMediaView(OpenRequest(this, *from, context));
 	} else if (from.error() == Data::NoStory::Unknown) {
-		stories.resolve({ peer->id, storyId }, crl::guard(&_storyOpenGuard, [=] {
+		const auto done = crl::guard(&_storyOpenGuard, [=] {
 			openPeerStory(peer, storyId, context);
-		}));
+		});
+		stories.resolve({ peer->id, storyId }, done);
 	}
 }
 
@@ -2540,6 +2541,7 @@ void SessionController::openPeerStories(
 	using namespace Media::View;
 	using namespace Data;
 
+	invalidate_weak_ptrs(&_storyOpenGuard);
 	auto &stories = session().data().stories();
 	if (const auto source = stories.source(peerId)) {
 		if (const auto idDates = source->toOpen()) {
@@ -2550,6 +2552,13 @@ void SessionController::openPeerStories(
 					? StoriesContext{ *list }
 					: StoriesContext{ StoriesContextPeer() }));
 		}
+	} else if (const auto userId = peerToUser(peerId)) {
+		if (const auto user = session().data().userLoaded(userId)) {
+			const auto done = crl::guard(&_storyOpenGuard, [=] {
+				openPeerStories(peerId, list);
+			});
+			stories.requestUserStories(user, done);
+		}
 	}
 }
 

From 94820f36ba5acda95b1b7b2e8ba08b70856e3e85 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 12:22:50 +0400
Subject: [PATCH 401/676] Improve expanded state of small amount of stories.

---
 .../dialogs/ui/dialogs_stories_list.cpp       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 685cc767d..ad39539dd 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -206,12 +206,18 @@ List::Layout List::computeLayout(float64 expanded) const {
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * ratio;
 	};
-	const auto singleFull = full.photoLeft * 2 + full.photo;
+	const auto widthFull = width();
 	const auto itemsCount = int(_data.items.size());
-	const auto narrowWidth = st::defaultDialogRow.padding.left()
-		+ st::defaultDialogRow.photoSize
-		+ st::defaultDialogRow.padding.left();
-	const auto narrow = false;// (width() <= narrowWidth);
+	const auto leftFullMin = full.left;
+	const auto singleFullMin = full.photoLeft * 2 + full.photo;
+	const auto totalFull = leftFullMin + singleFullMin * itemsCount;
+	const auto skipSide = (totalFull < widthFull)
+		? (widthFull - totalFull) / (itemsCount + 1)
+		: 0;
+	const auto skipBetween = (totalFull < widthFull && itemsCount > 1)
+		? (widthFull - totalFull - 2 * skipSide) / (itemsCount - 1)
+		: skipSide;
+	const auto singleFull = singleFullMin + skipBetween;
 	const auto smallSkip = (itemsCount > 1
 		&& _data.items[0].element.skipSmall)
 		? 1
@@ -220,12 +226,8 @@ List::Layout List::computeLayout(float64 expanded) const {
 		kSmallThumbsShown,
 		itemsCount - smallSkip);
 	const auto smallWidth = st.photo + (smallCount - 1) * st.shift;
-	const auto leftSmall = (narrow
-		? ((narrowWidth - smallWidth) / 2 - st.photoLeft)
-		: st.left) - (smallSkip ? st.shift : 0);
-	const auto leftFull = (narrow
-		? ((narrowWidth - full.photo) / 2 - full.photoLeft)
-		: full.left) - _scrollLeft;
+	const auto leftSmall = st.left - (smallSkip ? st.shift : 0);
+	const auto leftFull = full.left - _scrollLeft + skipSide;
 	const auto startIndexFull = std::max(-leftFull, 0) / singleFull;
 	const auto cellLeftFull = leftFull + (startIndexFull * singleFull);
 	const auto endIndexFull = std::min(

From 5f5933c1b3e2b99ed75f6f704b4adde5b68fe898 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 16:09:14 +0400
Subject: [PATCH 402/676] Improve overscroll, revert cmake_helpers.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b6cb6cb77..fd1752a5c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b6cb6cb770236a49bffdf572427faa477f00ccc0
+Subproject commit fd1752a5c2e71810e75c3b90eee3ff6fd9e0d71b
diff --git a/cmake b/cmake
index 982546b16..6d67365e5 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 982546b169df3d479e6511425870327559b38a89
+Subproject commit 6d67365e52480edbde2b2596844c26b56a8644dc

From 1f69c61d51c2ecc40ed05f3dafac4c30283d8652 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 14:58:06 +0400
Subject: [PATCH 403/676] Fix init glitch in ComposeControls.

---
 .../SourceFiles/chat_helpers/emoji_suggestions_widget.cpp  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index 7233c5a21..a97d1fe42 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -778,6 +778,13 @@ SuggestionsController::SuggestionsController(
 
 	updateForceHidden();
 
+	_container->shownValue(
+	) | rpl::filter([=](bool shown) {
+		return shown && !_shown;
+	}) | rpl::start_with_next([=] {
+		_container->hide();
+	}, _container->lifetime());
+
 	handleTextChange();
 }
 

From d46f974ab56df685fba907268b938060ed4f82dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 16:18:48 +0400
Subject: [PATCH 404/676] Fix mark-as-read of deleted accounts by Enter.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index aaa9733fe..25abe7428 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1804,7 +1804,9 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(
 }
 
 void HistoryWidget::tryProcessKeyInput(not_null<QKeyEvent*> e) {
-	if (_canSendTexts && _field->isVisible()) {
+	e->accept();
+	keyPressEvent(e);
+	if (!e->isAccepted() && _canSendTexts && _field->isVisible()) {
 		_field->setFocusFast();
 		QCoreApplication::sendEvent(_field->rawTextEdit(), e);
 	}

From 3851fa27d91d606cf830713ca3f165a692f8f651 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 17:25:28 +0400
Subject: [PATCH 405/676] Update lock/unlock icon.

---
 .../Resources/icons/dialogs/dialogs_lock.png     | Bin 362 -> 0 bytes
 .../Resources/icons/dialogs/dialogs_lock@2x.png  | Bin 556 -> 0 bytes
 .../Resources/icons/dialogs/dialogs_lock@3x.png  | Bin 817 -> 0 bytes
 .../Resources/icons/dialogs/dialogs_lock_off.png | Bin 0 -> 327 bytes
 .../icons/dialogs/dialogs_lock_off@2x.png        | Bin 0 -> 541 bytes
 .../icons/dialogs/dialogs_lock_off@3x.png        | Bin 0 -> 703 bytes
 .../Resources/icons/dialogs/dialogs_lock_on.png  | Bin 0 -> 307 bytes
 .../icons/dialogs/dialogs_lock_on@2x.png         | Bin 0 -> 502 bytes
 .../icons/dialogs/dialogs_lock_on@3x.png         | Bin 0 -> 662 bytes
 .../Resources/icons/dialogs/dialogs_unlock.png   | Bin 357 -> 0 bytes
 .../icons/dialogs/dialogs_unlock@2x.png          | Bin 523 -> 0 bytes
 .../icons/dialogs/dialogs_unlock@3x.png          | Bin 769 -> 0 bytes
 Telegram/SourceFiles/dialogs/dialogs.style       |  15 ++++++++++-----
 13 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock.png
 delete mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock@2x.png
 delete mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock@3x.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock_off.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock_off@2x.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock_off@3x.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock_on.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock_on@2x.png
 create mode 100644 Telegram/Resources/icons/dialogs/dialogs_lock_on@3x.png
 delete mode 100644 Telegram/Resources/icons/dialogs/dialogs_unlock.png
 delete mode 100644 Telegram/Resources/icons/dialogs/dialogs_unlock@2x.png
 delete mode 100644 Telegram/Resources/icons/dialogs/dialogs_unlock@3x.png

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

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^qChOd!2~4VYCcQ>QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPE4qLg&K3bFG_AJY2c)iex;Tbd
z2%ZhH7HU=yXcf5-S;g7!konYcPn-Bdo_PmPNoMc5QpBRob!PU2!fOdk#tS)EKYy!@
zNJ)LO{iyL{r;dH^rv`mE|9Q>UvU90vk+Ij0&8WTq{yb}gP)c5%%<<gYx3=*zGE7m}
z{3$fF@_l>ag1jjTigz`tJ7+I@I7k1qQz($T^mCAx%KbR)DHASL-ZDGp`Z@Oc+Sgql
zFPQoY-%4WV6rJ}&Oka)fax+s~`!oOl@-iX6TRwhj5Bc)DKlt;(_^;cqspbDWTWncx
gb?C^S$!AYX%Vq9aeqK27cM-^+p00i_>zopr0C|0b8UO$Q

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

literal 556
zcmeAS@N?(olHy`uVBq!ia0vp^T0pG9!2~4PGyk&#DaPU;cPEB*=VV?2IWDOYo@u_m
zU{xFpjP02WEFdL7ECs|249p7{8JK}IBS>rk6I@nn0W+Mf0aCc`*0*e+vT2?!jv*18
zZ^M22TpUF5CVQ^Q$#Hqax1({ca)<Yhrs6ZKF$b?PMij6qisd;}?K?9&<ie^bubXE!
zytq>R{`bnNDVO?>*YDfXEtVe{Ccx77*kOO}?L``Gi91eYtG@nSH}Cmp8+&naCl%ZC
z(T-EuJtz5G-tr-qH;~C;=gaj9OJ+*XS+(ldubl=F=Uz^dT=4wN;!LTQ)1gW(lhoL6
zEZgPc)mND9DQmWC-TqYyC({@{Xgk<7Kc6$t^y8_Bb_O=rd-;cZ7IjSPyS+y<*NK6H
zlgmqf_NEw*-_mzB=^W+aaS$>6)|NOS`~LT&YBq%~sp^eO7gXKmo>g4>GS6=P;Ty9e
zr<KOK>vJ8<pS4V-iLtqn!>U^K&90hvX%ku2uFJk`QrWP*^7gjJ7JP><l*ZN+?m4=i
zVTMKY@so^8!Y;WtDcjmx=z4sV*?GTe!m~n^PqVh=m*m@Yrmb3Z=WO^@PtLi!e+u~q
zyFN6VUn@MXT*#yF?Z@dq_84lO@OXGY_V~vK3zZriU22{bi*rhy^Ln|M-{pep-kp<o
dan~<pzCU+{fpp%fvj(7;@^tlcS?83{1OR(!+;0E?

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

literal 817
zcmV-11J3-3P)<h;3K|Lk000e1NJLTq002J#002A)0ssI2Ua9pa00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91KcE8u1ONa40RR91JOBUy0N6#c*Z=?mn@L1LRA>e5SkKBiQ5gQnhA5?o
z;u=_6*x0xN3tJX$fos7<5F28nELm78rGza}#P9cfskhS%<IM3ozQwV6oq7JvGh@um
z&yV?-22>jGsE|Iu@p`?nSS*o9KzqGjZ@1gq?e+m5R>@#6ST2{_?e^((`X_ww6^qye
z0IMOBn9t{{R;!!MM#%hN1OPCAnQS>^B9X{&ID8QH$r8Yza5%rMkxHc&i^Y?iPnSUf
z(PFOqR~rZf#^Z51ofdQ8EbsMt{eFM7T46nzOy=|XLZRUI`$gDvI?ZOY$Kz34)H=6X
zEla)4W-}g-+e2Uxn=D|^?MO{4nM?-PK?;PqQmHt517M**#F_G`t({JXqGPDlYBEms
zdR=7UN-D!*#)QM+%jH5jX0sXop=3M&1DJ>qfs_o96H_XcC;^6Iu_&(&u*ikfoh!BX
z@-_}g@q9g>&)sg<0c_a>FetQ0Qu@;0?_ur<mdoXSzo#@W2Y^8#7)j|%AB{%Iez)7v
zEIEi2lG2x6yjQtiuacn&CQ?XBUwX>HIGFT|WxA9y-McJ|5pKF?EYqcw>E2~wjBpp-
zdpsUID@-O6+;xa|e3El6m!sU6Ei7n48TxP`7~6p7w83CtvHZkWxIBDN9F0a~huOuB
zp$|RL@A=?mKLYCMaX@Lm^$c)y(XKNTXQZCc<N`<MNcXK$KN0+-G`~+g91fvS=;aPb
zrAH+%h1dc1Q{Qgk;)-b}e|^QI|K1@m-J9;!8Zc*$T5lXI(>+IvY8s|{wca>brhASS
z)ik8K$KAG?x-v`BQ7Zj>K3C46MwE1vO5bQS)Iun;I354OI|bz;eu-aypYv9FkZ}aw
vd6!1-3my)ieV6v`t{c8-z%*bQ_-)`nKQr+B6ZXCC00000NkvXXu0mjf3Pop5

diff --git a/Telegram/Resources/icons/dialogs/dialogs_lock_off.png b/Telegram/Resources/icons/dialogs/dialogs_lock_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..2459e11373947bac31650a2acdc80cd38c85aebf
GIT binary patch
literal 327
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfUZS-_;46zV=
z8@Q2|S&^q^6I1Af8!eifm?v*y5*6)XSmf^);UxHeflc5N{d=rd^J~)$ZkHXcG%v{i
zc=_*^Yv*>Rb2BXIE)zH|A+O6YVV%T7#~oZg9y|>qDc^UMny`Cmnk<>JLbruMVd<My
z`MtXu8ou9?XfA$m{7Tg9;$?gH&EFa}<=8vVbGs%ed#wrBpkt!rzeJ!XtI++oVZE8w
u(l_Zs#+rtc{P(x{%KtV!_Ir`vmPYZD`K=3uD(*f6dBW4x&t;ucLK6VMXJ@?t

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/dialogs/dialogs_lock_off@2x.png b/Telegram/Resources/icons/dialogs/dialogs_lock_off@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..33b77eb3fa06701d9ae8fef05941249fb820001f
GIT binary patch
literal 541
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuF*6!)z7!twx
zHq@}M*+772xp2syW+|_I2kIB>oh5#de}cw@jDReGdIp!G#nC6bbdD#SD+piHeZt!M
zo@{?|&F+s0>^B(88e|jLdt?fFZY)bVUU<lWr-_04{rBq2Cg-1D-qK-OCv!aZx?`gR
z2V+!rLWqX%<<i(z5ktm~DS?{YDK`|ZgoJ+mYHXkw=@I)%_@DWsB@0*-a|MN4mT<B(
zMjJT9D|IQo;__ayj-%Cof#&NPjf?jiN|pyK)Zo&n)@>C~P;C0<b>PlEh5O%E9=GTV
zGHziKG3iW>pK!&2t36R+$@^+e*N4l6Z26B&OpR>&l^UtFJ4W}#$BHMF>!uX3_)J=|
z?sev@7jiG_r>8PXdiRyw+RV1}E7!f$^OsuQ?#o_zd}G1+w$9`aw;nHvxqdf3%HVnB
zHyi(!U!9E#Hx{g4deUot4)5nz?<cr%EseM^&GpR$*Y<+y?W<OPcH`#lTaz1IdRX_%
zheN%G{=a+K5SMYtdc)^JR^BI@<u>ttw>ZnUf%y%C^#Q&=GnwyC{<byYGxr*4P}F$3
L`njxgN@xNAbvn{r

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/dialogs/dialogs_lock_off@3x.png b/Telegram/Resources/icons/dialogs/dialogs_lock_off@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7653aa43105e854c1ab445eac2b0d15039750021
GIT binary patch
literal 703
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz@+Kv;uw;_
z`ZmI_?~nrzOUsKF3p%GvGoSN=$+zmC!@>9;40{;vs`Irha0~Q$!0d4HZimOjlbbj`
z#F;s6W-Z#Y?eWaQ4zsON;*tu?DGfXm7>yj*PB6eY?L1dxuU(p+Wg-=SU6h4!)!XmC
z=fB<+qxb7koz|A9wHGr=EM)3>Su1WhHOxO}QqFt0VDn9hjy##yU!@Xf?G~BaUAFKf
zFUM)tLt4$e%xPJzjeqv(6&o##Hcb=a@1Mdxi-(Qb(s;+2mz^S#0dCU&8-pg_&Aa}x
z<c!<yyX%gyNq442blUu_i$68>vX@zxu4Jdn&S<M@8@cqiPP>l(^~|04!$M-WovH8r
zLz&&Huf8f=Z{(nMYf}wV_V(M6(G^8Tzt<@;r#!lwU{TAo`RkJ-@sbIilTsR%&b2Id
zOKtE~oBXq;&PMJdw>A6WJvp=16;=5y4;FDf|2<6d=)CqPMw_m`_FaDYZCQ77@VBh0
zs}5FO3#ObtXR@{J@I#<R(KcPVr2zq#`)9`pyb%cP5@Y@Q+HCgOoIBZnW_X$(*&oZw
z-^SLUE1r5kPt*5G-I;^?UH7ijO-f=&czV<2wy>4K?V?A4pT2H<Z^%?^6vryIFo|{2
z+b3ZmXE=L79I;LRU$U;%UmdE`m&~0qH99_wJ7;IiDuIYe;@z#O%Qe0qpLg8hLHfJ}
zmrpk2oywQ9_&4R<Z1=$6^S{xe5E7psP8^V*mVa*dl<-L>L5auH)z4*}Q$iB}GEEpm

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/dialogs/dialogs_lock_on.png b/Telegram/Resources/icons/dialogs/dialogs_lock_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..8209991f3dacb1838126588c14e08b1bd481d120
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfU&GmF~46zV=
zJMkdz5d|I==Uo;mv%L62yp#i&I{v4&*xQ`(oG@pK`yYpIdb^EIZ`=EI0gK&QJ>4gB
zxD{)nFB<6GQtUI7Tbm&f-cup4IzcH(%I(0!>vl?Owgzab?o{Y)Se25o<la2Cz2CQn
zb?&rhT&VV@=-l3Y?-zzBFJ7b(8sm^Gay3`-@68ocjH+(&drkacnsu+Cc>l7B{TG^r
ZEEr4YG-$M(Sh^kLU{6;+mvv4FO#n^#UpW8(

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/dialogs/dialogs_lock_on@2x.png b/Telegram/Resources/icons/dialogs/dialogs_lock_on@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4e3d6b2532b70644477c6aa11ae93e3c4f872e1
GIT binary patch
literal 502
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuFmf-2)7!twx
zcB*4vvjLB*xA=xfGHVh~itgZlE!VBAu+br@c?Ux|L(7cyQJVw;mV0s=OIdbnZL6Pi
zUR!bdY(CWmEK?eU0+_;BY_z||y{U|oIUXpo@JeZH?Df-|-lU4BUNXtOEyh=&;PPqF
zTl3pbD(%i2M?d78q>+1MdHaC_d8anj*s!ama4+??e7N^vJ(r(=5QC4vBy|ppdaHRV
zo*Cf^H{WzkuylNu@buk=wsRt4Vy=woulYD8F5x+Sjp^~7qX80aSGK?Z{g-V{%FQ_C
zlo%e)w|4p~7oL|~XPpum7JAjhx8&55_!A1pCY845pSu`U_F+}kG<BPIt975+i0$J)
z_Gp`Y+rjUDzejH_k~yxxVKGHrtgXTEooa}=e2L@A<8ck2bu<_L_u*K6{Y%C1($%eE
z?*lHI9G9N8=^Qt2@Bcej8TWr^sb-j;^K;z-trUUzr4uDzWJYpoFoFW+z<R+Sj8Y{_
U_lmjb$$`S$)78&qol`;+07e0~3IG5A

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/dialogs/dialogs_lock_on@3x.png b/Telegram/Resources/icons/dialogs/dialogs_lock_on@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..67c7d7c71763a280ed477ec333ff05b99937072a
GIT binary patch
literal 662
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz{KF`;uw;_
z`gVq6Uz3A?>(y54vK@wnuO-!D8kH;9#pOKv4W>)<PTX3!_TGV|#`cpYY?40dAbMlQ
z{ng7>YQ5Tj-yy-^fdZot26AR{J{+}lsoUa<*OPsg2eZWJO`m^!$Nl$9KiWpf^dCR{
z^i$Q|e^tz%3b+_;Cp_F@G5hQ$ozEh+x-xw1EtZ{*@{3|CKB+u9%6O=1F|YKQ?_AQK
zejEOo%X$CTM)kta9@P&#XDusget6-du%?m15zBdvmnMJyDRX?|{TC@l6K@%~FOnC#
z;5A9*lHPIcn;L#6JycF@K6o~Kb?8OCHLKtGS9KqG^<Y<euerlNv2(L;y#Idn?g@sO
z5p%zu-+b)QA`LCQ9_!^Zru(Hd_~`Ji+nu4a=H1iV-OD$8yRj{JX5ZGsre9Wl{#mm(
zPQL&6Bh_mOO(i0ZD+8|RiFMz8d(FW!lgn%2gWp>jH!NHgqs6uF{`RwJ!CY}WJ8XZZ
zU7qs&s`g)v)gsIO&TOtXI=paO$9l%5sq#j*=3QvKKka1KB=PtQYI-FREq$dNx1R)+
zoMB0BcYP7jzQI>-Y3Z7!;#>Bu3A^#K#E9{Y$i?Ybxo*EL^Yd402U@$t@3WHpZ(BB%
z`9E3bR`cHfR4@0V>tOBu1O>w#^>Syw8yb5yuy~-M1?DXO7=kwJwzt1LX&ER@c)I$z
JtaD0e0sylt5<36@

literal 0
HcmV?d00001

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

literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^qChOd!2~4VYCcQ>QjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPE4qLg&K3bFG_AJY2c*t>x;Tbd
z2;QBvm$yYh=IBEysc#E59nhU|Q1ZqR(={=zM~)qnQd0<vy0f>XMVLi;l6GH{P2K<R
zKh&12y%-haWy#YlkaT-n=B#O{D=oQWvTNrp|9(%RSx#!n1MNlo-V4rnKC_sQxhg~8
z&59T2A6oQ97`Hg{O0n2%7y7ho@w(U7O7DKRowmU7fO6-e3F$qu#|32_8yeCD4m<tJ
zt5R6|GbL;3l&#-l^H&_2oU*R@dBF^^dD$vI>kDGCO?_XQU#<GL|CIIfta7oRlb3(}
d`&eneu>6v_n|ycAIpqiPqNl5$%Q~loCIIgme~|zH

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

literal 523
zcmeAS@N?(olHy`uVBq!ia0vp^T0pG9!2~4PGyk&#DaPU;cPEB*=VV?2IWDOYo@u_m
zU{xFpjP02WEFdL7ECs|249p7{8JK}IBS>rk6I@nn0W+Mf0aCc`*0*e+vQkeM$B+ol
zx8b{cTMR^E^c0oU7IM63(0kETw~jGNVJU;h3dTl`7Ytj>t-Pm|^T^aaD%sA&uD$>H
z%u4y3Gj?*}a`V>wFyOgt(z}S`%evRAR!JQXRC{{NYtj;()2Wg3jx}(m%N);(TKB@{
z{PRk)NBev>vNWuI7HG4i)Wjug*0aym2}#esXiF}5Zsm4+o59&NiHBBBV(tm^T~g5J
zzWR#bvG29ftbTJD512W;J7^bPox9)Yu404Z#N*0o(^6NJ*rY`%2{W{^v`z~<+aIcL
zdG%-8=5^UoO2Nz~tqdu0T=Fc9i+B$^)EJpM1amk%TlnFK<;6XR=il%NUzu%QzdqVx
zw`<^++V%HT*6mkls{6otpt8ZtcXGCeG{2xHo5!7NlPVRC9{roqU7fd_W98a{+4rjg
zZa(7pGjF@xi(BmP*Trp^dT!C3v-YbeGtK>ftLE=TjTN05)<LtcKDIYr+2PxHMLvGV
t3Q@@i>qO#f6`J&RzByXEuQUHjqyG1~6^jl`<@N(bgr}>Y%Q~loCIDu|$j$%&

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

literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq002J#002A)0ssI2Ua9pa00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91KcE8u1ONa40RR91JOBUy0N6#c*Z=?mYe_^wRA>e5SiP$9KoB+GwGyoa
zMJo$Y8#`Y_EVcD5d;@(2JFWEv>;+3v3rjn}N<kFleg}kQvdJcsCD{<}TFuU$IdgLM
z=jJAtvp?&AjsrhBMU0wavDj!dTCG;0P<Xvw@AsQgls2T->rJQA^ZESi{vm@rX44j^
z=-+O)SF4p<v(E?^AQc=brH8}e^ZE1<>z4u&_>`1-+D;}DKan9hRC$;pC!EL??gF^D
zSS;MR-05^$uh;wi{&u^S%jIsj+wb=~osI+>jYiAmQc9W|LXfm!E|<$-Fz{7?JZ9;N
zpf=4jARW`)Zda{VeWibsm<5JD02l)B2~OeqqdMSguypYN(h8(=jm~B>s$R8Wy#4`6
z3&G>XB%Yyvl8(n?q<%Qo;sL-Dsg{EO(E&fki$Js46nNY)BIX2iyMqU8oGLFyQ+>T&
zr(C!k=`b{w@Df{Sxd3RYuT(060>SlqrNhuz!b@zS<pQ9oKA+DE3Iw0ehYmwy2`{mQ
zmJ5KUdQqQlVAZGRzxCdFujhc>IeNauQI&1)BRJqV&UifDZnyXQUA!U26@U}W;76AT
znwZd9t+v^0;?f$xgD&XBRK<e94>QugPlaA_t^gJ^z^x>v(2?aU2ZSA&gv0<&bmRzQ
z9T6NU?SFqbBD|Q#<54P=ym=|ZQV)})G6O@-*3b5RZ`B*vMv4~JdxbFu($;$eCM#N4
z?-j-vNL%j>n5<}Fy;m4xApHlt$J@36BWVj}N0#@8!+}y8h?yN(>gV&h0mZaMoE@|M
zO#!ZC_<PQGO|b%5{gy^IrH!ov)&c8)t^@x8z$nsV1*0Pm00000NkvXXu0mjfXxB)q

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index d8b405e7c..418584f7b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -218,13 +218,18 @@ dialogsMenuToggleUnreadMuted: icon {
 	{ "dialogs/dialogs_menu_unread_dot", dialogsMenuIconFg },
 };
 
-dialogsLock: IconButton(dialogsMenuToggle) {
-	icon: icon {{ "dialogs/dialogs_lock", dialogsMenuIconFg }};
-	iconOver: icon {{ "dialogs/dialogs_lock", dialogsMenuIconFgOver }};
+dialogsLock: IconButton {
+	width: 36px;
+	height: 38px;
+
+	icon: icon {{ "dialogs/dialogs_lock_off", dialogsMenuIconFg }};
+	iconOver: icon {{ "dialogs/dialogs_lock_off", dialogsMenuIconFgOver }};
+	iconPosition: point(-1px, -1px);
+
 	ripple: emptyRippleAnimation;
 }
-dialogsUnlockIcon: icon {{ "dialogs/dialogs_unlock", dialogsMenuIconFg }};
-dialogsUnlockIconOver: icon {{ "dialogs/dialogs_unlock", dialogsMenuIconFgOver }};
+dialogsUnlockIcon: icon {{ "dialogs/dialogs_lock_on", dialogsMenuIconFg }};
+dialogsUnlockIconOver: icon {{ "dialogs/dialogs_lock_on", dialogsMenuIconFgOver }};
 dialogsCalendar: IconButton {
 	width: 32px;
 	height: 35px;

From 6b4ccd29957e03f506a9f857886f68e785ee0618 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 11:41:12 +0400
Subject: [PATCH 406/676] Fix lock/unlock toggle without stories.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 23 +++++++++++++------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  5 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 984d5b647..a1f570fac 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -212,7 +212,9 @@ Widget::Widget(
 	_searchControls,
 	object_ptr<Ui::IconButton>(this, st::dialogsCalendar))
 , _cancelSearch(_searchControls, st::dialogsCancelSearch)
-, _lockUnlock(_searchControls, st::dialogsLock)
+, _lockUnlock(
+	_searchControls,
+	object_ptr<Ui::IconButton>(this, st::dialogsLock))
 , _scroll(this)
 , _scrollToTop(_scroll, st::dialogsToUp)
 , _stories((_layout != Layout::Child)
@@ -370,10 +372,13 @@ Widget::Widget(
 	) | rpl::start_with_next([=] {
 		updateLockUnlockVisibility();
 	}, lifetime());
-	_lockUnlock->setClickedCallback([this] {
-		_lockUnlock->setIconOverride(&st::dialogsUnlockIcon, &st::dialogsUnlockIconOver);
+	const auto lockUnlock = _lockUnlock->entity();
+	lockUnlock->setClickedCallback([=] {
+		lockUnlock->setIconOverride(
+			&st::dialogsUnlockIcon,
+			&st::dialogsUnlockIconOver);
 		Core::App().maybeLockByPasscode();
-		_lockUnlock->setIconOverride(nullptr);
+		lockUnlock->setIconOverride(nullptr);
 	});
 
 	setupMainMenuToggle();
@@ -2273,6 +2278,7 @@ void Widget::applyFilterUpdate(bool force) {
 		return;
 	}
 
+	updateLockUnlockVisibility(anim::type::normal);
 	updateStoriesVisibility();
 	const auto filterText = currentSearchQuery();
 	_inner->applyFilterUpdate(filterText, force);
@@ -2607,7 +2613,7 @@ void Widget::resizeEvent(QResizeEvent *e) {
 	updateControlsGeometry();
 }
 
-void Widget::updateLockUnlockVisibility() {
+void Widget::updateLockUnlockVisibility(anim::type animated) {
 	if (_showAnimation) {
 		return;
 	}
@@ -2618,8 +2624,11 @@ void Widget::updateLockUnlockVisibility() {
 		|| _childList
 		|| !_filter->getLastText().isEmpty()
 		|| _searchInChat;
-	if (_lockUnlock->isHidden() != hidden) {
-		_lockUnlock->setVisible(!hidden);
+	if (_lockUnlock->toggled() == hidden) {
+		const auto stories = _stories && !_stories->empty();
+		_lockUnlock->toggle(
+			!hidden,
+			stories ? anim::type::instant : animated);
 		if (!hidden) {
 			updateLockUnlockPosition();
 		}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 48760b630..83a8d70e6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -179,7 +179,8 @@ private:
 	void clearSearchCache();
 	void setSearchQuery(const QString &query);
 	void updateControlsVisibility(bool fast = false);
-	void updateLockUnlockVisibility();
+	void updateLockUnlockVisibility(
+		anim::type animated = anim::type::instant);
 	void updateLoadMoreChatsVisibility();
 	void updateStoriesVisibility();
 	void updateJumpToDateVisibility(bool fast = false);
@@ -245,7 +246,7 @@ private:
 	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _chooseFromUser;
 	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _jumpToDate;
 	object_ptr<Ui::CrossButton> _cancelSearch;
-	object_ptr<Ui::IconButton> _lockUnlock;
+	object_ptr< Ui::FadeWrapScaled<Ui::IconButton>> _lockUnlock;
 
 	std::unique_ptr<Ui::MoreChatsBar> _moreChatsBar;
 

From ad8f06fd95cf725e2f46875c79bebf62f86d0759 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 11:41:26 +0400
Subject: [PATCH 407/676] Mark stories as read almost instantly.

---
 .../SourceFiles/media/stories/media_stories_controller.cpp    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 973473de1..bd6c19b64 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -72,8 +72,8 @@ constexpr auto kPreloadUsersCount = 3;
 constexpr auto kPreloadStoriesCount = 5;
 constexpr auto kPreloadNextMediaCount = 3;
 constexpr auto kPreloadPreviousMediaCount = 1;
-constexpr auto kMarkAsReadAfterSeconds = 1;
-constexpr auto kMarkAsReadAfterProgress = 0.2;
+constexpr auto kMarkAsReadAfterSeconds = 0.2;
+constexpr auto kMarkAsReadAfterProgress = 0.;
 
 } // namespace
 

From 3606e62515bd18d794cfef3409c78ad2598655c9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 11:41:38 +0400
Subject: [PATCH 408/676] Apply interface scale multiplier in overscroll.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index fd1752a5c..c7e0b7af3 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit fd1752a5c2e71810e75c3b90eee3ff6fd9e0d71b
+Subproject commit c7e0b7af37bce7ec77195ff717d70457e51e1e7a

From de0b79aee80a19332d032ba4a3165c120a4e72f2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 11:48:27 +0400
Subject: [PATCH 409/676] Use larger skips in segments to allow up to 50.

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

diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index 8a6b7f4c2..a31eb708e 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -418,11 +418,12 @@ void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 		} else {
 			const auto small = 160;
 			const auto full = arc::kFullLength;
-			const auto separator = (full > 2 * small * segments)
+			const auto separator = (full > 1.1 * small * segments)
 				? small
-				: full / (segments * 2);
+				: full / (segments * 1.1);
 			const auto left = full - (separator * segments);
 			const auto length = left / float64(segments);
+
 			auto start = 0. + (arc::kQuarterLength + (separator / 2));
 			for (const auto &segment : ranges::views::reverse(_segments)) {
 				p.setPen(QPen(

From b46799f2c3a2fd6612d921a8db49fc3729b6e4fe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 11:58:56 +0400
Subject: [PATCH 410/676] Fix premium gift message layout.

---
 .../history/view/media/history_view_premium_gift.cpp          | 4 ++++
 .../history/view/media/history_view_premium_gift.h            | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index ec292be93..7df009fde 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -76,6 +76,10 @@ ClickHandlerPtr PremiumGift::createViewLink() {
 	});
 }
 
+int PremiumGift::buttonSkip() {
+	return st::msgServiceGiftBoxButtonMargins.top();
+}
+
 void PremiumGift::draw(
 		Painter &p,
 		const PaintContext &context,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
index edb79ad52..f3839291d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
@@ -28,6 +28,7 @@ public:
 	QString title() override;
 	TextWithEntities subtitle() override;
 	QString button() override;
+	int buttonSkip() override;
 	void draw(
 		Painter &p,
 		const PaintContext &context,

From 3b59f520280f05fd572b6973e14beffdcbf5e0a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 12:23:23 +0400
Subject: [PATCH 411/676] Fix overscroll background on theme change.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a1f570fac..7c88ad701 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -434,7 +434,18 @@ Widget::Widget(
 	setupSupportMode();
 	setupScrollUpButton();
 
-	_scroll->setOverscrollBg(st::dialogsBg->c);
+	const auto overscrollBg = [=] {
+		return anim::color(
+			st::dialogsBg,
+			st::dialogsBgOver,
+			_childListShown.current());
+	};
+	_scroll->setOverscrollBg(overscrollBg());
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		_scroll->setOverscrollBg(overscrollBg());
+	}, lifetime());
+
 	if (_layout != Layout::Child) {
 		setupConnectingWidget();
 
@@ -457,11 +468,8 @@ Widget::Widget(
 		}, lifetime());
 
 		_childListShown.changes(
-		) | rpl::start_with_next([=](float64 value) {
-			_scroll->setOverscrollBg(anim::color(
-				st::dialogsBg,
-				st::dialogsBgOver,
-				value));
+		) | rpl::start_with_next([=] {
+			_scroll->setOverscrollBg(overscrollBg());
 			updateControlsGeometry();
 		}, lifetime());
 

From 89bd3c10c5dc225e092487f7bbdbc0beab84f37c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 12:36:52 +0400
Subject: [PATCH 412/676] Fix crash in premium preview box.

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

diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 055b1296e..82d4e4801 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1823,7 +1823,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 	const auto &st = st::premiumPreviewBox.button;
 	result->resize(args.parent->width(), st.height);
 
-	const auto premium = &args.controller->session().api().premium();
+	const auto premium = &args.show->session().api().premium();
 	premium->reload();
 	const auto computeCost = [=] {
 		const auto amount = premium->monthlyAmount();

From 5f4dcc5eb662d06bde6da4affc7fe8b315362479 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 19:59:27 +0400
Subject: [PATCH 413/676] Show segments in expanded stories list.

---
 Telegram/Resources/langs/lang.strings         |   2 -
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   9 +-
 Telegram/SourceFiles/boxes/peer_list_box.h    |   4 +-
 .../boxes/peer_list_controllers.cpp           |   5 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 122 +++++++++++++-----
 .../dialogs/ui/dialogs_stories_list.h         |   8 ++
 .../ui/effects/outline_segments.cpp           |  73 +++++++++++
 .../SourceFiles/ui/effects/outline_segments.h |  23 ++++
 .../SourceFiles/ui/effects/round_checkbox.cpp |  28 +---
 .../SourceFiles/ui/effects/round_checkbox.h   |  14 +-
 Telegram/cmake/td_ui.cmake                    |   2 +
 11 files changed, 218 insertions(+), 72 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/effects/outline_segments.cpp
 create mode 100644 Telegram/SourceFiles/ui/effects/outline_segments.h

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 68a00520e..0fea4928d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2408,8 +2408,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_add_contact" = "Create";
 "lng_add_contact_button" = "New contact";
 "lng_contacts_header" = "Contacts";
-"lng_contacts_by_online" = "Sorted by last seen time";
-"lng_contacts_by_name" = "Sorted by name";
 "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/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 777e952b9..bbfb2acb1 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -10,13 +10,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
+#include "ui/effects/loading_element.h"
+#include "ui/effects/outline_segments.h"
+#include "ui/effects/round_checkbox.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/widgets/multi_select.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/popup_menu.h"
-#include "ui/effects/loading_element.h"
-#include "ui/effects/round_checkbox.h"
-#include "ui/effects/ripple_animation.h"
 #include "ui/empty_userpic.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/text_options.h"
@@ -894,7 +895,7 @@ void PeerListRow::setCheckedInternal(bool checked, anim::type animated) {
 }
 
 void PeerListRow::setCustomizedCheckSegments(
-		std::vector<Ui::RoundImageCheckboxSegment> segments) {
+		std::vector<Ui::OutlineSegment> segments) {
 	Expects(_checkbox != nullptr);
 
 	_checkbox->setCustomizedSegments(std::move(segments));
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 4252b5fa2..ac8ab554b 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -36,7 +36,7 @@ class SlideWrap;
 class FlatLabel;
 struct ScrollToRequest;
 class PopupMenu;
-struct RoundImageCheckboxSegment;
+struct OutlineSegment;
 } // namespace Ui
 
 using PaintRoundImageCallback = Fn<void(
@@ -204,7 +204,7 @@ public:
 		setCheckedInternal(checked, animated);
 	}
 	void setCustomizedCheckSegments(
-		std::vector<Ui::RoundImageCheckboxSegment> segments);
+		std::vector<Ui::OutlineSegment> segments);
 	void setHidden(bool hidden) {
 		_hidden = hidden;
 	}
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 18d2d514f..10e393b56 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -37,6 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "dialogs/dialogs_main_list.h"
+#include "ui/effects/outline_segments.h"
 #include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h" // showAddContact()
 #include "base/unixtime.h"
@@ -53,14 +54,14 @@ namespace {
 constexpr auto kSortByOnlineThrottle = 3 * crl::time(1000);
 constexpr auto kSearchPerPage = 50;
 
-[[nodiscard]] std::vector<Ui::RoundImageCheckboxSegment> PrepareSegments(
+[[nodiscard]] std::vector<Ui::OutlineSegment> PrepareSegments(
 		int count,
 		int unread,
 		const QBrush &unreadBrush) {
 	Expects(unread <= count);
 	Expects(count > 0);
 
-	auto result = std::vector<Ui::RoundImageCheckboxSegment>();
+	auto result = std::vector<Ui::OutlineSegment>();
 	const auto add = [&](bool unread) {
 		result.push_back({
 			.brush = unread ? unreadBrush : st::dialogsUnreadBgMuted->b,
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index ad39539dd..6e89cb043 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_stories_list.h"
 
 #include "lang/lang_keys.h"
+#include "ui/effects/outline_segments.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/painter.h"
@@ -41,6 +42,7 @@ struct List::Layout {
 	QPointF geometryShift;
 	float64 expandedRatio = 0.;
 	float64 ratio = 0.;
+	float64 segmentsSpinProgress = 0.;
 	float64 thumbnailLeft = 0.;
 	float64 photoLeft = 0.;
 	float64 left = 0.;
@@ -72,6 +74,8 @@ List::List(
 	resize(0, _data.empty() ? 0 : st.full.height);
 }
 
+List::~List() = default;
+
 void List::showContent(Content &&content) {
 	if (_content == content) {
 		return;
@@ -151,12 +155,13 @@ void List::requestExpanded(bool expanded) {
 	if (_expanded != expanded) {
 		_expanded = expanded;
 		const auto from = _expanded ? 0. : 1.;
-		const auto till = _expanded ? 1. : 0.;
+		const auto till = _expanded ? 2. : 0.;
+		const auto duration = (_expanded ? 2 : 1) * st::slideWrapDuration;
 		_expandedAnimation.start([=] {
 			checkForFullState();
 			update();
 			_collapsedGeometryChanged.fire({});
-		}, from, till, st::slideWrapDuration, anim::sineInOut);
+		}, from, till, duration, anim::sineInOut);
 	}
 	_toggleExpandedRequests.fire_copy(_expanded);
 }
@@ -192,10 +197,13 @@ List::Layout List::computeLayout() {
 	updateExpanding(
 		_lastExpandedHeight * _expandCatchUpAnimation.value(1.),
 		_st.full.height);
-	return computeLayout(_expandedAnimation.value(_expanded ? 1. : 0.));
+	return computeLayout(_expandedAnimation.value(_expanded ? 2. : 0.));
 }
 
 List::Layout List::computeLayout(float64 expanded) const {
+	const auto segmentsSpinProgress = expanded / 2.;
+	expanded = std::min(expanded, 1.);
+
 	const auto &st = _st.small;
 	const auto &full = _st.full;
 	const auto expandedRatio = _lastRatio;
@@ -251,6 +259,7 @@ List::Layout List::computeLayout(float64 expanded) const {
 				: 0.)),
 		.expandedRatio = expandedRatio,
 		.ratio = ratio,
+		.segmentsSpinProgress = segmentsSpinProgress,
 		.thumbnailLeft = thumbnailLeft,
 		.photoLeft = photoLeft,
 		.left = thumbnailLeft - photoLeft,
@@ -385,6 +394,11 @@ void List::paintEvent(QPaintEvent *e) {
 			}
 		}
 	};
+	auto gradient = QLinearGradient();
+	gradient.setStops({
+		{ 0., st::groupCallLive1->c },
+		{ 1., st::groupCallMuted1->c },
+	});
 	enumerate([&](Single single) {
 		// Name.
 		if (const auto full = single.itemFull) {
@@ -409,30 +423,35 @@ void List::paintEvent(QPaintEvent *e) {
 			photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
-		const auto smallUnread = small && small->element.unreadCount;
-		const auto fullUnread = itemFull && itemFull->element.unreadCount;
-		const auto unreadOpacity = (smallUnread && fullUnread)
+		const auto smallUnread = (small && small->element.unreadCount);
+		const auto fullUnreadCount = itemFull
+			? itemFull->element.unreadCount
+			: 0;
+		const auto unreadOpacity = (smallUnread && fullUnreadCount)
 			? 1.
 			: smallUnread
 			? (1. - expandRatio)
-			: fullUnread
+			: fullUnreadCount
 			? expandRatio
 			: 0.;
 		if (unreadOpacity > 0.) {
 			p.setOpacity(unreadOpacity);
-			const auto outerAdd = 2 * line;
+			const auto outerAdd = 1.5 * line;
 			const auto outer = userpic.marginsAdded(
 				{ outerAdd, outerAdd, outerAdd, outerAdd });
-			p.setPen(Qt::NoPen);
-			auto gradient = QLinearGradient(
-				userpic.topRight(),
-				userpic.bottomLeft());
-			gradient.setStops({
-				{ 0., st::groupCallLive1->c },
-				{ 1., st::groupCallMuted1->c },
-			});
-			p.setBrush(gradient);
-			p.drawEllipse(outer);
+			gradient.setStart(userpic.topRight());
+			gradient.setFinalStop(userpic.bottomLeft());
+			if (!fullUnreadCount) {
+				p.setPen(QPen(gradient, line));
+				p.drawEllipse(outer);
+			} else {
+				validateSegments(itemFull, gradient, line, true);
+				Ui::PaintOutlineSegments(
+					p,
+					outer,
+					itemFull->segments,
+					layout.segmentsSpinProgress);
+			}
 		}
 		p.setOpacity(1.);
 	}, [&](Single single) {
@@ -447,30 +466,37 @@ void List::paintEvent(QPaintEvent *e) {
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
 		const auto smallUnread = small && small->element.unreadCount;
-		const auto fullUnread = itemFull && itemFull->element.unreadCount;
+		const auto fullUnreadCount = itemFull
+			? itemFull->element.unreadCount
+			: 0;
+		const auto fullCount = itemFull ? itemFull->element.count : 0;
 
 		// White circle with possible read gray line.
-		const auto hasReadLine = (itemFull && !fullUnread);
+		const auto hasReadLine = (itemFull && fullUnreadCount < fullCount);
 		p.setOpacity((small && itemFull)
 			? 1.
 			: small
 			? (1. - expandRatio)
 			: expandRatio);
-		if (hasReadLine) {
-			auto color = st::dialogsUnreadBgMuted->c;
-			if (small) {
-				color.setAlphaF(color.alphaF() * expandRatio);
-			}
-			auto pen = QPen(color);
-			pen.setWidthF(lineRead);
-			p.setPen(pen);
-		} else {
-			p.setPen(Qt::NoPen);
-		}
 		const auto add = line + (hasReadLine ? (lineRead / 2.) : 0.);
 		const auto rect = userpic.marginsAdded({ add, add, add, add });
+		p.setPen(Qt::NoPen);
 		p.setBrush(st::dialogsBg);
 		p.drawEllipse(rect);
+		if (hasReadLine) {
+			if (small && !small->element.unreadCount) {
+				p.setOpacity(expandRatio);
+			}
+			validateSegments(
+				itemFull,
+				st::dialogsUnreadBgMuted->b,
+				lineRead,
+				false);
+			Ui::PaintOutlineSegments(
+				p,
+				rect,
+				itemFull->segments);
+		}
 
 		// Userpic.
 		if (itemFull == small) {
@@ -514,6 +540,36 @@ void List::validateThumbnail(not_null<Item*> item) {
 	}
 }
 
+void List::validateSegments(
+		not_null<Item*> item,
+		const QBrush &brush,
+		float64 line,
+		bool forUnread) {
+	const auto count = item->element.count;
+	const auto unread = item->element.unreadCount;
+	if (int(item->segments.size()) != count) {
+		item->segments.resize(count);
+	}
+	auto i = 0;
+	if (forUnread) {
+		for (; i != count - unread; ++i) {
+			item->segments[i].width = 0.;
+		}
+		for (; i != count; ++i) {
+			item->segments[i].brush = brush;
+			item->segments[i].width = line;
+		}
+	} else {
+		for (; i != count - unread; ++i) {
+			item->segments[i].brush = brush;
+			item->segments[i].width = line;
+		}
+		for (; i != count; ++i) {
+			item->segments[i].width = 0.;
+		}
+	}
+}
+
 void List::validateName(not_null<Item*> item) {
 	const auto &color = st::dialogsNameFg;
 	if (!item->nameCache.isNull() && item->nameCacheColor == color->c) {
@@ -680,8 +736,8 @@ void List::setLayoutConstraints(
 }
 
 List::CollapsedGeometry List::collapsedGeometryCurrent() const {
-	const auto expanded = _expandedAnimation.value(_expanded ? 1. : 0.);
-	if (expanded == 1.) {
+	const auto expanded = _expandedAnimation.value(_expanded ? 2. : 0.);
+	if (expanded >= 1.) {
 		return { QRect(), 1. };
 	}
 	const auto layout = computeLayout(0.);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index d0ecc1428..ef3b2917e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -22,6 +22,7 @@ struct DialogsStoriesList;
 
 namespace Ui {
 class PopupMenu;
+struct OutlineSegment;
 } // namespace Ui
 
 namespace Dialogs::Stories {
@@ -64,6 +65,7 @@ public:
 		not_null<QWidget*> parent,
 		const style::DialogsStoriesList &st,
 		rpl::producer<Content> content);
+	~List();
 
 	void setExpandedHeight(int height, bool momentum = false);
 	void setLayoutConstraints(
@@ -100,6 +102,7 @@ private:
 		Element element;
 		QImage nameCache;
 		QColor nameCacheColor;
+		std::vector<Ui::OutlineSegment> segments;
 		bool subscribed = false;
 	};
 	struct Data {
@@ -134,6 +137,11 @@ private:
 	void updateGeometry();
 	[[nodiscard]] QRect countSmallGeometry() const;
 	void updateExpanding(int expandingHeight, int expandedHeight);
+	void validateSegments(
+		not_null<Item*> item,
+		const QBrush &brush,
+		float64 line,
+		bool forUnread);
 
 	[[nodiscard]] Layout computeLayout();
 	[[nodiscard]] Layout computeLayout(float64 expanded) const;
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.cpp b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
new file mode 100644
index 000000000..2482217e7
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
@@ -0,0 +1,73 @@
+/*
+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/outline_segments.h"
+
+namespace Ui {
+
+void PaintOutlineSegments(
+		QPainter &p,
+		QRectF ellipse,
+		const std::vector<OutlineSegment> &segments,
+		float64 fromFullProgress) {
+	Expects(!segments.empty());
+
+	p.setBrush(Qt::NoBrush);
+	const auto count = int(segments.size());
+	if (count == 1) {
+		p.setPen(QPen(segments.front().brush, segments.front().width));
+		p.drawEllipse(ellipse);
+		return;
+	}
+	const auto small = 160;
+	const auto full = arc::kFullLength;
+	const auto separator = (full > 1.1 * small * count)
+		? small
+		: (full / (count * 1.1));
+	const auto left = full - (separator * count);
+	const auto length = left / float64(count);
+	const auto step = length + separator;
+	const auto spin = separator * (1. - fromFullProgress);
+
+	auto start = 0. + (arc::kQuarterLength + (separator / 2)) + (3. * spin);
+	auto pen = QPen(
+		segments.back().brush,
+		segments.back().width,
+		Qt::SolidLine,
+		Qt::RoundCap);
+	p.setPen(pen);
+	for (auto i = 0; i != count;) {
+		const auto &segment = segments[count - (++i)];
+		if (!segment.width) {
+			start += length + separator;
+			continue;
+		} else if (pen.brush() != segment.brush
+			|| pen.widthF() != segment.width) {
+			pen = QPen(
+				segment.brush,
+				segment.width,
+				Qt::SolidLine,
+				Qt::RoundCap);
+			p.setPen(pen);
+		}
+		const auto from = int(base::SafeRound(start));
+		const auto till = start + length;
+		auto added = spin;
+		for (; i != count;) {
+			start += length + separator;
+			const auto &next = segments[count - (++i)];
+			if (next.width) {
+				--i;
+				break;
+			}
+			added += (separator + length) * (1. - fromFullProgress);
+		}
+		p.drawArc(ellipse, from, int(base::SafeRound(till + added)) - from);
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.h b/Telegram/SourceFiles/ui/effects/outline_segments.h
new file mode 100644
index 000000000..fd4835595
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.h
@@ -0,0 +1,23 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+struct OutlineSegment {
+	QBrush brush;
+	float64 width = 0.;
+};
+
+void PaintOutlineSegments(
+	QPainter &p,
+	QRectF ellipse,
+	const std::vector<OutlineSegment> &segments,
+	float64 fromFullProgress = 1.);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index a31eb708e..78996a89c 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
+#include "ui/effects/outline_segments.h"
 #include "ui/image/image_prepare.h"
 
 #include <QtCore/QCoreApplication>
@@ -368,6 +369,10 @@ RoundImageCheckbox::RoundImageCheckbox(
 , _check(_st.check, _updateCallback) {
 }
 
+RoundImageCheckbox::RoundImageCheckbox(RoundImageCheckbox&&) = default;
+
+RoundImageCheckbox::~RoundImageCheckbox() = default;
+
 void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 	auto selectionLevel = _selection.value(checked() ? 1. : 0.);
 	if (_selection.animating()) {
@@ -416,26 +421,7 @@ void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 				p.drawRoundedRect(outline, *radius, *radius);
 			}
 		} else {
-			const auto small = 160;
-			const auto full = arc::kFullLength;
-			const auto separator = (full > 1.1 * small * segments)
-				? small
-				: full / (segments * 1.1);
-			const auto left = full - (separator * segments);
-			const auto length = left / float64(segments);
-
-			auto start = 0. + (arc::kQuarterLength + (separator / 2));
-			for (const auto &segment : ranges::views::reverse(_segments)) {
-				p.setPen(QPen(
-					segment.brush,
-					segment.width,
-					Qt::SolidLine,
-					Qt::RoundCap));
-				const auto from = int(base::SafeRound(start));
-				const auto till = int(base::SafeRound(start + length));
-				p.drawArc(outline, from, till - from);
-				start += length + separator;
-			}
+			PaintOutlineSegments(p, outline, _segments);
 		}
 		p.setOpacity(1.);
 	}
@@ -511,7 +497,7 @@ void RoundImageCheckbox::setColorOverride(std::optional<QBrush> fg) {
 }
 
 void RoundImageCheckbox::setCustomizedSegments(
-		std::vector<Segment> segments) {
+		std::vector<Ui::OutlineSegment> segments) {
 	_segments = std::move(segments);
 }
 
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h
index 9247c226e..ff24ac597 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.h
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h
@@ -15,6 +15,8 @@ enum class ImageRoundRadius;
 
 namespace Ui {
 
+struct OutlineSegment;
+
 class RoundCheckbox {
 public:
 	RoundCheckbox(const style::RoundCheckbox &st, Fn<void()> updateCallback);
@@ -45,26 +47,22 @@ private:
 
 };
 
-struct RoundImageCheckboxSegment {
-	QBrush brush;
-	float64 width = 0.;
-};
-
 class RoundImageCheckbox {
 public:
-	using Segment = RoundImageCheckboxSegment;
 	using PaintRoundImage = Fn<void(Painter &p, int x, int y, int outerWidth, int size)>;
 	RoundImageCheckbox(
 		const style::RoundImageCheckbox &st,
 		Fn<void()> updateCallback,
 		PaintRoundImage &&paintRoundImage,
 		Fn<std::optional<int>(int size)> roundingRadius = nullptr);
+	RoundImageCheckbox(RoundImageCheckbox&&);
+	~RoundImageCheckbox();
 
 	void paint(Painter &p, int x, int y, int outerWidth) const;
 	float64 checkedAnimationRatio() const;
 
 	void setColorOverride(std::optional<QBrush> fg);
-	void setCustomizedSegments(std::vector<Segment> segments);
+	void setCustomizedSegments(std::vector<OutlineSegment> segments);
 
 	bool checked() const {
 		return _check.checked();
@@ -91,7 +89,7 @@ private:
 	RoundCheckbox _check;
 
 	//std::optional<QBrush> _fgOverride;
-	std::vector<Segment> _segments;
+	std::vector<OutlineSegment> _segments;
 
 };
 
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 08b9990c4..d5ea92dcb 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -267,6 +267,8 @@ PRIVATE
     ui/effects/glare.h
     ui/effects/loading_element.cpp
     ui/effects/loading_element.h
+    ui/effects/outline_segments.cpp
+    ui/effects/outline_segments.h
     ui/effects/premium_graphics.cpp
     ui/effects/premium_graphics.h
     ui/effects/premium_stars.cpp

From 04f1a7be02f268ec6f3c566c50849b3e2b7a8320 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 20:47:31 +0400
Subject: [PATCH 414/676] Preload not_hidden -> hidden -> archive.

---
 Telegram/SourceFiles/data/data_stories.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 848227a5d..4f81cd447 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -280,6 +280,7 @@ private:
 	[[nodiscard]] FullStoryId nextPreloadId() const;
 	void startPreloading(not_null<Story*> story);
 	void preloadFinished(FullStoryId id, bool markAsPreloaded = false);
+	void preloadListsMore();
 
 	[[nodiscard]] int pollingInterval(
 		const PollingSettings &settings) const;

From 734c5c6740c1f76f892602c442042bbb5a1d9f91 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 20:47:44 +0400
Subject: [PATCH 415/676] Use a single Ui::UnreadStoryOutlineGradient.

---
 .../boxes/peer_list_controllers.cpp           | 10 ++-----
 Telegram/SourceFiles/data/data_stories.cpp    | 26 +++++++++++++++++++
 Telegram/SourceFiles/dialogs/dialogs_row.cpp  | 13 +++++-----
 .../dialogs/ui/dialogs_stories_list.cpp       |  9 +++----
 .../view/media/history_view_story_mention.cpp | 16 ++++--------
 .../ui/effects/outline_segments.cpp           |  9 +++++++
 .../SourceFiles/ui/effects/outline_segments.h |  2 ++
 7 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 10e393b56..88f0fac9a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -84,14 +84,8 @@ constexpr auto kSearchPerPage = 50;
 	const auto &st = st::contactsWithStories.item;
 	const auto left = st.photoPosition.x();
 	const auto top = st.photoPosition.y();
-	auto gradient = QLinearGradient(
-		QPoint(left + st.photoSize, top),
-		QPoint(left, top + st.photoSize));
-	gradient.setStops({
-		{ 0., st::groupCallLive1->c },
-		{ 1., st::groupCallMuted1->c },
-	});
-	return QBrush(gradient);
+	const auto size = st.photoSize;
+	return Ui::UnreadStoryOutlineGradient(QRectF(left, top, size, size));
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 20db4a13a..d5ebe356c 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -531,11 +531,37 @@ void Stories::loadMore(StorySourcesList list) {
 			}
 		}, [](const MTPDstories_allStoriesNotModified &) {
 		});
+
+		preloadListsMore();
 	}).fail([=] {
 		_loadMoreRequestId[index] = 0;
 	}).send();
 }
 
+void Stories::preloadListsMore() {
+	if (_loadMoreRequestId[static_cast<int>(StorySourcesList::NotHidden)]
+		|| _loadMoreRequestId[static_cast<int>(StorySourcesList::Hidden)]) {
+		return;
+	}
+	const auto loading = [&](StorySourcesList list) {
+		return _loadMoreRequestId[static_cast<int>(list)] != 0;
+	};
+	const auto countLoaded = [&](StorySourcesList list) {
+		const auto index = static_cast<int>(list);
+		return _sourcesLoaded[index] || !_sourcesStates[index].isEmpty();
+	};
+	if (loading(StorySourcesList::NotHidden)
+		|| loading(StorySourcesList::Hidden)) {
+		return;
+	} else if (!countLoaded(StorySourcesList::NotHidden)) {
+		loadMore(StorySourcesList::NotHidden);
+	} else if (!countLoaded(StorySourcesList::Hidden)) {
+		loadMore(StorySourcesList::Hidden);
+	} else if (!archiveCountKnown()) {
+		archiveLoadMore();
+	}
+}
+
 void Stories::sendResolveRequests() {
 	if (!_resolveSent.empty()) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 102ad6dd5..649fea059 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/chat/chat_theme.h" // CountAverageColor.
 #include "ui/color_contrast.h"
+#include "ui/effects/outline_segments.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/image/image_prepare.h"
 #include "ui/text/format_values.h"
@@ -372,13 +373,11 @@ void Row::PaintCornerBadgeFrame(
 			}
 			const auto left = st->padding.left();
 			const auto top = st->padding.top();
-			auto gradient = QLinearGradient(
-				QPoint(left + st->photoSize, top),
-				QPoint(left, top + st->photoSize));
-			gradient.setStops({
-				{ 0., st::groupCallLive1->c },
-				{ 1., st::groupCallMuted1->c },
-			});
+			auto gradient = Ui::UnreadStoryOutlineGradient(QRectF(
+				st->padding.left(),
+				st->padding.top(),
+				st->photoSize,
+				st->photoSize));
 			return QBrush(gradient);
 		};
 		const auto storiesBrush = data->storiesUnread
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 6e89cb043..9b3e90027 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -394,11 +394,7 @@ void List::paintEvent(QPaintEvent *e) {
 			}
 		}
 	};
-	auto gradient = QLinearGradient();
-	gradient.setStops({
-		{ 0., st::groupCallLive1->c },
-		{ 1., st::groupCallMuted1->c },
-	});
+	auto gradient = Ui::UnreadStoryOutlineGradient();
 	enumerate([&](Single single) {
 		// Name.
 		if (const auto full = single.itemFull) {
@@ -495,7 +491,8 @@ void List::paintEvent(QPaintEvent *e) {
 			Ui::PaintOutlineSegments(
 				p,
 				rect,
-				itemFull->segments);
+				itemFull->segments,
+				layout.segmentsSpinProgress);
 		}
 
 		// Userpic.
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
index 8aefb319b..07a469097 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_style.h"
+#include "ui/effects/outline_segments.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/painter.h"
@@ -124,23 +125,16 @@ void StoryMention::draw(
 		geometry.topLeft() + QPoint(padding, padding),
 		_thumbnail->image(size));
 
-	const auto thumbnail = geometry.marginsRemoved(
-		QMargins(padding, padding, padding, padding));
+	const auto thumbnail = QRectF(geometry.marginsRemoved(
+		QMargins(padding, padding, padding, padding)));
 	const auto added = 0.5 * (_unread
 		? st::storyMentionUnreadSkipTwice
 		: st::storyMentionReadSkipTwice);
 	const auto outline = thumbnail.marginsAdded(
-		QMargins(added, added, added, added));
+		QMarginsF(added, added, added, added));
 	if (_unread && _paletteVersion != style::PaletteVersion()) {
 		_paletteVersion = style::PaletteVersion();
-		auto gradient = QLinearGradient(
-			outline.topRight(),
-			outline.bottomLeft());
-		gradient.setStops({
-			{ 0., st::groupCallLive1->c },
-			{ 1., st::groupCallMuted1->c },
-		});
-		_unreadBrush = QBrush(gradient);
+		_unreadBrush = QBrush(Ui::UnreadStoryOutlineGradient(outline));
 	}
 	auto readColor = context.st->msgServiceFg()->c;
 	readColor.setAlphaF(std::min(1. * readColor.alphaF(), kReadOutlineAlpha));
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.cpp b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
index 2482217e7..bb9befb8b 100644
--- a/Telegram/SourceFiles/ui/effects/outline_segments.cpp
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
@@ -70,4 +70,13 @@ void PaintOutlineSegments(
 	}
 }
 
+QLinearGradient UnreadStoryOutlineGradient(QRectF rect) {
+	auto result = QLinearGradient(rect.topRight(), rect.bottomLeft());
+	result.setStops({
+		{ 0., st::groupCallLive1->c },
+		{ 1., st::groupCallMuted1->c },
+	});
+	return result;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.h b/Telegram/SourceFiles/ui/effects/outline_segments.h
index fd4835595..c777827a4 100644
--- a/Telegram/SourceFiles/ui/effects/outline_segments.h
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.h
@@ -20,4 +20,6 @@ void PaintOutlineSegments(
 	const std::vector<OutlineSegment> &segments,
 	float64 fromFullProgress = 1.);
 
+[[nodiscard]] QLinearGradient UnreadStoryOutlineGradient(QRectF rect = {});
+
 } // namespace Ui

From 88180121826eebd34580fbc415caec17be641c8a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 21:07:36 +0400
Subject: [PATCH 416/676] Show segments around chats list userpics.

---
 Telegram/SourceFiles/dialogs/dialogs_row.cpp | 87 ++++++++++++--------
 Telegram/SourceFiles/dialogs/dialogs_row.h   |  6 +-
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 649fea059..1a8778b90 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_folder.h"
 #include "data/data_forum.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_peer_values.h"
 #include "data/data_user.h"
 #include "history/history.h"
@@ -342,12 +343,14 @@ void Row::PaintCornerBadgeFrame(
 	Painter q(&data->frame);
 	q.translate(framePadding, framePadding);
 	auto hq = std::optional<PainterHighQualityEnabler>();
-	if (data->storiesShown) {
+	const auto photoSize = context.st->photoSize;
+	const auto storiesCount = data->storiesCount;
+	if (storiesCount) {
 		hq.emplace(q);
 		const auto line = st::dialogsStoriesFull.lineTwice / 2.;
 		const auto skip = line * 3 / 2.;
-		const auto scale = 1. - (2 * skip / context.st->photoSize);
-		const auto center = context.st->photoSize / 2.;
+		const auto scale = 1. - (2 * skip / photoSize);
+		const auto center = photoSize / 2.;
 		q.save();
 		q.translate(center, center);
 		q.scale(scale, scale);
@@ -361,41 +364,43 @@ void Row::PaintCornerBadgeFrame(
 		0,
 		0,
 		data->frame.width() / data->frame.devicePixelRatio(),
-		context.st->photoSize,
+		photoSize,
 		context.paused);
-	if (data->storiesShown) {
+	if (storiesCount) {
 		q.restore();
 
 		const auto st = context.st;
+		const auto outline = QRectF(0, 0, photoSize, photoSize);
+		const auto storiesUnreadCount = data->storiesUnreadCount;
 		const auto storiesUnreadBrush = [&] {
-			if (context.active) {
+			if (context.active || !storiesUnreadCount) {
 				return st::dialogsUnreadBgMutedActive->b;
 			}
 			const auto left = st->padding.left();
 			const auto top = st->padding.top();
-			auto gradient = Ui::UnreadStoryOutlineGradient(QRectF(
-				st->padding.left(),
-				st->padding.top(),
-				st->photoSize,
-				st->photoSize));
+			auto gradient = Ui::UnreadStoryOutlineGradient(outline);
 			return QBrush(gradient);
-		};
-		const auto storiesBrush = data->storiesUnread
-			? storiesUnreadBrush()
-			: context.active
+		}();
+		const auto storiesBrush = context.active
 			? st::dialogsUnreadBgMutedActive->b
 			: st::dialogsUnreadBgMuted->b;
-		const auto storiesLine = data->storiesUnread
-			? (st::dialogsStoriesFull.lineTwice / 2.)
-			: (st::dialogsStoriesFull.lineReadTwice / 2.);
-		const auto pen = QPen(storiesBrush, storiesLine);
-		q.setPen(pen);
-		q.drawEllipse(0, 0, st->photoSize, st->photoSize);
+		const auto storiesUnread = st::dialogsStoriesFull.lineTwice / 2.;
+		const auto storiesLine = st::dialogsStoriesFull.lineReadTwice / 2.;
+		auto segments = std::vector<Ui::OutlineSegment>();
+		segments.reserve(storiesCount);
+		const auto storiesReadCount = storiesCount - storiesUnreadCount;
+		for (auto i = 0; i != storiesReadCount; ++i) {
+			segments.push_back({ storiesBrush, storiesLine });
+		}
+		for (auto i = 0; i != storiesUnreadCount; ++i) {
+			segments.push_back({ storiesUnreadBrush, storiesUnread });
+		}
+		Ui::PaintOutlineSegments(q, outline, segments);
 	}
 
 	const auto &manager = data->layersManager;
 	if (const auto p = manager.progressForLayer(kBottomLayer); p > 0.) {
-		const auto size = context.st->photoSize;
+		const auto size = photoSize;
 		if (data->cacheTTL.isNull() && peer->messagesTTL()) {
 			data->cacheTTL = CornerBadgeTTL(peer, view, size);
 		}
@@ -430,8 +435,8 @@ void Row::PaintCornerBadgeFrame(
 		? st::dialogsOnlineBadgeFgActive
 		: st::dialogsOnlineBadgeFg);
 	q.drawEllipse(QRectF(
-		context.st->photoSize - skip.x() - size,
-		context.st->photoSize - skip.y() - size,
+		photoSize - skip.x() - size,
+		photoSize - skip.y() - size,
 		size,
 		size
 	).marginsRemoved({ shrink, shrink, shrink, shrink }));
@@ -451,11 +456,8 @@ void Row::paintUserpic(
 	const auto storiesUser = historyForCornerBadge
 		? historyForCornerBadge->peer->asUser()
 		: nullptr;
-	const auto storiesShown = (storiesUser
-		&& storiesUser->hasActiveStories()) ? 1 : 0;
-	const auto storiesUnread = (storiesShown
-		&& storiesUser->hasUnreadStories()) ? 1 : 0;
-	if (!historyForCornerBadge || (!cornerBadgeShown && !storiesShown)) {
+	const auto storiesHas = storiesUser && storiesUser->hasActiveStories();
+	if (!historyForCornerBadge || (!cornerBadgeShown && !storiesHas)) {
 		BasicRow::paintUserpic(
 			p,
 			peer,
@@ -476,6 +478,22 @@ void Row::paintUserpic(
 	const auto frameSide = (2 * framePadding + context.st->photoSize)
 		* ratio;
 	const auto frameSize = QSize(frameSide, frameSide);
+	const auto storiesSource = storiesHas
+		? storiesUser->owner().stories().source(storiesUser->id)
+		: nullptr;
+	const auto storiesCountReal = storiesSource
+		? int(storiesSource->ids.size())
+		: storiesHas
+		? 1
+		: 0;
+	const auto storiesUnreadCountReal = storiesSource
+		? storiesSource->unreadCount()
+		: (storiesHas && storiesUser->hasUnreadStories())
+		? 1
+		: 0;
+	const auto limit = (1 << 7) - 1;
+	const auto storiesCount = std::min(storiesCountReal, limit);
+	const auto storiesUnreadCount = std::min(storiesUnreadCountReal, limit);
 	if (_cornerBadgeUserpic->frame.size() != frameSize) {
 		_cornerBadgeUserpic->frame = QImage(
 			frameSize,
@@ -485,7 +503,8 @@ void Row::paintUserpic(
 	auto key = peer->userpicUniqueKey(userpicView());
 	key.first += peer->messagesTTL();
 	const auto frameIndex = videoUserpic ? videoUserpic->frameIndex() : -1;
-	const auto paletteVersion = style::PaletteVersion();
+	const auto paletteVersionReal = style::PaletteVersion();
+	const auto paletteVersion = (paletteVersionReal & ((1 << 17) - 1));
 	const auto active = context.active ? 1 : 0;
 	const auto keyChanged = (_cornerBadgeUserpic->key != key)
 		|| (_cornerBadgeUserpic->paletteVersion != paletteVersion);
@@ -496,14 +515,14 @@ void Row::paintUserpic(
 		|| !_cornerBadgeUserpic->layersManager.isFinished()
 		|| _cornerBadgeUserpic->active != active
 		|| _cornerBadgeUserpic->frameIndex != frameIndex
-		|| _cornerBadgeUserpic->storiesShown != storiesShown
-		|| _cornerBadgeUserpic->storiesUnread != storiesUnread
+		|| _cornerBadgeUserpic->storiesCount != storiesCount
+		|| _cornerBadgeUserpic->storiesUnreadCount != storiesUnreadCount
 		|| videoUserpic) {
 		_cornerBadgeUserpic->key = key;
 		_cornerBadgeUserpic->paletteVersion = paletteVersion;
 		_cornerBadgeUserpic->active = active;
-		_cornerBadgeUserpic->storiesShown = storiesShown;
-		_cornerBadgeUserpic->storiesUnread = storiesUnread;
+		_cornerBadgeUserpic->storiesCount = storiesCount;
+		_cornerBadgeUserpic->storiesUnreadCount = storiesUnreadCount;
 		_cornerBadgeUserpic->frameIndex = frameIndex;
 		_cornerBadgeUserpic->layersManager.markFrameShown();
 		PaintCornerBadgeFrame(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h
index 78e638093..86120ec3d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.h
@@ -170,9 +170,9 @@ private:
 		QImage frame;
 		QImage cacheTTL;
 		int frameIndex = -1;
-		uint32 paletteVersion : 24 = 0;
-		uint32 storiesShown : 1 = 0;
-		uint32 storiesUnread : 1 = 0;
+		uint32 paletteVersion : 17 = 0;
+		uint32 storiesCount : 7 = 0;
+		uint32 storiesUnreadCount : 7 = 0;
 		uint32 active : 1 = 0;
 	};
 

From 35214d108e3e65d7178731dcce08956caaebb5f6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 09:37:37 +0400
Subject: [PATCH 417/676] Move Bio privacy up a bit.

---
 .../SourceFiles/settings/settings_privacy_security.cpp    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 92f8229fe..7554dba27 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -281,6 +281,10 @@ void SetupPrivacy(
 		tr::lng_settings_profile_photo_privacy(),
 		Key::ProfilePhoto,
 		[] { return std::make_unique<ProfilePhotoPrivacyController>(); });
+	add(
+		tr::lng_settings_bio_privacy(),
+		Key::About,
+		[] { return std::make_unique<AboutPrivacyController>(); });
 	add(
 		tr::lng_settings_forwards_privacy(),
 		Key::Forwards,
@@ -300,10 +304,6 @@ void SetupPrivacy(
 		tr::lng_settings_voices_privacy(),
 		Key::Voices,
 		[=] { return std::make_unique<VoicesPrivacyController>(session); });
-	add(
-		tr::lng_settings_bio_privacy(),
-		Key::About,
-		[] { return std::make_unique<AboutPrivacyController>(); });
 
 	session->api().userPrivacy().reload(Api::UserPrivacy::Key::AddedByPhone);
 

From 4402cce928de5995ef6ecebc0d6267e122e619b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 12:15:19 +0400
Subject: [PATCH 418/676] Allow archive with stories only.

---
 Telegram/Resources/langs/lang.strings         |  8 +-
 Telegram/SourceFiles/data/data_folder.cpp     | 44 +++++++++-
 Telegram/SourceFiles/data/data_folder.h       |  7 ++
 Telegram/SourceFiles/data/data_stories.cpp    | 36 ++++++--
 Telegram/SourceFiles/data/data_stories.h      |  5 ++
 Telegram/SourceFiles/dialogs/dialogs.style    |  2 +-
 Telegram/SourceFiles/dialogs/dialogs_row.cpp  | 84 +++++++++----------
 Telegram/SourceFiles/dialogs/dialogs_row.h    | 12 +--
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  1 +
 .../SourceFiles/dialogs/ui/dialogs_layout.cpp | 21 ++---
 .../dialogs/ui/dialogs_video_userpic.cpp      | 27 +++++-
 .../dialogs/ui/dialogs_video_userpic.h        | 14 ++++
 .../ui/effects/outline_segments.cpp           |  2 +-
 .../SourceFiles/ui/effects/outline_segments.h |  2 +
 .../SourceFiles/window/window_main_menu.cpp   | 15 ++--
 .../window/window_session_controller.cpp      |  3 +-
 Telegram/lib_ui                               |  2 +-
 17 files changed, 207 insertions(+), 78 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0fea4928d..592cc337e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3822,8 +3822,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_userpic_builder_emoji_subtitle" = "Choose sticker or emoji";
 
 "lng_stories_my_name" = "My Story";
-"lng_stories_archive" = "Archive";
-"lng_stories_unarchive" = "Unarchive";
+"lng_stories_archive" = "Hide Stories";
+"lng_stories_unarchive" = "Unhide Stories";
 "lng_stories_row_count#one" = "{count} Story";
 "lng_stories_row_count#other" = "{count} Stories";
 "lng_stories_views#one" = "{count} view";
@@ -3838,8 +3838,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_title" = "Stories Archive";
 "lng_stories_archive_about" = "Only you can see archived stories unless you choose to save them to your profile.";
 "lng_stories_reply_sent" = "Message Sent";
-"lng_stories_hidden_to_contacts" = "Stories of {user} were moved to **Archive**.";
-"lng_stories_shown_in_chats" = "Stories of {user} were moved to the **Chats List**.";
+"lng_stories_hidden_to_contacts" = "Stories from {user} will now be shown in **Archived Chats**.";
+"lng_stories_shown_in_chats" = "Stories from {user} will now be shown in the **Chats List**.";
 "lng_stories_delete_one_sure" = "Are you sure you want to delete this story?";
 "lng_stories_delete_sure#one" = "Are you sure you want to delete {count} story?";
 "lng_stories_delete_sure#other" = "Are you sure you want to delete {count} stories?";
diff --git a/Telegram/SourceFiles/data/data_folder.cpp b/Telegram/SourceFiles/data/data_folder.cpp
index 4faa19f71..743487c85 100644
--- a/Telegram/SourceFiles/data/data_folder.cpp
+++ b/Telegram/SourceFiles/data/data_folder.cpp
@@ -39,6 +39,21 @@ constexpr auto kShowChatNamesCount = 8;
 		not_null<Folder*> folder) {
 	const auto &list = folder->lastHistories();
 	if (list.empty()) {
+		if (const auto storiesUnread = folder->storiesUnreadCount()) {
+			return {
+				tr::lng_contacts_stories_status_new(
+					tr::now,
+					lt_count,
+					storiesUnread),
+			};
+		} else if (const auto storiesCount = folder->storiesCount()) {
+			return {
+				tr::lng_contacts_stories_status(
+					tr::now,
+					lt_count,
+					storiesCount),
+			};
+		}
 		return {};
 	}
 
@@ -301,6 +316,33 @@ void Folder::validateListEntryCache() {
 		Ui::ItemTextDefaultOptions());
 }
 
+void Folder::updateStoriesCount(int count, int unread) {
+	if (_storiesCount == count && _storiesUnreadCount == unread) {
+		return;
+	}
+	const auto limit = (1 << 16) - 1;
+	const auto was = (_storiesCount > 0);
+	_storiesCount = std::min(count, limit);
+	_storiesUnreadCount = std::min(unread, limit);
+	const auto now = (_storiesCount > 0);
+	if (was == now) {
+		updateChatListEntryPostponed();
+	} else if (now) {
+		updateChatListSortPosition();
+	} else {
+		updateChatListExistence();
+	}
+	++_chatListViewVersion;
+}
+
+int Folder::storiesCount() const {
+	return _storiesCount;
+}
+
+int Folder::storiesUnreadCount() const {
+	return _storiesUnreadCount;
+}
+
 void Folder::requestChatListMessage() {
 	if (!chatListMessageKnown()) {
 		owner().histories().requestDialogEntry(this);
@@ -339,7 +381,7 @@ int Folder::fixedOnTopIndex() const {
 }
 
 bool Folder::shouldBeInChatList() const {
-	return !_chatsList.empty();
+	return !_chatsList.empty() || (_storiesCount > 0);
 }
 
 Dialogs::UnreadState Folder::chatListUnreadState() const {
diff --git a/Telegram/SourceFiles/data/data_folder.h b/Telegram/SourceFiles/data/data_folder.h
index 9e62fcabe..7008adac0 100644
--- a/Telegram/SourceFiles/data/data_folder.h
+++ b/Telegram/SourceFiles/data/data_folder.h
@@ -75,6 +75,10 @@ public:
 		return _listEntryCache;
 	}
 
+	void updateStoriesCount(int count, int unread);
+	[[nodiscard]] int storiesCount() const;
+	[[nodiscard]] int storiesUnreadCount() const;
+
 private:
 	void indexNameParts();
 
@@ -104,6 +108,9 @@ private:
 	int _chatListViewVersion = 0;
 	//rpl::variable<MessagePosition> _unreadPosition;
 
+	uint16_t _storiesCount = 0;
+	uint16_t _storiesUnreadCount = 0;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index d5ebe356c..904813765 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
+#include "data/data_folder.h"
 #include "data/data_photo.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
@@ -562,6 +563,31 @@ void Stories::preloadListsMore() {
 	}
 }
 
+void Stories::notifySourcesChanged(StorySourcesList list) {
+	_sourcesChanged[static_cast<int>(list)].fire({});
+	if (list == StorySourcesList::Hidden) {
+		pushHiddenCountsToFolder();
+	}
+}
+
+void Stories::pushHiddenCountsToFolder() {
+	const auto &list = sources(StorySourcesList::Hidden);
+	if (list.empty()) {
+		if (_folderForHidden) {
+			_folderForHidden->updateStoriesCount(0, 0);
+		}
+		return;
+	}
+	if (!_folderForHidden) {
+		_folderForHidden = _owner->folder(Folder::kId);
+	}
+	const auto count = int(list.size());
+	const auto unread = ranges::count_if(
+		list,
+		[](const StoriesSourceInfo &info) { return info.unreadCount > 0; });
+	_folderForHidden->updateStoriesCount(count, unread);
+}
+
 void Stories::sendResolveRequests() {
 	if (!_resolveSent.empty()) {
 		return;
@@ -722,7 +748,7 @@ void Stories::applyRemovedFromActive(FullStoryId id) {
 			&StoriesSourceInfo::id);
 		if (i != end(sources)) {
 			sources.erase(i);
-			_sourcesChanged[index].fire({});
+			notifySourcesChanged(list);
 		}
 	};
 	const auto i = _all.find(id.peer);
@@ -751,7 +777,7 @@ void Stories::applyDeletedFromSources(PeerId id, StorySourcesList list) {
 	if (i != end(sources)) {
 		sources.erase(i);
 	}
-	_sourcesChanged[static_cast<int>(list)].fire({});
+	notifySourcesChanged(list);
 }
 
 void Stories::removeDependencyStory(not_null<Story*> story) {
@@ -780,7 +806,7 @@ void Stories::sort(StorySourcesList list) {
 		return std::make_pair(key, info.id);
 	};
 	ranges::sort(sources, ranges::greater(), proj);
-	_sourcesChanged[index].fire({});
+	notifySourcesChanged(list);
 	preloadSourcesChanged(list);
 }
 
@@ -1044,7 +1070,7 @@ void Stories::toggleHidden(
 		const auto i = ranges::find(_sources[main], peerId, proj);
 		if (i != end(_sources[main])) {
 			_sources[main].erase(i);
-			_sourcesChanged[main].fire({});
+			notifySourcesChanged(StorySourcesList::NotHidden);
 			preloadSourcesChanged(StorySourcesList::NotHidden);
 		}
 		const auto j = ranges::find(_sources[other], peerId, proj);
@@ -1058,7 +1084,7 @@ void Stories::toggleHidden(
 		const auto i = ranges::find(_sources[other], peerId, proj);
 		if (i != end(_sources[other])) {
 			_sources[other].erase(i);
-			_sourcesChanged[other].fire({});
+			notifySourcesChanged(StorySourcesList::Hidden);
 			preloadSourcesChanged(StorySourcesList::Hidden);
 		}
 		const auto j = ranges::find(_sources[main], peerId, proj);
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 4f81cd447..27eb0f761 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -24,6 +24,7 @@ enum class ReportReason;
 
 namespace Data {
 
+class Folder;
 class Session;
 struct StoryView;
 struct StoryIdDates;
@@ -282,6 +283,9 @@ private:
 	void preloadFinished(FullStoryId id, bool markAsPreloaded = false);
 	void preloadListsMore();
 
+	void notifySourcesChanged(StorySourcesList list);
+	void pushHiddenCountsToFolder();
+
 	[[nodiscard]] int pollingInterval(
 		const PollingSettings &settings) const;
 	void maybeSchedulePolling(
@@ -319,6 +323,7 @@ private:
 	rpl::event_stream<> _sourcesChanged[kStorySourcesListCount];
 	bool _sourcesLoaded[kStorySourcesListCount] = { false };
 	QString _sourcesStates[kStorySourcesListCount];
+	Folder *_folderForHidden = nullptr;
 
 	mtpRequestId _loadMoreRequestId[kStorySourcesListCount] = { 0 };
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 418584f7b..69849adc8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -257,7 +257,7 @@ dialogsFilter: InputField(defaultInputField) {
 	placeholderFg: placeholderFg;
 	placeholderFgActive: placeholderFgActive;
 	placeholderFgError: placeholderFgActive;
-	placeholderMargins: margins(2px, 0px, 2px, 0px);
+	placeholderMargins: margins(5px, 0px, 2px, 0px);
 	placeholderScale: 0.;
 	placeholderShift: -50px;
 	placeholderFont: normalFont;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 1a8778b90..f8d748d0d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -233,20 +233,11 @@ void BasicRow::paintRipple(
 
 void BasicRow::paintUserpic(
 		Painter &p,
-		not_null<PeerData*> peer,
+		not_null<Entry*> entry,
+		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		History *historyForCornerBadge,
 		const Ui::PaintContext &context) const {
-	PaintUserpic(
-		p,
-		peer,
-		videoUserpic,
-		_userpic,
-		context.st->padding.left(),
-		context.st->padding.top(),
-		context.width,
-		context.st->photoSize,
-		context.paused);
+	PaintUserpic(p, entry, peer, videoUserpic, _userpic, context);
 }
 
 Row::Row(Key key, int index, int top) : _id(key), _top(top), _index(index) {
@@ -334,7 +325,8 @@ void Row::ensureCornerBadgeUserpic() const {
 void Row::PaintCornerBadgeFrame(
 		not_null<CornerBadgeUserpic*> data,
 		int framePadding,
-		not_null<PeerData*> peer,
+		not_null<Entry*> entry,
+		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
 		Ui::PeerUserpicView &view,
 		const Ui::PaintContext &context) {
@@ -356,16 +348,15 @@ void Row::PaintCornerBadgeFrame(
 		q.scale(scale, scale);
 		q.translate(-center, -center);
 	}
+	q.translate(-context.st->padding.left(), -context.st->padding.top());
 	PaintUserpic(
 		q,
+		entry,
 		peer,
 		videoUserpic,
 		view,
-		0,
-		0,
-		data->frame.width() / data->frame.devicePixelRatio(),
-		photoSize,
-		context.paused);
+		context);
+	q.translate(context.st->padding.left(), context.st->padding.top());
 	if (storiesCount) {
 		q.restore();
 
@@ -401,7 +392,7 @@ void Row::PaintCornerBadgeFrame(
 	const auto &manager = data->layersManager;
 	if (const auto p = manager.progressForLayer(kBottomLayer); p > 0.) {
 		const auto size = photoSize;
-		if (data->cacheTTL.isNull() && peer->messagesTTL()) {
+		if (data->cacheTTL.isNull() && peer && peer->messagesTTL()) {
 			data->cacheTTL = CornerBadgeTTL(peer, view, size);
 		}
 		q.setOpacity(p);
@@ -419,11 +410,12 @@ void Row::PaintCornerBadgeFrame(
 	}
 	q.setCompositionMode(QPainter::CompositionMode_Source);
 
-	const auto size = peer->isUser()
+	const auto online = peer && peer->isUser();
+	const auto size = online
 		? st::dialogsOnlineBadgeSize
 		: st::dialogsCallBadgeSize;
 	const auto stroke = st::dialogsOnlineBadgeStroke;
-	const auto skip = peer->isUser()
+	const auto skip = online
 		? st::dialogsOnlineBadgeSkip
 		: st::dialogsCallBadgeSkip;
 	const auto shrink = (size / 2) * (1. - topLayerProgress);
@@ -444,27 +436,27 @@ void Row::PaintCornerBadgeFrame(
 
 void Row::paintUserpic(
 		Painter &p,
-		not_null<PeerData*> peer,
+		not_null<Entry*> entry,
+		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		History *historyForCornerBadge,
 		const Ui::PaintContext &context) const {
-	updateCornerBadgeShown(peer);
+	if (peer) {
+		updateCornerBadgeShown(peer);
+	}
 
 	const auto cornerBadgeShown = !_cornerBadgeUserpic
 		? _cornerBadgeShown
 		: !_cornerBadgeUserpic->layersManager.isDisplayedNone();
-	const auto storiesUser = historyForCornerBadge
-		? historyForCornerBadge->peer->asUser()
-		: nullptr;
-	const auto storiesHas = storiesUser && storiesUser->hasActiveStories();
-	if (!historyForCornerBadge || (!cornerBadgeShown && !storiesHas)) {
-		BasicRow::paintUserpic(
-			p,
-			peer,
-			videoUserpic,
-			historyForCornerBadge,
-			context);
-		if (!historyForCornerBadge || !_cornerBadgeShown) {
+	const auto storiesUser = peer ? peer->asUser() : nullptr;
+	const auto storiesFolder = peer ? nullptr : _id.folder();
+	const auto storiesHas = storiesUser
+		? storiesUser->hasActiveStories()
+		: storiesFolder
+		? storiesFolder->storiesCount()
+		: false;
+	if (!cornerBadgeShown && !storiesHas) {
+		BasicRow::paintUserpic(p, entry, peer, videoUserpic, context);
+		if (!peer || !_cornerBadgeShown) {
 			_cornerBadgeUserpic = nullptr;
 		}
 		return;
@@ -478,20 +470,24 @@ void Row::paintUserpic(
 	const auto frameSide = (2 * framePadding + context.st->photoSize)
 		* ratio;
 	const auto frameSize = QSize(frameSide, frameSide);
-	const auto storiesSource = storiesHas
+	const auto storiesSource = (storiesHas && storiesUser)
 		? storiesUser->owner().stories().source(storiesUser->id)
 		: nullptr;
 	const auto storiesCountReal = storiesSource
 		? int(storiesSource->ids.size())
+		: storiesFolder
+		? storiesFolder->storiesCount()
 		: storiesHas
 		? 1
 		: 0;
 	const auto storiesUnreadCountReal = storiesSource
 		? storiesSource->unreadCount()
-		: (storiesHas && storiesUser->hasUnreadStories())
+		: storiesFolder
+		? storiesFolder->storiesUnreadCount()
+		: (storiesUser && storiesUser->hasUnreadStories())
 		? 1
 		: 0;
-	const auto limit = (1 << 7) - 1;
+	const auto limit = Ui::kOutlineSegmentsMax;
 	const auto storiesCount = std::min(storiesCountReal, limit);
 	const auto storiesUnreadCount = std::min(storiesUnreadCountReal, limit);
 	if (_cornerBadgeUserpic->frame.size() != frameSize) {
@@ -500,8 +496,8 @@ void Row::paintUserpic(
 			QImage::Format_ARGB32_Premultiplied);
 		_cornerBadgeUserpic->frame.setDevicePixelRatio(ratio);
 	}
-	auto key = peer->userpicUniqueKey(userpicView());
-	key.first += peer->messagesTTL();
+	auto key = peer ? peer->userpicUniqueKey(userpicView()) : InMemoryKey();
+	key.first += peer ? peer->messagesTTL() : 0;
 	const auto frameIndex = videoUserpic ? videoUserpic->frameIndex() : -1;
 	const auto paletteVersionReal = style::PaletteVersion();
 	const auto paletteVersion = (paletteVersionReal & ((1 << 17) - 1));
@@ -528,6 +524,7 @@ void Row::paintUserpic(
 		PaintCornerBadgeFrame(
 			_cornerBadgeUserpic.get(),
 			framePadding,
+			_id.entry(),
 			peer,
 			videoUserpic,
 			userpicView(),
@@ -537,10 +534,11 @@ void Row::paintUserpic(
 		context.st->padding.left() - framePadding,
 		context.st->padding.top() - framePadding,
 		_cornerBadgeUserpic->frame);
-	if (historyForCornerBadge->peer->isUser()) {
+	const auto history = _id.history();
+	if (!history || history->peer->isUser()) {
 		return;
 	}
-	const auto actionPainter = historyForCornerBadge->sendActionPainter();
+	const auto actionPainter = history->sendActionPainter();
 	const auto bg = context.active
 		? st::dialogsBgActive
 		: st::dialogsBg;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h
index 86120ec3d..eecbd9c4f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.h
@@ -35,6 +35,7 @@ struct TopicJumpCache;
 
 namespace Dialogs {
 
+class Entry;
 enum class SortMode;
 
 [[nodiscard]] QRect CornerBadgeTTLRect(int photoSize);
@@ -46,9 +47,9 @@ public:
 
 	virtual void paintUserpic(
 		Painter &p,
-		not_null<PeerData*> peer,
+		not_null<Entry*> entry,
+		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		History *historyForCornerBadge,
 		const Ui::PaintContext &context) const;
 
 	void addRipple(QPoint origin, QSize size, Fn<void()> updateCallback);
@@ -99,9 +100,9 @@ public:
 		Fn<void()> updateCallback = nullptr) const;
 	void paintUserpic(
 		Painter &p,
-		not_null<PeerData*> peer,
+		not_null<Entry*> entry,
+		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		History *historyForCornerBadge,
 		const Ui::PaintContext &context) const final override;
 
 	[[nodiscard]] bool lookupIsInTopicJump(int x, int y) const;
@@ -183,7 +184,8 @@ private:
 	static void PaintCornerBadgeFrame(
 		not_null<CornerBadgeUserpic*> data,
 		int framePadding,
-		not_null<PeerData*> peer,
+		not_null<Entry*> entry,
+		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
 		Ui::PeerUserpicView &view,
 		const Ui::PaintContext &context);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 7c88ad701..c25b31e5d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1419,6 +1419,7 @@ void Widget::updateStoriesVisibility() {
 			if (_scroll->position().overscroll < 0) {
 				_scroll->scrollToY(0);
 			}
+			_scroll->update();
 		} else {
 			_scroll->setOverscrollDefaults(0, 0);
 			_scroll->setOverscrollTypes(Type::Virtual, Type::Real);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index 7e195ba94..91674bfed 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -331,22 +331,23 @@ void PaintRow(
 			context.st->padding.top(),
 			context.width,
 			context.st->photoSize);
-	} else if (from) {
-		row->paintUserpic(
-			p,
-			from,
-			videoUserpic,
-			(flags & Flag::AllowUserOnline) ? history : nullptr,
-			context);
-	} else if (hiddenSenderInfo) {
+	} else if (!from && hiddenSenderInfo) {
 		hiddenSenderInfo->emptyUserpic.paintCircle(
 			p,
 			context.st->padding.left(),
 			context.st->padding.top(),
 			context.width,
 			context.st->photoSize);
+	} else if (!(flags & Flag::AllowUserOnline)) {
+		PaintUserpic(
+			p,
+			entry,
+			from,
+			videoUserpic,
+			row->userpicView(),
+			context);
 	} else {
-		entry->paintUserpic(p, row->userpicView(), context);
+		row->paintUserpic(p, entry, from, videoUserpic, context);
 	}
 
 	auto nameleft = context.st->nameLeft;
@@ -785,7 +786,7 @@ void RowPainter::Paint(
 			? history->peer->migrateTo()
 			: history->peer.get())
 		: nullptr;
-	const auto allowUserOnline = !context.narrow || badgesState.empty();
+	const auto allowUserOnline = true;// !context.narrow || badgesState.empty();
 	const auto flags = (allowUserOnline ? Flag::AllowUserOnline : Flag(0))
 		| (peer && peer->isSelf() ? Flag::SavedMessages : Flag(0))
 		| (peer && peer->isRepliesChat() ? Flag::RepliesMessages : Flag(0))
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
index cdebd9da4..bfc056243 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
@@ -7,13 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/dialogs_video_userpic.h"
 
-#include "ui/painter.h"
 #include "core/file_location.h"
 #include "data/data_peer.h"
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
 #include "data/data_file_origin.h"
 #include "data/data_session.h"
+#include "dialogs/ui/dialogs_layout.h"
+#include "ui/painter.h"
+#include "styles/style_dialogs.h"
 
 namespace Dialogs::Ui {
 
@@ -129,6 +131,29 @@ void VideoUserpic::clipCallback(Media::Clip::Notification notification) {
 	}
 }
 
+void PaintUserpic(
+		Painter &p,
+		not_null<Entry*> entry,
+		PeerData *peer,
+		VideoUserpic *videoUserpic,
+		PeerUserpicView &view,
+		const Ui::PaintContext &context) {
+	if (peer) {
+		PaintUserpic(
+			p,
+			peer,
+			videoUserpic,
+			view,
+			context.st->padding.left(),
+			context.st->padding.top(),
+			context.width,
+			context.st->photoSize,
+			context.paused);
+	} else {
+		entry->paintUserpic(p, view, context);
+	}
+}
+
 void PaintUserpic(
 		Painter &p,
 		not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.h b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.h
index 6c285ce97..cc06a008c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.h
@@ -19,10 +19,16 @@ namespace Ui {
 struct PeerUserpicView;
 } // namespace Ui
 
+namespace Dialogs {
+class Entry;
+} // namespace Dialogs
+
 namespace Dialogs::Ui {
 
 using namespace ::Ui;
 
+struct PaintContext;
+
 class VideoUserpic final {
 public:
 	VideoUserpic(not_null<PeerData*> peer, Fn<void()> repaint);
@@ -54,6 +60,14 @@ private:
 
 };
 
+void PaintUserpic(
+	Painter &p,
+	not_null<Entry*> entry,
+	PeerData *peer,
+	VideoUserpic *videoUserpic,
+	PeerUserpicView &view,
+	const Ui::PaintContext &context);
+
 void PaintUserpic(
 	Painter &p,
 	not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.cpp b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
index bb9befb8b..5b302056b 100644
--- a/Telegram/SourceFiles/ui/effects/outline_segments.cpp
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
@@ -17,7 +17,7 @@ void PaintOutlineSegments(
 	Expects(!segments.empty());
 
 	p.setBrush(Qt::NoBrush);
-	const auto count = int(segments.size());
+	const auto count = std::min(int(segments.size()), kOutlineSegmentsMax);
 	if (count == 1) {
 		p.setPen(QPen(segments.front().brush, segments.front().width));
 		p.drawEllipse(ellipse);
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.h b/Telegram/SourceFiles/ui/effects/outline_segments.h
index c777827a4..9a38cf9ce 100644
--- a/Telegram/SourceFiles/ui/effects/outline_segments.h
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.h
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
+inline constexpr auto kOutlineSegmentsMax = 50;
+
 struct OutlineSegment {
 	QBrush brush;
 	float64 width = 0.;
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 14f9a1cd1..ba24fba90 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -572,7 +572,7 @@ void MainMenu::setupArchive() {
 	const auto checkArchive = [=] {
 		const auto f = folder();
 		return f
-			&& !f->chatsList()->empty()
+			&& (!f->chatsList()->empty() || f->storiesCount() > 0)
 			&& controller->session().settings().archiveInMainMenu();
 	};
 
@@ -650,10 +650,15 @@ void MainMenu::setupArchive() {
 		return Badge::UnreadBadge{ state.unreadCounter, true };
 	}));
 
-	controller->session().data().chatsListChanges(
-	) | rpl::filter([](Data::Folder *folder) {
-		return folder && (folder->id() == Data::Folder::kId);
-	}) | rpl::start_with_next([=] {
+	rpl::merge(
+		controller->session().data().chatsListChanges(
+		) | rpl::filter([](Data::Folder *folder) {
+			return folder && (folder->id() == Data::Folder::kId);
+		}) | rpl::to_empty,
+		controller->session().data().stories().sourcesChanged(
+			Data::StorySourcesList::Hidden
+		)
+	) | rpl::start_with_next([=] {
 		const auto isArchiveVisible = checkArchive();
 		wrap->toggle(isArchiveVisible, anim::type::normal);
 		if (!isArchiveVisible) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 1a89da1b1..657876a59 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -949,7 +949,8 @@ SessionController::SessionController(
 	) | rpl::filter([=](Data::Folder *folder) {
 		return (folder != nullptr)
 			&& (folder == _openedFolder.current())
-			&& folder->chatsList()->indexed()->empty();
+			&& folder->chatsList()->indexed()->empty()
+			&& !folder->storiesCount();
 	}) | rpl::start_with_next([=](Data::Folder *folder) {
 		folder->updateChatListSortPosition();
 		closeFolder();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index c7e0b7af3..1c0889f78 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit c7e0b7af37bce7ec77195ff717d70457e51e1e7a
+Subproject commit 1c0889f78a74bb29e8cea6986ea8b18e7add7fb0

From fad05e8b353076997e51a476bbf451e903e0f502 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 18:15:44 +0400
Subject: [PATCH 419/676] Update tgcalls.

---
 Telegram/ThirdParty/tgcalls      | 2 +-
 Telegram/cmake/lib_tgcalls.cmake | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 2e2797648..258cf9b35 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 2e2797648aac2588e7fe479c2e8b4455ec65c5e6
+Subproject commit 258cf9b352ee2afde7e08e431f5887cd13119931
diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake
index 94cfdb856..8d730b142 100644
--- a/Telegram/cmake/lib_tgcalls.cmake
+++ b/Telegram/cmake/lib_tgcalls.cmake
@@ -28,6 +28,7 @@ PRIVATE
     CodecSelectHelper.h
     CryptoHelper.cpp
     CryptoHelper.h
+    DirectConnectionChannel.h
     EncryptedConnection.cpp
     EncryptedConnection.h
     FakeAudioDeviceModule.cpp
@@ -64,8 +65,11 @@ PRIVATE
 
     v2/ContentNegotiation.cpp
     v2/ContentNegotiation.h
+    v2/DirectNetworkingImpl.cpp
+    v2/DirectNetworkingImpl.h
     v2/ExternalSignalingConnection.cpp
     v2/ExternalSignalingConnection.h
+    v2/InstanceNetworking.h
     v2/InstanceV2ReferenceImpl.cpp
     v2/InstanceV2ReferenceImpl.h
     v2/InstanceV2Impl.cpp

From f31b40f6cece7cd212b0a6e8afe4bfc007fd3902 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 20:10:15 +0400
Subject: [PATCH 420/676] Add stories outline to group participants list.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   6 +-
 .../boxes/peer_list_controllers.cpp           | 272 ++++++++++--------
 .../SourceFiles/boxes/peer_list_controllers.h |  61 +++-
 .../boxes/peers/edit_participants_box.cpp     |  55 +++-
 .../boxes/peers/edit_participants_box.h       |   8 +
 Telegram/SourceFiles/data/data_changes.h      |  29 +-
 Telegram/SourceFiles/data/data_user.cpp       |   1 +
 Telegram/SourceFiles/info/info.style          |   9 +
 .../info/profile/info_profile_members.cpp     |   2 +
 9 files changed, 287 insertions(+), 156 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index bbfb2acb1..6f27553d0 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -889,9 +889,11 @@ void PeerListRow::createCheckbox(
 }
 
 void PeerListRow::setCheckedInternal(bool checked, anim::type animated) {
-	Expects(_checkbox != nullptr);
+	Expects(!checked || _checkbox != nullptr);
 
-	_checkbox->setChecked(checked, animated);
+	if (_checkbox) {
+		_checkbox->setChecked(checked, animated);
+	}
 }
 
 void PeerListRow::setCustomizedCheckSegments(
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 88f0fac9a..5831ec0b5 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -54,40 +54,6 @@ namespace {
 constexpr auto kSortByOnlineThrottle = 3 * crl::time(1000);
 constexpr auto kSearchPerPage = 50;
 
-[[nodiscard]] std::vector<Ui::OutlineSegment> PrepareSegments(
-		int count,
-		int unread,
-		const QBrush &unreadBrush) {
-	Expects(unread <= count);
-	Expects(count > 0);
-
-	auto result = std::vector<Ui::OutlineSegment>();
-	const auto add = [&](bool unread) {
-		result.push_back({
-			.brush = unread ? unreadBrush : st::dialogsUnreadBgMuted->b,
-			.width = (unread
-				? st::dialogsStoriesFull.lineTwice / 2.
-				: st::dialogsStoriesFull.lineReadTwice / 2.),
-		});
-	};
-	result.reserve(count);
-	for (auto i = 0, till = count - unread; i != till; ++i) {
-		add(false);
-	}
-	for (auto i = 0; i != unread; ++i) {
-		add(true);
-	}
-	return result;
-}
-
-[[nodiscard]] QBrush CreateStoriesGradient() {
-	const auto &st = st::contactsWithStories.item;
-	const auto left = st.photoPosition.x();
-	const auto top = st.photoPosition.y();
-	const auto size = st.photoSize;
-	return Ui::UnreadStoryOutlineGradient(QRectF(left, top, size, size));
-}
-
 } // namespace
 
 object_ptr<Ui::BoxContent> PrepareContactsBox(
@@ -124,6 +90,39 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 	return Box<PeerListBox>(std::move(controller), std::move(init));
 }
 
+QBrush PeerListStoriesGradient(const style::PeerList &st) {
+	const auto left = st.item.photoPosition.x();
+	const auto top = st.item.photoPosition.y();
+	const auto size = st.item.photoSize;
+	return Ui::UnreadStoryOutlineGradient(QRectF(left, top, size, size));
+}
+
+std::vector<Ui::OutlineSegment> PeerListStoriesSegments(
+		int count,
+		int unread,
+		const QBrush &unreadBrush) {
+	Expects(unread <= count);
+	Expects(count > 0);
+
+	auto result = std::vector<Ui::OutlineSegment>();
+	const auto add = [&](bool unread) {
+		result.push_back({
+			.brush = unread ? unreadBrush : st::dialogsUnreadBgMuted->b,
+			.width = (unread
+				? st::dialogsStoriesFull.lineTwice / 2.
+				: st::dialogsStoriesFull.lineReadTwice / 2.),
+		});
+	};
+	result.reserve(count);
+	for (auto i = 0, till = count - unread; i != till; ++i) {
+		add(false);
+	}
+	for (auto i = 0; i != unread; ++i) {
+		add(true);
+	}
+	return result;
+}
+
 void PeerListRowWithLink::setActionLink(const QString &action) {
 	_action = action;
 	refreshActionLink();
@@ -359,6 +358,115 @@ bool ChatsListBoxController::appendRow(not_null<History*> history) {
 	return false;
 }
 
+PeerListStories::PeerListStories(
+	not_null<PeerListController*> controller,
+	not_null<Main::Session*> session)
+: _controller(controller)
+, _session(session) {
+}
+
+void PeerListStories::updateColors() {
+	for (auto i = begin(_counts); i != end(_counts); ++i) {
+		if (const auto row = _delegate->peerListFindRow(i->first)) {
+			if (i->second.count >= 0 && i->second.unread >= 0) {
+				applyForRow(row, i->second.count, i->second.unread, true);
+			}
+		}
+	}
+}
+
+void PeerListStories::updateFor(
+		uint64 id,
+		int count,
+		int unread) {
+	if (const auto row = _delegate->peerListFindRow(id)) {
+		applyForRow(row, count, unread);
+		_delegate->peerListUpdateRow(row);
+	}
+}
+
+void PeerListStories::process(not_null<PeerListRow*> row) {
+	const auto user = row->peer()->asUser();
+	if (!user) {
+		return;
+	}
+	const auto stories = &_session->data().stories();
+	const auto source = stories->source(user->id);
+	const auto count = source
+		? int(source->ids.size())
+		: user->hasActiveStories()
+		? 1
+		: 0;
+	const auto unread = source
+		? source->info().unreadCount
+		: user->hasUnreadStories()
+		? 1
+		: 0;
+	applyForRow(row, count, unread, true);
+}
+
+bool PeerListStories::handleClick(not_null<PeerData*> peer) {
+	const auto point = _delegate->peerListLastRowMousePosition();
+	const auto &st = _controller->listSt()->item;
+	if (point && point->x() < st.photoPosition.x() + st.photoSize) {
+		if (const auto window = peer->session().tryResolveWindow()) {
+			if (const auto user = peer->asUser()) {
+				if (user->hasActiveStories()) {
+					window->openPeerStories(peer->id);
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
+void PeerListStories::prepare(not_null<PeerListDelegate*> delegate) {
+	_delegate = delegate;
+
+	_unreadBrush = PeerListStoriesGradient(*_controller->listSt());
+	style::PaletteChanged() | rpl::start_with_next([=] {
+		_unreadBrush = PeerListStoriesGradient(*_controller->listSt());
+		updateColors();
+	}, _lifetime);
+
+	_session->changes().peerUpdates(
+		Data::PeerUpdate::Flag::StoriesState
+	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		const auto id = update.peer->id.value;
+		if (const auto row = _delegate->peerListFindRow(id)) {
+			process(row);
+		}
+	}, _lifetime);
+
+	const auto stories = &_session->data().stories();
+	stories->sourceChanged() | rpl::start_with_next([=](PeerId id) {
+		const auto source = stories->source(id);
+		const auto info = source
+			? source->info()
+			: Data::StoriesSourceInfo();
+		updateFor(id.value, info.count, info.unreadCount);
+	}, _lifetime);
+}
+
+void PeerListStories::applyForRow(
+		not_null<PeerListRow*> row,
+		int count,
+		int unread,
+		bool force) {
+	auto &counts = _counts[row->id()];
+	if (!force && counts.count == count && counts.unread == unread) {
+		return;
+	}
+	counts.count = count;
+	counts.unread = unread;
+	_delegate->peerListSetRowChecked(row, count > 0);
+	if (count > 0) {
+		row->setCustomizedCheckSegments(
+			PeerListStoriesSegments(count, unread, _unreadBrush));
+	}
+}
+
 ContactsBoxController::ContactsBoxController(
 	not_null<Main::Session*> session)
 : ContactsBoxController(
@@ -385,31 +493,8 @@ void ContactsBoxController::prepare() {
 
 	prepareViewHook();
 
-	if (_storiesShown) {
-		_storiesUnread = CreateStoriesGradient();
-		style::PaletteChanged() | rpl::start_with_next([=] {
-			_storiesUnread = CreateStoriesGradient();
-			for (auto &entry : _storiesCounts) {
-				entry.second.count = entry.second.unread = -1;
-			}
-			updateStories();
-		}, lifetime());
-
-		const auto stories = &session().data().stories();
-		rpl::merge(
-			rpl::single(rpl::empty),
-			stories->sourcesChanged(Data::StorySourcesList::NotHidden),
-			stories->sourcesChanged(Data::StorySourcesList::Hidden)
-		) | rpl::start_with_next([=] {
-			updateStories();
-		}, lifetime());
-		stories->sourceChanged() | rpl::start_with_next([=](PeerId id) {
-			const auto source = stories->source(id);
-			const auto info = source
-				? source->info()
-				: Data::StoriesSourceInfo();
-			updateStoriesFor(id.value, info.count, info.unreadCount);
-		}, lifetime());
+	if (_stories) {
+		_stories->prepare(delegate());
 	}
 
 	session().data().contactsLoaded().value(
@@ -456,16 +541,10 @@ std::unique_ptr<PeerListRow> ContactsBoxController::createSearchRow(
 
 void ContactsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
-	if (const auto window = peer->session().tryResolveWindow()) {
-		if (_storiesShown) {
-			const auto point = delegate()->peerListLastRowMousePosition();
-			const auto &st = st::contactsWithStories.item;
-			if (point && point->x() < st.photoPosition.x() + st.photoSize) {
-				window->openPeerStories(peer->id);
-				return;
-			}
-		}
-		window->showPeerHistory(row->peer());
+	if (_stories && _stories->handleClick(peer)) {
+		return;
+	} else if (const auto window = peer->session().tryResolveWindow()) {
+		window->showPeerHistory(peer);
 	}
 }
 
@@ -491,52 +570,7 @@ void ContactsBoxController::setSortMode(SortMode mode) {
 }
 
 void ContactsBoxController::setStoriesShown(bool shown) {
-	_storiesShown = shown;
-}
-
-void ContactsBoxController::updateStories() {
-	const auto stories = &_session->data().stories();
-	const auto &a = stories->sources(Data::StorySourcesList::NotHidden);
-	const auto &b = stories->sources(Data::StorySourcesList::Hidden);
-	auto checked = base::flat_set<PeerListRowId>();
-	for (const auto &info : ranges::views::concat(a, b)) {
-		const auto id = info.id.value;
-		checked.emplace(id);
-		updateStoriesFor(id, info.count, info.unreadCount);
-	}
-	for (auto i = begin(_storiesCounts); i != end(_storiesCounts); ++i) {
-		if (i->second.count && !checked.contains(i->first)) {
-			updateStoriesFor(i->first, 0, 0);
-		}
-	}
-}
-
-void ContactsBoxController::updateStoriesFor(
-		uint64 id,
-		int count,
-		int unread) {
-	if (const auto row = delegate()->peerListFindRow(id)) {
-		applyRowStories(row, count, unread);
-		delegate()->peerListUpdateRow(row);
-	}
-}
-
-void ContactsBoxController::applyRowStories(
-		not_null<PeerListRow*> row,
-		int count,
-		int unread,
-		bool force) {
-	auto &counts = _storiesCounts[row->id()];
-	if (!force && counts.count == count && counts.unread == unread) {
-		return;
-	}
-	counts.count = count;
-	counts.unread = unread;
-	delegate()->peerListSetRowChecked(row, count > 0);
-	if (count > 0) {
-		row->setCustomizedCheckSegments(
-			PrepareSegments(count, unread, _storiesUnread));
-	}
+	_stories = std::make_unique<PeerListStories>(this, _session);
 }
 
 void ContactsBoxController::sort() {
@@ -586,12 +620,8 @@ bool ContactsBoxController::appendRow(not_null<UserData*> user) {
 	if (auto row = createRow(user)) {
 		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
-		if (_storiesShown) {
-			const auto stories = &session().data().stories();
-			if (const auto source = stories->source(user->id)) {
-				const auto info = source->info();
-				applyRowStories(raw, info.count, info.unreadCount, true);
-			}
+		if (_stories) {
+			_stories->process(raw);
 		}
 		return true;
 	}
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h
index 46d1a184c..0ba108f01 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.h
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h
@@ -20,12 +20,21 @@ class Forum;
 class ForumTopic;
 } // namespace Data
 
+namespace Ui {
+struct OutlineSegment;
+} // namespace Ui
+
 namespace Window {
 class SessionController;
 } // namespace Window
 
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareContactsBox(
 	not_null<Window::SessionController*> sessionController);
+[[nodiscard]] QBrush PeerListStoriesGradient(const style::PeerList &st);
+[[nodiscard]] std::vector<Ui::OutlineSegment> PeerListStoriesSegments(
+	int count,
+	int unread,
+	const QBrush &unreadBrush);
 
 class PeerListRowWithLink : public PeerListRow {
 public:
@@ -116,6 +125,41 @@ private:
 
 };
 
+class PeerListStories final {
+public:
+	PeerListStories(
+		not_null<PeerListController*> controller,
+		not_null<Main::Session*> session);
+
+	void prepare(not_null<PeerListDelegate*> delegate);
+
+	void process(not_null<PeerListRow*> row);
+	bool handleClick(not_null<PeerData*> peer);
+
+private:
+	struct Counts {
+		int count = 0;
+		int unread = 0;
+	};
+
+	void updateColors();
+	void updateFor(uint64 id, int count, int unread);
+	void applyForRow(
+		not_null<PeerListRow*> row,
+		int count,
+		int unread,
+		bool force = false);
+
+	const not_null<PeerListController*> _controller;
+	const not_null<Main::Session*> _session;
+	PeerListDelegate *_delegate = nullptr;
+
+	QBrush _unreadBrush;
+	base::flat_map<uint64, Counts> _counts;
+	rpl::lifetime _lifetime;
+
+};
+
 class ContactsBoxController : public PeerListController {
 public:
 	explicit ContactsBoxController(not_null<Main::Session*> session);
@@ -129,7 +173,7 @@ public:
 		not_null<PeerData*> peer) override final;
 	void rowClicked(not_null<PeerListRow*> row) override;
 	bool trackSelectedList() override {
-		return !_storiesShown;
+		return !_stories;
 	}
 
 	enum class SortMode {
@@ -147,32 +191,19 @@ protected:
 	}
 
 private:
-	struct StoriesCount {
-		int count = 0;
-		int unread = 0;
-	};
 	void sort();
 	void sortByName();
 	void sortByOnline();
 	void rebuildRows();
-	void updateStories();
 	void checkForEmptyRows();
 	bool appendRow(not_null<UserData*> user);
-	void updateStoriesFor(uint64 id, int count, int unread);
-	void applyRowStories(
-		not_null<PeerListRow*> row,
-		int count,
-		int unread,
-		bool force = false);
 
 	const not_null<Main::Session*> _session;
 	SortMode _sortMode = SortMode::Alphabet;
 	base::Timer _sortByOnlineTimer;
 	rpl::lifetime _sortByOnlineLifetime;
 
-	QBrush _storiesUnread;
-	base::flat_map<uint64, StoriesCount> _storiesCounts;
-	bool _storiesShown = false;
+	std::unique_ptr<PeerListStories> _stories;
 
 };
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 94caec150..c35fc9fbb 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -25,11 +25,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/dialogs_indexed_list.h"
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
+#include "data/data_stories.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_changes.h"
 #include "base/unixtime.h"
+#include "ui/effects/outline_segments.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/ui_utility.h"
 #include "info/profile/info_profile_values.h"
@@ -900,7 +902,11 @@ void ParticipantsBoxController::setupListChangeViewers() {
 				return (row.peer() == user);
 			});
 		} else if (auto row = createRow(user)) {
+			const auto raw = row.get();
 			delegate()->peerListPrependRow(std::move(row));
+			if (_stories) {
+				_stories->process(raw);
+			}
 			refreshRows();
 			if (_onlineSorter) {
 				_onlineSorter->sort();
@@ -1160,8 +1166,14 @@ void ParticipantsBoxController::restoreState(
 			loadMoreRows();
 		}
 		PeerListController::restoreState(std::move(state));
-		if (delegate()->peerListFullRowsCount() > 0 || _allLoaded) {
+		const auto count = delegate()->peerListFullRowsCount();
+		if (count > 0 || _allLoaded) {
 			refreshDescription();
+			if (_stories) {
+				for (auto i = 0; i != count; ++i) {
+					_stories->process(delegate()->peerListRowAt(i));
+				}
+			}
 		}
 		if (_onlineSorter) {
 			_onlineSorter->sort();
@@ -1177,14 +1189,21 @@ rpl::producer<int> ParticipantsBoxController::fullCountValue() const {
 	return _fullCountValue.value();
 }
 
+void ParticipantsBoxController::setStoriesShown(bool shown) {
+	_stories = std::make_unique<PeerListStories>(
+		this,
+		&_navigation->session());
+}
+
 void ParticipantsBoxController::prepare() {
 	auto title = [&] {
 		switch (_role) {
 		case Role::Admins: return tr::lng_channel_admins();
 		case Role::Profile:
-		case Role::Members: return (_peer->isChannel() && !_peer->isMegagroup()
-			? tr::lng_profile_subscribers_section()
-			: tr::lng_profile_participants_section());
+		case Role::Members:
+			return ((_peer->isChannel() && !_peer->isMegagroup())
+				? tr::lng_profile_subscribers_section()
+				: tr::lng_profile_participants_section());
 		case Role::Restricted: return tr::lng_exceptions_list_title();
 		case Role::Kicked: return tr::lng_removed_list_title();
 		}
@@ -1207,6 +1226,10 @@ void ParticipantsBoxController::prepare() {
 	setDescriptionText(tr::lng_contacts_loading(tr::now));
 	setSearchNoResultsText(tr::lng_blocked_list_not_found(tr::now));
 
+	if (_stories) {
+		_stories->prepare(delegate());
+	}
+
 	if (_role == Role::Profile) {
 		auto visible = _peer->isMegagroup()
 			? Info::Profile::CanViewParticipantsValue(_peer->asMegagroup())
@@ -1319,7 +1342,11 @@ void ParticipantsBoxController::rebuildChatParticipants(
 	}
 	for (const auto &user : participants) {
 		if (auto row = createRow(user)) {
+			const auto raw = row.get();
 			delegate()->peerListAppendRow(std::move(row));
+			if (_stories) {
+				_stories->process(raw);
+			}
 		}
 	}
 	_onlineSorter->sort();
@@ -1373,7 +1400,11 @@ void ParticipantsBoxController::rebuildChatAdmins(
 	}
 	for (const auto user : list) {
 		if (auto row = createRow(user)) {
+			const auto raw = row.get();
 			delegate()->peerListAppendRow(std::move(row));
+			if (_stories) {
+				_stories->process(raw);
+			}
 		}
 	}
 
@@ -1543,6 +1574,11 @@ bool ParticipantsBoxController::feedMegagroupLastParticipants() {
 void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	const auto participant = row->peer();
 	const auto user = participant->asUser();
+
+	if (_stories && _stories->handleClick(participant)) {
+		return;
+	}
+
 	if (_role == Role::Admins) {
 		Assert(user != nullptr);
 		showAdmin(user);
@@ -1890,7 +1926,11 @@ bool ParticipantsBoxController::appendRow(not_null<PeerData*> participant) {
 		recomputeTypeFor(participant);
 		return false;
 	} else if (auto row = createRow(participant)) {
+		const auto raw = row.get();
 		delegate()->peerListAppendRow(std::move(row));
+		if (_stories) {
+			_stories->process(raw);
+		}
 		if (_role != Role::Kicked) {
 			setDescriptionText(QString());
 		}
@@ -1906,10 +1946,17 @@ bool ParticipantsBoxController::prependRow(not_null<PeerData*> participant) {
 		if (_role == Role::Admins) {
 			// Perhaps we've added a new admin from search.
 			delegate()->peerListPrependRowFromSearchResult(row);
+			if (_stories) {
+				_stories->process(row);
+			}
 		}
 		return false;
 	} else if (auto row = createRow(participant)) {
+		const auto raw = row.get();
 		delegate()->peerListPrependRow(std::move(row));
+		if (_stories) {
+			_stories->process(raw);
+		}
 		if (_role != Role::Kicked) {
 			setDescriptionText(QString());
 		}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
index 30b445813..0882f214a 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "info/profile/info_profile_members_controllers.h"
 
+class PeerListStories;
 struct ChatAdminRightsInfo;
 struct ChatRestrictionsInfo;
 
@@ -174,6 +175,9 @@ public:
 		QWidget *parent,
 		not_null<PeerListRow*> row) override;
 	void loadMoreRows() override;
+	bool trackSelectedList() override {
+		return !_stories;
+	}
 
 	void peerListSearchAddRow(not_null<PeerData*> peer) override;
 	std::unique_ptr<PeerListRow> createSearchRow(
@@ -187,6 +191,8 @@ public:
 	[[nodiscard]] rpl::producer<int> onlineCountValue() const;
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;
 
+	void setStoriesShown(bool shown);
+
 protected:
 	// Allow child controllers not providing navigation.
 	// This is their responsibility to override all methods that use it.
@@ -288,6 +294,8 @@ private:
 	Ui::BoxPointer _addBox;
 	QPointer<Ui::BoxContent> _editParticipantBox;
 
+	std::unique_ptr<PeerListStories> _stories;
+
 };
 
 // Members, banned and restricted users server side search.
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index 3f0e587dd..d4fee22c8 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -85,26 +85,27 @@ struct PeerUpdate {
 		SupportInfo         = (1ULL << 23),
 		IsBot               = (1ULL << 24),
 		EmojiStatus         = (1ULL << 25),
+		StoriesState        = (1ULL << 26),
 
 		// For chats and channels
-		InviteLinks         = (1ULL << 26),
-		Members             = (1ULL << 27),
-		Admins              = (1ULL << 28),
-		BannedUsers         = (1ULL << 29),
-		Rights              = (1ULL << 30),
-		PendingRequests     = (1ULL << 31),
-		Reactions           = (1ULL << 32),
+		InviteLinks         = (1ULL << 27),
+		Members             = (1ULL << 28),
+		Admins              = (1ULL << 29),
+		BannedUsers         = (1ULL << 30),
+		Rights              = (1ULL << 31),
+		PendingRequests     = (1ULL << 32),
+		Reactions           = (1ULL << 33),
 
 		// For channels
-		ChannelAmIn         = (1ULL << 33),
-		StickersSet         = (1ULL << 34),
-		ChannelLinkedChat   = (1ULL << 35),
-		ChannelLocation     = (1ULL << 36),
-		Slowmode            = (1ULL << 37),
-		GroupCall           = (1ULL << 38),
+		ChannelAmIn         = (1ULL << 34),
+		StickersSet         = (1ULL << 35),
+		ChannelLinkedChat   = (1ULL << 36),
+		ChannelLocation     = (1ULL << 37),
+		Slowmode            = (1ULL << 38),
+		GroupCall           = (1ULL << 39),
 
 		// For iteration
-		LastUsedBit         = (1ULL << 38),
+		LastUsedBit         = (1ULL << 39),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index d25f37780..09c66a922 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -155,6 +155,7 @@ void UserData::setStoriesState(StoriesState state) {
 		if (const auto history = owner().historyLoaded(this)) {
 			history->updateChatListEntryPostponed();
 		}
+		session().changes().peerUpdated(this, UpdateFlag::StoriesState);
 	}
 }
 
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index eb746c3c5..c5567dd79 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -488,6 +488,15 @@ infoMembersList: PeerList(defaultPeerList) {
 		photoPosition: point(18px, 6px);
 		namePosition: point(79px, 11px);
 		statusPosition: point(79px, 31px);
+		checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+			selectExtendTwice: 1px;
+			imageRadius: 21px;
+			imageSmallRadius: 19px;
+			check: RoundCheckbox(defaultPeerListCheck) {
+				size: 0px;
+			}
+		}
+		nameFgChecked: contactsNameFg;
 	}
 }
 infoMembersButtonPosition: point(12px, 0px);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index 605ebbad5..b226935c3 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -50,6 +50,7 @@ Members::Members(
 , _controller(controller)
 , _peer(_controller->key().peer())
 , _listController(CreateMembersController(controller, _peer)) {
+	_listController->setStoriesShown(true);
 	setupHeader();
 	setupList();
 	setContent(_list.data());
@@ -232,6 +233,7 @@ void Members::setupButtons() {
 void Members::setupList() {
 	auto topSkip = _header ? _header->height() : 0;
 	_listController->setStyleOverrides(&st::infoMembersList);
+	_listController->setStoriesShown(true);
 	_list = object_ptr<ListWidget>(
 		this,
 		_listController.get());

From b630e48a77dbf6f37b1b1fc01577adbf3b9bdd2d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 20:45:19 +0400
Subject: [PATCH 421/676] Improve chats list filter border.

---
 Telegram/SourceFiles/dialogs/dialogs.style | 3 ++-
 Telegram/lib_ui                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 69849adc8..c824b8219 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -266,9 +266,10 @@ dialogsFilter: InputField(defaultInputField) {
 	borderFgActive: windowBgRipple;
 	borderFgError: activeLineFgError;
 
-	border: 2px;
+	border: 3px;
 	borderActive: 2px;
 	borderRadius: 18px;
+	borderDenominator: 2;
 
 	font: normalFont;
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 1c0889f78..048156ecd 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 1c0889f78a74bb29e8cea6986ea8b18e7add7fb0
+Subproject commit 048156ecda89b54ea48aafd5b0f97ccffcc922c9

From 961dd2a4a8a2e9827fda6cb7ff0d7916da265c3b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 22:27:12 +0400
Subject: [PATCH 422/676] Break large stories lists by days in viewer.

---
 .../stories/media_stories_controller.cpp      | 52 ++++++++++++++++++-
 .../media/stories/media_stories_controller.h  |  2 +
 .../media/stories/media_stories_header.cpp    | 20 +++++--
 .../media/stories/media_stories_header.h      |  2 +
 .../SourceFiles/media/view/media_view.style   |  2 +-
 5 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index bd6c19b64..2bdb19098 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/power_save_blocker.h"
 #include "base/qt_signal_producer.h"
+#include "base/unixtime.h"
 #include "boxes/peers/prepare_short_info_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/application.h"
@@ -75,6 +76,42 @@ constexpr auto kPreloadPreviousMediaCount = 1;
 constexpr auto kMarkAsReadAfterSeconds = 0.2;
 constexpr auto kMarkAsReadAfterProgress = 0.;
 
+struct SameDayRange {
+	int from = 0;
+	int till = 0;
+};
+[[nodiscard]] SameDayRange ComputeSameDayRange(
+		not_null<Data::Story*> story,
+		const Data::StoriesIds &ids,
+		int index) {
+	Expects(index >= 0 && index < ids.list.size());
+
+	auto result = SameDayRange{ .from = index, .till = index };
+	const auto peerId = story->peer()->id;
+	const auto stories = &story->owner().stories();
+	const auto now = base::unixtime::parse(story->date());
+	const auto b = begin(ids.list);
+	for (auto i = b + index; i != b;) {
+		if (const auto maybeStory = stories->lookup({ peerId, *--i })) {
+			const auto day = base::unixtime::parse((*maybeStory)->date());
+			if (day.date() != now.date()) {
+				break;
+			}
+		}
+		--result.from;
+	}
+	for (auto i = b + index + 1, e = end(ids.list); i != e; ++i) {
+		if (const auto maybeStory = stories->lookup({ peerId, *i })) {
+			const auto day = base::unixtime::parse((*maybeStory)->date());
+			if (day.date() != now.date()) {
+				break;
+			}
+		}
+		++result.till;
+	}
+	return result;
+}
+
 } // namespace
 
 class Controller::PhotoPlayback final {
@@ -629,11 +666,19 @@ void Controller::rebuildFromContext(
 			}
 		}
 	});
+	_sliderIndex = 0;
+	_sliderCount = 0;
 	if (list) {
 		_source = std::nullopt;
 		if (_list != list) {
 			_list = std::move(list);
 		}
+		if (const auto maybe = user->owner().stories().lookup(storyId)) {
+			const auto now = *maybe;
+			const auto range = ComputeSameDayRange(now, _list->ids, _index);
+			_sliderCount = range.till - range.from + 1;
+			_sliderIndex = _index - range.from;
+		}
 	} else {
 		if (source) {
 			const auto i = source->ids.lower_bound(StoryIdDates{ id });
@@ -659,7 +704,10 @@ void Controller::rebuildFromContext(
 		}
 	}
 	preloadNext();
-	_slider->show({ .index = _index, .total = shownCount() });
+	_slider->show({
+		.index = _sliderCount ? _sliderIndex : _index,
+		.total = _sliderCount ? _sliderCount : shownCount(),
+	});
 }
 
 void Controller::preloadNext() {
@@ -750,6 +798,8 @@ void Controller::show(
 	_header->show({
 		.user = user,
 		.date = story->date(),
+		.fullIndex = _sliderCount ? _index : 0,
+		.fullCount = _sliderCount ? shownCount() : 0,
 		.edited = story->edited(),
 	});
 	if (!changeShown(story)) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 37d7b60fb..0df907acd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -241,6 +241,8 @@ private:
 	FullStoryId _waitingForId;
 	int _waitingForDelta = 0;
 	int _index = 0;
+	int _sliderIndex = 0;
+	int _sliderCount = 0;
 	bool _started = false;
 	bool _viewed = false;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index fd8f21b33..ab2a842e9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/userpic_button.h"
 #include "ui/layers/box_content.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/labels.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
@@ -75,6 +76,16 @@ struct Timestamp {
 	return { Ui::FormatDateTime(whenFull) };
 }
 
+[[nodiscard]] TextWithEntities ComposeName(HeaderData data) {
+	auto result = Ui::Text::Bold(data.user->shortName());
+	if (data.fullCount) {
+		result.append(QString::fromUtf8(" \xE2\x80\xA2 %1/%2"
+		).arg(data.fullIndex + 1
+		).arg(data.fullCount));
+	}
+	return result;
+}
+
 [[nodiscard]] Timestamp ComposeDetails(HeaderData data, TimeId now) {
 	auto result = ComposeTimestamp(data.date, now);
 	if (data.edited) {
@@ -98,9 +109,12 @@ void Header::show(HeaderData data) {
 	if (_data == data) {
 		return;
 	}
-	const auto userChanged = (!_data || _data->user != data.user);
+	const auto nameDataChanged = !_data
+		|| (_data->user != data.user)
+		|| (_data->fullCount != data.fullCount)
+		|| (data.fullCount && _data->fullIndex != data.fullIndex);
 	_data = data;
-	if (userChanged) {
+	if (nameDataChanged) {
 		_date = nullptr;
 		const auto parent = _controller->wrap();
 		auto widget = std::make_unique<Ui::AbstractButton>(parent);
@@ -119,7 +133,7 @@ void Header::show(HeaderData data) {
 			st::storiesHeaderMargin.top());
 		const auto name = Ui::CreateChild<Ui::FlatLabel>(
 			raw,
-			data.user->firstName,
+			rpl::single(ComposeName(data)),
 			st::storiesHeaderName);
 		name->setAttribute(Qt::WA_TransparentForMouseEvents);
 		name->setOpacity(kNameOpacity);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index cab943464..1393eefd5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -22,6 +22,8 @@ class Controller;
 struct HeaderData {
 	not_null<UserData*> user;
 	TimeId date = 0;
+	int fullIndex = 0;
+	int fullCount = 0;
 	bool edited = false;
 
 	friend inline auto operator<=>(HeaderData, HeaderData) = default;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 00db429d1..ac5d9e062 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -426,7 +426,7 @@ storiesHeaderPhoto: UserpicButton(defaultUserpicButton) {
 }
 storiesHeaderName: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewControlFg;
-	style: semiboldTextStyle;
+	style: defaultTextStyle;
 }
 storiesHeaderNamePosition: point(50px, 0px);
 storiesHeaderDate: FlatLabel(defaultFlatLabel) {

From 4e046ca31abd87d465873f46cece7851223690c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 22:36:11 +0400
Subject: [PATCH 423/676] Closed alpha version 4.8.4.5.

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

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 1553b95ad..e2e0f8a2d 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.8.4.4" />
+    Version="4.8.4.5" />
   <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 1c0a03179..6d78ed1c8 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,8,4,4
- PRODUCTVERSION 4,8,4,4
+ FILEVERSION 4,8,4,5
+ PRODUCTVERSION 4,8,4,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.4.4"
+            VALUE "FileVersion", "4.8.4.5"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.4"
+            VALUE "ProductVersion", "4.8.4.5"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 87a38fb0b..3d37a211c 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,8,4,4
- PRODUCTVERSION 4,8,4,4
+ FILEVERSION 4,8,4,5
+ PRODUCTVERSION 4,8,4,5
  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.8.4.4"
+            VALUE "FileVersion", "4.8.4.5"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.4"
+            VALUE "ProductVersion", "4.8.4.5"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 79690f889..8f9e79acb 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004004ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004005ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
diff --git a/Telegram/build/version b/Telegram/build/version
index 8b47580b7..659b269d5 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -3,5 +3,5 @@ AppVersionStrMajor 4.8
 AppVersionStrSmall 4.8.4
 AppVersionStr      4.8.4
 BetaChannel        0
-AlphaVersion       4008004004
-AppVersionOriginal 4.8.4.4
+AlphaVersion       4008004005
+AppVersionOriginal 4.8.4.5

From 04a969cc5fd54919b27c566439834099937498c5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 22:38:28 +0400
Subject: [PATCH 424/676] Fix calls peer-to-peer privacy button icon.

---
 .../SourceFiles/settings/settings_privacy_controllers.cpp    | 3 ++-
 Telegram/SourceFiles/settings/settings_privacy_security.cpp  | 5 +++--
 Telegram/SourceFiles/settings/settings_privacy_security.h    | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 5fbb5b4c3..349741dfb 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -764,7 +764,8 @@ object_ptr<Ui::RpWidget> CallsPrivacyController::setupBelowWidget(
 		tr::lng_settings_calls_peer_to_peer_button(),
 		{ &st::settingsIconArrows, kIconLightBlue },
 		UserPrivacy::Key::CallsPeer2Peer,
-		[] { return std::make_unique<CallsPeer2PeerPrivacyController>(); });
+		[] { return std::make_unique<CallsPeer2PeerPrivacyController>(); },
+		&st::settingsButton);
 	AddSkip(content);
 
 	return result;
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 7554dba27..d9a1a97c3 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -814,14 +814,15 @@ void AddPrivacyButton(
 		rpl::producer<QString> label,
 		IconDescriptor &&descriptor,
 		Privacy::Key key,
-		Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory) {
+		Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory,
+		const style::SettingsButton *stOverride) {
 	const auto shower = Ui::CreateChild<rpl::lifetime>(container.get());
 	const auto session = &controller->session();
 	AddButtonWithLabel(
 		container,
 		std::move(label),
 		PrivacyString(session, key),
-		st::settingsButtonNoIcon,
+		stOverride ? *stOverride : st::settingsButtonNoIcon,
 		std::move(descriptor)
 	)->addClickHandler([=] {
 		*shower = session->api().userPrivacy().value(
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.h b/Telegram/SourceFiles/settings/settings_privacy_security.h
index 67b2fcc64..350d6f1b5 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.h
@@ -32,7 +32,8 @@ void AddPrivacyButton(
 	rpl::producer<QString> label,
 	IconDescriptor &&descriptor,
 	Api::UserPrivacy::Key key,
-	Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory);
+	Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory,
+	const style::SettingsButton *stOverride = nullptr);
 
 class PrivacySecurity : public Section<PrivacySecurity> {
 public:

From 585bbd45f407f73c5ccdfca42219eda0743cb8d6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Jul 2023 11:02:35 +0400
Subject: [PATCH 425/676] Fix undesired lock/unlock button visibility.

---
 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 c25b31e5d..0a7c92a52 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -240,6 +240,7 @@ Widget::Widget(
 			_childListShown.value(),
 			makeChildListShown)));
 	_scrollToTop->raise();
+	_lockUnlock->toggle(false, anim::type::instant);
 
 	_inner->updated(
 	) | rpl::start_with_next([=] {

From ffd691e5565241b530c9a11f4e4649011184c49d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Jul 2023 12:30:34 +0400
Subject: [PATCH 426/676] Update API scheme, pass privacy info to viewer.

---
 Telegram/SourceFiles/data/data_document.cpp   |  8 ++++
 Telegram/SourceFiles/data/data_document.h     |  1 +
 Telegram/SourceFiles/data/data_story.cpp      | 39 ++++++++++++-------
 Telegram/SourceFiles/data/data_story.h        | 17 ++++++--
 .../stories/media_stories_controller.cpp      |  5 +++
 .../media/stories/media_stories_header.h      |  7 ++++
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  3 +-
 7 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 173cfbb91..66e34cff2 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -330,6 +330,7 @@ void DocumentData::setattributes(
 	_flags &= ~(Flag::ImageType
 		| Flag::HasAttachedStickers
 		| Flag::UseTextColor
+		| Flag::SilentVideo
 		| kStreamingSupportedMask);
 	_flags |= kStreamingSupportedUnknown;
 
@@ -402,6 +403,9 @@ void DocumentData::setattributes(
 			_duration = crl::time(
 				base::SafeRound(data.vduration().v * 1000));
 			setMaybeSupportsStreaming(data.is_supports_streaming());
+			if (data.is_nosound()) {
+				_flags |= Flag::SilentVideo;
+			}
 			dimensions = QSize(data.vw().v, data.vh().v);
 		}, [&](const MTPDdocumentAttributeAudio &data) {
 			if (type == FileDocument) {
@@ -1542,6 +1546,10 @@ bool DocumentData::isVideoFile() const {
 	return (type == VideoDocument);
 }
 
+bool DocumentData::isSilentVideo() const {
+	return _flags & Flag::SilentVideo;
+}
+
 crl::time DocumentData::duration() const {
 	return std::max(_duration, crl::time());
 }
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index 9f013e373..59891c005 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -166,6 +166,7 @@ public:
 	[[nodiscard]] bool isSongWithCover() const;
 	[[nodiscard]] bool isAudioFile() const;
 	[[nodiscard]] bool isVideoFile() const;
+	[[nodiscard]] bool isSilentVideo() const;
 	[[nodiscard]] bool isAnimation() const;
 	[[nodiscard]] bool isGifv() const;
 	[[nodiscard]] bool isTheme() const;
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 210e4a8f4..8b21c7c34 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -255,12 +255,16 @@ bool Story::pinned() const {
 	return _pinned;
 }
 
-bool Story::isPublic() const {
-	return _isPublic;
-}
-
-bool Story::closeFriends() const {
-	return _closeFriends;
+StoryPrivacy Story::privacy() const {
+	return _privacyPublic
+		? StoryPrivacy::Public
+		: _privacyCloseFriends
+		? StoryPrivacy::CloseFriends
+		: _privacyContacts
+		? StoryPrivacy::Contacts
+		: _privacySelectedContacts
+		? StoryPrivacy::SelectedContacts
+		: StoryPrivacy::Other;
 }
 
 bool Story::forbidsForward() const {
@@ -276,7 +280,7 @@ bool Story::canDownload() const {
 }
 
 bool Story::canShare() const {
-	return isPublic() && !forbidsForward() && (pinned() || !expired());
+	return _privacyPublic && !forbidsForward() && (pinned() || !expired());
 }
 
 bool Story::canDelete() const {
@@ -288,7 +292,7 @@ bool Story::canReport() const {
 }
 
 bool Story::hasDirectLink() const {
-	if (!_isPublic || (!_pinned && expired())) {
+	if (!_privacyPublic || (!_pinned && expired())) {
 		return false;
 	}
 	const auto user = _peer->asUser();
@@ -410,8 +414,15 @@ void Story::applyFields(
 
 	const auto pinned = data.is_pinned();
 	const auto edited = data.is_edited();
-	const auto isPublic = data.is_public();
-	const auto closeFriends = data.is_close_friends();
+	const auto privacy = data.is_public()
+		? StoryPrivacy::Public
+		: data.is_close_friends()
+		? StoryPrivacy::CloseFriends
+		: data.is_contacts()
+		? StoryPrivacy::Contacts
+		: data.is_selected_contacts()
+		? StoryPrivacy::SelectedContacts
+		: StoryPrivacy::Other;
 	const auto noForwards = data.is_noforwards();
 	auto caption = TextWithEntities{
 		data.vcaption().value_or_empty(),
@@ -443,13 +454,13 @@ void Story::applyFields(
 	const auto viewsChanged = (_views != views)
 		|| (_recentViewers != viewers);
 
-	_isPublic = isPublic;
-	_closeFriends = closeFriends;
+	_privacyPublic = (privacy == StoryPrivacy::Public);
+	_privacyCloseFriends = (privacy == StoryPrivacy::CloseFriends);
+	_privacyContacts = (privacy == StoryPrivacy::Contacts);
+	_privacySelectedContacts = (privacy == StoryPrivacy::SelectedContacts);
 	_noForwards = noForwards;
 	_edited = edited;
 	_pinned = pinned;
-	_isPublic = isPublic;
-	_closeFriends = closeFriends;
 	_noForwards = noForwards;
 	if (viewsChanged) {
 		_views = views;
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index d95c4dd40..8ea17b7b7 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -23,6 +23,14 @@ class Session;
 class Thread;
 class PhotoMedia;
 
+enum class StoryPrivacy : uchar {
+	Public,
+	CloseFriends,
+	Contacts,
+	SelectedContacts,
+	Other,
+};
+
 struct StoryIdDates {
 	StoryId id = 0;
 	TimeId date = 0;
@@ -88,8 +96,7 @@ public:
 
 	void setPinned(bool pinned);
 	[[nodiscard]] bool pinned() const;
-	[[nodiscard]] bool isPublic() const;
-	[[nodiscard]] bool closeFriends() const;
+	[[nodiscard]] StoryPrivacy privacy() const;
 	[[nodiscard]] bool forbidsForward() const;
 	[[nodiscard]] bool edited() const;
 
@@ -138,8 +145,10 @@ private:
 	const TimeId _expires = 0;
 	TimeId _lastUpdateTime = 0;
 	bool _pinned : 1 = false;
-	bool _isPublic : 1 = false;
-	bool _closeFriends : 1 = false;
+	bool _privacyPublic : 1 = false;
+	bool _privacyCloseFriends : 1 = false;
+	bool _privacyContacts : 1 = false;
+	bool _privacySelectedContacts : 1 = false;
 	bool _noForwards : 1 = false;
 	bool _edited : 1 = false;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 2bdb19098..adad7ec8b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/update_checker.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
+#include "data/data_document.h"
 #include "data/data_file_origin.h"
 #include "data/data_message_reactions.h"
 #include "data/data_session.h"
@@ -795,12 +796,16 @@ void Controller::show(
 
 	_captionText = story->caption();
 	_captionFullView = nullptr;
+	const auto document = story->document();
 	_header->show({
 		.user = user,
 		.date = story->date(),
 		.fullIndex = _sliderCount ? _index : 0,
 		.fullCount = _sliderCount ? shownCount() : 0,
+		.privacy = story->privacy(),
 		.edited = story->edited(),
+		.video = (document != nullptr),
+		.silent = (document && document->isSilentVideo()),
 	});
 	if (!changeShown(story)) {
 		return;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 1393eefd5..2b8f6e61f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "ui/userpic_view.h"
 
+namespace Data {
+enum class StoryPrivacy : uchar;
+} // namespace Data
+
 namespace Ui {
 class RpWidget;
 class FlatLabel;
@@ -24,7 +28,10 @@ struct HeaderData {
 	TimeId date = 0;
 	int fullIndex = 0;
 	int fullCount = 0;
+	Data::StoryPrivacy privacy = {};
 	bool edited = false;
+	bool video = false;
+	bool silent = false;
 
 	friend inline auto operator<=>(HeaderData, HeaderData) = default;
 	friend inline bool operator==(HeaderData, HeaderData) = default;
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 18c9bcd5b..9c54c97bc 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1530,7 +1530,7 @@ storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long>
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#ffadc913 flags:# close_friends:flags.8?true id:int date:int expire_date:int = StoryItem;
-storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
@@ -1677,6 +1677,7 @@ account.invalidateSignInCodes#ca8ae8ba codes:Vector<string> = Bool;
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
 users.setSecureValueErrors#90c894b5 id:InputUser errors:Vector<SecureValueError> = Bool;
+users.getStoriesMaxIDs#ca1cb9ab id:Vector<InputUser> = Vector<int>;
 
 contacts.getContactIDs#7adc669d hash:long = Vector<int>;
 contacts.getStatuses#c4a353ee = Vector<ContactStatus>;

From 99926be57a859c2b149656ea943fa052f54dc944 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Jul 2023 17:31:52 +0400
Subject: [PATCH 427/676] Add privacy badge to stories userpic.

---
 .../icons/mediaview/mini_close_friends.png    | Bin 0 -> 325 bytes
 .../icons/mediaview/mini_close_friends@2x.png | Bin 0 -> 557 bytes
 .../icons/mediaview/mini_close_friends@3x.png | Bin 0 -> 726 bytes
 .../icons/mediaview/mini_contacts.png         | Bin 0 -> 412 bytes
 .../icons/mediaview/mini_contacts@2x.png      | Bin 0 -> 720 bytes
 .../icons/mediaview/mini_contacts@3x.png      | Bin 0 -> 1106 bytes
 .../mediaview/mini_selected_contacts.png      | Bin 0 -> 395 bytes
 .../mediaview/mini_selected_contacts@2x.png   | Bin 0 -> 666 bytes
 .../mediaview/mini_selected_contacts@3x.png   | Bin 0 -> 996 bytes
 .../media/stories/media_stories_header.cpp    | 216 ++++++++++++++++--
 .../media/stories/media_stories_header.h      |  12 +
 .../SourceFiles/media/view/media_view.style   |   7 +
 12 files changed, 217 insertions(+), 18 deletions(-)
 create mode 100644 Telegram/Resources/icons/mediaview/mini_close_friends.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_close_friends@2x.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_close_friends@3x.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_contacts.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_contacts@2x.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_contacts@3x.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_selected_contacts.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_selected_contacts@2x.png
 create mode 100644 Telegram/Resources/icons/mediaview/mini_selected_contacts@3x.png

diff --git a/Telegram/Resources/icons/mediaview/mini_close_friends.png b/Telegram/Resources/icons/mediaview/mini_close_friends.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c3072447e6761a60964c3a7f5a9613034b93cf9
GIT binary patch
literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$e)_b}*hG>YM
zov@qtu!2O3ZcsqLg&={Gx@k;DobvWIh&v>0;W@yT!%#Fa#^F=9i`S|rTqXaH%PQ=8
zXTD3Uw($Gf7nhs1ev4zdT&Aa;)bq7={noN`o|*^S6FC$Eyo%4A-n8cAazUqtYt6S!
zm$n>O*l@7=zMJ;JYnHLkGiTl6d+^#sL-ENM0~@vvxsIAw?=kGqm$`LJ;>}Ts<4O`e
tqVKF{AD@5j^BK$a9Bj%Drv32#&LH(>rkPa6ts0OQJYD@<);T3K0RRlkYpehO

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_close_friends@2x.png b/Telegram/Resources/icons/mediaview/mini_close_friends@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..82dd44af9567a6ae42ec3f9e0abe9d63dfaecb3f
GIT binary patch
literal 557
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSVF5FO4N|zKE$K5**>q1A#}E(R
zw^R17YD$newpC*Vx5kCGj;w-WU-A5dYq>Kr-$<R4h;#7{xUjcna<h<1Q!byC%Y{md
zrad)sU%&RW?|b<8@8{}y;r4b@mz@9gU0vbx{eWpt@8+@JE1dKF_gV3xlV{VI<8@eK
ze6`P&-mPJ13Ud<6i41!;@4ZK)kzL8om=_F7YI2P&=bw*XFD~04ax`tJ%HN{yUw{AQ
zm`V2^Uwn~c_acqgU#qO<a+Phr{kFo!El}k6$HyNJ$gv#!{8PlhaITM9qQs^4r^mnl
zmMuECQTfTNWh+-{iOkfzqnO|D(R8k#`oG{{A*U14YzufZ_TLXyRc~u~8h7S?-u6Rh
zS4uJS6e#8h-q;qK>h=0S)C{f_&nvI2mSGl9(Y+M6etK%;%_(7*OjyH`wc>)iUhT4z
z;K^7j!{6?l@U$v$rSyiVwOs4eRvdrDCeh|tJ6YxDuSkxJ*aI1>6~EQ)w|IB>VZ;9*
zJ%@%Z8I0KmtFq>wPu~%<KK!!DX`ZeO#slmz?>1@O%`4v+QDQaqc*nJ(oh-*T{dSly
d{Npue4Re#^JuB;scafl|@^tlcS?83{1OT%u-kSgb

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_close_friends@3x.png b/Telegram/Resources/icons/mediaview/mini_close_friends@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f024ce73a918ea36c5efa2249200872f12e4ea8
GIT binary patch
literal 726
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz~tcR;usRa
z`8Ira*C7XyP{H{(c6B5qCNEvv+SGev#r_1{7wi#Sw|>Z*nce=uX?Cq?K~pc+qNxiO
zJjmwfYnf4*VjOvbYqHWE%kT4w{qq*h+!6CCKo|sn{NM~(ef4bG=D78O7WIY`J)RU;
z*u=9l>BxS&l4I5>U3Bb{r*q!+YO~odc@sG=82T>_@_gTRghAHWM20WZnPINs6d$$s
z->q{w6oM|zv$=G}ZSlj81}_*UPMS7V<=N+-r=L3Yw<~xobnuJ%(tTj-vY?d_I%2(U
z`{UR-g*si-CL6vrpXn2}`fA?x+wZ?yOitK+_uTW(#~&wpnTs8H{PAeg!P$+nGMfa<
zzZu7t?~b*OJ$lD)`C;P&6<VGzKUO>`eDiqu<&&E{3?yWF-5zmIJ?&&B!WC)8(scj5
zJP%t@Y^4r|Q`j-yhYyZkdHuEGRal|N-?OvV#jU@eXTJLF*RKnlUFr->Hpl2a_Pp}_
zM=g)ii!IAymjq}S#K$G2FKEcvZr*P%*MIcwOC1dxQ?+w{<&(mG*Vw7)F{o-VZQUMX
zA+s-T{TH4i92yGyI61||)TW$G+Z(q&pm!n*tBYF`bELtP(@!mw)HbL-+HagvR2U^y
zt^D@)=?@p?oPYlQdgFl!O5Or9tG#_=)I647K9hFiQnqyl%b8sJjs>SnL<_RE&N_IZ
zXy=*`EfZGxD;|<vj?1-k6^|wbzHW@ZoVT61k-=Y3Q{=^ag%^90D)(H?@?CzpZvXnb
t${WQ_1@LfnJo1_v3XWl5953Pg!?5YL+hi?`KN6rc<>~6@vd$@?2>@_uCa3@a

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_contacts.png b/Telegram/Resources/icons/mediaview/mini_contacts.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc716cab41b4aa5c0aea7361c2e85903c9436a81
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K#j#^&kb7@{G%
zH^8>fH9_R*%y*(HSE^KmoRkH%H}LEhl-|I<k(qU>lXd5cDO}4Gp7qR*af|zXFL&SP
zxz*?X3b&NEmt-q=PI_!nD6@NA_Z5r2-}~;HJioqa&9ck|4-Q;6IU8K)8lZpL>C${<
zj`N@Y9BTI5Q5Gn2Uis7}75~`l0x_$(XUsUxad<*epon4T(T<u6k1OTG14LRk=$!WX
zwa@=Yw_M1hm}#k(O&UEfPdT~zLBEUpyM60ke-~u%xis~reu8?ATWDzL(w1eJFW5dE
zy%ZqPcJce)w@o{~8t{Y%+3c2?XLCMr^(w9!0hV3s)IBei%AWowc_7K`_O?P3ppBll
gx82^h@t5)g@ysn-&uy@~YYPe)Pgg&ebxsLQ0JKDy3jhEB

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_contacts@2x.png b/Telegram/Resources/icons/mediaview/mini_contacts@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7df593e8338ed0506ba718ff604c247c800e44b
GIT binary patch
literal 720
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSVF5FO4N|zKE$K4@1Cy1fi(`lf
z@7qx8{*8_zahvi)d6kYVeU^V==U>J@j6&Ppoc}PlMlBRybn(It6_xn*77nTDhfKXX
z@1}=`J)0}J=hokExpO|BDV}FsoObTxw{PG7{^IhOH!ooE#UC|x>#t{Tzs<|W{A2ai
zECY!Ut*J#jYb<2uY28uP5a~)W+Ij!I{kxjocllU$#?*yBI@lDq{(Xs6`4m=z3<diM
zk8~6h%w}_@$XO}8F0twp5I;0=XSMzO^Z)nROXTb-+pW7Ttkb2bSDvq3to!LM#o1@g
zq<SO#bi^LNi(q(kcEk2vF?zmg!Y7SqpMCvx)~QD8@YPpUdXw9o6t#HrtmdYzyqPmC
zm5qt9OLJ+>o^r0n+wZ@-HocJO@>F*)59HZ#r@7d%{qVsy?g^J)9+BG<qQ&WPpYPU;
zRHZqoTmpGa9Ii@&lf?PjBTE&|3-=sP&U^B-=;ZUydecw8EO}OBxg$pE(8=0@oRDT|
zO`(+TpMI*2sekM2Sr6ID^<REjVmJTrwy3o)OiOsY4|k+GGB$1BcsK9l-)pZ+x8K&C
z$icQdMC)sXO|M&XN>`RiO1InM?FK%{j&;X8mj;;^*~q0|t8DO5%Ql<Mu{vz^o>D1b
z=ql_tc%!i3YL@zB&O=<SO+hP{sMgm^^$OJyb3FWYkHNb24^I@@9#7hMK*va`*M3v{
z{u#A1eb~GM^0!9mua4gupnd1~+jHi#eYf9!`?boPWqX&P?zjAgI|`YPV-wvTH7@SF
ru;NF;0baJ|JB2RC{@wiV&T7Y)`1Hivw7-&%L8-~p)z4*}Q$iB}C#op9

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_contacts@3x.png b/Telegram/Resources/icons/mediaview/mini_contacts@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..50c9ff55fe6c057a87e5c825bbf2bbafdc315255
GIT binary patch
literal 1106
zcmV-Y1g-mtP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFyh%hsR9Fe^SIaB>Q4}{rHbRZp
zc>LtOkYYU6N~mcTSRpBiVrNU#`~|`wl8q%bV<C1nvY8nr8;^xT`Nhgx^7#Ee%{SL|
zzxRB<_iJWnzKididmf*2?wNbfIp2hY_!G}SJOjTh1GZ@Po1dRwQBjc_d4Tgb@*E!@
zUtV5D18do~yu5s3Vq$M^?;r7m!{PDq@v^cq%g|O0kc-8|#kaRNB9d?H*VosDg$1Y6
zY1NCW{_ybd!^6Wjp9%|@3=Ivb`cTwMN=llapI7iss?5#J0YuTAi5h^mwzf!D%7V?!
z&Dg{gWp4O@eLkPb?oGw``*}nueROoRy1KfywsvxIB30m-gM)*nPDuq^5aUyPadFYw
z+REFz-EI^iJ_3QhySvNI&gM-l(73b$9KSq2KSveN!xa=17{`PIuD3GhpsX3!o95<b
z3dQ5`@SzJd>QhNc31v(2QECMsetB?kKw3rwhlhu}zCe$SjZx-yO3>ckPKm(Z-rhEl
znksa3bWrB<fY3GT>gp&P@X<yMq^1h>_4Rpqc~S&<K<MF8ZN|*V$Y8XTa5x-NK4VfY
z<N-;q55ofCa=G}Wo;FpmmLb!Cnwpx5ii-4cXdGOk#>PfUs_`io@(dYcL29?#mzS6E
z)@#~qwxy*dy!9d#jsy{ADkC3~<oEkiQ&V|2DJd!FArSFQDNS7q`A9%%3(#$CZD(g^
zD=RDe`}?RgRaI4eeSMjknSz>hsj}xUL!7vej}M`m#db*@>aQRKDi{pLHUb_k6bcFM
z*i!zNK^zDK8X6jyo}NGo(H}7Cqvzk;+~5?ar>7Sd7S`6*R#sLTAL{k>bv>X7r?|Kn
zU69`vqcK8EO-&gzNHpe|nHi`t6P^HUX=$m6d#QMKc9sVMjsA}hptQ6!slLEO!n|JZ
z`}?~9f)P~ER9$9eW!>K1GPvjG=a!ZhRpU=RjBGD2FAU`V{yrxs=Tm6?x4*xiVg2}P
zW@Kc9fkZXJYVl7_PHJ!%nNex1ZmOoH=JfPbL%_kZYA(@FOiaY3&=4OVAG^D|B}xRV
zx3~A{=}EKQ*w_FRp=gl}AeJYf@9gX#tmNcm3I?K{o}S&^T`d&6k(-!B!@S}=@n`(%
z>I#>?v$M0hy82J#0nydfH9b9jeSOVB!Q~$q7+@eVCUEai3#j_Ug3t)4;REC6A3f@^
zqh^kdj-t0v{SKW0W4uA-H1PGqsYOFXgTy3?w>E8IMnDh8Wwh4G4Wf&S;u(l%;5TI8
YKb9#Qwu<WdeE<Le07*qoM6N<$f*|Alj{pDw

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_selected_contacts.png b/Telegram/Resources/icons/mediaview/mini_selected_contacts.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3ca5b06d89501605715441500c5e47cbbe12dd3
GIT binary patch
literal 395
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$ezIwVihG>W;
zCrEs8@bl}NI(2G9x?aSF2mk;7@0YiqHgziNtHkv5^=sCgIdS5^x_A!{julc&UESS{
zU9)D-R=l%fg~kp!HH+7W+xgeW?QJT^zrT++<-^C1jywMR`BRXp!Nbhld~<X9@})~1
zU5*|(61FD7F!z=TA0OWit2B%5_V(kqZp~_Kefs<R`}qBJwV$8$c6M@_n}0t&U4No(
z`>O35H&%Xp#CnGN|Nnn~Z(qF{8XU|l$XHZdRP?~DS;D&PO~dLo<EEyjc{Y_y58vJ1
z&cCRU)#>b9YjFuLAD<3`A0Hnde|~;`zntx=HEaF=S@-V6b)0(Wz{J31-xJ^dweK}3
OAUs|DT-G@yGywpfbC=Bk

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_selected_contacts@2x.png b/Telegram/Resources/icons/mediaview/mini_selected_contacts@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d12f95496d4a6772f01ef6e1156e63c469728599
GIT binary patch
literal 666
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSVF5FO4N|zKE$K4@0~3p<i(`lf
z@7s|5r#A*l)cw_2XrRF*nZvf)G0^MhKgRz}y_+I@jU;%wj1(5To^oQ_JgHSj?9_Tk
z&pMI&)qCInymz^9-sQ)yXYYGx$^3oiyVv{X{oZ%3cwRq$swUr`?|d04Rv{}x9u`=L
za5Zkeo0mG{|0JWCK8r8D_<mk%s+W`K^2?bfQmre^6V_k<E%^WQ{Ih8{rMBO;mFu6l
z`)=OWDBr~sjhl7<bk*9)FYnWREp#VZM@(mVfW`+cqu(AXhr}*NtiL{am4kwVqma&Y
z?}ZDZI=F7W{`#wKzwo}ZX^*+qhG`#r<ghb$_uXezKFcp}Ignrwvp#&<g_k86-_|pE
z@USs!DQ>lx=wTzr?-a2%EN*@H3T<-{H$Jvzz3JIjbI+w2XYRfKzW?~+-+%Yre)}lg
ztD^r!iB<Q}MPc3jTwl{RN3OoQPyCTYh3BlZYJO8K7_<!>H%63L$h1gyAN9Dd@IcN-
zZL-(WrbtWKgV*x5JOBDw6ZHM&gBrW%MV38Nebgf7967NpNV8F+^+TnD{v|KImDgWu
zoP7RS#&6rjj452780YD)nb<Vbhwa__GV9D$F?ySK=`Vl&vEs%YpPn$k<-z;!PcP~_
zuFSp9hG9CZ?8eNWKME`gSnlj|TYRudKmSI7#h<Tx3wm@qdoMCp9k*rQaWiMtRjspe
qdeg&Jo6bM4xrn8Uxr_NeUk#Jv(kr{tEptmi>B7_1&t;ucLK6V7G#14G

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/mini_selected_contacts@3x.png b/Telegram/Resources/icons/mediaview/mini_selected_contacts@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..90860348b9d729a0a23d59f8e994773bad20966f
GIT binary patch
literal 996
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuF?&s;^7!twx
zHvF`AmZOYc_04R-8PdLslsEzp`p&*{^^iM%MsRo36{ST-{xu2wVvc%psB9ZgOy>os
zE|-HGYkXPTB3xP}SodySQ*Hll=ZVZ`XI{#1zl)u-dDhQozipq*{`g&b^{OfUfetV@
zjY;d}n_07FO`Iq=`)pWrbah3A1Xt_4`SX{~{%;^$nX>t2{GRu}e%*Rl@TWkc^IcVS
zwY<E1<;g#?`}XhW=i%8fCqieMgMvW+apj38{`}eFwm8u+^>L?5)44WhJw3gGrY*-0
z9z5u@@WA#ix5Zz-el-a;OEQ}IqweL$7cVp(Zdt$n{mYk~X>ErSn>_umnz$$g%yZ~i
zc{NLQ!qTNnj~#PkI#QC6v10%J`Nw{qxXx*6V)B9aMPYETFk_dCXyl_gHFGcAyeTQz
zKV#m!d7lKgM(JwsAJ5Fpd^lNK^7_@QPd``waw_mx8FK0M*OvQ}Cku<!S5?hY2sip#
zVY7x|_3G7I+~=QHKXKeQKR0*j&#4O8+1VvMXV3Z`eAT3EZD*(UWBvN|e#<vcx}h`s
z<HwJC_wG&F*pX~yWfc_>v0~l2w28NG-3s78ZF%?3ou1y_jVEei-1HxxDM+7q{Pu0>
z``p=g?%wS+Dl0E<pZn+ZvE!%wx%5I6w;1of+b2IIY;~)LMN^F4bRRW-K0Z4;yB8i0
z7AKUImX?;4Ir)`53enoScW-Tdz5nD?g&kZPyQfc|{`9s3PhNh0cvu+F1*iPl+uO^_
z$~dIVkM8ATYqqtuP2JSf=(Tj#?AgEw6e#g+xR6j;DJja$xNO<74_pcye>7*kd-P~g
zPl$u7*$uAy-BUikd#4wk1_T9tkJMI#8WkNXJ9>9x*!S<>ci!8+Z{N8`1r~kh6AU~~
zahi+g6qYNkuG=r4*yHy2^yzL6Uhm11Czm)eofYMc{BYJ)np<h}=FK;L{rvg!*s(T+
zg*;sQuCoX=*`&_qV*8>0plo+y$75l0|K*oW92FKu=(Nd;`%dk9QDQa0cxF!rXB<m~
zWVe8wuCI?zNKJ3RuQO@JcPjVBU6b9lYuBRtGh^7!c-_5sukX^GJ9qwQUbYu*S?H*c
zv8%!|@qR|!j9oE$zgDuygjQ!~zuv7HZNSVLA`$?FKlnv{@Fq^#x3&MN#8prZ^K|ud
JS?83{1OWH<x`hA$

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index ab2a842e9..03f40701f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -16,7 +16,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/box_content.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/wrap/fade_wrap.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "styles/style_media_view.h"
@@ -32,6 +34,155 @@ struct Timestamp {
 	TimeId changes = 0;
 };
 
+struct PrivacyBadge {
+	const style::icon *icon = nullptr;
+	const style::color *bg1 = nullptr;
+	const style::color *bg2 = nullptr;
+};
+
+class UserpicBadge final : public Ui::RpWidget {
+public:
+	UserpicBadge(
+		not_null<QWidget*> userpic,
+		PrivacyBadge badge,
+		Fn<void()> clicked);
+
+private:
+	bool eventFilter(QObject *o, QEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+
+	void updateGeometry();
+
+	const not_null<QWidget*> _userpic;
+	const PrivacyBadge _badgeData;
+	const std::unique_ptr<Ui::AbstractButton> _clickable;
+	QRect _badge;
+	QImage _layer;
+	bool _grabbing = false;
+
+};
+
+[[nodiscard]] PrivacyBadge LookupPrivacyBadge(Data::StoryPrivacy privacy) {
+	using namespace Data;
+	static const auto badges = base::flat_map<StoryPrivacy, PrivacyBadge>{
+		{ StoryPrivacy::CloseFriends, PrivacyBadge{
+			&st::storiesBadgeCloseFriends,
+			&st::historyPeer2UserpicBg,
+			&st::historyPeer2UserpicBg2,
+		} },
+		{ StoryPrivacy::Contacts, PrivacyBadge{
+			&st::storiesBadgeContacts,
+			&st::historyPeer5UserpicBg,
+			&st::historyPeer5UserpicBg2,
+		} },
+		{ StoryPrivacy::SelectedContacts, PrivacyBadge{
+			&st::storiesBadgeSelectedContacts,
+			&st::historyPeer8UserpicBg,
+			&st::historyPeer8UserpicBg2,
+		} },
+	};
+	if (const auto i = badges.find(privacy); i != end(badges)) {
+		return i->second;
+	}
+	return {};
+}
+
+UserpicBadge::UserpicBadge(
+	not_null<QWidget*> userpic,
+	PrivacyBadge badge,
+	Fn<void()> clicked)
+: RpWidget(userpic->parentWidget())
+, _userpic(userpic)
+, _badgeData(badge)
+, _clickable(std::make_unique<Ui::AbstractButton>(parentWidget())) {
+	_clickable->setClickedCallback(std::move(clicked));
+	userpic->installEventFilter(this);
+	updateGeometry();
+	setAttribute(Qt::WA_TransparentForMouseEvents);
+	Ui::PostponeCall(this, [=] {
+		_userpic->raise();
+	});
+	show();
+}
+
+bool UserpicBadge::eventFilter(QObject *o, QEvent *e) {
+	if (o != _userpic) {
+		return false;
+	}
+	const auto type = e->type();
+	switch (type) {
+	case QEvent::Move:
+	case QEvent::Resize:
+		updateGeometry();
+		return false;
+	case QEvent::Paint:
+		return !_grabbing;
+	}
+	return false;
+}
+
+void UserpicBadge::paintEvent(QPaintEvent *e) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto layerSize = size() * ratio;
+	if (_layer.size() != layerSize) {
+		_layer = QImage(layerSize, QImage::Format_ARGB32_Premultiplied);
+		_layer.setDevicePixelRatio(ratio);
+	}
+	_layer.fill(Qt::transparent);
+	auto q = QPainter(&_layer);
+
+	_grabbing = true;
+	Ui::RenderWidget(q, _userpic);
+	_grabbing = false;
+
+	auto hq = PainterHighQualityEnabler(q);
+	auto pen = st::transparent->p;
+	pen.setWidthF(st::storiesBadgeOutline);
+	const auto half = st::storiesBadgeOutline / 2.;
+	auto outer = QRectF(_badge).marginsAdded({ half, half, half, half });
+	auto gradient = QLinearGradient(outer.topLeft(), outer.bottomLeft());
+	gradient.setStops({
+		{ 0., (*_badgeData.bg1)->c },
+		{ 1., (*_badgeData.bg2)->c },
+	});
+	q.setPen(pen);
+	q.setBrush(gradient);
+	q.setCompositionMode(QPainter::CompositionMode_Source);
+	q.drawEllipse(outer);
+	q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+	_badgeData.icon->paintInCenter(q, _badge);
+	q.end();
+
+	QPainter(this).drawImage(0, 0, _layer);
+}
+
+void UserpicBadge::updateGeometry() {
+	const auto width = _userpic->width() + st::storiesBadgeShift.x();
+	const auto height = _userpic->height() + st::storiesBadgeShift.y();
+	setGeometry(QRect(_userpic->pos(), QSize{ width, height }));
+	const auto inner = QRect(QPoint(), _badgeData.icon->size());
+	const auto badge = inner.marginsAdded(st::storiesBadgePadding).size();
+	_badge = QRect(
+		QPoint(width - badge.width(), height - badge.height()),
+		badge);
+	_clickable->setGeometry(_badge.translated(pos()));
+	update();
+}
+
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> MakePrivacyBadge(
+		not_null<QWidget*> userpic,
+		Data::StoryPrivacy privacy,
+		Fn<void()> clicked) {
+	const auto badge = LookupPrivacyBadge(privacy);
+	if (!badge.icon) {
+		return nullptr;
+	}
+	return std::make_unique<UserpicBadge>(
+		userpic,
+		badge,
+		std::move(clicked));
+}
+
 [[nodiscard]] Timestamp ComposeTimestamp(TimeId when, TimeId now) {
 	const auto minutes = (now - when) / 60;
 	if (!minutes) {
@@ -102,42 +253,41 @@ Header::Header(not_null<Controller*> controller)
 , _dateUpdateTimer([=] { updateDateText(); }) {
 }
 
-Header::~Header() {
-}
+Header::~Header() = default;
 
 void Header::show(HeaderData data) {
 	if (_data == data) {
 		return;
 	}
-	const auto nameDataChanged = !_data
-		|| (_data->user != data.user)
+	const auto userChanged = !_data
+		|| (_data->user != data.user);
+	const auto nameDataChanged = userChanged
+		|| !_name
 		|| (_data->fullCount != data.fullCount)
 		|| (data.fullCount && _data->fullIndex != data.fullIndex);
 	_data = data;
-	if (nameDataChanged) {
+	if (userChanged) {
 		_date = nullptr;
+		_name = nullptr;
+		_userpic = nullptr;
+		_info = nullptr;
+		_privacy = nullptr;
 		const auto parent = _controller->wrap();
-		auto widget = std::make_unique<Ui::AbstractButton>(parent);
+		auto widget = std::make_unique<Ui::RpWidget>(parent);
 		const auto raw = widget.get();
-		raw->setClickedCallback([=] {
+		_info = std::make_unique<Ui::AbstractButton>(raw);
+		_info->setClickedCallback([=] {
 			_controller->uiShow()->show(PrepareShortInfoBox(_data->user));
 		});
-		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+		_userpic = std::make_unique<Ui::UserpicButton>(
 			raw,
 			data.user,
 			st::storiesHeaderPhoto);
-		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
-		userpic->show();
-		userpic->move(
+		_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_userpic->show();
+		_userpic->move(
 			st::storiesHeaderMargin.left(),
 			st::storiesHeaderMargin.top());
-		const auto name = Ui::CreateChild<Ui::FlatLabel>(
-			raw,
-			rpl::single(ComposeName(data)),
-			st::storiesHeaderName);
-		name->setAttribute(Qt::WA_TransparentForMouseEvents);
-		name->setOpacity(kNameOpacity);
-		name->move(st::storiesHeaderNamePosition);
 		raw->show();
 		_widget = std::move(widget);
 
@@ -146,6 +296,26 @@ void Header::show(HeaderData data) {
 			raw->setGeometry(layout.header);
 		}, raw->lifetime());
 	}
+	if (nameDataChanged) {
+		_name = std::make_unique<Ui::FlatLabel>(
+			_widget.get(),
+			rpl::single(ComposeName(data)),
+			st::storiesHeaderName);
+		_name->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_name->setOpacity(kNameOpacity);
+		_name->move(st::storiesHeaderNamePosition);
+		_name->show();
+
+		rpl::combine(
+			_name->widthValue(),
+			_widget->heightValue()
+		) | rpl::start_with_next([=](int width, int height) {
+			if (_date) {
+				_info->setGeometry(
+					{ 0, 0, std::max(width, _date->width()), height });
+			}
+		}, _name->lifetime());
+	}
 	auto timestamp = ComposeDetails(data, base::unixtime::now());
 	_date = std::make_unique<Ui::FlatLabel>(
 		_widget.get(),
@@ -156,6 +326,16 @@ void Header::show(HeaderData data) {
 	_date->show();
 	_date->move(st::storiesHeaderDatePosition);
 
+	_date->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		_info->setGeometry(
+			{ 0, 0, std::max(width, _name->width()), _widget->height() });
+	}, _name->lifetime());
+
+	_privacy = MakePrivacyBadge(_userpic.get(), data.privacy, [=] {
+
+	});
+
 	if (timestamp.changes > 0) {
 		_dateUpdateTimer.callOnce(timestamp.changes * crl::time(1000));
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 2b8f6e61f..ae584ed8c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -17,6 +17,11 @@ enum class StoryPrivacy : uchar;
 namespace Ui {
 class RpWidget;
 class FlatLabel;
+class IconButton;
+class AbstractButton;
+class UserpicButton;
+template <typename Widget>
+class FadeWrap;
 } // namespace Ui
 
 namespace Media::Stories {
@@ -51,7 +56,14 @@ private:
 	const not_null<Controller*> _controller;
 
 	std::unique_ptr<Ui::RpWidget> _widget;
+	std::unique_ptr<Ui::AbstractButton> _info;
+	std::unique_ptr<Ui::UserpicButton> _userpic;
+	std::unique_ptr<Ui::FlatLabel> _name;
 	std::unique_ptr<Ui::FlatLabel> _date;
+	std::unique_ptr<Ui::IconButton> _playPause;
+	std::unique_ptr<Ui::IconButton> _volumeToggle;
+	std::unique_ptr<Ui::FadeWrap<Ui::RpWidget>> _volume;
+	std::unique_ptr<Ui::RpWidget> _privacy;
 	std::optional<HeaderData> _data;
 	base::Timer _dateUpdateTimer;
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index ac5d9e062..097b498cb 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -844,3 +844,10 @@ storiesReportBox: ReportBox(defaultReportBox) {
 storiesActionToast: Toast(defaultToast) {
 	maxWidth: 320px;
 }
+
+storiesBadgeCloseFriends: icon{{ "mediaview/mini_close_friends", historyPeerUserpicFg }};
+storiesBadgeContacts: icon{{ "mediaview/mini_contacts", historyPeerUserpicFg }};
+storiesBadgeSelectedContacts: icon{{ "mediaview/mini_selected_contacts", historyPeerUserpicFg }};
+storiesBadgePadding: margins(1px, 1px, 1px, 1px);
+storiesBadgeOutline: 2px;
+storiesBadgeShift: point(5px, 4px);

From c2805d92a58c8787d37186845f9a2f6a4e417dce Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Jul 2023 18:34:04 +0400
Subject: [PATCH 428/676] Fix marking stories as read.

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

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 904813765..df0615038 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -286,7 +286,10 @@ void Stories::processExpired() {
 void Stories::parseAndApply(const MTPUserStories &stories) {
 	const auto &data = stories.data();
 	const auto peerId = peerFromUser(data.vuser_id());
-	const auto readTill = data.vmax_read_id().value_or_empty();
+	const auto already = _readTill.find(peerId);
+	const auto readTill = std::max(
+		data.vmax_read_id().value_or_empty(),
+		(already != end(_readTill) ? already->second : 0));
 	const auto user = _owner->peer(peerId)->asUser();
 	auto result = StoriesSource{
 		.user = user,

From 80bdf9b74cd4c0b50d5e6de90acea6072773231b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Jul 2023 18:34:17 +0400
Subject: [PATCH 429/676] Add play/pause button to video stories.

---
 .../stories/media_stories_controller.cpp      | 14 +++++
 .../media/stories/media_stories_controller.h  |  8 +++
 .../media/stories/media_stories_header.cpp    | 52 +++++++++++++++++++
 .../media/stories/media_stories_header.h      |  6 +++
 .../SourceFiles/media/view/media_view.style   | 22 ++++++++
 5 files changed, 102 insertions(+)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index adad7ec8b..62019349d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -902,10 +902,24 @@ void Controller::subscribeToSession() {
 	});
 }
 
+PauseState Controller::pauseState() const {
+	const auto inactive = !_windowActive
+		|| _replyActive
+		|| _layerShown
+		|| _menuShown;
+	const auto playing = !inactive && !_paused;
+	return playing
+		? PauseState::Playing
+		: inactive
+		? PauseState::Inactive
+		: PauseState::Paused;
+}
+
 void Controller::updatePlayingAllowed() {
 	if (!_shown) {
 		return;
 	}
+	_header->updatePauseState();
 	setPlayingAllowed(_started
 		&& _windowActive
 		&& !_paused
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 0df907acd..b29b6d520 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -72,6 +72,12 @@ enum class HeaderLayout {
 	Outside,
 };
 
+enum class PauseState {
+	Playing,
+	Paused,
+	Inactive,
+};
+
 struct SiblingLayout {
 	QRect geometry;
 	QRect userpic;
@@ -136,6 +142,8 @@ public:
 	void contentPressed(bool pressed);
 	void setMenuShown(bool shown);
 
+	[[nodiscard]] PauseState pauseState() const;
+
 	void repaintSibling(not_null<Sibling*> sibling);
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 03f40701f..cf752495a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -272,6 +272,8 @@ void Header::show(HeaderData data) {
 		_userpic = nullptr;
 		_info = nullptr;
 		_privacy = nullptr;
+		_playPause = nullptr;
+		_volumeToggle = nullptr;
 		const auto parent = _controller->wrap();
 		auto widget = std::make_unique<Ui::RpWidget>(parent);
 		const auto raw = widget.get();
@@ -336,11 +338,61 @@ void Header::show(HeaderData data) {
 
 	});
 
+	if (data.video) {
+		_playPause = std::make_unique<Ui::IconButton>(
+			_widget.get(),
+			st::storiesPlayButton);
+		_playPause->show();
+		_playPause->setClickedCallback([=] {
+			_controller->togglePaused(_pauseState != PauseState::Paused);
+		});
+
+		_volumeToggle = std::make_unique<Ui::IconButton>(
+			_widget.get(),
+			st::storiesVolumeButton);
+		_volumeToggle->show();
+
+		_widget->widthValue() | rpl::start_with_next([=](int width) {
+			const auto playPause = st::storiesPlayButtonPosition;
+			_playPause->moveToRight(playPause.x(), playPause.y(), width);
+			const auto volume = st::storiesVolumeButtonPosition;
+			_volumeToggle->moveToRight(volume.x(), volume.y(), width);
+		}, _playPause->lifetime());
+
+		_pauseState = _controller->pauseState();
+		applyPauseState();
+	} else {
+		_playPause = nullptr;
+		_volumeToggle = nullptr;
+	}
+
 	if (timestamp.changes > 0) {
 		_dateUpdateTimer.callOnce(timestamp.changes * crl::time(1000));
 	}
 }
 
+void Header::updatePauseState() {
+	if (!_playPause) {
+		return;
+	} else if (const auto s = _controller->pauseState(); _pauseState != s) {
+		_pauseState = s;
+		applyPauseState();
+	}
+}
+
+void Header::applyPauseState() {
+	Expects(_playPause != nullptr);
+
+	const auto paused = (_pauseState == PauseState::Paused);
+	const auto inactive = (_pauseState == PauseState::Inactive);
+	_playPause->setAttribute(Qt::WA_TransparentForMouseEvents, inactive);
+	if (inactive) {
+		_playPause->clearState();
+	}
+	const auto icon = paused ? nullptr : &st::storiesPauseIcon;
+	_playPause->setIconOverride(icon, icon);
+}
+
 void Header::raise() {
 	if (_widget) {
 		_widget->raise();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index ae584ed8c..8685e5bc8 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -27,6 +27,7 @@ class FadeWrap;
 namespace Media::Stories {
 
 class Controller;
+enum class PauseState;
 
 struct HeaderData {
 	not_null<UserData*> user;
@@ -47,14 +48,19 @@ public:
 	explicit Header(not_null<Controller*> controller);
 	~Header();
 
+	void updatePauseState();
+
 	void show(HeaderData data);
 	void raise();
 
 private:
 	void updateDateText();
+	void applyPauseState();
 
 	const not_null<Controller*> _controller;
 
+	PauseState _pauseState = {};
+
 	std::unique_ptr<Ui::RpWidget> _widget;
 	std::unique_ptr<Ui::AbstractButton> _info;
 	std::unique_ptr<Ui::UserpicButton> _userpic;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 097b498cb..a3ae2dac0 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -851,3 +851,25 @@ storiesBadgeSelectedContacts: icon{{ "mediaview/mini_selected_contacts", history
 storiesBadgePadding: margins(1px, 1px, 1px, 1px);
 storiesBadgeOutline: 2px;
 storiesBadgeShift: point(5px, 4px);
+
+storiesPlayIcon: icon{{ "player/player_play", mediaviewPlaybackIconFgOver }};
+storiesPauseIcon: icon{{ "player/player_pause", mediaviewPlaybackIconFgOver }};
+storiesPlayButton: IconButton(defaultIconButton) {
+	width: 40px;
+	height: 40px;
+	icon: storiesPlayIcon;
+	iconOver: storiesPlayIcon;
+	iconPosition: point(8px, 8px);
+	rippleAreaPosition: point(4px, 4px);
+	rippleAreaSize: 32px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: mediaviewPlaybackIconRipple;
+	}
+}
+storiesPlayButtonPosition: point(54px, 0px);
+storiesVolumeButton: IconButton(storiesPlayButton) {
+	icon: mediaviewVolumeIcon2Over;
+	iconOver: mediaviewVolumeIcon2Over;
+	ripple: emptyRippleAnimation;
+}
+storiesVolumeButtonPosition: point(10px, 0px);

From 69b9c63a6960840cd51829b4a81a391b4f2700f4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Jul 2023 23:59:28 +0400
Subject: [PATCH 430/676] Implement volume dropdown.

---
 .../stories/media_stories_controller.cpp      |  16 ++
 .../media/stories/media_stories_controller.h  |   4 +
 .../media/stories/media_stories_delegate.h    |   3 +
 .../media/stories/media_stories_header.cpp    | 256 ++++++++++++++++--
 .../media/stories/media_stories_header.h      |  11 +-
 .../SourceFiles/media/view/media_view.style   |  18 +-
 .../media/view/media_view_overlay_widget.cpp  |  13 +
 .../media/view/media_view_overlay_widget.h    |   3 +
 8 files changed, 304 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 62019349d..99ab50de7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -915,6 +915,22 @@ PauseState Controller::pauseState() const {
 		: PauseState::Paused;
 }
 
+float64 Controller::currentVolume() const {
+	return Core::App().settings().videoVolume();
+}
+
+void Controller::toggleVolume() {
+	_delegate->storiesVolumeToggle();
+}
+
+void Controller::changeVolume(float64 volume) {
+	_delegate->storiesVolumeChanged(volume);
+}
+
+void Controller::volumeChangeFinished() {
+	_delegate->storiesVolumeChangeFinished();
+}
+
 void Controller::updatePlayingAllowed() {
 	if (!_shown) {
 		return;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index b29b6d520..8b804c598 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -143,6 +143,10 @@ public:
 	void setMenuShown(bool shown);
 
 	[[nodiscard]] PauseState pauseState() const;
+	[[nodiscard]] float64 currentVolume() const;
+	void toggleVolume();
+	void changeVolume(float64 volume);
+	void volumeChangeFinished();
 
 	void repaintSibling(not_null<Sibling*> sibling);
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index f42e3c463..ca663e69c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -61,6 +61,9 @@ public:
 	[[nodiscard]] virtual float64 storiesSiblingOver(SiblingType type) = 0;
 	virtual void storiesTogglePaused(bool paused) = 0;
 	virtual void storiesRepaint() = 0;
+	virtual void storiesVolumeToggle() = 0;
+	virtual void storiesVolumeChanged(float64 volume) = 0;
+	virtual void storiesVolumeChangeFinished() = 0;
 };
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index cf752495a..04a0e3f25 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -17,17 +17,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "styles/style_media_view.h"
 
+#include <QtGui/QGuiApplication>
+
 namespace Media::Stories {
 namespace {
 
 constexpr auto kNameOpacity = 1.;
 constexpr auto kDateOpacity = 0.8;
+constexpr auto kControlOpacity = 0.6;
+constexpr auto kControlOpacityOver = 1.;
+constexpr auto kVolumeHideTimeoutShort = crl::time(20);
+constexpr auto kVolumeHideTimeoutLong = crl::time(200);
 
 struct Timestamp {
 	QString text;
@@ -267,6 +274,7 @@ void Header::show(HeaderData data) {
 		|| (data.fullCount && _data->fullIndex != data.fullIndex);
 	_data = data;
 	if (userChanged) {
+		_volume = nullptr;
 		_date = nullptr;
 		_name = nullptr;
 		_userpic = nullptr;
@@ -339,18 +347,8 @@ void Header::show(HeaderData data) {
 	});
 
 	if (data.video) {
-		_playPause = std::make_unique<Ui::IconButton>(
-			_widget.get(),
-			st::storiesPlayButton);
-		_playPause->show();
-		_playPause->setClickedCallback([=] {
-			_controller->togglePaused(_pauseState != PauseState::Paused);
-		});
-
-		_volumeToggle = std::make_unique<Ui::IconButton>(
-			_widget.get(),
-			st::storiesVolumeButton);
-		_volumeToggle->show();
+		createPlayPause();
+		createVolumeToggle();
 
 		_widget->widthValue() | rpl::start_with_next([=](int width) {
 			const auto playPause = st::storiesPlayButtonPosition;
@@ -362,6 +360,7 @@ void Header::show(HeaderData data) {
 		_pauseState = _controller->pauseState();
 		applyPauseState();
 	} else {
+		_volume = nullptr;
 		_playPause = nullptr;
 		_volumeToggle = nullptr;
 	}
@@ -371,6 +370,223 @@ void Header::show(HeaderData data) {
 	}
 }
 
+void Header::createPlayPause() {
+	struct PlayPauseState {
+		Ui::Animations::Simple overAnimation;
+		bool over = false;
+		bool down = false;
+	};
+	_playPause = std::make_unique<Ui::RpWidget>(_widget.get());
+	auto &lifetime = _playPause->lifetime();
+	const auto state = lifetime.make_state<PlayPauseState>();
+
+	_playPause->events(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::Enter || type == QEvent::Leave) {
+			const auto over = (e->type() == QEvent::Enter);
+			if (state->over != over) {
+				state->over = over;
+				state->overAnimation.start(
+					[=] { _playPause->update(); },
+					over ? 0. : 1.,
+					over ? 1. : 0.,
+					st::mediaviewFadeDuration);
+			}
+		} else if (type == QEvent::MouseButtonPress && state->over) {
+			state->down = true;
+		} else if (type == QEvent::MouseButtonRelease) {
+			const auto down = base::take(state->down);
+			if (down && state->over) {
+				_controller->togglePaused(_pauseState != PauseState::Paused);
+			}
+		}
+	}, lifetime);
+
+	_playPause->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(_playPause.get());
+		const auto paused = (_pauseState == PauseState::Paused);
+		const auto icon = paused
+			? &st::storiesPlayIcon
+			: &st::storiesPauseIcon;
+		const auto over = state->overAnimation.value(
+			state->over ? 1. : 0.);
+		p.setOpacity(over * kControlOpacityOver
+			+ (1. - over) * kControlOpacity);
+		icon->paint(
+			p,
+			st::storiesPlayButton.iconPosition,
+			_playPause->width());
+	}, lifetime);
+
+	_playPause->resize(
+		st::storiesPlayButton.width,
+		st::storiesPlayButton.height);
+	_playPause->show();
+	_playPause->setCursor(style::cur_pointer);
+}
+
+void Header::createVolumeToggle() {
+	struct VolumeState {
+		base::Timer hideTimer;
+		bool over = false;
+		bool dropdownOver = false;
+	};
+	_volumeToggle = std::make_unique<Ui::RpWidget>(_widget.get());
+	auto &lifetime = _volumeToggle->lifetime();
+	const auto state = lifetime.make_state<VolumeState>();
+	state->hideTimer.setCallback([=] {
+		_volume->toggle(false, anim::type::normal);
+	});
+
+	_volumeToggle->events(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::Enter || type == QEvent::Leave) {
+			const auto over = (e->type() == QEvent::Enter);
+			if (state->over != over) {
+				state->over = over;
+				if (over) {
+					state->hideTimer.cancel();
+					_volume->toggle(true, anim::type::normal);
+				} else if (!state->dropdownOver) {
+					state->hideTimer.callOnce(kVolumeHideTimeoutShort);
+				}
+			}
+		}
+	}, lifetime);
+
+	_volumeToggle->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(_volumeToggle.get());
+		p.setOpacity(kControlOpacity);
+		_volumeIcon.current()->paint(
+			p,
+			st::storiesVolumeButton.iconPosition,
+			_volumeToggle->width());
+	}, lifetime);
+	updateVolumeIcon();
+
+	_volume = std::make_unique<Ui::FadeWrap<Ui::RpWidget>>(
+		_widget->parentWidget(),
+		object_ptr<Ui::RpWidget>(_widget->parentWidget()));
+	_volume->events(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::Enter || type == QEvent::Leave) {
+			const auto over = (e->type() == QEvent::Enter);
+			if (state->dropdownOver != over) {
+				state->dropdownOver = over;
+				if (over) {
+					state->hideTimer.cancel();
+					_volume->toggle(true, anim::type::normal);
+				} else if (!state->over) {
+					state->hideTimer.callOnce(kVolumeHideTimeoutLong);
+				}
+			}
+		}
+	}, lifetime);
+	_controller->layoutValue(
+	) | rpl::map([](const Layout &layout) {
+		return (layout.headerLayout == HeaderLayout::Outside);
+	}) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](bool horizontal) {
+		rebuildVolumeControls(_volume->entity(), horizontal);
+	}, lifetime);
+
+	rpl::combine(
+		_widget->positionValue(),
+		_volumeToggle->positionValue(),
+		rpl::mappers::_1 + rpl::mappers::_2
+	) | rpl::start_with_next([=](QPoint position) {
+		_volume->move(position);
+	}, _volume->lifetime());
+
+	_volumeToggle->resize(
+		st::storiesVolumeButton.width,
+		st::storiesVolumeButton.height);
+	_volumeToggle->show();
+	_volumeToggle->setCursor(style::cur_pointer);
+}
+
+void Header::rebuildVolumeControls(
+		not_null<Ui::RpWidget*> dropdown,
+		bool horizontal) {
+	auto removed = false;
+	do {
+		removed = false;
+		for (const auto &child : dropdown->children()) {
+			if (child->isWidgetType()) {
+				removed = true;
+				delete child;
+				break;
+			}
+		}
+	} while (removed);
+
+	const auto button = Ui::CreateChild<Ui::IconButton>(
+		dropdown.get(),
+		st::storiesVolumeButton);
+	_volumeIcon.value(
+	) | rpl::start_with_next([=](const style::icon *icon) {
+		button->setIconOverride(icon, icon);
+	}, button->lifetime());
+
+	const auto slider = Ui::CreateChild<Ui::MediaSlider>(
+		dropdown.get(),
+		st::storiesVolumeSlider);
+	slider->setMoveByWheel(true);
+	slider->setAlwaysDisplayMarker(true);
+	using Direction = Ui::MediaSlider::Direction;
+	slider->setDirection(horizontal
+		? Direction::Horizontal
+		: Direction::Vertical);
+
+	slider->setChangeProgressCallback([=](float64 value) {
+		_controller->changeVolume(value);
+		updateVolumeIcon();
+	});
+	slider->setChangeFinishedCallback([=](float64 value) {
+		_controller->volumeChangeFinished();
+	});
+	button->setClickedCallback([=] {
+		_controller->toggleVolume();
+		slider->setValue(_controller->currentVolume());
+		updateVolumeIcon();
+	});
+	slider->setValue(_controller->currentVolume());
+
+	const auto skip = button->width() / 2;
+	const auto size = button->width()
+		+ st::storiesVolumeSize
+		+ st::storiesVolumeBottom;
+	const auto seekSize = st::storiesVolumeSlider.seekSize;
+
+	button->move(0, 0);
+	if (horizontal) {
+		dropdown->resize(size, button->height());
+		slider->resize(st::storiesVolumeSize, seekSize.height());
+		slider->move(
+			button->width(),
+			(button->height() - slider->height()) / 2);
+	} else {
+		dropdown->resize(button->width(), size);
+		slider->resize(seekSize.width(), st::storiesVolumeSize);
+		slider->move(
+			(button->width() - slider->width()) / 2,
+			button->height());
+	}
+
+	dropdown->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(dropdown);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto radius = button->width() / 2.;
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::mediaviewSaveMsgBg);
+		p.drawRoundedRect(dropdown->rect(), radius, radius);
+	}, button->lifetime());
+}
+
 void Header::updatePauseState() {
 	if (!_playPause) {
 		return;
@@ -380,17 +596,25 @@ void Header::updatePauseState() {
 	}
 }
 
+void Header::updateVolumeIcon() {
+	const auto volume = _controller->currentVolume();
+	_volumeIcon = (volume <= 0.)
+		? &st::mediaviewVolumeIcon0Over
+		: (volume < 1 / 2.)
+		? &st::mediaviewVolumeIcon1Over
+		: &st::mediaviewVolumeIcon2Over;
+}
+
 void Header::applyPauseState() {
 	Expects(_playPause != nullptr);
 
-	const auto paused = (_pauseState == PauseState::Paused);
 	const auto inactive = (_pauseState == PauseState::Inactive);
 	_playPause->setAttribute(Qt::WA_TransparentForMouseEvents, inactive);
 	if (inactive) {
-		_playPause->clearState();
+		QEvent e(QEvent::Leave);
+		QGuiApplication::sendEvent(_playPause.get(), &e);
 	}
-	const auto icon = paused ? nullptr : &st::storiesPauseIcon;
-	_playPause->setIconOverride(icon, icon);
+	_playPause->update();
 }
 
 void Header::raise() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 8685e5bc8..b20f2b533 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -49,6 +49,7 @@ public:
 	~Header();
 
 	void updatePauseState();
+	void updateVolumeIcon();
 
 	void show(HeaderData data);
 	void raise();
@@ -56,6 +57,11 @@ public:
 private:
 	void updateDateText();
 	void applyPauseState();
+	void createPlayPause();
+	void createVolumeToggle();
+	void rebuildVolumeControls(
+		not_null<Ui::RpWidget*> dropdown, 
+		bool horizontal);
 
 	const not_null<Controller*> _controller;
 
@@ -66,9 +72,10 @@ private:
 	std::unique_ptr<Ui::UserpicButton> _userpic;
 	std::unique_ptr<Ui::FlatLabel> _name;
 	std::unique_ptr<Ui::FlatLabel> _date;
-	std::unique_ptr<Ui::IconButton> _playPause;
-	std::unique_ptr<Ui::IconButton> _volumeToggle;
+	std::unique_ptr<Ui::RpWidget> _playPause;
+	std::unique_ptr<Ui::RpWidget> _volumeToggle;
 	std::unique_ptr<Ui::FadeWrap<Ui::RpWidget>> _volume;
+	rpl::variable<const style::icon*> _volumeIcon;
 	std::unique_ptr<Ui::RpWidget> _privacy;
 	std::optional<HeaderData> _data;
 	base::Timer _dateUpdateTimer;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index a3ae2dac0..580347539 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -868,8 +868,22 @@ storiesPlayButton: IconButton(defaultIconButton) {
 }
 storiesPlayButtonPosition: point(54px, 0px);
 storiesVolumeButton: IconButton(storiesPlayButton) {
-	icon: mediaviewVolumeIcon2Over;
-	iconOver: mediaviewVolumeIcon2Over;
+	icon: mediaviewVolumeIcon0Over;
+	iconOver: mediaviewVolumeIcon0Over;
 	ripple: emptyRippleAnimation;
 }
 storiesVolumeButtonPosition: point(10px, 0px);
+storiesVolumeSize: 75px;
+storiesVolumeBottom: 20px;
+storiesVolumeSlider: MediaSlider {
+	width: 3px;
+	activeFg: mediaviewPlaybackActiveOver;
+	inactiveFg: mediaviewPlaybackActive;
+	activeFgOver: mediaviewPlaybackActiveOver;
+	inactiveFgOver: mediaviewPlaybackActive;
+	activeFgDisabled: mediaviewPlaybackActiveOver;
+	inactiveFgDisabled: mediaviewPlaybackActive;
+	receivedTillFg: mediaviewPlaybackActive;
+	seekSize: size(12px, 12px);
+	duration: mediaviewOverDuration;
+}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 379c341c0..dfa0f9085 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4219,10 +4219,23 @@ float64 OverlayWidget::storiesSiblingOver(Stories::SiblingType type) {
 		? overLevel(Over::LeftStories)
 		: overLevel(Over::RightStories);
 }
+
 void OverlayWidget::storiesRepaint() {
 	update();
 }
 
+void OverlayWidget::storiesVolumeToggle() {
+	playbackControlsVolumeToggled();
+}
+
+void OverlayWidget::storiesVolumeChanged(float64 volume) {
+	playbackControlsVolumeChanged(volume);
+}
+
+void OverlayWidget::storiesVolumeChangeFinished() {
+	playbackControlsVolumeChangeFinished();
+}
+
 void OverlayWidget::playbackToggleFullScreen() {
 	Expects(_streamed != nullptr);
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index b5be1b16c..cbb9165d9 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -261,6 +261,9 @@ private:
 	void storiesTogglePaused(bool paused) override;
 	float64 storiesSiblingOver(Stories::SiblingType type) override;
 	void storiesRepaint() override;
+	void storiesVolumeToggle() override;
+	void storiesVolumeChanged(float64 volume) override;
+	void storiesVolumeChangeFinished() override;
 
 	void hideControls(bool force = false);
 	void subscribeToScreenGeometry();

From 92f2b6dfbfc0de1c29111bd452199e68869c307a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 10:00:29 +0400
Subject: [PATCH 431/676] Fix unintentional stories viewer move-by-mouse-drag.

---
 .../view/controls/history_view_compose_controls.cpp        | 7 +++++++
 .../history/view/controls/history_view_compose_controls.h  | 1 +
 .../view/controls/history_view_voice_record_bar.cpp        | 4 ++++
 .../history/view/controls/history_view_voice_record_bar.h  | 1 +
 .../SourceFiles/media/stories/media_stories_controller.cpp | 5 +++++
 .../SourceFiles/media/stories/media_stories_controller.h   | 2 ++
 .../SourceFiles/media/stories/media_stories_header.cpp     | 7 +++++++
 Telegram/SourceFiles/media/stories/media_stories_header.h  | 3 +++
 Telegram/SourceFiles/media/stories/media_stories_reply.cpp | 4 ++++
 Telegram/SourceFiles/media/stories/media_stories_reply.h   | 2 ++
 Telegram/SourceFiles/media/stories/media_stories_view.cpp  | 4 ++++
 Telegram/SourceFiles/media/stories/media_stories_view.h    | 2 ++
 .../SourceFiles/media/view/media_view_overlay_widget.cpp   | 2 ++
 Telegram/lib_ui                                            | 2 +-
 14 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index e1b32aa7d..8d72bfbce 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2962,6 +2962,13 @@ bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
 
+bool ComposeControls::isRecordingPressed() const {
+	return !_voiceRecordBar->isRecordingLocked()
+		&& (!_voiceRecordBar->isHidden()
+			|| (_send->type() == Ui::SendButton::Type::Record
+				&& _send->isDown()));
+}
+
 rpl::producer<bool> ComposeControls::recordingValue() const {
 	return _recording.value();
 }
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 518782954..ce734f280 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -216,6 +216,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isRecording() const;
+	[[nodiscard]] bool isRecordingPressed() const;
 	[[nodiscard]] rpl::producer<bool> recordingValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index c49495542..757b85444 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1581,6 +1581,10 @@ bool VoiceRecordBar::isRecording() const {
 	return _recording.current();
 }
 
+bool VoiceRecordBar::isRecordingLocked() const {
+	return isRecording() && _lock->isLocked();
+}
+
 bool VoiceRecordBar::isActive() const {
 	return isRecording() || isListenState();
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 97fed00d9..2d04e98a7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -89,6 +89,7 @@ public:
 	void setStartRecordingFilter(Fn<bool()> &&callback);
 
 	[[nodiscard]] bool isRecording() const;
+	[[nodiscard]] bool isRecordingLocked() const;
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isListenState() const;
 	[[nodiscard]] bool isActive() const;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 99ab50de7..f6d4ad519 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1443,6 +1443,11 @@ void Controller::moveFromShown() {
 	}
 }
 
+bool Controller::ignoreWindowMove(QPoint position) const {
+	return _replyArea->ignoreWindowMove(position)
+		|| _header->ignoreWindowMove(position);
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 8b804c598..18951e7ad 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -160,6 +160,8 @@ public:
 	void reportRequested();
 	void togglePinnedRequested(bool pinned);
 
+	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 04a0e3f25..0d05837a9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -542,10 +542,12 @@ void Header::rebuildVolumeControls(
 		: Direction::Vertical);
 
 	slider->setChangeProgressCallback([=](float64 value) {
+		_ignoreWindowMove = true;
 		_controller->changeVolume(value);
 		updateVolumeIcon();
 	});
 	slider->setChangeFinishedCallback([=](float64 value) {
+		_ignoreWindowMove = false;
 		_controller->volumeChangeFinished();
 	});
 	button->setClickedCallback([=] {
@@ -623,6 +625,11 @@ void Header::raise() {
 	}
 }
 
+
+bool Header::ignoreWindowMove(QPoint position) const {
+	return _ignoreWindowMove;
+}
+
 void Header::updateDateText() {
 	if (!_date || !_data || !_data->date) {
 		return;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index b20f2b533..f83749482 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -54,6 +54,8 @@ public:
 	void show(HeaderData data);
 	void raise();
 
+	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+
 private:
 	void updateDateText();
 	void applyPauseState();
@@ -79,6 +81,7 @@ private:
 	std::unique_ptr<Ui::RpWidget> _privacy;
 	std::optional<HeaderData> _data;
 	base::Timer _dateUpdateTimer;
+	bool _ignoreWindowMove = false;
 
 };
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 9fa53b529..339a92181 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -677,6 +677,10 @@ rpl::producer<bool> ReplyArea::activeValue() const {
 	) | rpl::distinct_until_changed();
 }
 
+bool ReplyArea::ignoreWindowMove(QPoint position) const {
+	return _controls->isRecordingPressed();
+}
+
 void ReplyArea::showPremiumToast(not_null<DocumentData*> emoji) {
 	// #TODO stories
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index eeaa54726..25594c59b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -67,6 +67,8 @@ public:
 	[[nodiscard]] rpl::producer<bool> activeValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 
+	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+
 private:
 	class Cant;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 6a6a0dbd4..63fe641da 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -103,6 +103,10 @@ void View::togglePinnedRequested(bool pinned) {
 	_controller->togglePinnedRequested(pinned);
 }
 
+bool View::ignoreWindowMove(QPoint position) const {
+	return _controller->ignoreWindowMove(position);
+}
+
 SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 24b58feed..2e9ce1a74 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -82,6 +82,8 @@ public:
 	void reportRequested();
 	void togglePinnedRequested(bool pinned);
 
+	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index dfa0f9085..1d36a6282 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -706,6 +706,8 @@ void OverlayWidget::setupWindow() {
 				&& (widgetPoint.y() > st::mediaviewHeaderTop)
 				&& QRect(_x, _y, _w, _h).contains(widgetPoint)) {
 			return Flag::None | Flag(0);
+		} else if (_stories && _stories->ignoreWindowMove(widgetPoint)) {
+			return Flag::None | Flag(0);
 		}
 		return Flag::Move | Flag(0);
 	});
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 048156ecd..ae4651092 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 048156ecda89b54ea48aafd5b0f97ccffcc922c9
+Subproject commit ae465109201b30fa61b643d72aaf374265c6a9ed

From 7d067d492470978177a482322fa429c6972c0de5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 10:20:53 +0400
Subject: [PATCH 432/676] Fix build with Xcode.

---
 Telegram/SourceFiles/media/view/media_view_pip.cpp | 1 +
 Telegram/lib_ui                                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 4a0183d96..c11db5196 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/power_save_blocker.h"
 #include "base/event_filter.h"
 #include "ui/platform/ui_platform_utility.h"
+#include "ui/platform/ui_platform_window_title.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/widgets/shadow.h"
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ae4651092..8f03125ec 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ae465109201b30fa61b643d72aaf374265c6a9ed
+Subproject commit 8f03125ec1d6b0f4a3f0fe6b6849aa57a1006063

From 150cbe286626e44db86053ea78061461b914de3d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 10:21:04 +0400
Subject: [PATCH 433/676] Support silent video volume toggle state.

---
 .../media/stories/media_stories_header.cpp    | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 0d05837a9..654d54102 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -31,8 +31,9 @@ namespace {
 
 constexpr auto kNameOpacity = 1.;
 constexpr auto kDateOpacity = 0.8;
-constexpr auto kControlOpacity = 0.6;
+constexpr auto kControlOpacity = 0.65;
 constexpr auto kControlOpacityOver = 1.;
+constexpr auto kControlOpacityDisabled = 0.45;
 constexpr auto kVolumeHideTimeoutShort = crl::time(20);
 constexpr auto kVolumeHideTimeoutLong = crl::time(200);
 
@@ -427,20 +428,27 @@ void Header::createPlayPause() {
 }
 
 void Header::createVolumeToggle() {
+	Expects(_data.has_value());
+
 	struct VolumeState {
 		base::Timer hideTimer;
 		bool over = false;
+		bool silent = false;
 		bool dropdownOver = false;
 	};
 	_volumeToggle = std::make_unique<Ui::RpWidget>(_widget.get());
 	auto &lifetime = _volumeToggle->lifetime();
 	const auto state = lifetime.make_state<VolumeState>();
+	state->silent = _data->silent;
 	state->hideTimer.setCallback([=] {
 		_volume->toggle(false, anim::type::normal);
 	});
 
 	_volumeToggle->events(
 	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (state->silent) {
+			return;
+		}
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
@@ -458,7 +466,9 @@ void Header::createVolumeToggle() {
 
 	_volumeToggle->paintRequest() | rpl::start_with_next([=] {
 		auto p = QPainter(_volumeToggle.get());
-		p.setOpacity(kControlOpacity);
+		p.setOpacity(state->silent
+			? kControlOpacityDisabled
+			: kControlOpacity);
 		_volumeIcon.current()->paint(
 			p,
 			st::storiesVolumeButton.iconPosition,
@@ -469,6 +479,7 @@ void Header::createVolumeToggle() {
 	_volume = std::make_unique<Ui::FadeWrap<Ui::RpWidget>>(
 		_widget->parentWidget(),
 		object_ptr<Ui::RpWidget>(_widget->parentWidget()));
+	_volume->toggle(false, anim::type::instant);
 	_volume->events(
 	) | rpl::start_with_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
@@ -505,7 +516,9 @@ void Header::createVolumeToggle() {
 		st::storiesVolumeButton.width,
 		st::storiesVolumeButton.height);
 	_volumeToggle->show();
-	_volumeToggle->setCursor(style::cur_pointer);
+	if (!state->silent) {
+		_volumeToggle->setCursor(style::cur_pointer);
+	}
 }
 
 void Header::rebuildVolumeControls(
@@ -600,7 +613,7 @@ void Header::updatePauseState() {
 
 void Header::updateVolumeIcon() {
 	const auto volume = _controller->currentVolume();
-	_volumeIcon = (volume <= 0.)
+	_volumeIcon = (volume <= 0. || (_data && _data->silent))
 		? &st::mediaviewVolumeIcon0Over
 		: (volume < 1 / 2.)
 		? &st::mediaviewVolumeIcon1Over

From d7d493e0bf0013c42b5484830e52f41417a41902 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 13:55:18 +0400
Subject: [PATCH 434/676] Don't open stories on saved messages click.

---
 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 0a7c92a52..90722d7ea 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -528,7 +528,9 @@ void Widget::chosenRow(const ChosenRow &row) {
 		const auto peer = history->peer;
 		if (const auto user = history->peer->asUser()) {
 			if (row.message.fullId.msg == ShowAtUnreadMsgId) {
-				if (row.userpicClick && user->hasActiveStories()) {
+				if (row.userpicClick
+					&& user->hasActiveStories()
+					&& !user->isSelf()) {
 					controller()->openPeerStories(user->id);
 					return;
 				}

From f817df9d7fb107d9196d94f22c9ca6250b902c16 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 20 May 2023 18:20:10 +0400
Subject: [PATCH 435/676] Use new glibmm 2.78 API

---
 .../platform/linux/integration_linux.cpp      |  22 +--
 .../linux/linux_xdp_open_with_dialog.cpp      |  33 ++--
 .../platform/linux/main_window_linux.cpp      |  13 +-
 .../linux/notifications_manager_linux.cpp     | 147 +++++++++---------
 .../platform/linux/specific_linux.cpp         |  29 ++--
 Telegram/build/docker/centos_env/Dockerfile   |   4 +-
 cmake                                         |   2 +-
 snap/snapcraft.yaml                           |   2 +-
 8 files changed, 123 insertions(+), 129 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 26ed0d9fe..05cf6be27 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "platform/platform_integration.h"
 #include "base/platform/base_platform_info.h"
-#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "core/sandbox.h"
 #include "core/application.h"
@@ -125,7 +124,7 @@ LinuxIntegration::LinuxIntegration()
 	if (group == "org.freedesktop.appearance"
 		&& key == "color-scheme") {
 		try {
-			const auto ivalue = base::Platform::GlibVariantCast<uint>(value);
+			const auto ivalue = value.get_dynamic<uint>();
 
 			crl::on_main([=] {
 				Core::App().settings().setSystemDarkMode(ivalue == 1);
@@ -266,8 +265,9 @@ void LinuxIntegration::LaunchNativeApplication() {
 
 	const auto notificationIdVariantType = [] {
 		try {
-			return base::Platform::MakeGlibVariant(
-				NotificationId().toTuple()).get_type();
+			return Glib::create_variant(
+				NotificationId().toTuple()
+			).get_type();
 		} catch (...) {
 			return Glib::VariantType();
 		}
@@ -282,9 +282,9 @@ void LinuxIntegration::LaunchNativeApplication() {
 					const auto &app = Core::App();
 					app.notifications().manager().notificationActivated(
 						NotificationId::FromTuple(
-							base::Platform::GlibVariantCast<
-								NotificationIdTuple
-							>(parameter)));
+							parameter.get_dynamic<NotificationIdTuple>()
+						)
+					);
 				} catch (...) {
 				}
 			});
@@ -299,10 +299,10 @@ void LinuxIntegration::LaunchNativeApplication() {
 					const auto &app = Core::App();
 					app.notifications().manager().notificationReplied(
 						NotificationId::FromTuple(
-							base::Platform::GlibVariantCast<
-								NotificationIdTuple
-							>(parameter)),
-						{});
+							parameter.get_dynamic<NotificationIdTuple>()
+						),
+						{}
+					);
 				} catch (...) {
 				}
 			});
diff --git a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
index 70eebdf71..c37a123a3 100644
--- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_xdp_open_with_dialog.h"
 
 #include "base/platform/base_platform_info.h"
-#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "base/platform/linux/base_linux_wayland_integration.h"
 #include "core/application.h"
@@ -34,20 +33,17 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
 		const auto connection = Gio::DBus::Connection::get_sync(
 			Gio::DBus::BusType::SESSION);
 
-		auto reply = connection->call_sync(
+		const auto version = connection->call_sync(
 			std::string(base::Platform::XDP::kObjectPath),
 			std::string(kPropertiesInterface),
 			"Get",
-			base::Platform::MakeGlibVariant(std::tuple{
+			Glib::create_variant(std::tuple{
 				Glib::ustring(
 					std::string(kXDPOpenURIInterface)),
 				Glib::ustring("version"),
 			}),
-			std::string(base::Platform::XDP::kService));
-
-		const auto version = base::Platform::GlibVariantCast<uint>(
-			base::Platform::GlibVariantCast<Glib::VariantBase>(
-				reply.get_child(0)));
+			std::string(base::Platform::XDP::kService)
+		).get_child(0).get_dynamic<Glib::Variant<uint>>().get();
 
 		if (version < 3) {
 			return false;
@@ -112,7 +108,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
 				loop->quit();
 			},
 			std::string(base::Platform::XDP::kService),
-			"org.freedesktop.portal.Request",
+			std::string(base::Platform::XDP::kRequestInterface),
 			"Response",
 			requestPath);
 
@@ -128,26 +124,23 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
 			std::string(base::Platform::XDP::kObjectPath),
 			std::string(kXDPOpenURIInterface),
 			"OpenFile",
-			Glib::VariantContainerBase::create_tuple({
-				Glib::Variant<Glib::ustring>::create(parentWindowId),
-				Glib::Variant<int>::create_handle(0),
-				Glib::Variant<std::map<
-					Glib::ustring,
-					Glib::VariantBase
-				>>::create({
+			Glib::create_variant(std::tuple{
+				parentWindowId,
+				Glib::DBusHandle(),
+				std::map<Glib::ustring, Glib::VariantBase>{
 					{
 						"handle_token",
-						Glib::Variant<Glib::ustring>::create(handleToken)
+						Glib::create_variant(handleToken)
 					},
 					{
 						"activation_token",
-						Glib::Variant<Glib::ustring>::create(activationToken)
+						Glib::create_variant(activationToken)
 					},
 					{
 						"ask",
-						Glib::Variant<bool>::create(true)
+						Glib::create_variant(true)
 					},
-				}),
+				},
 			}),
 			Gio::UnixFDList::create(std::vector<int>{ fd }),
 			outFdList,
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index c0b76494e..692c68353 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "base/platform/base_platform_info.h"
-#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/event_filter.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/input_fields.h"
@@ -251,13 +250,11 @@ void MainWindow::updateUnityCounter() {
 		// According to the spec, it should be of 'x' D-Bus signature,
 		// which corresponds to signed 64-bit integer
 		// https://wiki.ubuntu.com/Unity/LauncherAPI#Low_level_DBus_API:_com.canonical.Unity.LauncherEntry
-		dbusUnityProperties["count"] = Glib::Variant<int64>::create(
-			counterSlice);
-		dbusUnityProperties["count-visible"] =
-			Glib::Variant<bool>::create(true);
+		dbusUnityProperties["count"] = Glib::create_variant(
+			int64(counterSlice));
+		dbusUnityProperties["count-visible"] = Glib::create_variant(true);
 	} else {
-		dbusUnityProperties["count-visible"] =
-			Glib::Variant<bool>::create(false);
+		dbusUnityProperties["count-visible"] = Glib::create_variant(false);
 	}
 
 	try {
@@ -270,7 +267,7 @@ void MainWindow::updateUnityCounter() {
 			"com.canonical.Unity.LauncherEntry",
 			"Update",
 			{},
-			base::Platform::MakeGlibVariant(std::tuple{
+			Glib::create_variant(std::tuple{
 				launcherUrl,
 				dbusUnityProperties,
 			}));
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 210064ac0..7b4f172a7 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/options.h"
 #include "base/platform/base_platform_info.h"
-#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_dbus_utilities.h"
 #include "core/application.h"
 #include "core/sandbox.h"
@@ -43,8 +42,6 @@ constexpr auto kObjectPath = "/org/freedesktop/Notifications"_cs;
 constexpr auto kInterface = kService;
 constexpr auto kPropertiesInterface = "org.freedesktop.DBus.Properties"_cs;
 
-using namespace base::Platform;
-
 struct ServerInformation {
 	QString name;
 	QString vendor;
@@ -116,10 +113,10 @@ void StartServiceAsync(Fn<void()> callback) {
 		const auto connection = Gio::DBus::Connection::get_sync(
 			Gio::DBus::BusType::SESSION);
 
-		DBus::StartServiceByNameAsync(
+		base::Platform::DBus::StartServiceByNameAsync(
 			connection,
 			std::string(kService),
-			[=](Fn<DBus::StartReply()> result) {
+			[=](Fn<base::Platform::DBus::StartReply()> result) {
 				Noexcept([&] {
 					try {
 						result(); // get the error if any
@@ -156,7 +153,7 @@ bool GetServiceRegistered() {
 
 		const auto hasOwner = [&] {
 			try {
-				return DBus::NameHasOwner(
+				return base::Platform::DBus::NameHasOwner(
 					connection,
 					std::string(kService));
 			} catch (...) {
@@ -167,7 +164,7 @@ bool GetServiceRegistered() {
 		static const auto activatable = [&] {
 			try {
 				return ranges::contains(
-					DBus::ListActivatableNames(connection),
+					base::Platform::DBus::ListActivatableNames(connection),
 					std::string(kService),
 					&Glib::ustring::raw);
 			} catch (...) {
@@ -195,19 +192,23 @@ void GetServerInformation(
 			{},
 			[=](const Glib::RefPtr<Gio::AsyncResult> &result) {
 				Noexcept([&] {
-					auto reply = connection->call_finish(result);
+					const auto reply = connection->call_finish(result);
 
-					const auto name = GlibVariantCast<Glib::ustring>(
-						reply.get_child(0));
+					const auto name = reply.get_child(
+						0
+					).get_dynamic<Glib::ustring>();
 
-					const auto vendor = GlibVariantCast<Glib::ustring>(
-						reply.get_child(1));
+					const auto vendor = reply.get_child(
+						1
+					).get_dynamic<Glib::ustring>();
 
-					const auto version = GlibVariantCast<Glib::ustring>(
-						reply.get_child(2));
+					const auto version = reply.get_child(
+						2
+					).get_dynamic<Glib::ustring>();
 
-					const auto specVersion = GlibVariantCast<Glib::ustring>(
-						reply.get_child(3));
+					const auto specVersion = reply.get_child(
+						3
+					).get_dynamic<Glib::ustring>();
 
 					crl::on_main([=] {
 						callback(ServerInformation{
@@ -241,18 +242,17 @@ void GetCapabilities(Fn<void(const QStringList &)> callback) {
 			{},
 			[=](const Glib::RefPtr<Gio::AsyncResult> &result) {
 				Noexcept([&] {
-					auto reply = connection->call_finish(result);
-
 					QStringList value;
 					ranges::transform(
-						GlibVariantCast<std::vector<Glib::ustring>>(
-							reply.get_child(0)),
+						connection->call_finish(
+							result
+						).get_child(
+							0
+						).get_dynamic<std::vector<Glib::ustring>>(),
 						ranges::back_inserter(value),
 						QString::fromStdString);
 
-					crl::on_main([=] {
-						callback(value);
-					});
+					crl::on_main([=] { callback(value); });
 				}, [&] {
 					crl::on_main([=] { callback({}); });
 				});
@@ -272,21 +272,20 @@ void GetInhibited(Fn<void(bool)> callback) {
 			std::string(kObjectPath),
 			std::string(kPropertiesInterface),
 			"Get",
-			MakeGlibVariant(std::tuple{
+			Glib::create_variant(std::tuple{
 				Glib::ustring(std::string(kInterface)),
 				Glib::ustring("Inhibited"),
 			}),
 			[=](const Glib::RefPtr<Gio::AsyncResult> &result) {
 				Noexcept([&] {
-					auto reply = connection->call_finish(result);
+					const auto value = connection->call_finish(
+						result
+					).get_child(
+						0
+					).get_dynamic<Glib::Variant<bool>>(
+					).get();
 
-					const auto value = GlibVariantCast<bool>(
-						GlibVariantCast<Glib::VariantBase>(
-							reply.get_child(0)));
-
-					crl::on_main([=] {
-						callback(value);
-					});
+					crl::on_main([=] { callback(value); });
 				}, [&] {
 					crl::on_main([=] { callback(false); });
 				});
@@ -470,38 +469,38 @@ bool NotificationData::init(
 			const Glib::ustring &object_path,
 			const Glib::ustring &interface_name,
 			const Glib::ustring &signal_name,
-			Glib::VariantContainerBase parameters) {
+			const Glib::VariantContainerBase &parameters) {
 		Noexcept([&] {
 			if (signal_name == "ActionInvoked") {
-				const auto id = GlibVariantCast<uint>(
-					parameters.get_child(0));
+				const auto id = parameters.get_child(0).get_dynamic<uint>();
 
-				const auto actionName = GlibVariantCast<Glib::ustring>(
-					parameters.get_child(1));
+				const auto actionName = parameters.get_child(
+					1
+				).get_dynamic<Glib::ustring>();
 
 				crl::on_main(weak, [=] { actionInvoked(id, actionName); });
 			} else if (signal_name == "ActivationToken") {
-				const auto id = GlibVariantCast<uint>(
-					parameters.get_child(0));
+				const auto id = parameters.get_child(0).get_dynamic<uint>();
 
-				const auto token = GlibVariantCast<Glib::ustring>(
-					parameters.get_child(1));
+				const auto token = parameters.get_child(
+					1
+				).get_dynamic<Glib::ustring>();
 
 				crl::on_main(weak, [=] { activationToken(id, token); });
 			} else if (signal_name == "NotificationReplied") {
-				const auto id = GlibVariantCast<uint>(
-					parameters.get_child(0));
+				const auto id = parameters.get_child(0).get_dynamic<uint>();
 
-				const auto text = GlibVariantCast<Glib::ustring>(
-					parameters.get_child(1));
+				const auto text = parameters.get_child(
+					1
+				).get_dynamic<Glib::ustring>();
 
 				crl::on_main(weak, [=] { notificationReplied(id, text); });
 			} else if (signal_name == "NotificationClosed") {
-				const auto id = GlibVariantCast<uint>(
-					parameters.get_child(0));
+				const auto id = parameters.get_child(0).get_dynamic<uint>();
 
-				const auto reason = GlibVariantCast<uint>(
-					parameters.get_child(1));
+				const auto reason = parameters.get_child(
+					1
+				).get_dynamic<uint>();
 
 				crl::on_main(weak, [=] { notificationClosed(id, reason); });
 			}
@@ -568,30 +567,30 @@ bool NotificationData::init(
 	}
 
 	if (capabilities.contains("action-icons")) {
-		_hints["action-icons"] = Glib::Variant<bool>::create(true);
+		_hints["action-icons"] = Glib::create_variant(true);
 	}
 
 	// suppress system sound if telegram sound activated,
 	// otherwise use system sound
 	if (capabilities.contains("sound")) {
 		if (Core::App().settings().soundNotify()) {
-			_hints["suppress-sound"] = Glib::Variant<bool>::create(true);
+			_hints["suppress-sound"] = Glib::create_variant(true);
 		} else {
 			// sound name according to http://0pointer.de/public/sound-naming-spec.html
-			_hints["sound-name"] = Glib::Variant<Glib::ustring>::create(
-				"message-new-instant");
+			_hints["sound-name"] = Glib::create_variant(
+				Glib::ustring("message-new-instant"));
 		}
 	}
 
 	if (capabilities.contains("x-canonical-append")) {
-		_hints["x-canonical-append"] = Glib::Variant<Glib::ustring>::create(
-			"true");
+		_hints["x-canonical-append"] = Glib::create_variant(
+			Glib::ustring("true"));
 	}
 
-	_hints["category"] = Glib::Variant<Glib::ustring>::create("im.received");
+	_hints["category"] = Glib::create_variant(Glib::ustring("im.received"));
 
-	_hints["desktop-entry"] = Glib::Variant<Glib::ustring>::create(
-		QGuiApplication::desktopFileName().toStdString());
+	_hints["desktop-entry"] = Glib::create_variant(
+		Glib::ustring(QGuiApplication::desktopFileName().toStdString()));
 
 	_notificationClosedSignalId = _dbusConnection->signal_subscribe(
 		signalEmitted,
@@ -647,7 +646,7 @@ void NotificationData::show() {
 			std::string(kObjectPath),
 			std::string(kInterface),
 			"Notify",
-			MakeGlibVariant(std::tuple{
+			Glib::create_variant(std::tuple{
 				Glib::ustring(std::string(AppName)),
 				uint(0),
 				iconName,
@@ -659,9 +658,12 @@ void NotificationData::show() {
 			}),
 			[=](const Glib::RefPtr<Gio::AsyncResult> &result) {
 				Noexcept([&] {
-					auto reply = connection->call_finish(result);
-					const auto notificationId = GlibVariantCast<uint>(
-						reply.get_child(0));
+					const auto notificationId = connection->call_finish(
+						result
+					).get_child(
+						0
+					).get_dynamic<uint>();
+
 					crl::on_main(weak, [=] {
 						_notificationId = notificationId;
 					});
@@ -691,7 +693,7 @@ void NotificationData::close() {
 		std::string(kObjectPath),
 		std::string(kInterface),
 		"CloseNotification",
-		MakeGlibVariant(std::tuple{
+		Glib::create_variant(std::tuple{
 			_notificationId,
 		}),
 		{},
@@ -728,7 +730,7 @@ void NotificationData::setImage(const QImage &image) {
 		? image.convertToFormat(QImage::Format_RGBA8888)
 		: image.convertToFormat(QImage::Format_RGB888);
 
-	_hints[_imageKey] = MakeGlibVariant(std::tuple{
+	_hints[_imageKey] = Glib::create_variant(std::tuple{
 		convertedImage.width(),
 		convertedImage.height(),
 		int(convertedImage.bytesPerLine()),
@@ -979,19 +981,22 @@ Manager::Private::Private(not_null<Manager*> manager)
 					const Glib::ustring &object_path,
 					const Glib::ustring &interface_name,
 					const Glib::ustring &signal_name,
-					Glib::VariantContainerBase parameters) {
+					const Glib::VariantContainerBase &parameters) {
 				Noexcept([&] {
-					const auto interface = GlibVariantCast<Glib::ustring>(
-						parameters.get_child(0));
+					const auto interface = parameters.get_child(
+						0
+					).get_dynamic<Glib::ustring>();
 
 					if (interface != kInterface.data()) {
 						return;
 					}
 
-					const auto inhibited = GlibVariantCast<bool>(
-						GlibVariantCast<
-							std::map<Glib::ustring, Glib::VariantBase>
-					>(parameters.get_child(1)).at("Inhibited"));
+					const auto inhibited = parameters.get_child(
+						1
+					).get_dynamic<std::map<Glib::ustring, Glib::VariantBase>>(
+					).at(
+						"Inhibited"
+					).get_dynamic<bool>();
 
 					crl::on_main(weak, [=] {
 						_inhibited = inhibited;
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 9e9fe63ba..7e20b946a 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/random.h"
 #include "base/platform/base_platform_info.h"
-#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_dbus_utilities.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "platform/linux/linux_desktop_environment.h"
@@ -90,13 +89,13 @@ bool PortalAutostart(bool start, bool silent) {
 		commandline.push_back("-autostart");
 
 		std::map<Glib::ustring, Glib::VariantBase> options;
-		options["handle_token"] = Glib::Variant<Glib::ustring>::create(
-			handleToken);
-		options["reason"] = Glib::Variant<Glib::ustring>::create(
-			tr::lng_settings_auto_start(tr::now).toStdString());
-		options["autostart"] = Glib::Variant<bool>::create(start);
-		options["commandline"] = base::Platform::MakeGlibVariant(commandline);
-		options["dbus-activatable"] = Glib::Variant<bool>::create(false);
+		options["handle_token"] = Glib::create_variant(handleToken);
+		options["reason"] = Glib::create_variant(
+			Glib::ustring(
+				tr::lng_settings_auto_start(tr::now).toStdString()));
+		options["autostart"] = Glib::create_variant(start);
+		options["commandline"] = Glib::create_variant(commandline);
+		options["dbus-activatable"] = Glib::create_variant(false);
 
 		auto uniqueName = connection->get_unique_name();
 		uniqueName.erase(0, 1);
@@ -117,10 +116,11 @@ bool PortalAutostart(bool start, bool silent) {
 				const Glib::ustring &object_path,
 				const Glib::ustring &interface_name,
 				const Glib::ustring &signal_name,
-				Glib::VariantContainerBase parameters) {
+				const Glib::VariantContainerBase &parameters) {
 				try {
-					const auto response = base::Platform::GlibVariantCast<
-						uint>(parameters.get_child(0));
+					const auto response = parameters.get_child(
+						0
+					).get_dynamic<uint>();
 
 					if (response) {
 						if (!silent) {
@@ -139,7 +139,7 @@ bool PortalAutostart(bool start, bool silent) {
 				loop->quit();
 			},
 			std::string(base::Platform::XDP::kService),
-			"org.freedesktop.portal.Request",
+			std::string(base::Platform::XDP::kRequestInterface),
 			"Response",
 			requestPath);
 
@@ -153,7 +153,7 @@ bool PortalAutostart(bool start, bool silent) {
 			std::string(base::Platform::XDP::kObjectPath),
 			"org.freedesktop.portal.Background",
 			"RequestBackground",
-			base::Platform::MakeGlibVariant(std::tuple{
+			Glib::create_variant(std::tuple{
 				parentWindowId,
 				options,
 			}),
@@ -429,8 +429,7 @@ std::optional<bool> IsDarkMode() {
 			"color-scheme");
 
 		if (result.has_value()) {
-			const auto value = base::Platform::GlibVariantCast<uint>(*result);
-			return value == 1;
+			return result->get_dynamic<uint>() == 1;
 		}
 	} catch (...) {
 	}
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 88fe34eb2..121afb690 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -59,7 +59,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 523b061671d4dd2f29979c982a2d03c2cc8eaf4f \
+	&& git fetch --depth=1 origin edafe1a2484cd6ac9be357aa1e4cda61bf6a8b9a \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
@@ -675,7 +675,7 @@ RUN git clone -b xkbcommon-1.3.1 --depth=1 {{ GIT }}/xkbcommon/libxkbcommon.git
 FROM patches AS glibmm
 COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
 
-RUN git clone -b 2.76.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
+RUN git clone -b 2.77.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
 	&& cd glibmm \
 	&& git apply ../patches/glibmm.patch \
 	&& CFLAGS="$CFLAGS {{ CFLAGS_LTO }}" CXXFLAGS="$CXXFLAGS {{ CFLAGS_LTO }}" meson build \
diff --git a/cmake b/cmake
index 6d67365e5..0620bb7b8 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 6d67365e52480edbde2b2596844c26b56a8644dc
+Subproject commit 0620bb7b87a0ec9195151fd5eb0cf38656c1280b
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f6ccbea64..40a3ca637 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -248,7 +248,7 @@ parts:
   glibmm:
     source: https://github.com/GNOME/glibmm.git
     source-depth: 1
-    source-tag: 2.76.0
+    source-tag: 2.77.0
     plugin: meson
     build-packages:
       - meson

From d60d80ba6342cce371e7c1770a2d16c037474c62 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 19 Jul 2023 14:20:14 +0400
Subject: [PATCH 436/676] Reuse lib_ui's title control side deduction code

---
 Telegram/SourceFiles/media/view/media_view_pip.cpp   | 10 +---------
 .../SourceFiles/platform/platform_overlay_widget.cpp | 12 +-----------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index c11db5196..dbee087b0 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -49,14 +49,6 @@ namespace {
 constexpr auto kPipLoaderPriority = 2;
 constexpr auto kMsInSecond = 1000;
 
-[[nodiscard]] bool IsWindowControlsOnLeft() {
-	using Control = Ui::Platform::TitleControls::Control;
-	const auto controlsLayout = Ui::Platform::TitleControlsLayout();
-	return ranges::contains(controlsLayout.left, Control::Close)
-		|| (controlsLayout.left.size() > controlsLayout.right.size()
-			&& !ranges::contains(controlsLayout.right, Control::Close));
-}
-
 [[nodiscard]] QRect ScreenFromPosition(QPoint point) {
 	const auto screen = QGuiApplication::screenAt(point);
 	const auto use = screen ? screen : QGuiApplication::primaryScreen();
@@ -1266,7 +1258,7 @@ void Pip::setupButtons() {
 			rect.y(),
 			volumeToggleWidth,
 			volumeToggleHeight);
-		if (!IsWindowControlsOnLeft()) {
+		if (!Ui::Platform::TitleControlsOnLeft()) {
 			_close.area.moveLeft(rect.x()
 				+ rect.width()
 				- (_close.area.x() - rect.x())
diff --git a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
index 90bda5624..03e8d32aa 100644
--- a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
+++ b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/animations.h"
 #include "ui/platform/ui_platform_window_title.h"
-#include "ui/platform/ui_platform_utility.h"
 #include "ui/widgets/rp_window.h"
 #include "ui/abstract_button.h"
 #include "styles/style_media_view.h"
@@ -228,16 +227,7 @@ rpl::producer<bool> DefaultOverlayWidgetHelper::controlsSideRightValue() {
 
 	return TitleControlsLayoutValue(
 	) | rpl::map([=](const TitleControls::Layout &layout) {
-		// See TitleControls::updateControlsPosition.
-		if (ranges::contains(layout.left, TitleControl::Close)) {
-			return false;
-		} else if (ranges::contains(layout.right, TitleControl::Close)) {
-			return true;
-		} else if (layout.left.size() > layout.right.size()) {
-			return false;
-		} else {
-			return true;
-		}
+		return !TitleControlsOnLeft(layout);
 	}) | rpl::distinct_until_changed();
 }
 

From 93457c8ea32008d64f1e325186f5da3dea66c67f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 18:44:40 +0400
Subject: [PATCH 437/676] Fix possible crash in legacy group participants.

---
 .../boxes/peers/edit_participants_box.cpp            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index c35fc9fbb..72291faf4 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1341,11 +1341,13 @@ void ParticipantsBoxController::rebuildChatParticipants(
 		}
 	}
 	for (const auto &user : participants) {
-		if (auto row = createRow(user)) {
-			const auto raw = row.get();
-			delegate()->peerListAppendRow(std::move(row));
-			if (_stories) {
-				_stories->process(raw);
+		if (!delegate()->peerListFindRow(user->id.value)) {
+			if (auto row = createRow(user)) {
+				const auto raw = row.get();
+				delegate()->peerListAppendRow(std::move(row));
+				if (_stories) {
+					_stories->process(raw);
+				}
 			}
 		}
 	}

From dd9ea293342a7667111a6f7d310aa80971602e1d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 19:07:51 +0400
Subject: [PATCH 438/676] Close short info box by outside click in stories.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1d36a6282..33dc18e22 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -432,6 +432,7 @@ OverlayWidget::OverlayWidget()
 , _stateAnimation([=](crl::time now) { return stateAnimationCallback(now); })
 , _dropdown(_body, st::mediaviewDropdownMenu) {
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
+	_layerBg->setHideByBackgroundClick(true);
 
 	CrashReports::SetAnnotation("OpenGL Renderer", "[not-initialized]");
 

From 7e18ecfb7858d4353dca23860e54ba47af59dbac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 19:10:10 +0400
Subject: [PATCH 439/676] Use "My Story" instead of name in viewer.

---
 Telegram/SourceFiles/media/stories/media_stories_header.cpp  | 4 +++-
 Telegram/SourceFiles/media/stories/media_stories_sibling.cpp | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 654d54102..5dafcb9e7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -236,7 +236,9 @@ void UserpicBadge::updateGeometry() {
 }
 
 [[nodiscard]] TextWithEntities ComposeName(HeaderData data) {
-	auto result = Ui::Text::Bold(data.user->shortName());
+	auto result = Ui::Text::Bold(data.user->isSelf()
+		? tr::lng_stories_my_name(tr::now)
+		: data.user->shortName());
 	if (data.fullCount) {
 		result.append(QString::fromUtf8(" \xE2\x80\xA2 %1/%2"
 		).arg(data.fullIndex + 1
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index b8eda7d4a..0da004993 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
 #include "media/stories/media_stories_view.h"
@@ -339,7 +340,9 @@ QImage Sibling::nameImage(const SiblingLayout &layout) {
 			.linkFontOver = font,
 		});
 	};
-	const auto text = _peer->shortName();
+	const auto text = _peer->isSelf()
+		? tr::lng_stories_my_name(tr::now)
+		: _peer->shortName();
 	if (_nameText != text) {
 		_name.reset();
 		_nameText = text;

From da5bce00d42c219cdd548cf32ff37aab89c82d0c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 19:17:46 +0400
Subject: [PATCH 440/676] Gray out names of users with non-unread stories.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 9b3e90027..a1c6f452b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -568,14 +568,17 @@ void List::validateSegments(
 }
 
 void List::validateName(not_null<Item*> item) {
-	const auto &color = st::dialogsNameFg;
+	const auto &element = item->element;
+	const auto &color = (element.unreadCount || element.skipSmall)
+		? st::dialogsNameFg
+		: st::windowSubTextFg;
 	if (!item->nameCache.isNull() && item->nameCacheColor == color->c) {
 		return;
 	}
 	const auto &full = _st.full;
 	const auto &font = full.nameStyle.font;
 	const auto available = AvailableNameWidth(_st);
-	const auto text = Ui::Text::String(full.nameStyle, item->element.name);
+	const auto text = Ui::Text::String(full.nameStyle, element.name);
 	const auto ratio = style::DevicePixelRatio();
 	item->nameCacheColor = color->c;
 	item->nameCache = QImage(

From 0b7af5bfe3b32380f3107e349f0f214f9f1ad3ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 19:31:43 +0400
Subject: [PATCH 441/676] Auto-focus story reply on input start.

---
 .../stories/media_stories_controller.cpp      |  4 ++++
 .../media/stories/media_stories_controller.h  |  1 +
 .../media/stories/media_stories_reply.cpp     |  4 ++++
 .../media/stories/media_stories_reply.h       |  1 +
 .../media/stories/media_stories_view.cpp      |  4 ++++
 .../media/stories/media_stories_view.h        |  1 +
 .../media/view/media_view_overlay_widget.cpp  | 20 ++++++++++++-------
 .../media/view/media_view_overlay_widget.h    |  1 +
 8 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index f6d4ad519..b42a0bd74 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1448,6 +1448,10 @@ bool Controller::ignoreWindowMove(QPoint position) const {
 		|| _header->ignoreWindowMove(position);
 }
 
+void Controller::tryProcessKeyInput(not_null<QKeyEvent*> e) {
+	_replyArea->tryProcessKeyInput(e);
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 18951e7ad..19b2de4d9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -161,6 +161,7 @@ public:
 	void togglePinnedRequested(bool pinned);
 
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 339a92181..1497a60e4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -681,6 +681,10 @@ bool ReplyArea::ignoreWindowMove(QPoint position) const {
 	return _controls->isRecordingPressed();
 }
 
+void ReplyArea::tryProcessKeyInput(not_null<QKeyEvent*> e) {
+	_controls->tryProcessKeyInput(e);
+}
+
 void ReplyArea::showPremiumToast(not_null<DocumentData*> emoji) {
 	// #TODO stories
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 25594c59b..9b9662b4a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -68,6 +68,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
 private:
 	class Cant;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 63fe641da..240a39b4e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -107,6 +107,10 @@ bool View::ignoreWindowMove(QPoint position) const {
 	return _controller->ignoreWindowMove(position);
 }
 
+void View::tryProcessKeyInput(not_null<QKeyEvent*> e) {
+	_controller->tryProcessKeyInput(e);
+}
+
 SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 2e9ce1a74..099689e31 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -83,6 +83,7 @@ public:
 	void togglePinnedRequested(bool pinned);
 
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 33dc18e22..9a58198e3 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4886,14 +4886,20 @@ bool OverlayWidget::isSaveMsgShown() const {
 }
 
 void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
+	if (_processingKeyPress) {
+		return;
+	}
+	_processingKeyPress = true;
+	const auto guard = gsl::finally([&] { _processingKeyPress = false; });
 	const auto key = e->key();
 	const auto modifiers = e->modifiers();
 	const auto ctrl = modifiers.testFlag(Qt::ControlModifier);
-	if (_stories && key == Qt::Key_Space && _down != Over::Video) {
-		_stories->togglePaused(!_stories->paused());
-		return;
-	}
-	if (_streamed) {
+	if (_stories) {
+		if (key == Qt::Key_Space && _down != Over::Video) {
+			_stories->togglePaused(!_stories->paused());
+			return;
+		}
+	} else if (_streamed) {
 		// Ctrl + F for full screen toggle is in eventFilter().
 		const auto toggleFull = (modifiers.testFlag(Qt::AltModifier) || ctrl)
 			&& (key == Qt::Key_Enter || key == Qt::Key_Return);
@@ -4962,9 +4968,9 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 			zoomIn();
 		} else if (key == Qt::Key_Minus || key == Qt::Key_Underscore) {
 			zoomOut();
-		} else if (key == Qt::Key_I) {
-			update();
 		}
+	} else if (_stories) {
+		_stories->tryProcessKeyInput(e);
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index cbb9165d9..b0feb4f1d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -690,6 +690,7 @@ private:
 	base::Timer _dropdownShowTimer;
 
 	bool _receiveMouse = true;
+	bool _processingKeyPress = false;
 
 	bool _touchPress = false;
 	bool _touchMove = false;

From 5b10b7e15ff53a4c30f0c423413295d3cd2d4027 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 10:33:45 +0400
Subject: [PATCH 442/676] Use separate record cancel text in stories.

---
 Telegram/Resources/langs/lang.strings                         | 1 +
 .../history/view/controls/history_view_compose_controls.cpp   | 1 +
 .../history/view/controls/history_view_compose_controls.h     | 1 +
 .../history/view/controls/history_view_voice_record_bar.cpp   | 4 +++-
 .../history/view/controls/history_view_voice_record_bar.h     | 1 +
 Telegram/SourceFiles/media/stories/media_stories_reply.cpp    | 1 +
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 592cc337e..ce176c6d1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2062,6 +2062,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_send_as_premium_required" = "Subscribe to {link} to be able to comment on behalf of your channels in group chats.";
 "lng_send_as_premium_required_link" = "Telegram Premium";
 "lng_record_cancel" = "Release outside this field to cancel";
+"lng_record_cancel_stories" = "Release outside to cancel";
 "lng_record_lock_cancel_sure" = "Are you sure you want to stop recording and discard your voice message?";
 "lng_record_listen_cancel_sure" = "Are you sure you want to discard your recorded voice message?";
 "lng_record_lock_discard" = "Discard";
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 8d72bfbce..b18fba987 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -996,6 +996,7 @@ ComposeControls::ComposeControls(
 		.outerContainer = parent,
 		.show = _show,
 		.send = _send,
+		.customCancelText = descriptor.voiceCustomCancelText,
 		.stOverride = &_st.record,
 		.recorderHeight = st::historySendSize.height(),
 		.lockFromBottom = descriptor.voiceLockFromBottom,
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 ce734f280..984509323 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -103,6 +103,7 @@ struct ComposeControlsDescriptor {
 	Window::SessionController *regularWindow = nullptr;
 	rpl::producer<ChatHelpers::FileChosen> stickerOrEmojiChosen;
 	rpl::producer<QString> customPlaceholder;
+	QString voiceCustomCancelText;
 	bool voiceLockFromBottom = false;
 	ChatHelpers::ComposeFeatures features;
 };
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 757b85444..6f30a8e59 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1024,7 +1024,9 @@ VoiceRecordBar::VoiceRecordBar(
 , _startTimer([=] { startRecording(); })
 , _message(
 	st::historyRecordTextStyle,
-	tr::lng_record_cancel(tr::now),
+	(!descriptor.customCancelText.isEmpty()
+		? descriptor.customCancelText
+		: tr::lng_record_cancel(tr::now)),
 	TextParseOptions{ TextParseMultiline, 0, 0, Qt::LayoutDirectionAuto })
 , _lockFromBottom(descriptor.lockFromBottom)
 , _cancelFont(st::historyRecordFont) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 2d04e98a7..09c491678 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -43,6 +43,7 @@ struct VoiceRecordBarDescriptor {
 	not_null<Ui::RpWidget*> outerContainer;
 	std::shared_ptr<ChatHelpers::Show> show;
 	std::shared_ptr<Ui::SendButton> send;
+	QString customCancelText;
 	const style::RecordBar *stOverride = nullptr;
 	int recorderHeight = 0;
 	bool lockFromBottom = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 1497a60e4..c9eeed94d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -86,6 +86,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 		.sendMenuType = SendMenu::Type::SilentOnly,
 		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
 		.customPlaceholder = tr::lng_story_reply_ph(),
+		.voiceCustomCancelText = tr::lng_record_cancel_stories(tr::now),
 		.voiceLockFromBottom = true,
 		.features = {
 			.sendAs = false,

From d392c7e8f0e4904d32d5f4aba7e324e7c5541e7e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 10:33:58 +0400
Subject: [PATCH 443/676] Use only vertical volume dropdown layout.

---
 .../SourceFiles/media/stories/media_stories_header.cpp    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 5dafcb9e7..d0b988cb5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -498,13 +498,7 @@ void Header::createVolumeToggle() {
 			}
 		}
 	}, lifetime);
-	_controller->layoutValue(
-	) | rpl::map([](const Layout &layout) {
-		return (layout.headerLayout == HeaderLayout::Outside);
-	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool horizontal) {
-		rebuildVolumeControls(_volume->entity(), horizontal);
-	}, lifetime);
+	rebuildVolumeControls(_volume->entity(), false);
 
 	rpl::combine(
 		_widget->positionValue(),

From 75f542747dda8453bd1f3359db96eecd68e7e36e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 20:12:41 +0400
Subject: [PATCH 444/676] Fix build with GCC.

---
 Telegram/SourceFiles/dialogs/dialogs_row.cpp                | 3 ---
 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp    | 1 -
 Telegram/SourceFiles/media/stories/media_stories_header.cpp | 1 -
 Telegram/SourceFiles/ui/effects/outline_segments.cpp        | 1 -
 4 files changed, 6 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index f8d748d0d..c937f10f2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -360,15 +360,12 @@ void Row::PaintCornerBadgeFrame(
 	if (storiesCount) {
 		q.restore();
 
-		const auto st = context.st;
 		const auto outline = QRectF(0, 0, photoSize, photoSize);
 		const auto storiesUnreadCount = data->storiesUnreadCount;
 		const auto storiesUnreadBrush = [&] {
 			if (context.active || !storiesUnreadCount) {
 				return st::dialogsUnreadBgMutedActive->b;
 			}
-			const auto left = st->padding.left();
-			const auto top = st->padding.top();
 			auto gradient = Ui::UnreadStoryOutlineGradient(outline);
 			return QBrush(gradient);
 		}();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index a1c6f452b..b09083ed7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -233,7 +233,6 @@ List::Layout List::computeLayout(float64 expanded) const {
 	const auto smallCount = std::min(
 		kSmallThumbsShown,
 		itemsCount - smallSkip);
-	const auto smallWidth = st.photo + (smallCount - 1) * st.shift;
 	const auto leftSmall = st.left - (smallSkip ? st.shift : 0);
 	const auto leftFull = full.left - _scrollLeft + skipSide;
 	const auto startIndexFull = std::max(-leftFull, 0) / singleFull;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index d0b988cb5..5b35ec1c7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -566,7 +566,6 @@ void Header::rebuildVolumeControls(
 	});
 	slider->setValue(_controller->currentVolume());
 
-	const auto skip = button->width() / 2;
 	const auto size = button->width()
 		+ st::storiesVolumeSize
 		+ st::storiesVolumeBottom;
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.cpp b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
index 5b302056b..7d4dd47fa 100644
--- a/Telegram/SourceFiles/ui/effects/outline_segments.cpp
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
@@ -30,7 +30,6 @@ void PaintOutlineSegments(
 		: (full / (count * 1.1));
 	const auto left = full - (separator * count);
 	const auto length = left / float64(count);
-	const auto step = length + separator;
 	const auto spin = separator * (1. - fromFullProgress);
 
 	auto start = 0. + (arc::kQuarterLength + (separator / 2)) + (3. * spin);

From 150957abcd29b700f77bcdeeffaa38f7e90d5eae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 20:20:32 +0400
Subject: [PATCH 445/676] Fix story viewer after attach choose dialog.

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

diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 6e3003893..7103e1bd6 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -371,6 +371,9 @@ bool GetDefault(
 		? parent->window()
 		: Core::App().getFileDialogParent();
 	Core::App().notifyFileDialogShown(true);
+	const auto guard = gsl::finally([] {
+		Core::App().notifyFileDialogShown(false);
+	});
 	if (type == Type::ReadFiles) {
 		files = QFileDialog::getOpenFileNames(resolvedParent, caption, startFile, filter);
 		QString path = files.isEmpty() ? QString() : QFileInfo(files.back()).absoluteDir().absolutePath();
@@ -386,7 +389,6 @@ bool GetDefault(
 	} else {
 		file = QFileDialog::getOpenFileName(resolvedParent, caption, startFile, filter);
 	}
-	Core::App().notifyFileDialogShown(false);
 
 	if (file.isEmpty()) {
 		files = QStringList();

From 68fa3e36d73ce0a39af4976bcecb7530a3ad1b17 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 20:49:46 +0400
Subject: [PATCH 446/676] Fix story mention text updating.

---
 Telegram/SourceFiles/data/data_media_types.cpp | 12 ++++++++++--
 Telegram/SourceFiles/data/data_media_types.h   |  4 ++--
 Telegram/SourceFiles/data/data_session.cpp     |  5 +++++
 Telegram/SourceFiles/history/history_item.cpp  |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 1367970fc..19d89c500 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -412,7 +412,7 @@ FullStoryId Media::storyId() const {
 	return {};
 }
 
-bool Media::storyExpired() const {
+bool Media::storyExpired(bool revalidate) {
 	return false;
 }
 
@@ -2033,7 +2033,15 @@ FullStoryId MediaStory::storyId() const {
 	return _storyId;
 }
 
-bool MediaStory::storyExpired() const {
+bool MediaStory::storyExpired(bool revalidate) {
+	if (revalidate) {
+		const auto stories = &parent()->history()->owner().stories();
+		if (const auto maybeStory = stories->lookup(_storyId)) {
+			_expired = false;
+		} else if (maybeStory.error() == Data::NoStory::Deleted) {
+			_expired = true;
+		}
+	}
 	return _expired;
 }
 
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 81e034c02..7649a37ed 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -114,7 +114,7 @@ public:
 	virtual PollData *poll() const;
 	virtual const WallPaper *paper() const;
 	virtual FullStoryId storyId() const;
-	virtual bool storyExpired() const;
+	virtual bool storyExpired(bool revalidate = false);
 	virtual bool storyMention() const;
 
 	virtual bool uploading() const;
@@ -580,7 +580,7 @@ public:
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
 	FullStoryId storyId() const override;
-	bool storyExpired() const override;
+	bool storyExpired(bool revalidate = false) override;
 	bool storyMention() const override;
 
 	TextWithEntities notificationText() const override;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index ca39658a6..b3911b9d4 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3917,6 +3917,11 @@ void Session::refreshStoryItemViews(FullStoryId id) {
 	const auto i = _storyItems.find(id);
 	if (i != _storyItems.end()) {
 		for (const auto item : i->second) {
+			if (const auto media = item->media()) {
+				if (media->storyMention()) {
+					item->updateStoryMentionText();
+				}
+			}
 			requestItemViewRefresh(item);
 		}
 	}
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index c6ddbb4c4..bc0fffeb7 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -4825,7 +4825,7 @@ PreparedServiceText HistoryItem::prepareStoryMentionText() {
 	auto result = PreparedServiceText();
 	const auto peer = history()->peer;
 	result.links.push_back(peer->createOpenLink());
-	const auto phrase = (this->media() && this->media()->storyExpired())
+	const auto phrase = (this->media() && this->media()->storyExpired(true))
 		? (out()
 			? tr::lng_action_story_mention_me_unavailable
 			: tr::lng_action_story_mention_unavailable)

From 9ccb11bd1a45adc376672a00b131d1847acd9354 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 20 Jul 2023 18:06:45 +0400
Subject: [PATCH 447/676] Avoid using const_string for constant consumed by
 std::string

---
 .../platform/linux/integration_linux.cpp      |  4 +-
 .../linux/linux_xdp_open_with_dialog.cpp      | 23 +++---
 .../linux/notifications_manager_linux.cpp     | 80 +++++++++----------
 .../platform/linux/specific_linux.cpp         | 12 ++-
 4 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 05cf6be27..0303f5093 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -114,8 +114,8 @@ LinuxIntegration::LinuxIntegration()
 	XdpInhibit::InhibitProxy::new_for_bus_sync(
 		Gio::BusType::SESSION_,
 		Gio::DBusProxyFlags::DO_NOT_AUTO_START_AT_CONSTRUCTION_,
-		std::string(base::Platform::XDP::kService),
-		std::string(base::Platform::XDP::kObjectPath),
+		base::Platform::XDP::kService,
+		base::Platform::XDP::kObjectPath,
 		nullptr))
 , _darkModeWatcher([](
 	const Glib::ustring &group,
diff --git a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
index c37a123a3..9efcb0b68 100644
--- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
@@ -23,8 +23,8 @@ namespace File {
 namespace internal {
 namespace {
 
-constexpr auto kXDPOpenURIInterface = "org.freedesktop.portal.OpenURI"_cs;
-constexpr auto kPropertiesInterface = "org.freedesktop.DBus.Properties"_cs;
+constexpr auto kXDPOpenURIInterface = "org.freedesktop.portal.OpenURI";
+constexpr auto kPropertiesInterface = "org.freedesktop.DBus.Properties";
 
 } // namespace
 
@@ -34,15 +34,14 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
 			Gio::DBus::BusType::SESSION);
 
 		const auto version = connection->call_sync(
-			std::string(base::Platform::XDP::kObjectPath),
-			std::string(kPropertiesInterface),
+			base::Platform::XDP::kObjectPath,
+			kPropertiesInterface,
 			"Get",
 			Glib::create_variant(std::tuple{
-				Glib::ustring(
-					std::string(kXDPOpenURIInterface)),
+				Glib::ustring(kXDPOpenURIInterface),
 				Glib::ustring("version"),
 			}),
-			std::string(base::Platform::XDP::kService)
+			base::Platform::XDP::kService
 		).get_child(0).get_dynamic<Glib::Variant<uint>>().get();
 
 		if (version < 3) {
@@ -107,8 +106,8 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
 				const Glib::VariantContainerBase &parameters) {
 				loop->quit();
 			},
-			std::string(base::Platform::XDP::kService),
-			std::string(base::Platform::XDP::kRequestInterface),
+			base::Platform::XDP::kService,
+			base::Platform::XDP::kRequestInterface,
 			"Response",
 			requestPath);
 
@@ -121,8 +120,8 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
 		auto outFdList = Glib::RefPtr<Gio::UnixFDList>();
 
 		connection->call_sync(
-			std::string(base::Platform::XDP::kObjectPath),
-			std::string(kXDPOpenURIInterface),
+			base::Platform::XDP::kObjectPath,
+			kXDPOpenURIInterface,
 			"OpenFile",
 			Glib::create_variant(std::tuple{
 				parentWindowId,
@@ -144,7 +143,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
 			}),
 			Gio::UnixFDList::create(std::vector<int>{ fd }),
 			outFdList,
-			std::string(base::Platform::XDP::kService));
+			base::Platform::XDP::kService);
 
 		if (signalId != 0) {
 			QWidget window;
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 7b4f172a7..849af9f37 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -37,10 +37,10 @@ namespace Platform {
 namespace Notifications {
 namespace {
 
-constexpr auto kService = "org.freedesktop.Notifications"_cs;
-constexpr auto kObjectPath = "/org/freedesktop/Notifications"_cs;
+constexpr auto kService = "org.freedesktop.Notifications";
+constexpr auto kObjectPath = "/org/freedesktop/Notifications";
 constexpr auto kInterface = kService;
-constexpr auto kPropertiesInterface = "org.freedesktop.DBus.Properties"_cs;
+constexpr auto kPropertiesInterface = "org.freedesktop.DBus.Properties";
 
 struct ServerInformation {
 	QString name;
@@ -76,7 +76,7 @@ std::unique_ptr<base::Platform::DBus::ServiceWatcher> CreateServiceWatcher() {
 			try {
 				return ranges::contains(
 					base::Platform::DBus::ListActivatableNames(connection),
-					std::string(kService),
+					kService,
 					&Glib::ustring::raw);
 			} catch (...) {
 				// avoid service restart loop in sandboxed environments
@@ -86,7 +86,7 @@ std::unique_ptr<base::Platform::DBus::ServiceWatcher> CreateServiceWatcher() {
 
 		return std::make_unique<base::Platform::DBus::ServiceWatcher>(
 			connection,
-			std::string(kService),
+			kService,
 			[=](
 				const Glib::ustring &service,
 				const Glib::ustring &oldOwner,
@@ -115,7 +115,7 @@ void StartServiceAsync(Fn<void()> callback) {
 
 		base::Platform::DBus::StartServiceByNameAsync(
 			connection,
-			std::string(kService),
+			kService,
 			[=](Fn<base::Platform::DBus::StartReply()> result) {
 				Noexcept([&] {
 					try {
@@ -155,7 +155,7 @@ bool GetServiceRegistered() {
 			try {
 				return base::Platform::DBus::NameHasOwner(
 					connection,
-					std::string(kService));
+					kService);
 			} catch (...) {
 				return false;
 			}
@@ -165,7 +165,7 @@ bool GetServiceRegistered() {
 			try {
 				return ranges::contains(
 					base::Platform::DBus::ListActivatableNames(connection),
-					std::string(kService),
+					kService,
 					&Glib::ustring::raw);
 			} catch (...) {
 				return false;
@@ -186,8 +186,8 @@ void GetServerInformation(
 			Gio::DBus::BusType::SESSION);
 
 		connection->call(
-			std::string(kObjectPath),
-			std::string(kInterface),
+			kObjectPath,
+			kInterface,
 			"GetServerInformation",
 			{},
 			[=](const Glib::RefPtr<Gio::AsyncResult> &result) {
@@ -224,7 +224,7 @@ void GetServerInformation(
 					crl::on_main([=] { callback(std::nullopt); });
 				});
 			},
-			std::string(kService));
+			kService);
 	}, [&] {
 		crl::on_main([=] { callback(std::nullopt); });
 	});
@@ -236,8 +236,8 @@ void GetCapabilities(Fn<void(const QStringList &)> callback) {
 			Gio::DBus::BusType::SESSION);
 
 		connection->call(
-			std::string(kObjectPath),
-			std::string(kInterface),
+			kObjectPath,
+			kInterface,
 			"GetCapabilities",
 			{},
 			[=](const Glib::RefPtr<Gio::AsyncResult> &result) {
@@ -257,7 +257,7 @@ void GetCapabilities(Fn<void(const QStringList &)> callback) {
 					crl::on_main([=] { callback({}); });
 				});
 			},
-			std::string(kService));
+			kService);
 	}, [&] {
 		crl::on_main([=] { callback({}); });
 	});
@@ -269,11 +269,11 @@ void GetInhibited(Fn<void(bool)> callback) {
 			Gio::DBus::BusType::SESSION);
 
 		connection->call(
-			std::string(kObjectPath),
-			std::string(kPropertiesInterface),
+			kObjectPath,
+			kPropertiesInterface,
 			"Get",
 			Glib::create_variant(std::tuple{
-				Glib::ustring(std::string(kInterface)),
+				Glib::ustring(kInterface),
 				Glib::ustring("Inhibited"),
 			}),
 			[=](const Glib::RefPtr<Gio::AsyncResult> &result) {
@@ -290,7 +290,7 @@ void GetInhibited(Fn<void(bool)> callback) {
 					crl::on_main([=] { callback(false); });
 				});
 			},
-			std::string(kService));
+			kService);
 	}, [&] {
 		crl::on_main([=] { callback(false); });
 	});
@@ -545,25 +545,25 @@ bool NotificationData::init(
 			_notificationRepliedSignalId =
 				_dbusConnection->signal_subscribe(
 					signalEmitted,
-					std::string(kService),
-					std::string(kInterface),
+					kService,
+					kInterface,
 					"NotificationReplied",
-					std::string(kObjectPath));
+					kObjectPath);
 		}
 
 		_actionInvokedSignalId = _dbusConnection->signal_subscribe(
 			signalEmitted,
-			std::string(kService),
-			std::string(kInterface),
+			kService,
+			kInterface,
 			"ActionInvoked",
-			std::string(kObjectPath));
+			kObjectPath);
 
 		_activationTokenSignalId = _dbusConnection->signal_subscribe(
 			signalEmitted,
-			std::string(kService),
-			std::string(kInterface),
+			kService,
+			kInterface,
 			"ActivationToken",
-			std::string(kObjectPath));
+			kObjectPath);
 	}
 
 	if (capabilities.contains("action-icons")) {
@@ -594,10 +594,10 @@ bool NotificationData::init(
 
 	_notificationClosedSignalId = _dbusConnection->signal_subscribe(
 		signalEmitted,
-		std::string(kService),
-		std::string(kInterface),
+		kService,
+		kInterface,
 		"NotificationClosed",
-		std::string(kObjectPath));
+		kObjectPath);
 	return true;
 }
 
@@ -643,8 +643,8 @@ void NotificationData::show() {
 		const auto connection = _dbusConnection;
 
 		connection->call(
-			std::string(kObjectPath),
-			std::string(kInterface),
+			kObjectPath,
+			kInterface,
 			"Notify",
 			Glib::create_variant(std::tuple{
 				Glib::ustring(std::string(AppName)),
@@ -673,7 +673,7 @@ void NotificationData::show() {
 					});
 				});
 			},
-			std::string(kService));
+			kService);
 	}));
 }
 
@@ -690,14 +690,14 @@ void NotificationData::close() {
 	}
 
 	_dbusConnection->call(
-		std::string(kObjectPath),
-		std::string(kInterface),
+		kObjectPath,
+		kInterface,
 		"CloseNotification",
 		Glib::create_variant(std::tuple{
 			_notificationId,
 		}),
 		{},
-		std::string(kService),
+		kService,
 		-1,
 		Gio::DBus::CallFlags::NO_AUTO_START);
 	_manager->clearNotification(_id);
@@ -987,7 +987,7 @@ Manager::Private::Private(not_null<Manager*> manager)
 						0
 					).get_dynamic<Glib::ustring>();
 
-					if (interface != kInterface.data()) {
+					if (interface != kInterface) {
 						return;
 					}
 
@@ -1003,10 +1003,10 @@ Manager::Private::Private(not_null<Manager*> manager)
 					});
 				});
 			},
-			std::string(kService),
-			std::string(kPropertiesInterface),
+			kService,
+			kPropertiesInterface,
 			"PropertiesChanged",
-			std::string(kObjectPath));
+			kObjectPath);
 	}
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 7e20b946a..9fdb7a914 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -54,8 +54,6 @@ using Platform::internal::WaylandIntegration;
 namespace Platform {
 namespace {
 
-constexpr auto kDesktopFile = ":/misc/org.telegram.desktop.desktop"_cs;
-
 bool PortalAutostart(bool start, bool silent) {
 	if (cExeName().isEmpty()) {
 		return false;
@@ -138,8 +136,8 @@ bool PortalAutostart(bool start, bool silent) {
 
 				loop->quit();
 			},
-			std::string(base::Platform::XDP::kService),
-			std::string(base::Platform::XDP::kRequestInterface),
+			base::Platform::XDP::kService,
+			base::Platform::XDP::kRequestInterface,
 			"Response",
 			requestPath);
 
@@ -150,14 +148,14 @@ bool PortalAutostart(bool start, bool silent) {
 		});
 
 		connection->call_sync(
-			std::string(base::Platform::XDP::kObjectPath),
+			base::Platform::XDP::kObjectPath,
 			"org.freedesktop.portal.Background",
 			"RequestBackground",
 			Glib::create_variant(std::tuple{
 				parentWindowId,
 				options,
 			}),
-			std::string(base::Platform::XDP::kService));
+			base::Platform::XDP::kService);
 
 		if (signalId != 0) {
 			QWidget window;
@@ -190,7 +188,7 @@ bool GenerateDesktopFile(
 	DEBUG_LOG(("App Info: placing .desktop file to %1").arg(targetPath));
 	if (!QDir(targetPath).exists()) QDir().mkpath(targetPath);
 
-	const auto sourceFile = kDesktopFile.utf16();
+	const auto sourceFile = u":/misc/org.telegram.desktop.desktop"_q;
 	const auto targetFile = targetPath
 		+ QGuiApplication::desktopFileName()
 		+ u".desktop"_q;

From 6e3c3a8dd22d0ceb94830c0834c94f0049ce9875 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 21:42:22 +0400
Subject: [PATCH 448/676] Collapse stories on archive open/close.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 47 ++++++++++++++++---
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  6 +++
 .../dialogs/ui/dialogs_stories_list.cpp       |  1 +
 Telegram/lib_base                             |  2 +-
 Telegram/lib_ui                               |  2 +-
 Telegram/lib_webview                          |  2 +-
 6 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 90722d7ea..9ff80e9fd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1075,19 +1075,52 @@ void Widget::changeOpenedFolder(Data::Folder *folder, anim::type animated) {
 		cancelSearch();
 		closeChildList(anim::type::instant);
 		controller()->closeForum();
-		const auto was = (_openedFolder != nullptr);
 		_openedFolder = folder;
 		_inner->changeOpenedFolder(folder);
-		storiesToggleExplicitExpand(false);
-		if (was != (_openedFolder != nullptr)) {
-			using List = Data::StorySourcesList;
-			_storiesContents.fire(Stories::ContentForSession(
-				&controller()->session(),
-				folder ? List::Hidden : List::NotHidden));
+		if (_stories) {
+			storiesExplicitCollapse();
 		}
 	}, (folder != nullptr), animated);
 }
 
+void Widget::storiesExplicitCollapse() {
+	if (_storiesExplicitExpand) {
+		storiesToggleExplicitExpand(false);
+	} else if (_stories) {
+		using Type = Ui::ElasticScroll::OverscrollType;
+		_scroll->setOverscrollDefaults(0, 0);
+		_scroll->setOverscrollTypes(Type::None, Type::Real);
+		_scroll->setOverscrollTypes(
+			_stories->isHidden() ? Type::Real : Type::Virtual,
+			Type::Real);
+	}
+	_storiesExplicitExpandAnimation.stop();
+	_storiesExplicitExpandValue = 0;
+
+	using List = Data::StorySourcesList;
+	collectStoriesUserpicsViews(_openedFolder
+		? List::NotHidden
+		: List::Hidden);
+	_storiesContents.fire(Stories::ContentForSession(
+		&session(),
+		_openedFolder ? List::Hidden : List::NotHidden));
+}
+
+void Widget::collectStoriesUserpicsViews(Data::StorySourcesList list) {
+	auto &map = (list == Data::StorySourcesList::Hidden)
+		? _storiesUserpicsViewsHidden
+		: _storiesUserpicsViewsShown;
+	map.clear();
+	auto &owner = session().data();
+	for (const auto &source : owner.stories().sources(list)) {
+		if (const auto peer = owner.peerLoaded(source.id)) {
+			if (auto view = peer->activeUserpicView(); view.cloud) {
+				map.emplace(source.id, std::move(view));
+			}
+		}
+	}
+}
+
 void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 	if (_openedForum == forum) {
 		return;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 83a8d70e6..9473ac348 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/dialogs_key.h"
 #include "window/section_widget.h"
 #include "ui/effects/animations.h"
+#include "ui/userpic_view.h"
 #include "mtproto/sender.h"
 #include "api/api_single_message_search.h"
 
@@ -20,6 +21,7 @@ class Error;
 
 namespace Data {
 class Forum;
+enum class StorySourcesList : uchar;
 } // namespace Data
 
 namespace Main {
@@ -168,6 +170,8 @@ private:
 	void setupDownloadBar();
 	void setupShortcuts();
 	void setupStories();
+	void storiesExplicitCollapse();
+	void collectStoriesUserpicsViews(Data::StorySourcesList list);
 	void storiesToggleExplicitExpand(bool expand);
 	void trackScroll(not_null<Ui::RpWidget*> widget);
 	[[nodiscard]] bool searchForPeersRequired(const QString &query) const;
@@ -281,6 +285,8 @@ private:
 	QString _lastFilterText;
 
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
+	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsHidden;
+	base::flat_map<PeerId, Ui::PeerUserpicView> _storiesUserpicsViewsShown;
 	Fn<void()> _updateScrollGeometryCached;
 	std::unique_ptr<Stories::List> _stories;
 	Ui::Animations::Simple _storiesExplicitExpandAnimation;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index b09083ed7..1703c29d4 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -622,6 +622,7 @@ void List::mousePressEvent(QMouseEvent *e) {
 		return;
 	} else if (_state == State::Small) {
 		requestExpanded(true);
+		return;
 	} else if (_state != State::Full) {
 		return;
 	}
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 74be75339..2669a0457 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 74be75339d474df1a2863028ec146744597bd0bb
+Subproject commit 2669a04579069942b6208a18abe93c26adfddf2a
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 8f03125ec..288bec715 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 8f03125ec1d6b0f4a3f0fe6b6849aa57a1006063
+Subproject commit 288bec7157bf654d121ebfd2828801b49beb34ec
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index ec24c7a96..ebb8b8b91 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit ec24c7a96036268b2024ca9765a66c63e6b8396a
+Subproject commit ebb8b8b91fe357b2c397a3eb98655c585b8c856e

From 94ad9221edf1328aeff127d7f8494af65712a3c4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 22:08:24 +0400
Subject: [PATCH 449/676] Fix opening recent viewers short profiles.

---
 .../media/stories/media_stories_recent_views.cpp         | 9 +++++++--
 .../media/stories/media_stories_recent_views.h           | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 5f24fe717..6f11e6169 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -342,11 +342,15 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 	};
 	if (_menuPlaceholderCount > 0) {
 		const auto i = _menuEntries.end() - (_menuPlaceholderCount--);
+		auto data = prepare(i->view);
 		i->peer = peer;
 		i->date = date;
-		i->action->setData(prepare(i->view));
+		i->callback = data.callback;
+		i->action->setData(std::move(data));
 	} else {
 		auto view = Ui::PeerUserpicView();
+		auto data = prepare(view);
+		auto callback = data.callback;
 		auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
 			_menu->menu(),
 			nullptr,
@@ -358,6 +362,7 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 			.action = raw,
 			.peer = peer,
 			.date = date,
+			.callback = std::move(callback),
 			.view = std::move(view),
 		});
 	}
@@ -440,7 +445,7 @@ void RecentViews::subscribeToMenuUserpicsLoading(
 					.text = peer->name(),
 					.date = entry.date,
 					.userpic = std::move(userpic),
-					.callback = [] {},
+					.callback = entry.callback,
 				});
 				entry.key = key;
 				if (!peer->hasUserpic() || !peer->useEmptyUserpic(view)) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
index 2ecddf4ac..14bbdba68 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
@@ -55,6 +55,7 @@ private:
 		not_null<Ui::WhoReactedEntryAction*> action;
 		PeerData *peer = nullptr;
 		QString date;
+		Fn<void()> callback;
 		Ui::PeerUserpicView view;
 		InMemoryKey key;
 	};

From 1f47b8e130d49e044090f1aed0cddfb67ed50352 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 22:19:32 +0400
Subject: [PATCH 450/676] Fix userpics list glitch.

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

diff --git a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
index 3c2ad72b9..4044c7d26 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
@@ -364,6 +364,9 @@ void GroupCallUserpics::finishAnimating() {
 }
 
 void GroupCallUserpics::toggle(Userpic &userpic, bool shown) {
+	if (userpic.hiding == !shown && !userpic.shownAnimation.animating()) {
+		return;
+	}
 	userpic.hiding = !shown;
 	userpic.shownAnimation.start(
 		[=] { recountAndRepaint(); },

From c35556b33a6ff0fe8c65300dac3c4e32bd38f455 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 22:31:47 +0400
Subject: [PATCH 451/676] Improve short info button geometry.

---
 .../media/stories/media_stories_header.cpp    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 5b35ec1c7..e710cd288 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -309,6 +309,16 @@ void Header::show(HeaderData data) {
 			raw->setGeometry(layout.header);
 		}, raw->lifetime());
 	}
+	const auto updateInfoGeometry = [=] {
+		if (_name && _date) {
+			const auto namex = st::storiesHeaderNamePosition.x();
+			const auto namer = namex + _name->width();
+			const auto datex = st::storiesHeaderDatePosition.x();
+			const auto dater = datex + _date->width();
+			const auto r = std::max(namer, dater);
+			_info->setGeometry({ 0, 0, r, _widget->height() });
+		}
+	};
 	if (nameDataChanged) {
 		_name = std::make_unique<Ui::FlatLabel>(
 			_widget.get(),
@@ -322,12 +332,7 @@ void Header::show(HeaderData data) {
 		rpl::combine(
 			_name->widthValue(),
 			_widget->heightValue()
-		) | rpl::start_with_next([=](int width, int height) {
-			if (_date) {
-				_info->setGeometry(
-					{ 0, 0, std::max(width, _date->width()), height });
-			}
-		}, _name->lifetime());
+		) | rpl::start_with_next(updateInfoGeometry, _name->lifetime());
 	}
 	auto timestamp = ComposeDetails(data, base::unixtime::now());
 	_date = std::make_unique<Ui::FlatLabel>(
@@ -340,10 +345,7 @@ void Header::show(HeaderData data) {
 	_date->move(st::storiesHeaderDatePosition);
 
 	_date->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		_info->setGeometry(
-			{ 0, 0, std::max(width, _name->width()), _widget->height() });
-	}, _name->lifetime());
+	) | rpl::start_with_next(updateInfoGeometry, _date->lifetime());
 
 	_privacy = MakePrivacyBadge(_userpic.get(), data.privacy, [=] {
 

From 2cd08b8923f5e5b7f16fa4edff67636915751c79 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 22:50:18 +0400
Subject: [PATCH 452/676] Cut off name / date correctly.

---
 .../stories/media_stories_controller.cpp      |   8 +-
 .../media/stories/media_stories_controller.h  |   1 +
 .../media/stories/media_stories_header.cpp    | 165 ++++++++++++------
 .../media/stories/media_stories_header.h      |   4 +-
 .../SourceFiles/media/view/media_view.style   |   6 +-
 5 files changed, 121 insertions(+), 63 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index b42a0bd74..f32aec6c6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -910,9 +910,11 @@ PauseState Controller::pauseState() const {
 	const auto playing = !inactive && !_paused;
 	return playing
 		? PauseState::Playing
-		: inactive
-		? PauseState::Inactive
-		: PauseState::Paused;
+		: !inactive
+		? PauseState::Paused
+		: _paused
+		? PauseState::InactivePaused
+		: PauseState::Inactive;
 }
 
 float64 Controller::currentVolume() const {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 19b2de4d9..d234d540c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -76,6 +76,7 @@ enum class PauseState {
 	Playing,
 	Paused,
 	Inactive,
+	InactivePaused,
 };
 
 struct SiblingLayout {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index e710cd288..7a9e92bfa 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -235,16 +235,12 @@ void UserpicBadge::updateGeometry() {
 	return { Ui::FormatDateTime(whenFull) };
 }
 
-[[nodiscard]] TextWithEntities ComposeName(HeaderData data) {
-	auto result = Ui::Text::Bold(data.user->isSelf()
-		? tr::lng_stories_my_name(tr::now)
-		: data.user->shortName());
-	if (data.fullCount) {
-		result.append(QString::fromUtf8(" \xE2\x80\xA2 %1/%2"
-		).arg(data.fullIndex + 1
-		).arg(data.fullCount));
-	}
-	return result;
+[[nodiscard]] QString ComposeCounter(HeaderData data) {
+	const auto index = data.fullIndex + 1;
+	const auto count = data.fullCount;
+	return count
+		? QString::fromUtf8(" \xE2\x80\xA2 %1/%2").arg(index).arg(count)
+		: QString();
 }
 
 [[nodiscard]] Timestamp ComposeDetails(HeaderData data, TimeId now) {
@@ -269,46 +265,8 @@ void Header::show(HeaderData data) {
 	if (_data == data) {
 		return;
 	}
-	const auto userChanged = !_data
-		|| (_data->user != data.user);
-	const auto nameDataChanged = userChanged
-		|| !_name
-		|| (_data->fullCount != data.fullCount)
-		|| (data.fullCount && _data->fullIndex != data.fullIndex);
+	const auto userChanged = !_data || (_data->user != data.user);
 	_data = data;
-	if (userChanged) {
-		_volume = nullptr;
-		_date = nullptr;
-		_name = nullptr;
-		_userpic = nullptr;
-		_info = nullptr;
-		_privacy = nullptr;
-		_playPause = nullptr;
-		_volumeToggle = nullptr;
-		const auto parent = _controller->wrap();
-		auto widget = std::make_unique<Ui::RpWidget>(parent);
-		const auto raw = widget.get();
-		_info = std::make_unique<Ui::AbstractButton>(raw);
-		_info->setClickedCallback([=] {
-			_controller->uiShow()->show(PrepareShortInfoBox(_data->user));
-		});
-		_userpic = std::make_unique<Ui::UserpicButton>(
-			raw,
-			data.user,
-			st::storiesHeaderPhoto);
-		_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
-		_userpic->show();
-		_userpic->move(
-			st::storiesHeaderMargin.left(),
-			st::storiesHeaderMargin.top());
-		raw->show();
-		_widget = std::move(widget);
-
-		_controller->layoutValue(
-		) | rpl::start_with_next([=](const Layout &layout) {
-			raw->setGeometry(layout.header);
-		}, raw->lifetime());
-	}
 	const auto updateInfoGeometry = [=] {
 		if (_name && _date) {
 			const auto namex = st::storiesHeaderNamePosition.x();
@@ -319,20 +277,58 @@ void Header::show(HeaderData data) {
 			_info->setGeometry({ 0, 0, r, _widget->height() });
 		}
 	};
-	if (nameDataChanged) {
+	if (userChanged) {
+		_volume = nullptr;
+		_date = nullptr;
+		_name = nullptr;
+		_counter = nullptr;
+		_userpic = nullptr;
+		_info = nullptr;
+		_privacy = nullptr;
+		_playPause = nullptr;
+		_volumeToggle = nullptr;
+		const auto parent = _controller->wrap();
+		auto widget = std::make_unique<Ui::RpWidget>(parent);
+		const auto raw = widget.get();
+
+		_info = std::make_unique<Ui::AbstractButton>(raw);
+		_info->setClickedCallback([=] {
+			_controller->uiShow()->show(PrepareShortInfoBox(_data->user));
+		});
+
+		_userpic = std::make_unique<Ui::UserpicButton>(
+			raw,
+			data.user,
+			st::storiesHeaderPhoto);
+		_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_userpic->show();
+		_userpic->move(
+			st::storiesHeaderMargin.left(),
+			st::storiesHeaderMargin.top());
+
 		_name = std::make_unique<Ui::FlatLabel>(
-			_widget.get(),
-			rpl::single(ComposeName(data)),
+			raw,
+			rpl::single(data.user->isSelf()
+				? tr::lng_stories_my_name(tr::now)
+				: data.user->shortName()),
 			st::storiesHeaderName);
 		_name->setAttribute(Qt::WA_TransparentForMouseEvents);
 		_name->setOpacity(kNameOpacity);
-		_name->move(st::storiesHeaderNamePosition);
 		_name->show();
+		_name->move(st::storiesHeaderNamePosition);
 
 		rpl::combine(
 			_name->widthValue(),
-			_widget->heightValue()
+			raw->heightValue()
 		) | rpl::start_with_next(updateInfoGeometry, _name->lifetime());
+
+		raw->show();
+		_widget = std::move(widget);
+
+		_controller->layoutValue(
+		) | rpl::start_with_next([=](const Layout &layout) {
+			raw->setGeometry(layout.header);
+		}, raw->lifetime());
 	}
 	auto timestamp = ComposeDetails(data, base::unixtime::now());
 	_date = std::make_unique<Ui::FlatLabel>(
@@ -347,8 +343,21 @@ void Header::show(HeaderData data) {
 	_date->widthValue(
 	) | rpl::start_with_next(updateInfoGeometry, _date->lifetime());
 
-	_privacy = MakePrivacyBadge(_userpic.get(), data.privacy, [=] {
+	auto counter = ComposeCounter(data);
+	if (!counter.isEmpty()) {
+		_counter = std::make_unique<Ui::FlatLabel>(
+			_widget.get(),
+			std::move(counter),
+			st::storiesHeaderDate);
+		_counter->resizeToNaturalWidth(_counter->naturalWidth());
+		_counter->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_counter->setOpacity(kNameOpacity);
+		_counter->show();
+	} else {
+		_counter = nullptr;
+	}
 
+	_privacy = MakePrivacyBadge(_userpic.get(), data.privacy, [=] {
 	});
 
 	if (data.video) {
@@ -370,6 +379,41 @@ void Header::show(HeaderData data) {
 		_volumeToggle = nullptr;
 	}
 
+	rpl::combine(
+		_widget->widthValue(),
+		_counter ? _counter->widthValue() : rpl::single(0),
+		_dateUpdated.events_starting_with_copy(rpl::empty)
+	) | rpl::start_with_next([=](int outer, int counter, auto) {
+		const auto right = _playPause
+			? _playPause->x()
+			: (outer - st::storiesHeaderMargin.right());
+		const auto nameLeft = st::storiesHeaderNamePosition.x();
+		const auto nameNatural = _name->naturalWidth();
+		if (counter) {
+			counter += st::normalFont->spacew;
+		}
+		const auto nameAvailable = right - nameLeft - counter;
+		auto counterLeft = nameLeft;
+		if (nameAvailable <= 0) {
+			_name->hide();
+		} else {
+			_name->show();
+			_name->resizeToNaturalWidth(nameAvailable);
+			counterLeft += _name->width() + st::normalFont->spacew;
+		}
+		if (_counter) {
+			_counter->move(counterLeft, _name->y());
+		}
+		const auto dateLeft = st::storiesHeaderDatePosition.x();
+		const auto dateAvailable = right - dateLeft;
+		if (dateAvailable <= 0) {
+			_date->hide();
+		} else {
+			_date->show();
+			_date->resizeToNaturalWidth(dateAvailable);
+		}
+	}, _date->lifetime());
+
 	if (timestamp.changes > 0) {
 		_dateUpdateTimer.callOnce(timestamp.changes * crl::time(1000));
 	}
@@ -403,14 +447,17 @@ void Header::createPlayPause() {
 		} else if (type == QEvent::MouseButtonRelease) {
 			const auto down = base::take(state->down);
 			if (down && state->over) {
-				_controller->togglePaused(_pauseState != PauseState::Paused);
+				const auto paused = (_pauseState == PauseState::Paused)
+					|| (_pauseState == PauseState::InactivePaused);
+				_controller->togglePaused(!paused);
 			}
 		}
 	}, lifetime);
 
 	_playPause->paintRequest() | rpl::start_with_next([=] {
 		auto p = QPainter(_playPause.get());
-		const auto paused = (_pauseState == PauseState::Paused);
+		const auto paused = (_pauseState == PauseState::Paused)
+			|| (_pauseState == PauseState::InactivePaused);
 		const auto icon = paused
 			? &st::storiesPlayIcon
 			: &st::storiesPauseIcon;
@@ -620,7 +667,8 @@ void Header::updateVolumeIcon() {
 void Header::applyPauseState() {
 	Expects(_playPause != nullptr);
 
-	const auto inactive = (_pauseState == PauseState::Inactive);
+	const auto inactive = (_pauseState == PauseState::Inactive)
+		|| (_pauseState == PauseState::InactivePaused);
 	_playPause->setAttribute(Qt::WA_TransparentForMouseEvents, inactive);
 	if (inactive) {
 		QEvent e(QEvent::Leave);
@@ -646,6 +694,7 @@ void Header::updateDateText() {
 	}
 	auto timestamp = ComposeDetails(*_data, base::unixtime::now());
 	_date->setText(timestamp.text);
+	_dateUpdated.fire({});
 	if (timestamp.changes > 0) {
 		_dateUpdateTimer.callOnce(timestamp.changes * crl::time(1000));
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index f83749482..12a66b1a1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -62,7 +62,7 @@ private:
 	void createPlayPause();
 	void createVolumeToggle();
 	void rebuildVolumeControls(
-		not_null<Ui::RpWidget*> dropdown, 
+		not_null<Ui::RpWidget*> dropdown,
 		bool horizontal);
 
 	const not_null<Controller*> _controller;
@@ -73,7 +73,9 @@ private:
 	std::unique_ptr<Ui::AbstractButton> _info;
 	std::unique_ptr<Ui::UserpicButton> _userpic;
 	std::unique_ptr<Ui::FlatLabel> _name;
+	std::unique_ptr<Ui::FlatLabel> _counter;
 	std::unique_ptr<Ui::FlatLabel> _date;
+	rpl::event_stream<> _dateUpdated;
 	std::unique_ptr<Ui::RpWidget> _playPause;
 	std::unique_ptr<Ui::RpWidget> _volumeToggle;
 	std::unique_ptr<Ui::FadeWrap<Ui::RpWidget>> _volume;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 580347539..d463e8adc 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -426,11 +426,15 @@ storiesHeaderPhoto: UserpicButton(defaultUserpicButton) {
 }
 storiesHeaderName: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewControlFg;
-	style: defaultTextStyle;
+	style: semiboldTextStyle;
+	minWidth: 10px;
+	maxHeight: 20px;
 }
 storiesHeaderNamePosition: point(50px, 0px);
 storiesHeaderDate: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewControlFg;
+	minWidth: 10px;
+	maxHeight: 20px;
 }
 storiesHeaderDatePosition: point(50px, 17px);
 storiesShadowTop: icon{{ "mediaview/shadow_bottom-flip_vertical", windowShadowFg }};

From 1bdab16d7b3bc95b795ddf04923af52d1b83a558 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 23:13:35 +0400
Subject: [PATCH 453/676] Pause story while previewing a voice note.

---
 .../history/view/controls/history_view_compose_controls.cpp     | 2 +-
 .../history/view/controls/history_view_compose_controls.h       | 2 +-
 Telegram/SourceFiles/media/stories/media_stories_reply.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index b18fba987..c35ff0816 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2971,7 +2971,7 @@ bool ComposeControls::isRecordingPressed() const {
 }
 
 rpl::producer<bool> ComposeControls::recordingValue() const {
-	return _recording.value();
+	return _voiceRecordBar->shownValue();
 }
 
 rpl::producer<bool> ComposeControls::hasSendTextValue() const {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 984509323..95a72c356 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -218,7 +218,7 @@ public:
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isRecordingPressed() const;
-	[[nodiscard]] rpl::producer<bool> recordingValue() const;
+	[[nodiscard]] rpl::producer<bool> recordingActiveValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 
 	void applyCloudDraft();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index c9eeed94d..9d7728b72 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -671,7 +671,7 @@ rpl::producer<bool> ReplyArea::activeValue() const {
 	using namespace rpl::mappers;
 	return rpl::combine(
 		_controls->focusedValue(),
-		_controls->recordingValue(),
+		_controls->recordingActiveValue(),
 		_controls->tabbedPanelShownValue(),
 		_choosingAttach.value(),
 		_1 || _2 || _3 || _4

From e034f5e3047e21ab1f34124ff16d4394d197f77e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 23:15:45 +0400
Subject: [PATCH 454/676] Version 4.8.5.

- Bug fixes and other minor improvements. And stories preview.
---
 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/SourceFiles/data/data_story.cpp     |  2 +-
 Telegram/build/version                       | 10 +++++-----
 changelog.txt                                |  4 ++++
 7 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index e2e0f8a2d..4c223ef01 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.8.4.5" />
+    Version="4.8.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 6d78ed1c8..ce5cf123d 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,8,4,5
- PRODUCTVERSION 4,8,4,5
+ FILEVERSION 4,8,5,0
+ PRODUCTVERSION 4,8,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.4.5"
+            VALUE "FileVersion", "4.8.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.5"
+            VALUE "ProductVersion", "4.8.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 3d37a211c..5691c986a 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,8,4,5
- PRODUCTVERSION 4,8,4,5
+ FILEVERSION 4,8,5,0
+ PRODUCTVERSION 4,8,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.4.5"
+            VALUE "FileVersion", "4.8.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.4.5"
+            VALUE "ProductVersion", "4.8.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 8f9e79acb..101e781dc 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (4008004005ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 4008004;
-constexpr auto AppVersionStr = "4.8.4";
+constexpr auto AppVersion = 4008005;
+constexpr auto AppVersionStr = "4.8.5";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 8b21c7c34..2a139de87 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -276,7 +276,7 @@ bool Story::edited() const {
 }
 
 bool Story::canDownload() const {
-	return !forbidsForward() || _peer->isSelf();
+	return /*!forbidsForward() || */_peer->isSelf();
 }
 
 bool Story::canShare() const {
diff --git a/Telegram/build/version b/Telegram/build/version
index 659b269d5..92713d02f 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008004
+AppVersion         4008005
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.4
-AppVersionStr      4.8.4
+AppVersionStrSmall 4.8.5
+AppVersionStr      4.8.5
 BetaChannel        0
-AlphaVersion       4008004005
-AppVersionOriginal 4.8.4.5
+AlphaVersion       0
+AppVersionOriginal 4.8.5
diff --git a/changelog.txt b/changelog.txt
index 5906c8a22..bd7743446 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.5 (20.07.23)
+
+- Bug fixes and other minor improvements. And stories preview.
+
 4.8.4 (13.06.23)
 
 - Fix opening links on Linux.

From e646205bca05a1ae9d31a040bc86e54b13c81b5b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 23:30:12 +0400
Subject: [PATCH 455/676] Version 4.8.5: Fix build.

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

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index c35ff0816..f6ad9ffe3 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2970,7 +2970,7 @@ bool ComposeControls::isRecordingPressed() const {
 				&& _send->isDown()));
 }
 
-rpl::producer<bool> ComposeControls::recordingValue() const {
+rpl::producer<bool> ComposeControls::recordingActiveValue() const {
 	return _voiceRecordBar->shownValue();
 }
 

From 9a6cb68d71b872f27ea0b2e898b89458d45e9190 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 00:53:53 +0400
Subject: [PATCH 456/676] Version 4.8.5: Fix build with GCC.

---
 Telegram/SourceFiles/media/stories/media_stories_header.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 7a9e92bfa..5dc7f6b15 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -388,7 +388,6 @@ void Header::show(HeaderData data) {
 			? _playPause->x()
 			: (outer - st::storiesHeaderMargin.right());
 		const auto nameLeft = st::storiesHeaderNamePosition.x();
-		const auto nameNatural = _name->naturalWidth();
 		if (counter) {
 			counter += st::normalFont->spacew;
 		}

From 5fc10c934ab7086391bdb21836e15d24a9fc2b64 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 06:18:03 +0400
Subject: [PATCH 457/676] Version 4.8.6.

- Fix langpack keys by a full rebuild 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                                | 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 4c223ef01..c5647a2b5 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.8.5.0" />
+    Version="4.8.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 ce5cf123d..9fc997288 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,8,5,0
- PRODUCTVERSION 4,8,5,0
+ FILEVERSION 4,8,6,0
+ PRODUCTVERSION 4,8,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.5.0"
+            VALUE "FileVersion", "4.8.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.5.0"
+            VALUE "ProductVersion", "4.8.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 5691c986a..a581fc869 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,8,5,0
- PRODUCTVERSION 4,8,5,0
+ FILEVERSION 4,8,6,0
+ PRODUCTVERSION 4,8,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.5.0"
+            VALUE "FileVersion", "4.8.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.5.0"
+            VALUE "ProductVersion", "4.8.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 101e781dc..5b4f6e797 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 = 4008005;
-constexpr auto AppVersionStr = "4.8.5";
+constexpr auto AppVersion = 4008006;
+constexpr auto AppVersionStr = "4.8.6";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 92713d02f..f85771589 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008005
+AppVersion         4008006
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.5
-AppVersionStr      4.8.5
+AppVersionStrSmall 4.8.6
+AppVersionStr      4.8.6
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.5
+AppVersionOriginal 4.8.6
diff --git a/changelog.txt b/changelog.txt
index bd7743446..fb06e9a51 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.6 (21.07.23)
+
+- Fix langpack keys by a full rebuild on macOS.
+
 4.8.5 (20.07.23)
 
 - Bug fixes and other minor improvements. And stories preview.

From 3cb49127f4c8ec4712f9a2a0058b0b9eb5b964aa Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 21 Jul 2023 04:00:59 +0400
Subject: [PATCH 458/676] Make a weak pointer for GApplication startup lambda

Or it never gets destroyed
---
 Telegram/SourceFiles/platform/linux/integration_linux.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 0303f5093..a465ddefe 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -222,7 +222,12 @@ void LinuxIntegration::LaunchNativeApplication() {
 				G_APPLICATION_HANDLES_OPEN,
 				nullptr)));
 
-	app->signal_startup().connect([=] {
+	app->signal_startup().connect([weak = std::weak_ptr(app)] {
+		const auto app = weak.lock();
+		if (!app) {
+			return;
+		}
+
 		// GNotification
 		InvokeQueued(qApp, [] {
 			Core::App().notifications().createManager();

From 76f7a870edaaccd687f0817517ebf14e85ac853c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 11:53:56 +0400
Subject: [PATCH 459/676] Return loading of full archive.

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

diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index 6a96f4e5f..7506abea5 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -116,7 +116,7 @@ rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
 			const auto hasBefore = int(i - begin(archive.list));
 			const auto hasAfter = int(end(archive.list) - i);
 			if (hasAfter < limit) {
-				//stories->archiveLoadMore();
+				stories->archiveLoadMore();
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);

From b7370127ff9a481de85238e8757eea992c09a6eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 12:18:16 +0400
Subject: [PATCH 460/676] Correctly clear story instances on deletion.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 10 ++++++++++
 .../info/media/info_media_list_widget.cpp     |  2 ++
 .../info/stories/info_stories_provider.cpp    | 19 +++++++++++++++----
 .../info/stories/info_stories_provider.h      |  6 +++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index df0615038..4768714dd 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -723,6 +723,16 @@ void Stories::applyDeleted(FullStoryId id) {
 			}
 			_owner->refreshStoryItemViews(id);
 			Assert(!_pollingSettings.contains(story.get()));
+			if (const auto j = _items.find(id.peer); j != end(_items)) {
+				const auto k = j->second.find(id.story);
+				if (k != end(j->second)) {
+					Assert(!k->second.lock());
+					j->second.erase(k);
+					if (j->second.empty()) {
+						_items.erase(j);
+					}
+				}
+			}
 			if (i->second.empty()) {
 				_stories.erase(i);
 			}
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 459f1408c..ae029cf9e 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -548,6 +548,7 @@ void ListWidget::refreshRows() {
 	resizeToWidth(width());
 	restoreScrollState();
 	mouseActionUpdate();
+	update();
 }
 
 bool ListWidget::preventAutoHide() const {
@@ -1942,6 +1943,7 @@ void ListWidget::applyDragSelection(SelectedMap &applyTo) const {
 
 void ListWidget::refreshHeight() {
 	resize(width(), recountHeight());
+	update();
 }
 
 int ListWidget::recountHeight() {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index fbe81ebc5..e582f9ce7 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/media/info_media_widget.h"
 #include "info/media/info_media_list_section.h"
 #include "info/info_controller.h"
+#include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
@@ -54,6 +55,14 @@ Provider::Provider(not_null<AbstractController*> controller)
 			layout.second.item->invalidateCache();
 		}
 	}, _lifetime);
+
+	_peer->session().changes().storyUpdates(
+		Data::StoryUpdate::Flag::Destroyed
+	) | rpl::filter([=](const Data::StoryUpdate &update) {
+		return update.story->peer()  == _peer;
+	}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+		storyRemoved(update.story);
+	}, _lifetime);
 }
 
 Provider::~Provider() {
@@ -253,15 +262,17 @@ bool Provider::isAfter(
 	return (a->id < b->id);
 }
 
-void Provider::itemRemoved(not_null<const HistoryItem*> item) {
-	const auto id = StoryIdFromMsgId(item->id);
-	if (const auto i = _layouts.find(id); i != end(_layouts)) {
+void Provider::storyRemoved(not_null<Data::Story*> story) {
+	Expects(story->peer() == _peer);
+
+	if (const auto i = _layouts.find(story->id()); i != end(_layouts)) {
 		_peer->owner().stories().unregisterPolling(
-			{ _peer->id, id },
+			story,
 			Data::Stories::Polling::Chat);
 		_layoutRemoved.fire(i->second.item.get());
 		_layouts.erase(i);
 	}
+	_items.remove(story->id());
 }
 
 BaseLayout *Provider::getLayout(
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.h b/Telegram/SourceFiles/info/stories/info_stories_provider.h
index 390234128..b43350d97 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.h
@@ -16,6 +16,10 @@ class HistoryItem;
 class PeerData;
 class History;
 
+namespace Data {
+class Story;
+} // namespace Data
+
 namespace Info {
 class AbstractController;
 } // namespace Info
@@ -97,7 +101,7 @@ private:
 		not_null<const Media::BaseLayout*> item,
 		not_null<const Media::BaseLayout*> previous) override;
 
-	void itemRemoved(not_null<const HistoryItem*> item);
+	void storyRemoved(not_null<Data::Story*> story);
 	void markLayoutsStale();
 	void clearStaleLayouts();
 	void clear();

From 315b95a2144a695dad719a14c52787e6200a887d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 12:58:36 +0400
Subject: [PATCH 461/676] Fix voice recording indicator.

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

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 6f30a8e59..9376e3372 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1352,8 +1352,11 @@ void VoiceRecordBar::initLevelGeometry() {
 		_send->geometryValue(),
 		geometryValue(),
 		static_cast<Ui::RpWidget*>(parentWidget())->geometryValue()
-	) | rpl::start_with_next([=](QRect send, QRect me, QRect parent) {
-		const auto mapped = Ui::MapFrom(_outerContainer, this, send);
+	) | rpl::start_with_next([=](QRect send, auto, auto) {
+		const auto mapped = Ui::MapFrom(
+			_outerContainer,
+			_send->parentWidget(),
+			send);
 		const auto center = (send.width() - _level->width()) / 2;
 		_level->moveToLeft(mapped.x() + center, mapped.y() + center);
 	}, lifetime());

From 2402285d0346518208c4751b851a2195572059d6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 13:11:53 +0400
Subject: [PATCH 462/676] Fix possible crash in views refresh.

---
 .../SourceFiles/media/stories/media_stories_recent_views.cpp  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 6f11e6169..806f21ebd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -136,6 +136,8 @@ void RecentViews::show(RecentViewsData data) {
 	_data = data;
 	if (!_data.valid) {
 		_text = {};
+		_clickHandlerLifetime.destroy();
+		_userpicsLifetime.destroy();
 		_userpics = nullptr;
 		_widget = nullptr;
 		return;
@@ -305,6 +307,8 @@ void RecentViews::showMenu() {
 	_controller->setMenuShown(true);
 	_menu->setDestroyedCallback(crl::guard(_widget.get(), [=] {
 		_controller->setMenuShown(false);
+		_waitingForUserpicsLifetime.destroy();
+		_waitingForUserpics.clear();
 		_menuShortLifetime.destroy();
 		_menuEntries.clear();
 		_menuEntriesCount = 0;

From 9d8d0398861cf50ccacd308ad9682fd80eea662d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 13:15:38 +0400
Subject: [PATCH 463/676] Fix possible crash in pinned item translations.

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

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index cd2fa4685..5074219da 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1840,13 +1840,12 @@ void HistoryInner::performDrag() {
 }
 
 void HistoryInner::itemRemoved(not_null<const HistoryItem*> item) {
-	if (_history != item->history() && _migrated != item->history()) {
-		return;
-	}
-
 	if (_pinnedItem == item) {
 		_pinnedItem = nullptr;
 	}
+	if (_history != item->history() && _migrated != item->history()) {
+		return;
+	}
 	if (_reactionsItem.current() == item) {
 		_reactionsItem = nullptr;
 	}

From 863313531d7135af216939b8a48fcfbeacce1bfa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 13:44:43 +0400
Subject: [PATCH 464/676] Fix crash in viewed shared story deletion.

---
 Telegram/SourceFiles/data/data_stories.cpp | 16 +++++++++++-----
 Telegram/SourceFiles/data/data_stories.h   |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 4768714dd..085958ea2 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -692,10 +692,10 @@ void Stories::applyDeleted(FullStoryId id) {
 	if (i != end(_stories)) {
 		const auto j = i->second.find(id.story);
 		if (j != end(i->second)) {
-			// Duplicated in Stories::apply(peer, const MTPUserStories*).
-			auto story = std::move(j->second);
+			const auto &story = _deletingStories[id] = std::move(j->second);
 			_expiring.remove(story->expires(), story->fullId());
 			i->second.erase(j);
+
 			session().changes().storyUpdated(
 				story.get(),
 				UpdateFlag::Destroyed);
@@ -736,6 +736,7 @@ void Stories::applyDeleted(FullStoryId id) {
 			if (i->second.empty()) {
 				_stories.erase(i);
 			}
+			_deletingStories.remove(id);
 		}
 	}
 }
@@ -1628,9 +1629,14 @@ bool Stories::registerPolling(FullStoryId id, Polling polling) {
 }
 
 void Stories::unregisterPolling(FullStoryId id, Polling polling) {
-	const auto maybeStory = lookup(id);
-	Assert(maybeStory.has_value());
-	unregisterPolling(*maybeStory, polling);
+	if (const auto maybeStory = lookup(id)) {
+		unregisterPolling(*maybeStory, polling);
+	} else if (const auto i = _deletingStories.find(id)
+		; i != end(_deletingStories)) {
+		unregisterPolling(i->second.get(), polling);
+	} else {
+		Unexpected("Couldn't find story for unregistering polling.");
+	}
 }
 
 int Stories::pollingInterval(const PollingSettings &settings) const {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 27eb0f761..c4d55a129 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -299,6 +299,7 @@ private:
 	std::unordered_map<
 		PeerId,
 		base::flat_map<StoryId, std::unique_ptr<Story>>> _stories;
+	base::flat_map<FullStoryId, std::unique_ptr<Story>> _deletingStories;
 	std::unordered_map<
 		PeerId,
 		base::flat_map<StoryId, std::weak_ptr<HistoryItem>>> _items;

From f8e815545247f22c3b1ed7a8f3f8496af34d9e9a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 14:42:26 +0400
Subject: [PATCH 465/676] Fix possible crash with large UI scale values.

---
 Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp | 7 ++++++-
 Telegram/lib_ui                                          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index 04565a741..ffedf1f50 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -344,7 +344,12 @@ void CustomEmojiLoader::check() {
 			sizeOverride);
 	};
 	auto put = [=, key = cacheKey(document)](QByteArray value) {
-		document->owner().cacheBigFile().put(key, std::move(value));
+		const auto size = value.size();
+		if (size <= Storage::Cache::Database::Settings().maxDataSize) {
+			document->owner().cacheBigFile().put(key, std::move(value));
+		} else {
+			LOG(("Data Error: Cached emoji size too big: %1.").arg(size));
+		}
 	};
 	const auto type = document->sticker()->type;
 	auto generator = [=, bytes = Lottie::ReadContent(data, filepath)]()
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 288bec715..39d440f77 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 288bec7157bf654d121ebfd2828801b49beb34ec
+Subproject commit 39d440f774b5b0986200299c4893e3f6a4678c85

From 75dc7e6e81cdb036d1b8c4868bfaf8ff4f78149f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 14:42:51 +0400
Subject: [PATCH 466/676] Fix a crash with possible empty contact name.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 04a9d025f..7174aef59 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -896,6 +896,10 @@ void OverlayWidget::RendererGL::paintStoriesSiblingPart(
 		float64 opacity) {
 	Expects(index >= 0 && index < kStoriesSiblingPartsCount);
 
+	if (image.isNull() || rect.isEmpty()) {
+		return;
+	}
+
 	_f->glActiveTexture(GL_TEXTURE0);
 
 	auto &part = _storiesSiblingParts[index];

From 21fa3264e3b1281cb8dc46a40c496a77fc30d964 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 16:40:20 +0400
Subject: [PATCH 467/676] Pause video while caption is expanded.

---
 .../media_stories_caption_full_view.cpp       |  8 +++++--
 .../stories/media_stories_controller.cpp      | 22 +++++++++++++++----
 .../media/stories/media_stories_controller.h  |  2 ++
 .../media/stories/media_stories_view.cpp      |  4 ++++
 .../media/stories/media_stories_view.h        |  1 +
 .../media/view/media_view_overlay_widget.cpp  | 11 ++++++++--
 6 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
index b301ced92..6506dd62c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
@@ -68,13 +68,17 @@ void CaptionFullView::resizeEvent(QResizeEvent *e) {
 
 void CaptionFullView::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Escape) {
-		_close();
+		if (const auto onstack = _close) {
+			onstack();
+		}
 	}
 }
 
 void CaptionFullView::mousePressEvent(QMouseEvent *e) {
 	if (e->button() == Qt::LeftButton) {
-		_close();
+		if (const auto onstack = _close) {
+			onstack();
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index f32aec6c6..bb9480c26 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -345,10 +345,11 @@ Controller::~Controller() {
 }
 
 void Controller::updateContentFaded() {
-	if (_contentFaded == _replyActive) {
+	const auto faded = _replyActive || _captionFullView || _captionExpanded;
+	if (_contentFaded == faded) {
 		return;
 	}
-	_contentFaded = _replyActive;
+	_contentFaded = faded;
 	_contentFadeAnimation.start(
 		[=] { _delegate->storiesRepaint(); },
 		_contentFaded ? 0. : 1.,
@@ -570,16 +571,24 @@ TextWithEntities Controller::captionText() const {
 	return _captionText;
 }
 
+void Controller::setCaptionExpanded(bool expanded) {
+	if (_captionExpanded == expanded) {
+		return;
+	}
+	_captionExpanded = expanded;
+	updateContentFaded();
+}
+
 void Controller::showFullCaption() {
 	if (_captionText.empty()) {
 		return;
 	}
-	togglePaused(true);
 	_captionFullView = std::make_unique<CaptionFullView>(
 		wrap(),
 		&_delegate->storiesShow()->session(),
 		_captionText,
-		[=] { togglePaused(false); });
+		[=] { _captionFullView = nullptr; updateContentFaded(); });
+	updateContentFaded();
 }
 
 std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
@@ -796,6 +805,9 @@ void Controller::show(
 
 	_captionText = story->caption();
 	_captionFullView = nullptr;
+	_captionExpanded = false;
+	_contentFaded = false;
+	_contentFadeAnimation.stop();
 	const auto document = story->document();
 	_header->show({
 		.user = user,
@@ -942,6 +954,8 @@ void Controller::updatePlayingAllowed() {
 		&& _windowActive
 		&& !_paused
 		&& !_replyActive
+		&& !_captionFullView
+		&& !_captionExpanded
 		&& !_layerShown
 		&& !_menuShown);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index d234d540c..a7dd60da2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -122,6 +122,7 @@ public:
 	[[nodiscard]] bool closeByClickAt(QPoint position) const;
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
+	void setCaptionExpanded(bool expanded);
 	void showFullCaption();
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
@@ -241,6 +242,7 @@ private:
 	Ui::Animations::Simple _contentFadeAnimation;
 	bool _contentFaded = false;
 
+	bool _captionExpanded = false;
 	bool _windowActive = false;
 	bool _replyFocused = false;
 	bool _replyActive = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 240a39b4e..159999281 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -123,6 +123,10 @@ TextWithEntities View::captionText() const {
 	return _controller->captionText();
 }
 
+void View::setCaptionExpanded(bool expanded) {
+	_controller->setCaptionExpanded(expanded);
+}
+
 void View::showFullCaption() {
 	_controller->showFullCaption();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 099689e31..57e38e70b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -64,6 +64,7 @@ public:
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
+	void setCaptionExpanded(bool expanded);
 	void showFullCaption();
 
 	void updatePlayback(const Player::TrackState &state);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 9a58198e3..32fd05e73 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -486,6 +486,10 @@ OverlayWidget::OverlayWidget()
 			return base::EventFilterResult::Cancel;
 		} else if (type == QEvent::ThemeChange && Platform::IsLinux()) {
 			_window->setWindowIcon(Window::CreateIcon(_session));
+		} else if (type == QEvent::FocusOut) {
+			if (const auto popup = QApplication::activePopupWidget()) {
+				int a = popup->x();
+			}
 		}
 		return base::EventFilterResult::Continue;
 	});
@@ -1384,8 +1388,9 @@ void OverlayWidget::refreshCaptionGeometry() {
 	_captionFitsIfExpanded = _stories
 		&& (wantedHeight <= maxExpandedHeight);
 	_captionShownFull = (wantedHeight <= maxCollapsedHeight);
-	if (_captionShownFull) {
+	if (_captionShownFull && _captionExpanded && _stories) {
 		_captionExpanded = false;
+		_stories->setCaptionExpanded(false);
 	}
 	_captionRect = QRect(
 		(width() - captionWidth) / 2,
@@ -3120,7 +3125,7 @@ void OverlayWidget::setCursor(style::cursor cursor) {
 }
 
 void OverlayWidget::setFocus() {
-	_widget->setFocus();
+	_body->setFocus();
 }
 
 bool OverlayWidget::takeFocusFrom(not_null<QWidget*> window) const {
@@ -5570,10 +5575,12 @@ ClickHandlerPtr OverlayWidget::ensureCaptionExpandLink() {
 				return;
 			} else if (_captionExpanded) {
 				_captionExpanded = false;
+				_stories->setCaptionExpanded(false);
 				refreshCaptionGeometry();
 				update();
 			} else if (_captionFitsIfExpanded) {
 				_captionExpanded = true;
+				_stories->setCaptionExpanded(true);
 				refreshCaptionGeometry();
 				update();
 			} else {

From 0b5c0e3e983d4107f0bc12eabec064e52de284d6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 16:44:28 +0400
Subject: [PATCH 468/676] Force internal player for stories.

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

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 66e34cff2..c9e66759b 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1331,6 +1331,7 @@ bool DocumentData::canBeStreamed(HistoryItem *item) const {
 	return hasRemoteLocation()
 		&& supportsStreaming()
 		&& (!isVideoFile()
+			|| storyMedia()
 			|| !ExternalVideoPlayer.value()
 			|| (item && !item->allowsForward()));
 }

From 2cc0faa5b32e5a6e0342f8299f32db3f500b2067 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 17:11:49 +0400
Subject: [PATCH 469/676] Pause stories if reply context menu is shown.

---
 .../history/view/controls/history_view_compose_controls.cpp   | 4 ++++
 .../history/view/controls/history_view_compose_controls.h     | 1 +
 Telegram/SourceFiles/media/stories/media_stories_reply.cpp    | 3 ++-
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 4 ----
 Telegram/lib_ui                                               | 2 +-
 5 files changed, 8 insertions(+), 6 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 f6ad9ffe3..86d412b2a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2978,6 +2978,10 @@ rpl::producer<bool> ComposeControls::hasSendTextValue() const {
 	return _hasSendText.value();
 }
 
+rpl::producer<bool> ComposeControls::fieldMenuShownValue() const {
+	return _field->menuShownValue();
+}
+
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
 	if (_voiceRecordBar->isActive()) {
 		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
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 95a72c356..de7002012 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -220,6 +220,7 @@ public:
 	[[nodiscard]] bool isRecordingPressed() const;
 	[[nodiscard]] rpl::producer<bool> recordingActiveValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
+	[[nodiscard]] rpl::producer<bool> fieldMenuShownValue() const;
 
 	void applyCloudDraft();
 	void applyDraft(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 9d7728b72..9df6d290f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -673,8 +673,9 @@ rpl::producer<bool> ReplyArea::activeValue() const {
 		_controls->focusedValue(),
 		_controls->recordingActiveValue(),
 		_controls->tabbedPanelShownValue(),
+		_controls->fieldMenuShownValue(),
 		_choosingAttach.value(),
-		_1 || _2 || _3 || _4
+		_1 || _2 || _3 || _4 || _5
 	) | rpl::distinct_until_changed();
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 32fd05e73..0a8be2dc6 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -486,10 +486,6 @@ OverlayWidget::OverlayWidget()
 			return base::EventFilterResult::Cancel;
 		} else if (type == QEvent::ThemeChange && Platform::IsLinux()) {
 			_window->setWindowIcon(Window::CreateIcon(_session));
-		} else if (type == QEvent::FocusOut) {
-			if (const auto popup = QApplication::activePopupWidget()) {
-				int a = popup->x();
-			}
 		}
 		return base::EventFilterResult::Continue;
 	});
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 39d440f77..079d966e4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 39d440f774b5b0986200299c4893e3f6a4678c85
+Subproject commit 079d966e45922f90de297fc9f7435cbf8b127b09

From 30c73fbdf29ff8e6f36641f4b4e271c7974ed88e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 21 Jul 2023 17:47:45 +0400
Subject: [PATCH 470/676] Fix D-Bus service with non-standard workdir or
 backslash in the path

Working dir not set leads to unrelevant instance being launched with unrelevant bus name and entire launchf fails.

D-Bus service files also don't need backslash escaping unlike the .desktop files.
---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 9fdb7a914..e53ac78b0 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -346,12 +346,16 @@ bool GenerateServiceFile(bool silent = false) {
 		"Name",
 		QGuiApplication::desktopFileName().toStdString());
 
+	QStringList exec;
+	exec.append(executable);
+	if (Core::Launcher::Instance().customWorkingDir()) {
+		exec.append(u"-workdir"_q);
+		exec.append(cWorkingDir());
+	}
 	target->set_string(
 		group,
 		"Exec",
-		KShell::joinArgs({ executable }).replace(
-			'\\',
-			qstr("\\\\")).toStdString());
+		KShell::joinArgs(exec).toStdString());
 
 	try {
 		target->save_to_file(targetFile.toStdString());

From 06e49c6813a292d8d9d37585cfeb953115092604 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 18:06:00 +0400
Subject: [PATCH 471/676] Fix opening t.me/channel with min-loaded channels.

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

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index b3911b9d4..73ebae0e1 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1158,7 +1158,8 @@ UserData *Session::userByPhone(const QString &phone) const {
 PeerData *Session::peerByUsername(const QString &username) const {
 	const auto uname = username.trimmed();
 	for (const auto &[peerId, peer] : _peers) {
-		if (!peer->userName().compare(uname, Qt::CaseInsensitive)) {
+		if (peer->isLoaded()
+			&& !peer->userName().compare(uname, Qt::CaseInsensitive)) {
 			return peer.get();
 		}
 	}

From c0b7577db929339335fe1fb8199e45ffb64ac31d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 18:21:34 +0400
Subject: [PATCH 472/676] If opening an unread story show only unread.

---
 .../stories/media_stories_controller.cpp      | 39 +++++++++++++------
 .../media/stories/media_stories_controller.h  |  1 +
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index bb9480c26..489ed9ad4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -669,6 +669,9 @@ void Controller::rebuildFromContext(
 			storyId.peer,
 			&StoriesSourceInfo::id);
 		if (i != end(sources)) {
+			if (_cachedSourcesList.empty()) {
+				_showingUnreadSources = source && (source->readTill < id);
+			}
 			rebuildCachedSourcesList(sources, (i - begin(sources)));
 			showSiblings(&user->session());
 			if (int(sources.end() - i) < kPreloadUsersCount) {
@@ -1294,6 +1297,8 @@ void Controller::rebuildCachedSourcesList(
 		int index) {
 	Expects(index >= 0 && index < lists.size());
 
+	const auto currentPeerId = lists[index].id;
+
 	// Remove removed.
 	_cachedSourcesList.erase(ranges::remove_if(_cachedSourcesList, [&](
 			PeerId id) {
@@ -1301,7 +1306,7 @@ void Controller::rebuildCachedSourcesList(
 	}), end(_cachedSourcesList));
 
 	// Find current, full rebuild if can't find.
-	const auto i = ranges::find(_cachedSourcesList, lists[index].id);
+	const auto i = ranges::find(_cachedSourcesList, currentPeerId);
 	if (i == end(_cachedSourcesList)) {
 		_cachedSourcesList.clear();
 	} else {
@@ -1310,38 +1315,50 @@ void Controller::rebuildCachedSourcesList(
 
 	if (_cachedSourcesList.empty()) {
 		// Full rebuild.
+		const auto predicate = [&](const Data::StoriesSourceInfo &info) {
+			return !_showingUnreadSources
+				|| (info.unreadCount > 0)
+				|| (info.id == currentPeerId);
+		};
 		_cachedSourcesList = lists
+			| ranges::views::filter(predicate)
 			| ranges::views::transform(&Data::StoriesSourceInfo::id)
 			| ranges::to_vector;
-		_cachedSourceIndex = index;
+		_cachedSourceIndex = ranges::find(_cachedSourcesList, currentPeerId)
+			- begin(_cachedSourcesList);
 	} else if (ranges::equal(
 			lists,
 			_cachedSourcesList,
 			ranges::equal_to(),
 			&Data::StoriesSourceInfo::id)) {
 		// No rebuild needed.
-		_cachedSourceIndex = index;
 	} else {
 		// All that go before the current push to front.
 		for (auto before = index; before > 0;) {
-			const auto peerId = lists[--before].id;
-			if (!ranges::contains(_cachedSourcesList, peerId)) {
+			const auto &info = lists[--before];
+			if (_showingUnreadSources && !info.unreadCount) {
+				continue;
+			} else if (!ranges::contains(_cachedSourcesList, info.id)) {
 				_cachedSourcesList.insert(
 					begin(_cachedSourcesList),
-					peerId);
+					info.id);
 				++_cachedSourceIndex;
 			}
 		}
 		// All that go after the current push to back.
-		for (auto after = index + 1, count = int(lists.size()); after != count; ++after) {
-			const auto peerId = lists[after].id;
-			if (!ranges::contains(_cachedSourcesList, peerId)) {
-				_cachedSourcesList.push_back(peerId);
+		for (auto after = index + 1, count = int(lists.size())
+			; after != count
+			; ++after) {
+			const auto &info = lists[after];
+			if (_showingUnreadSources && !info.unreadCount) {
+				continue;
+			} else if (!ranges::contains(_cachedSourcesList, info.id)) {
+				_cachedSourcesList.push_back(info.id);
 			}
 		}
 	}
 
-	Ensures(_cachedSourcesList.size() == lists.size());
+	Ensures(_cachedSourcesList.size() <= lists.size());
 	Ensures(_cachedSourceIndex >= 0
 		&& _cachedSourceIndex < _cachedSourcesList.size());
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index a7dd60da2..1d83d24e5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -266,6 +266,7 @@ private:
 
 	std::vector<PeerId> _cachedSourcesList;
 	int _cachedSourceIndex = -1;
+	bool _showingUnreadSources = false;
 
 	ViewsSlice _viewsSlice;
 	rpl::event_stream<> _moreViewsLoaded;

From e7312697bf242f5674461514b4efc39e6708182d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 18:49:54 +0400
Subject: [PATCH 473/676] In the viewer remember which story was opened.

---
 .../stories/media_stories_controller.cpp      | 56 +++++++++++++------
 .../media/stories/media_stories_controller.h  | 12 +++-
 .../media/stories/media_stories_sibling.cpp   | 28 ++++++++--
 .../media/stories/media_stories_sibling.h     |  7 ++-
 4 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 489ed9ad4..2c2efc7d6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -673,6 +673,7 @@ void Controller::rebuildFromContext(
 				_showingUnreadSources = source && (source->readTill < id);
 			}
 			rebuildCachedSourcesList(sources, (i - begin(sources)));
+			_cachedSourcesList[_cachedSourceIndex].shownId = storyId.story;
 			showSiblings(&user->session());
 			if (int(sources.end() - i) < kPreloadUsersCount) {
 				stories.loadMore(list);
@@ -980,13 +981,13 @@ void Controller::showSiblings(not_null<Main::Session*> session) {
 		session,
 		(_cachedSourceIndex > 0
 			? _cachedSourcesList[_cachedSourceIndex - 1]
-			: PeerId()));
+			: CachedSource()));
 	showSibling(
 		_siblingRight,
 		session,
 		(_cachedSourceIndex + 1 < _cachedSourcesList.size()
 			? _cachedSourcesList[_cachedSourceIndex + 1]
-			: PeerId()));
+			: CachedSource()));
 }
 
 void Controller::hideSiblings() {
@@ -997,16 +998,16 @@ void Controller::hideSiblings() {
 void Controller::showSibling(
 		std::unique_ptr<Sibling> &sibling,
 		not_null<Main::Session*> session,
-		PeerId peerId) {
-	if (!peerId) {
+		CachedSource cached) {
+	if (!cached) {
 		sibling = nullptr;
 		return;
 	}
-	const auto source = session->data().stories().source(peerId);
+	const auto source = session->data().stories().source(cached.peerId);
 	if (!source) {
 		sibling = nullptr;
-	} else if (!sibling || !sibling->shows(*source)) {
-		sibling = std::make_unique<Sibling>(this, *source);
+	} else if (!sibling || !sibling->shows(*source, cached.shownId)) {
+		sibling = std::make_unique<Sibling>(this, *source, cached.shownId);
 	}
 }
 
@@ -1301,12 +1302,18 @@ void Controller::rebuildCachedSourcesList(
 
 	// Remove removed.
 	_cachedSourcesList.erase(ranges::remove_if(_cachedSourcesList, [&](
-			PeerId id) {
-		return !ranges::contains(lists, id, &Data::StoriesSourceInfo::id);
+			CachedSource source) {
+		return !ranges::contains(
+			lists,
+			source.peerId,
+			&Data::StoriesSourceInfo::id);
 	}), end(_cachedSourcesList));
 
 	// Find current, full rebuild if can't find.
-	const auto i = ranges::find(_cachedSourcesList, currentPeerId);
+	const auto i = ranges::find(
+		_cachedSourcesList,
+		currentPeerId,
+		&CachedSource::peerId);
 	if (i == end(_cachedSourcesList)) {
 		_cachedSourcesList.clear();
 	} else {
@@ -1320,17 +1327,24 @@ void Controller::rebuildCachedSourcesList(
 				|| (info.unreadCount > 0)
 				|| (info.id == currentPeerId);
 		};
+		const auto mapper = [](const Data::StoriesSourceInfo &info) {
+			return CachedSource{ info.id };
+		};
 		_cachedSourcesList = lists
 			| ranges::views::filter(predicate)
-			| ranges::views::transform(&Data::StoriesSourceInfo::id)
+			| ranges::views::transform(mapper)
 			| ranges::to_vector;
-		_cachedSourceIndex = ranges::find(_cachedSourcesList, currentPeerId)
-			- begin(_cachedSourcesList);
+		_cachedSourceIndex = ranges::find(
+			_cachedSourcesList,
+			currentPeerId,
+			&CachedSource::peerId
+		) - begin(_cachedSourcesList);
 	} else if (ranges::equal(
 			lists,
 			_cachedSourcesList,
 			ranges::equal_to(),
-			&Data::StoriesSourceInfo::id)) {
+			&Data::StoriesSourceInfo::id,
+			&CachedSource::peerId)) {
 		// No rebuild needed.
 	} else {
 		// All that go before the current push to front.
@@ -1338,10 +1352,13 @@ void Controller::rebuildCachedSourcesList(
 			const auto &info = lists[--before];
 			if (_showingUnreadSources && !info.unreadCount) {
 				continue;
-			} else if (!ranges::contains(_cachedSourcesList, info.id)) {
+			} else if (!ranges::contains(
+					_cachedSourcesList,
+					info.id,
+					&CachedSource::peerId)) {
 				_cachedSourcesList.insert(
 					begin(_cachedSourcesList),
-					info.id);
+					{ info.id });
 				++_cachedSourceIndex;
 			}
 		}
@@ -1352,8 +1369,11 @@ void Controller::rebuildCachedSourcesList(
 			const auto &info = lists[after];
 			if (_showingUnreadSources && !info.unreadCount) {
 				continue;
-			} else if (!ranges::contains(_cachedSourcesList, info.id)) {
-				_cachedSourcesList.push_back(info.id);
+			} else if (!ranges::contains(
+					_cachedSourcesList,
+					info.id,
+					&CachedSource::peerId)) {
+				_cachedSourcesList.push_back({ info.id });
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 1d83d24e5..760835a81 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -177,6 +177,14 @@ private:
 			const StoriesList &,
 			const StoriesList &) = default;
 	};
+	struct CachedSource {
+		PeerId peerId = 0;
+		StoryId shownId = 0;
+
+		explicit operator bool() const {
+			return peerId != 0;
+		}
+	};
 	class PhotoPlayback;
 	class Unsupported;
 
@@ -198,7 +206,7 @@ private:
 	void showSibling(
 		std::unique_ptr<Sibling> &sibling,
 		not_null<Main::Session*> session,
-		PeerId peerId);
+		CachedSource cached);
 
 	void subjumpTo(int index);
 	void checkWaitingFor();
@@ -264,7 +272,7 @@ private:
 	bool _started = false;
 	bool _viewed = false;
 
-	std::vector<PeerId> _cachedSourcesList;
+	std::vector<CachedSource> _cachedSourcesList;
 	int _cachedSourceIndex = -1;
 	bool _showingUnreadSources = false;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 0da004993..1024edadb 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -33,6 +33,17 @@ constexpr auto kSiblingFadeOver = 0.4;
 constexpr auto kSiblingNameOpacity = 0.8;
 constexpr auto kSiblingNameOpacityOver = 1.;
 
+[[nodiscard]] StoryId LookupShownId(
+		const Data::StoriesSource &source,
+		StoryId suggestedId) {
+	const auto i = suggestedId
+		? source.ids.lower_bound(Data::StoryIdDates{ suggestedId })
+		: end(source.ids);
+	return (i != end(source.ids) && i->id == suggestedId)
+		? suggestedId
+		: source.toOpen().id;
+}
+
 } // namespace
 
 class Sibling::Loader {
@@ -229,9 +240,10 @@ bool Sibling::LoaderVideo::updateAfterGoodCheck() {
 
 Sibling::Sibling(
 	not_null<Controller*> controller,
-	const Data::StoriesSource &source)
+	const Data::StoriesSource &source,
+	StoryId suggestedId)
 : _controller(controller)
-, _id{ source.user->id, source.ids.front().id }
+, _id{ source.user->id, LookupShownId(source, suggestedId) }
 , _peer(source.user) {
 	checkStory();
 	_goodShown.stop();
@@ -288,10 +300,14 @@ not_null<PeerData*> Sibling::peer() const {
 	return _peer;
 }
 
-bool Sibling::shows(const Data::StoriesSource &source) const {
-	Expects(!source.ids.empty());
-
-	return _id == FullStoryId{ source.user->id, source.ids.front().id };
+bool Sibling::shows(
+		const Data::StoriesSource &source,
+		StoryId suggestedId) const {
+	const auto fullId = FullStoryId{
+		source.user->id,
+		LookupShownId(source, suggestedId),
+	};
+	return (_id == fullId);
 }
 
 SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.h b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
index 28cfc9cbc..24f334cae 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.h
@@ -26,12 +26,15 @@ class Sibling final : public base::has_weak_ptr {
 public:
 	Sibling(
 		not_null<Controller*> controller,
-		const Data::StoriesSource &source);
+		const Data::StoriesSource &source,
+		StoryId suggestedId);
 	~Sibling();
 
 	[[nodiscard]] FullStoryId shownId() const;
 	[[nodiscard]] not_null<PeerData*> peer() const;
-	[[nodiscard]] bool shows(const Data::StoriesSource &source) const;
+	[[nodiscard]] bool shows(
+		const Data::StoriesSource &source,
+		StoryId suggestedId) const;
 
 	[[nodiscard]] SiblingView view(
 		const SiblingLayout &layout,

From fd3169f82d31c68e26eaf23725cb01ff1c3b20a2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 19:17:14 +0400
Subject: [PATCH 474/676] Fix admins list restore in group profile.

---
 .../SourceFiles/boxes/peers/edit_participants_box.cpp  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 72291faf4..e1d09efec 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1165,15 +1165,19 @@ void ParticipantsBoxController::restoreState(
 		if (my->wasLoading) {
 			loadMoreRows();
 		}
+		const auto was = _fullCountValue.current();
 		PeerListController::restoreState(std::move(state));
-		const auto count = delegate()->peerListFullRowsCount();
-		if (count > 0 || _allLoaded) {
+		const auto now = delegate()->peerListFullRowsCount();
+		if (now > 0 || _allLoaded) {
 			refreshDescription();
 			if (_stories) {
-				for (auto i = 0; i != count; ++i) {
+				for (auto i = 0; i != now; ++i) {
 					_stories->process(delegate()->peerListRowAt(i));
 				}
 			}
+			if (now != was) {
+				refreshRows();
+			}
 		}
 		if (_onlineSorter) {
 			_onlineSorter->sort();

From 5bda700c2ca00b2332ed7e33ec58c74dfa398bf1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 19:25:55 +0400
Subject: [PATCH 475/676] Fix t.me/s/domain links.

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

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index df0c92771..d18b842c0 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -345,7 +345,13 @@ bool ResolveUsernameOrPhone(
 	const auto params = url_parse_params(
 		match->captured(1),
 		qthelp::UrlParamNameTransform::ToLower);
-	const auto domain = params.value(u"domain"_q);
+	const auto domainParam = params.value(u"domain"_q);
+	const auto appnameParam = params.value(u"appname"_q);
+
+	// Fix t.me/s/username links.
+	const auto webChannelPreviewLink = (domainParam == u"s"_q)
+		&& !appnameParam.isEmpty();
+	const auto domain = webChannelPreviewLink ? appnameParam : domainParam;
 	const auto phone = params.value(u"phone"_q);
 	const auto validDomain = [](const QString &domain) {
 		return qthelp::regex_match(
@@ -385,7 +391,7 @@ bool ResolveUsernameOrPhone(
 	}
 	const auto storyParam = params.value(u"story"_q);
 	const auto storyId = storyParam.toInt();
-	const auto appname = params.value(u"appname"_q);
+	const auto appname = webChannelPreviewLink ? QString() : appnameParam;
 	const auto appstart = params.value(u"startapp"_q);
 	const auto commentParam = params.value(u"comment"_q);
 	const auto commentId = commentParam.toInt();

From 87206a6c799ceca58c02b6808165ea6ce6a96dac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 19:49:58 +0400
Subject: [PATCH 476/676] Use transparent outline for stories in chats list.

---
 .../dialogs/ui/dialogs_stories_list.cpp       | 70 +++++++++++++++----
 .../dialogs/ui/dialogs_stories_list.h         |  8 +++
 2 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 1703c29d4..b7f5abd3a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -41,6 +41,7 @@ struct List::Layout {
 	int itemsCount = 0;
 	QPointF geometryShift;
 	float64 expandedRatio = 0.;
+	float64 expandRatio = 0.;
 	float64 ratio = 0.;
 	float64 segmentsSpinProgress = 0.;
 	float64 thumbnailLeft = 0.;
@@ -210,6 +211,12 @@ List::Layout List::computeLayout(float64 expanded) const {
 	const auto collapsedRatio = expandedRatio * kFrictionRatio;
 	const auto ratio = expandedRatio * expanded
 		+ collapsedRatio * (1. - expanded);
+	const auto expandRatio = (ratio >= kCollapseAfterRatio)
+		? 1.
+		: (ratio <= kExpandAfterRatio * kFrictionRatio)
+		? 0.
+		: ((ratio - (kExpandAfterRatio * kFrictionRatio))
+			/ (kCollapseAfterRatio - (kExpandAfterRatio * kFrictionRatio)));
 
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * ratio;
@@ -257,6 +264,7 @@ List::Layout List::computeLayout(float64 expanded) const {
 				? (lerp(_changingGeometryFrom.y(), _geometryFull.y()) - y())
 				: 0.)),
 		.expandedRatio = expandedRatio,
+		.expandRatio = expandRatio,
 		.ratio = ratio,
 		.segmentsSpinProgress = segmentsSpinProgress,
 		.thumbnailLeft = thumbnailLeft,
@@ -280,12 +288,7 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto &full = _st.full;
 	const auto layout = computeLayout();
 	const auto ratio = layout.ratio;
-	const auto expandRatio = (ratio >= kCollapseAfterRatio)
-		? 1.
-		: (ratio <= kExpandAfterRatio * kFrictionRatio)
-		? 0.
-		: ((ratio - kExpandAfterRatio * kFrictionRatio)
-			/ (kCollapseAfterRatio - kExpandAfterRatio * kFrictionRatio));
+	const auto expandRatio = layout.expandRatio;
 	const auto lerp = [&](float64 a, float64 b) {
 		return a + (b - a) * ratio;
 	};
@@ -293,11 +296,50 @@ void List::paintEvent(QPaintEvent *e) {
 		return a + (b - a) * expandRatio;
 	};
 	const auto line = elerp(st.lineTwice, full.lineTwice) / 2.;
+	const auto photo = lerp(st.photo, full.photo);
+	const auto layered = layout.single < (photo + 4 * line);
+	auto p = QPainter(this);
+	if (layered) {
+		ensureLayer();
+		auto q = QPainter(&_layer);
+		paint(q, layout, photo, line, true);
+		q.end();
+		p.drawImage(0, 0, _layer);
+	} else {
+		paint(p, layout, photo, line, false);
+	}
+}
+
+void List::ensureLayer() {
+	const auto ratio = style::DevicePixelRatio();
+	const auto layer = size() * ratio;
+	if (_layer.size() != layer) {
+		_layer = QImage(layer, QImage::Format_ARGB32_Premultiplied);
+		_layer.setDevicePixelRatio(ratio);
+	}
+	_layer.fill(Qt::transparent);
+}
+
+void List::paint(
+		QPainter &p,
+		const Layout &layout,
+		float64 photo,
+		float64 line,
+		bool layered) {
+	const auto &st = _st.small;
+	const auto &full = _st.full;
+	const auto ratio = layout.ratio;
+	const auto expandRatio = layout.expandRatio;
+	const auto lerp = [&](float64 a, float64 b) {
+		return a + (b - a) * ratio;
+	};
+	const auto elerp = [&](float64 a, float64 b) {
+		return a + (b - a) * expandRatio;
+	};
 	const auto lineRead = elerp(st.lineReadTwice, full.lineReadTwice) / 2.;
 	const auto photoTopSmall = st.photoTop;
 	const auto photoTop = photoTopSmall
 		+ (full.photoTop - photoTopSmall) * layout.expandedRatio;
-	const auto photo = lerp(st.photo, full.photo);
 	const auto nameScale = _lastRatio;
 	const auto nameTop = full.nameTop
 		+ (photoTop + photo - full.photoTop - full.photo);
@@ -306,9 +348,6 @@ void List::paintEvent(QPaintEvent *e) {
 	const auto nameLeft = layout.photoLeft + (photo - nameWidth) / 2.;
 	const auto readUserpicOpacity = elerp(_st.readOpacity, 1.);
 	const auto readUserpicAppearingOpacity = elerp(_st.readOpacity, 0.);
-
-	auto p = QPainter(this);
-
 	if (_state == State::Changing) {
 		p.translate(layout.geometryShift);
 	}
@@ -438,6 +477,7 @@ void List::paintEvent(QPaintEvent *e) {
 			gradient.setFinalStop(userpic.bottomLeft());
 			if (!fullUnreadCount) {
 				p.setPen(QPen(gradient, line));
+				p.setBrush(Qt::NoBrush);
 				p.drawEllipse(outer);
 			} else {
 				validateSegments(itemFull, gradient, line, true);
@@ -475,9 +515,13 @@ void List::paintEvent(QPaintEvent *e) {
 			: expandRatio);
 		const auto add = line + (hasReadLine ? (lineRead / 2.) : 0.);
 		const auto rect = userpic.marginsAdded({ add, add, add, add });
-		p.setPen(Qt::NoPen);
-		p.setBrush(st::dialogsBg);
-		p.drawEllipse(rect);
+		if (layered) {
+			p.setCompositionMode(QPainter::CompositionMode_Source);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::transparent);
+			p.drawEllipse(rect);
+			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		}
 		if (hasReadLine) {
 			if (small && !small->element.unreadCount) {
 				p.setOpacity(expandRatio);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index ef3b2917e..a870f83d6 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -123,6 +123,13 @@ private:
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
 
+	void paint(
+		QPainter &p,
+		const Layout &layout,
+		float64 photo,
+		float64 line,
+		bool layered);
+	void ensureLayer();
 	void validateThumbnail(not_null<Item*> item);
 	void validateName(not_null<Item*> item);
 	void updateScrollMax();
@@ -156,6 +163,7 @@ private:
 	rpl::event_stream<> _loadMoreRequests;
 	rpl::event_stream<> _collapsedGeometryChanged;
 
+	QImage _layer;
 	QPoint _positionSmall;
 	style::align _alignSmall = {};
 	QRect _geometryFull;

From daef7faaa4566af44c7f013dd04493d7b429e61f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 20:23:52 +0400
Subject: [PATCH 477/676] Don't open stories from userpic in narrow chats mode.

---
 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 0a01ddda7..d0d01778b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3336,7 +3336,8 @@ bool InnerWidget::chooseRow(
 			Qt::KeyboardModifiers modifiers) {
 		row.newWindow = (modifiers & Qt::ControlModifier);
 		row.userpicClick = (_lastRowLocalMouseX >= 0)
-			&& (_lastRowLocalMouseX < _st->nameLeft);
+			&& (_lastRowLocalMouseX < _st->nameLeft)
+			&& (width() > _narrowWidth);
 		return row;
 	};
 	auto chosen = modifyChosenRow(computeChosenRow(), modifiers);

From 676a3f8cfa8101a500bcf60e1ea9f110104a85c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 20:31:10 +0400
Subject: [PATCH 478/676] Open hidden stories by archive userpic click.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 9ff80e9fd..5b1518d65 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -526,7 +526,7 @@ void Widget::chosenRow(const ChosenRow &row) {
 		return;
 	} else if (history) {
 		const auto peer = history->peer;
-		if (const auto user = history->peer->asUser()) {
+		if (const auto user = peer->asUser()) {
 			if (row.message.fullId.msg == ShowAtUnreadMsgId) {
 				if (row.userpicClick
 					&& user->hasActiveStories()
@@ -549,6 +549,14 @@ void Widget::chosenRow(const ChosenRow &row) {
 			hideChildList();
 		}
 	} else if (const auto folder = row.key.folder()) {
+		if (row.userpicClick) {
+			const auto list = Data::StorySourcesList::Hidden;
+			const auto &sources = session().data().stories().sources(list);
+			if (!sources.empty()) {
+				controller()->openPeerStories(sources.front().id, list);
+				return;
+			}
+		}
 		controller()->openFolder(folder);
 		hideChildList();
 	}

From 0b32a0a1eadc01764f26d3bbf2f227c591f714e3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 21:50:35 +0400
Subject: [PATCH 479/676] Lock scroll either horizontal or vertical.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  5 ++-
 .../dialogs/ui/dialogs_stories_list.cpp       | 34 ++++++++++++++-----
 .../dialogs/ui/dialogs_stories_list.h         |  6 ++++
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 5b1518d65..1b696ae8d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -793,7 +793,10 @@ void Widget::setupMainMenuToggle() {
 }
 
 void Widget::setupStories() {
-	trackScroll(_stories.get());
+	_stories->verticalScrollEvents(
+	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+		_scroll->viewportEvent(e);
+	}, _stories->lifetime());
 
 	_storiesContents.fire(Stories::ContentForSession(
 		&controller()->session(),
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index b7f5abd3a..1a1a395d3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -152,6 +152,10 @@ rpl::producer<> List::loadMoreRequests() const {
 	return _loadMoreRequests.events();
 }
 
+rpl::producer<not_null<QWheelEvent*>> List::verticalScrollEvents() const {
+	return _verticalScrollEvents.events();
+}
+
 void List::requestExpanded(bool expanded) {
 	if (_expanded != expanded) {
 		_expanded = expanded;
@@ -635,18 +639,30 @@ void List::validateName(not_null<Item*> item) {
 }
 
 void List::wheelEvent(QWheelEvent *e) {
-	const auto horizontal = (e->angleDelta().x() != 0);
-	if (!horizontal || _state == State::Small) {
+	const auto phase = e->phase();
+	const auto fullDelta = e->pixelDelta().isNull()
+		? e->angleDelta()
+		: e->pixelDelta();
+	if (phase == Qt::ScrollBegin || phase == Qt::ScrollEnd) {
+		_scrollingLock = Qt::Orientation();
+		if (fullDelta.isNull()) {
+			return;
+		}
+	}
+	const auto vertical = qAbs(fullDelta.x()) < qAbs(fullDelta.y());
+	if (_scrollingLock == Qt::Orientation() && phase != Qt::NoScrollPhase) {
+		_scrollingLock = vertical ? Qt::Vertical : Qt::Horizontal;
+	}
+	if (_scrollingLock == Qt::Vertical || (vertical && !_scrollLeftMax)) {
+		_verticalScrollEvents.fire(e);
+		return;
+	} else if (_state == State::Small) {
 		e->ignore();
 		return;
 	}
-	auto delta = horizontal
-		? ((style::RightToLeft() ? -1 : 1) * (e->pixelDelta().x()
-			? e->pixelDelta().x()
-			: e->angleDelta().x()))
-		: (e->pixelDelta().y()
-			? e->pixelDelta().y()
-			: e->angleDelta().y());
+	const auto delta = vertical
+		? fullDelta.y()
+		: ((style::RightToLeft() ? -1 : 1) * fullDelta.x());
 
 	const auto now = _scrollLeft;
 	const auto used = now - delta;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index a870f83d6..3182d7229 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -91,6 +91,9 @@ public:
 	[[nodiscard]] rpl::producer<> entered() const;
 	[[nodiscard]] rpl::producer<> loadMoreRequests() const;
 
+	[[nodiscard]] auto verticalScrollEvents() const
+		-> rpl::producer<not_null<QWheelEvent*>>;
+
 private:
 	struct Layout;
 	enum class State {
@@ -177,6 +180,7 @@ private:
 	int _scrollLeft = 0;
 	int _scrollLeftMax = 0;
 	bool _dragging = false;
+	Qt::Orientation _scrollingLock = {};
 
 	Ui::Animations::Simple _expandedAnimation;
 	Ui::Animations::Simple _expandCatchUpAnimation;
@@ -188,6 +192,8 @@ private:
 	int _selected = -1;
 	int _pressed = -1;
 
+	rpl::event_stream<not_null<QWheelEvent*>> _verticalScrollEvents;
+
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	base::has_weak_ptr _menuGuard;
 

From 0c61e0e184db790359704ddf3b91c915ead19fd0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 21:59:08 +0400
Subject: [PATCH 480/676] Version 4.8.7.

- Several crash fixes and small stories improvements.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 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 c5647a2b5..898e980a2 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.8.6.0" />
+    Version="4.8.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 9fc997288..8f8652e9e 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,8,6,0
- PRODUCTVERSION 4,8,6,0
+ FILEVERSION 4,8,7,0
+ PRODUCTVERSION 4,8,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.6.0"
+            VALUE "FileVersion", "4.8.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.6.0"
+            VALUE "ProductVersion", "4.8.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index a581fc869..c1a090788 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,8,6,0
- PRODUCTVERSION 4,8,6,0
+ FILEVERSION 4,8,7,0
+ PRODUCTVERSION 4,8,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.6.0"
+            VALUE "FileVersion", "4.8.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.6.0"
+            VALUE "ProductVersion", "4.8.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 5b4f6e797..71ea8719a 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 = 4008006;
-constexpr auto AppVersionStr = "4.8.6";
+constexpr auto AppVersion = 4008007;
+constexpr auto AppVersionStr = "4.8.7";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index f85771589..1322ed7d7 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008006
+AppVersion         4008007
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.6
-AppVersionStr      4.8.6
+AppVersionStrSmall 4.8.7
+AppVersionStr      4.8.7
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.6
+AppVersionOriginal 4.8.7
diff --git a/changelog.txt b/changelog.txt
index fb06e9a51..314f815c6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.7 (21.07.23)
+
+- Several crash fixes and small stories improvements.
+
 4.8.6 (21.07.23)
 
 - Fix langpack keys by a full rebuild on macOS.

From 100e875530a512d156240bdd1c27c9b66caae732 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 22 Jul 2023 22:27:45 +0400
Subject: [PATCH 481/676] Short launcher access in Logs::start

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

diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index 03cfe4c49..f645db99d 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -346,7 +346,8 @@ bool WritingEntry() {
 void start() {
 	Assert(LogsData == nullptr);
 
-	if (!Core::Launcher::Instance().checkPortableVersionFolder()) {
+	auto &launcher = Core::Launcher::Instance();
+	if (!launcher.checkPortableVersionFolder()) {
 		return;
 	}
 
@@ -414,7 +415,7 @@ void start() {
 
 	QDir().mkpath(cWorkingDir() + u"tdata"_q);
 
-	Core::Launcher::Instance().workingFolderReady();
+	launcher.workingFolderReady();
 	CrashReports::StartCatching();
 
 	if (!LogsData->openMain()) {
@@ -430,7 +431,7 @@ void start() {
 	LOG(("Executable dir: %1, name: %2").arg(cExeDir(), cExeName()));
 	LOG(("Initial working dir: %1").arg(initialWorkingDir));
 	LOG(("Working dir: %1").arg(cWorkingDir()));
-	LOG(("Command line: %1").arg(Core::Launcher::Instance().arguments().join(' ')));
+	LOG(("Command line: %1").arg(launcher.arguments().join(' ')));
 
 	if (!LogsData) {
 		LOG(("FATAL: Could not open '%1' for writing log!"

From cd7539c001495d5daa63375307b5c56417a31a3d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 22 Jul 2023 01:07:22 +0400
Subject: [PATCH 482/676] Detect when -workdir value is not really custom

---
 Telegram/SourceFiles/core/launcher.cpp | 20 ++++++++++++++++----
 Telegram/SourceFiles/core/launcher.h   |  3 ++-
 Telegram/SourceFiles/logs.cpp          |  7 +++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 52ebbd7c7..35b168d9a 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -394,6 +394,18 @@ int Launcher::exec() {
 	return result;
 }
 
+bool Launcher::validateCustomWorkingDir() {
+	if (customWorkingDir()) {
+		if (_customWorkingDir == cWorkingDir()) {
+			_customWorkingDir = {};
+			return false;
+		}
+		cForceWorkingDir(_customWorkingDir);
+		return true;
+	}
+	return false;
+}
+
 void Launcher::workingFolderReady() {
 	srand((unsigned int)time(nullptr));
 
@@ -435,7 +447,7 @@ const QStringList &Launcher::arguments() const {
 }
 
 bool Launcher::customWorkingDir() const {
-	return _customWorkingDir;
+	return !_customWorkingDir.isEmpty();
 }
 
 void Launcher::prepareSettings() {
@@ -534,9 +546,9 @@ void Launcher::processArguments() {
 	gStartInTray = parseResult.contains("-startintray");
 	gQuit = parseResult.contains("-quit");
 	gSendPaths = parseResult.value("-sendpath", {});
-	cForceWorkingDir(parseResult.value("-workdir", {}).join(QString()));
-	if (!gWorkingDir.isEmpty()) {
-		_customWorkingDir = true;
+	_customWorkingDir = parseResult.value("-workdir", {}).join(QString());
+	if (!_customWorkingDir.isEmpty()) {
+		_customWorkingDir = QDir(_customWorkingDir).absolutePath() + '/';
 	}
 	gStartUrl = parseResult.value("--", {}).join(QString());
 
diff --git a/Telegram/SourceFiles/core/launcher.h b/Telegram/SourceFiles/core/launcher.h
index 264085f20..a5e5117a5 100644
--- a/Telegram/SourceFiles/core/launcher.h
+++ b/Telegram/SourceFiles/core/launcher.h
@@ -34,6 +34,7 @@ public:
 	uint64 installationTag() const;
 
 	bool checkPortableVersionFolder();
+	bool validateCustomWorkingDir();
 	void workingFolderReady();
 	void writeDebugModeSetting();
 	void writeInstallBetaVersionsSetting();
@@ -83,7 +84,7 @@ private:
 	QStringList _arguments;
 	BaseIntegration _baseIntegration;
 
-	bool _customWorkingDir = false;
+	QString _customWorkingDir;
 
 };
 
diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index f645db99d..b8bd88d6c 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -363,7 +363,6 @@ void start() {
 
 		if (!cWorkingDir().isEmpty()) {
 			// This value must come from TelegramForcePortable
-			// or from the "-workdir" command line argument.
 			cForceWorkingDir(cWorkingDir());
 			workingDirChosen = true;
 		} else {
@@ -391,7 +390,6 @@ void start() {
 
 		if (!cWorkingDir().isEmpty()) {
 			// This value must come from TelegramForcePortable
-			// or from the "-workdir" command line argument.
 			cForceWorkingDir(cWorkingDir());
 			workingDirChosen = true;
 		}
@@ -408,6 +406,11 @@ void start() {
 		}
 	}
 
+	if (launcher.validateCustomWorkingDir()) {
+		delete LogsData;
+		LogsData = new LogsDataFields();
+	}
+
 // WinRT build requires the working dir to stay the same for plugin loading.
 #ifndef Q_OS_WINRT
 	QDir().setCurrent(cWorkingDir());

From 272d2da04af1e5a98b63cdebae52ea0e5a060407 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 22 Jul 2023 01:07:47 +0400
Subject: [PATCH 483/676] Stabilize app id on Linux when -workdir is set to the
 default workdir

Currently the app id hash is generated from workdir path only when it's set explicitly and that's for a good reason: the default workdir could be changed (e.g. by creating a TelegramForcePortable) and app id would change what would result in a duplicate .desktop created.

The current code has the possibility of having duplicate .desktop files, too, as it happened, but by specifying -workdir to the same directory as the default one.

There's now a check that ensures the specified workdir is really custom so those duplicate launchers could be removed what should really stabilize the hash.
---
 .../platform/linux/specific_linux.cpp          | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index e53ac78b0..81ff88729 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -309,6 +309,10 @@ bool GenerateDesktopFile(
 		hashMd5Hex(d.constData(), d.size(), md5Hash);
 
 		if (!Core::Launcher::Instance().customWorkingDir()) {
+			QFile::remove(u"%1org.telegram.desktop._%2.desktop"_q.arg(
+				targetPath,
+				md5Hash));
+
 			const auto exePath = QFile::encodeName(
 				cExeDir() + cExeName());
 			hashMd5Hex(exePath.constData(), exePath.size(), md5Hash);
@@ -335,7 +339,7 @@ bool GenerateServiceFile(bool silent = false) {
 		+ QGuiApplication::desktopFileName()
 		+ u".service"_q;
 
-	DEBUG_LOG(("App Info: placing .service file to %1").arg(targetPath));
+	DEBUG_LOG(("App Info: placing D-Bus service file to %1").arg(targetPath));
 	if (!QDir(targetPath).exists()) QDir().mkpath(targetPath);
 
 	const auto target = Glib::KeyFile::create();
@@ -366,6 +370,18 @@ bool GenerateServiceFile(bool silent = false) {
 		return false;
 	}
 
+	if (!Core::UpdaterDisabled() && !Core::Launcher::Instance().customWorkingDir()) {
+		DEBUG_LOG(("App Info: removing old D-Bus service files"));
+
+		char md5Hash[33] = { 0 };
+		const auto d = QFile::encodeName(QDir(cWorkingDir()).absolutePath());
+		hashMd5Hex(d.constData(), d.size(), md5Hash);
+
+		QFile::remove(u"%1org.telegram.desktop._%2.service"_q.arg(
+			targetPath,
+			md5Hash));
+	}
+
 	QProcess::execute(u"systemctl"_q, {
 		u"--user"_q,
 		u"reload"_q,

From 727bfd1059bff2859721aad83e8a9d79c8c666ad Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 10:43:55 +0400
Subject: [PATCH 484/676] Fix incorrect state of ElasticScroll.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 079d966e4..ad852f0f4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 079d966e45922f90de297fc9f7435cbf8b127b09
+Subproject commit ad852f0f4ab271de4db799d01fa8b7032eb33b11

From 0b1b996e3348bfe0d8c32b3f5f7b5a4926892ebf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 10:44:36 +0400
Subject: [PATCH 485/676] Fix build with MSVC.

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

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 35b168d9a..b18f0b541 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -397,7 +397,7 @@ int Launcher::exec() {
 bool Launcher::validateCustomWorkingDir() {
 	if (customWorkingDir()) {
 		if (_customWorkingDir == cWorkingDir()) {
-			_customWorkingDir = {};
+			_customWorkingDir = QString();
 			return false;
 		}
 		cForceWorkingDir(_customWorkingDir);

From fb4e05405e7c95d6593ef53810b9c36e07d0a0d3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 11:43:20 +0400
Subject: [PATCH 486/676] Support and use share comment in stories.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/calls/calls.style        |  5 ++++
 .../SourceFiles/data/data_media_types.cpp     | 21 +++------------
 .../history/view/history_view_element.cpp     |  8 ++++--
 .../history/view/media/history_view_gif.cpp   | 22 +++++++--------
 .../history/view/media/history_view_gif.h     |  2 +-
 .../history/view/media/history_view_photo.cpp | 25 ++++++++---------
 .../history/view/media/history_view_photo.h   |  2 +-
 .../media/stories/media_stories_share.cpp     | 27 ++++++++++++-------
 9 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ce176c6d1..8ebc76005 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1710,6 +1710,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_forwarded" = "Forwarded from {user}";
 "lng_forwarded_story" = "Story from {user}";
+"lng_forwarded_story_expired" = "This story has expired.";
 "lng_forwarded_date" = "Original: {date}";
 "lng_forwarded_channel" = "Forwarded from {channel}";
 "lng_forwarded_psa_default" = "Forwarded from {channel}";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 28b5f90a6..c8f287328 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -744,6 +744,11 @@ groupCallShareBoxComment: InputField(groupCallField) {
 }
 groupCallShareBoxList: PeerList(groupCallMembersList) {
 	item: PeerListItem(groupCallMembersListItem) {
+		nameStyle: TextStyle(defaultTextStyle) {
+			font: font(11px);
+			linkFont: font(11px);
+			linkFontOver: font(11px);
+		}
 		checkbox: RoundImageCheckbox(groupCallMembersListCheckbox) {
 			imageRadius: 28px;
 			imageSmallRadius: 24px;
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 19d89c500..e623df3a5 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1995,18 +1995,11 @@ MediaStory::MediaStory(
 	owner->registerStoryItem(storyId, parent);
 
 	const auto stories = &owner->stories();
-	if (const auto maybeStory = stories->lookup(storyId)) {
-		if (!_mention) {
-			parent->setText((*maybeStory)->caption());
-		}
-	} else {
+	const auto maybeStory = stories->lookup(storyId);
+	if (!maybeStory) {
 		if (maybeStory.error() == NoStory::Unknown) {
 			stories->resolve(storyId, crl::guard(this, [=] {
-				if (const auto maybeStory = stories->lookup(storyId)) {
-					if (!_mention) {
-						parent->setText((*maybeStory)->caption());
-					}
-				} else {
+				if (!stories->lookup(storyId)) {
 					_expired = true;
 				}
 				if (_mention) {
@@ -2058,9 +2051,7 @@ TextWithEntities MediaStory::notificationText() const {
 				&& maybeStory.error() == Data::NoStory::Deleted))
 			? tr::lng_in_dlg_story_expired
 			: tr::lng_in_dlg_story)(tr::now),
-		(maybeStory
-			? (*maybeStory)->caption()
-			: TextWithEntities()));
+		parent()->originalText());
 }
 
 QString MediaStory::pinnedTextSubstring() const {
@@ -2100,9 +2091,6 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
 	if (!maybeStory) {
-		if (!_mention) {
-			realParent->setText(TextWithEntities());
-		}
 		if (maybeStory.error() == Data::NoStory::Deleted) {
 			_expired = true;
 			return nullptr;
@@ -2124,7 +2112,6 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 			message,
 			std::make_unique<HistoryView::StoryMention>(message, story));
 	} else {
-		realParent->setText(story->caption());
 		if (const auto photo = story->photo()) {
 			return std::make_unique<HistoryView::Photo>(
 				message,
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index f20499bb9..f86159d38 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -846,8 +846,12 @@ void Element::validateText() {
 		_media = nullptr;
 		if (!storyMention) {
 			if (_text.isEmpty()) {
-				setTextWithLinks(
-					Ui::Text::Italic(u"This story has expired"_q));
+				auto now = Ui::Text::Italic(
+					tr::lng_forwarded_story_expired(tr::now));
+				if (!text.empty()) {
+					now.append(u"\n\n"_q).append(text);
+				}
+				setTextWithLinks(std::move(now));
 			}
 			return;
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index d3040ce07..0bee2fbf0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -88,14 +88,13 @@ Gif::Gif(
 	bool spoiler)
 : File(parent, realParent)
 , _data(document)
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right())
+, _storyId(realParent->media()
+	? realParent->media()->storyId()
+	: FullStoryId())
+, _caption(
+	st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right())
 , _spoiler(spoiler ? std::make_unique<MediaSpoiler>() : nullptr)
 , _downloadSize(Ui::FormatSizeText(_data->size)) {
-	if (const auto media = realParent->media()) {
-		if (media->storyId()) {
-			_story = true;
-		}
-	}
 	setDocumentLinks(_data, realParent, [=] {
 		if (!_data->createMediaView()->canBePlayed(realParent)
 			|| !_data->isAnimation()
@@ -1438,15 +1437,14 @@ void Gif::dataMediaCreated() const {
 }
 
 void Gif::togglePollingStory(bool enabled) const {
-	if (!_story || _pollingStory == enabled) {
+	if (!_storyId || _pollingStory == enabled) {
 		return;
 	}
 	const auto polling = Data::Stories::Polling::Chat;
-	const auto media = _parent->data()->media();
-	const auto id = media ? media->storyId() : FullStoryId();
 	if (!enabled) {
-		_data->owner().stories().unregisterPolling(id, polling);
-	} else if (!_data->owner().stories().registerPolling(id, polling)) {
+		_data->owner().stories().unregisterPolling(_storyId, polling);
+	} else if (
+			!_data->owner().stories().registerPolling(_storyId, polling)) {
 		return;
 	}
 	_pollingStory = enabled;
@@ -1464,7 +1462,7 @@ void Gif::hideSpoilers() {
 }
 
 bool Gif::needsBubble() const {
-	if (_story) {
+	if (_storyId) {
 		return true;
 	} else if (_data->isVideoMessage()) {
 		return false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 50c5583ac..c737d2391 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -211,6 +211,7 @@ private:
 	void togglePollingStory(bool enabled) const;
 
 	const not_null<DocumentData*> _data;
+	const FullStoryId _storyId;
 	Ui::Text::String _caption;
 	std::unique_ptr<Streamed> _streamed;
 	const std::unique_ptr<MediaSpoiler> _spoiler;
@@ -223,7 +224,6 @@ private:
 	mutable std::optional<Ui::BubbleRounding> _thumbCacheRounding;
 	mutable bool _thumbCacheBlurred : 1 = false;
 	mutable bool _thumbIsEllipse : 1 = false;
-	mutable bool _story : 1 = false;
 	mutable bool _pollingStory : 1 = false;
 
 };
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index ed5c49ac9..a5cf0f41c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -69,13 +69,11 @@ Photo::Photo(
 	bool spoiler)
 : File(parent, realParent)
 , _data(photo)
+, _storyId(realParent->media()
+	? realParent->media()->storyId()
+	: FullStoryId())
 , _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right())
 , _spoiler(spoiler ? std::make_unique<MediaSpoiler>() : nullptr) {
-	if (const auto media = realParent->media()) {
-		if (media->storyId()) {
-			_story = 1;
-		}
-	}
 	_caption = createCaption(realParent);
 	create(realParent->fullId());
 }
@@ -168,15 +166,14 @@ void Photo::unloadHeavyPart() {
 
 void Photo::togglePollingStory(bool enabled) const {
 	const auto pollingStory = (enabled ? 1 : 0);
-	if (!_story || _pollingStory == pollingStory) {
+	if (!_storyId || _pollingStory == pollingStory) {
 		return;
 	}
 	const auto polling = Data::Stories::Polling::Chat;
-	const auto media = _parent->data()->media();
-	const auto id = media ? media->storyId() : FullStoryId();
 	if (!enabled) {
-		_data->owner().stories().unregisterPolling(id, polling);
-	} else if (!_data->owner().stories().registerPolling(id, polling)) {
+		_data->owner().stories().unregisterPolling(_storyId, polling);
+	} else if (
+			!_data->owner().stories().registerPolling(_storyId, polling)) {
 		return;
 	}
 	_pollingStory = pollingStory;
@@ -285,7 +282,7 @@ int Photo::adjustHeightForLessCrop(QSize dimensions, QSize current) const {
 void Photo::draw(Painter &p, const PaintContext &context) const {
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return;
-	} else if (_story && _data->isNull()) {
+	} else if (_storyId && _data->isNull()) {
 		return;
 	}
 
@@ -623,7 +620,7 @@ void Photo::paintUserpicFrame(
 }
 
 QSize Photo::photoSize() const {
-	if (_story) {
+	if (_storyId) {
 		return { kStoryWidth, kStoryHeight };
 	}
 	return QSize(_data->width(), _data->height());
@@ -634,7 +631,7 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return result;
-	} else if (_story && _data->isNull()) {
+	} else if (_storyId && _data->isNull()) {
 		return result;
 	}
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
@@ -1054,7 +1051,7 @@ void Photo::hideSpoilers() {
 }
 
 bool Photo::needsBubble() const {
-	if (_story || !_caption.isEmpty()) {
+	if (_storyId || !_caption.isEmpty()) {
 		return true;
 	}
 	const auto item = _parent->data();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 94404ddbe..cfe9e9627 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -163,6 +163,7 @@ private:
 	void togglePollingStory(bool enabled) const;
 
 	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;
@@ -172,7 +173,6 @@ private:
 	uint32 _serviceWidth : 28 = 0;
 	mutable uint32 _imageCacheForum : 1 = 0;
 	mutable uint32 _imageCacheBlurred : 1 = 0;
-	mutable uint32 _story : 1 = 0;
 	mutable uint32 _pollingStory : 1 = 0;
 
 };
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index 413fbf3d1..d6fe67adc 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_share.h"
 
 #include "api/api_common.h"
+#include "api/api_text_entities.h"
 #include "apiwrap.h"
 #include "base/random.h"
 #include "boxes/share_box.h"
@@ -86,7 +87,7 @@ namespace Media::Stories {
 			for (const auto thread : result) {
 				const auto error = GetErrorTextForSending(
 					thread,
-					{ .story = story, .text = &comment });
+					{ .story = story });
 				if (!error.isEmpty()) {
 					return std::make_pair(error, thread);
 				}
@@ -105,16 +106,21 @@ namespace Media::Stories {
 			return;
 		}
 
+		auto caption = TextWithEntities{
+			comment.text,
+			TextUtilities::ConvertTextTagsToEntities(comment.tags)
+		};
+		TextUtilities::Trim(caption);
+		auto sentEntities = Api::EntitiesToMTP(
+			session,
+			caption.entities,
+			Api::ConvertOption::SkipLocal);
+		const auto captionText = caption.text;
+
 		const auto api = &story->owner().session().api();
 		auto &histories = story->owner().histories();
 		for (const auto thread : result) {
 			const auto action = Api::SendAction(thread, options);
-			if (!comment.text.isEmpty()) {
-				auto message = Api::MessageToSend(action);
-				message.textWithTags = comment;
-				message.action.clearDraft = false;
-				api->sendMessage(std::move(message));
-			}
 			const auto peer = thread->peer();
 			const auto threadHistory = thread->owningHistory();
 			const auto randomId = base::RandomValue<uint64>();
@@ -126,6 +132,9 @@ namespace Media::Stories {
 			if (silentPost) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 			}
+			if (!sentEntities.v.isEmpty()) {
+				sendFlags |= MTPmessages_SendMedia::Flag::f_entities;
+			}
 			const auto done = [=] {
 				if (!--state->requests) {
 					if (show->valid()) {
@@ -145,10 +154,10 @@ namespace Media::Stories {
 					MTP_inputMediaStory(
 						user->inputUser,
 						MTP_int(id.story)),
-					MTPstring(),
+					MTP_string(captionText),
 					MTP_long(randomId),
 					MTPReplyMarkup(),
-					MTPVector<MTPMessageEntity>(),
+					sentEntities,
 					MTP_int(action.options.scheduled),
 					MTP_inputPeerEmpty()
 				), [=](const MTPUpdates &result, const MTP::Response &response) {

From 88a165d6761c4289c40ea8363d42822826589041 Mon Sep 17 00:00:00 2001
From: Avimitin <dev@avimit.in>
Date: Mon, 24 Jul 2023 16:53:09 +0800
Subject: [PATCH 487/676] Use absolute executable path for dbus service

After the v4.8.7 release, I cannot launch telegram desktop because of the
recent dbus support introduced in
https://github.com/telegramdesktop/tdesktop/commit/2dfe85832717ccfd9268a5b767f03eb4e8665b8f.
And it was fixed after I changed the value of the Exec field to absolute
path to the telegram-desktop executable.

In dbus specification they don't mention that they will find
executable from PATH variable, so this is a UB.
After this commit, cmake will use the full install path to generate the correct service file
and fix the above issue.

Signed-off-by: Avimitin <dev@avimit.in>
---
 Telegram/CMakeLists.txt              | 3 ++-
 lib/xdg/org.telegram.desktop.service | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 329e16226..8fb9e62d1 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1758,6 +1758,7 @@ endif()
 
 if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
+    configure_file("../lib/xdg/org.telegram.desktop.service" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.service" @ONLY)
     configure_file("../lib/xdg/org.telegram.desktop.metainfo.xml" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" @ONLY)
     generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml")
     install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
@@ -1769,6 +1770,6 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     install(FILES "Resources/art/icon256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "telegram.png")
     install(FILES "../lib/xdg/org.telegram.desktop.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-    install(FILES "../lib/xdg/org.telegram.desktop.service" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.service" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
 endif()
diff --git a/lib/xdg/org.telegram.desktop.service b/lib/xdg/org.telegram.desktop.service
index 0f9caabbc..525cac208 100644
--- a/lib/xdg/org.telegram.desktop.service
+++ b/lib/xdg/org.telegram.desktop.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.telegram.desktop
-Exec=telegram-desktop
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/telegram-desktop

From 320db83155ff5f3afb67bc1a2e6e979a98c69869 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 15:31:43 +0400
Subject: [PATCH 488/676] Fix build with GCC.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 1a1a395d3..c3a9ddda3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -332,11 +332,7 @@ void List::paint(
 		bool layered) {
 	const auto &st = _st.small;
 	const auto &full = _st.full;
-	const auto ratio = layout.ratio;
 	const auto expandRatio = layout.expandRatio;
-	const auto lerp = [&](float64 a, float64 b) {
-		return a + (b - a) * ratio;
-	};
 	const auto elerp = [&](float64 a, float64 b) {
 		return a + (b - a) * expandRatio;
 	};

From 2323aef899df81a66645ad443f423d5d98ce4311 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 17:01:13 +0400
Subject: [PATCH 489/676] Show nice tooltips about story privacy / silence.

---
 Telegram/Resources/langs/lang.strings         |  10 +
 .../stories/media_stories_controller.cpp      |  17 +-
 .../media/stories/media_stories_controller.h  |   1 +
 .../media/stories/media_stories_header.cpp    | 204 +++++++++++++++---
 .../media/stories/media_stories_header.h      |  16 ++
 .../SourceFiles/media/view/media_view.style   |  15 ++
 Telegram/lib_ui                               |   2 +-
 7 files changed, 233 insertions(+), 32 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 8ebc76005..85149cb42 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3833,6 +3833,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_no_views" = "No views";
 "lng_stories_unsupported" = "This story is not supported\nby your version of Telegram.";
 "lng_stories_cant_reply" = "You can't reply to this story.";
+"lng_stories_about_silent" = "This video has no sound.";
+"lng_stories_about_close_friends" = "You're seeing this story because {user} added you to their list of **Close Friends**.";
+"lng_stories_about_contacts" = "Only {user}'s contacts can view this story.";
+"lng_stories_about_selected_contacts" = "Only some contacts {user} selected can view this story.";
+"lng_stories_about_close_friends_my" = "Only your list of **Close Friends** can view this story.";
+"lng_stories_about_contacts_my" = "Only your contacts can view this story.";
+"lng_stories_about_selected_contacts_my" = "Only some contacts you selected can view this story.";
+"lng_stories_click_to_view" = "Click here to view updates from {users}.";
+"lng_stories_click_to_view_and_one" = "{accumulated}, {user}";
+"lng_stories_click_to_view_and_last" = "{accumulated} and {user}";
 
 "lng_stories_my_title" = "Saved Stories";
 "lng_stories_archive_button" = "Stories Archive";
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 2c2efc7d6..a5cf70746 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -322,8 +322,18 @@ Controller::Controller(not_null<Delegate*> delegate)
 
 	_delegate->storiesLayerShown(
 	) | rpl::start_with_next([=](bool shown) {
-		_layerShown = shown;
-		updatePlayingAllowed();
+		if (_layerShown != shown) {
+			_layerShown = shown;
+			updatePlayingAllowed();
+		}
+	}, _lifetime);
+
+	_header->tooltipShownValue(
+	) | rpl::start_with_next([=](bool shown) {
+		if (_tooltipShown != shown) {
+			_tooltipShown = shown;
+			updatePlayingAllowed();
+		}
 	}, _lifetime);
 
 	const auto window = _wrap->window()->windowHandle();
@@ -961,7 +971,8 @@ void Controller::updatePlayingAllowed() {
 		&& !_captionFullView
 		&& !_captionExpanded
 		&& !_layerShown
-		&& !_menuShown);
+		&& !_menuShown
+		&& !_tooltipShown);
 }
 
 void Controller::setPlayingAllowed(bool allowed) {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 760835a81..3aa3a49a2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -257,6 +257,7 @@ private:
 	bool _hasSendText = false;
 	bool _layerShown = false;
 	bool _menuShown = false;
+	bool _tooltipShown = false;
 	bool _paused = false;
 
 	FullStoryId _shown;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 5dc7f6b15..8da578b9b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
@@ -50,10 +51,9 @@ struct PrivacyBadge {
 
 class UserpicBadge final : public Ui::RpWidget {
 public:
-	UserpicBadge(
-		not_null<QWidget*> userpic,
-		PrivacyBadge badge,
-		Fn<void()> clicked);
+	UserpicBadge(not_null<QWidget*> userpic, PrivacyBadge badge);
+
+	[[nodiscard]] QRect badgeGeometry() const;
 
 private:
 	bool eventFilter(QObject *o, QEvent *e) override;
@@ -63,7 +63,6 @@ private:
 
 	const not_null<QWidget*> _userpic;
 	const PrivacyBadge _badgeData;
-	const std::unique_ptr<Ui::AbstractButton> _clickable;
 	QRect _badge;
 	QImage _layer;
 	bool _grabbing = false;
@@ -95,15 +94,10 @@ private:
 	return {};
 }
 
-UserpicBadge::UserpicBadge(
-	not_null<QWidget*> userpic,
-	PrivacyBadge badge,
-	Fn<void()> clicked)
+UserpicBadge::UserpicBadge(not_null<QWidget*> userpic, PrivacyBadge badge)
 : RpWidget(userpic->parentWidget())
 , _userpic(userpic)
-, _badgeData(badge)
-, _clickable(std::make_unique<Ui::AbstractButton>(parentWidget())) {
-	_clickable->setClickedCallback(std::move(clicked));
+, _badgeData(badge) {
 	userpic->installEventFilter(this);
 	updateGeometry();
 	setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -113,6 +107,10 @@ UserpicBadge::UserpicBadge(
 	show();
 }
 
+QRect UserpicBadge::badgeGeometry() const {
+	return _badge;
+}
+
 bool UserpicBadge::eventFilter(QObject *o, QEvent *e) {
 	if (o != _userpic) {
 		return false;
@@ -173,22 +171,27 @@ void UserpicBadge::updateGeometry() {
 	_badge = QRect(
 		QPoint(width - badge.width(), height - badge.height()),
 		badge);
-	_clickable->setGeometry(_badge.translated(pos()));
 	update();
 }
 
-[[nodiscard]] std::unique_ptr<Ui::RpWidget> MakePrivacyBadge(
+struct MadePrivacyBadge {
+	std::unique_ptr<Ui::RpWidget> widget;
+	QRect geometry;
+};
+
+[[nodiscard]] MadePrivacyBadge MakePrivacyBadge(
 		not_null<QWidget*> userpic,
-		Data::StoryPrivacy privacy,
-		Fn<void()> clicked) {
+		Data::StoryPrivacy privacy) {
 	const auto badge = LookupPrivacyBadge(privacy);
 	if (!badge.icon) {
-		return nullptr;
+		return {};
 	}
-	return std::make_unique<UserpicBadge>(
-		userpic,
-		badge,
-		std::move(clicked));
+	auto widget = std::make_unique<UserpicBadge>(userpic, badge);
+	const auto geometry = widget->badgeGeometry();
+	return {
+		.widget = std::move(widget),
+		.geometry = geometry,
+	};
 }
 
 [[nodiscard]] Timestamp ComposeTimestamp(TimeId when, TimeId now) {
@@ -277,6 +280,8 @@ void Header::show(HeaderData data) {
 			_info->setGeometry({ 0, 0, r, _widget->height() });
 		}
 	};
+	_tooltip = nullptr;
+	_tooltipShown = false;
 	if (userChanged) {
 		_volume = nullptr;
 		_date = nullptr;
@@ -328,6 +333,8 @@ void Header::show(HeaderData data) {
 		_controller->layoutValue(
 		) | rpl::start_with_next([=](const Layout &layout) {
 			raw->setGeometry(layout.header);
+			_contentGeometry = layout.content;
+			updateTooltipGeometry();
 		}, raw->lifetime());
 	}
 	auto timestamp = ComposeDetails(data, base::unixtime::now());
@@ -357,8 +364,29 @@ void Header::show(HeaderData data) {
 		_counter = nullptr;
 	}
 
-	_privacy = MakePrivacyBadge(_userpic.get(), data.privacy, [=] {
-	});
+	auto made = MakePrivacyBadge(_userpic.get(), data.privacy);
+	_privacy = std::move(made.widget);
+	_privacyBadgeOver = false;
+	_privacyBadgeGeometry = _privacy
+		? Ui::MapFrom(_info.get(), _privacy.get(), made.geometry)
+		: QRect();
+	if (_privacy) {
+		_info->setMouseTracking(true);
+		_info->events(
+		) | rpl::filter([=](not_null<QEvent*> e) {
+			const auto type = e->type();
+			if (type != QEvent::Leave && type != QEvent::MouseMove) {
+				return false;
+			}
+			const auto over = (type == QEvent::MouseMove)
+				&& _privacyBadgeGeometry.contains(
+					static_cast<QMouseEvent*>(e.get())->pos());
+			return (_privacyBadgeOver != over);
+		}) | rpl::start_with_next([=] {
+			_privacyBadgeOver = !_privacyBadgeOver;
+			toggleTooltip(Tooltip::Privacy, _privacyBadgeOver);
+		}, _privacy->lifetime());
+	}
 
 	if (data.video) {
 		createPlayPause();
@@ -369,6 +397,7 @@ void Header::show(HeaderData data) {
 			_playPause->moveToRight(playPause.x(), playPause.y(), width);
 			const auto volume = st::storiesVolumeButtonPosition;
 			_volumeToggle->moveToRight(volume.x(), volume.y(), width);
+			updateTooltipGeometry();
 		}, _playPause->lifetime());
 
 		_pauseState = _controller->pauseState();
@@ -496,15 +525,14 @@ void Header::createVolumeToggle() {
 
 	_volumeToggle->events(
 	) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (state->silent) {
-			return;
-		}
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
 			if (state->over != over) {
 				state->over = over;
-				if (over) {
+				if (state->silent) {
+					toggleTooltip(Tooltip::SilentVideo, over);
+				} else if (over) {
 					state->hideTimer.cancel();
 					_volume->toggle(true, anim::type::normal);
 				} else if (!state->dropdownOver) {
@@ -565,6 +593,123 @@ void Header::createVolumeToggle() {
 	}
 }
 
+void Header::toggleTooltip(Tooltip type, bool show) {
+	const auto guard = gsl::finally([&] {
+		_tooltipShown = (_tooltip != nullptr);
+	});
+	if (const auto was = _tooltip.release()) {
+		was->toggleAnimated(false);
+	}
+	if (!show) {
+		return;
+	}
+	const auto text = [&]() -> TextWithEntities {
+		using Privacy = Data::StoryPrivacy;
+		const auto boldName = Ui::Text::Bold(_data->user->shortName());
+		const auto self = _data->user->isSelf();
+		switch (type) {
+		case Tooltip::SilentVideo:
+			return { tr::lng_stories_about_silent(tr::now) };
+		case Tooltip::Privacy: switch (_data->privacy) {
+			case Privacy::CloseFriends:
+				return self
+					? tr::lng_stories_about_close_friends_my(
+						tr::now,
+						Ui::Text::RichLangValue)
+					: tr::lng_stories_about_close_friends(
+						tr::now,
+						lt_user,
+						boldName,
+						Ui::Text::RichLangValue);
+			case Privacy::Contacts:
+				return self
+					? tr::lng_stories_about_contacts_my(
+						tr::now,
+						Ui::Text::RichLangValue)
+					: tr::lng_stories_about_contacts(
+						tr::now,
+						lt_user,
+						boldName,
+						Ui::Text::RichLangValue);
+			case Privacy::SelectedContacts:
+				return self
+					? tr::lng_stories_about_selected_contacts_my(
+						tr::now,
+						Ui::Text::RichLangValue)
+					: tr::lng_stories_about_selected_contacts(
+						tr::now,
+						lt_user,
+						boldName,
+						Ui::Text::RichLangValue);
+			}
+		}
+		return {};
+	}();
+	if (text.empty()) {
+		return;
+	}
+	_tooltipType = type;
+	_tooltip = std::make_unique<Ui::ImportantTooltip>(
+		_widget->parentWidget(),
+		Ui::MakeNiceTooltipLabel(
+			_widget.get(),
+			rpl::single(text),
+			st::storiesInfoTooltipMaxWidth,
+			st::storiesInfoTooltipLabel),
+		st::storiesInfoTooltip);
+	const auto tooltip = _tooltip.get();
+	const auto weak = QPointer<QWidget>(tooltip);
+	const auto destroy = [=] {
+		delete weak.data();
+	};
+	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
+	tooltip->setHiddenCallback(destroy);
+	updateTooltipGeometry();
+	tooltip->toggleAnimated(true);
+}
+
+void Header::updateTooltipGeometry() {
+	if (!_tooltip) {
+		return;
+	}
+	const auto geometry = [&] {
+		switch (_tooltipType) {
+		case Tooltip::SilentVideo:
+			return Ui::MapFrom(
+				_widget->parentWidget(),
+				_volumeToggle.get(),
+				_volumeToggle->rect());
+		case Tooltip::Privacy:
+			return Ui::MapFrom(
+				_widget->parentWidget(),
+				_info.get(),
+				_privacyBadgeGeometry.marginsAdded(
+					st::storiesInfoTooltip.padding));
+		}
+		return QRect();
+	}();
+	if (geometry.isEmpty()) {
+		toggleTooltip(Tooltip::None, false);
+		return;
+	}
+	const auto weak = QPointer<QWidget>(_tooltip.get());
+	const auto countPosition = [=](QSize size) {
+		const auto result = geometry.bottomLeft()
+			- QPoint(size.width() / 2, 0);
+		const auto inner = _contentGeometry.marginsRemoved(
+			st::storiesInfoTooltip.padding);
+		if (size.width() > inner.width()) {
+			return QPoint(
+				inner.x() + (inner.width() - size.width()) / 2,
+				result.y());
+		} else if (result.x() < inner.x()) {
+			return QPoint(inner.x(), result.y());
+		}
+		return result;
+	};
+	_tooltip->pointAt(geometry, RectPart::Bottom, countPosition);
+}
+
 void Header::rebuildVolumeControls(
 		not_null<Ui::RpWidget*> dropdown,
 		bool horizontal) {
@@ -682,11 +827,14 @@ void Header::raise() {
 	}
 }
 
-
 bool Header::ignoreWindowMove(QPoint position) const {
 	return _ignoreWindowMove;
 }
 
+rpl::producer<bool> Header::tooltipShownValue() const {
+	return _tooltipShown.value();
+}
+
 void Header::updateDateText() {
 	if (!_date || !_data || !_data->date) {
 		return;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 12a66b1a1..4c67526e2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -20,6 +20,7 @@ class FlatLabel;
 class IconButton;
 class AbstractButton;
 class UserpicButton;
+class ImportantTooltip;
 template <typename Widget>
 class FadeWrap;
 } // namespace Ui
@@ -55,8 +56,15 @@ public:
 	void raise();
 
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
+	[[nodiscard]] rpl::producer<bool> tooltipShownValue() const;
 
 private:
+	enum class Tooltip {
+		None,
+		SilentVideo,
+		Privacy,
+	};
+
 	void updateDateText();
 	void applyPauseState();
 	void createPlayPause();
@@ -64,6 +72,8 @@ private:
 	void rebuildVolumeControls(
 		not_null<Ui::RpWidget*> dropdown,
 		bool horizontal);
+	void toggleTooltip(Tooltip type, bool show);
+	void updateTooltipGeometry();
 
 	const not_null<Controller*> _controller;
 
@@ -81,9 +91,15 @@ private:
 	std::unique_ptr<Ui::FadeWrap<Ui::RpWidget>> _volume;
 	rpl::variable<const style::icon*> _volumeIcon;
 	std::unique_ptr<Ui::RpWidget> _privacy;
+	QRect _privacyBadgeGeometry;
 	std::optional<HeaderData> _data;
+	std::unique_ptr<Ui::ImportantTooltip> _tooltip = { nullptr };
+	rpl::variable<bool> _tooltipShown = false;
+	QRect _contentGeometry;
+	Tooltip _tooltipType = {};
 	base::Timer _dateUpdateTimer;
 	bool _ignoreWindowMove = false;
+	bool _privacyBadgeOver = false;
 
 };
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index d463e8adc..2a855721c 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -891,3 +891,18 @@ storiesVolumeSlider: MediaSlider {
 	seekSize: size(12px, 12px);
 	duration: mediaviewOverDuration;
 }
+storiesInfoTooltipLabel: FlatLabel(defaultImportantTooltipLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+		linkFont: font(11px);
+		linkFontOver: font(11px underline);
+	}
+	minWidth: 36px;
+}
+storiesInfoTooltip: ImportantTooltip(defaultImportantTooltip) {
+	bg: importantTooltipBg;
+	padding: margins(10px, 3px, 10px, 5px);
+	radius: 4px;
+	arrow: 4px;
+}
+storiesInfoTooltipMaxWidth: 360px;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ad852f0f4..bd1e8f7c4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ad852f0f4ab271de4db799d01fa8b7032eb33b11
+Subproject commit bd1e8f7c47c3e99493adf9653d684c86a0a51941

From 4e109e0517facc06f00af1d70e6c2df83d58bc7b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 01:15:32 +0300
Subject: [PATCH 490/676] Added support build of dav1d on arm machines.

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

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 8b8bfd1d3..a8f611a8c 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -520,7 +520,7 @@ mac:
 """)
 
 stage('mozjpeg', """
-    git clone -b v4.0.3 https://github.com/mozilla/mozjpeg.git
+    git clone -b v4.1.3 https://github.com/mozilla/mozjpeg.git
     cd mozjpeg
 win:
     cmake . ^
@@ -675,13 +675,31 @@ stage('dav1d', """
 win:
     git clone -b 1.2.1 --depth 1 https://code.videolan.org/videolan/dav1d.git
     cd dav1d
+
+    if "%X8664%" equ "x64" (
+        SET "TARGET=x86_64"
+    ) else (
+        SET "TARGET=x86"
+    )
+    set FILE=cross-file.txt
+    echo [binaries] > %FILE%
+    echo c = 'cl' >> %FILE%
+    echo cpp = 'cl' >> %FILE%
+    echo ar = 'lib' >> %FILE%
+    echo windres = 'rc' >> %FILE%
+    echo [host_machine] >> %FILE%
+    echo system = 'windows' >> %FILE%
+    echo cpu_family = '%TARGET%' >> %FILE%
+    echo cpu = '%TARGET%' >> %FILE%
+    echo endian = 'little'>> %FILE%
+
 depends:python/Scripts/activate.bat
     %THIRDPARTY_DIR%\\python\\Scripts\\activate.bat
-    meson setup --prefix %LIBS_DIR%/local --default-library=static --buildtype=debug -Denable_tools=false -Denable_tests=false -Db_vscrt=mtd builddir-debug
+    meson setup --cross-file %FILE% --prefix %LIBS_DIR%/local --default-library=static --buildtype=debug -Denable_tools=false -Denable_tests=false -Db_vscrt=mtd builddir-debug
     meson compile -C builddir-debug
     meson install -C builddir-debug
 release:
-    meson setup --prefix %LIBS_DIR%/local --default-library=static --buildtype=release -Denable_tools=false -Denable_tests=false -Db_vscrt=mt builddir-release
+    meson setup --cross-file %FILE% --prefix %LIBS_DIR%/local --default-library=static --buildtype=release -Denable_tools=false -Denable_tests=false -Db_vscrt=mt builddir-release
     meson compile -C builddir-release
     meson install -C builddir-release
 win:

From 39f494eaddef588d47072d64a5b205a3498bb626 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 17:14:15 +0300
Subject: [PATCH 491/676] Removed display of right buttons in message field
 while editing message.

---
 .../SourceFiles/history/history_widget.cpp    | 34 +++++++++++++------
 .../view/controls/history_view_ttl_button.cpp |  8 +++++
 .../view/controls/history_view_ttl_button.h   |  2 ++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 25abe7428..321c1227c 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2852,10 +2852,10 @@ void HistoryWidget::updateControlsVisibility() {
 			_silent->setVisible(!_editMsgId);
 		}
 		if (_scheduled) {
-			_scheduled->show();
+			_scheduled->setVisible(!_editMsgId);
 		}
 		if (_ttlInfo) {
-			_ttlInfo->show();
+			_ttlInfo->setVisible(!_editMsgId);
 		}
 		if (_sendAs) {
 			_sendAs->show();
@@ -5010,19 +5010,33 @@ void HistoryWidget::moveFieldControls() {
 }
 
 void HistoryWidget::updateFieldSize() {
-	auto kbShowShown = _history && !_kbShown && _keyboard->hasMarkup();
+	const auto kbShowShown = _history && !_kbShown && _keyboard->hasMarkup();
 	auto fieldWidth = width()
 		- _attachToggle->width()
 		- st::historySendRight
 		- _send->width()
 		- _tabbedSelectorToggle->width();
-	if (_botMenuButton) fieldWidth -= st::historyBotMenuSkip + _botMenuButton->width();
-	if (_sendAs) fieldWidth -= _sendAs->width();
-	if (kbShowShown) fieldWidth -= _botKeyboardShow->width();
-	if (_cmdStartShown) fieldWidth -= _botCommandStart->width();
-	if (_silent && !_silent->isHidden()) fieldWidth -= _silent->width();
-	if (_scheduled) fieldWidth -= _scheduled->width();
-	if (_ttlInfo) fieldWidth -= _ttlInfo->width();
+	if (_botMenuButton) {
+		fieldWidth -= st::historyBotMenuSkip + _botMenuButton->width();
+	}
+	if (_sendAs) {
+		fieldWidth -= _sendAs->width();
+	}
+	if (kbShowShown) {
+		fieldWidth -= _botKeyboardShow->width();
+	}
+	if (_cmdStartShown) {
+		fieldWidth -= _botCommandStart->width();
+	}
+	if (_silent && _silent->isVisible()) {
+		fieldWidth -= _silent->width();
+	}
+	if (_scheduled && _scheduled->isVisible()) {
+		fieldWidth -= _scheduled->width();
+	}
+	if (_ttlInfo && _ttlInfo->isVisible()) {
+		fieldWidth -= _ttlInfo->width();
+	}
 
 	if (_fieldDisabled) {
 		_fieldDisabled->resize(fieldWidth, fieldHeight());
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
index 945253ec6..f7e15f5e5 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
@@ -50,6 +50,14 @@ void TTLButton::hide() {
 	_button.hide();
 }
 
+void TTLButton::setVisible(bool visible) {
+	_button.setVisible(visible);
+}
+
+bool TTLButton::isVisible() const {
+	return _button.isVisible();
+}
+
 void TTLButton::move(int x, int y) {
 	_button.move(x, y);
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.h b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.h
index dbdc50a9f..16098aa6e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.h
@@ -28,6 +28,8 @@ public:
 
 	void show();
 	void hide();
+	void setVisible(bool visible);
+	[[nodiscard]] bool isVisible() const;
 	void move(int x, int y);
 
 	[[nodiscard]] int width() const;

From 6d69a78a0572181348474f5cd905d4239eec09f2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 17:51:22 +0300
Subject: [PATCH 492/676] Fixed width updating of message field with hidden
 right buttons.

---
 .../SourceFiles/history/history_widget.cpp    | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 321c1227c..cc9e0d0e4 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2848,14 +2848,35 @@ void HistoryWidget::updateControlsVisibility() {
 		if (_botMenuButton) {
 			_botMenuButton->show();
 		}
-		if (_silent) {
-			_silent->setVisible(!_editMsgId);
-		}
-		if (_scheduled) {
-			_scheduled->setVisible(!_editMsgId);
-		}
-		if (_ttlInfo) {
-			_ttlInfo->setVisible(!_editMsgId);
+		{
+			auto rightButtonsChanged = false;
+			if (_silent) {
+				const auto was = _silent->isVisible();
+				const auto now = (!_editMsgId);
+				if (was != now) {
+					_silent->setVisible(now);
+					rightButtonsChanged = true;
+				}
+			}
+			if (_scheduled) {
+				const auto was = _scheduled->isVisible();
+				const auto now = (!_editMsgId);
+				if (was != now) {
+					_scheduled->setVisible(now);
+					rightButtonsChanged = true;
+				}
+			}
+			if (_ttlInfo) {
+				const auto was = _ttlInfo->isVisible();
+				const auto now = (!_editMsgId);
+				if (was != now) {
+					_ttlInfo->setVisible(now);
+					rightButtonsChanged = true;
+				}
+			}
+			if (rightButtonsChanged) {
+				updateFieldSize();
+			}
 		}
 		if (_sendAs) {
 			_sendAs->show();

From 3a472d1b900c4eb56127c800b60983781ca22fca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 18:38:08 +0300
Subject: [PATCH 493/676] Removed first animation from radio button in premium
 graphics.

---
 Telegram/SourceFiles/boxes/gift_premium_box.cpp      | 7 ++++---
 Telegram/SourceFiles/settings/settings_premium.cpp   | 7 ++++---
 Telegram/SourceFiles/ui/effects/premium_graphics.cpp | 4 ++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 199ee4cad..6720339c2 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -156,14 +156,15 @@ void GiftBox(
 
 	// List.
 	const auto group = std::make_shared<Ui::RadiobuttonGroup>();
-	group->setChangedCallback([=](int value) {
+	const auto groupValueChangedCallback = [=](int value) {
 		Expects(value < options.size() && value >= 0);
 		auto text = tr::lng_premium_gift_button(
 			tr::now,
 			lt_cost,
 			options[value].costTotal);
 		state->buttonText.fire(std::move(text));
-	});
+	};
+	group->setChangedCallback(groupValueChangedCallback);
 	Ui::Premium::AddGiftOptions(
 		buttonsParent,
 		group,
@@ -215,7 +216,7 @@ void GiftBox(
 	});
 	box->addButton(std::move(button));
 
-	group->setValue(0);
+	groupValueChangedCallback(0);
 
 	Data::PeerPremiumValue(
 		user
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 82d4e4801..2b359b984 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -1653,7 +1653,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 	} else {
 #endif
 	{
-		_radioGroup->setChangedCallback([=](int value) {
+		const auto callback = [=](int value) {
 			const auto options =
 				_controller->session().api().premium().subscriptionOptions();
 			if (options.empty()) {
@@ -1665,8 +1665,9 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 				lt_cost,
 				options[value].costPerMonth);
 			_buttonText = std::move(text);
-		});
-		_radioGroup->setValue(0);
+		};
+		_radioGroup->setChangedCallback(callback);
+		callback(0);
 	}
 
 	_showFinished.events(
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 2e9972257..a7ce3f922 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -1138,6 +1138,10 @@ void AddGiftOptions(
 			stCheckbox,
 			std::move(radioView));
 		radio->setAttribute(Qt::WA_TransparentForMouseEvents);
+		{ // Paint the last frame instantly for the layer animation.
+			group->setValue(0);
+			radio->finishAnimating();
+		}
 
 		row->sizeValue(
 		) | rpl::start_with_next([=, margins = stCheckbox.margin](

From 65a344be76dc23ef77e649d1bc523f4e610ed34e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 20:02:46 +0300
Subject: [PATCH 494/676] Added phrase for personal photo to short info box.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../boxes/peers/peer_short_info_box.cpp       | 51 +++++++++++++++----
 .../boxes/peers/peer_short_info_box.h         |  4 ++
 .../boxes/peers/prepare_short_info_box.cpp    |  5 ++
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 85149cb42..cb98565ea 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1143,6 +1143,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_shared_links#other" = "{count} shared links";
 "lng_profile_copy_phone" = "Copy Phone Number";
 "lng_profile_copy_fullname" = "Copy Name";
+"lng_profile_photo_by_you" = "photo set by you";
 
 "lng_via_link_group_one" = "**{user}** restricts adding them to groups.\nYou can send them an invite link as message instead.";
 "lng_via_link_group_many#one" = "**{count} user** restricts adding them to groups.\nYou can send them an invite link as message instead.";
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index 1bf236db1..5d8e93901 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -105,6 +105,7 @@ PeerShortInfoCover::PeerShortInfoCover(
 		userpic
 	) | rpl::start_with_next([=](PeerShortInfoUserpic &&value) {
 		applyUserpic(std::move(value));
+		applyAdditionalStatus(value.additionalStatus);
 	}, lifetime());
 
 	style::PaletteChanged(
@@ -136,16 +137,7 @@ PeerShortInfoCover::PeerShortInfoCover(
 		return base::EventFilterResult::Cancel;
 	});
 
-	_name->moveToLeft(
-		_st.namePosition.x(),
-		_st.size - _st.namePosition.y() - _name->height(),
-		_st.size);
-	_status->moveToLeft(
-		_st.statusPosition.x(),
-		(_st.size
-			- _st.statusPosition.y()
-			- _status->height()),
-		_st.size);
+	refreshLabelsGeometry();
 
 	_roundedTopImage = QImage(
 		QSize(_st.size, _st.radius) * style::DevicePixelRatio(),
@@ -415,6 +407,23 @@ QImage PeerShortInfoCover::currentVideoFrame() const {
 		: QImage();
 }
 
+void PeerShortInfoCover::applyAdditionalStatus(const QString &status) {
+	if (status.isEmpty()) {
+		if (_additionalStatus) {
+			_additionalStatus.destroy();
+			refreshLabelsGeometry();
+		}
+		return;
+	}
+	if (_additionalStatus) {
+		_additionalStatus->setText(status);
+	} else {
+		_additionalStatus.create(_widget.get(), status, _statusStyle->st);
+		_additionalStatus->show();
+		refreshLabelsGeometry();
+	}
+}
+
 void PeerShortInfoCover::applyUserpic(PeerShortInfoUserpic &&value) {
 	if (_index != value.index) {
 		_index = value.index;
@@ -593,6 +602,28 @@ void PeerShortInfoCover::refreshBarImages() {
 	_barLarge = makeBar(_largeWidth);
 }
 
+void PeerShortInfoCover::refreshLabelsGeometry() {
+	const auto statusTop = _st.size
+		- _st.statusPosition.y()
+		- _status->height();
+	const auto diff = _st.namePosition.y()
+		- _name->height()
+		- _st.statusPosition.y();
+	if (_additionalStatus) {
+		_additionalStatus->moveToLeft(
+			_status->x(),
+			statusTop - diff - _additionalStatus->height());
+	}
+	_name->moveToLeft(
+		_st.namePosition.x(),
+		_st.size
+			- _st.namePosition.y()
+			- _name->height()
+			- (_additionalStatus ? (diff + _additionalStatus->height()) : 0),
+		_st.size);
+	_status->moveToLeft(_st.statusPosition.x(), statusTop, _st.size);
+}
+
 QRect PeerShortInfoCover::radialRect() const {
 	const auto cover = _widget->rect();
 	const auto size = st::boxLoadingSize;
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
index 07e60132a..0e130562d 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
@@ -50,6 +50,7 @@ struct PeerShortInfoUserpic {
 	float64 photoLoadingProgress = 0.;
 	std::shared_ptr<Media::Streaming::Document> videoDocument;
 	crl::time videoStartPosition = 0;
+	QString additionalStatus;
 };
 
 class PeerShortInfoCover final {
@@ -87,6 +88,7 @@ private:
 	[[nodiscard]] QImage currentVideoFrame() const;
 
 	void applyUserpic(PeerShortInfoUserpic &&value);
+	void applyAdditionalStatus(const QString &status);
 	[[nodiscard]] QRect radialRect() const;
 
 	void videoWaiting();
@@ -99,6 +101,7 @@ private:
 	void updateRadialState();
 	void refreshCoverCursor();
 	void refreshBarImages();
+	void refreshLabelsGeometry();
 
 	const style::ShortInfoCover &_st;
 
@@ -108,6 +111,7 @@ private:
 	object_ptr<Ui::FlatLabel> _name;
 	std::unique_ptr<CustomLabelStyle> _statusStyle;
 	object_ptr<Ui::FlatLabel> _status;
+	object_ptr<Ui::FlatLabel> _additionalStatus = { nullptr };
 
 	std::array<QImage, 4> _roundMask;
 	QImage _userpicImage;
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index 8baf378b5..9965e8810 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -335,6 +335,11 @@ bool ProcessCurrent(
 		: state->photoView
 		? state->photoView->owner().get()
 		: nullptr;
+	state->current.additionalStatus = ((state->photoId == userpicPhotoId)
+			&& peer->isUser()
+			&& peer->asUser()->hasPersonalPhoto())
+		? tr::lng_profile_photo_by_you(tr::now)
+		: QString();
 	state->waitingLoad = false;
 	if (!changedPhotoId
 		&& (state->current.index > 0 || !changedUserpic)

From fce8bc62013edb37422ef28cce327f544dbb8675 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 21:42:13 +0400
Subject: [PATCH 495/676] Add stories-above-chats-list tooltip.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/calls/calls.style        |   8 +-
 Telegram/SourceFiles/core/core_settings.cpp   |  12 +-
 Telegram/SourceFiles/core/core_settings.h     |   7 +
 Telegram/SourceFiles/dialogs/dialogs.style    |   3 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   9 +
 .../dialogs/ui/dialogs_stories_list.cpp       | 209 +++++++++++++++++-
 .../dialogs/ui/dialogs_stories_list.h         |  17 ++
 .../media/stories/media_stories_header.cpp    |   2 +-
 .../media/stories/media_stories_header.h      |   2 +-
 .../SourceFiles/media/view/media_view.style   |  16 +-
 Telegram/lib_ui                               |   2 +-
 12 files changed, 256 insertions(+), 32 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index cb98565ea..5e7f85bc6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3841,6 +3841,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_about_close_friends_my" = "Only your list of **Close Friends** can view this story.";
 "lng_stories_about_contacts_my" = "Only your contacts can view this story.";
 "lng_stories_about_selected_contacts_my" = "Only some contacts you selected can view this story.";
+"lng_stories_click_to_view_mine" = "Click here to view your story.";
 "lng_stories_click_to_view" = "Click here to view updates from {users}.";
 "lng_stories_click_to_view_and_one" = "{accumulated}, {user}";
 "lng_stories_click_to_view_and_last" = "{accumulated} and {user}";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index c8f287328..2791724dd 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -1338,13 +1338,7 @@ groupCallNiceTooltip: ImportantTooltip(defaultImportantTooltip) {
 	radius: 4px;
 	arrow: 4px;
 }
-groupCallNiceTooltipLabel: FlatLabel(defaultImportantTooltipLabel) {
-	style: TextStyle(defaultTextStyle) {
-		font: font(11px);
-		linkFont: font(11px);
-		linkFontOver: font(11px underline);
-	}
-}
+groupCallNiceTooltipLabel: defaultImportantTooltipLabel;
 groupCallStickedTooltip: ImportantTooltip(groupCallNiceTooltip) {
 	padding: margins(10px, 1px, 6px, 3px);
 }
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index d1e9bfb5a..cef0bd2e8 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -200,7 +200,8 @@ QByteArray Settings::serialize() const {
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(mediaViewPosition)
 		+ sizeof(qint32)
-		+ sizeof(quint64);
+		+ sizeof(quint64)
+		+ sizeof(qint32);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -334,7 +335,8 @@ QByteArray Settings::serialize() const {
 			<< qint32(_windowTitleContent.current().hideTotalUnread ? 1 : 0)
 			<< mediaViewPosition
 			<< qint32(_ignoreBatterySaving.current() ? 1 : 0)
-			<< quint64(_macRoundIconDigest.value_or(0));
+			<< quint64(_macRoundIconDigest.value_or(0))
+			<< qint32(_storiesClickTooltipHidden.current() ? 1 : 0);
 	}
 	return result;
 }
@@ -440,6 +442,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	QByteArray mediaViewPosition;
 	qint32 ignoreBatterySaving = _ignoreBatterySaving.current() ? 1 : 0;
 	quint64 macRoundIconDigest = _macRoundIconDigest.value_or(0);
+	qint32 storiesClickTooltipHidden = _storiesClickTooltipHidden.current() ? 1 : 0;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -674,6 +677,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> macRoundIconDigest;
 	}
+	if (!stream.atEnd()) {
+		stream >> storiesClickTooltipHidden;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -865,6 +871,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	}
 	_ignoreBatterySaving = (ignoreBatterySaving == 1);
 	_macRoundIconDigest = macRoundIconDigest ? macRoundIconDigest : std::optional<uint64>();
+	_storiesClickTooltipHidden = (storiesClickTooltipHidden == 1);
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1155,6 +1162,7 @@ void Settings::resetOnLastLogout() {
 	_tabbedReplacedWithInfo = false; // per-window
 	_systemDarkModeEnabled = false;
 	_hiddenGroupCallTooltips = 0;
+	_storiesClickTooltipHidden = 0;
 
 	_recentEmojiPreload.clear();
 	_recentEmoji.clear();
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 111bf6c80..aec34560c 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -802,6 +802,12 @@ public:
 	[[nodiscard]] std::optional<uint64> macRoundIconDigest() const {
 		return _macRoundIconDigest;
 	}
+	[[nodiscard]] rpl::producer<bool> storiesClickTooltipHiddenValue() const {
+		return _storiesClickTooltipHidden.value();
+	}
+	void setStoriesClickTooltipHidden(bool value) {
+		_storiesClickTooltipHidden = value;
+	}
 
 	[[nodiscard]] static bool ThirdColumnByDefault();
 	[[nodiscard]] static float64 DefaultDialogsWidthRatio();
@@ -923,6 +929,7 @@ private:
 	WindowPosition _mediaViewPosition = { .maximized = 2 };
 	rpl::variable<bool> _ignoreBatterySaving = false;
 	std::optional<uint64> _macRoundIconDigest;
+	rpl::variable<bool> _storiesClickTooltipHidden = false;
 
 	bool _tabbedReplacedWithInfo = false; // per-window
 	rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index c824b8219..0e877db81 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -562,3 +562,6 @@ dialogsStoriesListInfo: DialogsStoriesList(dialogsStoriesList) {
 dialogsStoriesListMine: DialogsStoriesList(dialogsStoriesListInfo) {
 	readOpacity: 1.;
 }
+dialogsStoriesTooltip: defaultImportantTooltip;
+dialogsStoriesTooltipLabel: defaultImportantTooltipLabel;
+dialogsStoriesTooltipMaxWidth: 200px;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 1b696ae8d..e2fb50534 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -798,6 +798,15 @@ void Widget::setupStories() {
 		_scroll->viewportEvent(e);
 	}, _stories->lifetime());
 
+	const auto hideTooltip = [=] {
+		Core::App().settings().setStoriesClickTooltipHidden(true);
+		Core::App().saveSettingsDelayed();
+	};
+	_stories->setShowTooltip(
+		Core::App().settings().storiesClickTooltipHiddenValue(
+		) | rpl::map(!rpl::mappers::_1),
+		hideTooltip);
+
 	_storiesContents.fire(Stories::ContentForSession(
 		&controller()->session(),
 		Data::StorySourcesList::NotHidden));
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index c3a9ddda3..da710848b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -7,14 +7,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/dialogs_stories_list.h"
 
+#include "base/event_filter.h"
+#include "base/qt_signal_producer.h"
 #include "lang/lang_keys.h"
 #include "ui/effects/outline_segments.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
 
 #include <QtWidgets/QApplication>
+#include <QtGui/QWindow>
 
 #include "base/debug_log.h"
 
@@ -27,6 +33,7 @@ constexpr auto kExpandAfterRatio = 0.72;
 constexpr auto kCollapseAfterRatio = 0.68;
 constexpr auto kFrictionRatio = 0.15;
 constexpr auto kExpandCatchUpDuration = crl::time(200);
+constexpr auto kMaxTooltipNames = 3;
 
 [[nodiscard]] int AvailableNameWidth(const style::DialogsStoriesList &st) {
 	const auto &full = st.full;
@@ -112,6 +119,7 @@ void List::showContent(Content &&content) {
 			_data.items.emplace_back(Item{ .element = element });
 		}
 	}
+	_lastCollapsedGeometry = {};
 	if (int(_data.items.size()) != wasCount) {
 		updateGeometry();
 	}
@@ -120,6 +128,8 @@ void List::showContent(Content &&content) {
 	if (!wasCount) {
 		_empty = false;
 	}
+	_tooltipText = computeTooltipText();
+	updateTooltipGeometry();
 }
 
 void List::updateScrollMax() {
@@ -162,10 +172,16 @@ void List::requestExpanded(bool expanded) {
 		const auto from = _expanded ? 0. : 1.;
 		const auto till = _expanded ? 2. : 0.;
 		const auto duration = (_expanded ? 2 : 1) * st::slideWrapDuration;
+		if (!isHidden() && _expanded) {
+			toggleTooltip(false);
+		}
 		_expandedAnimation.start([=] {
 			checkForFullState();
 			update();
 			_collapsedGeometryChanged.fire({});
+			if (!isHidden() && !_expandedAnimation.animating()) {
+				toggleTooltip(false);
+			}
 		}, from, till, duration, anim::sineInOut);
 	}
 	_toggleExpandedRequests.fire_copy(_expanded);
@@ -179,6 +195,12 @@ void List::resizeEvent(QResizeEvent *e) {
 	updateScrollMax();
 }
 
+void List::updateExpanding() {
+	updateExpanding(
+		_lastExpandedHeight * _expandCatchUpAnimation.value(1.),
+		_st.full.height);
+}
+
 void List::updateExpanding(int expandingHeight, int expandedHeight) {
 	Expects(!expandingHeight || expandedHeight > 0);
 
@@ -196,12 +218,10 @@ void List::updateExpanding(int expandingHeight, int expandedHeight) {
 	if (change) {
 		requestExpanded(!_expanded);
 	}
+	updateTooltipGeometry();
 }
 
 List::Layout List::computeLayout() {
-	updateExpanding(
-		_lastExpandedHeight * _expandCatchUpAnimation.value(1.),
-		_st.full.height);
 	return computeLayout(_expandedAnimation.value(_expanded ? 2. : 0.));
 }
 
@@ -678,6 +698,9 @@ void List::mousePressEvent(QMouseEvent *e) {
 		return;
 	} else if (_state == State::Small) {
 		requestExpanded(true);
+		if (const auto onstack = _tooltipHide) {
+			onstack();
+		}
 		return;
 	} else if (_state != State::Full) {
 		return;
@@ -757,6 +780,7 @@ void List::setExpandedHeight(int height, bool momentum) {
 	} else if (!momentum && _expandIgnored && height > 0) {
 		_expandIgnored = false;
 		_expandCatchUpAnimation.start([=] {
+			updateExpanding();
 			update();
 			checkForFullState();
 		}, 0., 1., kExpandCatchUpDuration);
@@ -764,6 +788,7 @@ void List::setExpandedHeight(int height, bool momentum) {
 		_expandCatchUpAnimation.stop();
 	}
 	_lastExpandedHeight = height;
+	updateExpanding();
 	if (!checkForFullState()) {
 		setState(!height ? State::Small : State::Changing);
 	}
@@ -784,17 +809,177 @@ void List::setLayoutConstraints(
 		QPoint positionSmall,
 		style::align alignSmall,
 		QRect geometryFull) {
+	if (_positionSmall == positionSmall
+		&& _alignSmall == alignSmall
+		&& _geometryFull == geometryFull) {
+		return;
+	}
 	_positionSmall = positionSmall;
 	_alignSmall = alignSmall;
 	_geometryFull = geometryFull;
+	_lastCollapsedGeometry = {};
 	updateGeometry();
 	update();
 }
 
+TextWithEntities List::computeTooltipText() const {
+	const auto &list = _data.items;
+	if (list.empty()) {
+		return {};
+	} else if (list.size() == 1 && list.front().element.skipSmall) {
+		return { tr::lng_stories_click_to_view_mine(tr::now) };
+	}
+	auto names = QStringList();
+	for (const auto &item : list) {
+		if (item.element.skipSmall) {
+			continue;
+		}
+		names.append(item.element.name);
+		if (names.size() >= kMaxTooltipNames) {
+			break;
+		}
+	}
+	auto sequence = Ui::Text::Bold(names.front());
+	if (names.size() > 1) {
+		for (auto i = 1; i + 1 != names.size(); ++i) {
+			sequence = tr::lng_stories_click_to_view_and_one(
+				tr::now,
+				lt_accumulated,
+				sequence,
+				lt_user,
+				Ui::Text::Bold(names[i]),
+				Ui::Text::WithEntities);
+		}
+		sequence = tr::lng_stories_click_to_view_and_last(
+			tr::now,
+			lt_accumulated,
+			sequence,
+			lt_user,
+			Ui::Text::Bold(names.back()),
+			Ui::Text::WithEntities);
+	}
+	return tr::lng_stories_click_to_view(
+		tr::now,
+		lt_users,
+		sequence,
+		Ui::Text::WithEntities);
+}
+
+void List::setShowTooltip(rpl::producer<bool> shown, Fn<void()> hide) {
+	_tooltip = nullptr;
+	_tooltipHide = std::move(hide);
+	_tooltipNotHidden = std::move(shown);
+	_tooltipText = computeTooltipText();
+	const auto window = this->window();
+	const auto notEmpty = [](const TextWithEntities &text) {
+		return !text.empty();
+	};
+	_tooltip = std::make_unique<Ui::ImportantTooltip>(
+		window,
+		Ui::MakeNiceTooltipLabel(
+			window,
+			_tooltipText.value() | rpl::filter(notEmpty),
+			st::dialogsStoriesTooltipMaxWidth,
+			st::dialogsStoriesTooltipLabel),
+		st::dialogsStoriesTooltip);
+	const auto tooltip = _tooltip.get();
+	const auto weak = QPointer<QWidget>(tooltip);
+	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
+	tooltip->toggleFast(false);
+	updateTooltipGeometry();
+
+	const auto handle = window->windowHandle();
+	auto windowActive = rpl::single(
+		handle->isActive()
+	) | rpl::then(base::qt_signal_producer(
+		handle,
+		&QWindow::activeChanged
+	) | rpl::map([=] {
+		return handle->isActive();
+	})) | rpl::distinct_until_changed();
+
+	for (auto parent = parentWidget()
+		; parent != window
+		; parent = parent->parentWidget()) {
+		using namespace base;
+		install_event_filter(parent, tooltip, [=](not_null<QEvent*> e) {
+			if (e->type() == QEvent::Move) {
+				updateTooltipGeometry();
+			}
+			return EventFilterResult::Continue;
+		});
+	}
+
+	rpl::combine(
+		_tooltipNotHidden.value(),
+		_tooltipText.value() | rpl::map(
+			notEmpty
+		) | rpl::distinct_until_changed(),
+		std::move(windowActive)
+	) | rpl::start_with_next([=](bool, bool, bool active) {
+		_tooltipWindowActive = active;
+		if (!isHidden()) {
+			toggleTooltip(false);
+		}
+	}, tooltip->lifetime());
+
+	shownValue(
+	) | rpl::skip(1) | rpl::start_with_next([=](bool shown) {
+		toggleTooltip(true);
+	}, tooltip->lifetime());
+}
+
+void List::toggleTooltip(bool fast) {
+	const auto shown = !_expanded
+		&& !_expandedAnimation.animating()
+		&& !isHidden()
+		&& _tooltipNotHidden.current()
+		&& !_tooltipText.current().empty()
+		&& window()->windowHandle()->isActive();
+	if (shown) {
+		updateTooltipGeometry();
+	}
+	if (fast) {
+		_tooltip->toggleFast(shown);
+	} else {
+		_tooltip->toggleAnimated(shown);
+	}
+}
+
+void List::updateTooltipGeometry() {
+	if (!_tooltip || _expanded || _expandedAnimation.animating()) {
+		return;
+	}
+	const auto collapsed = collapsedGeometryCurrent();
+	if (collapsed.geometry.isEmpty()) {
+		int a = 0;
+	}
+	const auto geometry = Ui::MapFrom(
+		window(),
+		parentWidget(),
+		QRect(
+			collapsed.geometry.x(),
+			collapsed.geometry.y(),
+			int(std::ceil(collapsed.singleWidth)),
+			collapsed.geometry.height()));
+	const auto weak = QPointer<QWidget>(_tooltip.get());
+	const auto countPosition = [=](QSize size) {
+		return QPoint(
+			geometry.x() + (geometry.width() - size.width()) / 2,
+			geometry.y() + geometry.height());
+	};
+	_tooltip->pointAt(geometry, RectPart::Bottom, countPosition);
+}
+
 List::CollapsedGeometry List::collapsedGeometryCurrent() const {
 	const auto expanded = _expandedAnimation.value(_expanded ? 2. : 0.);
 	if (expanded >= 1.) {
-		return { QRect(), 1. };
+		const auto single = 2 * _st.full.photoLeft + _st.full.photo;
+		return { QRect(), 1., float64(single) };
+	} else if (_lastCollapsedRatio == _lastRatio
+		&& _lastCollapsedGeometry.expanded == expanded
+		&& !_lastCollapsedGeometry.geometry.isEmpty()) {
+		return _lastCollapsedGeometry;
 	}
 	const auto layout = computeLayout(0.);
 	const auto small = countSmallGeometry();
@@ -803,10 +988,21 @@ List::CollapsedGeometry List::collapsedGeometryCurrent() const {
 	const auto left = int(base::SafeRound(
 		shift + layout.left + layout.single * index));
 	const auto width = small.x() + small.width() - left;
-	return {
-		QRect(left, small.y(), width, small.height()),
+	const auto photoTopSmall = _st.small.photoTop;
+	const auto photoTop = photoTopSmall
+		+ (_st.full.photoTop - photoTopSmall) * layout.expandedRatio;
+	const auto ySmall = photoTopSmall
+		+ ((photoTop - photoTopSmall) * kSmallThumbsShown / 0.5);
+	const auto photo = _st.small.photo
+		+ (_st.full.photo - _st.small.photo) * layout.ratio;
+	const auto top = y() + layout.geometryShift.y();
+	_lastCollapsedRatio = _lastRatio;
+	_lastCollapsedGeometry = {
+		QRect(left, top, width, ySmall + photo + _st.full.photoTop),
 		expanded,
+		layout.photoLeft * 2 + photo,
 	};
+	return _lastCollapsedGeometry;
 }
 
 rpl::producer<> List::collapsedGeometryChanged() const {
@@ -822,6 +1018,7 @@ void List::updateGeometry() {
 	} break;
 	case State::Full: setGeometry(_geometryFull);
 	}
+	updateTooltipGeometry();
 	update();
 }
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 3182d7229..9ecf28394 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -23,6 +23,7 @@ struct DialogsStoriesList;
 namespace Ui {
 class PopupMenu;
 struct OutlineSegment;
+class ImportantTooltip;
 } // namespace Ui
 
 namespace Dialogs::Stories {
@@ -72,9 +73,11 @@ public:
 		QPoint positionSmall,
 		style::align alignSmall,
 		QRect geometryFull = QRect());
+	void setShowTooltip(rpl::producer<bool> shown, Fn<void()> hide);
 	struct CollapsedGeometry {
 		QRect geometry;
 		float64 expanded = 0.;
+		float64 singleWidth = 0.;
 	};
 	[[nodiscard]] CollapsedGeometry collapsedGeometryCurrent() const;
 	[[nodiscard]] rpl::producer<> collapsedGeometryChanged() const;
@@ -142,10 +145,15 @@ private:
 	void checkLoadMore();
 	void requestExpanded(bool expanded);
 
+	void updateTooltipGeometry();
+	[[nodiscard]] TextWithEntities computeTooltipText() const;
+	void toggleTooltip(bool fast);
+
 	bool checkForFullState();
 	void setState(State state);
 	void updateGeometry();
 	[[nodiscard]] QRect countSmallGeometry() const;
+	void updateExpanding();
 	void updateExpanding(int expandingHeight, int expandedHeight);
 	void validateSegments(
 		not_null<Item*> item,
@@ -189,11 +197,20 @@ private:
 	bool _expandIgnored : 1 = false;
 	bool _expanded : 1 = false;
 
+	mutable CollapsedGeometry _lastCollapsedGeometry;
+	mutable float64 _lastCollapsedRatio = 0.;
+
 	int _selected = -1;
 	int _pressed = -1;
 
 	rpl::event_stream<not_null<QWheelEvent*>> _verticalScrollEvents;
 
+	rpl::variable<TextWithEntities> _tooltipText;
+	rpl::variable<bool> _tooltipNotHidden;
+	Fn<void()> _tooltipHide;
+	std::unique_ptr<Ui::ImportantTooltip> _tooltip;
+	bool _tooltipWindowActive = false;
+
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	base::has_weak_ptr _menuGuard;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 8da578b9b..ac85729ee 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -315,7 +315,7 @@ void Header::show(HeaderData data) {
 			raw,
 			rpl::single(data.user->isSelf()
 				? tr::lng_stories_my_name(tr::now)
-				: data.user->shortName()),
+				: data.user->name()),
 			st::storiesHeaderName);
 		_name->setAttribute(Qt::WA_TransparentForMouseEvents);
 		_name->setOpacity(kNameOpacity);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index 4c67526e2..c10df3ec2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -93,7 +93,7 @@ private:
 	std::unique_ptr<Ui::RpWidget> _privacy;
 	QRect _privacyBadgeGeometry;
 	std::optional<HeaderData> _data;
-	std::unique_ptr<Ui::ImportantTooltip> _tooltip = { nullptr };
+	std::unique_ptr<Ui::ImportantTooltip> _tooltip;
 	rpl::variable<bool> _tooltipShown = false;
 	QRect _contentGeometry;
 	Tooltip _tooltipType = {};
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 2a855721c..49eefe127 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -891,18 +891,6 @@ storiesVolumeSlider: MediaSlider {
 	seekSize: size(12px, 12px);
 	duration: mediaviewOverDuration;
 }
-storiesInfoTooltipLabel: FlatLabel(defaultImportantTooltipLabel) {
-	style: TextStyle(defaultTextStyle) {
-		font: font(11px);
-		linkFont: font(11px);
-		linkFontOver: font(11px underline);
-	}
-	minWidth: 36px;
-}
-storiesInfoTooltip: ImportantTooltip(defaultImportantTooltip) {
-	bg: importantTooltipBg;
-	padding: margins(10px, 3px, 10px, 5px);
-	radius: 4px;
-	arrow: 4px;
-}
+storiesInfoTooltipLabel: defaultImportantTooltipLabel;
+storiesInfoTooltip: defaultImportantTooltip;
 storiesInfoTooltipMaxWidth: 360px;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index bd1e8f7c4..8314fc9b3 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit bd1e8f7c47c3e99493adf9653d684c86a0a51941
+Subproject commit 8314fc9b3f292dd9921ef2bfa1c30bcfd2ed05ed

From 16117e56bb91c6775a224042322d832aab080c75 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 22:10:21 +0300
Subject: [PATCH 496/676] Added phrase for public photo to short info box.

---
 Telegram/Resources/langs/lang.strings                     | 1 +
 .../SourceFiles/boxes/peers/prepare_short_info_box.cpp    | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5e7f85bc6..15c8eff5f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1144,6 +1144,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_copy_phone" = "Copy Phone Number";
 "lng_profile_copy_fullname" = "Copy Name";
 "lng_profile_photo_by_you" = "photo set by you";
+"lng_profile_public_photo" = "public photo";
 
 "lng_via_link_group_one" = "**{user}** restricts adding them to groups.\nYou can send them an invite link as message instead.";
 "lng_via_link_group_many#one" = "**{count} user** restricts adding them to groups.\nYou can send them an invite link as message instead.";
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index 9965e8810..dfe8bdf72 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -335,10 +335,14 @@ bool ProcessCurrent(
 		: state->photoView
 		? state->photoView->owner().get()
 		: nullptr;
-	state->current.additionalStatus = ((state->photoId == userpicPhotoId)
-			&& peer->isUser()
+	state->current.additionalStatus = (!peer->isUser())
+		? QString()
+		: ((state->photoId == userpicPhotoId)
 			&& peer->asUser()->hasPersonalPhoto())
 		? tr::lng_profile_photo_by_you(tr::now)
+		: ((state->current.index == (state->current.count - 1))
+			&& SyncUserFallbackPhotoViewer(peer->asUser()))
+		? tr::lng_profile_public_photo(tr::now)
 		: QString();
 	state->waitingLoad = false;
 	if (!changedPhotoId

From 9a72b0511758e1a7e7706cf6be43a5191f3c2842 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 22:15:51 +0300
Subject: [PATCH 497/676] Removed left button from short info box with self.

---
 .../boxes/peers/peer_short_info_box.cpp          | 16 ++++++++++------
 .../boxes/peers/peer_short_info_box.h            |  1 +
 .../boxes/peers/prepare_short_info_box.cpp       |  4 +++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index 5d8e93901..bc07210f6 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -685,12 +685,16 @@ rpl::producer<int> PeerShortInfoBox::moveRequests() const {
 void PeerShortInfoBox::prepare() {
 	addButton(tr::lng_close(), [=] { closeBox(); });
 
-	// Perhaps a new lang key should be added for opening a group.
-	addLeftButton((_type == PeerShortInfoType::User)
-		? tr::lng_profile_send_message()
-		: (_type == PeerShortInfoType::Group)
-		? tr::lng_view_button_group()
-		: tr::lng_profile_view_channel(), [=] { _openRequests.fire({}); });
+	if (_type != PeerShortInfoType::Self) {
+		// Perhaps a new lang key should be added for opening a group.
+		addLeftButton(
+			(_type == PeerShortInfoType::User)
+				? tr::lng_profile_send_message()
+				: (_type == PeerShortInfoType::Group)
+				? tr::lng_view_button_group()
+				: tr::lng_profile_view_channel(),
+			[=] { _openRequests.fire({}); });
+	}
 
 	prepareRows();
 
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
index 0e130562d..bf59ff7aa 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
@@ -28,6 +28,7 @@ class RpWidget;
 } // namespace Ui
 
 enum class PeerShortInfoType {
+	Self,
 	User,
 	Group,
 	Channel,
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index dfe8bdf72..d71645316 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -431,7 +431,9 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 		Fn<void()> open,
 		Fn<bool()> videoPaused,
 		const style::ShortInfoBox *stOverride) {
-	const auto type = peer->isUser()
+	const auto type = peer->isSelf()
+		? PeerShortInfoType::Self
+		: peer->isUser()
 		? PeerShortInfoType::User
 		: peer->isBroadcast()
 		? PeerShortInfoType::Channel

From fd33fb4e7a0b234830aeb17a0f903bf66b0453af Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 23:09:11 +0300
Subject: [PATCH 498/676] Fixed style of input field in boxes from compose
 controls in media view.

---
 .../SourceFiles/chat_helpers/chat_helpers.style    |  2 ++
 .../controls/history_view_compose_controls.cpp     |  2 ++
 Telegram/SourceFiles/media/view/media_view.style   | 14 ++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 5c72090e0..b1b3583ac 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -204,6 +204,7 @@ ComposeControls {
 	record: RecordBar;
 	files: ComposeFiles;
 	premium: PremiumLimits;
+	boxField: InputField;
 }
 
 ReportBox {
@@ -1148,6 +1149,7 @@ defaultComposeControls: ComposeControls {
 	record: defaultRecordBar;
 	files: defaultComposeFiles;
 	premium: defaultPremiumLimits;
+	boxField: defaultInputField;
 }
 
 moreChatsBarHeight: 48px;
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 86d412b2a..93550ba66 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1663,6 +1663,8 @@ void ComposeControls::initField() {
 		}
 		return false;
 	});
+	_field->setEditLinkCallback(
+		DefaultEditLinkCallback(_show, _field, &_st.boxField));
 	initAutocomplete();
 	const auto allow = [=](const auto &) {
 		return _history && Data::AllowEmojiWithoutPremium(_history->peer);
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 49eefe127..dc74d145f 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -752,6 +752,20 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		statusFg: storiesComposeGrayText;
 	}
 	premium: storiesComposePremium;
+	boxField: InputField(defaultInputField) {
+		textBg: transparent;
+		textFg: groupCallMembersFg;
+
+		placeholderFg: groupCallMemberNotJoinedStatus;
+		placeholderFgActive: groupCallMemberNotJoinedStatus;
+		placeholderFgError: groupCallMemberNotJoinedStatus;
+
+		borderFg: inputBorderFg;
+		borderFgActive: groupCallMemberInactiveStatus;
+		borderFgError: activeLineFgError;
+
+		menu: storiesPopupMenu;
+	}
 }
 storiesViewsMenu: PopupMenu(storiesPopupMenuWithIcons) {
 	scrollPadding: margins(0px, 6px, 0px, 4px);

From 921aeb308372e372631418158b2a2c8fa62f2b3d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 24 Jul 2023 23:33:37 +0300
Subject: [PATCH 499/676] Removed display of all layers in media view on open
 story.

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

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index a5cf70746..b77eeafa3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -833,6 +833,7 @@ void Controller::show(
 		.video = (document != nullptr),
 		.silent = (document && document->isSilentVideo()),
 	});
+	uiShow()->hideLayer(anim::type::instant);
 	if (!changeShown(story)) {
 		return;
 	}

From 065eb8e63cbd3ea365dbbca5036d095d91f7d75a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 25 Jul 2023 02:10:44 +0300
Subject: [PATCH 500/676] Removed tabbing navigation from short info box.

---
 Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp | 3 +++
 Telegram/lib_base                                        | 2 +-
 2 files changed, 4 insertions(+), 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 bc07210f6..b1d6ab7b0 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "base/event_filter.h"
+#include "base/qt/qt_tab_key.h"
 #include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
@@ -670,6 +671,8 @@ PeerShortInfoBox::PeerShortInfoBox(
 	) | rpl::start_with_next([=] {
 		_cover.setScrollTop(_scroll->scrollTop());
 	}, _cover.lifetime());
+
+	base::DisableTabKey(this);
 }
 
 PeerShortInfoBox::~PeerShortInfoBox() = default;
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 2669a0457..77a89e3c8 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 2669a04579069942b6208a18abe93c26adfddf2a
+Subproject commit 77a89e3c857353acac83817e6ff354b962edb45c

From 57fc9f71acec646efd4f56d1c31ee0cf4940590c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 10:45:08 +0400
Subject: [PATCH 501/676] Fix some stories tooltip edge cases.

---
 Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp | 3 ---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp          | 6 ++++--
 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp | 9 +++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index b1d6ab7b0..bc07210f6 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "base/event_filter.h"
-#include "base/qt/qt_tab_key.h"
 #include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
@@ -671,8 +670,6 @@ PeerShortInfoBox::PeerShortInfoBox(
 	) | rpl::start_with_next([=] {
 		_cover.setScrollTop(_scroll->scrollTop());
 	}, _cover.lifetime());
-
-	base::DisableTabKey(this);
 }
 
 PeerShortInfoBox::~PeerShortInfoBox() = default;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e2fb50534..f6b506d0d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -803,8 +803,10 @@ void Widget::setupStories() {
 		Core::App().saveSettingsDelayed();
 	};
 	_stories->setShowTooltip(
-		Core::App().settings().storiesClickTooltipHiddenValue(
-		) | rpl::map(!rpl::mappers::_1),
+		rpl::combine(
+			Core::App().settings().storiesClickTooltipHiddenValue(),
+			shownValue(),
+			!rpl::mappers::_1 && rpl::mappers::_2),
 		hideTooltip);
 
 	_storiesContents.fire(Stories::ContentForSession(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index da710848b..83b73ec7d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -951,9 +951,6 @@ void List::updateTooltipGeometry() {
 		return;
 	}
 	const auto collapsed = collapsedGeometryCurrent();
-	if (collapsed.geometry.isEmpty()) {
-		int a = 0;
-	}
 	const auto geometry = Ui::MapFrom(
 		window(),
 		parentWidget(),
@@ -964,8 +961,12 @@ void List::updateTooltipGeometry() {
 			collapsed.geometry.height()));
 	const auto weak = QPointer<QWidget>(_tooltip.get());
 	const auto countPosition = [=](QSize size) {
+		const auto left = geometry.x()
+			+ (geometry.width() - size.width()) / 2;
+		const auto right = window()->width()
+			- st::dialogsStoriesTooltip.padding.right();
 		return QPoint(
-			geometry.x() + (geometry.width() - size.width()) / 2,
+			std::max(std::min(left, right - size.width()), 0),
 			geometry.y() + geometry.height());
 	};
 	_tooltip->pointAt(geometry, RectPart::Bottom, countPosition);

From b7ea9a283790199c84a21ee46e52eb6e0dd99bf9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 10:45:17 +0400
Subject: [PATCH 502/676] Block tab-focus inside a layer widget.

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 77a89e3c8..efd052594 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 77a89e3c857353acac83817e6ff354b962edb45c
+Subproject commit efd052594db9f3d85a2fbcba76db6fdecf226597
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 8314fc9b3..2f0ac3822 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 8314fc9b3f292dd9921ef2bfa1c30bcfd2ed05ed
+Subproject commit 2f0ac382289d0584002c007bdf2b3e4464f75b58

From 8cc90c3373811549c4bb50f8d1239c7d00f5f3f0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 12:30:52 +0400
Subject: [PATCH 503/676] Fix media viewer with MacBook top notch.

---
 .../stories/media_stories_controller.cpp      |   5 +-
 .../media/stories/media_stories_delegate.h    |   1 +
 .../media/view/media_view_overlay_opengl.cpp  |  27 ++++-
 .../media/view/media_view_overlay_raster.cpp  |  10 +-
 .../media/view/media_view_overlay_widget.cpp  | 101 ++++++++++++++----
 .../media/view/media_view_overlay_widget.h    |   5 +
 .../platform/mac/overlay_widget_mac.h         |   1 +
 .../platform/mac/overlay_widget_mac.mm        |   8 ++
 .../platform/platform_overlay_widget.h        |   3 +
 9 files changed, 135 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index b77eeafa3..384770741 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -388,6 +388,8 @@ void Controller::initLayout() {
 
 	_layout = _wrap->sizeValue(
 	) | rpl::map([=](QSize size) {
+		const auto topNotchSkip = _delegate->storiesTopNotchSkip();
+
 		size = QSize(
 			std::max(size.width(), st::mediaviewMinWidth),
 			std::max(size.height(), st::mediaviewMinHeight));
@@ -397,7 +399,8 @@ void Controller::initLayout() {
 			? HeaderLayout::Outside
 			: HeaderLayout::Normal;
 
-		const auto topSkip = st::storiesFieldMargin.bottom()
+		const auto topSkip = topNotchSkip
+			+ st::storiesFieldMargin.bottom()
 			+ (layout.headerLayout == HeaderLayout::Outside
 				? outsideHeaderHeight
 				: 0);
diff --git a/Telegram/SourceFiles/media/stories/media_stories_delegate.h b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
index ca663e69c..d1a06a52e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_delegate.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_delegate.h
@@ -64,6 +64,7 @@ public:
 	virtual void storiesVolumeToggle() = 0;
 	virtual void storiesVolumeChanged(float64 volume) = 0;
 	virtual void storiesVolumeChangeFinished() = 0;
+	[[nodiscard]] virtual int storiesTopNotchSkip() = 0;
 };
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 7174aef59..b3b26aeed 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -21,7 +21,8 @@ namespace {
 
 using namespace Ui::GL;
 
-constexpr auto kRadialLoadingOffset = 4;
+constexpr auto kNotchOffset = 4;
+constexpr auto kRadialLoadingOffset = kNotchOffset + 4;
 constexpr auto kThemePreviewOffset = kRadialLoadingOffset + 4;
 constexpr auto kDocumentBubbleOffset = kThemePreviewOffset + 4;
 constexpr auto kSaveMsgOffset = kDocumentBubbleOffset + 4;
@@ -129,7 +130,7 @@ OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 void OverlayWidget::RendererGL::init(
 		not_null<QOpenGLWidget*> widget,
 		QOpenGLFunctions &f) {
-	constexpr auto kQuads = 8;
+	constexpr auto kQuads = 9;
 	constexpr auto kQuadVertices = kQuads * 4;
 	constexpr auto kQuadValues = kQuadVertices * 4;
 	constexpr auto kControlsValues = kControlsCount * kControlValues;
@@ -291,6 +292,28 @@ bool OverlayWidget::RendererGL::handleHideWorkaround(QOpenGLFunctions &f) {
 
 void OverlayWidget::RendererGL::paintBackground() {
 	_contentBuffer->bind();
+	if (const auto notch = _owner->topNotchSkip()) {
+		const auto top = transformRect(QRect(0, 0, _owner->width(), notch));
+        const GLfloat coords[] = {
+			top.left(), top.top(),
+			top.right(), top.top(),
+			top.right(), top.bottom(),
+			top.left(), top.bottom(),
+		};
+		const auto offset = kNotchOffset;
+		_contentBuffer->write(
+			offset * 4 * sizeof(GLfloat),
+			coords,
+			sizeof(coords));
+
+		_fillProgram->bind();
+		_fillProgram->setUniformValue("viewport", _uniformViewport);
+		FillRectangle(
+			*_f,
+			&*_fillProgram,
+			offset,
+			QColor(0, 0, 0));
+	}
 }
 
 void OverlayWidget::RendererGL::paintTransformedVideoFrame(
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
index 277d39d96..4ca702d39 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
@@ -45,6 +45,12 @@ void OverlayWidget::RendererSW::paintBackground() {
 	for (const auto &rect : region) {
 		_p->fillRect(rect, bg);
 	}
+	if (const auto notch = _owner->topNotchSkip()) {
+		const auto top = QRect(0, 0, _owner->width(), notch);
+		if (const auto black = top.intersected(_clipOuter); !black.isEmpty()) {
+			_p->fillRect(black, Qt::black);
+		}
+	}
 	_p->setCompositionMode(m);
 }
 
@@ -101,8 +107,8 @@ void OverlayWidget::RendererSW::paintTransformedStaticContent(
 }
 
 void OverlayWidget::RendererSW::paintControlsFade(
-	QRect content,
-	const ContentGeometry &geometry) {
+		QRect content,
+		const ContentGeometry &geometry) {
 	auto opacity = geometry.controlsOpacity;
 	if (geometry.fade > 0.) {
 		_p->setOpacity(geometry.fade);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 0a8be2dc6..aa225a91f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -587,6 +587,16 @@ OverlayWidget::OverlayWidget()
 		update();
 	}, lifetime());
 
+	_helper->topNotchSkipValue(
+	) | rpl::start_with_next([=](int notch) {
+		if (_topNotchSize != notch) {
+			_topNotchSize = notch;
+			if (_fullscreen) {
+				updateControlsGeometry();
+			}
+		}
+	}, lifetime());
+
 	_window->setTitle(tr::lng_mediaview_title(tr::now));
 	_window->setTitleStyle(st::mediaviewTitle);
 
@@ -673,7 +683,11 @@ void OverlayWidget::showSaveMsgToastWith(
 	const auto h = st::mediaviewSaveMsgStyle.font->height
 		+ st::mediaviewSaveMsgPadding.top()
 		+ st::mediaviewSaveMsgPadding.bottom();
-	_saveMsg = QRect((width() - w) / 2, (height() - h) / 2, w, h);
+	_saveMsg = QRect(
+		(width() - w) / 2,
+		_minUsedTop + (_maxUsedHeight - h) / 2,
+		w,
+		h);
 	const auto callback = [=](float64 value) {
 		updateSaveMsg();
 		if (!_saveMsgAnimation.animating()) {
@@ -703,7 +717,7 @@ void OverlayWidget::setupWindow() {
 				&& _streamed->controls
 				&& _streamed->controls->dragging())) {
 			return Flag::None | Flag(0);
-		} else if ((_w > _widget->width() || _h > _widget->height())
+		} else if ((_w > _widget->width() || _h > _maxUsedHeight)
 				&& (widgetPoint.y() > st::mediaviewHeaderTop)
 				&& QRect(_x, _y, _w, _h).contains(widgetPoint)) {
 			return Flag::None | Flag(0);
@@ -940,8 +954,14 @@ void OverlayWidget::updateGeometryToScreen(bool inMove) {
 void OverlayWidget::updateControlsGeometry() {
 	updateNavigationControlsGeometry();
 
-	_saveMsg.moveTo((width() - _saveMsg.width()) / 2, (height() - _saveMsg.height()) / 2);
-	_photoRadialRect = QRect(QPoint((width() - st::radialSize.width()) / 2, (height() - st::radialSize.height()) / 2), st::radialSize);
+	_saveMsg.moveTo(
+		(width() - _saveMsg.width()) / 2,
+		_minUsedTop + (_maxUsedHeight - _saveMsg.height()) / 2);
+	_photoRadialRect = QRect(
+		QPoint(
+			(width() - st::radialSize.width()) / 2,
+			_minUsedTop + (_maxUsedHeight - st::radialSize.height()) / 2),
+		st::radialSize);
 
 	const auto bottom = st::mediaviewShadowBottom.height();
 	const auto top = st::mediaviewShadowTop.size();
@@ -960,6 +980,9 @@ void OverlayWidget::updateControlsGeometry() {
 }
 
 void OverlayWidget::updateNavigationControlsGeometry() {
+	_minUsedTop = topNotchSkip();
+	_maxUsedHeight = height() - _minUsedTop;
+
 	const auto overRect = QRect(
 		QPoint(),
 		QSize(st::mediaviewIconOver, st::mediaviewIconOver));
@@ -969,14 +992,22 @@ void OverlayWidget::updateNavigationControlsGeometry() {
 	const auto navSkip = st::mediaviewHeaderTop;
 	const auto xLeft = _stories ? (_x - navSize) : 0;
 	const auto xRight = _stories ? (_x + _w) : (width() - navSize);
-	_leftNav = QRect(xLeft, navSkip, navSize, height() - 2 * navSkip);
+	_leftNav = QRect(
+		xLeft,
+		_minUsedTop + navSkip,
+		navSize,
+		_maxUsedHeight - 2 * navSkip);
 	_leftNavOver = _stories
 		? QRect()
 		: style::centerrect(_leftNav, overRect);
 	_leftNavIcon = style::centerrect(
 		_leftNav,
 		_stories ? st::storiesLeft : st::mediaviewLeft);
-	_rightNav = QRect(xRight, navSkip, navSize, height() - 2 * navSkip);
+	_rightNav = QRect(
+		xRight,
+		_minUsedTop + navSkip,
+		navSize,
+		_maxUsedHeight - 2 * navSkip);
 	_rightNavOver = _stories
 		? QRect()
 		: style::centerrect(_rightNav, overRect);
@@ -1213,7 +1244,7 @@ void OverlayWidget::updateControls() {
 	if (_document && documentBubbleShown()) {
 		_docRect = QRect(
 			(width() - st::mediaviewFileSize.width()) / 2,
-			(height() - st::mediaviewFileSize.height()) / 2,
+			_minUsedTop + (_maxUsedHeight - st::mediaviewFileSize.height()) / 2,
 			st::mediaviewFileSize.width(),
 			st::mediaviewFileSize.height());
 		_docIconRect = QRect(
@@ -1244,7 +1275,7 @@ void OverlayWidget::updateControls() {
 	} else {
 		_docIconRect = QRect(
 			(width() - st::mediaviewFileIconSize) / 2,
-			(height() - st::mediaviewFileIconSize) / 2,
+			_minUsedTop + (_maxUsedHeight - st::mediaviewFileIconSize) / 2,
 			st::mediaviewFileIconSize,
 			st::mediaviewFileIconSize);
 		_docDownload->hide();
@@ -1263,7 +1294,8 @@ void OverlayWidget::updateControls() {
 	_shareVisible = story && story->canShare();
 	_rotateVisible = !_themePreviewShown && !story;
 	const auto navRect = [&](int i) {
-		return QRect(width() - st::mediaviewIconSize.width() * i,
+		return QRect(
+			width() - st::mediaviewIconSize.width() * i,
 			height() - st::mediaviewIconSize.height(),
 			st::mediaviewIconSize.width(),
 			st::mediaviewIconSize.height());
@@ -1302,12 +1334,27 @@ void OverlayWidget::updateControls() {
 	}();
 	_dateText = d.isValid() ? Ui::FormatDateTime(d) : QString();
 	if (!_fromName.isEmpty()) {
-		_fromNameLabel.setText(st::mediaviewTextStyle, _fromName, Ui::NameTextOptions());
-		_nameNav = QRect(st::mediaviewTextLeft, height() - st::mediaviewTextTop, qMin(_fromNameLabel.maxWidth(), width() / 3), st::mediaviewFont->height);
-		_dateNav = QRect(st::mediaviewTextLeft + _nameNav.width() + st::mediaviewTextSkip, height() - st::mediaviewTextTop, st::mediaviewFont->width(_dateText), st::mediaviewFont->height);
+		_fromNameLabel.setText(
+			st::mediaviewTextStyle,
+			_fromName,
+			Ui::NameTextOptions());
+		_nameNav = QRect(
+			st::mediaviewTextLeft,
+			height() - st::mediaviewTextTop,
+			qMin(_fromNameLabel.maxWidth(), width() / 3),
+			st::mediaviewFont->height);
+		_dateNav = QRect(
+			st::mediaviewTextLeft + _nameNav.width() + st::mediaviewTextSkip,
+			height() - st::mediaviewTextTop,
+			st::mediaviewFont->width(_dateText),
+			st::mediaviewFont->height);
 	} else {
 		_nameNav = QRect();
-		_dateNav = QRect(st::mediaviewTextLeft, height() - st::mediaviewTextTop, st::mediaviewFont->width(_dateText), st::mediaviewFont->height);
+		_dateNav = QRect(
+			st::mediaviewTextLeft,
+			height() - st::mediaviewTextTop,
+			st::mediaviewFont->width(_dateText),
+			st::mediaviewFont->height);
 	}
 	updateHeader();
 	refreshNavVisibility();
@@ -1363,9 +1410,9 @@ void OverlayWidget::refreshCaptionGeometry() {
 			_caption.maxWidth());
 	const auto maxExpandedOuterHeight = (_stories
 		? (_h - st::storiesShadowTop.height())
-		: height());
+		: _maxUsedHeight);
 	const auto maxCollapsedOuterHeight = !_stories
-		? (height() / 4)
+		? (_maxUsedHeight / 4)
 		: (_h / 3);
 	const auto maxExpandedHeight = maxExpandedOuterHeight
 		- st::mediaviewCaptionPadding.top()
@@ -1777,7 +1824,7 @@ void OverlayWidget::recountSkipTop() {
 		? height()
 		: (_streamed->controls->y() - st::mediaviewCaptionPadding.bottom());
 	const auto skipHeightBottom = (height() - bottom);
-	_skipTop = std::min(
+	_skipTop = _minUsedTop + std::min(
 		std::max(
 			st::mediaviewCaptionMargin.height(),
 			height() - _height - skipHeightBottom),
@@ -1785,7 +1832,7 @@ void OverlayWidget::recountSkipTop() {
 	_availableHeight = height() - skipHeightBottom - _skipTop;
 	if (_fullScreenVideo && skipHeightBottom > 0 && _width > 0) {
 		const auto h = width() * _height / _width;
-		const auto topAllFit = height() - skipHeightBottom - h;
+		const auto topAllFit = _maxUsedHeight - skipHeightBottom - h;
 		if (_skipTop > topAllFit) {
 			_skipTop = std::max(topAllFit, 0);
 		}
@@ -1818,12 +1865,12 @@ void OverlayWidget::resizeContentByScreenSize() {
 	};
 	if (_width > 0 && _height > 0) {
 		_zoomToDefault = countZoomFor(availableWidth, _availableHeight);
-		_zoomToScreen = countZoomFor(width(), height());
+		_zoomToScreen = countZoomFor(width(), _maxUsedHeight);
 	} else {
 		_zoomToDefault = _zoomToScreen = 0;
 	}
 	const auto usew = _fullScreenVideo ? width() : availableWidth;
-	const auto useh = _fullScreenVideo ? height() : _availableHeight;
+	const auto useh = _fullScreenVideo ? _maxUsedHeight : _availableHeight;
 	if ((_width > usew) || (_height > useh) || _fullScreenVideo) {
 		const auto use = _fullScreenVideo ? _zoomToScreen : _zoomToDefault;
 		_zoom = kZoomToScreenLevel;
@@ -3156,6 +3203,10 @@ void OverlayWidget::show(OpenRequest request) {
 			}
 		}
 	}
+	if (isHidden() || isMinimized()) {
+		// Count top notch on macOS before counting geometry.
+		_helper->beforeShow(_fullscreen);
+	}
 	if (photo) {
 		if (contextItem && contextPeer) {
 			return;
@@ -4240,6 +4291,14 @@ void OverlayWidget::storiesVolumeChangeFinished() {
 	playbackControlsVolumeChangeFinished();
 }
 
+int OverlayWidget::topNotchSkip() const {
+	return _fullscreen ? _topNotchSize : 0;
+}
+
+int OverlayWidget::storiesTopNotchSkip() {
+	return topNotchSkip();
+}
+
 void OverlayWidget::playbackToggleFullScreen() {
 	Expects(_streamed != nullptr);
 
@@ -5366,7 +5425,7 @@ bool OverlayWidget::handleDoubleClick(
 
 void OverlayWidget::snapXY() {
 	auto xmin = width() - _w, xmax = 0;
-	auto ymin = height() - _h, ymax = 0;
+	auto ymin = height() - _h, ymax = _minUsedTop;
 	accumulate_min(xmin, (width() - _w) / 2);
 	accumulate_max(xmax, (width() - _w) / 2);
 	accumulate_min(ymin, _skipTop + (_availableHeight - _h) / 2);
@@ -5390,7 +5449,7 @@ void OverlayWidget::handleMouseMove(QPoint position) {
 				>= QApplication::startDragDistance())) {
 			_dragging = QRect(_x, _y, _w, _h).contains(_mStart) ? 1 : -1;
 			if (_dragging > 0) {
-				if (_w > width() || _h > height()) {
+				if (_w > width() || _h > _maxUsedHeight) {
 					setCursor(style::cur_sizeall);
 				} else {
 					setCursor(style::cur_default);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index b0feb4f1d..b4a243f84 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -243,6 +243,7 @@ private:
 	void playbackResumeOnCall();
 	void playbackPauseMusic();
 	void switchToPip();
+	[[nodiscard]] int topNotchSkip() const;
 
 	not_null<Ui::RpWidget*> storiesWrap() override;
 	std::shared_ptr<ChatHelpers::Show> storiesShow() override;
@@ -264,6 +265,7 @@ private:
 	void storiesVolumeToggle() override;
 	void storiesVolumeChanged(float64 volume) override;
 	void storiesVolumeChangeFinished() override;
+	int storiesTopNotchSkip() override;
 
 	void hideControls(bool force = false);
 	void subscribeToScreenGeometry();
@@ -589,10 +591,13 @@ private:
 	bool _captionFitsIfExpanded = false;
 	bool _captionExpanded = false;
 
+	int _topNotchSize = 0;
 	int _width = 0;
 	int _height = 0;
 	int _skipTop = 0;
 	int _availableHeight = 0;
+	int _minUsedTop = 0; // Geometry without top notch on macOS.
+	int _maxUsedHeight = 0;
 	int _x = 0, _y = 0, _w = 0, _h = 0;
 	int _xStart = 0, _yStart = 0;
 	int _zoom = 0; // < 0 - out, 0 - none, > 0 - in
diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.h b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.h
index 1e292891f..2c83b5612 100644
--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.h
+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.h
@@ -36,6 +36,7 @@ public:
 	void clearState() override;
 	void setControlsOpacity(float64 opacity) override;
 	rpl::producer<bool> controlsSideRightValue() override;
+	rpl::producer<int> topNotchSkipValue() override;
 
 private:
 	using Control = Ui::Platform::TitleControl;
diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
index 4f9160e7a..ef544803e 100644
--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
@@ -35,6 +35,7 @@ struct MacOverlayWidgetHelper::Data {
 	rpl::event_stream<> clearStateRequests;
 	bool anyOver = false;
 	NSWindow * __weak native = nil;
+	rpl::variable<int> topNotchSkip;
 };
 
 MacOverlayWidgetHelper::MacOverlayWidgetHelper(
@@ -96,6 +97,9 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) {
 	[window setTitleVisibility:NSWindowTitleHidden];
 	[window setTitlebarAppearsTransparent:YES];
 	[window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView];
+	if (@available(macOS 12.0, *)) {
+		_data->topNotchSkip = [[window screen] safeAreaInsets].top;
+	}
 }
 
 void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) {
@@ -153,6 +157,10 @@ rpl::producer<bool> MacOverlayWidgetHelper::controlsSideRightValue() {
 	return rpl::single(false);
 }
 
+rpl::producer<int> MacOverlayWidgetHelper::topNotchSkipValue() {
+	return _data->topNotchSkip.value();
+}
+
 object_ptr<Ui::AbstractButton> MacOverlayWidgetHelper::create(
 		not_null<QWidget*> parent,
 		Control control) {
diff --git a/Telegram/SourceFiles/platform/platform_overlay_widget.h b/Telegram/SourceFiles/platform/platform_overlay_widget.h
index 97b6ef7ef..2de3687d0 100644
--- a/Telegram/SourceFiles/platform/platform_overlay_widget.h
+++ b/Telegram/SourceFiles/platform/platform_overlay_widget.h
@@ -58,6 +58,9 @@ public:
 	-> rpl::producer<not_null<QMouseEvent*>> {
 		return rpl::never<not_null<QMouseEvent*>>();
 	}
+	[[nodiscard]] virtual rpl::producer<int> topNotchSkipValue() {
+		return rpl::single(0);
+	}
 };
 
 [[nodiscard]] std::unique_ptr<OverlayWidgetHelper> CreateOverlayWidgetHelper(

From 5aa610290367bfb8b9c7238114f02b9a7f074080 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 17:37:56 +0400
Subject: [PATCH 504/676] Implement nice expandable story caption viewer.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../SourceFiles/core/click_handler_types.cpp  |   1 +
 .../media_stories_caption_full_view.cpp       | 189 +++++++++++++-----
 .../stories/media_stories_caption_full_view.h |  41 ++--
 .../stories/media_stories_controller.cpp      |  45 +++--
 .../media/stories/media_stories_controller.h  |   5 +-
 .../media/stories/media_stories_view.cpp      |   4 +-
 .../media/stories/media_stories_view.h        |   5 +-
 .../SourceFiles/media/view/media_view.style   |   6 +-
 .../media/view/media_view_overlay_widget.cpp  |  94 +++++----
 .../media/view/media_view_overlay_widget.h    |   5 +-
 11 files changed, 259 insertions(+), 137 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 15c8eff5f..e966fe52d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3846,6 +3846,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_click_to_view" = "Click here to view updates from {users}.";
 "lng_stories_click_to_view_and_one" = "{accumulated}, {user}";
 "lng_stories_click_to_view_and_last" = "{accumulated} and {user}";
+"lng_stories_show_more" = "Show more";
 
 "lng_stories_my_title" = "Saved Stories";
 "lng_stories_archive_button" = "Stories Archive";
diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index 02472e437..e3bbba7d1 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -147,6 +147,7 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 				my.show->showBox(std::move(box));
 			} else if (use) {
 				use->show(std::move(box));
+				use->activate();
 			}
 		} else {
 			open();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
index 6506dd62c..25687468f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
@@ -7,79 +7,168 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_caption_full_view.h"
 
+#include "base/event_filter.h"
 #include "core/ui_integration.h"
-#include "ui/widgets/scroll_area.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "media/stories/media_stories_controller.h"
+#include "media/stories/media_stories_view.h"
+#include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/labels.h"
+#include "ui/click_handler.h"
 #include "styles/style_media_view.h"
 
 namespace Media::Stories {
 
-CaptionFullView::CaptionFullView(
-	not_null<Ui::RpWidget*> parent,
-	not_null<Main::Session*> session,
-	const TextWithEntities &text,
-	Fn<void()> close)
-: RpWidget(parent)
-, _scroll(std::make_unique<Ui::ScrollArea>((RpWidget*)this))
-, _text(_scroll->setOwnedWidget(
+CaptionFullView::CaptionFullView(not_null<Controller*> controller)
+: _controller(controller)
+, _scroll(std::make_unique<Ui::ElasticScroll>(controller->wrap()))
+, _wrap(_scroll->setOwnedWidget(
 	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
 		_scroll.get(),
 		object_ptr<Ui::FlatLabel>(_scroll.get(), st::storiesCaptionFull),
-		st::mediaviewCaptionPadding))->entity())
-, _close(std::move(close))
-, _background(st::storiesRadius, st::mediaviewCaptionBg) {
-	_text->setMarkedText(text, Core::MarkedTextContext{
-		.session = session,
+		st::mediaviewCaptionPadding)))
+, _text(_wrap->entity()) {
+	_text->setMarkedText(controller->captionText(), Core::MarkedTextContext{
+		.session = &controller->uiShow()->session(),
 		.customEmojiRepaint = [=] { _text->update(); },
 	});
 
-	parent->sizeValue() | rpl::start_with_next([=](QSize size) {
-		setGeometry(QRect(QPoint(), size));
-	}, lifetime());
+	startAnimation();
+	_controller->layoutValue(
+	) | rpl::start_with_next([=](const Layout &layout) {
+		if (_outer != layout.content) {
+			const auto skip = layout.header.y()
+				+ layout.header.height()
+				- layout.content.y();
+			_outer = layout.content.marginsRemoved({ 0, skip, 0, 0 });
+			updateGeometry();
+		}
+	}, _scroll->lifetime());
 
-	show();
-	setFocus();
+	const auto filter = [=](not_null<QEvent*> e) {
+		const auto mouse = [&] {
+			return static_cast<QMouseEvent*>(e.get());
+		};
+		const auto type = e->type();
+		if (type == QEvent::MouseButtonPress
+			&& mouse()->button() == Qt::LeftButton
+			&& !ClickHandler::getActive()) {
+			_down = true;
+		} else if (type == QEvent::MouseButtonRelease && _down) {
+			_down = false;
+			if (!ClickHandler::getPressed()) {
+				close();
+			}
+		} else if (type == QEvent::KeyPress
+			&& static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Escape) {
+			close();
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	};
+	base::install_event_filter(_text.get(), filter);
+	base::install_event_filter(_wrap.get(), filter);
+
+	using Type = Ui::ElasticScroll::OverscrollType;
+
+	rpl::combine(
+		_scroll->positionValue(),
+		_scroll->movementValue()
+	) | rpl::filter([=] {
+		return !_closing;
+	}) | rpl::start_with_next([=](
+			Ui::ElasticScrollPosition position,
+			Ui::ElasticScrollMovement movement) {
+		const auto overscrollTop = std::max(-position.overscroll, 0);
+		using Phase = Ui::ElasticScrollMovement;
+		if (movement == Phase::Progress) {
+			if (overscrollTop > 0) {
+				_pulling = true;
+			} else {
+				_pulling = false;
+			}
+		} else if (_pulling
+			&& (movement == Phase::Momentum
+				|| movement == Phase::Returning)) {
+			_pulling = false;
+			if (overscrollTop > st::storiesCaptionPullThreshold) {
+				_closingTopAdded = overscrollTop;
+				_scroll->setOverscrollTypes(Type::None, Type::Real);
+				close();
+				updateGeometry();
+			}
+		}
+	}, _scroll->lifetime());
+
+	_scroll->show();
+	_scroll->setOverscrollBg(QColor(0, 0, 0, 0));
+	_scroll->setOverscrollTypes(Type::Real, Type::Real);
+	_text->show();
+	_text->setFocus();
 }
 
 CaptionFullView::~CaptionFullView() = default;
 
-void CaptionFullView::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
-	_background.paint(p, _scroll->geometry());
-	_background.paint(p, _scroll->geometry());
+bool CaptionFullView::closing() const {
+	return _closing;
 }
 
-void CaptionFullView::resizeEvent(QResizeEvent *e) {
-	const auto wanted = _text->naturalWidth();
+bool CaptionFullView::focused() const {
+	return Ui::InFocusChain(_scroll.get());
+}
+
+void CaptionFullView::close() {
+	if (_closing) {
+		return;
+	}
+	_closing = true;
+	_controller->captionClosing();
+	startAnimation();
+}
+
+void CaptionFullView::updateGeometry() {
+	if (_outer.isEmpty()) {
+		return;
+	}
+	const auto lineHeight = st::mediaviewCaptionStyle.font->height;
 	const auto padding = st::mediaviewCaptionPadding;
-	const auto margin = st::mediaviewCaptionMargin * 2;
-	const auto available = (rect() - padding).width()
-		- (margin.width() * 2);
-	const auto use = std::min(wanted, available);
-	_text->resizeToWidth(use);
-	const auto fullw = use + padding.left() + padding.right();
-	const auto fullh = std::min(
-		_text->height() + padding.top() + padding.bottom(),
-		height() - (margin.height() * 2));
-	const auto left = (width() - fullw) / 2;
-	const auto top = (height() - fullh) / 2;
-	_scroll->setGeometry(left, top, fullw, fullh);
-}
-
-void CaptionFullView::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Escape) {
-		if (const auto onstack = _close) {
-			onstack();
-		}
+	_text->resizeToWidth(_outer.width() - padding.left() - padding.right());
+	const auto add = padding.top() + padding.bottom();
+	const auto maxShownHeight = lineHeight * kMaxShownCaptionLines;
+	const auto shownHeight = (_text->height() > maxShownHeight)
+		? (lineHeight * kCollapsedCaptionLines)
+		: _text->height();
+	const auto collapsedHeight = shownHeight + add;
+	const auto addedToBottom = lineHeight;
+	const auto expandedHeight = _text->height() + add + addedToBottom;
+	const auto fullHeight = std::min(expandedHeight, _outer.height());
+	const auto shown = _animation.value(_closing ? 0. : 1.);
+	const auto height = (_closing || _animation.animating())
+		? anim::interpolate(collapsedHeight, fullHeight, shown)
+		: _outer.height();
+	const auto added = anim::interpolate(0, _closingTopAdded, shown);
+	const auto bottomPadding = anim::interpolate(0, addedToBottom, shown);
+	const auto use = padding + ((_closing || _animation.animating())
+		? QMargins(0, 0, 0, bottomPadding)
+		: QMargins(0, height - fullHeight, 0, bottomPadding));
+	_wrap->setPadding(use);
+	_scroll->setGeometry(
+		_outer.x(),
+		added + _outer.y() + _outer.height() - height,
+		_outer.width(),
+		std::max(height - added, 0));
+	if (_closing && !_animation.animating()) {
+		_controller->captionClosed();
 	}
 }
 
-void CaptionFullView::mousePressEvent(QMouseEvent *e) {
-	if (e->button() == Qt::LeftButton) {
-		if (const auto onstack = _close) {
-			onstack();
-		}
-	}
+void CaptionFullView::startAnimation() {
+	_animation.start(
+		[=] { updateGeometry(); },
+		_closing ? 1. : 0.,
+		_closing ? 0. : 1.,
+		st::fadeWrapDuration,
+		anim::sineInOut);
 }
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h
index 94b6e2cff..b51ccb0d9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.h
@@ -7,8 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "ui/rp_widget.h"
-#include "ui/round_rect.h"
+#include "ui/effects/animations.h"
 
 namespace Main {
 class Session;
@@ -16,30 +15,38 @@ class Session;
 
 namespace Ui {
 class FlatLabel;
-class ScrollArea;
+class ElasticScroll;
+template <typename Widget>
+class PaddingWrap;
 } // namespace Ui
 
 namespace Media::Stories {
 
-class CaptionFullView final : private Ui::RpWidget {
+class Controller;
+
+class CaptionFullView final {
 public:
-	CaptionFullView(
-		not_null<Ui::RpWidget*> parent,
-		not_null<Main::Session*> session,
-		const TextWithEntities &text,
-		Fn<void()> close);
+	explicit CaptionFullView(not_null<Controller*> controller);
 	~CaptionFullView();
 
-private:
-	void paintEvent(QPaintEvent *e) override;
-	void resizeEvent(QResizeEvent *e) override;
-	void keyPressEvent(QKeyEvent *e) override;
-	void mousePressEvent(QMouseEvent *e) override;
+	void close();
+	[[nodiscard]] bool closing() const;
+	[[nodiscard]] bool focused() const;
 
-	std::unique_ptr<Ui::ScrollArea> _scroll;
+private:
+	void updateGeometry();
+	void startAnimation();
+
+	const not_null<Controller*> _controller;
+	const std::unique_ptr<Ui::ElasticScroll> _scroll;
+	const not_null<Ui::PaddingWrap<Ui::FlatLabel>*> _wrap;
 	const not_null<Ui::FlatLabel*> _text;
-	Fn<void()> _close;
-	Ui::RoundRect _background;
+	Ui::Animations::Simple _animation;
+	QRect _outer;
+	int _closingTopAdded = 0;
+	bool _pulling = false;
+	bool _closing = false;
+	bool _down = false;
 
 };
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 384770741..b94484a59 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -280,9 +280,6 @@ Controller::Controller(not_null<Delegate*> delegate)
 		_1 || _2
 	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool active) {
-		if (active) {
-			_captionFullView = nullptr;
-		}
 		_replyActive = active;
 		updateContentFaded();
 	}, _lifetime);
@@ -355,7 +352,8 @@ Controller::~Controller() {
 }
 
 void Controller::updateContentFaded() {
-	const auto faded = _replyActive || _captionFullView || _captionExpanded;
+	const auto faded = _replyActive
+		|| (_captionFullView && !_captionFullView->closing());
 	if (_contentFaded == faded) {
 		return;
 	}
@@ -584,26 +582,31 @@ TextWithEntities Controller::captionText() const {
 	return _captionText;
 }
 
-void Controller::setCaptionExpanded(bool expanded) {
-	if (_captionExpanded == expanded) {
-		return;
-	}
-	_captionExpanded = expanded;
-	updateContentFaded();
+bool Controller::skipCaption() const {
+	return _captionFullView != nullptr;
 }
 
 void Controller::showFullCaption() {
 	if (_captionText.empty()) {
 		return;
 	}
-	_captionFullView = std::make_unique<CaptionFullView>(
-		wrap(),
-		&_delegate->storiesShow()->session(),
-		_captionText,
-		[=] { _captionFullView = nullptr; updateContentFaded(); });
+	_captionFullView = std::make_unique<CaptionFullView>(this);
 	updateContentFaded();
 }
 
+void Controller::captionClosing() {
+	updateContentFaded();
+}
+
+void Controller::captionClosed() {
+	if (!_captionFullView) {
+		return;
+	} else if (_captionFullView->focused()) {
+		_wrap->setFocus();
+	}
+	_captionFullView = nullptr;
+}
+
 std::shared_ptr<ChatHelpers::Show> Controller::uiShow() const {
 	return _delegate->storiesShow();
 }
@@ -820,9 +823,8 @@ void Controller::show(
 		_slider->raise();
 	}
 
+	captionClosed();
 	_captionText = story->caption();
-	_captionFullView = nullptr;
-	_captionExpanded = false;
 	_contentFaded = false;
 	_contentFadeAnimation.stop();
 	const auto document = story->document();
@@ -972,17 +974,13 @@ void Controller::updatePlayingAllowed() {
 		&& _windowActive
 		&& !_paused
 		&& !_replyActive
-		&& !_captionFullView
-		&& !_captionExpanded
+		&& (!_captionFullView || _captionFullView->closing())
 		&& !_layerShown
 		&& !_menuShown
 		&& !_tooltipShown);
 }
 
 void Controller::setPlayingAllowed(bool allowed) {
-	if (allowed) {
-		_captionFullView = nullptr;
-	}
 	if (_photoPlayback) {
 		_photoPlayback->togglePaused(!allowed);
 	} else {
@@ -1192,6 +1190,9 @@ void Controller::togglePaused(bool paused) {
 
 void Controller::contentPressed(bool pressed) {
 	togglePaused(pressed);
+	if (_captionFullView) {
+		_captionFullView->close();
+	}
 	if (pressed) {
 		_reactions->collapse();
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 3aa3a49a2..35d82c9b0 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -122,8 +122,10 @@ public:
 	[[nodiscard]] bool closeByClickAt(QPoint position) const;
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
-	void setCaptionExpanded(bool expanded);
+	[[nodiscard]] bool skipCaption() const;
 	void showFullCaption();
+	void captionClosing();
+	void captionClosed();
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 	[[nodiscard]] auto stickerOrEmojiChosen() const
@@ -250,7 +252,6 @@ private:
 	Ui::Animations::Simple _contentFadeAnimation;
 	bool _contentFaded = false;
 
-	bool _captionExpanded = false;
 	bool _windowActive = false;
 	bool _replyFocused = false;
 	bool _replyActive = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 159999281..dfbab352b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -123,8 +123,8 @@ TextWithEntities View::captionText() const {
 	return _controller->captionText();
 }
 
-void View::setCaptionExpanded(bool expanded) {
-	_controller->setCaptionExpanded(expanded);
+bool View::skipCaption() const {
+	return _controller->skipCaption();
 }
 
 void View::showFullCaption() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 57e38e70b..08fe4cf1b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -48,6 +48,9 @@ struct SiblingView {
 	}
 };
 
+inline constexpr auto kCollapsedCaptionLines = 2;
+inline constexpr auto kMaxShownCaptionLines = 4;
+
 class View final {
 public:
 	explicit View(not_null<Delegate*> delegate);
@@ -64,7 +67,7 @@ public:
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
-	void setCaptionExpanded(bool expanded);
+	[[nodiscard]] bool skipCaption() const;
 	void showFullCaption();
 
 	void updatePlayback(const Player::TrackState &state);
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index dc74d145f..c15460c9e 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -445,7 +445,8 @@ storiesSideSkip: 145px;
 storiesCaptionFull: FlatLabel(defaultFlatLabel) {
 	style: mediaviewCaptionStyle;
 	textFg: mediaviewCaptionFg;
-	minWidth: 360px;
+	palette: mediaviewTextPalette;
+	minWidth: 36px;
 }
 storiesComposeBg: groupCallMembersBg;
 storiesComposeBgOver: groupCallMembersBgOver;
@@ -908,3 +909,6 @@ storiesVolumeSlider: MediaSlider {
 storiesInfoTooltipLabel: defaultImportantTooltipLabel;
 storiesInfoTooltip: defaultImportantTooltip;
 storiesInfoTooltipMaxWidth: 360px;
+storiesCaptionPullThreshold: 50px;
+storiesShowMorePadding: margins(6px, 4px, 6px, 4px);
+storiesShowMoreFont: semiboldFont;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index aa225a91f..a5f00bc3d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1383,6 +1383,10 @@ void OverlayWidget::resizeCenteredControls() {
 }
 
 void OverlayWidget::refreshCaptionGeometry() {
+	_caption.updateSkipBlock(0, 0);
+	_captionShowMoreWidth = 0;
+	_captionSkipBlockWidth = 0;
+
 	if (_caption.isEmpty()) {
 		_captionRect = QRect();
 		return;
@@ -1408,32 +1412,28 @@ void OverlayWidget::refreshCaptionGeometry() {
 				- st::mediaviewCaptionPadding.left()
 				- st::mediaviewCaptionPadding.right()),
 			_caption.maxWidth());
-	const auto maxExpandedOuterHeight = (_stories
-		? (_h - st::storiesShadowTop.height())
-		: _maxUsedHeight);
-	const auto maxCollapsedOuterHeight = !_stories
-		? (_maxUsedHeight / 4)
-		: (_h / 3);
-	const auto maxExpandedHeight = maxExpandedOuterHeight
-		- st::mediaviewCaptionPadding.top()
-		- st::mediaviewCaptionPadding.bottom();
-	const auto maxCollapsedHeight = maxCollapsedOuterHeight
-		- st::mediaviewCaptionPadding.top()
-		- st::mediaviewCaptionPadding.bottom();
 	const auto lineHeight = st::mediaviewCaptionStyle.font->height;
 	const auto wantedHeight = _caption.countHeight(captionWidth);
-	const auto maxHeight = _captionExpanded
-		? maxExpandedHeight
-		: maxCollapsedHeight;
+	const auto maxHeight = !_stories
+		? (_maxUsedHeight / 4)
+		: (wantedHeight > lineHeight * Stories::kMaxShownCaptionLines)
+		? (lineHeight * Stories::kCollapsedCaptionLines)
+		: wantedHeight;
 	const auto captionHeight = std::min(
 		wantedHeight,
 		(maxHeight / lineHeight) * lineHeight);
-	_captionFitsIfExpanded = _stories
-		&& (wantedHeight <= maxExpandedHeight);
-	_captionShownFull = (wantedHeight <= maxCollapsedHeight);
-	if (_captionShownFull && _captionExpanded && _stories) {
-		_captionExpanded = false;
-		_stories->setCaptionExpanded(false);
+	if (_stories && captionHeight < wantedHeight) {
+		const auto padding = st::storiesShowMorePadding;
+		_captionShowMoreWidth = st::storiesShowMoreFont->width(
+			tr::lng_stories_show_more(tr::now));
+		_captionSkipBlockWidth = _captionShowMoreWidth
+			+ padding.left()
+			+ padding.right()
+			- st::mediaviewCaptionPadding.right();
+		const auto skiph = st::storiesShowMoreFont->height
+			+ padding.bottom()
+			- st::mediaviewCaptionPadding.bottom();
+		_caption.updateSkipBlock(_captionSkipBlockWidth, skiph);
 	}
 	_captionRect = QRect(
 		(width() - captionWidth) / 2,
@@ -3495,7 +3495,6 @@ void OverlayWidget::updateThemePreviewGeometry() {
 }
 
 void OverlayWidget::displayFinished(anim::activation activation) {
-	_captionExpanded = _captionFitsIfExpanded = _captionShownFull = false;
 	updateControls();
 	if (isHidden()) {
 		_helper->beforeShow(_fullscreen);
@@ -4502,7 +4501,8 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 		if (!_stories) {
 			renderer->paintFooter(footerGeometry(), opacity);
 		}
-		if (!_caption.isEmpty()) {
+		if (!_caption.isEmpty()
+			&& (!_stories || !_stories->skipCaption())) {
 			renderer->paintCaption(captionGeometry(), opacity);
 		}
 		if (_groupThumbs) {
@@ -4912,6 +4912,7 @@ void OverlayWidget::paintCaptionContent(
 	}
 	if (inner.intersects(clip)) {
 		p.setPen(st::mediaviewCaptionFg);
+		const auto lineHeight = st::mediaviewCaptionStyle.font->height;
 		_caption.draw(p, {
 			.position = inner.topLeft(),
 			.availableWidth = inner.width(),
@@ -4919,8 +4920,31 @@ void OverlayWidget::paintCaptionContent(
 			.spoiler = Ui::Text::DefaultSpoilerCache(),
 			.pausedEmoji = On(PowerSaving::kEmojiChat),
 			.pausedSpoiler = On(PowerSaving::kChatSpoiler),
-			.elisionLines = inner.height() / st::mediaviewCaptionStyle.font->height,
+			.elisionLines = inner.height() / lineHeight,
+			.elisionRemoveFromEnd = _captionSkipBlockWidth,
 		});
+
+		if (_captionShowMoreWidth > 0) {
+			const auto padding = st::storiesShowMorePadding;
+			const auto showMoreLeft = outer.x()
+				+ outer.width()
+				- padding.right()
+				- _captionShowMoreWidth;
+			const auto showMoreTop = outer.y()
+				+ outer.height()
+				- padding.bottom()
+				- st::storiesShowMoreFont->height;
+			const auto underline = _captionExpandLink
+				&& ClickHandler::showAsActive(_captionExpandLink);
+			p.setFont(underline
+				? st::storiesShowMoreFont->underline()
+				: st::storiesShowMoreFont);
+			p.drawTextLeft(
+				showMoreLeft,
+				showMoreTop,
+				width(),
+				tr::lng_stories_show_more(tr::now));
+		}
 	}
 }
 
@@ -5545,9 +5569,13 @@ void OverlayWidget::updateOver(QPoint pos) {
 		lnk = textState.link;
 		lnkhost = this;
 	} else if (_captionRect.contains(pos)) {
-		auto textState = _caption.getState(pos - _captionRect.topLeft(), _captionRect.width());
+		auto request = Ui::Text::StateRequestElided();
+		const auto lineHeight = st::mediaviewCaptionStyle.font->height;
+		request.lines = _captionRect.height() / lineHeight;
+		request.removeFromEnd = _captionSkipBlockWidth;
+		auto textState = _caption.getStateElided(pos - _captionRect.topLeft(), _captionRect.width(), request);
 		lnk = textState.link;
-		if (_stories && !_captionShownFull && !lnk) {
+		if (_stories && !lnk) {
 			lnk = ensureCaptionExpandLink();
 		}
 		lnkhost = this;
@@ -5626,19 +5654,7 @@ void OverlayWidget::updateOver(QPoint pos) {
 ClickHandlerPtr OverlayWidget::ensureCaptionExpandLink() {
 	if (!_captionExpandLink) {
 		const auto toggle = crl::guard(_widget, [=] {
-			if (!_stories) {
-				return;
-			} else if (_captionExpanded) {
-				_captionExpanded = false;
-				_stories->setCaptionExpanded(false);
-				refreshCaptionGeometry();
-				update();
-			} else if (_captionFitsIfExpanded) {
-				_captionExpanded = true;
-				_stories->setCaptionExpanded(true);
-				refreshCaptionGeometry();
-				update();
-			} else {
+			if (_stories) {
 				_stories->showFullCaption();
 			}
 		});
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index b4a243f84..49727bb5d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -587,9 +587,8 @@ private:
 	Ui::Text::String _caption;
 	QRect _captionRect;
 	ClickHandlerPtr _captionExpandLink;
-	bool _captionShownFull = false;
-	bool _captionFitsIfExpanded = false;
-	bool _captionExpanded = false;
+	int _captionShowMoreWidth = 0;
+	int _captionSkipBlockWidth = 0;
 
 	int _topNotchSize = 0;
 	int _width = 0;

From 0f2e8d9a794ed152d866979a1711ff854f0dc290 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 17:59:53 +0400
Subject: [PATCH 505/676] Add a small scale for stories siblings.

---
 .../media/stories/media_stories_sibling.cpp     |  2 ++
 .../media/stories/media_stories_view.h          |  2 ++
 .../media/view/media_view_overlay_opengl.cpp    | 17 ++++++++++++++++-
 .../media/view/media_view_overlay_opengl.h      |  3 +++
 .../media/view/media_view_overlay_widget.cpp    |  6 ++++--
 .../media/view/media_view_overlay_widget.h      |  4 +++-
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 1024edadb..791c8235f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -32,6 +32,7 @@ constexpr auto kSiblingFade = 0.5;
 constexpr auto kSiblingFadeOver = 0.4;
 constexpr auto kSiblingNameOpacity = 0.8;
 constexpr auto kSiblingNameOpacityOver = 1.;
+constexpr auto kSiblingScaleOver = 0.05;
 
 [[nodiscard]] StoryId LookupShownId(
 		const Data::StoriesSource &source,
@@ -325,6 +326,7 @@ SiblingView Sibling::view(const SiblingLayout &layout, float64 over) {
 		.namePosition = namePosition(layout, name),
 		.nameOpacity = (kSiblingNameOpacity * (1 - over)
 			+ kSiblingNameOpacityOver * over),
+		.scale = 1. + (over * kSiblingScaleOver),
 	};
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 08fe4cf1b..4d6cdac1e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -25,6 +25,7 @@ class Controller;
 struct ContentLayout {
 	QRect geometry;
 	float64 fade = 0.;
+	float64 scale = 1.;
 	int radius = 0;
 	bool headerOutside = false;
 };
@@ -39,6 +40,7 @@ struct SiblingView {
 	QImage name;
 	QPoint namePosition;
 	float64 nameOpacity = 0.;
+	float64 scale = 1.;
 
 	[[nodiscard]] bool valid() const {
 		return !image.isNull();
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index b3b26aeed..7851ed7f9 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -488,7 +488,9 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 		not_null<QOpenGLShaderProgram*> program,
 		ContentGeometry geometry,
 		bool fillTransparentBackground) {
-	const auto rect = transformRect(geometry.rect);
+	const auto rect = scaleRect(
+		transformRect(geometry.rect),
+		geometry.scale);
 	const auto centerx = rect.x() + rect.width() / 2;
 	const auto centery = rect.y() + rect.height() / 2;
 	const auto rsin = float(std::sin(geometry.rotation * M_PI / 180.));
@@ -1066,4 +1068,17 @@ Rect OverlayWidget::RendererGL::transformRect(const QRect &raster) const {
 	return TransformRect(Rect(raster), _viewport, _factor);
 }
 
+Rect OverlayWidget::RendererGL::scaleRect(
+		const Rect &unscaled,
+		float64 scale) const {
+	const auto added = scale - 1.;
+	const auto addw = unscaled.width() * added;
+	const auto addh = unscaled.height() * added;
+	return Rect(
+		unscaled.x() - addw / 2,
+		unscaled.y() - addh / 2,
+		unscaled.width() + addw,
+		unscaled.height() + addh);
+}
+
 } // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index 4f769ce7b..a0342518a 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -97,6 +97,9 @@ private:
 	[[nodiscard]] Ui::GL::Rect transformRect(const QRectF &raster) const;
 	[[nodiscard]] Ui::GL::Rect transformRect(
 		const Ui::GL::Rect &raster) const;
+	[[nodiscard]] Ui::GL::Rect scaleRect(
+		const Ui::GL::Rect &unscaled,
+		float64 scale) const;
 
 	void uploadTexture(
 		GLint internalformat,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index a5f00bc3d..30dc08c71 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1795,11 +1795,13 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 }
 
 OverlayWidget::ContentGeometry OverlayWidget::storiesContentGeometry(
-		const Stories::ContentLayout &layout) const {
+		const Stories::ContentLayout &layout,
+		float64 scale) const {
 	return {
 		.rect = QRectF(layout.geometry),
 		.controlsOpacity = kStoriesControlsOpacity,
 		.fade = layout.fade,
+		.scale = scale,
 		.roundRadius = layout.radius,
 		.topShadowShown = !layout.headerOutside,
 	};
@@ -4458,7 +4460,7 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 			const auto paint = [&](const SiblingView &view, int index) {
 				renderer->paintTransformedStaticContent(
 					view.image,
-					storiesContentGeometry(view.layout),
+					storiesContentGeometry(view.layout, view.scale),
 					false, // semi-transparent
 					false, // fill transparent background
 					index);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 49727bb5d..06d0c0468 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -180,6 +180,7 @@ private:
 
 		// Stories.
 		qreal fade = 0.;
+		qreal scale = 1.;
 		int bottomShadowSkip = 0;
 		int roundRadius = 0;
 		bool topShadowShown = false;
@@ -421,7 +422,8 @@ private:
 	[[nodiscard]] QRect finalContentRect() const;
 	[[nodiscard]] ContentGeometry contentGeometry() const;
 	[[nodiscard]] ContentGeometry storiesContentGeometry(
-		const Stories::ContentLayout &layout) const;
+		const Stories::ContentLayout &layout,
+		float64 scale = 1.) const;
 	void updateContentRect();
 	void contentSizeChanged();
 

From 6098e5ac33270a7d0591b13b9020cf996f9221b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 18:03:02 +0400
Subject: [PATCH 506/676] Close stories on Key_Right press on last one.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 30dc08c71..535beeb2a 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -5045,7 +5045,9 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 		if (_controlsHideTimer.isActive()) {
 			activateControls();
 		}
-		moveToNext(1);
+		if (!moveToNext(1) && _stories) {
+			storiesClose();
+		}
 	} else if (ctrl) {
 		if (key == Qt::Key_Plus
 			|| key == Qt::Key_Equal

From a85f33f7d36adbcd435b007a52e70175be3f39fa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 20:08:26 +0400
Subject: [PATCH 507/676] Fix reactions strip glitch in story reply sending.

---
 Telegram/SourceFiles/media/stories/media_stories_reply.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 9df6d290f..7ea8ce8b7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -186,8 +186,8 @@ void ReplyArea::send(
 
 	session().api().sendMessage(std::move(message));
 
-	_controls->clear();
 	finishSending(skipToast);
+	_controls->clear();
 }
 
 void ReplyArea::sendVoice(VoiceToSend &&data) {
@@ -276,8 +276,6 @@ void ReplyArea::sendInlineResult(
 	action.generateLocal = true;
 	session().api().sendInlineResult(bot, result, action, localMessageId);
 
-	_controls->clear();
-
 	auto &bots = cRefRecentInlineBots();
 	const auto index = bots.indexOf(bot);
 	if (index) {
@@ -290,11 +288,12 @@ void ReplyArea::sendInlineResult(
 		bot->session().local().writeRecentHashtagsAndBots();
 	}
 	finishSending();
+	_controls->clear();
 }
 
 void ReplyArea::finishSending(bool skipToast) {
 	_controls->hidePanelsAnimated();
-	_controller->wrap()->setFocus();
+	_controller->unfocusReply();
 	if (!skipToast) {
 		_controller->uiShow()->showToast(
 			tr::lng_stories_reply_sent(tr::now));

From 35f0f87f730fc16af5ae6fd5c90d35721c8c7a7d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 20:24:13 +0400
Subject: [PATCH 508/676] Fix possible crash in story deletion.

Fixes #26571.
---
 .../SourceFiles/media/stories/media_stories_controller.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index b94484a59..42cf67c5a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -872,9 +872,10 @@ bool Controller::changeShown(Data::Story *story) {
 	if (_shown == id && !sessionChanged) {
 		return false;
 	}
-	if (const auto now = this->story()) {
-		now->owner().stories().unregisterPolling(
-			now,
+	if (_shown) {
+		Assert(_session != nullptr);
+		_session->data().stories().unregisterPolling(
+			_shown,
 			Data::Stories::Polling::Viewer);
 	}
 	if (sessionChanged) {

From 30334b6c74d1eb53cd82a1d2d2ea35cb515f21e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 20:50:21 +0400
Subject: [PATCH 509/676] Attempt to fix crash in story preloading.

---
 Telegram/SourceFiles/data/data_document.cpp                 | 3 ++-
 Telegram/SourceFiles/data/data_stories.h                    | 2 +-
 Telegram/SourceFiles/data/data_story.cpp                    | 2 ++
 Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp    | 3 ++-
 Telegram/SourceFiles/info/stories/info_stories_provider.cpp | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index c9e66759b..5852a9606 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -54,6 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace {
 
 constexpr auto kDefaultCoverThumbnailSize = 100;
+constexpr auto kMaxAllowedPreloadPrefix = 6 * 1024 * 1024;
 
 const auto kLottieStickerDimensions = QSize(
 	kStickerSideSize,
@@ -393,7 +394,7 @@ void DocumentData::setattributes(
 				if (data.is_round_message()) {
 					_additional = std::make_unique<RoundData>();
 				} else if (const auto size = data.vpreload_prefix_size()) {
-					if (size->v > 0) {
+					if (size->v > 0 && size->v < kMaxAllowedPreloadPrefix) {
 						_videoPreloadPrefix = size->v;
 					}
 				}
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index c4d55a129..48ea79688 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -217,7 +217,7 @@ public:
 	void registerPolling(not_null<Story*> story, Polling polling);
 	void unregisterPolling(not_null<Story*> story, Polling polling);
 
-	bool registerPolling(FullStoryId id, Polling polling);
+	[[nodiscard]] bool registerPolling(FullStoryId id, Polling polling);
 	void unregisterPolling(FullStoryId id, Polling polling);
 	void requestUserStories(
 		not_null<UserData*> user,
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 2a139de87..fbc678581 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "media/streaming/media_streaming_reader.h"
 #include "storage/download_manager_mtproto.h"
+#include "storage/file_download.h" // kMaxFileInMemory
 #include "ui/text/text_utilities.h"
 
 namespace Data {
@@ -574,6 +575,7 @@ void StoryPreload::load() {
 	}
 	_task = std::make_unique<LoadTask>(id(), video, [=](QByteArray data) {
 		if (!data.isEmpty()) {
+			Assert(data.size() < Storage::kMaxFileInMemory);
 			_story->owner().cacheBigFile().putIfEmpty(
 				key,
 				Storage::Cache::Database::TaggedValue(std::move(data), 0));
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index ffedf1f50..b9f34f030 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lottie/lottie_frame_generator.h"
 #include "ffmpeg/ffmpeg_frame_generator.h"
 #include "chat_helpers/stickers_lottie.h"
+#include "storage/file_download.h" // kMaxFileInMemory
 #include "ui/widgets/input_fields.h"
 #include "ui/text/text_custom_emoji.h"
 #include "ui/text/text_utilities.h"
@@ -345,7 +346,7 @@ void CustomEmojiLoader::check() {
 	};
 	auto put = [=, key = cacheKey(document)](QByteArray value) {
 		const auto size = value.size();
-		if (size <= Storage::Cache::Database::Settings().maxDataSize) {
+		if (size <= Storage::kMaxFileInMemory) {
 			document->owner().cacheBigFile().put(key, std::move(value));
 		} else {
 			LOG(("Data Error: Cached emoji size too big: %1.").arg(size));
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index e582f9ce7..82f0ca5f2 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -283,9 +283,10 @@ BaseLayout *Provider::getLayout(
 		if (auto layout = createLayout(id, delegate)) {
 			layout->initDimensions();
 			it = _layouts.emplace(id, std::move(layout)).first;
-			_peer->owner().stories().registerPolling(
+			const auto ok = _peer->owner().stories().registerPolling(
 				{ _peer->id, id },
 				Data::Stories::Polling::Chat);
+			Assert(ok);
 		} else {
 			return nullptr;
 		}

From 885a8b3161ee702276256c3da18193e04da4ab38 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 21:33:32 +0400
Subject: [PATCH 510/676] Attempt to fix a crash in pinned message
 translations.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index cc9e0d0e4..d69117441 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -6564,6 +6564,8 @@ void HistoryWidget::checkPinnedBarState() {
 			_list->setShownPinned(
 				session().data().message(
 					_pinnedTracker->currentMessageId().message));
+		} else {
+			_list->setShownPinned(nullptr);
 		}
 		return std::move(content);
 	}));

From 642c5a37c59c7fb2aacf07180e8208d8f8bd9e9c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 21:34:40 +0400
Subject: [PATCH 511/676] Version 4.8.8.

- Several crash fixes and story viewer improvements.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 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 898e980a2..2d99765a2 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.8.7.0" />
+    Version="4.8.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 8f8652e9e..207ce5673 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,8,7,0
- PRODUCTVERSION 4,8,7,0
+ FILEVERSION 4,8,8,0
+ PRODUCTVERSION 4,8,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.7.0"
+            VALUE "FileVersion", "4.8.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.7.0"
+            VALUE "ProductVersion", "4.8.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c1a090788..65a32e4a7 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,8,7,0
- PRODUCTVERSION 4,8,7,0
+ FILEVERSION 4,8,8,0
+ PRODUCTVERSION 4,8,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.7.0"
+            VALUE "FileVersion", "4.8.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.7.0"
+            VALUE "ProductVersion", "4.8.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 71ea8719a..630dfd075 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 = 4008007;
-constexpr auto AppVersionStr = "4.8.7";
+constexpr auto AppVersion = 4008008;
+constexpr auto AppVersionStr = "4.8.8";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 1322ed7d7..a0acebbbd 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008007
+AppVersion         4008008
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.7
-AppVersionStr      4.8.7
+AppVersionStrSmall 4.8.8
+AppVersionStr      4.8.8
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.7
+AppVersionOriginal 4.8.8
diff --git a/changelog.txt b/changelog.txt
index 314f815c6..0e476e2f1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.8 (25.07.23)
+
+- Several crash fixes and story viewer improvements.
+
 4.8.7 (21.07.23)
 
 - Several crash fixes and small stories improvements.

From 2d31704bdee53a3bdba4582ad6da363c6672e384 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 09:45:06 +0400
Subject: [PATCH 512/676] Fix lock/unlock button visibility.

---
 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 f6b506d0d..8fe35aba2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1458,6 +1458,7 @@ void Widget::stopWidthAnimation() {
 }
 
 void Widget::updateStoriesVisibility() {
+	updateLockUnlockVisibility();
 	if (!_stories) {
 		return;
 	}
@@ -1487,7 +1488,6 @@ void Widget::updateStoriesVisibility() {
 		if (_aboveScrollAdded > 0 && _updateScrollGeometryCached) {
 			_updateScrollGeometryCached();
 		}
-		updateLockUnlockVisibility();
 		updateLockUnlockPosition();
 	}
 }

From e71f614f4dfe376e0a91f44b78bb9680ce91e098 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 09:48:44 +0400
Subject: [PATCH 513/676] Fix a possible crash in messages list.

---
 Telegram/SourceFiles/history/view/history_view_list_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 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 9ca933844..5903fa94b 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -933,7 +933,7 @@ Element *ListWidget::viewByPosition(Data::MessagePosition position) const {
 	const auto result = (index < 0) ? nullptr : _items[index].get();
 	return (position == Data::MinMessagePosition
 		|| position == Data::MaxMessagePosition
-		|| result->data()->position() == position)
+		|| (result && result->data()->position() == position))
 		? result
 		: nullptr;
 }

From 37ab65d952262d947fba10887992fd742c4f0603 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 10:47:19 +0400
Subject: [PATCH 514/676] Allow editing photos in messages in ComposeControls.

---
 .../history_view_compose_controls.cpp         | 207 +++++++++++++++---
 1 file changed, 173 insertions(+), 34 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 93550ba66..4901c3bf9 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -347,7 +347,7 @@ public:
 	void setHistory(const SetHistoryArgs &args);
 	void init();
 
-	void editMessage(FullMsgId id);
+	void editMessage(FullMsgId id, bool photoEditAllowed = false);
 	void replyToMessage(FullMsgId id);
 	void updateForwarding(
 		Data::Thread *thread,
@@ -363,8 +363,10 @@ public:
 	[[nodiscard]] bool readyToForward() const;
 	[[nodiscard]] const HistoryItemsList &forwardItems() const;
 	[[nodiscard]] FullMsgId replyingToMessage() const;
-	[[nodiscard]] rpl::producer<FullMsgId> editMsgId() const;
+	[[nodiscard]] FullMsgId editMsgId() const;
+	[[nodiscard]] rpl::producer<FullMsgId> editMsgIdValue() const;
 	[[nodiscard]] rpl::producer<FullMsgId> scrollToItemRequests() const;
+	[[nodiscard]] rpl::producer<> editPhotoRequests() const;
 	[[nodiscard]] MessageToEdit queryToEdit();
 	[[nodiscard]] WebPageId webPageId() const;
 
@@ -425,16 +427,24 @@ private:
 	HistoryItem *_shownMessage = nullptr;
 	Ui::Text::String _shownMessageName;
 	Ui::Text::String _shownMessageText;
+	std::unique_ptr<Ui::SpoilerAnimation> _shownPreviewSpoiler;
+	Ui::Animations::Simple _inPhotoEditOver;
 	int _shownMessageNameVersion = -1;
-	bool _repaintScheduled = false;
+	bool _shownMessageHasPreview : 1 = false;
+	bool _inPhotoEdit : 1 = false;
+	bool _photoEditAllowed : 1 = false;
+	bool _repaintScheduled : 1 = false;
+	bool _inClickable : 1 = false;
 
 	const not_null<Data::Session*> _data;
 	const not_null<Ui::IconButton*> _cancel;
 
 	QRect _clickableRect;
+	QRect _shownMessagePreviewRect;
 
 	rpl::event_stream<bool> _visibleChanged;
 	rpl::event_stream<FullMsgId> _scrollToItemRequests;
+	rpl::event_stream<> _editPhotoRequests;
 
 };
 
@@ -554,26 +564,45 @@ void FieldHeader::init() {
 	}, lifetime());
 
 	setMouseTracking(true);
-	const auto inClickable = lifetime().make_state<bool>(false);
 	events(
 	) | rpl::filter([=](not_null<QEvent*> event) {
-		return ranges::contains(kMouseEvents, event->type())
+		const auto type = event->type();
+		const auto leaving = (type == QEvent::Leave);
+		return (ranges::contains(kMouseEvents, type) || leaving)
 			&& (isEditingMessage()
 				|| readyToForward()
 				|| replyingToMessage());
 	}) | rpl::start_with_next([=](not_null<QEvent*> event) {
-		const auto type = event->type();
-		const auto e = static_cast<QMouseEvent*>(event.get());
-		const auto pos = e ? e->pos() : mapFromGlobal(QCursor::pos());
-		const auto inPreviewRect = _clickableRect.contains(pos);
-
-		if (type == QEvent::MouseMove) {
-			if (inPreviewRect != *inClickable) {
-				*inClickable = inPreviewRect;
-				setCursor(*inClickable
+		const auto updateOver = [&](bool inClickable, bool inPhotoEdit) {
+			if (_inClickable != inClickable) {
+				_inClickable = inClickable;
+				setCursor(_inClickable
 					? style::cur_pointer
 					: style::cur_default);
 			}
+			if (_inPhotoEdit != inPhotoEdit) {
+				_inPhotoEdit = inPhotoEdit;
+				_inPhotoEditOver.start(
+					[=] { update(); },
+					_inPhotoEdit ? 0. : 1.,
+					_inPhotoEdit ? 1. : 0.,
+					st::defaultMessageBar.duration);
+			}
+		};
+		const auto type = event->type();
+		if (type == QEvent::Leave) {
+			updateOver(false, false);
+			return;
+		}
+		const auto e = static_cast<QMouseEvent*>(event.get());
+		const auto pos = e ? e->pos() : mapFromGlobal(QCursor::pos());
+		const auto inPreviewRect = _clickableRect.contains(pos);
+		const auto inPhotoEdit = _shownMessageHasPreview
+			&& _photoEditAllowed
+			&& _shownMessagePreviewRect.contains(pos);
+
+		if (type == QEvent::MouseMove) {
+			updateOver(inPreviewRect, inPhotoEdit);
 			return;
 		}
 		const auto isLeftIcon = (pos.x() < st::historyReplySkip);
@@ -582,6 +611,8 @@ void FieldHeader::init() {
 			if (isLeftButton && isLeftIcon) {
 				*leftIconPressed = true;
 				update();
+			} else if (isLeftButton && inPhotoEdit) {
+				_editPhotoRequests.fire({});
 			} else if (isLeftButton && inPreviewRect) {
 				if (!isEditingMessage() && readyToForward()) {
 					_forwardPanel->editOptions(_show);
@@ -794,20 +825,74 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
 		}
 	}
 
+	const auto media = _shownMessage->media();
+	_shownMessageHasPreview = media && media->hasReplyPreview();
+	const auto preview = _shownMessageHasPreview
+		? media->replyPreview()
+		: nullptr;
+	const auto spoilered = preview && media->hasSpoiler();
+	if (!spoilered) {
+		_shownPreviewSpoiler = nullptr;
+	} else if (!_shownPreviewSpoiler) {
+		_shownPreviewSpoiler = std::make_unique<Ui::SpoilerAnimation>([=] {
+			update();
+		});
+	}
+	const auto previewSkipValue = st::msgReplyBarSize.height()
+		+ st::msgReplyBarSkip
+		- st::msgReplyBarSize.width()
+		- st::msgReplyBarPos.x();
+	const auto previewSkip = _shownMessageHasPreview ? previewSkipValue : 0;
+	const auto textLeft = replySkip + previewSkip;
+	const auto textAvailableWidth = availableWidth - previewSkip;
+	if (preview) {
+		const auto overEdit = _photoEditAllowed
+			? _inPhotoEditOver.value(_inPhotoEdit ? 1. : 0.)
+			: 0.;
+		const auto to = QRect(
+			replySkip,
+			st::msgReplyPadding.top(),
+			st::msgReplyBarSize.height(),
+			st::msgReplyBarSize.height());
+		p.drawPixmap(to.x(), to.y(), preview->pixSingle(
+			preview->size() / style::DevicePixelRatio(),
+			{
+				.options = Images::Option::RoundSmall,
+				.outer = to.size(),
+			}));
+		if (_shownPreviewSpoiler) {
+			if (overEdit > 0.) {
+				p.setOpacity(1. - overEdit);
+			}
+			Ui::FillSpoilerRect(
+				p,
+				to,
+				Ui::DefaultImageSpoiler().frame(
+					_shownPreviewSpoiler->index(crl::now(), p.inactive())));
+		}
+		if (overEdit > 0.) {
+			p.setOpacity(overEdit);
+			p.fillRect(to, st::historyEditMediaBg);
+			st::historyEditMedia.paintInCenter(p, to);
+			p.setOpacity(1.);
+		}
+
+	}
+
 	p.setPen(st::historyReplyNameFg);
 	p.setFont(st::msgServiceNameFont);
 	_shownMessageName.drawElided(
 		p,
-		replySkip,
+		textLeft,
 		st::msgReplyPadding.top(),
-		availableWidth);
+		textAvailableWidth);
 
 	p.setPen(st::historyComposeAreaFg);
 	_shownMessageText.draw(p, {
 		.position = QPoint(
-			replySkip,
+			textLeft,
 			st::msgReplyPadding.top() + st::msgServiceNameFont->height),
-		.availableWidth = availableWidth,
+		.availableWidth = textAvailableWidth,
 		.palette = &st::historyComposeAreaPalette,
 		.spoiler = Ui::Text::DefaultSpoilerCache(),
 		.now = crl::now(),
@@ -848,6 +933,10 @@ bool FieldHeader::isEditingMessage() const {
 	return !!_editMsgId.current();
 }
 
+FullMsgId FieldHeader::editMsgId() const {
+	return _editMsgId.current();
+}
+
 bool FieldHeader::readyToForward() const {
 	return !_forwardPanel->empty();
 }
@@ -879,10 +968,21 @@ void FieldHeader::updateControlsGeometry(QSize size) {
 		0,
 		width() - st::historyReplySkip - _cancel->width(),
 		height());
+	_shownMessagePreviewRect = QRect(
+		st::historyReplySkip,
+		st::msgReplyPadding.top(),
+		st::msgReplyBarSize.height(),
+		st::msgReplyBarSize.height());
 }
 
-void FieldHeader::editMessage(FullMsgId id) {
+void FieldHeader::editMessage(FullMsgId id, bool photoEditAllowed) {
+	_photoEditAllowed = photoEditAllowed;
 	_editMsgId = id;
+	if (!photoEditAllowed) {
+		_inPhotoEdit = false;
+		_inPhotoEditOver.stop();
+	}
+	update();
 }
 
 void FieldHeader::replyToMessage(FullMsgId id) {
@@ -898,7 +998,7 @@ void FieldHeader::updateForwarding(
 	}
 }
 
-rpl::producer<FullMsgId> FieldHeader::editMsgId() const {
+rpl::producer<FullMsgId> FieldHeader::editMsgIdValue() const {
 	return _editMsgId.value();
 }
 
@@ -906,6 +1006,10 @@ rpl::producer<FullMsgId> FieldHeader::scrollToItemRequests() const {
 	return _scrollToItemRequests.events();
 }
 
+rpl::producer<> FieldHeader::editPhotoRequests() const {
+	return _editPhotoRequests.events();
+}
+
 MessageToEdit FieldHeader::queryToEdit() {
 	const auto item = _data->message(_editMsgId.current());
 	if (!isEditingMessage() || !item) {
@@ -1470,7 +1574,7 @@ void ComposeControls::init() {
 		paintBackground(clip);
 	}, _wrap->lifetime());
 
-	_header->editMsgId(
+	_header->editMsgIdValue(
 	) | rpl::start_with_next([=](const auto &id) {
 		unregisterDraftSources();
 		updateSendButtonType();
@@ -1482,6 +1586,16 @@ void ComposeControls::init() {
 		registerDraftSource();
 	}, _wrap->lifetime());
 
+	_header->editPhotoRequests(
+	) | rpl::start_with_next([=] {
+		EditCaptionBox::StartPhotoEdit(
+			_regularWindow,
+			_photoEditMedia,
+			_editingId,
+			_field->getTextWithTags(),
+			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
+	}, _wrap->lifetime());
+
 	_header->previewCancelled(
 	) | rpl::start_with_next([=] {
 		if (_preview) {
@@ -1521,7 +1635,7 @@ void ComposeControls::init() {
 		_voiceRecordBar->requestToSendWithOptions(options);
 	}, _wrap->lifetime());
 
-	_header->editMsgId(
+	_header->editMsgIdValue(
 	) | rpl::start_with_next([=](const auto &id) {
 		_editingId = id;
 	}, _wrap->lifetime());
@@ -2051,7 +2165,43 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	}
 
 	if (draft == editDraft) {
-		_header->editMessage(editingId);
+		const auto resolve = [=] {
+			if (const auto item = _history->owner().message(editingId)) {
+				const auto media = item->media();
+				_canReplaceMedia = media && media->allowsEditMedia();
+				_photoEditMedia = (_canReplaceMedia
+					&& _regularWindow
+					&& media->photo()
+					&& !media->photo()->isNull())
+					? media->photo()->createMediaView()
+					: nullptr;
+				if (_photoEditMedia) {
+					_photoEditMedia->wanted(
+						Data::PhotoSize::Large,
+						item->fullId());
+				}
+				_header->editMessage(editingId, _photoEditMedia != nullptr);
+				return true;
+			}
+			_canReplaceMedia = false;
+			_photoEditMedia = nullptr;
+			_header->editMessage(editingId, false);
+			return false;
+		};
+		if (!resolve()) {
+			const auto callback = crl::guard(_header.get(), [=] {
+				if (_header->editMsgId() == editingId
+					&& resolve()
+					&& updateReplaceMediaButton()) {
+					updateControlsVisibility();
+					updateControlsGeometry(_wrap->size());
+				}
+			});
+			_history->session().api().requestMessageData(
+				_history->peer,
+				editingId.msg,
+				callback);
+		}
 		_header->replyToMessage({});
 	} else {
 		_canReplaceMedia = false;
@@ -2710,17 +2860,6 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 			cursor,
 			previewState));
 	applyDraft();
-
-	const auto media = item->media();
-	_canReplaceMedia = media && media->allowsEditMedia();
-	_photoEditMedia = (_canReplaceMedia
-		&& media->photo()
-		&& !media->photo()->isNull())
-		? media->photo()->createMediaView()
-		: nullptr;
-	if (_photoEditMedia) {
-		_photoEditMedia->wanted(Data::PhotoSize::Large, item->fullId());
-	}
 	if (updateReplaceMediaButton()) {
 		updateControlsVisibility();
 		updateControlsGeometry(_wrap->size());

From 5dc35bc75f95a935c5b9981a3433cc6cd0b133ea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 12:00:43 +0400
Subject: [PATCH 515/676] Fix userpics in "Who Read" menu.

---
 .../ui/controls/who_reacted_context_action.cpp        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index ae9acc05d..4a7dcb337 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -165,8 +165,9 @@ Action::Action(
 		+ _st.itemStyle.font->height
 		+ st::defaultWhoRead.itemPadding.bottom()) {
 	const auto parent = parentMenu->menu();
-	const auto checkAppeared = [=, now = crl::now()] {
-		_appeared = (crl::now() - now) >= parentMenu->st().duration;
+	const auto delay = anim::Disabled() ? 0 : parentMenu->st().duration;
+	const auto checkAppeared = [=, now = crl::now()](bool force = false) {
+		_appeared = force || ((crl::now() - now) >= delay);
 	};
 
 	setAcceptBoth(true);
@@ -224,8 +225,10 @@ Action::Action(
 	enableMouseSelecting();
 
 	base::call_delayed(parentMenu->st().duration, this, [=] {
-		checkAppeared();
-		updateUserpicsFromContent();
+		if (!_appeared) {
+			checkAppeared(true);
+			updateUserpicsFromContent();
+		}
 	});
 }
 

From 3654c197a9b2de0e92b30a4890abfdefb20c647b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 12:00:57 +0400
Subject: [PATCH 516/676] Fix DirectManipulation scroll events in media viewer.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 535beeb2a..75faf2be5 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -5065,20 +5065,22 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 void OverlayWidget::handleWheelEvent(not_null<QWheelEvent*> e) {
 	constexpr auto step = int(QWheelEvent::DefaultDeltasPerStep);
 
+	const auto acceptForJump = (e->source() == Qt::MouseEventNotSynthesized)
+		|| (e->source() == Qt::MouseEventSynthesizedBySystem);
 	_verticalWheelDelta += e->angleDelta().y();
 	while (qAbs(_verticalWheelDelta) >= step) {
 		if (_verticalWheelDelta < 0) {
 			_verticalWheelDelta += step;
 			if (e->modifiers().testFlag(Qt::ControlModifier)) {
 				zoomOut();
-			} else if (e->source() == Qt::MouseEventNotSynthesized) {
+			} else if (acceptForJump) {
 				moveToNext(1);
 			}
 		} else {
 			_verticalWheelDelta -= step;
 			if (e->modifiers().testFlag(Qt::ControlModifier)) {
 				zoomIn();
-			} else if (e->source() == Qt::MouseEventNotSynthesized) {
+			} else if (acceptForJump) {
 				moveToNext(-1);
 			}
 		}
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 2f0ac3822..91d43ea4b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 2f0ac382289d0584002c007bdf2b3e4464f75b58
+Subproject commit 91d43ea4b50ef1e7df810ab1f14c49e044570734

From ce39431beb14eb658082d447d0d37c0b16088e32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 12:01:53 +0400
Subject: [PATCH 517/676] Don't jump by scroll events in stories viewer.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 75faf2be5..2f2cf164c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -5065,8 +5065,9 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 void OverlayWidget::handleWheelEvent(not_null<QWheelEvent*> e) {
 	constexpr auto step = int(QWheelEvent::DefaultDeltasPerStep);
 
-	const auto acceptForJump = (e->source() == Qt::MouseEventNotSynthesized)
-		|| (e->source() == Qt::MouseEventSynthesizedBySystem);
+	const auto acceptForJump = !_stories
+		&& ((e->source() == Qt::MouseEventNotSynthesized)
+			|| (e->source() == Qt::MouseEventSynthesizedBySystem));
 	_verticalWheelDelta += e->angleDelta().y();
 	while (qAbs(_verticalWheelDelta) >= step) {
 		if (_verticalWheelDelta < 0) {

From 16820139dd6e46ee5d8af73122b2bc6ed34a93f7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 26 Jul 2023 03:25:01 +0300
Subject: [PATCH 518/676] Improved style of stickers settings box.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/boxes/stickers_box.cpp   | 181 +++++++++++-------
 .../chat_helpers/chat_helpers.style           |   6 +
 3 files changed, 115 insertions(+), 73 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e966fe52d..3a6b93532 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1926,6 +1926,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_switch_gifs" = "GIFs";
 "lng_switch_masks" = "Masks";
 "lng_stickers_featured_add" = "Add";
+"lng_stickers_featured_installed" = "Added";
 "lng_emoji_featured_unlock" = "Unlock";
 "lng_emoji_premium_restore" = "Restore";
 "lng_gifs_search" = "Search GIFs";
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 29a16c78e..32295cf08 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -211,7 +211,7 @@ private:
 	void setActionDown(int newActionDown);
 	void setPressed(SelectedRow pressed);
 	void setup();
-	QRect relativeButtonRect(bool removeButton) const;
+	QRect relativeButtonRect(bool removeButton, bool installedSet) const;
 	void ensureRipple(const style::RippleAnimation &st, QImage mask, bool removeButton);
 
 	bool shiftingAnimationCallback(crl::time now);
@@ -234,7 +234,7 @@ private:
 	void readVisibleSets();
 
 	void updateControlsGeometry();
-	void rebuildAppendSet(not_null<StickersSet*> set, int maxNameWidth);
+	void rebuildAppendSet(not_null<StickersSet*> set);
 	void fillSetCover(not_null<StickersSet*> set, DocumentData **outSticker, int *outWidth, int *outHeight) const;
 	int fillSetCount(not_null<StickersSet*> set) const;
 	[[nodiscard]] QString fillSetTitle(
@@ -247,7 +247,7 @@ private:
 	void handleMegagroupSetAddressChange();
 	void setMegagroupSelectedSet(const StickerSetIdentifier &set);
 
-	int countMaxNameWidth() const;
+	int countMaxNameWidth(bool installedSet) const;
 	[[nodiscard]] bool skipPremium() const;
 
 	const std::shared_ptr<ChatHelpers::Show> _show;
@@ -255,9 +255,9 @@ private:
 	MTP::Sender _api;
 
 	const Section _section;
-	const bool _isInstalled;
+	const bool _isInstalledTab;
 
-	Ui::RoundRect _buttonBgOver, _buttonBg;
+	Ui::RoundRect _buttonBgOver, _buttonBg, _inactiveButtonBg;
 
 	int32 _rowHeight = 0;
 
@@ -282,6 +282,8 @@ private:
 	int _addWidth = 0;
 	QString _undoText;
 	int _undoWidth = 0;
+	QString _installedText;
+	int _installedWidth = 0;
 
 	QPoint _mouse;
 	bool _inDragArea = false;
@@ -678,19 +680,19 @@ void StickersBox::refreshTabs() {
 	_tabIndices.clear();
 	auto sections = std::vector<QString>();
 	if (_installed.widget()) {
-		sections.push_back(tr::lng_stickers_installed_tab(tr::now).toUpper());
+		sections.push_back(tr::lng_stickers_installed_tab(tr::now));
 		_tabIndices.push_back(Section::Installed);
 	}
 	if (_masks.widget()) {
-		sections.push_back(tr::lng_stickers_masks_tab(tr::now).toUpper());
+		sections.push_back(tr::lng_stickers_masks_tab(tr::now));
 		_tabIndices.push_back(Section::Masks);
 	}
 	if (!stickers.featuredSetsOrder().isEmpty() && _featured.widget()) {
-		sections.push_back(tr::lng_stickers_featured_tab(tr::now).toUpper());
+		sections.push_back(tr::lng_stickers_featured_tab(tr::now));
 		_tabIndices.push_back(Section::Featured);
 	}
 	if (!archivedSetsOrder().isEmpty() && _archived.widget()) {
-		sections.push_back(tr::lng_stickers_archived_tab(tr::now).toUpper());
+		sections.push_back(tr::lng_stickers_archived_tab(tr::now));
 		_tabIndices.push_back(Section::Archived);
 	}
 	_tabs->setSections(sections);
@@ -771,7 +773,7 @@ void StickersBox::updateTabsGeometry() {
 
 	auto featuredLeft = width() / maxTabs;
 	auto featuredRight = 2 * width() / maxTabs;
-	auto featuredTextWidth = st::stickersTabs.labelStyle.font->width(tr::lng_stickers_featured_tab(tr::now).toUpper());
+	auto featuredTextWidth = st::stickersTabs.labelStyle.font->width(tr::lng_stickers_featured_tab(tr::now));
 	auto featuredTextRight = featuredLeft + (featuredRight - featuredLeft - featuredTextWidth) / 2 + featuredTextWidth;
 	auto unreadBadgeLeft = featuredTextRight - st::stickersFeaturedBadgeSkip;
 	auto unreadBadgeTop = st::stickersFeaturedBadgeTop;
@@ -1133,26 +1135,32 @@ StickersBox::Inner::Inner(
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(section)
-, _isInstalled(_section == Section::Installed || _section == Section::Masks)
+, _isInstalledTab(_section == Section::Installed
+	|| _section == Section::Masks)
 , _buttonBgOver(
-	ImageRoundRadius::Small,
-	(_isInstalled
+	ImageRoundRadius::Large,
+	(_isInstalledTab
 		? st::stickersUndoRemove
 		: st::stickersTrendingAdd).textBgOver)
 , _buttonBg(
-	ImageRoundRadius::Small,
-	(_isInstalled
+	ImageRoundRadius::Large,
+	(_isInstalledTab
 		? st::stickersUndoRemove
 		: st::stickersTrendingAdd).textBg)
+, _inactiveButtonBg(
+	ImageRoundRadius::Large,
+	st::stickersTrendingInstalled.textBg)
 , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
 , _shiftingAnimation([=](crl::time now) {
 	return shiftingAnimationCallback(now);
 })
 , _itemsTop(st::membersMarginTop)
-, _addText(tr::lng_stickers_featured_add(tr::now).toUpper())
+, _addText(tr::lng_stickers_featured_add(tr::now))
 , _addWidth(st::stickersTrendingAdd.font->width(_addText))
-, _undoText(tr::lng_stickers_return(tr::now).toUpper())
-, _undoWidth(st::stickersUndoRemove.font->width(_undoText)) {
+, _undoText(tr::lng_stickers_return(tr::now))
+, _undoWidth(st::stickersUndoRemove.font->width(_undoText))
+, _installedText(tr::lng_stickers_featured_installed(tr::now))
+, _installedWidth(st::stickersTrendingInstalled.font->width(_installedText)) {
 	setup();
 }
 
@@ -1165,17 +1173,21 @@ StickersBox::Inner::Inner(
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(StickersBox::Section::Installed)
-, _isInstalled(_section == Section::Installed || _section == Section::Masks)
+, _isInstalledTab(_section == Section::Installed
+	|| _section == Section::Masks)
 , _buttonBgOver(
-	ImageRoundRadius::Small,
-	(_isInstalled
+	ImageRoundRadius::Large,
+	(_isInstalledTab
 		? st::stickersUndoRemove
 		: st::stickersTrendingAdd).textBgOver)
 , _buttonBg(
-	ImageRoundRadius::Small,
-	(_isInstalled
+	ImageRoundRadius::Large,
+	(_isInstalledTab
 		? st::stickersUndoRemove
 		: st::stickersTrendingAdd).textBg)
+, _inactiveButtonBg(
+	ImageRoundRadius::Large,
+	st::stickersTrendingInstalled.textBg)
 , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
 , _shiftingAnimation([=](crl::time now) {
 	return shiftingAnimationCallback(now);
@@ -1295,15 +1307,23 @@ void StickersBox::Inner::updateControlsGeometry() {
 	}
 }
 
-QRect StickersBox::Inner::relativeButtonRect(bool removeButton) const {
+QRect StickersBox::Inner::relativeButtonRect(
+		bool removeButton,
+		bool installedSet) const {
 	auto buttonw = st::stickersRemove.width;
 	auto buttonh = st::stickersRemove.height;
 	auto buttonshift = st::stickersRemoveSkip;
 	if (!removeButton) {
-		const auto &st = _isInstalled
+		const auto &st = installedSet
+			? st::stickersTrendingInstalled
+			: _isInstalledTab
 			? st::stickersUndoRemove
 			: st::stickersTrendingAdd;
-		const auto textWidth = _isInstalled ? _undoWidth : _addWidth;
+		const auto textWidth = installedSet
+			? _installedWidth
+			: _isInstalledTab
+			? _undoWidth
+			: _addWidth;
 		buttonw = textWidth - st.width;
 		buttonh = st.height;
 		buttonshift = 0;
@@ -1332,7 +1352,7 @@ void StickersBox::Inner::paintRow(Painter &p, not_null<Row*> row, int index) {
 		}
 	}
 
-	if (_isInstalled) {
+	if (_isInstalledTab) {
 		if (index >= 0 && index == _above) {
 			auto current = _aboveShadowFadeOpacity.current();
 			if (_started >= 0) {
@@ -1359,13 +1379,13 @@ void StickersBox::Inner::paintRow(Painter &p, not_null<Row*> row, int index) {
 		paintFakeButton(p, row, index);
 	}
 
-	if (row->removed && _isInstalled) {
+	if (row->removed && _isInstalledTab) {
 		p.setOpacity(st::stickersRowDisabledOpacity);
 	}
 
 	auto stickerx = st::contactsPadding.left();
 
-	if (!_megagroupSet && _isInstalled) {
+	if (!_megagroupSet && _isInstalledTab) {
 		stickerx += st::stickersReorderIcon.width() + st::stickersReorderSkip;
 		if (!row->isRecentSet()) {
 			st::stickersReorderIcon.paint(p, st::contactsPadding.left(), (_rowHeight - st::stickersReorderIcon.height()) / 2, width());
@@ -1553,7 +1573,7 @@ void StickersBox::Inner::updateRowThumbnail(not_null<Row*> row) {
 		Unexpected("StickersBox::Inner::updateRowThumbnail: row not found");
 	}();
 	const auto left = st::contactsPadding.left()
-		+ ((!_megagroupSet && _isInstalled)
+		+ ((!_megagroupSet && _isInstalledTab)
 			? st::stickersReorderIcon.width() + st::stickersReorderSkip
 			: 0);
 	update(
@@ -1564,14 +1584,19 @@ void StickersBox::Inner::updateRowThumbnail(not_null<Row*> row) {
 }
 
 void StickersBox::Inner::paintFakeButton(Painter &p, not_null<Row*> row, int index) {
-	auto removeButton = (_isInstalled && !row->removed);
-	auto rect = relativeButtonRect(removeButton);
-	if (!_isInstalled && row->isInstalled() && !row->isArchived() && !row->removed) {
-		// Checkbox after installed from Trending or Archived.
-		int checkx = width() - (st::contactsPadding.right() + st::contactsCheckPosition.x() + (rect.width() + st::stickersFeaturedInstalled.width()) / 2);
-		int checky = st::contactsPadding.top() + (st::contactsPhotoSize - st::stickersFeaturedInstalled.height()) / 2;
-		st::stickersFeaturedInstalled.paint(p, QPoint(checkx, checky), width());
+	const auto removeButton = (_isInstalledTab && !row->removed);
+	if (!_isInstalledTab && row->isInstalled() && !row->isArchived() && !row->removed) {
+		// Round button "Added" after installed from Trending or Archived.
+		const auto rect = relativeButtonRect(removeButton, true);
+		const auto &st = st::stickersTrendingInstalled;
+		const auto textWidth = _installedWidth;
+		const auto &text = _installedText;
+		_inactiveButtonBg.paint(p, myrtlrect(rect));
+		p.setFont(st.font);
+		p.setPen(st.textFg);
+		p.drawTextLeft(rect.x() - (st.width / 2), rect.y() + st.textTop, width(), text, textWidth);
 	} else {
+		const auto rect = relativeButtonRect(removeButton, false);
 		auto selected = (index == _actionSel && _actionDown < 0) || (index == _actionDown);
 		if (removeButton) {
 			// Trash icon button when not disabled in Installed.
@@ -1589,11 +1614,11 @@ void StickersBox::Inner::paintFakeButton(Painter &p, not_null<Row*> row, int ind
 		} else {
 			// Round button ADD when not installed from Trending or Archived.
 			// Or round button UNDO after disabled from Installed.
-			const auto &st = _isInstalled
+			const auto &st = _isInstalledTab
 				? st::stickersUndoRemove
 				: st::stickersTrendingAdd;
-			const auto textWidth = _isInstalled ? _undoWidth : _addWidth;
-			const auto &text = _isInstalled ? _undoText : _addText;
+			const auto textWidth = _isInstalledTab ? _undoWidth : _addWidth;
+			const auto &text = _isInstalledTab ? _undoText : _addText;
 			(selected ? _buttonBgOver : _buttonBg).paint(p, myrtlrect(rect));
 			if (row->ripple) {
 				row->ripple->paint(p, rect.x(), rect.y(), width());
@@ -1618,7 +1643,7 @@ void StickersBox::Inner::mousePressEvent(QMouseEvent *e) {
 		setActionDown(_actionSel);
 		update(0, _itemsTop + _actionSel * _rowHeight, width(), _rowHeight);
 	} else if (auto selectedIndex = std::get_if<int>(&_selected)) {
-		if (_isInstalled && !_rows[*selectedIndex]->isRecentSet() && _inDragArea) {
+		if (_isInstalledTab && !_rows[*selectedIndex]->isRecentSet() && _inDragArea) {
 			_above = _dragging = _started = *selectedIndex;
 			_dragStart = mapFromGlobal(_mouse);
 		}
@@ -1640,12 +1665,12 @@ void StickersBox::Inner::setActionDown(int newActionDown) {
 	if (_actionDown >= 0 && _actionDown < _rows.size()) {
 		update(0, _itemsTop + _actionDown * _rowHeight, width(), _rowHeight);
 		const auto row = _rows[_actionDown].get();
-		auto removeButton = (_isInstalled && !row->removed);
+		auto removeButton = (_isInstalledTab && !row->removed);
 		if (!row->ripple) {
-			if (_isInstalled) {
+			if (_isInstalledTab) {
 				if (row->removed) {
 					auto rippleSize = QSize(_undoWidth - st::stickersUndoRemove.width, st::stickersUndoRemove.height);
-					auto rippleMask = Ui::RippleAnimation::RoundRectMask(rippleSize, st::roundRadiusSmall);
+					auto rippleMask = Ui::RippleAnimation::RoundRectMask(rippleSize, st::roundRadiusLarge);
 					ensureRipple(st::stickersUndoRemove.ripple, std::move(rippleMask), removeButton);
 				} else {
 					auto rippleSize = st::stickersRemove.rippleAreaSize;
@@ -1654,12 +1679,12 @@ void StickersBox::Inner::setActionDown(int newActionDown) {
 				}
 			} else if (!row->isInstalled() || row->isArchived() || row->removed) {
 				auto rippleSize = QSize(_addWidth - st::stickersTrendingAdd.width, st::stickersTrendingAdd.height);
-				auto rippleMask = Ui::RippleAnimation::RoundRectMask(rippleSize, st::roundRadiusSmall);
+				auto rippleMask = Ui::RippleAnimation::RoundRectMask(rippleSize, st::roundRadiusLarge);
 				ensureRipple(st::stickersTrendingAdd.ripple, std::move(rippleMask), removeButton);
 			}
 		}
 		if (row->ripple) {
-			auto rect = relativeButtonRect(removeButton);
+			auto rect = relativeButtonRect(removeButton, false);
 			row->ripple->add(mapFromGlobal(QCursor::pos()) - QPoint(myrtlrect(rect).x(), _itemsTop + _actionDown * _rowHeight + rect.y()));
 		}
 	}
@@ -1722,7 +1747,7 @@ void StickersBox::Inner::setPressed(SelectedRow pressed) {
 
 void StickersBox::Inner::ensureRipple(const style::RippleAnimation &st, QImage mask, bool removeButton) {
 	_rows[_actionDown]->ripple = std::make_unique<Ui::RippleAnimation>(st, std::move(mask), [this, index = _actionDown, removeButton] {
-		update(myrtlrect(relativeButtonRect(removeButton).translated(0, _itemsTop + index * _rowHeight)));
+		update(myrtlrect(relativeButtonRect(removeButton, false).translated(0, _itemsTop + index * _rowHeight)));
 	});
 }
 
@@ -1785,14 +1810,14 @@ void StickersBox::Inner::updateSelected() {
 			selected = selectedIndex;
 			local.setY(local.y() - _itemsTop - selectedIndex * _rowHeight);
 			const auto row = _rows[selectedIndex].get();
-			if (!_megagroupSet && (_isInstalled || !row->isInstalled() || row->isArchived() || row->removed)) {
-				auto removeButton = (_isInstalled && !row->removed);
-				auto rect = myrtlrect(relativeButtonRect(removeButton));
+			if (!_megagroupSet && (_isInstalledTab || !row->isInstalled() || row->isArchived() || row->removed)) {
+				auto removeButton = (_isInstalledTab && !row->removed);
+				auto rect = myrtlrect(relativeButtonRect(removeButton, false));
 				actionSel = rect.contains(local) ? selectedIndex : -1;
 			} else {
 				actionSel = -1;
 			}
-			if (!_megagroupSet && _isInstalled && !row->isRecentSet()) {
+			if (!_megagroupSet && _isInstalledTab && !row->isRecentSet()) {
 				auto dragAreaWidth = st::contactsPadding.left() + st::stickersReorderIcon.width() + st::stickersReorderSkip;
 				auto dragArea = myrtlrect(0, 0, dragAreaWidth, _rowHeight);
 				inDragArea = dragArea.contains(local);
@@ -1816,7 +1841,7 @@ void StickersBox::Inner::updateSelected() {
 void StickersBox::Inner::updateCursor() {
 	setCursor(_inDragArea
 		? style::cur_sizeall
-		: (!_megagroupSet && _isInstalled)
+		: (!_megagroupSet && _isInstalledTab)
 		? ((_actionSel >= 0 && (_actionDown < 0 || _actionDown == _actionSel))
 			? style::cur_pointer
 			: style::cur_default)
@@ -1841,7 +1866,7 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 	_mouse = e->globalPos();
 	updateSelected();
 	if (_actionDown == _actionSel && _actionSel >= 0) {
-		if (_isInstalled) {
+		if (_isInstalledTab) {
 			setRowRemoved(_actionDown, !_rows[_actionDown]->removed);
 		} else if (_installSetCallback) {
 			_installSetCallback(_rows[_actionDown]->set->id);
@@ -2079,15 +2104,15 @@ void StickersBox::Inner::rebuildMegagroupSet() {
 	}
 
 	const auto set = it->second.get();
-	auto maxNameWidth = countMaxNameWidth();
-	auto titleWidth = 0;
-	auto title = fillSetTitle(set, maxNameWidth, &titleWidth);
 	auto count = fillSetCount(set);
 	auto sticker = (DocumentData*)nullptr;
 	auto pixw = 0, pixh = 0;
 	fillSetCover(set, &sticker, &pixw, &pixh);
 	auto flagsOverride = SetFlag::Installed;
 	auto removed = false;
+	auto maxNameWidth = countMaxNameWidth(!_isInstalledTab);
+	auto titleWidth = 0;
+	auto title = fillSetTitle(set, maxNameWidth, &titleWidth);
 	if (!_megagroupSelectedSet
 		|| _megagroupSelectedSet->set->id != set->id) {
 		_megagroupSetField->setText(set->shortName);
@@ -2125,8 +2150,6 @@ void StickersBox::Inner::rebuild(bool masks) {
 		rebuildMegagroupSet();
 	}
 
-	auto maxNameWidth = countMaxNameWidth();
-
 	_oldRows = std::move(_rows);
 	clear();
 	const auto &order = ([&]() -> const StickersSetsOrder & {
@@ -2155,12 +2178,12 @@ void StickersBox::Inner::rebuild(bool masks) {
 			? tr::lng_stickers_group_from_featured(tr::now)
 			: tr::lng_stickers_group_from_your(tr::now));
 		updateControlsGeometry();
-	} else if (_isInstalled) {
+	} else if (_isInstalledTab) {
 		const auto cloudIt = sets.find((_section == Section::Masks)
 			? Data::Stickers::CloudRecentAttachedSetId
 			: Data::Stickers::CloudRecentSetId); // Section::Installed.
 		if (cloudIt != sets.cend() && !cloudIt->second->stickers.isEmpty()) {
-			rebuildAppendSet(cloudIt->second.get(), maxNameWidth);
+			rebuildAppendSet(cloudIt->second.get());
 		}
 	}
 	for (const auto setId : order) {
@@ -2170,7 +2193,7 @@ void StickersBox::Inner::rebuild(bool masks) {
 		}
 
 		const auto set = it->second.get();
-		rebuildAppendSet(set, maxNameWidth);
+		rebuildAppendSet(set);
 
 		if (set->stickers.isEmpty()
 			|| (set->flags & SetFlag::NotLoaded)) {
@@ -2205,7 +2228,8 @@ void StickersBox::Inner::updateSize(int newWidth) {
 }
 
 void StickersBox::Inner::updateRows() {
-	int maxNameWidth = countMaxNameWidth();
+	const auto maxNameWidth = countMaxNameWidth(false);
+	const auto maxNameWidthInstalled = countMaxNameWidth(true);
 	const auto &sets = session().data().stickers().sets();
 	for (const auto &row : _rows) {
 		const auto it = sets.find(row->set->id);
@@ -2231,7 +2255,7 @@ void StickersBox::Inner::updateRows() {
 			auto wasInstalled = row->isInstalled();
 			auto wasArchived = row->isArchived();
 			row->flagsOverride = fillSetFlags(set);
-			if (_isInstalled) {
+			if (_isInstalledTab) {
 				row->flagsOverride &= ~SetFlag::Archived;
 			}
 			if (row->isInstalled() != wasInstalled
@@ -2239,7 +2263,14 @@ void StickersBox::Inner::updateRows() {
 				row->ripple.reset();
 			}
 		}
-		row->title = fillSetTitle(set, maxNameWidth, &row->titleWidth);
+		const auto installedSet = (!_isInstalledTab
+			&& row->isInstalled()
+			&& !row->isArchived()
+			&& !row->removed);
+		row->title = fillSetTitle(
+			set,
+			installedSet ? maxNameWidthInstalled : maxNameWidth,
+			&row->titleWidth);
 		row->count = fillSetCount(set);
 	}
 	update();
@@ -2251,7 +2282,7 @@ bool StickersBox::Inner::appendSet(not_null<StickersSet*> set) {
 			return false;
 		}
 	}
-	rebuildAppendSet(set, countMaxNameWidth());
+	rebuildAppendSet(set);
 	return true;
 }
 
@@ -2259,18 +2290,20 @@ bool StickersBox::Inner::skipPremium() const {
 	return !_session->premiumPossible();
 }
 
-int StickersBox::Inner::countMaxNameWidth() const {
+int StickersBox::Inner::countMaxNameWidth(bool installedSet) const {
 	int namex = st::contactsPadding.left() + st::contactsPhotoSize + st::contactsPadding.left();
-	if (!_megagroupSet && _isInstalled) {
+	if (!_megagroupSet && _isInstalledTab) {
 		namex += st::stickersReorderIcon.width() + st::stickersReorderSkip;
 	}
 	int namew = st::boxWideWidth - namex - st::contactsPadding.right() - st::contactsCheckPosition.x();
-	if (_isInstalled) {
+	if (_isInstalledTab) {
 		if (!_megagroupSet) {
 			namew -= _undoWidth - st::stickersUndoRemove.width;
 		}
 	} else {
-		namew -= _addWidth - st::stickersTrendingAdd.width;
+		namew -= installedSet
+			? (_installedWidth - st::stickersTrendingInstalled.width)
+			: (_addWidth - st::stickersTrendingAdd.width);
 		if (_section == Section::Featured) {
 			namew -= st::stickersFeaturedUnreadSize + st::stickersFeaturedUnreadSkip;
 		}
@@ -2278,14 +2311,12 @@ int StickersBox::Inner::countMaxNameWidth() const {
 	return namew;
 }
 
-void StickersBox::Inner::rebuildAppendSet(
-		not_null<StickersSet*> set,
-		int maxNameWidth) {
+void StickersBox::Inner::rebuildAppendSet(not_null<StickersSet*> set) {
 	auto flagsOverride = (set->id != Data::Stickers::CloudRecentSetId)
 		? fillSetFlags(set)
 		: SetFlag::Installed;
 	auto removed = false;
-	if (_isInstalled && (flagsOverride & SetFlag::Archived)) {
+	if (_isInstalledTab && (flagsOverride & SetFlag::Archived)) {
 		return;
 	}
 
@@ -2293,6 +2324,10 @@ void StickersBox::Inner::rebuildAppendSet(
 	int pixw = 0, pixh = 0;
 	fillSetCover(set, &sticker, &pixw, &pixh);
 
+	const auto maxNameWidth = countMaxNameWidth(!_isInstalledTab
+		&& (flagsOverride & SetFlag::Installed)
+		&& !(flagsOverride & SetFlag::Archived)
+		&& !removed);
 	int titleWidth = 0;
 	QString title = fillSetTitle(set, maxNameWidth, &titleWidth);
 	int count = fillSetCount(set);
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index b1b3583ac..cf5961705 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -288,6 +288,12 @@ stickersTrendingAdd: RoundButton(defaultActiveButton) {
 	height: 26px;
 	textTop: 4px;
 }
+stickersTrendingInstalled: RoundButton(stickersTrendingAdd) {
+	textFg: activeButtonBg;
+	textFgOver: activeButtonBgOver;
+	textBg: activeButtonSecondaryFg;
+	textBgOver: activeButtonSecondaryFgOver;
+}
 stickersRemove: IconButton(defaultIconButton) {
 	width: 40px;
 	height: 40px;

From 16e5792f3af481a6309cb76ac823ac304674e5d6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 26 Jul 2023 04:23:14 +0300
Subject: [PATCH 519/676] Improved style of buttons in stickers search results.

---
 .../chat_helpers/chat_helpers.style           |  3 -
 .../chat_helpers/stickers_list_widget.cpp     | 81 ++++++++++++-------
 .../chat_helpers/stickers_list_widget.h       |  8 +-
 .../SourceFiles/media/view/media_view.style   |  1 -
 4 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index cf5961705..e791a7a35 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -105,7 +105,6 @@ EmojiPan {
 	trendingHeaderFg: color;
 	trendingSubheaderFg: color;
 	trendingUnreadFg: color;
-	trendingInstalled: icon;
 	overBg: color;
 	pathBg: color;
 	pathFg: color;
@@ -330,7 +329,6 @@ stickersFeaturedUnreadBg: msgFileInBg;
 stickersFeaturedUnreadSize: 5px;
 stickersFeaturedUnreadSkip: 5px;
 stickersFeaturedUnreadTop: 7px;
-stickersFeaturedInstalled: icon {{ "chat/input_save", lightButtonFg }};
 
 stickersMaxHeight: 320px;
 stickersPadding: margins(19px, 13px, 19px, 13px);
@@ -597,7 +595,6 @@ defaultEmojiPan: EmojiPan {
 	trendingHeaderFg: stickersTrendingHeaderFg;
 	trendingSubheaderFg: stickersTrendingSubheaderFg;
 	trendingUnreadFg: stickersFeaturedUnreadBg;
-	trendingInstalled: stickersFeaturedInstalled;
 	overBg: emojiPanHover;
 	pathBg: windowBgRipple;
 	pathFg: windowBgOver;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index afee47efd..3675c0483 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -186,7 +186,7 @@ StickersListWidget::StickersListWidget(
 , _mode(descriptor.mode)
 , _show(std::move(descriptor.show))
 , _features(descriptor.features)
-, _overBg(st::roundRadiusSmall, st().overBg)
+, _overBg(st::roundRadiusLarge, st().overBg)
 , _api(&session().mtp())
 , _localSetsManager(std::make_unique<LocalStickersManager>(&session()))
 , _section(Section::Stickers)
@@ -194,22 +194,27 @@ StickersListWidget::StickersListWidget(
 , _updateItemsTimer([=] { updateItems(); })
 , _updateSetsTimer([=] { updateSets(); })
 , _trendingAddBgOver(
-	ImageRoundRadius::Small,
+	ImageRoundRadius::Large,
 	st::stickersTrendingAdd.textBgOver)
-, _trendingAddBg(ImageRoundRadius::Small, st::stickersTrendingAdd.textBg)
+, _trendingAddBg(ImageRoundRadius::Large, st::stickersTrendingAdd.textBg)
+, _inactiveButtonBg(
+	ImageRoundRadius::Large,
+	st::stickersTrendingInstalled.textBg)
 , _groupCategoryAddBgOver(
-	ImageRoundRadius::Small,
+	ImageRoundRadius::Large,
 	st::stickerGroupCategoryAdd.textBgOver)
 , _groupCategoryAddBg(
-	ImageRoundRadius::Small,
+	ImageRoundRadius::Large,
 	st::stickerGroupCategoryAdd.textBg)
 , _pathGradient(std::make_unique<Ui::PathShiftGradient>(
 	st().pathBg,
 	st().pathFg,
 	[=] { update(); }))
 , _megagroupSetAbout(st::columnMinimalWidthThird - st::emojiScroll.width - st().headerLeft)
-, _addText(tr::lng_stickers_featured_add(tr::now).toUpper())
+, _addText(tr::lng_stickers_featured_add(tr::now))
 , _addWidth(st::stickersTrendingAdd.font->width(_addText))
+, _installedText(tr::lng_stickers_featured_installed(tr::now))
+, _installedWidth(st::stickersTrendingInstalled.font->width(_installedText))
 , _settings(this, tr::lng_stickers_you_have(tr::now))
 , _previewTimer([=] { showPreview(); })
 , _premiumMark(std::make_unique<StickerPremiumMark>(&session()))
@@ -896,26 +901,40 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				: loadedCount;
 
 			auto widthForTitle = stickersRight() - (st().headerLeft - st().margin.left());
-			if (featuredHasAddButton(info.section)) {
-				auto add = featuredAddRect(info);
-				auto selected = selectedButton ? (selectedButton->section == info.section) : false;
-				(selected ? _trendingAddBgOver : _trendingAddBg).paint(p, myrtlrect(add));
+			{
+				const auto installedSet = !featuredHasAddButton(info.section);
+				const auto add = featuredAddRect(info, installedSet);
+				const auto selected = selectedButton
+					? (selectedButton->section == info.section)
+					: false;
+				(installedSet
+					? _inactiveButtonBg
+					: selected
+					? _trendingAddBgOver
+					: _trendingAddBg).paint(p, myrtlrect(add));
 				if (set.ripple) {
 					set.ripple->paint(p, add.x(), add.y(), width());
 					if (set.ripple->empty()) {
 						set.ripple.reset();
 					}
 				}
-				p.setFont(st::stickersTrendingAdd.font);
-				p.setPen(selected ? st::stickersTrendingAdd.textFgOver : st::stickersTrendingAdd.textFg);
-				p.drawTextLeft(add.x() - (st::stickersTrendingAdd.width / 2), add.y() + st::stickersTrendingAdd.textTop, width(), _addText, _addWidth);
+				const auto &text = installedSet ? _installedText : _addText;
+				const auto textWidth = installedSet
+					? _installedWidth
+					: _addWidth;
+				const auto &st = installedSet
+					? st::stickersTrendingInstalled
+					: st::stickersTrendingAdd;
+				p.setFont(st.font);
+				p.setPen(selected ? st.textFgOver : st.textFg);
+				p.drawTextLeft(
+					add.x() - (st.width / 2),
+					add.y() + st.textTop,
+					width(),
+					text,
+					textWidth);
 
-				widthForTitle -= add.width() - (st::stickersTrendingAdd.width / 2);
-			} else {
-				auto add = featuredAddRect(info);
-				int checkx = add.left() + (add.width() - st::stickersFeaturedInstalled.width()) / 2;
-				int checky = add.top() + (add.height() - st::stickersFeaturedInstalled.height()) / 2;
-				st().trendingInstalled.paint(p, QPoint(checkx, checky), width());
+				widthForTitle -= add.width() - (st.width / 2);
 			}
 			if (set.flags & SetFlag::Unread) {
 				widthForTitle -= st::stickersFeaturedUnreadSize + st::stickersFeaturedUnreadSkip;
@@ -1453,14 +1472,17 @@ bool StickersListWidget::featuredHasAddButton(int index) const {
 }
 
 QRect StickersListWidget::featuredAddRect(int index) const {
-	return featuredAddRect(sectionInfo(index));
+	return featuredAddRect(sectionInfo(index), false);
 }
 
-QRect StickersListWidget::featuredAddRect(const SectionInfo &info) const {
-	auto addw = _addWidth - st::stickersTrendingAdd.width;
-	auto addh = st::stickersTrendingAdd.height;
-	auto addx = stickersRight() - addw;
-	auto addy = info.top + st::stickersTrendingAddTop;
+QRect StickersListWidget::featuredAddRect(
+		const SectionInfo &info,
+		bool installedSet) const {
+	const auto addw = (installedSet ? _installedWidth : _addWidth)
+		- st::stickersTrendingAdd.width;
+	const auto addh = st::stickersTrendingAdd.height;
+	const auto addx = stickersRight() - addw;
+	const auto addy = info.top + st::stickersTrendingAddTop;
 	return QRect(addx, addy, addw, addh);
 }
 
@@ -1536,7 +1558,7 @@ void StickersListWidget::setPressed(OverState newPressed) {
 	} else if (std::get_if<OverGroupAdd>(&_pressed)) {
 		if (!_megagroupSetButtonRipple) {
 			auto maskSize = _megagroupSetButtonRect.size();
-			auto mask = Ui::RippleAnimation::RoundRectMask(maskSize, st::roundRadiusSmall);
+			auto mask = Ui::RippleAnimation::RoundRectMask(maskSize, st::roundRadiusLarge);
 			_megagroupSetButtonRipple = std::make_unique<Ui::RippleAnimation>(st::stickerGroupCategoryAdd.ripple, std::move(mask), [this] {
 				rtlupdate(megagroupSetButtonRectFinal());
 			});
@@ -1564,7 +1586,7 @@ std::unique_ptr<Ui::RippleAnimation> StickersListWidget::createButtonRipple(int
 
 	if (shownSets()[section].externalLayout) {
 		auto maskSize = QSize(_addWidth - st::stickersTrendingAdd.width, st::stickersTrendingAdd.height);
-		auto mask = Ui::RippleAnimation::RoundRectMask(maskSize, st::roundRadiusSmall);
+		auto mask = Ui::RippleAnimation::RoundRectMask(maskSize, st::roundRadiusLarge);
 		return std::make_unique<Ui::RippleAnimation>(
 			st::stickersTrendingAdd.ripple,
 			std::move(mask),
@@ -1740,6 +1762,7 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 			Assert(button->section >= 0 && button->section < sets.size());
 			if (sets[button->section].externalLayout) {
 				_localSetsManager->install(sets[button->section].id);
+				update();
 			} else {
 				removeSet(sets[button->section].id);
 			}
@@ -2354,7 +2377,7 @@ void StickersListWidget::updateSelected() {
 		if (p.y() >= info.top && p.y() < info.rowsTop) {
 			if (hasRemoveButton(section) && myrtlrect(removeButtonRect(info)).contains(p.x(), p.y())) {
 				newSelected = OverButton{ section };
-			} else if (featuredHasAddButton(section) && myrtlrect(featuredAddRect(info)).contains(p.x(), p.y())) {
+			} else if (featuredHasAddButton(section) && myrtlrect(featuredAddRect(info, false)).contains(p.x(), p.y())) {
 				newSelected = OverButton{ section };
 			} else if (_features.openStickerSets
 				&& !(sets[section].flags & SetFlag::Special)) {
@@ -2557,7 +2580,7 @@ void StickersListWidget::showMegagroupSet(ChannelData *megagroup) {
 			_megagroupSetAbout.setText(
 				st::stickerGroupCategoryAbout,
 				tr::lng_group_stickers_description(tr::now));
-			_megagroupSetButtonText = tr::lng_group_stickers_add(tr::now).toUpper();
+			_megagroupSetButtonText = tr::lng_group_stickers_add(tr::now);
 			refreshMegagroupSetGeometry();
 		}
 		_megagroupSetButtonRipple.reset();
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index 6e2c2fa04..2e1ef9c1c 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -302,7 +302,9 @@ private:
 	[[nodiscard]] int stickersRight() const;
 	[[nodiscard]] bool featuredHasAddButton(int index) const;
 	[[nodiscard]] QRect featuredAddRect(int index) const;
-	[[nodiscard]] QRect featuredAddRect(const SectionInfo &info) const;
+	[[nodiscard]] QRect featuredAddRect(
+		const SectionInfo &info,
+		bool installedSet) const;
 	[[nodiscard]] bool hasRemoveButton(int index) const;
 	[[nodiscard]] QRect removeButtonRect(int index) const;
 	[[nodiscard]] QRect removeButtonRect(const SectionInfo &info) const;
@@ -392,7 +394,7 @@ private:
 	OverState _pressed;
 	QPoint _lastMousePosition;
 
-	Ui::RoundRect _trendingAddBgOver, _trendingAddBg;
+	Ui::RoundRect _trendingAddBgOver, _trendingAddBg, _inactiveButtonBg;
 	Ui::RoundRect _groupCategoryAddBgOver, _groupCategoryAddBg;
 
 	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
@@ -405,6 +407,8 @@ private:
 
 	QString _addText;
 	int _addWidth;
+	QString _installedText;
+	int _installedWidth;
 
 	object_ptr<Ui::LinkButton> _settings;
 
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index c15460c9e..adf770688 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -571,7 +571,6 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 	trendingHeaderFg: storiesComposeWhiteText;
 	trendingSubheaderFg: storiesComposeGrayText;
 	trendingUnreadFg: storiesComposeBlue;
-	trendingInstalled: icon {{ "chat/input_save", storiesComposeBlue }};
 	overBg: storiesComposeBgOver;
 	pathBg: storiesComposeBgRipple;
 	pathFg: storiesComposeBgOver;

From b6e2360f5121830caecf42d11beacb6bb5845055 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 12:37:10 +0400
Subject: [PATCH 520/676] Version 4.8.9.

- Bug fixes and other minor improvements.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 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 2d99765a2..a0e82f806 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.8.8.0" />
+    Version="4.8.9.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 207ce5673..1253b7043 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,8,8,0
- PRODUCTVERSION 4,8,8,0
+ FILEVERSION 4,8,9,0
+ PRODUCTVERSION 4,8,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.8.0"
+            VALUE "FileVersion", "4.8.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.8.0"
+            VALUE "ProductVersion", "4.8.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 65a32e4a7..cb1aed9eb 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,8,8,0
- PRODUCTVERSION 4,8,8,0
+ FILEVERSION 4,8,9,0
+ PRODUCTVERSION 4,8,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.8.0"
+            VALUE "FileVersion", "4.8.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.8.0"
+            VALUE "ProductVersion", "4.8.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 630dfd075..4f1c6194a 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 = 4008008;
-constexpr auto AppVersionStr = "4.8.8";
+constexpr auto AppVersion = 4008009;
+constexpr auto AppVersionStr = "4.8.9";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index a0acebbbd..3bbc47084 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008008
+AppVersion         4008009
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.8
-AppVersionStr      4.8.8
+AppVersionStrSmall 4.8.9
+AppVersionStr      4.8.9
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.8
+AppVersionOriginal 4.8.9
diff --git a/changelog.txt b/changelog.txt
index 0e476e2f1..4c503803a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.9 (26.07.23)
+
+- Bug fixes and other minor improvements.
+
 4.8.8 (25.07.23)
 
 - Several crash fixes and story viewer improvements.

From 770880b74bef0763708501d8a70b0eab9a7f7233 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 12:32:55 +0400
Subject: [PATCH 521/676] Version 4.8.9: Add hiding X button to stories
 tooltip.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  5 +-
 .../dialogs/ui/dialogs_stories_list.cpp       | 58 +++++++++++++++++--
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 0e877db81..88e1239be 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -562,6 +562,9 @@ dialogsStoriesListInfo: DialogsStoriesList(dialogsStoriesList) {
 dialogsStoriesListMine: DialogsStoriesList(dialogsStoriesListInfo) {
 	readOpacity: 1.;
 }
-dialogsStoriesTooltip: defaultImportantTooltip;
+dialogsStoriesTooltip: ImportantTooltip(defaultImportantTooltip) {
+	padding: margins(0px, 0px, 0px, 0px);
+}
 dialogsStoriesTooltipLabel: defaultImportantTooltipLabel;
 dialogsStoriesTooltipMaxWidth: 200px;
+dialogsStoriesTooltipHide: size(14px, 14px);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 83b73ec7d..d71e8663d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -16,11 +16,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/tooltip.h"
+#include "ui/abstract_button.h"
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QWindow>
+#include <QtGui/QPainter>
 
 #include "base/debug_log.h"
 
@@ -34,6 +36,7 @@ constexpr auto kCollapseAfterRatio = 0.68;
 constexpr auto kFrictionRatio = 0.15;
 constexpr auto kExpandCatchUpDuration = crl::time(200);
 constexpr auto kMaxTooltipNames = 3;
+constexpr auto kStoriesTooltipHideBgOpacity = 0.2;
 
 [[nodiscard]] int AvailableNameWidth(const style::DialogsStoriesList &st) {
 	const auto &full = st.full;
@@ -42,6 +45,55 @@ constexpr auto kMaxTooltipNames = 3;
 	return full.photoLeft * 2 + full.photo - 2 * skip;
 }
 
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeTooltipContent(
+		not_null<QWidget*> parent,
+		rpl::producer<TextWithEntities> text,
+		Fn<void()> hide) {
+	const auto size = st::dialogsStoriesTooltipHide;
+	const auto buttonw = size.width();
+	const auto skip = st::defaultImportantTooltip.padding.right();
+	auto result = object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
+		parent,
+		Ui::MakeNiceTooltipLabel(
+			parent,
+			std::move(text),
+			st::dialogsStoriesTooltipMaxWidth,
+			st::dialogsStoriesTooltipLabel),
+		(st::defaultImportantTooltip.padding
+			+ QMargins(0, 0, skip + buttonw, 0)));
+	const auto button = Ui::CreateChild<Ui::AbstractButton>(result.data());
+	result->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		const auto buttonh = button->height();
+		button->resize(skip * 2 + buttonw, size.height());
+		button->moveToRight(0, 0, size.width());
+	}, button->lifetime());
+	button->setClickedCallback(std::move(hide));
+	button->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(button);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::importantTooltipFg);
+		p.setOpacity(kStoriesTooltipHideBgOpacity);
+		const auto rect = style::centerrect(
+			button->rect(),
+			QRect(QPoint(), size));
+		const auto center = QRectF(rect).center();
+		const auto half = QSizeF(rect.size()) / 6.;
+		const auto phalf = QPointF(half.width(), half.height());
+		const auto mhalf = QPointF(-half.width(), half.height());
+		p.drawEllipse(rect);
+		p.setOpacity(1.);
+		auto pen = st::importantTooltipFg->p;
+		pen.setWidthF(style::ConvertScaleExact(sqrtf(2.)));
+		p.setPen(pen);
+		p.drawLine(center - phalf, center + phalf);
+		p.drawLine(center - mhalf, center + mhalf);
+	}, button->lifetime());
+	return result;
+}
+
 } // namespace
 
 struct List::Layout {
@@ -876,15 +928,13 @@ void List::setShowTooltip(rpl::producer<bool> shown, Fn<void()> hide) {
 	};
 	_tooltip = std::make_unique<Ui::ImportantTooltip>(
 		window,
-		Ui::MakeNiceTooltipLabel(
+		MakeTooltipContent(
 			window,
 			_tooltipText.value() | rpl::filter(notEmpty),
-			st::dialogsStoriesTooltipMaxWidth,
-			st::dialogsStoriesTooltipLabel),
+			_tooltipHide),
 		st::dialogsStoriesTooltip);
 	const auto tooltip = _tooltip.get();
 	const auto weak = QPointer<QWidget>(tooltip);
-	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
 	tooltip->toggleFast(false);
 	updateTooltipGeometry();
 

From e6a80927c62dabb49b82717fac94d9472b5c058c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 13:46:58 +0400
Subject: [PATCH 522/676] Version 4.8.9: Fix build with GCC.

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

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index d71e8663d..eaa5c89dd 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -64,7 +64,6 @@ constexpr auto kStoriesTooltipHideBgOpacity = 0.2;
 	const auto button = Ui::CreateChild<Ui::AbstractButton>(result.data());
 	result->sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
-		const auto buttonh = button->height();
 		button->resize(skip * 2 + buttonw, size.height());
 		button->moveToRight(0, 0, size.width());
 	}, button->lifetime());

From ebbef70d420a6713858f5d3ec6e929fc70eeedc2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 26 Jul 2023 18:40:02 +0300
Subject: [PATCH 523/676] Removed self from contacts list.

---
 .../SourceFiles/boxes/peer_list_controllers.cpp   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 5831ec0b5..335531fc9 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -59,7 +59,20 @@ constexpr auto kSearchPerPage = 50;
 object_ptr<Ui::BoxContent> PrepareContactsBox(
 		not_null<Window::SessionController*> sessionController) {
 	using Mode = ContactsBoxController::SortMode;
-	auto controller = std::make_unique<ContactsBoxController>(
+	class Controller final : public ContactsBoxController {
+	public:
+		using ContactsBoxController::ContactsBoxController;
+
+	protected:
+		std::unique_ptr<PeerListRow> createRow(
+				not_null<UserData*> user) override {
+			return !user->isSelf()
+				? ContactsBoxController::createRow(user)
+				: nullptr;
+		}
+
+	};
+	auto controller = std::make_unique<Controller>(
 		&sessionController->session());
 	controller->setStyleOverrides(&st::contactsWithStories);
 	controller->setStoriesShown(true);

From 73373e373ffb38566da0c4ac9f7bc20488943e2a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 26 Jul 2023 22:23:45 +0300
Subject: [PATCH 524/676] Moved important tooltip for stories in dialogs to
 MainWidget.

---
 Telegram/SourceFiles/core/core_settings.h     |  3 ++
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 25 +++++----
 .../dialogs/ui/dialogs_stories_list.cpp       | 53 ++++++++++++-------
 .../dialogs/ui/dialogs_stories_list.h         |  5 +-
 4 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index aec34560c..72468e755 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -802,6 +802,9 @@ public:
 	[[nodiscard]] std::optional<uint64> macRoundIconDigest() const {
 		return _macRoundIconDigest;
 	}
+	[[nodiscard]] bool storiesClickTooltipHidden() const {
+		return _storiesClickTooltipHidden.current();
+	}
 	[[nodiscard]] rpl::producer<bool> storiesClickTooltipHiddenValue() const {
 		return _storiesClickTooltipHidden.value();
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 8fe35aba2..7a147a3c6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -798,16 +798,21 @@ void Widget::setupStories() {
 		_scroll->viewportEvent(e);
 	}, _stories->lifetime());
 
-	const auto hideTooltip = [=] {
-		Core::App().settings().setStoriesClickTooltipHidden(true);
-		Core::App().saveSettingsDelayed();
-	};
-	_stories->setShowTooltip(
-		rpl::combine(
-			Core::App().settings().storiesClickTooltipHiddenValue(),
-			shownValue(),
-			!rpl::mappers::_1 && rpl::mappers::_2),
-		hideTooltip);
+	if (!Core::App().settings().storiesClickTooltipHidden()) {
+		// Don't create tooltip
+		// until storiesClickTooltipHidden can be returned to false.
+		const auto hideTooltip = [=] {
+			Core::App().settings().setStoriesClickTooltipHidden(true);
+			Core::App().saveSettingsDelayed();
+		};
+		_stories->setShowTooltip(
+			parentWidget(),
+			rpl::combine(
+				Core::App().settings().storiesClickTooltipHiddenValue(),
+				shownValue(),
+				!rpl::mappers::_1 && rpl::mappers::_2),
+			hideTooltip);
+	}
 
 	_storiesContents.fire(Stories::ContentForSession(
 		&controller()->session(),
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index eaa5c89dd..4fed6d154 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -916,19 +916,21 @@ TextWithEntities List::computeTooltipText() const {
 		Ui::Text::WithEntities);
 }
 
-void List::setShowTooltip(rpl::producer<bool> shown, Fn<void()> hide) {
+void List::setShowTooltip(
+		not_null<QWidget*> tooltipParent,
+		rpl::producer<bool> shown,
+		Fn<void()> hide) {
 	_tooltip = nullptr;
 	_tooltipHide = std::move(hide);
 	_tooltipNotHidden = std::move(shown);
 	_tooltipText = computeTooltipText();
-	const auto window = this->window();
 	const auto notEmpty = [](const TextWithEntities &text) {
 		return !text.empty();
 	};
 	_tooltip = std::make_unique<Ui::ImportantTooltip>(
-		window,
+		tooltipParent,
 		MakeTooltipContent(
-			window,
+			tooltipParent,
 			_tooltipText.value() | rpl::filter(notEmpty),
 			_tooltipHide),
 		st::dialogsStoriesTooltip);
@@ -937,7 +939,7 @@ void List::setShowTooltip(rpl::producer<bool> shown, Fn<void()> hide) {
 	tooltip->toggleFast(false);
 	updateTooltipGeometry();
 
-	const auto handle = window->windowHandle();
+	const auto handle = tooltipParent->window()->windowHandle();
 	auto windowActive = rpl::single(
 		handle->isActive()
 	) | rpl::then(base::qt_signal_producer(
@@ -947,16 +949,29 @@ void List::setShowTooltip(rpl::producer<bool> shown, Fn<void()> hide) {
 		return handle->isActive();
 	})) | rpl::distinct_until_changed();
 
-	for (auto parent = parentWidget()
-		; parent != window
-		; parent = parent->parentWidget()) {
+	{
+		const auto recompute = [=] {
+			updateTooltipGeometry();
+			tooltip->raise();
+		};
 		using namespace base;
-		install_event_filter(parent, tooltip, [=](not_null<QEvent*> e) {
-			if (e->type() == QEvent::Move) {
-				updateTooltipGeometry();
+		using Event = not_null<QEvent*>;
+		install_event_filter(tooltip, tooltipParent, [=](Event e) {
+			if ((e->type() == QEvent::Move)
+				|| (e->type() == QEvent::ChildAdded)
+				|| (e->type() == QEvent::ChildRemoved)) {
+				recompute();
 			}
 			return EventFilterResult::Continue;
 		});
+		for (const auto &child : tooltipParent->children()) {
+			install_event_filter(tooltip, child, [=](Event e) {
+				if (e->type() == QEvent::ZOrderChange) {
+					recompute();
+				}
+				return EventFilterResult::Continue;
+			});
+		}
 	}
 
 	rpl::combine(
@@ -985,14 +1000,16 @@ void List::toggleTooltip(bool fast) {
 		&& _tooltipNotHidden.current()
 		&& !_tooltipText.current().empty()
 		&& window()->windowHandle()->isActive();
+	if (_tooltip) {
+		if (fast) {
+			_tooltip->toggleFast(shown);
+		} else {
+			_tooltip->toggleAnimated(shown);
+		}
+	}
 	if (shown) {
 		updateTooltipGeometry();
 	}
-	if (fast) {
-		_tooltip->toggleFast(shown);
-	} else {
-		_tooltip->toggleAnimated(shown);
-	}
 }
 
 void List::updateTooltipGeometry() {
@@ -1001,7 +1018,7 @@ void List::updateTooltipGeometry() {
 	}
 	const auto collapsed = collapsedGeometryCurrent();
 	const auto geometry = Ui::MapFrom(
-		window(),
+		_tooltip->parentWidget(),
 		parentWidget(),
 		QRect(
 			collapsed.geometry.x(),
@@ -1012,7 +1029,7 @@ void List::updateTooltipGeometry() {
 	const auto countPosition = [=](QSize size) {
 		const auto left = geometry.x()
 			+ (geometry.width() - size.width()) / 2;
-		const auto right = window()->width()
+		const auto right = _tooltip->parentWidget()->width()
 			- st::dialogsStoriesTooltip.padding.right();
 		return QPoint(
 			std::max(std::min(left, right - size.width()), 0),
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index 9ecf28394..ea2f2f36c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -73,7 +73,10 @@ public:
 		QPoint positionSmall,
 		style::align alignSmall,
 		QRect geometryFull = QRect());
-	void setShowTooltip(rpl::producer<bool> shown, Fn<void()> hide);
+	void setShowTooltip(
+		not_null<QWidget*> tooltipParent,
+		rpl::producer<bool> shown,
+		Fn<void()> hide);
 	struct CollapsedGeometry {
 		QRect geometry;
 		float64 expanded = 0.;

From 4017d8db7c3a6ea0d88ea9243782a1a77ad90fac Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 28 Jul 2023 02:44:20 +0300
Subject: [PATCH 525/676] Removed Save button from box for bot username
 editing.

---
 Telegram/Resources/langs/lang.strings       | 2 +-
 Telegram/SourceFiles/boxes/username_box.cpp | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3a6b93532..acfe54a1d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -433,7 +433,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_usernames_deactivate_description" = "Do you want to hide this link from the channel info page?";
 "lng_channel_usernames_description" = "Drag and drop links to change the order in which they will be displayed on the channel info page.";
 
-"lng_bot_username_title" = "Username";
+"lng_bot_username_title" = "Public Link";
 "lng_bot_username_description1" = "This link cannot be edited. You can acquire additional usernames on {link}.";
 "lng_bot_username_description1_link" = "Fragment";
 "lng_bot_usernames_activate_description" = "Do you want to show this link on the bot info page?";
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 8e7ccd244..ded98183a 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -393,8 +393,12 @@ void UsernamesBox(
 	editor->submitted(
 	) | rpl::start_with_next(finish, editor->lifetime());
 
-	box->addButton(tr::lng_settings_save(), finish);
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	if (isBot) {
+		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
+	} else {
+		box->addButton(tr::lng_settings_save(), finish);
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	}
 }
 
 void AddUsernameCheckLabel(

From 19ba685cc3e125de7546af4d4ae3b4102ef718b3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 28 Jul 2023 03:28:29 +0300
Subject: [PATCH 526/676] Added ability to mark as read all chats from menu of
 filter button.

---
 .../window/window_filters_menu.cpp            | 68 +++++++++++++------
 .../SourceFiles/window/window_peer_menu.cpp   |  7 +-
 .../SourceFiles/window/window_peer_menu.h     |  4 +-
 3 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 657e0165d..b606be053 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -40,6 +40,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Window {
 namespace {
 
+[[nodiscard]] Dialogs::UnreadState MainListMapUnreadState(
+		not_null<Main::Session*> session,
+		const Dialogs::UnreadState &state) {
+	const auto folderId = Data::Folder::kId;
+	if (const auto folder = session->data().folderLoaded(folderId)) {
+		return state - folder->chatsList()->unreadState();
+	}
+	return state;
+}
+
 [[nodiscard]] rpl::producer<Dialogs::UnreadState> MainListUnreadState(
 		not_null<Dialogs::MainList*> list) {
 	return rpl::single(rpl::empty) | rpl::then(
@@ -59,11 +69,7 @@ namespace {
 	return MainListUnreadState(
 		session->data().chatsList()
 	) | rpl::map([=](const Dialogs::UnreadState &state) {
-		const auto folderId = Data::Folder::kId;
-		if (const auto folder = session->data().folderLoaded(folderId)) {
-			return state - folder->chatsList()->unreadState();
-		}
-		return state;
+		return MainListMapUnreadState(session, state);
 	});
 }
 
@@ -331,7 +337,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 		raw->setAcceptDrops(true);
 		raw->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
-			return ((e->type() == QEvent::ContextMenu) && (id > 0))
+			return ((e->type() == QEvent::ContextMenu) && (id >= 0))
 				|| e->type() == QEvent::DragEnter
 				|| e->type() == QEvent::DragMove
 				|| e->type() == QEvent::DragLeave;
@@ -368,7 +374,7 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 		return;
 	}
 	const auto i = _filters.find(id);
-	if (i == end(_filters)) {
+	if ((i == end(_filters)) && id) {
 		return;
 	}
 	_popupMenu = base::make_unique_q<Ui::PopupMenu>(
@@ -382,23 +388,41 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 			args.icon);
 	});
 
-	addAction(
-		tr::lng_filters_context_edit(tr::now),
-		[=] { showEditBox(id); },
-		&st::menuIconEdit);
+	if (id) {
+		addAction(
+			tr::lng_filters_context_edit(tr::now),
+			[=] { showEditBox(id); },
+			&st::menuIconEdit);
 
-	auto filteredChats = [=] {
-		return _session->session().data().chatsFilters().chatsList(id);
-	};
-	Window::MenuAddMarkAsReadChatListAction(
-		_session,
-		std::move(filteredChats),
-		addAction);
+		auto filteredChats = [=] {
+			return _session->session().data().chatsFilters().chatsList(id);
+		};
+		Window::MenuAddMarkAsReadChatListAction(
+			_session,
+			std::move(filteredChats),
+			addAction);
 
-	addAction(
-		tr::lng_filters_context_remove(tr::now),
-		[=] { showRemoveBox(id); },
-		&st::menuIconDelete);
+		addAction(
+			tr::lng_filters_context_remove(tr::now),
+			[=] { showRemoveBox(id); },
+			&st::menuIconDelete);
+	} else {
+		auto customUnreadState = [=] {
+			const auto session = &_session->session();
+			return MainListMapUnreadState(
+				session,
+				session->data().chatsList()->unreadState());
+		};
+		Window::MenuAddMarkAsReadChatListAction(
+			_session,
+			[=] { return _session->session().data().chatsList(); },
+			addAction,
+			std::move(customUnreadState));
+	}
+	if (_popupMenu->empty()) {
+		_popupMenu = nullptr;
+		return;
+	}
 	_popupMenu->popup(position);
 }
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 7b908dc47..9098b9112 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2299,9 +2299,12 @@ void MenuAddMarkAsReadAllChatsAction(
 void MenuAddMarkAsReadChatListAction(
 		not_null<Window::SessionController*> controller,
 		Fn<not_null<Dialogs::MainList*>()> &&list,
-		const PeerMenuCallback &addAction) {
+		const PeerMenuCallback &addAction,
+		Fn<Dialogs::UnreadState()> customUnreadState) {
 	// There is no async to make weak from controller.
-	const auto unreadState = list()->unreadState();
+	const auto unreadState = customUnreadState
+		? customUnreadState()
+		: list()->unreadState();
 	if (!unreadState.messages && !unreadState.marks && !unreadState.chats) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 7fde1f407..d5808fbf5 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -32,6 +32,7 @@ class Thread;
 namespace Dialogs {
 class MainList;
 struct EntryState;
+struct UnreadState;
 } // namespace Dialogs
 
 namespace ChatHelpers {
@@ -69,7 +70,8 @@ void MenuAddMarkAsReadAllChatsAction(
 void MenuAddMarkAsReadChatListAction(
 	not_null<Window::SessionController*> controller,
 	Fn<not_null<Dialogs::MainList*>()> &&list,
-	const PeerMenuCallback &addAction);
+	const PeerMenuCallback &addAction,
+	Fn<Dialogs::UnreadState()> customUnreadState = nullptr);
 
 void PeerMenuExportChat(not_null<PeerData*> peer);
 void PeerMenuDeleteContact(

From a08e42fb97fde33ddab3456724df448e6e7e3d0c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 28 Jul 2023 03:56:38 +0300
Subject: [PATCH 527/676] Moved edit folders button from folders menu to
 context menu.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../window/window_filters_menu.cpp            | 31 ++++++++++++-------
 .../SourceFiles/window/window_filters_menu.h  |  1 +
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index acfe54a1d..9730225d2 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3587,6 +3587,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_restore" = "Undo";
 "lng_filters_new" = "New Folder";
 "lng_filters_edit" = "Edit Folder";
+"lng_filters_setup_menu" = "Edit Folders";
 "lng_filters_new_name" = "Folder name";
 "lng_filters_add_chats" = "Add chats";
 "lng_filters_remove_chats" = "Remove chats";
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index b606be053..c6c34a0d9 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -320,17 +320,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 		} else if (id >= 0) {
 			_session->setActiveChatsFilter(id);
 		} else {
-			const auto filters = &_session->session().data().chatsFilters();
-			if (filters->suggestedLoaded()) {
-				_session->showSettings(Settings::Folders::Id());
-			} else if (!_waitingSuggested) {
-				_waitingSuggested = true;
-				filters->requestSuggested();
-				filters->suggestedUpdated(
-				) | rpl::take(1) | rpl::start_with_next([=] {
-					_session->showSettings(Settings::Folders::Id());
-				}, _outer.lifetime());
-			}
+			openFiltersSettings();
 		}
 	});
 	if (id >= 0) {
@@ -368,6 +358,20 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 	return button;
 }
 
+void FiltersMenu::openFiltersSettings() {
+	const auto filters = &_session->session().data().chatsFilters();
+	if (filters->suggestedLoaded()) {
+		_session->showSettings(Settings::Folders::Id());
+	} else if (!_waitingSuggested) {
+		_waitingSuggested = true;
+		filters->requestSuggested();
+		filters->suggestedUpdated(
+		) | rpl::take(1) | rpl::start_with_next([=] {
+			_session->showSettings(Settings::Folders::Id());
+		}, _outer.lifetime());
+	}
+}
+
 void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	if (_popupMenu) {
 		_popupMenu = nullptr;
@@ -418,6 +422,11 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 			[=] { return _session->session().data().chatsList(); },
 			addAction,
 			std::move(customUnreadState));
+
+		addAction(
+			tr::lng_filters_setup_menu(tr::now),
+			[=] { openFiltersSettings(); },
+			&st::menuIconEdit);
 	}
 	if (_popupMenu->empty()) {
 		_popupMenu = nullptr;
diff --git a/Telegram/SourceFiles/window/window_filters_menu.h b/Telegram/SourceFiles/window/window_filters_menu.h
index a4084164b..ee71510ea 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.h
+++ b/Telegram/SourceFiles/window/window_filters_menu.h
@@ -52,6 +52,7 @@ private:
 	void showRemoveBox(FilterId id);
 	void remove(FilterId id, std::vector<not_null<PeerData*>> leave = {});
 	void scrollToButton(not_null<Ui::RpWidget*> widget);
+	void openFiltersSettings();
 
 	const not_null<SessionController*> _session;
 	const not_null<Ui::RpWidget*> _parent;

From 7149119098c3c0b52cccbc67b88b5d632448f901 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 28 Jul 2023 04:11:12 +0300
Subject: [PATCH 528/676] Fixed style of media player controls.

---
 Telegram/SourceFiles/media/player/media_player.style | 12 ++++++++----
 .../SourceFiles/media/player/media_player_widget.cpp |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/media/player/media_player.style b/Telegram/SourceFiles/media/player/media_player.style
index 841cc3e5c..5e5a3ec8b 100644
--- a/Telegram/SourceFiles/media/player/media_player.style
+++ b/Telegram/SourceFiles/media/player/media_player.style
@@ -106,7 +106,7 @@ mediaPlayerRepeatButton: IconButton {
 	icon: icon {
 		{ "player/player_repeat", mediaPlayerActiveFg }
 	};
-	iconPosition: point(3px, 6px);
+	iconPosition: point(2px, 5px);
 
 	rippleAreaPosition: point(2px, 6px);
 	rippleAreaSize: 24px;
@@ -135,6 +135,10 @@ mediaPlayerReverseDisabledIconOver: icon {
 mediaPlayerShuffleIcon: icon {
 	{ "player/player_shuffle", mediaPlayerActiveFg }
 };
+mediaPlayerOrderButton: IconButton(mediaPlayerRepeatButton) {
+	iconPosition: point(2px, 6px);
+	rippleAreaPosition: point(2px, 6px);
+}
 mediaPlayerRepeatDisabledRippleBg: windowBgOver;
 
 mediaPlayerPlayButton: IconButton(mediaPlayerRepeatButton) {
@@ -233,7 +237,7 @@ mediaPlayerVolumeToggle: IconButton(mediaPlayerRepeatButton) {
 		{ "player/player_mini_full", mediaPlayerActiveFg },
 	};
 	iconPosition: point(5px, 6px);
-	rippleAreaPosition: point(4px, 5px);
+	rippleAreaPosition: point(5px, 6px);
 }
 mediaPlayerVolumeMargin: 10px;
 mediaPlayerVolumeSize: size(27px, 100px);
@@ -267,9 +271,9 @@ mediaPlayerClose: IconButton(mediaPlayerRepeatButton) {
 	width: 39px;
 	icon: icon {{ "player/panel_close", menuIconFg }};
 	iconOver: icon {{ "player/panel_close", menuIconFgOver }};
-	iconPosition: point(5px, 6px);
+	iconPosition: point(4px, 6px);
 
-	rippleAreaPosition: point(4px, 5px);
+	rippleAreaPosition: point(4px, 6px);
 	ripple: RippleAnimation(defaultRippleAnimation) {
 		color: windowBgOver;
 	}
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index d9be06b6d..abe1c738c 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -55,7 +55,7 @@ Widget::Widget(
 , _playPause(this, st::mediaPlayerPlayButton)
 , _volumeToggle(rightControls(), st::mediaPlayerVolumeToggle)
 , _repeatToggle(rightControls(), st::mediaPlayerRepeatButton)
-, _orderToggle(rightControls(), st::mediaPlayerRepeatButton)
+, _orderToggle(rightControls(), st::mediaPlayerOrderButton)
 , _speedToggle(rightControls(), st::mediaPlayerSpeedButton)
 , _close(this, st::mediaPlayerClose)
 , _shadow(this)

From b663edff09a772180e09560465e314b29f358292 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 27 Jul 2023 18:26:26 +0400
Subject: [PATCH 529/676] Improve silent stories playback.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 2f2cf164c..04d814478 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3698,6 +3698,7 @@ bool OverlayWidget::createStreamingObjects() {
 	_streamed->instance.setPriority(kOverlayLoaderPriority);
 	_streamed->instance.lockPlayer();
 	_streamed->withSound = _document
+		&& !_document->isSilentVideo()
 		&& (_document->isAudioFile()
 			|| _document->isVideoFile()
 			|| _document->isVoiceMessage()
@@ -4038,12 +4039,14 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 	};
 	if (!_streamed->withSound) {
 		options.mode = Streaming::Mode::Video;
-		options.loop = true;
+		options.loop = !_stories;
 	} else {
 		Assert(_document != nullptr);
 		const auto messageId = _message ? _message->fullId() : FullMsgId();
 		options.audioId = AudioMsgId(_document, messageId);
-		options.speed = Core::App().settings().videoPlaybackSpeed();
+		options.speed = _stories
+			? Core::App().settings().videoPlaybackSpeed()
+			: 1.;
 		if (_pip) {
 			_pip = nullptr;
 		}
@@ -4111,7 +4114,7 @@ void OverlayWidget::playbackControlsSpeedChanged(float64 speed) {
 		Core::App().settings().setVideoPlaybackSpeed(speed);
 		Core::App().saveSettingsDelayed();
 	}
-	if (_streamed && _streamed->controls) {
+	if (_streamed && _streamed->controls && !_stories) {
 		DEBUG_LOG(("Media playback speed: %1 to _streamed.").arg(speed));
 		_streamed->instance.setSpeed(speed);
 	}

From 48687d443fc32beea619c14c9b8ecec383c118cf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 27 Jul 2023 23:48:41 +0400
Subject: [PATCH 530/676] Use message date instead of file date.

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

diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 2f8609ace..cae666b37 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -1020,7 +1020,7 @@ Document::Document(
 , _forceFileLayout(fields.forceFileLayout)
 , _date(langDateTime(base::unixtime::parse(fields.dateOverride
 	? fields.dateOverride
-	: _data->date)))
+	: parent->date())))
 , _ext(_generic.ext)
 , _datew(st::normalFont->width(_date)) {
 	_name.setMarkedText(

From e59e7d9b9745e4ee9d74626974671a7147c90859 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 27 Jul 2023 20:51:53 +0400
Subject: [PATCH 531/676] Correct check for scheduled message ids.

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

diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index e2a69482e..8033fba9c 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -185,7 +185,8 @@ rpl::producer<SparseIdsMergedSlice> SharedScheduledMediaViewer(
 		SharedMediaMergedKey key,
 		int limitBefore,
 		int limitAfter) {
-	Expects(!IsServerMsgId(key.mergedKey.universalId));
+	Expects(!key.mergedKey.universalId
+		|| Data::IsScheduledMsgId(key.mergedKey.universalId));
 	Expects((key.mergedKey.universalId != 0)
 		|| (limitBefore == 0 && limitAfter == 0));
 

From fcd1062d783582a84c157f017ee4bf9b0ae9a3c2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 12:09:51 +0400
Subject: [PATCH 532/676] Use message date instead of file date in voices.

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

diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index cae666b37..9ac811f19 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -700,7 +700,7 @@ Voice::Voice(
 
 	updateName();
 	const auto dateText = Ui::Text::Link(
-		langDateTime(base::unixtime::parse(_data->date))); // Link 1.
+		langDateTime(base::unixtime::parse(parent->date()))); // Link 1.
 	_details.setMarkedText(
 		st::defaultTextStyle,
 		tr::lng_date_and_duration(

From 7d1725b339ecf1ea6fc483af711cab94a4912c5e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 12:10:01 +0400
Subject: [PATCH 533/676] Simplify ordering of stories tooltip.

---
 .../SourceFiles/dialogs/dialogs_widget.cpp     |  9 +++++++++
 Telegram/SourceFiles/dialogs/dialogs_widget.h  |  1 +
 .../dialogs/ui/dialogs_stories_list.cpp        | 18 +++++++-----------
 .../dialogs/ui/dialogs_stories_list.h          |  2 ++
 Telegram/SourceFiles/mainwidget.cpp            |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 7a147a3c6..11e7b2f1b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1386,6 +1386,15 @@ void Widget::jumpToTop(bool belowPinned) {
 	}
 }
 
+void Widget::raiseWithTooltip() {
+	raise();
+	if (_stories) {
+		Ui::PostponeCall(this, [=] {
+			_stories->raiseTooltip();
+		});
+	}
+}
+
 void Widget::scrollToDefault(bool verytop) {
 	if (verytop) {
 		//_scroll->verticalScrollBar()->setMinimum(0);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index 9473ac348..e1d1a64ef 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -98,6 +98,7 @@ public:
 	void setInnerFocus();
 
 	void jumpToTop(bool belowPinned = false);
+	void raiseWithTooltip();
 
 	void startWidthAnimation();
 	void stopWidthAnimation();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 4fed6d154..f99091721 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -957,21 +957,11 @@ void List::setShowTooltip(
 		using namespace base;
 		using Event = not_null<QEvent*>;
 		install_event_filter(tooltip, tooltipParent, [=](Event e) {
-			if ((e->type() == QEvent::Move)
-				|| (e->type() == QEvent::ChildAdded)
-				|| (e->type() == QEvent::ChildRemoved)) {
+			if (e->type() == QEvent::ChildAdded) {
 				recompute();
 			}
 			return EventFilterResult::Continue;
 		});
-		for (const auto &child : tooltipParent->children()) {
-			install_event_filter(tooltip, child, [=](Event e) {
-				if (e->type() == QEvent::ZOrderChange) {
-					recompute();
-				}
-				return EventFilterResult::Continue;
-			});
-		}
 	}
 
 	rpl::combine(
@@ -993,6 +983,12 @@ void List::setShowTooltip(
 	}, tooltip->lifetime());
 }
 
+void List::raiseTooltip() {
+	if (_tooltip) {
+		_tooltip->raise();
+	}
+}
+
 void List::toggleTooltip(bool fast) {
 	const auto shown = !_expanded
 		&& !_expandedAnimation.animating()
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index ea2f2f36c..24468850a 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -77,6 +77,8 @@ public:
 		not_null<QWidget*> tooltipParent,
 		rpl::producer<bool> shown,
 		Fn<void()> hide);
+	void raiseTooltip();
+
 	struct CollapsedGeometry {
 		QRect geometry;
 		float64 expanded = 0.;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 4b46807d0..8abf9f2d2 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1926,7 +1926,7 @@ void MainWidget::showBackFromStack(
 
 void MainWidget::orderWidgets() {
 	if (_dialogs) {
-		_dialogs->raise();
+		_dialogs->raiseWithTooltip();
 	}
 	if (_player) {
 		_player->raise();

From 815e9d246203a84a814d90bdc21a0dbe94c6c84e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 12:19:14 +0400
Subject: [PATCH 534/676] Call viewMessage only when marking as read.

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

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 5074219da..eedd0b81c 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1052,6 +1052,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	_translateTracker->startBunch();
 	auto readTill = (HistoryItem*)nullptr;
 	auto readContents = base::flat_set<not_null<HistoryItem*>>();
+	const auto markingAsViewed = _widget->markingContentsRead();
 	const auto guard = gsl::finally([&] {
 		if (_pinnedItem) {
 			_translateTracker->add(_pinnedItem);
@@ -1060,7 +1061,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 		if (readTill && _widget->markingMessagesRead()) {
 			session().data().histories().readInboxTill(readTill);
 		}
-		if (!readContents.empty() && _widget->markingContentsRead()) {
+		if (markingAsViewed && !readContents.empty()) {
 			session().api().markContentsRead(readContents);
 		}
 		_userpicsCache.clear();
@@ -1093,7 +1094,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			} else if (isUnread) {
 				readTill = item;
 			}
-			if (item->hasViews()) {
+			if (markingAsViewed && item->hasViews()) {
 				session().api().views().scheduleIncrement(item);
 			}
 			if (withReaction) {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 5903fa94b..1e2648125 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -2059,12 +2059,13 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 	}
 	auto readTill = (HistoryItem*)nullptr;
 	auto readContents = base::flat_set<not_null<HistoryItem*>>();
+	const auto markingAsViewed = markingMessagesRead();
 	const auto guard = gsl::finally([&] {
 		if (_translateTracker) {
 			_delegate->listAddTranslatedItems(_translateTracker.get());
 			_translateTracker->finishBunch();
 		}
-		if (readTill && markingMessagesRead()) {
+		if (markingAsViewed && readTill) {
 			_delegate->listMarkReadTill(readTill);
 		}
 		if (!readContents.empty() && markingContentsRead()) {
@@ -2136,7 +2137,7 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 			} else if (isUnread) {
 				readTill = item;
 			}
-			if (item->hasViews()) {
+			if (markingAsViewed && item->hasViews()) {
 				session->api().views().scheduleIncrement(item);
 			}
 			if (withReaction) {

From f58171b50b5b620d584b4cbc7ed0dcb1950508be Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 20:45:04 +0400
Subject: [PATCH 535/676] Fix tooltips in group calls.

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

diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 8af7d3f0d..a240ce118 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -2060,6 +2060,7 @@ void Panel::showNiceTooltip(
 			(normal ? widget().get() : container),
 			std::move(text),
 			st::groupCallNiceTooltipLabel);
+		label->resizeToNaturalWidth(label->naturalWidth());
 		if (normal) {
 			return label;
 		}

From 61f4defa4d4872631e827aa604468f564a854296 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 21:20:06 +0400
Subject: [PATCH 536/676] Partially revert "Support and use share comment in
 stories."

Send sharing comment as a separate message, like in posts sharing.
---
 .../SourceFiles/data/data_media_types.cpp     | 21 ++++++++++++---
 .../history/view/history_view_element.cpp     |  8 ++----
 .../stories/media_stories_controller.cpp      |  2 +-
 .../media/stories/media_stories_share.cpp     | 27 +++++++------------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index e623df3a5..19d89c500 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1995,11 +1995,18 @@ MediaStory::MediaStory(
 	owner->registerStoryItem(storyId, parent);
 
 	const auto stories = &owner->stories();
-	const auto maybeStory = stories->lookup(storyId);
-	if (!maybeStory) {
+	if (const auto maybeStory = stories->lookup(storyId)) {
+		if (!_mention) {
+			parent->setText((*maybeStory)->caption());
+		}
+	} else {
 		if (maybeStory.error() == NoStory::Unknown) {
 			stories->resolve(storyId, crl::guard(this, [=] {
-				if (!stories->lookup(storyId)) {
+				if (const auto maybeStory = stories->lookup(storyId)) {
+					if (!_mention) {
+						parent->setText((*maybeStory)->caption());
+					}
+				} else {
 					_expired = true;
 				}
 				if (_mention) {
@@ -2051,7 +2058,9 @@ TextWithEntities MediaStory::notificationText() const {
 				&& maybeStory.error() == Data::NoStory::Deleted))
 			? tr::lng_in_dlg_story_expired
 			: tr::lng_in_dlg_story)(tr::now),
-		parent()->originalText());
+		(maybeStory
+			? (*maybeStory)->caption()
+			: TextWithEntities()));
 }
 
 QString MediaStory::pinnedTextSubstring() const {
@@ -2091,6 +2100,9 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	const auto stories = &parent()->history()->owner().stories();
 	const auto maybeStory = stories->lookup(_storyId);
 	if (!maybeStory) {
+		if (!_mention) {
+			realParent->setText(TextWithEntities());
+		}
 		if (maybeStory.error() == Data::NoStory::Deleted) {
 			_expired = true;
 			return nullptr;
@@ -2112,6 +2124,7 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 			message,
 			std::make_unique<HistoryView::StoryMention>(message, story));
 	} else {
+		realParent->setText(story->caption());
 		if (const auto photo = story->photo()) {
 			return std::make_unique<HistoryView::Photo>(
 				message,
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index f86159d38..0503f04ff 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -846,12 +846,8 @@ void Element::validateText() {
 		_media = nullptr;
 		if (!storyMention) {
 			if (_text.isEmpty()) {
-				auto now = Ui::Text::Italic(
-					tr::lng_forwarded_story_expired(tr::now));
-				if (!text.empty()) {
-					now.append(u"\n\n"_q).append(text);
-				}
-				setTextWithLinks(std::move(now));
+				setTextWithLinks(Ui::Text::Italic(
+					tr::lng_forwarded_story_expired(tr::now)));
 			}
 			return;
 		}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 42cf67c5a..237401606 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -64,7 +64,7 @@ namespace {
 
 constexpr auto kPhotoProgressInterval = crl::time(100);
 constexpr auto kPhotoDuration = 5 * crl::time(1000);
-constexpr auto kFullContentFade = 0.35;
+constexpr auto kFullContentFade = 0.6;
 constexpr auto kSiblingMultiplierDefault = 0.448;
 constexpr auto kSiblingMultiplierMax = 0.72;
 constexpr auto kSiblingOutsidePart = 0.24;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index d6fe67adc..413fbf3d1 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_share.h"
 
 #include "api/api_common.h"
-#include "api/api_text_entities.h"
 #include "apiwrap.h"
 #include "base/random.h"
 #include "boxes/share_box.h"
@@ -87,7 +86,7 @@ namespace Media::Stories {
 			for (const auto thread : result) {
 				const auto error = GetErrorTextForSending(
 					thread,
-					{ .story = story });
+					{ .story = story, .text = &comment });
 				if (!error.isEmpty()) {
 					return std::make_pair(error, thread);
 				}
@@ -106,21 +105,16 @@ namespace Media::Stories {
 			return;
 		}
 
-		auto caption = TextWithEntities{
-			comment.text,
-			TextUtilities::ConvertTextTagsToEntities(comment.tags)
-		};
-		TextUtilities::Trim(caption);
-		auto sentEntities = Api::EntitiesToMTP(
-			session,
-			caption.entities,
-			Api::ConvertOption::SkipLocal);
-		const auto captionText = caption.text;
-
 		const auto api = &story->owner().session().api();
 		auto &histories = story->owner().histories();
 		for (const auto thread : result) {
 			const auto action = Api::SendAction(thread, options);
+			if (!comment.text.isEmpty()) {
+				auto message = Api::MessageToSend(action);
+				message.textWithTags = comment;
+				message.action.clearDraft = false;
+				api->sendMessage(std::move(message));
+			}
 			const auto peer = thread->peer();
 			const auto threadHistory = thread->owningHistory();
 			const auto randomId = base::RandomValue<uint64>();
@@ -132,9 +126,6 @@ namespace Media::Stories {
 			if (silentPost) {
 				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 			}
-			if (!sentEntities.v.isEmpty()) {
-				sendFlags |= MTPmessages_SendMedia::Flag::f_entities;
-			}
 			const auto done = [=] {
 				if (!--state->requests) {
 					if (show->valid()) {
@@ -154,10 +145,10 @@ namespace Media::Stories {
 					MTP_inputMediaStory(
 						user->inputUser,
 						MTP_int(id.story)),
-					MTP_string(captionText),
+					MTPstring(),
 					MTP_long(randomId),
 					MTPReplyMarkup(),
-					sentEntities,
+					MTPVector<MTPMessageEntity>(),
 					MTP_int(action.options.scheduled),
 					MTP_inputPeerEmpty()
 				), [=](const MTPUpdates &result, const MTP::Response &response) {

From 84ce95cc9538bc140646989e78f03e8273ed2646 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 21:37:42 +0400
Subject: [PATCH 537/676] Update toast colors in day-blue / day-custom-base.

---
 Telegram/Resources/day-blue.tdesktop-theme    | Bin 3686 -> 3706 bytes
 .../Resources/day-custom-base.tdesktop-theme  | Bin 14227 -> 14474 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Telegram/Resources/day-blue.tdesktop-theme b/Telegram/Resources/day-blue.tdesktop-theme
index 04b07154d9de6376e61e8d284eaa1a3b64c649e2..54d4dfa296af5891df00f28fc14c6869cdb44c7c 100644
GIT binary patch
literal 3706
zcmZ{nXEYlQ+r}em?^S!RT2Z34QdKinX-jRj2}MY>F<Tnc3|ggXwN*v`Ms1;1j1qek
zks7VkEHO(7kLUUDp7*@xdGGt&>zw;K*XN&=8TBP@002M_un82fTn9Kh=v-Vz7sYx}
z?rt9bJ|RJ&fu10Epw9*~8L>jj{Ne8Ex_Gb;X8?|;hz)kqN|6jP$XID7A$<*R8GqvG
zen&w}05v#a`XP*#os2v{*sr`Cy#%oOAE(t%r}qQIme5cZ0H8tz0N}ZB@(6ku6oLRD
zJ-rbA$RM~9($_1%E6c$#h}ggx{ilk3k*-mf0R0p};noht1n1s+e>-B-IH~xXU)>MA
z@!rtj=+h<g?WB$3Pr$O{s62kw1RO_MW03NEn}v=Ji&@vXet#@$Uxtk68uSlXOKN*<
z7v|OH8TF1XcOM6BPhkDyznk*P(^6LJeO6|1;Vc!jpT}GBP4+g%w|K*}D$^^9Kfv;B
zsx+#kRd8CCq{Ftsb^c!eXd>GCW1<v}>NiZ)90lP3oyFy6k`nWcfWWkm*X#>lvk&|(
zKuvF-i=;8+?o5zhpB3#BS@vpV9=^M(R&9~<O3`jrD8bUY4j6-P&xP%V6^-EP5{CDx
zpE$foywScSH7|;k<H}5v;nITF?z`GbeBaOK8_p70mF!8u&~VQb6or7TE}b{Z@L3pX
z&^Og|Z=XZ9s^(EjeI|AP5LFpuBa!Qt9o^;>H;8O^>}BI#o86(&<T0+bbgJILFL-pB
z*!rBhSiBkQ=Dl2ZPU1X)cl&SFa3tB6=Y{4SP|O~gEBA0*Zoew)Hol_-%@9+oUMBWz
zuL@|}ZgN?s4&$+l-Xw~;ToM^%7CS!yX~8&mDfyAOgaG1+%udv~j7sI%<vJJgsQBiw
z_ql$^Z1O_AANE;^^=T!`M)nAj)|(a+a2BeuOY@b=q07S%+ID8vc(VYDAqMN|D?|$#
z$oYX$DH7K?$6&J2(Y5Owx+jlOaZ_1Nm*vV~ffnGWHy_SE9K@H?y15TV=mn4XF0!Ud
zY7lqEI1l>;<~3N+^Wu6>G%M6E4}4~`k7~=^VEPOUa?-cP_wifcIfjr9`JcsA%HK?2
zYu0+7Ps}p}lLlH1rPuUE2M<62W|@DhuN{Eo9W7rh{6csF_4bm<{Jk&ZCE<LI!K|eb
z6o|PsJ>LH%$GZBt#t5^KS+YzJDl#Qqzp;Q3K$6JaGcls_hM*lC_OlWk=$d0LTNT5r
z66XfhOJJney^L5X`&&!`oiD?D;4Nt?YbMO<`m0QN9&LFuFyZDF_h^Qq)SVi+MT*3E
zQ*yVvnB^PJ;GKh>nA@@o0<%AU30FLjaL6mfN`+&x9)#YlNgZ%wi8Tg7Y&&mmqfQ~8
zR%4B0AD{fe#cCD!88YK658g!vzsnkWmu$j`^8Sf>=IvvW-8@~Xm~NNK?5(YPc{Ei-
zoBA;3W64~G(qszfH2I<U6fcSF^kDEgvu{ep!^9?;J=dFQ^b@iLnQNO;p!{iSqLiCd
zG$h%g^)}Y6c0J1E9;#9qC5>zRaRN{ZLmm<hT!fY^g-^`X9%(}4GeY{lTSEQc@*CDQ
zrr#HhUmTceVl`G#Er@;;1tS!@++C8Xhxl^@n$T(@gui8AGvqw1)bNUdAC;z&E!B7E
zFw=pEG=j$$o$z)8GAbv>Zmzk%#<@)z?O4BaiJTWU082y6v6i@_Q1}#=z_8b!@A7w3
z(!j|@6da63F7+rZ$BEUiW%ooZ@@DYQZyHM=J?L?!z!+0#_PwE&oxAK4ca#Aw*eHYW
zt_LU6ypYyYbDSXZwJVd*#1WTA^*+-i4^0T+;E{fAEVlu$H`|aA;~QCQr5|hbb_UjR
zK)WOm9WT|#l{Q))ZTuC`{{Xa$mx=4^lGl+acRI?;q`rYfy3B_{D$XH7w0#d;KKFfm
zYN7C;EP2~&P5{3qKw(qf+Agj_7L1MlO!_v#X<;bdGX?L}(9d_pByE%WWE*PcUJJiX
zdNx*Sg-oZrZvKgDmp!l5%lmB6@C5@~Bf*C6$wbc{96g(yW|eO6H9sMUUv$Y>rq-FD
zuEZUBx!Db3B6KOI(U}k-Hn=ZwPol?Wp=Ad5TxI}&$DGBfUa*Uzme`F}7$5bf-qX4j
zXk>3}@|kBO?e_hr-=F`^W*ff0Rk_0=^k6mV*9h8gGWeHe95CoO;@!869hRRr9AHQZ
z?yZ#<h$G4Tn`}qsWS9kb-RmjGU1XU5(}gw2KDD%~@1}*AUUC2>=@2TbY98Tu*OS~-
zz4MjC`kv9-&aK@7Y`DzBrABqg4E>OQL_=0+`0`?VQB~_PnGaeyFKBQmzs*V9y6dy<
z(cJsyF2;5KrsP|(#5ZlXpskr<t!3v91&kb)%?aq3A1XF;uXA=vb&xWV!-sGrDq}g6
zoDTJkTfXMHuCa^4s)z*KDc8Ne#QRnYYr$;lz?ZPKWAN>;8+4CfE;<UE2p9Cq<y#Xr
zAn+Oth#kvkCKc<}D~K_xg6*8f{;3-2o}Q-Pe|BZ{bH9|!C4R}}%CQEJ($;V(gO=hM
zgDu)>v~zDrrnOB?P5A|lKDb!>`px(D%LGISw^wZ_j37~NYC5S<UdZok)yhaoSNv5x
zKsE9zTA@lOvU8euzvE0uWRyGT3#qf!XHS=xFOX#<boVd-eXP9I2d;Xj)1yiK`>|fm
zwOheME+uUAuR=QtQA)8Te~`tWA|&XPPsN4iD%5;R;OX0ZV>>KsFuVKL+n;v+nb+C8
z)e22=Z-iRM*Z7FZOUd!SwbpMDG-4Fr!CoEuo2hn|z2oK3aA`f3J$xC23)vV+x;!yp
zB?VeI2CzAo`})ncU>#x~r+Y>9QatIe7#1ruUMd?HU1oOkKlq8Sxoa=2u4LK*l>ZAr
z&`yRniPI2h^6Vn7#F~n)qf7gu=vLAM;kBoF@rnt%B^!*|{vkUHIx4}|u6j)!!2=53
zI#yafSkty{*zH{+-4n;vNTF)R{gNw`VeN_LRgPH>QKWX`b5EP4rRFvB@#~ff7xx6`
zd+Z^(OL>dbfh>oIRSJPh9?Jm9<9uT;4R1wCnl>VA>kSveQC?BTNp*)&wlr<}^bx24
zt!+YsUfZ_c$R_LKN#1$8p}O+gVY(YbbsMIlw&ZLe4m#V(%|ogrf2rN0H=KIgrLOvi
z{<F!xbTLcU7vn28^x{6H9H9r)Yn1Q=wi<%uvNT4&a1@1Z^Q$3>{*wG_-cN^B^tI&e
zOu}?{Cw$$3XY{(-_>}*gffUbdt(CMa@D8W2F^xo?oqft}weI!TRAi5OZRlHg(0#pU
zwua|r+NvR{W=ZA26|1czaYlQaoT8)=1b%A8j^fh<pE@**0j(u-Hb06QaO7n%Y;oSG
zZ+RnF_9!6#qfw%!h>Wx!_!<W-JbcU7S<F*vV}fR;8*Up`al4AKo-f;>bZyeQH0F&+
z<LvLaJLQY1pElhaOBw4`{g2MJs4FLh*BNeUdu>$hYqXIy+T!qmQ5CXPYe3rU;I!@v
zw&hX{^*CK<ZI@ojbsN8%o7A0^;FmF?Gu_LFh8seal^@FOz(+ZF^siL0I8CMo#mElF
zickP{DUQk7$3ltTsxT^2OIT~G%ChDq*p{d=GcfC96{ubMZd=vR!gw5fG!1RV6qsuk
z2}DqZMr?@>ci@?K)^SDhn)w;>qfIkc<7h&_D#izuT!M)Kkr?kI=Av$;o=KX)JGzdG
zT{KR@usJOdkwMtzTRl&xU{+dek&%)r&1wes6{Q<0X=(5DU;#a(8j$?D^B06*7OVL{
z<^GH*-7x+iMW>Fju|vowyWqIVv7gS)O{u1I6;}3MpdutY@dsz~)0PjOO0eRl^WD^X
zpS`8%@v5$jHCB_IvU<gpvvh9s_&W0ztKiQRZxM{~nC*<GU6mlsalgY93GI`GxMY0y
z-eW$HtmaO9#ral83y~R^6TWSs<d-&zBT89?1#K<Mj%8(1ecx~i-wq~Js3iQJFGgvl
zs>uy#SB-_5F6_hmPr7bzl)Yzbg^tP+vg`V5A<wdF0ja<33hDG-Pdj@}>U8A&Y1>GC
zEi&7xBa(q4F^zCI5vO4Cm6**N5e+=CldIgw#!dM0w*B^z_FU>AX-J3m8A=Jc=e<2X
z_#sAJMQ38L2?68u_-eyH|7O)Mvt9LMxFMtMZPUuEAOUyP!aC2Phv@DbVtFS2s+ETZ
zf7&w0XPn#cWpuxOhRxk&N~D_N)-LmhxFWv^9+Zu0i&GYjZ3MC*KDtrI@%M9zES9ML
zGs@&*J1*q1iUB_hGNU9<-~}23`f4fN-`<K|jYWJQ#Z!8c3*ADi#5z~R6Wimg<RQ(P
z?~!GgAC3z{C%^nX5iwCFeyF@>dMj7qbCwIe6kOo18`z<x#K+o2ZhxyOD3khu<mns*
zh*2Fd;o-5XPBh%pQ8&b67y%7G2RIzbr5aC)YW1sdWp?sj2PWvoQncKk$De|;TiBz8
z&K|i=KLKsnng-57$}mu<eZxC}5V<F#!JZ?m$=6E>)zPu+NT^{lp@!8MTu_RW3;Pg{
z<2b(}X&jD^#`$Q3uPY;tR;y>lutw%)_U*@|$68h8OAO@NJ8r|-B=wp)1mQ_S1*`4>
ze;M_6)h5K_5!R5_xCc|^!#Q!!%};ZYO!x{}?hW!HaTzD!l5{`*)qxCf9yYqckiob>
zT1We|Ma^B!!<rJOvV1<2YK}{H+M8f6S1l!yMZ6md*J?CqjEJg2O<&bl9<qILEEGmh
zOdN+Fd5a3>>9ZfMTMB+xTUGvZPHkmI1>^?&|Co2dUl$?vpZ<TL?|*Cm8@T;jMD-u7
b-^KP{G0w`2hW6iYz>9oxF-aHP2LSvFniLfF

literal 3686
zcmZ`+byO7I)*V6^Vo0fhp^;EJ29WOVkdl&6U}!`UMsgfdQgX-v=^6n6X(<tgX6O<S
z5h(=(;o<vY{nod>ckVi8-*e7gd;fRW+D5trgrtDKVGaWu?gDJAHE!;Ilj0_w9GyMf
z{JaBUkA!?+Zb%~oO%N&g?{kp0mYT^8;{8n^(M@He>qGu~p{8sG%yQ<#9jz(?i0TM{
zIyuZYa{xeF-9W8I#UaAzM)CGd4+QwoN0}qvzAWA(2LR4Q0RXz2sk67Ix1YaIz#|ub
zj{t8U!2ov`FPA)P8}B^{s<3TKwOv(Ze1m<4;N57ITf_p^N^-JIjiAr{mE0jZ)QYG>
zo(|WASP)Iwaj3X+(tz{8D1tIS^o&Yg?w3E|b)mb)MXypZu`G5e>eskrUOs)$s|?N7
zGUHjw6OS67HnlPL#Grr@T5CRJEAqPxzwCgg!{p^pJWznu&NB&N;oge!_IjY<?WwMO
z%*CQ`(t&2&!6eLSAX)7X>v#95q+n?pk?Wqs@yo$Pf;A$F0Um2qmWV6?iCO1WnWCC|
zPtqUW-w8+llZMAM_0)SKMP5aZ$K#{N3gJbz!z7DW=W4}<@}c_!5KGkWr45>dy>ngm
zaD`KJHq|=`@HmQQ2^T#m63Wx+-w||za+0E1>vG5E+2dQkw&sl2@XBSDhW6E7%kGVK
z25=*cwdmcmqPV1n6nXAw>>5I39O>KVq(+O!E(}gkgD+3o$EfW37dZ4n4|y{2K80PR
zm0=?)KlHB`+3XPJX~r>*BuCs@UDK4<e`K_?LI&AJB~a56@wypx6K&_W6~<hR=>@aJ
z>`-UbuXF+znVAwVFVa~tRDK(fP>Q9QwLfBhPL%L(M)2+rVMOJsbH`uyb9Sm|JH69)
zV&a?*FDx3v&eeEF_0F98I)4#oz64++6z8MXYvI*L7tR-ea9URI;c@b`acY+{OMN&H
zZFcEdKLspYy7kb39Wdx@Hm(QN$5U=bKY$AJdqg2&%Uph38w5~y#^A1M#?KuFCXqfn
zBp;NcuKa9;KxvK)VpkYuIxSHGL4CnznOJEytlGfGU1pjOt#U$S%<nUpAq=y{xsq?$
ztBJGg4K_;I>&bFTmp$hnB8Jl6vsk^vo^U$Fh@w3xRboULBKr3Y|7b<mSE-N`)||CH
zc4}{ysBHuvIj>4e#HZo6Q;m}oG4bDfMFn$TPA8SbBc=U}=G!oNq=LC8Qfl-#zEC`6
zQ=*K*^<HlOXSx0oE-BW4!cV?2j<WR|VoEJNEoZM6g1L@@I|mhE5w=ruo&1ik!rRI=
z#$gF5(t(;+Jjv$%A8mD;U&~k+PpHsh!H1goMwMsRLhNvqdC;L|1hnm2n1*1QHHvt>
z48x~qfT=@PW^#t}N|C>DZzv5&w(`S~B$&H@EQ$DCt&)`I^NUqya=Od4A_RH&iV#~7
zCl*`)qUDqa_hfzG3`*s|Q4;i=Q0s`%*`4gR#^rFv_fb~N1;30Pyn_zaa1Ji8uS*R_
zpUtR}4USS|19P}8ry4q=>pq_qlkyYp2dPyuWE-j72l1aek_yFxbm3I;kw>XP(HYvE
zC4GTaE*5b<sx%M9--Iz0fZJr=_BF)jIDSf7%$|GuC5h|JofGgk2iFg3m%bvRbsFyt
zQY6SoCL$F3V%-u<HN<nP{cvU@Y_IipzK}LCiRk%3lkvq*H`$WNnoZ*JBbPEEuWBO?
zz5^3%nn<9`QH-TiFCVrvWr-CK*(mEF0`W6(UQ`g>$cn<qlZF9P;3I=?Z*e_8m^Mrm
zHN8+=g3wQ(a{m-slAQ-zqVT8#)R8>*DIbeX!`(7ki(ZHcmaP-f|MM1yyzrG@O8&Gc
zoc!KV@6#{cWqEsFJJ6Fa##OAY%U4cyjc!}q;S&@wb%PFTfM)_Cui}3dA!SF1TJ5oZ
zxvI4s>LEa81{2K=4X@fS2+gLtN+je=DDhOIv?yV*KFqc%ZF`6$1&PbE<jiB8fj#|L
z!+-nos!LONr|=Fk?LNp}bZ3p={^0wGX%NzDGetRhj!eX3zQtcjVWROK^7b1$H|M7W
z;IF-e(+_)HXsKWW#<%a-rex13j6l2nM0KonjsP*PHs;~A8lF&iR2K87FR_CBxa4P6
zr1{|S2pcKE!|ssv-PtYXe#u<6C;~^HtL=p|`8<W6!Q$ufWh8-O-N2!Rs`0KL0lRG|
znq};PzC$Ygy+1KQhMM?pl&-qT2Lmw-324T2%*>oO7fadeIucgp8m6e)Z|mFLwV3ZJ
z9g&~*^v;VpWI}|gapkSLKB@h8Ulh&Esa625F5F&|-WA0LnyjY}Z;=1FcqX9E9ZGgc
z`%xsp^S+yeWK@%+#YT=%rnW}6x=IJ_n$q5O^7^x$@18d09P5XcKTy~)Wo@!!tO80a
zJ5d6b!9O*2!2XHcS9M_&)2x5Q{ft-JWnvfvYSAu57tKwUR2po~hLG2Qb3SywK<nJv
zR?w#{oodTwANU>mInYGwZsuI>L~xsj1rJ$ksW#N}xd!bS<=)wC_}2-H)t&%9b!`#M
zB|zz1;6xvTdM>j%RL#cX-WsEvw2!m@0|7UqEnkn^m--p7wN!m}>~*r%OLR;eD`l@P
zKm2=!6J9RTv_5a^qa-3MA67)`Q^Riynd9|iMEJB=GmWa9D|bx4qNnGU?n4wuFf6ay
zxIu#0=eWI`EVcH?(WTA;-2BWabJezRXJ-^mEt7avb5*y!Y=-YRl{Eq@A4UENtvJN2
zr>mdb61+{YNLgN5{@DBC3D7`$L$oX9P61<b(*bZky&#La=N(7K2w8gDW~;Jqj%8jF
z4)VmtHkAd<O6-}x8!y12h34O%r#N?z{-YAJNZ}H=umv_tz1~f(#~G}#c$+?ayahp<
zHteU2`Q#?w^Y319m4!U7qWLgNW+^j0{0yO`V~e$bQE3k^c8gc*t>1~$Wx%9A4mUQJ
z3GNU;EIfJRwty#YhhS;PCcKT4<3*Fr4}0M@?KW1?NXXEJfWNYE5YUmh7UMTB!NV!E
zBhmIzFfd`ZUtF-VBv5%k+-srdBi*HillxtMwxV{eV=+d1)xl5nUvNlKJwx&$5003H
z93e)4DxYr_)f=PM1kc!_;YcO0iiHwuYt%ePfJ@#Z81%>5Xwr+4V{)ieql4FJml+~q
zV@*!#0BO3;DV}yvH|J0`8h?7cKVt<?AH3^Q_of%$O1KdiZR*t!YfzV-c0c-<ntBNA
zr(juNOBagSHKX0!I_?YjDbo)hw6i&HQfB|K!WnFD_^h(Mluw^o6DABR(aRBtv*g_h
z&b<9rn+Ag)?y6JC!r_(WeK4y|-i+pYhtZjGu&vT~XJS_bE~}KD>fy7fOH`4@fhtU@
zwVpg!fppbp7bQ}qRWx1cQ1+5-9?~(Nag>MZZ;N(mD2Z)s;(VXd$IyfCzavgwKD|Fy
zx1auaRZ~jr{flt{kCf@@jLZQ>&xkqkM<N$6o@Tsjg+YSvCp|J1DXlbw9f~2ra{D%~
zW+%V9+xdF;_8a&pGYKd`zr;{X3nHP1r&jGtvNyl#e#q$Q_pE4Xh%ikWb!5aTwjzPZ
z6?Brlq!w?S-sHp~+T$T1?<-}C@B9RBi?3kF7Y3NsT$Hc?nywY=&6k#FybawXoK|-R
zOs2AYjCSciOn$>x6aQXsKki7N+JtLLL4<$4$H{|D`fds*^yNnJ*MbU0|Mw^3Ynb5#
zql*F_f#E*DJTc4I8a`8(ok>c})WjlNU0smp{7T{iG$g0Q!CgKh5DtV&rDgE?v@J05
zO85r9R{!BnTem#PS725BL>%9ohdt_ZMJ0Wz1=X6_^+1LuL$<PX>2ip3<Pqu4?48Kr
z5dTUA5_3`naYNMuk0c&w0`5W1ZEr!Y!1#t4>Urg_yNUKk9bNAx>d`(-?8~GsVbfMA
zJS`O1YPxT<i-e8otF{c!GeeYzu%7Ui$x@xBXZi+|p4R)6TJ3DV5foA#e`3aJaE;3b
zQEi=fn-sfraktu6eJ`FMnr<Py_ZKjM?bXJlSyv$4LFv$;^>%yRdPPB&*l{`Swr^{k
z+AO|a(dv_Z_*V)U?J6K)1=Z273x>0CwtLGb`wdI5PN&n8X2HwWcs3!s!!hn$OCV(<
zq8nk>)eL-kX+60zx?M+tW`bWR>czuf?JhT<%v&CxVZw!>YkUk`VL(ayhEB(_Db<y|
za;lWo^ymrS4W&u+avWu3<eN#$!L6o?c(Y5<ve>OnAKfIbYgPTu04Ni@Y5Lb&HpS=m
zvP|XeXprifXwPto&bPc)lvEQ$$uDm;dcJPXJ^Sa9zLsrgtVx+KcVS-7GtR@0^6sy~
z7YVYN**bn)lXzPa%+#jY){_Y3eQ~E#H<e)hVkk?#hjSVSr{jGKK}FE>BMiM`hktzb
zDWNZW=>_=}atZNvInXazt5St$OkW;SH5SI7ZxnBtb~LOfA@WB^LmBg8*}MeLf4s2U
zEcm@Or9>qWrmQHvf{8h(d^jDB5lMb!4?&1Psk7e&zc@IzL5yIcB=R6n!w8Rk>3>*0
z5v1(Sp$phMlH1BZ8xG1D+fj*mr>;wOm5XTzOXLr$ePG@ElMXHw{FHV<->2qLzOnb=
z49}^Wzrho&>)L>x35<eTlaOQ+$<dtg<s#=-`p9d5kuDy-BH%w+G48((>L%F#UH`8!
zBmM6=9)J-5@cIM3w3)_p%_6DeC&v9R{ulp$GG71W_q);fe{I-5Wzq{_0)GFX{~tLc
T-CKX%AOQd74BQ|R^tbyL7hc1%

diff --git a/Telegram/Resources/day-custom-base.tdesktop-theme b/Telegram/Resources/day-custom-base.tdesktop-theme
index 36f91ef0257d5dd8456abb9ca410a86a8df13524..d10f68c7568edc082b008a7e9f2064b9c31e15d2 100644
GIT binary patch
literal 14474
zcmZ{LV~j3L(B;^+ZQZeL+vYR2ZQHhO+qP}rxnpbJ@6Tp8+3ilcQk6bQrG8ba&QX*B
z1w#V@0)hgfHg4y>_vUZtK?VZ4`!9s>U)0#h#M<1+-qp^O!OFqBRKr_UMWcD2I8j3h
zrGOr44Jr}lL(2pSy|#><groojk_O942m}flodmo@ywJ8I6vNXZsNjN4Q63HreJKp0
zRg8xH6dhF3F6eDYkV(Cu;`x3Sdad4ixAmWZyF7vU?Iw%&8Ar4Eoag5614R+Uhy9ZT
z845J`K&bweB0*7xB}77MYH4a}ZES06Y;EriuES<OTQoN;zdaWh4>u<_k7oxLPq(K>
z=kjiEMl=S~dX09oD{cPMuiD)MrD$`TAV!3&lLQ7UN~XBiX4DQ+%xuUHMH2Yt)Rq&(
z=_ycCUS8hYT$mEx1T3Nz{1Kc+3k3L?J)8>^5$Bi;f&>;ho&CI~ySw^mZOg#>Bc@FW
zXs|A6k@PNyG}$|el7#js{p(#mNIM!j@VFK1DblelR`jW4ac7GYiY6Uyz3cVHK<026
zfiap4+0j>!4gu{5ejac5LJu#o!&k_f4RvuA=5?p)4)CYPSXkd#0ZILm6~VkoXoX>q
zu`V5gZ!J7ijuohh=Rbn#aE*O^;;pOEjI_yjAT0;0XcN9&E%0^?mpU{l=~8x#keLGj
zJ53b=`gt^rU47r^Rm3wGEJC0_$s?N@710cB#PU`Dt0-W5FZC*4IywrAXgQxh&<3yf
znCl=~M(2!iIZ<01{Q!s=p8iyL>8rH#iYV@PFX}C|Hizgk2q+4P69yg~UyBCb3fz^!
z)>}_Ic*Q)5SVI#0D@{2CQ&St>tywgeR<!7AzL!fFQuKpicRu0)Pr9@Qh7GdK>eL~q
zE)}DYWQD!ik}<%E6V33>#T}A}o0l)QM1KN@i|2h->NiB6<~d1H6bVe7zrjPN#E^Zd
z6qhoCUB9r@%GFwuqA<zq+9e7YNb728oFWHnX@Hp`TFm)UvUpLm?fwx8qhGPRN`I94
z9%1%3XR-$B$U%EmABE+ht0M+!8MIQPBBdB29=Ngq+-y%L>H%q!Z4WVB&xY<SG-_Cr
zwTzUrKpzRqUSwmh9x-_m^M|0Wk75so_iW0Z{HUok5ZJ~VO##DDQ+&)cl0F`?&^`V+
z<{9o41}fMiLGN8V#yV!|9vV#~D)N!o)QJ5N69~3c_1ZzJna1@>-9u3)i?p!0ZHC7M
zAARIaj<nTF#B*lUE3KHcmISKiO9}-`x=`gKaSwC2A;M&7G3&Dy-<uZ7XE1rWkgV%*
z2Bgm^u1Sl+KR)|Mn2x4n6eW^}|4<i}zDcky&9-Z|Rht1Y6Ggp_8Yoqu*3zawO>6u{
zlG_|tKjPTasnuNRezcCBn-Brs&dWE9?HQp}A$w@;0Nl3SQrWpaqUW8l+IfUieUSGV
z*F(}(di!nl{oqiXR(*aIi|u4Gn+tZ{R$Gb}$IZwJG;4!XsY?KobuCVyd%<LTmD%A@
z>HPdIKcO92Vl&7+?N^L~DH?M?gs+02j~yqK-)cJ6{bt_QRyCg^l=i{c1A%H7Bq@Xe
zNTHAz#hd2je7#sJ&P*t~Vi7)pIj~0nn?@(f2JUlACPAEYA>eOJJ)3y=G2C;n3zDQ$
zPDo4)1@8aQ#L%cekK2DUd-e$D`IC1j7{{Ymxk@1haD*RVk%m9b(66_a;%l7suRliN
zbeQXMNm!tif<7>glZsXDRj(f>*uB*Sg8b7%6HuZ_xJGAS6Qy1X@j39?D>pj@AlGkS
zHN#?Fn$D7gcsqgRsPthSoMs)ob@Wx`Zvtd0t2;mUV@5m-V}KFqtmDA#R5K`0@JDq$
zV2PoPtvc<0fzL&nk_N}+NYIeRnUSldQ?A03tqw+!Rq_`-3DrKV5wdQ-$9P&m10h4h
zrbxL?EnWc!qri=U1v&VV(F+(TbI%8*SXYl^4~Fy|eEaGO8QeAHL7TC}J-UjJ(`_qO
zA#weZAW6bcopc>f(vJ@&DGf+RzvJlO_2ybpC!{%c_}u67CHwAB;I}KG(p`8mCL-6#
z5au95nCIJuziBr(wsdiI%BSy?;HAa`jJ7QLm;>>&@dhv$h~7?_PK#YZO<Wbmp;+S0
z47-1=`+FG~3nF3xFs>ar1CrzW`{~UF<Ik75sx;NHIMs(dqi{5tPr28A%M@}gar+g=
z3RfMNA3>P$F{&Rgh<PsDcmr+G+lM@XudG?S*;mIL&*1Bj-tnqoYMpWJrz{0ozUd^x
z-V`4}LOswaPmU_Z*^WXEc0-Xx#v6T%?i~6Yz;@54tO!m<!Dd-<0SauE!_e|f!gY0N
zUS{#s8yX^#3UCi9$=(DpD{jr{h=f5Puty;LWERhke!BxQCjyLXU`j_;Y?s_i$=z@u
zy&WF0K90%KKtJ$KxUPdBsfcw@>uR%nhXEBbx_XgNfR)tXFU@73Kn0BS=-DcI&2L4?
z?;~YtJS7>pQ*oendB|uYVX*$C%Up#`;EH|BIUK)0AjN`X_GjQQhZIM%kJy99+=xKH
z+1Ma*y0-!ff)gbKF=&yuY+w}9z3(6+nw<<lB$*(ZDjBC5GUn_J`}#o8BE39E8BRlJ
z(mvx%gRq*G(3TtFtE6k}in-E2&S6;WVxg|2ANpHvp|DUuClj{?JcaGac)uS_2_lq+
zt*TO^L;H^!jd!_fF*fp6)hZ}oaiUfjbt*qMOzgM@$CN}fyoysk)q}l(*fY&Z*_G5I
zkt$_Eb^xi2bc+Fo(mIs_Wai0$=!5;~;)AKMX$jAw-#dd|vsH^WvBD1!gtD1^@lJ}F
z#R<<W)}NTPYl&t!7@?8FWq~+LZ`?tw;n2J~+rwjDB?#k^Rduyc*Q_G=<f;=m8@{Gr
zT{hrwlB!o7ZtZ5?lQ%;Ls}*p_smz`3vaa$<tu2NzWb13n`R}FJDpMQM;*H$C&fa>8
z4K&v-TXRQ2{`cvODYMyfVGgf<bZ(7{rms__;OBhqX^c+JY175kU!InEJn;+p^X#k;
zX-q3uakdgsdFIc4+vtB1Rd-V9TGuBV>F<1$9sgX!d{g_SiX?b>m_=f~_r={9_vxir
z$NU5+=QK10V@~^Z^=D_@W~R++(`b|OiN(IkRx7s8H>Wp7vwJ=8dh%#FlIk%a;L`rP
z_qfI*wrKv<n4v?8{CX8Z&y3j281aOf<#tGQqEy1=%PQ*A?s>QdO~2TlB0H@5Ubw?s
zwX{<RA?~@;`<T=xxJ7O9c%w0H>{*RctrK|MO`e$}Iq5<hr))jifS;L5wszy33qz)J
zZ7}|!al1Y+!t!UGyD5hsk#0BBY!NQ&gVFJ$DtkMA7^?}Y7D>@^G<Jy(7t6<mON+2Y
zl9Kxrrr-8|I`X;~Clh^YbC!!*2+rRtA!RQvLW-`F`}H_CI$4_o!mdfXXAO_rVc-cL
zF+nC(0)<4U%(Q~dwqDOd3p$C7s`GtSC)jfi?*AN|c%Cd9WZTY<S@zt1o1JZqNg^9P
zCM4)=t*4W*%=z<*eNbK%&NG@$F5%jG`&bQ`^z-~SP8q(OHr491U*4A$+dcM2>+euK
z;rSdqb&rE8|6GI0@yGSJ^VibtHM>~G6qWm6Q=0vi2+g@u96uu%++qJ@ab8{Jj5LQ^
zeqx#5BMU_uG+I_xhL@IANL^^_MV2mRmNshfgEci?qTf~z+B(MvzZ~IBH8k~3sidzC
zh=)Ztr8wI&ap=<7Zv1?nwN;mX(lI5Y6=hOUHo<gSn%Fu6DaOj%>(t9{qefeQi>b4m
zWT}CdmFUel(hrwv1n+x3w4gACDvmF-cl2=exK$FkmxYf-&C{`*ig1DwONl1{og{HV
zmy9(_wE4_rIC825%{5TF)~<fj=k)zWAU4TzX%&o*4=a`0;`CiXhR}j*lc((7n@twV
zD<^^5tAI=IJ1U0KIiDW!Lr43OuKt17I!m40=EuoOO*rb~c_|VTnq!=dJ8iS!DQ+q)
z{>I*yT_zjp$x2A#^gSHXb_|i~*s}-f(d{#Twl}5ODq=i4FK`#}Y;U0v!z<swV(+MV
z)?_Di`j`oBO+0L8fj4{6<V2X_c;LVM9_`BC1WhF~!G_7ql9>N(-R>LgjK_Amz0`bc
zX}OLYUg_m`s&|_vTyoZpG(7e5f0k}!?O+<Dl?I)&(eVeR-<fkYVb83Mt(YHn%y^?5
zui^7`kkx_^|05xVaCXgZX<!ytf4ttMwB#YevCF#JEwDoYG@EW^U`8Wqx)X~6hcYqp
zh3+R}JM6su{intWb|KvYV;UX#ygl7uGaStqemlrYO@KRiPuO$s)f`7%dU@usD0ftH
zd=8~!Ktf$nJ-?QPP!}rUSioV_?e=CDPAR-Pk>X?;^~vZB*eaA6Xf~M#l0Wh3z)-N$
z*kfBUM<nQae<Rk4*cfO74|Tum68x%L1EW|G5$dDTJ!H?-0hA^_zTOPWCejo|RLh=+
zGwkjJ&v+Sa-=L$LZBK7C2Ky$$1n~hf-e#`u<gW72?|#h3%YvV}0a=JRrXfBrM3jyG
z?1$ejFUB`F+q8n97?n|(%BJoDR4vCPGbNh(S!eA<9MIpI-eh*{MB^!=J)6E+3@w5Y
zT)n2=oBTloOUT0geGU1Kq2r~S7i?Oy_P^+GKwfv48Fy5T+2X}X6$6fW?88UlxnOl~
zXoll#xi1@&M$SK^@|oyRgX`kevI4Z{3jva<SJo8X2!$K~W}R~8o1e2Bo*wLBo;&L{
zl!j4%Hr`iv$_P85@@&ti%o1*3kJL~Bw$qgPY(UpCG{y)^I%wO(lgg`#C>UD=j=rVN
znq~C5wW>cwU)Fpn2*gn43agtmBEvKm?o-HReGV=T&dh?Qj?Tiq|EHy>kMp#%5?$kP
zk!A$6gI$szVTO-e_`)N)+EZBb1$>pF#|EWytKlmwBErH4$ecuN#H_dt!ua#I*q<Sf
zGk7t0`wnj9P?E&Z@za+4{ZGwrEBgD=fhBnI^|CMsR0iOImW_@M&LtfeoT4Vwe1Fe4
zhsM^~-dP56i`?$+(C*u?L$<%7iLS#Mb8GOzLxe^~i{?1O#OC5ggI<eXZ@{yWy9zgt
z=D~MGXe_nXVvKiEydBSe#Ib<M81HCo%-6KrBX9`|*6c@AXM7(jyg3OCs7=?9x)EHJ
zGSG2f)NX}f&F!L%wl+@<C~#b9mtxGx-E;S#`_NEu!e;|&ut--t@w1(}5oqCu;(XY0
z*A8=@^BQu4J`oSG;=!<HAK%OsA1nTwKi(jiAWk5;JwWn%l)JBpHO~j%?Az`*S@9pA
zpE{8`zrtI&{8R_GiiHmI8G%0{WG!a#4N=lMLp%3XLCNbyVT_+UeYbUl`h7v&H%d<&
z8*q`!$+XoG;p{kQJ`Vz00u##>PvjVXFT>eUQhw{E%WKw^ww+J=Zzr685}HiUgAu78
zYut6)obR1W&t{wVn#YjG2nnoiu7Vc1uP|B6J=+Ea;M`pJ+KPv6PQ$L#HyXy4^j*v#
zz_n-0-t(GMs%S#0>Ja@$;3OuX6Q>9{2L+&YG}DB!jzm)muP1(XlU}@qVUKpvV!DHS
zB5mTjB5S1UNQ%%x^H(3*H~Mu<8Tj5Zn-iZ_DL2m4WJ&`|{R2q8+V7fa4oOdD;B1XZ
zb#%U?2ouHZ3}5SSb^TR7TO&VoPPU=V8U<LtN;xdreZCFlN8@2hIZQXq2<+_uKVOpX
zzByi|lAo?Kx&hOXFNh^Gs?RW#K-jan5H4NCKcI?5g?%6?vOr!-OFLg(+<p5hf-bXj
zuLaYdf{<Q4zT|_OEKhgewhO;uKQm<Fx$UolJl$pLh_Ursko`%?R(M(R=L`IJ0+gRl
z_quCU6kl|@&o5#r#6<yyTp)$&W(>k6Q9L{abXn9QW>#X$!4o#aEWjjQKn&Rf*@ba(
zGyi%8S8hKD@Hos~1WJlTFTfN8c&JA^%4U8y&0j`eIyv~$?oF%^&>_;mtq)tXy*~q*
zJJ%8f#ycJ`cp^JrHV)s8NtYkniyJejNmeV#wgyns$?*_Ej|okueujgEO&`Lx8HWMR
zJ0q6#LJ~9PK`$E!b_jw+_8le+fa<g_$G#Ir$MZrQuZ|U;DlV<m5v!}josVBq#uJUe
z&U<^s|2^k<uKrRFJt6_yA_oF8=>q~n|8LG?VsB&b<jmk=YUXV1V(&ojVqs=$)~l!E
zzRj8B_ga6TB~arl4=93lz4qO7W6qnjGtXU~d-~f)FDcB-gHlOe$@$Nqzk&v6Bo=dW
zQqos`oaCxnxKNP_jlpLwy2ht(`x{Nq{{GQ^al3u-QDyHgzleVO7B$T;vds*AP{2*i
zlcuTKoU9A72-+`!YBL%IL20<3t?6y|-yv;%z&u)?WYfI6f?P}Wh74u%1($tZk%(uN
zrz#9k?2EM@@4wK5bsu1Zk!j86Pz~Y%7#Rtl?o-QRT0xY`elP1q;_+kZce=bH2KG0h
zlmIZg=?98Gux%WzMVF;c>?&^vs$+py%1WK{ignn2tN_LRqMB7rNm?`R@V@3wKl$u0
zT2>8SBU*k+J&lc@$)6MK>^JJIvroQxlCTuyYR+ocY0D1aYO%~I5-?$;uII98HW?N$
znrL7By98Yn2&LC|%(|#Gcx!o>xBJN0zXWV)E))OEpu4NVQsh@E?jOjkJWVb4dURJA
zJ}+^Q5zKZav$(q^qh0)`9*oN`?CP(4^X|RV?!#4_*OTT|$i~Z&X&*pAx1;TrDAz>g
zu<@&vThRK^hay3UpjmSS+kkXRH(L2Hvt`RLda+=n!C|`a`<>C^1hVo(X>ZToBQY26
zE79<-z7PpcU0cpw@!1q=A`m(gj$I-|FCQ|^+hM+)N25Nd=qfC1x*xHKebUy)`MiPQ
zVHIhDb49LjrPX+8q`!j`iVk>>H_<aUcPlNYj^wLlT}iGYeWv9<#kEX>%;YF-O(yDi
z_Z!60VnFV^n&2yTZ*7{iOp^&Dx1Y19YT0%WHQ;-b<>XSE{BZ>@YF9}WriD8?F#qye
zPIcNGGUi=}*<1Bts-ZDl6U9iixZ{@!C&xM*c>?pjWU6U_S$OYJrF^u>fc3kL4YQ2E
ztiNF%wl!ouqGtnyMvKk6g*ejFiat+Ak$E^U`}nEB>x176QX{Vl2m4dXEe!q@)WLb-
zrlGR;(yI*ebhl#tmR3nKN)ptcUwcxzJ2>M-6@~kTvL4O*qZi<5i?Al#`I)IjjtSRn
z)53{<{QxG#2BY>BBq=tt2L4d@-){}3e8<m+ikKH0?gE+*TyAAJc=s5(fp6x_4O@KY
z@gTbc8$Pw3RLQT){hanuvc*{=7+2Lxu5EB0H<%>UW<XTR6m1@_3i2X;3l>KO9j}Y0
z*|BDg1b5gA<eF=@gLMb^`>%$s#&*Xpd2^pZx8Z#bMk|*C;!p2gVhSR-<dGt=p_dKx
zN=U}IpVY$dRPp~>^kOd8Pll`Fgd%IXE1gr1z+0d~Qg9RVcCsm&>eOQUgeMBOqBL@U
z-I^c9=apWE*kfwSjf%}sPh~$8x^N0gzLFCZ4kp5hr7#<I$NGJL$*A_P5Uu2)cPAGV
z(CpssowLb^y2Ko#`FK^QOfCWDxzPX8PQTvqU{rmcl8nXcf(h18)7JDO=Y?I>PsLTX
zMer|I?cCmKnvFQZdYcxI482uR@u?w2h#d@vTD^S5LhW(#PvJ5l*z1%b$wa*|)Z<1+
zvO*cR7#CxAmJz>EYm%P)8)5OvD{3OkEFDhCgHn8MJ5lpRYP|0D)pFhqUPAXl#>p4|
zz0o{5PG(g0P>g1uG9p7A#tJzIkQ3sV<62Q+ii;A&9)8w|FRVe%9$q)Ua;u9n<Jv|P
z4OW%xaECDILC%Ic6mYty`=CFcw|WaV#`03h@Tc|6Xlwl&_!{==C@VUU|3Jxvd6vqw
ztfb--osZpzWeQefQeI@E`n3W>l7a5_bu7voN90vEbLSk0r5r*_=Nqnsp^ctD(2lx*
zFujFv8D`&mSX>yiP0NIh7WO)bY(hLXS$jj%aKpI3GU|A;5GRzuR=q^2f+yg^=8-JU
z1G$Cdj9v^0ckRT*k2aG$g4->!bTV3fs)W?8afzzX4`m-{n>cf54edbF5P~F>y25N(
z??rBNDu7xcfg4X0@y7QtWRQe%Ca=#ZW_mk)UPR6&9E;S54<P#Pb~0#NjF<Oy6*i=c
z;eus~t6&fK$9NjE%_2?{Dqh28mvKO9k8>z=)dpLlQ0h>8lxcBXdl5fW&q8bmO{xUn
zD<yck%_}xfOPSHGjkUV!jRK)uL`W^ClJ-d<P}Gd>e6g9<)cjz+f5ytgsA#UKLM)OT
z?a%htLG<=+<{=I7J-{ZjjuL~=hJsw?ntn-+J(UZI9+|(_>H#oM%~Tp53BAeev19TR
zduw@;Sji!&EVLrzCogKFOk45;bq~e1Ap%<3%bMh4;lc@Cv8Dav30xFfPT4QwkwG~9
zdti_F7x%jug<eH{5Kp-SW^q>Ft{vy0{7-us*oG)w;O!}jVu~aCty|U}1GVl*Kcy;<
zL6w_rz~HM>rEudq_(Mk;rGJlZ9Wm(5s+?fjr^W<IQ;raIig-mXZ*Z4x*1a1m)v<4S
z%xis$V~iTSbhvZ)+B;mPD$Hp3ta%6%>G9{T=4T_8!G)QrUTU?LLV5E$XV~$qQ4Q8V
zlnUfOaMCPghvQSoPt*^SoR<2Bq9qhvWFE0xF~_@?0&ptWl*1md*pyo3>x?z#Ii@Bx
zr4ke{u*z?455*<6>A(b<A9ofaRT%wwkDlDO?4L*uNNvV{ZY@T`-Bf45Y-AJ5JVdz_
zWrWAb#)>{Yg2et_v-v?-7W+hNWveJT0_b>|4hs-LCPB(e^tv4`K~*MfB8Qg{LoKQS
z5i2(Vw$O#O#aOIF;Yw5N<Gx@dF8qdh$u3k;N_oX1rLVwR6w7&0J_=kfe?zk~C($c`
z&zcws7pcuv;3b1;*EOhVmHRX{JJ@M$XJ@GTDas93JQeK>fnrWfa~kdvLuGtd<~;gQ
z_HP=DyS`?py?`p&NPo*-R4bIkFhw4hz<;#U68ht`P{z^LnpjUIGzHZ{XQ4^v#E5q(
zN-AL}vT6eLK$yi;%Puc7MEpdLtJ%hE@XeWS{#Lx*HaH6g<ctrBuOm?B4Yb$hy<jN*
zMP7xz60W^eR+lHw@TZOz@4%cHXoK@#o9>$M;tQ-F-qJ~2OBmu|<pq(KpsO$6VLMm6
z%?kb|K+(U{>M^bnAzR)^xX&D8RTQEna)kf<ynnR$n9vt3x4fEvS3-nJrk<u)S{CvP
z7-L+aCNm@lKW%mxm(jwnEBW!0ANkWCp}Bbhy2kz|C{^<kl@^A$QJLQhO>kglh`?|F
z)i)ZD9C=6OS}YS3U7tU7e)J-(ws4)@b;eOp-UTK==}^5L(c~}>n737$DOi9Lm=k<l
zsfqZNd8+olLKD~a!OHp|eWF);LFUkNCEp519_|HqrSlR)HtM=uGcl(bw_m><ZBy~r
zhTHL6>x>W(Mu;*TI@0{yva5ISJ=RkrFyg?}%)~>SwDvcHuStm<hl=xVl^qB0Xkeg!
zY5nVCPL4Bn8KQSPDTT|+pX#xQ*$|8CW!P@1fnnOaN^$a~K2`-&y&<`!Guf1lC7{Nn
znLdGmOG&Qo=IF5M-k)ya`e1{9WD3s+cH=OO7L9X-{Bp%hsqk0x%Jnw*=R}JgH~Mrz
zHf_wkO=S<Ktog%Nzf2<#1nuHVPBOC<1i^*S^c~U?IF4@<ulCNCK5ag)M*Z_g!{0&z
zA*dg8`d3$(!m~-w{zRO`2TF&e8E*}MYXr=(UB#PW>YkAzHuX-CX%n2n?CcF1?M_b(
z$HQip>e;2*{gt2`!&?q_5wGB>jmw(<Qge_`o8~0fwu2QS;ejw{F~!$}Xbcu0NUjI4
z?t6)dtFh8ef<)dvM!9A^)Z&d2y;zJp<O9(JrgwjqFu4vzt!i^*@JJ=Cw$`25PQS#2
zk>rb*t8jsuat=V*B0MG%FYa4%1J}}oXV*8dh}?1%Tk1iLSAC|(3Qq{4)`UqE>8K2N
zCE2;c%VZUW5Xzj~j?3wuc*=^9c%P`Q_uOKk;arMtKuj-BK`6pi$_Hg|v8MPV;pJ9+
zt=?!$x~r8l!(mr?(1=BZ(x-vee@}yXZwFy@voXK5<ewTk3G>CyHpu+~=MretQ|3S*
zwj27X#JGNm)`#FL7uv#3)gU`4Z4Xam%eWp*7mLY4IBL<VtJ#r}no7Ch73`mx_UN87
ziD)Gy|Av~zm7OD_Z96h4kmeppJP7ny2PR-X;3kB?9t3WMb2Cq3ia9Ff$nwUW5(D#=
zn^Kg|BUqBDnPvw-4d2?!sn@18gDkd|F>%9{MQf7l;Gsh3$Y<CW^BVza(#Qt2tAwp~
zRS7w7#5%6)8kqEj7wzi9y$-Ub9v{g3S4*hW#Ulf}mh32BF9U6ggW<KI3zxnQ4(Jwy
zUG`&L!i_t0-k%+>79LP?Yiz(PA06~^3ZuL^G~IlAHqNavqdDij-5M3*6063!8fWn-
zzHtigD1=358lg15!=HZSR~4y`<(1e4uflJ)N>`feZq8gJ5C6~_;AyGr<Pl!+%<<^j
z1lR=}RVd!v^%O$i*Rl;I@~C<A7VGNF3azZU)1ClzEB$yUpnE<jp<C>}5z%mMDpjO$
z5JJ=Swin|iUviG~PsnFwwxzpFmT#-YyAz7G<i5Y*xO}`fb9zCr(Tq{p3rtKr{L?mL
zE!^qIty$lVH$wkM#D{~&1_$S)9_PWk&k`28xZ{ZBAlhK_42L~;F0dB$b!eOrh~Cb_
zeo~;b_{qo&Phx&CgCz+uXsJ-iMa|-t*_IG?c4J$H5R;UoS$V@?E`%`cqX3C;>vjl8
zIY%yxC%}%O)E`@;DqK$`4ulGaH{=nh$E`%*74yDke0iYsouPhrz}C_JILzebIhtKK
zSyCLmUM9c@{M(Giu@-mEv1YuO|7%nDT6+$bp_mJCko|Bm5$lk!^cRWsBkS>;gINaD
z5%CLN@k{Y1&)@h5THNQLwTa<ZKIXH#Y048`&k@`po^I7l7|Q>c?wbF>@TekqTR~Dt
z#S1soO@6_gUG#RUXqj;=l8Gc8y`UBdV6=(}x`}b6CKP}ZhNcf)xqob_Z(<FUG{w^Q
zi@%W}f{*E*d5}O}xG?eDU)jdt-Dg6LH|xIPTB564H<sXz-5(X~h%J|-_<Z6lyZiGz
z%=foCAgB*<P;a;45+r))5Tz$p2zW=I@3bNN4t(Y`ICV~h-xHXYN4;;E*dxWf&Oa&#
z64=X^AJ@A~J9$Eh;QXR(^6YTMBPg}JOo5pUIx0*-7zq>VRYu>3DOEhp@QJtk!<h5?
zD9MYt3KIV*PEdL+z);zG-LWb1yjd|;&l9gyZ{9rHBhy7GF8PFi-x<qSQqGqGWDo6M
zmW4_zFqDGc*|1;7PnjyGvh_Cv3zgNzS4}x+#P<?R2>an|QYf$djayWlXgjPi>-(nR
zw-XBg4L0akz_ben4|m5!E!l<8sinZAsC=|+uFcw}jmf6ZEq4(7Q{e)q%}|r6(T3V>
z%@l_6xV#*+e#ekVqZzu-98p6+NzfnIN_iR4V!<wU7xysPwxhjDaHp%BqJB!$OKNV7
zt>Bh0;8~1pY@Jt=r|lT=GBfX_S)J+fkMQ(6?*whBd0{;2#v5KbbZVWQR4iviDLgkK
zq0)GfG*lhWF7IqRR8M#an@I<bdhYWQJ}BPW=Vaax^6Rxwkx*VZC%s44q><i}H22cT
zNgiHQb1)w!Td98;?Tk$0HEugOO`^Xf^Q+LPv+)hchXx?etsAajKJ~|z>i<yBS5@iL
z4a$=}+4HCEQYN2pY<Y*Dv;(G^F^;u36#LCcNA|7t@gG$o3a>o|*>)lcz*8VoSoCr|
zs$cK^(rlQl>J(}zgaX7vxeLOoSy`%Ej5b}caRa_nv#zDhl4pH{!#4~#chu04z)?Uc
z7qJaO9P{s<8W7QI&UY%zDZLtsKzV1Y9>u2AX_LbZUi~^WEsIHk#=K9waC!bI3ENN+
z$FT0KHEJ0t?bkkeN38F!!0xVGi{Y8Ctc<IGOBL*K(|cXDFkY>MvguZbYE_$dMz-Uk
zHumdJug#j?n~K?;K@t1f*QW8cYG<{=kif57UUK44#Agxd`^Tzxi8s#zCMT9xa-KCT
zR#gg9l?sU#9DLQ&PRT7v?DfDpey(b^A&#b3Rpke1)c-=j+3%_pw<;Ag)Er9J)`}lV
zH8qr6*Qb}<$mUI4!;p#VpUBO<v_{@dhzh<d#kIKeZ0lGoO3o^_;HQ3)Ctp{Jp9;f*
zL{zJ*wYw-u2-xv>%o&bEU^Zv$Kmk<lxjUIaD?>@nPU!Nwsfx!KV8`!%Am&Oz1L==U
zXP0VW`NmGQ8K+&iW_dFl`RCNX0F9cX1Pf5(#)C7MB${`I;!ozVX5G39=XvNcSAucx
z^W1;^&muY7{_tw23(}WWv*t~8XU=tfN!4LqxO6h+{e4y0#ZotEP|n6m&`UySa^@g_
zsxx=6vBvPOp>w`1Y9C33Zj$*I$*hHE#kBs4f$;Y$e^IxogXv!0T#M%MnMUn!BvgGD
z=K4aV(>A*LuL@{*Qp;>X2;zgjcHb^Qi&4fjI^t9g8x@ODwu_L6>^_)%YdE&IXt_=-
zgEYIVB)|B)oY!|q$M>R2*K-xRM8%NO&6a8TdrY!yLc%3O2!rS)MbrI#ngzA@i>+$v
zU-dnv&S&C_Y0Mn^d1yw?)TfUnxvcd5kL-C)M%F0KtfKlmLpUjQOX=|%a-r?AzEaQH
z_djN6Se7TJ-VEE09mE@~GsIJyj5h%#kVS&4svNbRGaL48u$h2|KZ|lhMw${FzS2p2
z?L;#$BiD3NbX4`&-b{omddr5Nbh+ckaEO;CcoD=}P=9$B`O&U4flS?&O|cg+cbr8d
zv4aN^j3?PGyDpaFLWyXKJQ>>Qv><FrWsRMlB|kU4=7yqLti869+Rh@p7n;6kca%aY
zn|GRSHYKz8797h$f>DFXUgYBd${;wl=A6n+M9#~{w7*l_8*a@mW6HC;3x|Nrne|C8
zf|MZwEx!m^!YG4x$6pc>0?&PHdi!PH8DN>30#;TIo8d-a(b^9t-s`)8kW{WC-9N{s
zO_Cxnn-aTIC_q?g$HPYF6GmBoT2uM(!q6TY>7=JvA69ky`Uls}gi<Qv9YV8=Ze}cg
zh3(?M_rum_e~qb6qqLt!0lm6mtfs@+!mSt<Uz~J?zgJb%>7#<b+;k_5unr<cz6DqM
z#U0mfkTQ)o`$<yWZ!1SQ)L&vd;L`uLZxhc%(joJxW><L&J-P9df=)jr-v&Yc!Nppv
zo9UNgG?8b)J)GL265m5C^c>`$5Ts16B^>sbS<a|0KTCi7*=-C{gNSH&`@-gI%f|Ss
z9^M^wj@>42U~D8!&;E=R`49@TRqL^y8P2=zmboWt7Yzw&AsnvZVEzJD`(AMEiBFl9
z*V0EJjm7#40VDGggyrTvI}h&U9RO`Z1DHD7<TV8;?x0$M<l@qkPkMGTyL$J*(z<~y
z?7I3skPY{Jo3`Q~^{NL%N~akW$%zgnXob{rw=&`mR4Fk-X<xWfJ^$t&pupM!AP&6M
z2VosBF2kl(bSW&LY*KPQI;JS(k2QweDm|@q)=i7$Yx{%L`bx);Slm{{qjqD2cWj5u
zbd)L9l>8C5>(nzY)fwSNK?LeiAnNS*>j!SE!nM*H`@=L8L}sWt(CY!Tt&!xP2(ygq
zvk8Fc5zVi@3J{1Yn-G`2jH$bG<CQv!jBV6{o1|L4)tt%7a$w_3JXv#Q{UmGXdi!9_
zc3^|1Q70ThfqEQ>2AeRt-4fUrtAo0<h}tyCvTPgtrNzt{;aKA2)q$4XNw)%@My3gp
zT;ml894Gyf@civG-%o;ABt-M9WpxhL27iIG{wobkFw?G*t_MCadXsNu)*M@i%y!pX
zrJ3p{M*XUAH{25;z`-n(3F|oUtiW5g1UgUkke%Tp{ySv0{<N!7>AbSD{k8XpXD<5~
zY}jMGV*7fJthjNJtPGYtspNZVuouU{r+1IR`1&J!TL<wX*E6q5ac?ZX;*=OS7Ui<N
z;v4BKs({)lg1kH2g(%4ICz8=qKzDuu95W?rQURFNi`H<(GvZ6?@X|<l(Rm2Mdvkqh
zDn_Xa&wLVrnTEAF5%9c2Y;4{2c<S!AOo{%gh0t!;2^O347p0VGk2gs)%UpV{^y2FQ
zL?|cz@`GUby*_Ce_I2rHibA;BBj~A@;;m(1+L081QvR2kzC?^Mb`142-<l2a#@Zx=
zH9^CuM~6wE%@-t$)N4h&kEP0hPe8DV#{(N~<alV@lqiNbl*)ki0qj+3Sc%I6Us_yB
z4MJlAS}UOaH7^5K8{lu;n%LjBjg9<7zZ)uX&%MJU)6J?$O5CD47GZTh=)F<>$kd>@
zmNG7|sMB-87U`vTx!<35$GoJhpFUGWYJ-T}G%(hT$%&s-Q6pAe^1|EVWxHuAiSzpG
zXDs@*00G@{Wbp>eQ%{E&sB^u>T2+bbWqBzBuSZpFd<X{fas-$V^QGKFO!>!$B~w+V
z=dZwEhlW>Cyq&E-|05=thw>x!M9HX-<y(Kg{H~gZm;~N1p2(IpO|`URs4Z`vpz0U}
z&Zuj&$f6KORKRT%r6Sjnw{f`Fxbioe$bQp@+?~#Bb*BpxuU<P<@o=j+j*qzS3{uE3
z5UQijP`4NfLvZc;xrf$|uKMhL;x0(;6^LWhN0Y2dEOP)H)akvM>iK4-gO<^&?m?W>
zk+UHTGJVk9_OZ&&!E(~nhTQ{FqzQ0bWj&Z#>EvKQh0TFsr$CZ^J8kYyi&r@(FzX9?
zi&ReU`d}8B^Aa^EAY_^IZ}0Ao`u12)ePMKb_L|dz?^dT3$@Y&;U_pIT{b!5hEOla0
zfi#%i>l4){ZGrpW2~;&y!jd)wr(Rmb@uo9@XrZgQOp7U$p}K|$!NVCVrrt5|Hu3oV
zDKTGXjuh9fDGvwSgu#s80R~pzBL*s1hKx`~g4LVce+e7VBE48<<9a^icGQe`-NO>$
z$ZkB4_l>I+#m12SpnnJfm&>?#r(%nsw9FmuBqRSd_FY=8SWr2lt@vNLz3CN<FR$1X
zTT7dKwef8-VG5o~cQYHe_L+pn_>GddJ=@~t0T$I#gb163ZG88C7IS8)b_nR<3;w;g
zHKv4n+}<(x3O?EW5Dp}_-%Vq&he+9?^ql_U{jGyY_EO`xe!BQnCG$AF+rD^Zwy!_-
zk6x#^6yWpU8LSwtG?*|oz47w-)r!f5%3U12zNPKr;Eo=J6mlmKM5;I;N38iUHW(>_
zo*s*n5_XZG@&r!}ZhXMk6$Rwgq_)Q{9D#AMx2AllGhAG_N8xyFPgS?OH0TUohb(9u
z$-TW%);v{!)PeC)mq&**f;nbPF3+g97%>rNU}Wj5TLxzA?txt-Ao%Xmrk?EQI3pZ4
z2=fc^Cjsae+$})8d5x&^r<W&C2vE~or*zw5z_xvXel=5x622kAuhqIX$yx}Y<x1s?
zCZk`SU0XCzRD8Dj$^yd-%7dqx`X{fSTlgUVN)Gy|Y1}W;`^<?FM{F>yUy6j#$G}{l
z|4qOY##CEo(gte@{F4COJ4B1=P~tF{q75o59_)7c2n=9>pd@egomUM21;sJ2z?@Io
zX-P`#$lF=7cD$XkC!8j+pLr#dOboVPT&?dMqytup@~|}c=!mEOYsNSSt9|3qn^Vv6
zz#em-V>QBRyFlh;3dtlnQLK;u!ZH)B4{1P}#*g4;voAnkSZN^Ql3RP=4NZ9+>+=0~
zqE3Glo=;Q&(|5s*CH$6L_im?Vl6>@LKmULvZu~1@NY2N&>QiM!O~N=z^x-4!D1_1}
z5M4ZsZBP;O;ZPu**x|Ut9+Q)t44u0V0>nTZ*yoDYLuf?8r?{PEBt*ZhOlG-TfSX%X
z2Kx27RIvrMcz805$O5v2B#a{jh^e%^_Pf@N7|sPy{Y<hsRnEBMzf_;q{D^oH*F)N?
zIfvFmPNu}eU50q{XR?ux+%J|K0@a}OZ(#5z%+n&Ti`x$b2-4(bC`Wrr-Rnz3%isO~
z)+8?vw%plt*;B8zpSr{{k+48fmGWTU)}zlPK(w;TK59t^dHj{82!Os2vNsS1Un_)?
zGCC@0IS^qW(CB>qWnvd^kCo{_VLO;*YdUV2#D)&Wrg*HcZwP9#E(?2&B`|}@r?JFi
zc>1;Nr43Be4C|GvfnNGNx$lf$BgO4u`lZ8FW~*Xf!lil=x4~3Mr>f{tfKYa#T8jmp
z9PXYhy@todB7BHvjS1{<Hq;}AKR-Z6g77!^GZ#+jEsMUC%IVJvV)9x1*M;Px29_1P
z(GmPMojUVXfYMv|<WPTSnp3-gqe#jqAh~qRZ;y~d%58%y=_@pBF91}G%*eK<;+bo#
zM?;1WPzjNK{f^Ves+tNOR21&cQ+VyDgTz&=DSLnmWc60)o}3q3M)9;hjqby92Lfva
zQ)Ke@fyv@TxrCMIFnqc3Vesl0fK)Kt8?<!js<^m=QnBzjRSIEIfEvPr<<>TFEA7Fz
zx;FtaqoN0UU+}Vy3Io@1l815Ax!Oqx*&!hjVOJs`am4Jyfdj)k8t)@uKDCuz_P%Fu
z8GN_MOcod~SE<uZK#-h<z+m&Hc`Q|4hNhx%Y=?p+Q?Z{i(^0m+vul~%AMRDJcnhgy
zTgg8eAZR}?sc|Qk;5KPxs%Z>@gNu6?iWaRu@k3Q2qr15p+p~sE;{NK>4wEF;6Ld>k
z#Wb_HGfZC1wt#WCX0whF<ONHtom&f=$hx?U6Ff1@4J5yHorF;4_{T2%^*e>ote^Fn
z+CYeeqI0(L$bTwYVA9{J2LWt<!;8_YD)Ts+r<HP-uB+iG8~L6*4_L!G&<kHnJ>7LM
z{)$WpLwucrqWRQ=!o>UIJPN(_O^WKk&iuO9lF%qk>6X6BQJk&$Aiw+QeVa(3B?C=h
zA{o6UW`A^Bn#yB2PLMzdgE1Sm?yAJmpG#+c1)ae`q1`d{ypeavyI8L(ob<CFwPk`e
z)6V>Xpk0Ut=7KeKhskI`in#QC(j~TG5Fg|sC32Hmw~Vu0hyz@pDkhJ}IEMU6pCf%@
z12ow501b{M!>h*u`81)NlSc-8ItpAp3T>rep(rubvL}*A$BDZSdPoIE9QNFWx6dKb
zkyhQQ%HX7H6Zf4vfu&@Pmx{S3A()&~s13m#W*;`tRw8Eos)*o{@r-$Q0{4h}Wmm~{
zXaR)*Fv+?XGkA${F4WiL%5*5jtM;#&uof%}=xl#Mv>|HKYVc%`7%_&fvN$TFusTEj
z$ZUr=CH6QPw0*gAxZIoy44v5u7iszCHbp0^X;btn>fz34y(n_)Yuz=6+`9E?BWa0o
z3Bh(_m+f6*>LFP|_WaTFY)R)Dh!~nR1h413nJXHzm$6}X6u-xpxAyRzB5zcG^n@=e
zV6{*&@`Rg&u-G*pf!-3ct06$soOe@}`-wKOVH;9tf;v8gNv}D$3<Q*1wMW0c*Xwe2
zh|l<Pc0#)0lr{H_#;MRtbXW$rRF_w0R)a-h|6(x-v$J4@bk{$1)<0#46rkNR>(adC
zfQjt3@*M~64Gsq{8K>)@s$9$66Z?V(aBnm1hhmcjA0v}d@oWtUY=k72N)N2oP|0?J
zNReui?O`}mnuD_q7)!VWupA2wHZ#;o!rGKiv+hz1w?OQFHc4}V>@>o>l~0S&Y1qKU
z(4!?wUg7iCVPT*}G#krMjQ2As>M73}Ic(ZtJfI($6r2%LRp|BXmh@?5aN={@85IDs
zO_`4K%v=V+XdzmUCXM?pR$HM>RHe(`0NI&c3p;`dB1z3DCyKNj1hDPboz$R(<AFL-
zd`vj9M{0<Q;jcg7UPPnC)nZ+e8v2ilgwGP*m__(i$P?})7>ePX8Sl&0CCoohPr+P&
zbjgMzTSV$G(O8AA5W%$4hIc~W4exaK(6hkRKTGo2g^@nJWX0^o|7cx^+45OjP~ESJ
zgA$`mMMA&_uVC~+T^}SOUvjQvzTA!u!nNJm>X{_WAwT)8f1k03!?HsUEM?jH1@x}g
zSn#Kx_D#my9WBxxoFRdN`%Omw5&waNgYZ)ZBM}XgIc9cerHv<P30b7AGO(I(h3y^`
z1LXveTDqX4O_@~AG0CpMdQLhL{#Uq!y&`P-GQaeI=+qdHPark!64++`hwq<T2S`%c
z_=d5B1+8h!rV};{B$s)!)K!i7qFj$hY=-b+3onX3ReG-yitUFV&e;g3=Lg~(?<A%8
z*ov~SwRp?|$OZ+g^D|BxWWLkzFT|ghfxbln8U$~0(0>ipR{ygd<<Pv|?ce!WT4>71
zu$ja@6?0PLe-MV=8k7V}b{f4Rp_aAX7+xD~YTdpfGU@HmZBrb3F|Hh9ry<m1I8LBO
zoO0c#U;m~(fzeu*j7%x3K<AOYb($R0*^%_T{XFgUFYPg@aVRP2aGrHF6QQuMRr^Gk
zld;d|8Q-HL)<5kmL8xfVI=DS9!LpY)pLE+N-VVSAXMN%;y>c{oc;}qdzo{=__$c*^
zCC?=t52*eKWOt2A0Y$h9*VL%@At#S1_vy-&lgmp$8EB;=T_}-ow?XW5=V(iFf#xfP
z%JM^H;f@A??jynXdTbY<9esoJFV6M7Jokphl#`B*5NoF{I1TE?MA?Uy`wwx!-UJUu
zMu(!xo8b~=Eo2I;8f()~maI3&W?W2j44-~NIQ8Cbz+Rw7UTLo{r$Q|yGZxzHBlTi<
zO_@i=!1H|+ba=t^>D#N@V3&#7>VRn<nB~}<=+t(B*>T`XLFM}E&WGlm85z&8YlCH-
z2T{VlXI<&%QGoTi5^R^nXYBz97Z{bUseR&i%7y2RKM!~OR*B)L>*(A%n6P=r@_LEr
z>CdOHMGHhld6HykoI|stev$_J{3<+@{X`I-n&&Df5QMYiIWbs6*)9a2T=yEYe&wEW
z_@ww1RL0u*2T(B*Uq|)61r%j~LC}Ey|FXaT7-9d%`M*Vg|0nkUMJ4+mATSWofA7VA
bLc;$iu}o109O8ezf&6#<|Fh2=|Kt5H@Anvm

literal 14227
zcmZ|0Q*<v(6y+J)xv`BK+fHu$k8RtwZQHhO+qP{x^L4N3UOj7Osvgd&{jg8H)~Vl?
zlL7_%0|W#F1w>`g%60F_S67S-1a$YGgz%qgpl@ht>R{_^V?<|RXIiZ4sio-r=QmnL
zr`$>aT!>RYAuio8EW%_G9R!5hF266{9}bF~TpENlRW3R}2)~_(GC8o#5s9iwOt@OY
zAaWI#&{EiIpD+tNC?j?T&*b_1@jQ2C`|!u-^q#x-mb2IKrkmgG7o;Er3<8oEB|Io#
zPw4fz3`w4b1#)a;WMgDxXJ%z(W~cuLxeXUT6OfIVJDR1Pg`2IF#k;MowZ+@bdxpO=
zRV<Z$xl*;+5DfU}g}CvJG;2{AgNc{GABzwpUKD>_9>eQj6FLJBtH)bgRiDb;AQEk^
zpO@2LVHy*4mB~3%nl@?RVJrN>J-`&PlcvCXWu8#y(}Bjvueyj#CyK<Nhb{pP)S@qt
z<P9K8AdWBl+xSuNZ>g0iQ%cI;urd9C?NFRF@>ry>y@GR`CMEmz<JoGDr@y3Unle#*
zNOTy3S2et|%Pj^uI9O;849a?4K@5++e^PY|{L+m~gy$$v;WmN`f7UU%%&oygfhNYy
z44yFyM+n6YKgaUls*VQP#=&&j^0+Usx;^#;N*9mXaH@)PExH7Ck&8;u%pEx!b#){X
zMtB5$b@$kX<Q)j&PRMs$%<^hMp7^a?4A)(>FejdE)ryy<yv77jc7GL>(dkj*kbifZ
z%TW|lb{Sf;U`*cPmJS&y?MwAskORnWnXE?jNsweJn0!#5yji(fZ!L=w{D~I#j-7I-
zMNE=lO<ctLHCh=%Q31l2NqC29xQOWOn_W;$*psM=A2b@5in#hRHUdrYiJj1_N>YKs
z5@W41M_2<rh~C}99S~thS65c?&KP<-2P9AYGj_Mo1#Ns7AygHy-aVUC_}qD;w4yZk
zZ5T|n7+#KWn$bG9?*Ncr)w4RP;tZU*I9cLwLA#6bf*H+cktkTCZh_`v(LvIu$e->(
zBb87G4vXm4A&@pcM(!;y?F&4jV>7)`Kc%w-$=vDU;IONdKYo+4O-c8}L-91&i_mO&
z>L>|D|K9k_!ji^we>f!_Rl304rj~Q1hLU@T1g$iaM9}rrTwa{od1FTd&B)xy+(g|W
zMHi6MjxHH$sMvPtMc}B&=>p<JH)wT)igY}(@l%`2nM~-!f?bTbklApky@^*81*3Pl
zR`eKDhI7pfI63Dlg!?CL$%v5ua2X?EeKEpC@)6?I_Lkgu6lU~cxICDHh2JpMrqy~0
zt&=D6PfmAGprh#;g%4@h+Run3X%MkrB7Da{;9)QykEmjW^^q=CEMGJR7sL4$xz0Z(
zbHubZo3p<FzUwM*Q0m_bQdR#HA~8xOoqN&J^|_?6w>)RI&)yn3*K$o#_gvIh*Cp9p
z`&Q4?F-;U5Vz)skwrnZ+a;_H}N`Z$KLWe^MJ!*_vsDuO_kJMj|eoo<hmdIvZ>3CM*
zG^h}lYc=e6%oPoR&l_@>jjHz7L_rq0Za5}rfjTZ(OvjUqZ6JlO8iGh8k&F#XFEp*a
zfv$UE_;ei~;<7>}$cJqKeaR5*wSzb{>f3HDrFB1Qi6L6&bJlz5s67Q|5<)~G8=0OO
z^wo05O|oLPC7$-`a<3ovOBrw^pz>GGpDP$Tw2SSf7mZL)>CLs8;(CzX!IvJ}?P)!!
z=jn?lqx20E#AOsgWcT}hdsKT$V1RY7g%!C`HOTZ#;g(K7JqF%3;%p{aOLo~uUQ!wr
zwbEw7-Hqq&lsznlRL_O*PChHXk8c=Bs(+`?ri4Whr-BiAwtB#|sH!H5dHso2zK>9g
zsyyWT;LSpnU<i!S8nGxqJStgHE@ne0W(yFhSVGda?-q2w$H@3L7$I)L^$P<AHnu2q
z=&~6r0}EyJC!9bM{!5*pMAJZww)Xd)%}$@t>J><p0jZ_HR&qV$(Cb^AbCNHBT7+&F
z7EGa#srp_|<5Td?2)AxQ|EI)-g5VSarpTC>PWMG~_X(&~dDeP91p1=}VEpgAG2~Qa
zVBK_9)C=#8LuWN*r3_%H95XrU$f%90n=Tzg32OkGiu6_SR&hU)A3m~)8k7myP>*+e
z>w**lmfSGUlaHT@ih2It3Hji9+3xebC~2H6Vae>#9wkVY*kiY8y;Byw_^A2xWzPHh
zCa~5}UyuFUzdtzh8L;Mv+WHRI_ohv`o`$>AgdE5i@EWlow%jK7jKGwe?h#Mj_f`be
z&)b0!gJ{FDw{9b>B7B!K$D+|yr~|dl3b2MhYK3#u_ea}^_5<LV4-&~@3E9}JKp5w8
zPU%XS0pK5*7d~oYS)UqIV|u0qf;#*Vp*39Nb~&5~z!7Acgp%60tW$EFE@1)%=ouyc
z>aJ9v^!<di(|$1cPavv_oLgexJBTbD+t`SJHR4phMdxvg>?KYf8$9AftnMHw?DD4P
zh%ccSCYQ@2z6BtOgzc?z@V}FDL&1Lxst?AZ0>M0OtpN8S#W2-OaS^yw;V{m11&DAQ
zIOLie1a6h<kNLInIffBydC4%q1aD@nZ&~ye{4Fl&AW9_jDG}p9>PSA%r4+La1nN=u
z+4di)xL*nE16W&?S0+I$g|g=QAzX`re5i(o{8$;9&#5S-wY6SiiB`$yPlQ=tW7M#U
zCr|ufExWli)wo>C?Yc?V*ozs5MT#a$IMY7d^BhKP(WiVJLe_u7w71)AFon&*9+~Wo
zDJbHqh_JVeH40GBk_LYnDrfOT%VAy0*sHyF^vJO4l*W~I1A&$|^orWdu(sS~pGv0;
zjl&<div<&U?3V6IpM7ZdVIAK0<fs;qLmEU6iI-MZM_;jxVwEbJudhjs?c*)~!Hrn^
znLRh#p12Df)W@nH#iRNMQ<H{cYkG9yf%$1|ZMzLW##Fvgrze&U>8*Gw;GM?#vKVu1
zEGT;PdSI#2<c)%S)!aR`EStGXpNdZKxS=ycIi^b$TM2(;>|wnN=<V!VLs1x?GwaY<
z*Y#j;{e8?K4KMnL7+MviA7z6a{9c|TLCC$c#1m#Mteor~UwyJtoxENEQQU$}YB*Zf
z?gD$c-tJx^uAL%IsWr=fLbXUxHEAw!j1P>`#=aVUJg_z;i+OJ2f>6~xzF*-MoJ0Tm
zYoZb+^7EJ<Aw6UzbifpFa?2^)o>dTu16a+X()`}fNqkbJCX=t&p1aFpNxx|g+V3h`
zg<t&U*|9XbKf@X_csKilwIy((7@EFaJT{FnTIzfd1V42%c-g{9>xUf1wZY(v)aiQ9
z5XGN!_Hzv(wBQYnUK(dU)0aRWLFM1pMb`Q@1!e40fT?|~Z?B6GDly~|R+Qge8Grrr
zHY9bRM=J6ZL$8U3?77<|@Xt!j85(^x?)l=yd#pPVm`e@x(1j1LJ=XymFi<dR5c)!m
zz|5-RVmjMG4QAdSk)y4udb{bK(|h=_)_%US@2qJnv*2EPx4D6hd0ZZmsr!4e)84_<
zZCt-)8<v}ob&Z~z;8kVo7Ng6a^f5JUYjZvMlze&g)B4@qUkk`-^1$PFjq7CSI(i#@
zkQmW|x8ZPQ;3vGy@G)#^PjCR|vHUHg>M|iZJ-i&rL;m{bes%54+OA%*L$VMR+cP-C
z<S(R2uuD1_w$j>|l9PN%!gO({417&yxWK;YWiK50dtG(!|8bYFiiQ;{1%#-5yVTY~
z)g`jga(FUNuc<kkd<qFA-BG^Owvx%TJJA+`79`-U*K74kZ#(9qnq*snSPMNi5oY6t
zHt-9EMhy7z1c{47OBU0e*|~b#tIseBwn?)|vjA~xOv1HTh%vie3z8ybQH72spRe&;
zb}J)i)>f>VH{-fw&+h4bW=}Lqd3w%oeH}T0TI%XkzvjIT{iJ9DX2@!GX67{X0%)e3
z0H-5hY^h^?l(xLc>Q6JS&{Rw8Jnc+n963!3&zF0SV~~@2qzu<r)nvS=;?ec6>Zam;
z2;^0stVMUbBzh)E@aQxdw{N?m=S=A`4;&&hr!2psXRS8oyl}oW8HcyB$=K!UqzCB}
z;-LEIc$&)QhQp>uf%f_=2LIhY;APxTMuAIIlB8~*^?lxI0JiyBFZ{=98f(!J!d&x4
z+vKi&5(!GhNOSqx+C$$+hDfS>Qo)c{WTx|At2}1I0l?Tziacb>HILeSyWcrZUxu<z
z&0t8g+$sYdcT@jHRJAd-2{dc7ymawvH&2^RK0mmn-89?`L=puTV&DzbO~JC?ayp&B
z;s85y%7Ss4gnF+|R?E5HnekTD&qxZ2-hW%=b4wf^iCXZ|Z+Zf;U%01-*1aX6O0%3;
zOn>D=j6D#D9dO9L+lB!IRn%i0ufe^F?Q~7G0zho(JQ3^+&<C5XJSra|>Zxqsu3_12
z<ATH780#SeQ}0KRz9MGe=vV{=`G~ZR`7$;2lH|6VVVOtE!iZ~_2yi&v^(h+Gf{j~M
zR8?)NuZCU_hA5$4g6uD7Grcj&xK)W<<MIMu6wx){(2at8b{Hs(?SN5!(!146PggD`
zWRaAHXDJ^%YE!3<i)IVea<h&r=L<EVZA{^8><M?XCcEZ7skF_4ksMWwERX2|`W6`n
zdh(6p9&1j=!Ow`+X>PuNae+F1xZCb5CF!HZ$dHp4j91_*Yg-S&rptgh9!qmJIjv@N
zFOuGgki4|BCcd&Cps|s{CB4Ut_yyOZb7vMSr?~k(7C?8R_VM0`G@;iH_%UxGJdi|M
z3l?d4K6n%gfn1U!ciB!=X)}yHkZLhScwjj=Xw1^uQ|O4x)R(^cHX>|1yCf<<Xpj57
zfYBI`W(rLj7C-IOUxw;1q<!}mwzj64(i)lz_+Q_y&x%@JIt#!If{US%Q1`S5zj;`^
zPaR;0WYKsJh&_U+|J*!Is{dWHpG^dPQeZqaW;JL;&K$J&v^nn<$FC>!!nb!UfDtAB
zJFA$!%llbjqO$T(>~|LO(8x?OI8NaSTpTnsB(h-Wgk8{}c+>MrRxj!t`fqgWY3>;x
zUj_dMM{KoTQKV&>plyu}HvAh(N^*C>0V+dL;Va>c><xI5s=F000^RRn!3nlnl?3yx
z_-fmsI!LV1gq&|gTH0&McRk^oC1bn3JUGVZ55np3V$hApfXc)>)?-fK4^?+=fX3)T
zP)v+yDKsd~#PcD=Sodg4;3FB?Fg;=p9dPtBuGq{#P7;;S<MFMeiM88N`w>5Y&$&HS
z42gzgcQ;ppwg7$J$8|5<got8}3hv-f&x)t@>|;(B0mhqV9&l%1pv3`OU66}A5X@Vm
z66KcTNnUSQ5Zmpa6$SIj^i6yvyNAaz&V_uvy-3GTm70T|2g|L0Yq;T$)r*#4p={WH
zyv%@nS4-v3C#%;Q5v@rne|by!>a_vaG;zOO)pN(96A#y`x<xb%+b$M0mVP+RcJbFU
z&aw<X_twq;#Hba;-E8*VO3)wuy6V#tE$Xct3qIEbc%~JEf<;HlIRn{oSN!6o6=Ee%
zn<rzFKSDEMO3vF@KN4$;$>%{NGa^`Ap}0BJw_Vgt#5*$m?UQ4nV<&5{V<lg3#FFw$
z@_4?DgNnr|3xNcj*uuJ=Vb<{v$stN#AR%`Ig)tRDy~G$MBHTFZn>Z@ofmJX<9=>i5
zTZJ8n(@O+~_<$Pew~lw$K>619!ApRW@1xUH$W=Qh<mN`&?svr(wLCLh!6$<cQQt9~
z-FKn|!5$c4VKBM?fzwhiuw*eWSdui5$J)limq$m>hPt%V^o?o$q`MGgN4qm?|2n6`
zVY_PHZ}eA+a8w8Vb&!jTN+DLdRwJwrStu(9OZH8?Hpfr#Rkty$x~0Z_p&ct{l7bjR
zzyr8YHVlQCki9!jk|?Zk<&*^rci1@d4zijD5MAcLW?qa8?HRx9(rpPJF8e9mPF}&E
zGqBcOE}G%CldN19^%n!*Rmj}2A99jhO7)fD*+EP8*9CkGscNF$K>OosN3xU+W{gqW
zo80W)KcU03NaeC*^C33vbf<QdS$%SjJM=k!h!feh0<hRJ59wyC5Vrx1bJOj1jsM`M
zCh@_l)qf`IAH0XMOD&E<=tqUxS%X-deFYbN!9u<W8BTwJ<o@?SCmcOUnPfT#wt*A~
zD7Y602<^Xtj-joUt%D<-laaBbrIW24t&^FtwQ;w$y6YtilFx1Jm_Ou(qgn$8PM3hc
z&^n^Aw{XkxQrud<%T4i@hlyC{5v@5rJfwKhy9o<+bkY0^7yZJ+^YzW(_$Jo3H_Q88
z;P~Ze*FJ$PQ_Jos&AVkn@-o=3scLd5aW{&Ht2j$BKXJrs+#rd?8~=3j!TtAN9im(;
zpD?4`Tl~!N8UsM~6nX9AiM<0QfHgM>C~w|pDt43?lBZ_~alg3gBU07c5A8VTj^<FJ
z5QdOUVb?=yo@jKC>IYgu0z>mdIEf8fE#pK+2i*$bhTp9);}Swp$v~3Vp`>)9m|!XE
zi`}Ta8<$!~qd~No{*=A^EU|D@Th~!QrTG{<=Pde6a0|$(p9dt;?B2R_>5FjcqnS2W
za6+?NHIpi;H~B+BX?r#<hmcW$2>y8M+@ZIVMhR@6`r0Qq+o(Az^dZJt89kO!mHu;~
zaO98?rQ$6jk4~kaJdP)Ge{@p*yfVcR;z)8PF~1mh)*<~=%)sClb#+v}eN5V|PxAG(
zuz`OkCUTI>t|R7WXzCt!ei+M;P?U{PhGreM72p^HN{|}{ZU8k)I!JlZveIW_1uzsU
z5YAn{RhQa*%s-Hdxv$m|xHEF{rS#>`{2nKE<y^UI12X=pNF#8L*>gz~y1r+Wvcr6r
zMxZ?-)0CMtZ8tL$zp>QDdcFi<L&!}CD;GaSw^Q>`Nj`&0%G>2UJV~alUzeLtfJ7d%
z5znKzkH~(CsT)bVM<d~fSWHCHYL?tn0`-!0`i*?glx`YxU57Yn*9IC??c21O&7JUA
zs8hbS0tf9V@ZJ^C^bPaMA4;GgFu5Lr+q`w0cv2F#Re@rnF1hkb2qeOD+;{b%e`YA3
zgUu0Y7Rp^@x*#i^bD_*4Rdx^U`fU~%(5+adv{2{pY_fK6QvRFBNBU>6<&_&S2&n`4
z21tI8#Qaip&$ybzGXf0+825CA1W@#GciUt7>L`<8lg6?|P8URSw{ym*j}P(*W50bM
z_&HR;ml59i7%K}JBd<)O!HW#MoQ#RO54Z?1oo|2{AsrIvNJ-az--B~FvB9j=vQ1z#
z^%zYSTA_iou=7bWS<_!Z3KLe|w>>q8&j5(reK#$!b@Ixw<9B3Dkz=(Sm)5NqtYJh`
zR3Vc=eg%pR|JfVPS^LlKGZ5Bb&5@g@xB$hJsb#a5ZP7@gk9Xm4RPBM%%VtA((ZrS>
zf;FlgK%tnD()2jT4`5!-sp3u<P3*<2crp$qYzbd$kX-6q;66xZa@2L@CE)}cQ2P$v
zF-I+_P-9je`tkw$K52BwemVIs6MqKj`)Kxb$>9Y#>Ba>?{4+|+U@*#*@%cK>l=xOE
zl=D=%k`*9|aBBUesa1z7G;{)fTGcF4I%(0IDc7r2>lxjpQrxCb)%)tx2O7#~=-52p
zH#dD(-eDXLnKxBP{`{t`tg_!)xW*DeXXvp=$fCv#lbH(*w0QZ_#_Y0}4j2&N&%!F<
zNU7?_S&kkSS!*+CGAYDzFY*8SQ^k68GsH~$Pr*H5Dp6lj7mT`N++CSK@9N{cr>fmX
za2%T-Or|_>mnYK84UA+s2>XIEGzYGe5i@|K1=GpU)Jh?rAlRP?e%011q(a2XpCH$K
zt&KY6#EPE*`%ijbH}lz{xszVdZ;J57QEFCi$~M1oVSX#-$*wqli*>cfUUbc@fkO}{
zzHd-FLn*|8%)PbG%-w$vXFX;Y>It!!+$h4aD!UQ>pRiH1p{Zo7Z*9VmKl>35y9<<&
zRS|%DLr@pQ$)>OVyK2KX%!<7e81g_px7Qp@sWS@ZRb{#D`z5qc$_-r5G}g+5fARE`
zo@1J3OE+ea>67x+j8&;|hdp{dq)RUl#p98tlZAvfH3|Q6zQA_^E{JvZMv?cF<PeYq
zkCm9PYCXVP9-O0&84i&_{C6pQ?@QZ)+7&s{P>gbuYt7ee5P3lkR)7=pew(%qjfP;n
zpC3wfl)%{Y2;`mpru9d#Tuq~hF|g`a+KdAbyUhCnmr9^XV~y1fv6t*eP@XQ~hG^?4
zD)L#0lyZ)t-E}zoyW|JPN_KD<kkog}SY*_1GQY%U&`;(brA17SXZ@$KT=epET1!IV
zWDtH=>jvYy1}#%?_y!=0Dvg+%-@_~tbZKnktrpd>J5l5>loQ!K=|B`aGSgr*#bQ0D
ze)l~u+?CFvSt$!29F57FiI@3_c!aEN^Yw2Cql!>u0u%j8YK~W7k*s-G-!VrD-!Mg{
z`8eu)hkliC9h5B)cnY8rFLlpbu@6fD>@8qQqBJA3$0&Q0hafuz7EcKS$6uYH78v5j
zD-f7Ibg3}S4<HYilZ`%J%r8uokyu-6{CvXbOY`drl+j@xFmM+R<|CW)c~P#~Ogp@a
zBaAAnlz7v4Hm-&;)c#i_Q>H<TsE3`~YM+85v(HRJ3vC(GR&2Uah8#P%BN0T@ySc8>
zi6+v+vB`sPfB28zRTyLgI%T1A3=t09LVrkDlI@wITI1{!+I2|8d4(GoR~ASTG0{oi
z&JX?_cH4mR)E#|7LM}*0VR*&Uys7t9*VT!AmaE+(b5oxH;ULqH$0Ix?#FbO0-fSuc
z5?i0y#<?Vz{%Ph!t81{P<*A3!VkhL>b2Z8Q$IXzugc?fr3ci%A{)n3bt!(U&*Ag>l
zt_N56$659h%I?f7kAvbIsc|2yRk7HWwn5sI7u;QfQ;!UzSsx@MJqzzA@DUl+p=DWs
zrOClNxsG_>6D^uq-rUlJ{Ls<?h8!DlJQ^-8J|ha2M$*Af6vvrlXLbmY*g1|i%%jit
zChCg-`DURzVn(dlfXPcf1+zCs4Oi4aZBlRg8A_~@Srb)+5d(a^-lZY{kArTNomxbR
zeEd93*h^$TlXb)iwK#rlUH+cmJphIyF)*?QPl07PmI|NzOo%UzOJ4hK_-rD)ylGgM
zk`Cb}n7A%vpTa{uRn4~K?p_U2su!Z+pv@~HD<(}B&@PA_b6mr@aZ7ZPoHdLy;t^(q
zgTutPng#)L1}E+{=)>vbFGH}7%92s?L&blA01WbWuH@12Wj5-K1dtDNQ*kdSac)ca
z_#_R{?eVX7KppavQHPR(*o*)nO&J;}1PTbFxk85Eo##({cY?t$wlR|3Kd=nj5N=aN
zo3qU<Ia)0%?GWLIY+HuE?{}s$^usQ;X1%j&5}1y7<8~pmRG4<E$}8Xn2^RCnlTnRH
zm=&_JrWG1x4Sf;VFUj=FmXFbQkBJ$ne}2Y@5agcS68(CN0FdT$?Dw=}{?*uhYod;A
z%Y?0#ehD40>@|R|NfKlVP>en0U|VfxT04Hys7m7y9Bn|+yb4NfaQl%H`kKe?tZGzg
zsVgkpONOReO=XhR6EH@1Kc$j7t#}pZD5FXK%a8`Bx;b#+`k)>-p^O24w2m=EsP81w
z9%-oM?yEJ-&-+q7XSdO!9ls{(9V7RoV9&CC(9BL6`^Bn74GS-X29p^ll9myR%;H+t
z5vuney|uEp+^y82%k8d_e4{^7nG|jq%PlzmRl*<c`@3m%EXFLEb!9h=uxf%+=XY5}
zjmWl63vL|lP#;~Yj#C`5rNdq<6R|BzTQI?+Zk(P!lyjOy{C&>|u!uZ?RLei*S4JXP
zHL9!@bsKt;2*d(u_$<g%6KIfR_d-SLXYx3V-;0r~AL5F1$Brfj=Di?alJ)zWcU<$M
zf<QEwUx9UM&<iW#9Ni4gn))T`T?0SQON|G9%q;+Z%?_$jgJM0*0-mn!!ltjuAX1_$
z&yp*YK-~j=h&s`)q+U+9CEsVtumz(b3KTCy7s`HuO^({w#Wn${(>;+`qeGO0AL3ni
zr|-nj9`b-|m%qv2&K1#wquml=9PMN(-?jD;JYaN2Xwakjr}vI}R`1O#*XhQT^{Lj#
zWT8~ClqijL5))MHkTv+R57vp_BytFjAK#mniOPD+-#9?U!w@*Wf6TdzRAWZ?Pvy$P
z5&agpM$Q4R&tt~SEK4H6QbN|<D9tk)XKK?1CHZgCF60loqFr&y&y3%70B#i+=mpj_
z1%pxOm5{yTms^sw5fn~2=JyszK~{M2xC@_i`L<wGO?41n+z_it?*L(<;Xrnvf$$RZ
zoAVZOd`RWAw$1qH!*<dDtXh=4Dp8xgZXn6_T(omP(XkuHyxa((q$`Errosp(Z*Hh1
zHpKSV%JqX+oeG8-!(dVTjvX8UnWyDKT_K!WP|Ttol;X@?5pNbQj<08XI8mCTzw0xn
zo2>kSCx6a9j&|zi;B=ebFq1TA;H_GYWZ+J0cGgEmuKgB>bJHWje3X=prRhPd?CKV{
zDFIuib>k9FUK=$FH&5-c5BbEon^pMg?qs?FLLv38b)4o}^uumoRbOH(El}HiJ-7e`
zH;OXL)T3YVtI8YEVtkBuTs8x<A^mv7Y=d*FD}k6(_WK(O$ImMbsxq!7yu}h`X4f|Z
z$z&%aBtz?_<JLE(N`Ze?e!u*7AED_!)@*q@b4T#}RyocbF{Wm>NXX-RY%}qov(snG
z$hANGbM#JVyeNf3$V?px)@H?Uj)JEGxzG8PdX{wwUsTd4@0Kh1QQeg5LErv$O*b~P
zWC@#x(Ohm2vS#97)!$R_8mX}BuR28Wia^=<9k;0OHwgmAh8(H&h+=}Ah58t~kdl-T
zy>ko|LCas7;pWD}cWu-9v+q~DCkCd)(Vz(yD8zaxfK5PPZYNlFR{#mrZ3HEJwC5eS
z(7o`x=?^F@fI&e>Zj$S_bnf<cg8Gz|ZJ5;uq(S7=T=*@aafJjC*wfqY6PYR~0{2g|
zqtMqh<Qb@X7ph^17Mg$+cpcNLReH*FBU;`FU9c+Qv#DFgDz{h7?Ay;u10%&^XQ^l^
zS^nJE^Y7$>&h2{)8Gs$Qli_G#Bw558y*HxJUR@a_@?hKvX4}W!mz^^rDyF@H%%uK2
zpy6O2r6XDpcuR{{s1m5UpnZ#bp9iZT#N+^u$U6Yi{p4dXJaJC4cE&U^rF@0dA!(Gq
z!@AL5&65z5X6_>aoK%d3eOQ1;k%L3>d)0eYVyEuSbL=J&8!J0V)&qqyu33hmyt%c|
z4TtumV#xc!P14hoaaXKTO<sq59B&KXzZ(&~d{m@}eVVW}hc^hR#YyLYK}%N|8+Spl
zwLj_)nwf_YUf>!%En%7;dt@qd>t4vn9)1||6H1*ACph0VR^Sp_D%Awvn5Z=w5h69<
zlZxCy!|2keQ{q%}^W?Kc7#}ID(ta(e_+DXS87b;-5f(Qqna6$v!f=YRC6}TgH~_tx
zi&kFDcYNgR1~*-6*t-IKto~lkGqyC+{a4ac{1SW4t3A6>hF`3A+UtUD6LvkI*{eH<
zUrbEUNXmo!Ks>zo5lY!8<Fh8H0y|~Rk<eR`Ae4rpMH=BYfd+k5Z!ZPT_OXIr2$66|
zy#|ruqM(ouH=U{vsm8KC{ID!`>%PW8=aK4$q8`!<*;?Wzqm?1eP=(tDpiXWZ?&xe*
z@Q%z*+;yD7ZiIpGrsG$t-A2GsYhuy<b#2rkjsd$KrGTtc7;Vbbg)X<gf>PoP>a5Y?
z|Axh8i2o>pAjCeOVA+-^?vP|kdD_7tU-EM22Ua&)(JSECE1;j@-%%v)*eR}=GNTd?
zj7zyBgh8EcgP~|2_8oqxt(;H!2a`k4&<o@cy);yqQgMc1T8Kb%4mihU{+&txvU!?>
z#*<$w$iM~B?;NJ}XClUn49pzDyb1=_tFupThsF@wHm@SJqk?^sQc_fz0I+P&FIQ5m
zTf#7{r>#^`tX<*O9NkbYh)caX(U#7VQG*eH67uw2tnpq9v&gbQW~|{J6H+g72%ltD
zEyc2Hqe`QUoc{w-{S6Xq4s(|9P=z-cnV3fZXG_4Itt8;hf;UmI4#q_p0dr@BUOvsF
zj*h7-T2X>0Cbh*0^f;mE8zb5bj^k}j;H{wr86OjlvNxHRc4BU2!MIvqW&1CpIQgm~
ztI%slosRPKSwRf2)}s4N{it8I1adnvvP|*i(TGzK0?gF7defcU$g?)YKTlu8(}S2k
zG<z6VcN6?4%GArgs)S{lXMM2`4%Pe3V+TBUfkNC!&_=ZZz5Y<F#T>jOtLAiCufLe9
zez=bmO)u1UeWR_xkf$hR$5z=Q%=YYy?y3CY&mgFDkcSe#L6~L6tcW+tav9oLa1EC2
zAQx~kB}Vdn6J|w;JE*E)V{{!96DIa$uCF%(f|$R|eN3Ia_p&GE3DfY(d&Aoe{k>JU
z#wTD8MQr*l1=b;?O0Nq8FlrfG@&$3BQ@0bChN1aqJ8^LV1S`l{@p)pM{`xUh7Ybid
zs%V1-@;a534)rD?9KkLIt8C2hwSiPz5@1S75dAt}E8ahsR%yLL%Kh%ae=Rg`#xe1%
zXJFH^B0jyQcYIGx-Dkqf)vJ`@>lT_O_r)W&7VHlr@-CZn|7hp2Q=qD)AxU2AZ$AvH
zV6EXShwNJ|-TzA3>7G?OtjvcrzI)-M`S(zrVyCR{^B<J}7{OHWpgMu($)gSZU@Gl#
zOL{D^t#kX|Ezbs%`NUvL1fq<H*4_)YG1_pXL|qcymRm-WC!xB??f$wAw@5Tx&BqAF
zfzR`(VnwR9SU)9T)&QR~Xqso>kz8vOStuCB7$9n7^bT-W+!>|hs^&%~H9|U%B12M$
z30~p7n1}^v&eN2a8d*<i0`?kQT6k%cbua8&o!hjBk!-hUHj3;#Q`kusz3)l*Z*uj9
zNN%~AUm07u?qD1Zoe$Y?F@PkOBl9B{5y-2jP*1Ow{{T|Mjg1P+ifM@YI5=+*xd8~9
zUf07ne8XOv=*3|y56=eNmh&gT4oi0Porc#_6~96@vEPOM@N~X%bjJ~J9}b=B)k?sf
z`_XbPe_MQT(d%5Dl_$`c7<v(4Ij2Cjk(Oq+>B^Gqwr}*PRD9W`rw$VPo9RKLHw2SE
zUo?vnG4JwFi`z3OSYk_swfdAhQSSo5x3DT)v`>@|2sI1dR~K8tR%6i-euB3K9oDfO
zzE)|%*F0L{Q^zKD|CPfb+uy%a9GS7vrd1AhqR*1qwD##4{L_(Z@D}e)&Zm;Ji*}DZ
z^*~h+I5fi|@5v_yZOn<^$DzLP-n{24)PkUoNg5I-2??>RbNU-**SdP3Mc50j))!-7
z0*BtIA+3jt5nMrDT4~;;UY(rt57x3j%s>}mS=q*v3%5^K=K(9(lQ)(~tz?DGj1(?j
zbfZEMz(-i6(XC99D_s7|Cx~xog1%>J$B0OqW~GnD4+P&YHc=j1X;nz-L2i|rVOrxX
z(`sk&-Cp$|tt6&%$)#|0Vi1-&j8ws18J6>LyxM4?PiG;B69L>?g@moDG#I(>vOKu8
zG&p&GQ63f?CL?<J?op#srkjV2-hqwM#xp?UqpJcGUGbMloyK(X%)Lxoxz3J4U_HY6
zWcFxD5jY+Wf&9_gh?crn08gX?;Vptzl^OQC!N5#U8{W=`Q@z0y)OA_pXi0=;bD&sl
z)^tSy>qSMRF;QkDQiejxDI#9J4Yw%c=5(Zv{njjqC%`<0%0_DRCt%8V34jsAq^+cN
zkKnIwg)cg|Zo=)T_#zjUIzQ-EUS%D}1X5cXV0x}E@YsJMKTWrm=As@R`kq-~8-Lj#
zlv{j~v%&7r6~{ILEA|+hVzSG2KeQ=!gfaq&3iqBI=t1$uNUM{4PxhXHZJT^n<&aZ8
zzcax`%maWtH2MH%o)q09sBlp2|9!a>0Y3B$djdL?PtZRK@<1W-*Et{1xl~nS9w`q0
z6p|+KEJ?1Fq@alym(!AnZK!N!PVg&j8iA0qvM|OdaDONl!?-AsiIHa>{goiTyoPSu
zPk2;LRoH9gBa$60;sI(jjnI#MPB0oV9jtH<bnvF%HAlv97%qp-`mtpr5oO4L7J2`z
zhA?WFf;gm>rZ4`jbs+(}Uk0VMm_#R8dW0bD93Iu{@fAfZFQSa%38u_N1BU$P3N<)v
zOc(=I!Q??mURpTO&&{}Mkp3ONjOr;fhAp@|r|o9Yg|KFk3ZZyQPF-Ha41c)CdsU8@
z_^EKmbME;Rk=jK*U-j4ftHSCG8kGpfO2F@$h!WO@$8%tjs6IjildL>&>SVpayq9HP
zICzdEjG<2F6fUr@!DWfa&UG8xlhs?eR_$X!8)M8u&Fqq?$|H1`epoZa^O{WAc$HpF
zh<?VhE!eOZgYF1bAjjYbw28ug6P(wyE{)dY!7FY`fHtOzk%wTyOheW*PRWH4J#Qc8
z>n&sSACg=)1DfJ=0d!la)burR*!^~6yCU5%cN>P5Rx@>;h7`RsF4R5D3SdG?gdwyM
z1o*3=7wopgsQFvWjb?!Bsqv9qY1R-hjvu?4`~;r0^9gBRqi6(lI5eqFC8Ik^`yQga
z-Jdn}PPR4>VXMxH_)qLL{Nr>vyz@Vpga}}_pd(Wzz~PO>nm;&P%1QHz!hNsxO;R(b
zEEhxWilrHRqem%axqStnl|B)=TBx9jo<7}wiJ}95b@_poGWWb{qdG<qdS)Xnt+s#a
zH6wYbhzH{D;+?(2^64HBy>!=EAq>fm0Y%xeu@INJJ(qjZGQn1O!RYfeq{)CF+-YwH
zOb#NuVEcf0KUA~Vrf`ynk1^@Tjg~W>AB?XUJwO^D1~$G=@=2ReY&DG`<rLqf1Wz@<
z3&R^#*|<Z6V3)_?6_K_czZl{Z{GxC2c{$FgvfR1eR~x7B^h5??PkH!#=iT<+Ru+Dy
zZ2G9=`=<rAf)rX0NJVdOnp-Yn?HrnQ8od#PHugE$OGmzs3$vw(=7Wos`k9%^5X6*8
z8G7FNo(25dZ?QCoyT~z(R><l9Ov*vH!{@>zD;@*TwxTs&$_F;q2f{c$Q@5}@U3@AH
zxiR3heW`2IB6<n5ij>#p^WW(G;d(x0z*6sU+4bc!v=tf{;(g3jKFGLY3E;2Sf;uD;
zK+|~uniQDnW)7)inO$&Nz+*g3?r1ty>~g(!Iei9oXduJQ)ZzRUsM1ZRP#Vk}nOejD
zK)w&7(Eg(D0V$c;lbXZV@6^Klhm@Mm(Pga`EDaXrPY!}{WU~r0M})`vd`c|=&q{B&
zRTD?R@O6=k5mr(sXj89d=GHvjtKzRQEPl0P+aG#I4Rge&cK^b)ZZpiW&FMz5i!}!O
zUP)SVU+$h<@ckp3uDUHycFoyD0{<y_l#F&Y8>xX@oqww)vQ=MR$0tFA1lCcOQP+Al
z7ve?_`3z$egy~1s+`@nbzfnAUYyUuwJg7P9!NE|(_=ccE>25|wVh`G$t?Fkx>8l58
zhCudwN>d#Rk*VrUNl8qp-_=AfycG)8YU8wR_WEK`zuqvNo@FuQWHm?b;n%A6a-n5n
z#!uoNzItof#{>y^eYzr?a<W|9y2$E7w{OJX$KHo<eUZL3Ck$sde;UyW`=vDiPH}{Q
zQNQ^O+2wjf#82vWPblropXHPsp9Vwht|?(Jr1($8z(@@ib3RDuEmsm4AKe-V_plZM
z&jj`08va00ci$89%_@W+&DL8}_7okE9Rxp6TyzPBI<*n3-?|J8RbeI^g;)So@0ePw
z6qFeb!S(oTf@Mma-0?|pMn=>-XL7F|bi>mRpO3_9m4-*S4@0`Cn6;@RUw^M3EaX_H
z<Ha8vsuR@)(J7ym<K`H66`-?h@~f`X=tfU~xKVN*Ws0Z8NC`{BqKFFRQHqkzkc`Gg
z)eQ%}mG}>ND&C(j4s4g3JrqpPVjxuk7T6vr(6ZZS8M%q`@1_qKA<ChGa6RgJ|5#6P
z|1NzT;Vs%$GE4s|Q}^ZgJzc!VLffmqn$*LE4={iy^@HfQ^>P_qP*oVB;g_h0K>tbz
zmUf_=E_Jhb&9ho8(u8d1#l*pxTqIX(5mgzFn{6jsZtLLNFvI=hExW~4z2FXBQ$jw6
z@_Jh0(bngw=pCd}Ln;jlpG8;WKe#B1=8NEFllE$)Swww+ZF|T{*T*rTC^Va5{PdUQ
z8bOKBzxlpkW&f%RAmwdR&XwAVf%8?SdVrL~<245*GwCci#dbmEqv40`bC$l^X=Wny
z`(hED>%!yOaU&GutqKX@!&+1zT);0|dKMZ9@YMB_wTkZAewGh!CsT+&MRR1Y$XoQG
z56y;nS42V|xKLryBhuwUhjwnukrOaqLdU-*8%AUYwkson%!VL3-DmQEi2=)*-xbRU
z5QhRVZG0fv8DT{b4vD1?I)F*T;dNN@d=hs|s&`B`5VFf;!$a$s-&@O=_74@Lw0DF1
z<c*M`Xdpy=(2@&uE0(zime~mU#2G?8GW28fLlIw{WyMFqn^}LS(cc>q&f>Q@h5zjq
z7V|xgxZ;kyAuekawEW^J#2mz(reoKx`sp|;lR>M$nbU+V*yQU(3MTikFhp`!gB+9K
zu&54HUkcqkuJav>ZJ^TpP>OBp>uTdv{_5^>1N_vETngAlSwj_;rg8FGS7hJ1tos}9
z#7q(TX1clvY<DmW8{^#_Vuue7*kYLME?Dp+*3*7dw2_yE<O%?{{#ZVcOKATU8p=5|
zl^uEQECFJ#<{2(FdZIWH1h;lNJGvestV)+O<&ZR~t4Q3jM-vWS_F`5|-AeL2%~&yX
z=fM-MxQ)HKMO_)A$uV|>af`}BF%*z#p5fu5Dq`Vl&I4v^BLQNCWJ*S5VvRjQ3U`-$
zw;sWST9PDng~np4e;?)m%S}~t<vfCxIYZG?ueaO&Ckzh*pA1)We**?eQ+n8GeK#PF
zz26lwnu^bKjSZH5LD9ZMF1P4dw8C@p<Vpnj&kooe_Xdt11EezslZu~+H{!6O(x@})
za|sW9dteTQZvV}+2`_MwHpXMgh4a{+C9`%UFIjvs;GHaetQyLkZatwnKtc*8(oFx1
zn0(O;t$JiH=wR>L+vk<jHn@Q6s#Yjs&bMM~A!@o*K{aXaMgtBxJ;j5SdB-RnAh{iO
zvmxThezY4A47`tws#Ye+>*0FdCypdkHsi^tTW7Wo8F;B7c#3ym4o}}Q&oi-sj6A7q
z=4XT}4;kW;3tT-%$EM%a%6fe7vQeWOE;8MNC&F<Y&#=K7N*wO*k4(K`#U|MPV4y|=
zZ3Lz{onX!ewM>GoZAo=}aPCo`<Egh$I1Dg=uK;x1PMlPt@EBAKZ_cz_(!L^@qweG;
z)dTwKgkg>|yz(%p_k3S*O<Z$~cKxtTILf3Gjq0BnU*f2>L)7jv+LIiMq7Id_5EN$M
z$<C9~Y+4<6sNF6cp3UN~t&;ojt_PdYb=zur_JITdWYcGi-NsGYZ<tsnsNxsNBvfLM
ze<B)9{-#We2|G(P=OsRDlI=!?Xt>E~blM%;Cm4Hk<j25AsXVdi%)GnMNL%*TDe>sg
zr9{><sN_2-A>mgcsrH0!hxL9ODd4c<`)_8ukT`MM(IY^0_p@lYf;zk3+SY+b+@E=*
z(<C<Q@)ksgbazAMi_8mX?m#Y)A%MdU!vtXYetg8g{zo}<HuE}kL+BGD>i>%?;hfP{
z10p{`t+Mo&b0PA8LeV0uIJ=&Yd`#MgVrk;Toq$7#_ltGU@=Dx?)aT{V7ct4gf%$Z_
zuY=Tl%2~%Oas<2f*rYoWQVytdNN4BYbFork;ZHv98ISeZV;s{n2+PJ|IC|eF4GW+K
z!6ZIx_As{-+k+C8+PKl-U&h3T?Cf`j(0Wj0>41Vc&R3$~EwTIiZGco3@`XLkPXF8q
z7Q~&98tBJ_yAZBUps#*u+Et8F`cLVA>dTt#!XIq{$f;J}P~H1Eqd)b8qKgj@RdRZV
zJd7e?(Xg$D&fi6kDoDqBQI9<RwD^7x@&u%58;TnVUs(DDG?_|(yT*UuOC7WMHyHy*
zzG?iq_6dg$@iy1S%ls)&?k=1@6?Aia7$t4S3_f@ISiy;2SDPktJshLo)V<xREFU9r
zV$Ce>$)w7>NXvEGVVhT&ZfQFhg-Rw|<BFksk_^Yzp5(auGWGQ){UN4)AU<Kiq;+%K
zojj~_Q!H)sEQHW?E8EnTa%j?x&Y*Tnb@AhqgX+I8M)!to=P?)85GzBg6Q1&@PYZx=
z4{$cg^tK<%Y<-dAk(smdZ=_5%$?-N6mF`A|$MN4-1Gq8$bz_tJp*TOaNv4Q6mR76S
zdRJ2`>obFRYO%Qk_Oy9U7R|4wxv<jl@P)8f_#YEqyQ@hzu7$L=WEJoxF9w3b11z_X
ze_4%lR+`dUT3Lii*Z!0PdOu2oO-j7CjJpFO{PH;2*ip|04eWWVq$cUcEg^y)TauKQ
zt;ssDyoZi$5uM3B+FHEeyH+ho5f;TF)}3HtduTiXne}}B%Ri)``G>KY;AiIZlG4~N
z&{ux}DeE3-rSO8c54$%IWrkzN=4*13R9}8ur9!g?p8HoW%Op`sTIyG3^o=~yj;1dP
z<FKj>p<6>*5j?6*i06-gVnGD@?Q_}O^8iZHqHIX*y5WjqQfiq$_)G4S7C&T7S>177
z@uX3vM13U2@$47c-;i=rz##lU|9`o)|9GeWx%~d``u|L^!2l8dPaPNt69}mATqJaJ
z99VQBGK~gu{eRd0)BpdCQT;Ff|KT(LUs~?}6RP?@+cfpqiaGor_W!G$oD?|3|F{dt
Oe|z-5+QRlfPX8Cy*<C#V


From 1c1e6437356bb5086def632605ca070a93c48b61 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 21:38:59 +0400
Subject: [PATCH 538/676] Use close icon from group calls in stories tooltip.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  9 ++++-
 .../dialogs/ui/dialogs_stories_list.cpp       | 35 ++++---------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 88e1239be..622016bb8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -567,4 +567,11 @@ dialogsStoriesTooltip: ImportantTooltip(defaultImportantTooltip) {
 }
 dialogsStoriesTooltipLabel: defaultImportantTooltipLabel;
 dialogsStoriesTooltipMaxWidth: 200px;
-dialogsStoriesTooltipHide: size(14px, 14px);
+dialogsStoriesTooltipHide: IconButton(defaultIconButton) {
+	width: 34px;
+	height: 20px;
+	iconPosition: point(-1px, -1px);
+	icon: icon {{ "calls/video_tooltip", importantTooltipFg }};
+	iconOver: icon {{ "calls/video_tooltip", importantTooltipFg }};
+	ripple: emptyRippleAnimation;
+}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index f99091721..82854b90b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -13,10 +13,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/outline_segments.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/labels.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/tooltip.h"
-#include "ui/abstract_button.h"
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
 
@@ -49,8 +49,7 @@ constexpr auto kStoriesTooltipHideBgOpacity = 0.2;
 		not_null<QWidget*> parent,
 		rpl::producer<TextWithEntities> text,
 		Fn<void()> hide) {
-	const auto size = st::dialogsStoriesTooltipHide;
-	const auto buttonw = size.width();
+	const auto size = st::dialogsStoriesTooltipHide.width;
 	const auto skip = st::defaultImportantTooltip.padding.right();
 	auto result = object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
 		parent,
@@ -60,36 +59,16 @@ constexpr auto kStoriesTooltipHideBgOpacity = 0.2;
 			st::dialogsStoriesTooltipMaxWidth,
 			st::dialogsStoriesTooltipLabel),
 		(st::defaultImportantTooltip.padding
-			+ QMargins(0, 0, skip + buttonw, 0)));
-	const auto button = Ui::CreateChild<Ui::AbstractButton>(result.data());
+			+ QMargins(0, 0, skip + size, 0)));
+	const auto button = Ui::CreateChild<Ui::IconButton>(
+		result.data(),
+		st::dialogsStoriesTooltipHide);
 	result->sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
-		button->resize(skip * 2 + buttonw, size.height());
+		button->resize(button->width(), size.height());
 		button->moveToRight(0, 0, size.width());
 	}, button->lifetime());
 	button->setClickedCallback(std::move(hide));
-	button->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(button);
-		auto hq = PainterHighQualityEnabler(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(st::importantTooltipFg);
-		p.setOpacity(kStoriesTooltipHideBgOpacity);
-		const auto rect = style::centerrect(
-			button->rect(),
-			QRect(QPoint(), size));
-		const auto center = QRectF(rect).center();
-		const auto half = QSizeF(rect.size()) / 6.;
-		const auto phalf = QPointF(half.width(), half.height());
-		const auto mhalf = QPointF(-half.width(), half.height());
-		p.drawEllipse(rect);
-		p.setOpacity(1.);
-		auto pen = st::importantTooltipFg->p;
-		pen.setWidthF(style::ConvertScaleExact(sqrtf(2.)));
-		p.setPen(pen);
-		p.drawLine(center - phalf, center + phalf);
-		p.drawLine(center - mhalf, center + mhalf);
-	}, button->lifetime());
 	return result;
 }
 

From 81be0ef20b4b52cd8c58f1f7cfdfe931cba29b32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 21:41:24 +0400
Subject: [PATCH 539/676] Version 4.8.10.

- Send story sharing comments as separate messages.
- Fix stories explanation tooltip ordering.
---
 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 a0e82f806..9e1d43480 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.8.9.0" />
+    Version="4.8.10.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 1253b7043..275685f7c 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,8,9,0
- PRODUCTVERSION 4,8,9,0
+ FILEVERSION 4,8,10,0
+ PRODUCTVERSION 4,8,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.9.0"
+            VALUE "FileVersion", "4.8.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.9.0"
+            VALUE "ProductVersion", "4.8.10.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index cb1aed9eb..e7bd1d0dc 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,8,9,0
- PRODUCTVERSION 4,8,9,0
+ FILEVERSION 4,8,10,0
+ PRODUCTVERSION 4,8,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.9.0"
+            VALUE "FileVersion", "4.8.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.9.0"
+            VALUE "ProductVersion", "4.8.10.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4f1c6194a..6bbf2904d 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 = 4008009;
-constexpr auto AppVersionStr = "4.8.9";
+constexpr auto AppVersion = 4008010;
+constexpr auto AppVersionStr = "4.8.10";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 3bbc47084..f7062fb28 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008009
+AppVersion         4008010
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.9
-AppVersionStr      4.8.9
+AppVersionStrSmall 4.8.10
+AppVersionStr      4.8.10
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.9
+AppVersionOriginal 4.8.10
diff --git a/changelog.txt b/changelog.txt
index 4c503803a..28384f4b3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+4.8.10 (28.07.23)
+
+- Send story sharing comments as separate messages.
+- Fix stories explanation tooltip ordering.
+
 4.8.9 (26.07.23)
 
 - Bug fixes and other minor improvements.

From 8ec0bdcac935adfdae740c4551db08927be59dd7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 28 Jul 2023 21:46:02 +0400
Subject: [PATCH 540/676] Version 4.8.10: Fix build with GCC.

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

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 692c68353..f6d48b3da 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "base/platform/base_platform_info.h"
 #include "base/event_filter.h"
+#include "ui/platform/ui_platform_window_title.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/ui_utility.h"

From cf781e1043cb4086d9f8b2573a5bd757611a0edd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 1 Aug 2023 16:04:25 +0400
Subject: [PATCH 541/676] Port AppLaunchContext to cppgir

---
 .../platform/linux/file_utilities_linux.cpp   | 47 +++++++++++++------
 Telegram/lib_base                             |  2 +-
 Telegram/lib_ui                               |  2 +-
 cmake                                         |  2 +-
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index aad9fe167..33b0ad780 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -12,21 +12,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QDesktopServices>
 
-#include <glibmm.h>
-#include <giomm.h>
+#include <gio/gio.hpp>
+
+using namespace gi::repository;
 
 namespace Platform {
 namespace File {
 
 void UnsafeOpenUrl(const QString &url) {
-	try {
-		if (Gio::AppInfo::launch_default_for_uri(
+	{
+		const auto result = Gio::AppInfo::launch_default_for_uri(
 			url.toStdString(),
-			base::Platform::AppLaunchContext())) {
+			base::Platform::AppLaunchContext());
+
+		if (!result) {
+			LOG(("App Error: %1").arg(
+				QString::fromStdString(result.error().what())));
+		} else if (*result) {
 			return;
 		}
-	} catch (const std::exception &e) {
-		LOG(("App Error: %1").arg(QString::fromStdString(e.what())));
 	}
 
 	QDesktopServices::openUrl(url);
@@ -45,14 +49,29 @@ bool UnsafeShowOpenWith(const QString &filepath) {
 }
 
 void UnsafeLaunch(const QString &filepath) {
-	try {
-		if (Gio::AppInfo::launch_default_for_uri(
-			Glib::filename_to_uri(filepath.toStdString()),
-			base::Platform::AppLaunchContext())) {
-			return;
+	if ([&] {
+		const auto filename = GLib::filename_to_uri(filepath.toStdString());
+		if (!filename) {
+			LOG(("App Error: %1").arg(
+				QString::fromStdString(filename.error().what())));
+
+			return false;
 		}
-	} catch (const std::exception &e) {
-		LOG(("App Error: %1").arg(QString::fromStdString(e.what())));
+
+		const auto result = Gio::AppInfo::launch_default_for_uri(
+			*filename,
+			base::Platform::AppLaunchContext());
+
+		if (!result) {
+			LOG(("App Error: %1").arg(
+				QString::fromStdString(result.error().what())));
+
+			return false;
+		}
+
+		return *result;
+	}()) {
+		return;
 	}
 
 	if (UnsafeShowOpenWith(filepath)) {
diff --git a/Telegram/lib_base b/Telegram/lib_base
index efd052594..609a9e69f 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit efd052594db9f3d85a2fbcba76db6fdecf226597
+Subproject commit 609a9e69f2a69fea050e75cbe2b546b4aa1e4914
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 91d43ea4b..0f25a9451 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 91d43ea4b50ef1e7df810ab1f14c49e044570734
+Subproject commit 0f25a9451012c7fba93777a009f3b5dcc0f1ca89
diff --git a/cmake b/cmake
index 0620bb7b8..d1c98b4c4 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 0620bb7b87a0ec9195151fd5eb0cf38656c1280b
+Subproject commit d1c98b4c472c7b59c239006a06d7a784a60a347f

From da55698a51d80f03e2d35c437877701f277d9abe Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 2 Aug 2023 21:02:37 +0400
Subject: [PATCH 542/676] Generate GUID for GNotification

That's what g_application_send_notification does when ID is not passed and that simplifies the code
---
 .../linux/notifications_manager_linux.cpp     | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 849af9f37..7448d690e 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -360,6 +360,7 @@ private:
 
 	Glib::RefPtr<Gio::Application> _application;
 	Glib::RefPtr<Gio::Notification> _notification;
+	const std::string _guid;
 
 	Glib::RefPtr<Gio::DBus::Connection> _dbusConnection;
 	Glib::ustring _title;
@@ -390,7 +391,8 @@ NotificationData::NotificationData(
 , _id(id)
 , _application(UseGNotification()
 		? Gio::Application::get_default()
-		: nullptr) {
+		: nullptr)
+, _guid(_application ? Gio::DBus::generate_guid() : std::string()) {
 }
 
 bool NotificationData::init(
@@ -623,13 +625,7 @@ NotificationData::~NotificationData() {
 
 void NotificationData::show() {
 	if (_application && _notification) {
-		_application->send_notification(
-			std::to_string(_id.contextId.sessionId)
-				+ '-'
-				+ std::to_string(_id.contextId.peerId.value)
-				+ '-'
-				+ std::to_string(_id.msgId.bare),
-			_notification);
+		_application->send_notification(_guid, _notification);
 		return;
 	}
 
@@ -679,12 +675,7 @@ void NotificationData::show() {
 
 void NotificationData::close() {
 	if (_application) {
-		_application->withdraw_notification(
-			std::to_string(_id.contextId.sessionId)
-				+ '-'
-				+ std::to_string(_id.contextId.peerId.value)
-				+ '-'
-				+ std::to_string(_id.msgId.bare));
+		_application->withdraw_notification(_guid);
 		_manager->clearNotification(_id);
 		return;
 	}

From 0e3e0c5b8154e16c4a101ed1bf2fac4fec2b6952 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 2 Aug 2023 23:59:21 +0400
Subject: [PATCH 543/676] Do a D-Bus request instead of systemctl command for
 D-Bus config reload

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

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 81ff88729..620b146e2 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -382,11 +382,18 @@ bool GenerateServiceFile(bool silent = false) {
 			md5Hash));
 	}
 
-	QProcess::execute(u"systemctl"_q, {
-		u"--user"_q,
-		u"reload"_q,
-		u"dbus"_q,
-	});
+	try {
+		const auto connection = Gio::DBus::Connection::get_sync(
+			Gio::DBus::BusType::SESSION);
+
+		connection->call_sync(
+			base::Platform::DBus::kObjectPath,
+			base::Platform::DBus::kInterface,
+			"ReloadConfig",
+			{},
+			base::Platform::DBus::kService);
+	} catch (...) {
+	}
 
 	return true;
 }

From 506fa52c1cb45fb3e9a1cd65aabcc7f0a8e7a028 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Tue, 1 Aug 2023 00:27:14 +0000
Subject: [PATCH 544/676] Update User-Agent for DNS to Chrome 115.0.5790.102.

---
 .../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 d339bc228..f09fe11f9 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/114.0.5735.133 Safari/537.36");
+		"Chrome/115.0.5790.102 Safari/537.36");
 	return kResult;
 }
 

From eb2fa5b80646a4ce190df41756c70764974a9979 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 30 Jul 2023 04:55:51 +0300
Subject: [PATCH 545/676] Added round corners to preview in pinned messages
 bar.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 037819498..2b82db6f2 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -55,7 +55,9 @@ namespace {
 		result.preview = kEmpty;
 		result.spoilerRepaint = nullptr;
 	} else {
-		result.preview = preview->original();
+		result.preview = Images::Round(
+			preview->original(),
+			ImageRoundRadius::Small);
 		result.spoilerRepaint = spoiler ? repaint : nullptr;
 	}
 	return result;

From 29db7488fcb391c882ceb895d7e6c12892c40f68 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 30 Jul 2023 05:02:28 +0300
Subject: [PATCH 546/676] Slightly moved right action icon in message view for
 forwarded messages.

Fixed #26587.
---
 Telegram/SourceFiles/ui/chat/chat.style | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 4119099de..35f3967c0 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -523,7 +523,7 @@ historyFastShareSize: 31px;
 historyFastShareLeft: 13px;
 historyFastShareBottom: 5px;
 historyFastShareIcon: icon {{ "fast_share", msgServiceFg }};
-historyGoToOriginalIcon: icon {{ "fast_to_original", msgServiceFg }};
+historyGoToOriginalIcon: icon {{ "fast_to_original", msgServiceFg, point(1px, 0px) }};
 historyFastCommentsIcon: icon {{ "fast_comments", msgServiceFg }};
 historyFastTranscribeIcon: icon {{ "chat/voice_to_text", msgServiceFg }};
 

From d6e1ee2a2854add8e7089bf0ba63c891c5abd343 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 30 Jul 2023 05:13:11 +0300
Subject: [PATCH 547/676] Added closing of attached bot web view when app is
 locked by passcode.

Fixed #26582.
---
 Telegram/SourceFiles/mainwindow.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index e96a5c248..f5baef181 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/sandbox.h"
 #include "core/application.h"
 #include "export/export_manager.h"
+#include "inline_bots/bot_attach_web_view.h" // AttachWebView::cancel.
 #include "intro/intro_widget.h"
 #include "main/main_session.h"
 #include "main/main_account.h" // Account::sessionValue.
@@ -198,6 +199,9 @@ void MainWindow::setupPasscodeLock() {
 		_passcodeLock->showFinished();
 		setInnerFocus();
 	}
+	if (const auto sessionController = controller().sessionController()) {
+		sessionController->session().attachWebView().cancel();
+	}
 }
 
 void MainWindow::clearPasscodeLock() {

From 1364dba01586abd52e4681605237caece74fcd96 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 30 Jul 2023 06:02:14 +0300
Subject: [PATCH 548/676] Added phrase for limit of number of chats that never
 show in filter.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 Telegram/SourceFiles/api/api_chat_filters.cpp |  2 +-
 .../SourceFiles/boxes/choose_filter_box.cpp   |  3 +-
 .../boxes/filters/edit_filter_box.cpp         |  8 ++++--
 .../boxes/filters/edit_filter_chats_list.cpp  | 28 +++++--------------
 .../boxes/filters/edit_filter_chats_list.h    |  5 +++-
 .../SourceFiles/boxes/premium_limits_box.cpp  | 13 +++++----
 .../SourceFiles/boxes/premium_limits_box.h    |  3 +-
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9730225d2..38577fef1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -189,6 +189,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filter_chats_limit_title" = "Limit Reached";
 "lng_filter_chats_limit1#one" = "Sorry, you can't add more than **{count}** chat to a folder.";
 "lng_filter_chats_limit1#other" = "Sorry, you can't add more than **{count}** chats to a folder.";
+"lng_filter_chats_exlude_limit1#one" = "Sorry, you can't exlude more than **{count}** chat from a folder.";
+"lng_filter_chats_exlude_limit1#other" = "Sorry, you can't exlude more than **{count}** chats from a folder.";
 "lng_filter_chats_limit2#one" = "You can increase this limit to **{count}** by upgrading to **Telegram Premium**.";
 "lng_filter_chats_limit2#other" = "You can increase this limit to **{count}** by upgrading to **Telegram Premium**.";
 
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index 2b19deac3..c045263ae 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -510,7 +510,7 @@ void ShowImportError(
 	if (error == u"CHANNELS_TOO_MUCH"_q) {
 		window->show(Box(ChannelsLimitBox, session));
 	} else if (error == u"FILTER_INCLUDE_TOO_MUCH"_q) {
-		window->show(Box(FilterChatsLimitBox, session, count));
+		window->show(Box(FilterChatsLimitBox, session, count, true));
 	} else if (error == u"CHATLISTS_TOO_MUCH"_q) {
 		window->show(Box(ShareableFiltersLimitBox, session));
 	} else {
diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.cpp b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
index ef6b8ecb2..416b30ff1 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
@@ -164,7 +164,8 @@ void FillChooseFilterMenu(
 				controller->show(Box(
 					FilterChatsLimitBox,
 					&controller->session(),
-					r.count));
+					r.count,
+					true));
 			} else if (validator.canAdd()) {
 				validator.add(id);
 			}
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index e135fd691..724dd7c47 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -336,14 +336,18 @@ void EditExceptions(
 		Fn<void()> refresh) {
 	const auto include = (options & Flag::Contacts) != Flags(0);
 	const auto rules = data->current();
+	const auto session = &window->session();
 	auto controller = std::make_unique<EditFilterChatsListController>(
-		&window->session(),
+		session,
 		(include
 			? tr::lng_filters_include_title()
 			: tr::lng_filters_exclude_title()),
 		options,
 		rules.flags() & options,
-		include ? rules.always() : rules.never());
+		include ? rules.always() : rules.never(),
+		[=](int count) {
+			return Box(FilterChatsLimitBox, session, count, include);
+		});
 	const auto rawController = controller.get();
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setCloseByOutsideClick(false);
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index 6cce77d60..61e937dfe 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -7,9 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/filters/edit_filter_chats_list.h"
 
+#include "data/data_premium_limits.h"
 #include "history/history.h"
 #include "window/window_session_controller.h"
-#include "boxes/premium_limits_box.h"
 #include "lang/lang_keys.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/vertical_layout.h"
@@ -99,22 +99,6 @@ private:
 	return PeerId(FakeChatId(static_cast<BareId>(flag))).value;
 }
 
-[[nodiscard]] int Limit(
-		not_null<Main::Session*> session,
-		const QString &key,
-		int fallback) {
-	return session->account().appConfig().get<int>(key, fallback);
-}
-
-[[nodiscard]] int Limit(not_null<Main::Session*> session) {
-	const auto premium = session->premium();
-	return Limit(session,
-		(premium
-			? "dialog_filters_chats_limit_premium"
-			: "dialog_filters_chats_limit_default"),
-		premium ? 200 : 100);
-}
-
 TypeRow::TypeRow(Flag flag) : PeerListRow(TypeId(flag)) {
 }
 
@@ -338,15 +322,18 @@ EditFilterChatsListController::EditFilterChatsListController(
 	rpl::producer<QString> title,
 	Flags options,
 	Flags selected,
-	const base::flat_set<not_null<History*>> &peers)
+	const base::flat_set<not_null<History*>> &peers,
+	LimitBoxFactory limitBox)
 : ChatsListBoxController(session)
 , _session(session)
+, _limitBox(std::move(limitBox))
 , _title(std::move(title))
 , _peers(peers)
 , _options(options & ~Flag::Chatlist)
 , _selected(selected)
-, _limit(Limit(session))
+, _limit(Data::PremiumLimits(session).dialogFiltersChatsCurrent())
 , _chatlist(options & Flag::Chatlist) {
+	Expects(_limitBox != nullptr);
 }
 
 Main::Session &EditFilterChatsListController::session() const {
@@ -375,8 +362,7 @@ void EditFilterChatsListController::rowClicked(not_null<PeerListRow*> row) {
 		delegate()->peerListSetRowChecked(row, !row->checked());
 		updateTitle();
 	} else {
-		delegate()->peerListShowBox(
-			Box(FilterChatsLimitBox, _session, count));
+		delegate()->peerListShowBox(_limitBox(count));
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
index ce4583184..a9dfd3fa2 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
@@ -43,13 +43,15 @@ class EditFilterChatsListController final : public ChatsListBoxController {
 public:
 	using Flag = Data::ChatFilter::Flag;
 	using Flags = Data::ChatFilter::Flags;
+	using LimitBoxFactory = Fn<object_ptr<Ui::BoxContent>(int)>;
 
 	EditFilterChatsListController(
 		not_null<Main::Session*> session,
 		rpl::producer<QString> title,
 		Flags options,
 		Flags selected,
-		const base::flat_set<not_null<History*>> &peers);
+		const base::flat_set<not_null<History*>> &peers,
+		LimitBoxFactory limitBox);
 
 	[[nodiscard]] Main::Session &session() const override;
 	[[nodiscard]] Flags chosenOptions() const {
@@ -70,6 +72,7 @@ private:
 	void updateTitle();
 
 	const not_null<Main::Session*> _session;
+	const LimitBoxFactory _limitBox;
 	rpl::producer<QString> _title;
 	base::flat_set<not_null<History*>> _peers;
 	Flags _options;
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index 3fbdc34c1..8980a9028 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -694,7 +694,8 @@ void PublicLinksLimitBox(
 void FilterChatsLimitBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
-		int currentCount) {
+		int currentCount,
+		bool include) {
 	const auto premium = session->premium();
 	const auto premiumPossible = session->premiumPossible();
 
@@ -707,10 +708,12 @@ void FilterChatsLimitBox(
 		premiumLimit);
 
 	auto text = rpl::combine(
-		tr::lng_filter_chats_limit1(
-			lt_count,
-			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+		(include
+			? tr::lng_filter_chats_limit1
+			: tr::lng_filter_chats_exlude_limit1)(
+				lt_count,
+				rpl::single(premium ? premiumLimit : defaultLimit),
+				Ui::Text::RichLangValue),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_chats_limit2(
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.h b/Telegram/SourceFiles/boxes/premium_limits_box.h
index bb9115a3e..7bcda6e53 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.h
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.h
@@ -35,7 +35,8 @@ void PublicLinksLimitBox(
 void FilterChatsLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
-	int currentCount);
+	int currentCount,
+	bool include);
 void FilterLinksLimitBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session);

From 0f70f9e89dcddbacfff019377f80a360be400802 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 30 Jul 2023 13:35:10 +0300
Subject: [PATCH 549/676] Removed Screencast button from Call panel while
 pending call.

---
 Telegram/SourceFiles/calls/calls_panel.cpp | 45 ++++++++++++----------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index fcb0a1c7b..46481cad6 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -95,6 +95,7 @@ Panel::Panel(not_null<Call*> call)
 	_decline->entity()->setText(tr::lng_call_decline());
 	_cancel->setDuration(st::callPanelDuration);
 	_cancel->entity()->setText(tr::lng_call_cancel());
+	_screencast->setDuration(st::callPanelDuration);
 
 	initWindow();
 	initWidget();
@@ -299,6 +300,7 @@ void Panel::initControls() {
 
 	_decline->finishAnimating();
 	_cancel->finishAnimating();
+	_screencast->finishAnimating();
 }
 
 void Panel::setIncomingSize(QSize size) {
@@ -595,6 +597,7 @@ void Panel::showControls() {
 	widget()->showChildren();
 	_decline->setVisible(_decline->toggled());
 	_cancel->setVisible(_cancel->toggled());
+	_screencast->setVisible(_screencast->toggled());
 
 	const auto shown = !_incomingFrameSize.isEmpty();
 	_incoming->widget()->setVisible(shown);
@@ -753,12 +756,6 @@ void Panel::updateControlsGeometry() {
 		updateOutgoingVideoBubbleGeometry();
 	}
 
-	auto threeWidth = _answerHangupRedial->width()
-		+ st::callCancel.button.width
-		- _screencast->width();
-	_decline->moveToLeft((widget()->width() - threeWidth) / 2, _buttonsTop);
-	_cancel->moveToLeft((widget()->width() - threeWidth) / 2, _buttonsTop);
-
 	updateHangupGeometry();
 }
 
@@ -779,22 +776,28 @@ void Panel::updateOutgoingVideoBubbleGeometry() {
 }
 
 void Panel::updateHangupGeometry() {
-	auto twoWidth = _answerHangupRedial->width() + _screencast->width();
-	auto threeWidth = twoWidth + st::callCancel.button.width;
-	auto rightFrom = (widget()->width() - threeWidth) / 2;
-	auto rightTo = (widget()->width() - twoWidth) / 2;
-	auto hangupProgress = (_call
-			&& _call->state() == State::WaitingUserConfirmation)
+	const auto isWaitingUser = (_call
+		&& _call->state() == State::WaitingUserConfirmation);
+	const auto hangupProgress = isWaitingUser
 		? 0.
 		: _hangupShownProgress.value(_hangupShown ? 1. : 0.);
-	auto hangupRight = anim::interpolate(rightFrom, rightTo, hangupProgress);
-	_answerHangupRedial->moveToRight(hangupRight, _buttonsTop);
 	_answerHangupRedial->setProgress(hangupProgress);
-	_mute->moveToRight(hangupRight - _mute->width(), _buttonsTop);
-	_screencast->moveToLeft(hangupRight - _mute->width(), _buttonsTop);
-	_camera->moveToLeft(
-		hangupRight - _mute->width() + _screencast->width(),
-		_buttonsTop);
+
+	// Screencast - Camera - Cancel/Decline - Answer/Hangup/Redial - Mute.
+	const auto buttonWidth = st::callCancel.button.width;
+	const auto cancelWidth = buttonWidth * (1. - hangupProgress);
+	const auto cancelLeft = (isWaitingUser)
+		? ((widget()->width() - buttonWidth) / 2)
+		: (_mute->animating())
+		? ((widget()->width() - cancelWidth) / 2)
+		: ((widget()->width() / 2) - cancelWidth);
+
+	_cancel->moveToLeft(cancelLeft, _buttonsTop);
+	_decline->moveToLeft(cancelLeft, _buttonsTop);
+	_camera->moveToLeft(cancelLeft - buttonWidth, _buttonsTop);
+	_screencast->moveToLeft(_camera->x() - buttonWidth, _buttonsTop);
+	_answerHangupRedial->moveToLeft(cancelLeft + cancelWidth, _buttonsTop);
+	_mute->moveToLeft(_answerHangupRedial->x() + buttonWidth, _buttonsTop);
 	if (_startVideo) {
 		_startVideo->moveToLeft(_camera->x(), _camera->y());
 	}
@@ -877,7 +880,9 @@ void Panel::stateChanged(State state) {
 		toggleButton(_decline, incomingWaiting);
 		toggleButton(_cancel, (isBusy || isWaitingUser));
 		toggleButton(_mute, !isWaitingUser);
-		toggleButton(_screencast, !isWaitingUser);
+		toggleButton(
+			_screencast,
+			!(isBusy || isWaitingUser || incomingWaiting));
 		const auto hangupShown = !_decline->toggled()
 			&& !_cancel->toggled();
 		if (_hangupShown != hangupShown) {

From 55159884397a4e633b72f6581f4fd9883c778328 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 1 Aug 2023 01:45:36 +0300
Subject: [PATCH 550/676] Fixed false clicking on Silent post toggle when mouse
 is outside.

---
 .../SourceFiles/ui/controls/silent_toggle.cpp | 56 +++++++++----------
 .../SourceFiles/ui/controls/silent_toggle.h   |  4 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
index e583af790..2968c80fd 100644
--- a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
+++ b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
@@ -31,23 +31,29 @@ SilentToggle::SilentToggle(QWidget *parent, not_null<ChannelData*> channel)
 
 	resize(_st.width, _st.height);
 
-	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
-		auto p = QPainter(this);
-		paintRipple(p, _st.rippleAreaPosition, nullptr);
-
-		//const auto checked = _crossLineAnimation.value(_checked ? 1. : 0.);
-		const auto over = isOver();
-		(_checked
-			? (over
-				? st::historySilentToggleOnOver
-				: st::historySilentToggleOn)
-			: (over
-				? st::historySilentToggle.iconOver
-				: st::historySilentToggle.icon)).paintInCenter(p, rect());
-	}, lifetime());
-
 	setMouseTracking(true);
+
+	clicks(
+	) | rpl::start_with_next([=] {
+		setChecked(!_checked);
+		Ui::Tooltip::Show(0, this);
+		_channel->owner().notifySettings().update(_channel, {}, _checked);
+	}, lifetime());
+}
+
+void SilentToggle::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	paintRipple(p, _st.rippleAreaPosition, nullptr);
+
+	//const auto checked = _crossLineAnimation.value(_checked ? 1. : 0.);
+	const auto over = isOver();
+	(_checked
+		? (over
+			? st::historySilentToggleOnOver
+			: st::historySilentToggleOn)
+		: (over
+			? st::historySilentToggle.iconOver
+			: st::historySilentToggle.icon)).paintInCenter(p, rect());
 }
 
 void SilentToggle::mouseMoveEvent(QMouseEvent *e) {
@@ -62,11 +68,12 @@ void SilentToggle::mouseMoveEvent(QMouseEvent *e) {
 void SilentToggle::setChecked(bool checked) {
 	if (_checked != checked) {
 		_checked = checked;
-		_crossLineAnimation.start(
-			[=] { update(); },
-			_checked ? 0. : 1.,
-			_checked ? 1. : 0.,
-			kAnimationDuration);
+		update();
+		// _crossLineAnimation.start(
+		// 	[=] { update(); },
+		// 	_checked ? 0. : 1.,
+		// 	_checked ? 1. : 0.,
+		// 	kAnimationDuration);
 	}
 }
 
@@ -75,13 +82,6 @@ void SilentToggle::leaveEventHook(QEvent *e) {
 	Ui::Tooltip::Hide();
 }
 
-void SilentToggle::mouseReleaseEvent(QMouseEvent *e) {
-	setChecked(!_checked);
-	RippleButton::mouseReleaseEvent(e);
-	Ui::Tooltip::Show(0, this);
-	_channel->owner().notifySettings().update(_channel, {}, _checked);
-}
-
 QString SilentToggle::tooltipText() const {
 	return _checked
 		? tr::lng_wont_be_notified(tr::now)
diff --git a/Telegram/SourceFiles/ui/controls/silent_toggle.h b/Telegram/SourceFiles/ui/controls/silent_toggle.h
index 358f958d5..e38d52fac 100644
--- a/Telegram/SourceFiles/ui/controls/silent_toggle.h
+++ b/Telegram/SourceFiles/ui/controls/silent_toggle.h
@@ -29,8 +29,8 @@ public:
 	bool tooltipWindowActive() const override;
 
 protected:
+	void paintEvent(QPaintEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 
 	QImage prepareRippleMask() const override;
@@ -42,7 +42,7 @@ private:
 	not_null<ChannelData*> _channel;
 	bool _checked = false;
 
-	Animations::Simple _crossLineAnimation;
+	// Animations::Simple _crossLineAnimation;
 
 };
 

From 39e8ed22a9d73ebedc890c42241a7996d320e609 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 1 Aug 2023 11:41:35 +0300
Subject: [PATCH 551/676] Removed display of all layers in media view on open
 any media.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 04d814478..2f06caa21 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3209,6 +3209,12 @@ void OverlayWidget::show(OpenRequest request) {
 		// Count top notch on macOS before counting geometry.
 		_helper->beforeShow(_fullscreen);
 	}
+	if (_cachedShow) {
+		_cachedShow->showOrHideBoxOrLayer(
+			v::null,
+			Ui::LayerOption::CloseOther,
+			anim::type::instant);
+	}
 	if (photo) {
 		if (contextItem && contextPeer) {
 			return;

From bda3bae712a163bd21e86682c82834972539294d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 31 Jul 2023 18:59:01 +0200
Subject: [PATCH 552/676] Always use crl::time for media durations.

---
 Telegram/SourceFiles/apiwrap.cpp                      |  2 +-
 Telegram/SourceFiles/apiwrap.h                        |  2 +-
 .../history/view/controls/compose_controls_common.h   |  2 +-
 .../view/controls/history_view_voice_record_bar.cpp   |  4 ++--
 .../history/view/history_view_scheduled_section.cpp   |  4 ++--
 .../history/view/history_view_scheduled_section.h     |  7 +++++--
 Telegram/SourceFiles/media/audio/media_audio.cpp      |  2 +-
 Telegram/SourceFiles/storage/localimageloader.cpp     | 11 +++++++----
 Telegram/SourceFiles/storage/localimageloader.h       |  4 ++--
 Telegram/SourceFiles/ui/chat/attach/attach_prepare.h  |  2 +-
 10 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 3b030e7a7..5ee484778 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3417,7 +3417,7 @@ void ApiWrap::sendSharedContact(
 void ApiWrap::sendVoiceMessage(
 		QByteArray result,
 		VoiceWaveform waveform,
-		int duration,
+		crl::time duration,
 		const SendAction &action) {
 	const auto caption = TextWithTags();
 	const auto to = fileLoadTaskOptions(action);
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index dcab7cde8..5815fd3c0 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -302,7 +302,7 @@ public:
 	void sendVoiceMessage(
 		QByteArray result,
 		VoiceWaveform waveform,
-		int duration,
+		crl::time duration,
 		const SendAction &action);
 	void sendFiles(
 		Ui::PreparedList &&list,
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index f32132ccb..06f295ee8 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -25,7 +25,7 @@ struct MessageToEdit {
 struct VoiceToSend {
 	QByteArray bytes;
 	VoiceWaveform waveform;
-	int duration = 0;
+	crl::time duration = 0;
 	Api::SendOptions options;
 };
 struct SendActionUpdate {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 9376e3372..cba6d2e7c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -72,8 +72,8 @@ enum class FilterType {
 	return std::clamp(float64(low) / high, 0., 1.);
 }
 
-[[nodiscard]] auto Duration(int samples) {
-	return samples / ::Media::Player::kDefaultFrequency;
+[[nodiscard]] crl::time Duration(int samples) {
+	return samples * crl::time(1000) / ::Media::Player::kDefaultFrequency;
 }
 
 [[nodiscard]] auto FormatVoiceDuration(int samples) {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 602f46ae2..d8db92e6d 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -607,7 +607,7 @@ void ScheduledWidget::send(Api::SendOptions options) {
 void ScheduledWidget::sendVoice(
 		QByteArray bytes,
 		VoiceWaveform waveform,
-		int duration) {
+		crl::time duration) {
 	const auto callback = [=](Api::SendOptions options) {
 		sendVoice(bytes, waveform, duration, options);
 	};
@@ -617,7 +617,7 @@ void ScheduledWidget::sendVoice(
 void ScheduledWidget::sendVoice(
 		QByteArray bytes,
 		VoiceWaveform waveform,
-		int duration,
+		crl::time duration,
 		Api::SendOptions options) {
 	session().api().sendVoiceMessage(
 		bytes,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 2173d3dcc..1c715e17e 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -197,11 +197,14 @@ private:
 		Api::SendOptions options) const;
 	void send();
 	void send(Api::SendOptions options);
-	void sendVoice(QByteArray bytes, VoiceWaveform waveform, int duration);
 	void sendVoice(
 		QByteArray bytes,
 		VoiceWaveform waveform,
-		int duration,
+		crl::time duration);
+	void sendVoice(
+		QByteArray bytes,
+		VoiceWaveform waveform,
+		crl::time duration,
 		Api::SendOptions options);
 	void edit(
 		not_null<HistoryItem*> item,
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 2fbe37665..9186d3616 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -1560,7 +1560,7 @@ Ui::PreparedFileInformation PrepareForSending(
 	FFMpegAttributesReader reader(Core::FileLocation(fname), data);
 	const auto positionMs = crl::time(0);
 	if (reader.open(positionMs) && reader.duration() > 0) {
-		result.duration = reader.duration() / 1000;
+		result.duration = reader.duration();
 		result.title = reader.title();
 		result.performer = reader.performer();
 		result.cover = reader.cover();
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 20a911d2e..62df16845 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -525,7 +525,7 @@ FileLoadTask::FileLoadTask(
 FileLoadTask::FileLoadTask(
 	not_null<Main::Session*> session,
 	const QByteArray &voice,
-	int32 duration,
+	crl::time duration,
 	const VoiceWaveform &waveform,
 	const FileLoadTo &to,
 	const TextWithTags &caption)
@@ -851,8 +851,9 @@ void FileLoadTask::process(Args &&args) {
 		if (auto song = std::get_if<Ui::PreparedFileInformation::Song>(
 				&_information->media)) {
 			isSong = true;
+			const auto seconds = song->duration / 1000;
 			auto flags = MTPDdocumentAttributeAudio::Flag::f_title | MTPDdocumentAttributeAudio::Flag::f_performer;
-			attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(song->duration), MTP_string(song->title), MTP_string(song->performer), MTPstring()));
+			attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(seconds), MTP_string(song->title), MTP_string(song->performer), MTPstring()));
 			thumbnail = PrepareFileThumbnail(std::move(song->cover));
 		} else if (auto video = std::get_if<Ui::PreparedFileInformation::Video>(
 				&_information->media)) {
@@ -866,9 +867,10 @@ void FileLoadTask::process(Args &&args) {
 			if (video->supportsStreaming) {
 				flags |= MTPDdocumentAttributeVideo::Flag::f_supports_streaming;
 			}
+			const auto realSeconds = video->duration / 1000.;
 			attributes.push_back(MTP_documentAttributeVideo(
 				MTP_flags(flags),
-				MTP_double(video->duration / 1000.),
+				MTP_double(realSeconds),
 				MTP_int(coverWidth),
 				MTP_int(coverHeight),
 				MTPint())); // preload_prefix_size
@@ -970,8 +972,9 @@ void FileLoadTask::process(Args &&args) {
 	}
 
 	if (isVoice) {
+		const auto seconds = _duration / 1000;
 		auto flags = MTPDdocumentAttributeAudio::Flag::f_voice | MTPDdocumentAttributeAudio::Flag::f_waveform;
-		attributes[0] = MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(_duration), MTPstring(), MTPstring(), MTP_bytes(documentWaveformEncode5bit(_waveform)));
+		attributes[0] = MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(seconds), MTPstring(), MTPstring(), MTP_bytes(documentWaveformEncode5bit(_waveform)));
 		attributes.resize(1);
 		document = MTP_document(
 			MTP_flags(0),
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 3d4354623..97b0ad9ce 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -256,7 +256,7 @@ public:
 	FileLoadTask(
 		not_null<Main::Session*> session,
 		const QByteArray &voice,
-		int32 duration,
+		crl::time duration,
 		const VoiceWaveform &waveform,
 		const FileLoadTo &to,
 		const TextWithTags &caption);
@@ -306,7 +306,7 @@ private:
 	QString _filepath;
 	QByteArray _content;
 	std::unique_ptr<Ui::PreparedFileInformation> _information;
-	int32 _duration = 0;
+	crl::time _duration = 0;
 	VoiceWaveform _waveform;
 	SendMediaType _type;
 	TextWithTags _caption;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index f78655c66..c6a74790a 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -27,7 +27,7 @@ struct PreparedFileInformation {
 		Editor::PhotoModifications modifications;
 	};
 	struct Song {
-		int duration = -1;
+		crl::time duration = -1;
 		QString title;
 		QString performer;
 		QImage cover;

From 8669e6a89164d99212036577c81a7d988741dac5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 4 Aug 2023 04:05:35 +0400
Subject: [PATCH 553/676] Port GApplication to cppgir

---
 .../platform/linux/integration_linux.cpp      | 311 +++++++++---------
 .../window/notifications_manager.cpp          |  13 +-
 2 files changed, 156 insertions(+), 168 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index a465ddefe..5f22f596e 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -17,79 +17,177 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QAbstractEventDispatcher>
 
+#include <glibmm.h>
+#include <gio/gio.hpp>
 #include <xdpinhibit/xdpinhibit.hpp>
-#include <giomm.h>
 
-typedef GApplication TDesktopApplication;
-typedef GApplicationClass TDesktopApplicationClass;
+namespace Platform {
+namespace {
 
-G_DEFINE_TYPE(
-	TDesktopApplication,
-	t_desktop_application,
-	G_TYPE_APPLICATION)
+using namespace gi::repository;
 
-static void t_desktop_application_class_init(
-		TDesktopApplicationClass *klass) {
-	const auto application_class = G_APPLICATION_CLASS(klass);
+class Application : public Gio::impl::ApplicationImpl {
+public:
+	Application();
 
-	application_class->local_command_line = [](
-			GApplication *application,
-			char ***arguments,
-			int *exit_status) -> gboolean {
-		return false;
-	};
-
-	application_class->command_line = [](
-			GApplication *application,
-			GApplicationCommandLine *cmdline) {
-		return 0;
-	};
-
-	application_class->before_emit = [](
-			GApplication *application,
-			GVariant *platformData) {
+	void before_emit_(GLib::Variant platformData) noexcept override {
 		if (Platform::IsWayland()) {
 			static const auto keys = {
 				"activation-token",
 				"desktop-startup-id",
 			};
 			for (const auto &key : keys) {
-				const char *token = nullptr;
-				g_variant_lookup(platformData, key, "&s", &token);
-				if (token) {
-					qputenv("XDG_ACTIVATION_TOKEN", token);
+				if (auto token = platformData.lookup_value(key)) {
+					qputenv(
+						"XDG_ACTIVATION_TOKEN",
+						token.get_string(nullptr).c_str());
 					break;
 				}
 			}
 		}
-	};
+	}
 
-	application_class->add_platform_data = [](
-			GApplication *application,
-			GVariantBuilder *builder) {
+	void startup_() noexcept override {
+		// GNotification
+		InvokeQueued(qApp, [] {
+			Core::App().notifications().createManager();
+		});
+
+		Gio::impl::ApplicationImpl::startup_();
+		QEventLoop().exec();
+		quit();
+	}
+
+	void activate_() noexcept override {
+		Core::Sandbox::Instance().customEnterFromEventLoop([] {
+			Core::App().activate();
+		});
+	}
+
+	void open_(GFile **files, int n_files, const char*) noexcept override {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			for (int i = 0; i < n_files; ++i) {
+				QFileOpenEvent e(
+					QUrl(QString::fromUtf8(g_file_get_uri(files[i]))));
+				QGuiApplication::sendEvent(qApp, &e);
+			}
+		});
+	}
+
+	int command_line_(Gio::ApplicationCommandLine) noexcept override {
+		return 0;
+	}
+
+	gboolean local_command_line_(char***, int*) noexcept override {
+		return false;
+	}
+
+	void add_platform_data_(GLib::VariantBuilder builder) noexcept override {
 		if (Platform::IsWayland()) {
 			const auto token = qgetenv("XDG_ACTIVATION_TOKEN");
 			if (!token.isEmpty()) {
-				g_variant_builder_add(
-					builder,
-					"{sv}",
-					"activation-token",
-					g_variant_new_string(token.constData()));
+				builder.add_value(
+					GLib::Variant::new_dict_entry(
+						GLib::Variant::new_string("activation-token"),
+						GLib::Variant::new_variant(
+							GLib::Variant::new_string(token.toStdString()))));
 				qunsetenv("XDG_ACTIVATION_TOKEN");
 			}
 		}
-	};
+	}
+};
+
+Application::Application()
+: Gio::impl::ApplicationImpl(this) {
+	const auto appId = QGuiApplication::desktopFileName().toStdString();
+	if (Gio::Application::id_is_valid(appId)) {
+		set_application_id(appId);
+	}
+	set_flags(Gio::ApplicationFlags::HANDLES_OPEN_);
+
+	auto actionMap = Gio::ActionMap(*this);
+
+	auto quitAction = Gio::SimpleAction::new_("quit");
+	quitAction.signal_activate().connect([](
+			Gio::SimpleAction,
+			GLib::Variant parameter) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([] {
+			Core::Quit();
+		});
+	});
+	actionMap.add_action(quitAction);
+
+	using Window::Notifications::Manager;
+	using NotificationId = Manager::NotificationId;
+	using NotificationIdTuple = std::invoke_result_t<
+		decltype(&NotificationId::toTuple),
+		NotificationId*
+	>;
+
+	const auto notificationIdVariantType = [] {
+		try {
+			return gi::wrap(
+				Glib::create_variant(
+					NotificationId().toTuple()
+				).get_type().gobj_copy(),
+				gi::transfer_full,
+				gi::direction_out
+			);
+		} catch (...) {
+			return GLib::VariantType();
+		}
+	}();
+
+	auto notificationActivateAction = Gio::SimpleAction::new_(
+		"notification-activate",
+		notificationIdVariantType);
+
+	notificationActivateAction.signal_activate().connect([](
+			Gio::SimpleAction,
+			GLib::Variant parameter) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			try {
+				const auto &app = Core::App();
+				app.notifications().manager().notificationActivated(
+					NotificationId::FromTuple(
+						Glib::wrap(
+							parameter.gobj_copy_()
+						).get_dynamic<NotificationIdTuple>()
+					)
+				);
+			} catch (...) {
+			}
+		});
+	});
+
+	actionMap.add_action(notificationActivateAction);
+
+	auto notificationMarkAsReadAction = Gio::SimpleAction::new_(
+		"notification-mark-as-read",
+		notificationIdVariantType);
+
+	notificationMarkAsReadAction.signal_activate().connect([](
+			Gio::SimpleAction,
+			GLib::Variant parameter) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			try {
+				const auto &app = Core::App();
+				app.notifications().manager().notificationReplied(
+					NotificationId::FromTuple(
+						Glib::wrap(
+							parameter.gobj_copy_()
+						).get_dynamic<NotificationIdTuple>()
+					),
+					{}
+				);
+			} catch (...) {
+			}
+		});
+	});
+
+	actionMap.add_action(notificationMarkAsReadAction);
 }
 
-static void t_desktop_application_init(TDesktopApplication *application) {
-}
-
-namespace Platform {
-namespace {
-
-using namespace gi::repository;
-namespace Gio = gi::repository::Gio;
-
 class LinuxIntegration final : public Integration {
 public:
 	LinuxIntegration();
@@ -103,8 +201,6 @@ private:
 
 	void initInhibit();
 
-	static void LaunchNativeApplication();
-
 	XdpInhibit::InhibitProxy _inhibitProxy;
 	base::Platform::XDP::SettingWatcher _darkModeWatcher;
 };
@@ -146,8 +242,8 @@ LinuxIntegration::LinuxIntegration()
 void LinuxIntegration::init() {
 	initInhibit();
 
-	Glib::signal_idle().connect_once([] {
-		LaunchNativeApplication();
+	GLib::idle_add_once([] {
+		gi::make_ref<Application>()->run(0, nullptr);
 	});
 }
 
@@ -207,115 +303,6 @@ void LinuxIntegration::initInhibit() {
 		nullptr);
 }
 
-void LinuxIntegration::LaunchNativeApplication() {
-	const auto appId = QGuiApplication::desktopFileName().toStdString();
-
-	const auto app = Glib::wrap(
-		G_APPLICATION(
-			g_object_new(
-				t_desktop_application_get_type(),
-				"application-id",
-				::Gio::Application::id_is_valid(appId)
-					? appId.c_str()
-					: nullptr,
-				"flags",
-				G_APPLICATION_HANDLES_OPEN,
-				nullptr)));
-
-	app->signal_startup().connect([weak = std::weak_ptr(app)] {
-		const auto app = weak.lock();
-		if (!app) {
-			return;
-		}
-
-		// GNotification
-		InvokeQueued(qApp, [] {
-			Core::App().notifications().createManager();
-		});
-
-		QEventLoop().exec();
-		app->quit();
-	}, true);
-
-	app->signal_activate().connect([] {
-		Core::Sandbox::Instance().customEnterFromEventLoop([] {
-			Core::App().activate();
-		});
-	}, true);
-
-	app->signal_open().connect([](
-			const ::Gio::Application::type_vec_files &files,
-			const Glib::ustring &hint) {
-		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			for (const auto &file : files) {
-				QFileOpenEvent e(
-					QUrl(QString::fromStdString(file->get_uri())));
-				QGuiApplication::sendEvent(qApp, &e);
-			}
-		});
-	}, true);
-
-	app->add_action("quit", [] {
-		Core::Sandbox::Instance().customEnterFromEventLoop([] {
-			Core::Quit();
-		});
-	});
-
-	using Window::Notifications::Manager;
-	using NotificationId = Manager::NotificationId;
-	using NotificationIdTuple = std::invoke_result_t<
-		decltype(&NotificationId::toTuple),
-		NotificationId*
-	>;
-
-	const auto notificationIdVariantType = [] {
-		try {
-			return Glib::create_variant(
-				NotificationId().toTuple()
-			).get_type();
-		} catch (...) {
-			return Glib::VariantType();
-		}
-	}();
-
-	app->add_action_with_parameter(
-		"notification-activate",
-		notificationIdVariantType,
-		[](const Glib::VariantBase &parameter) {
-			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-				try {
-					const auto &app = Core::App();
-					app.notifications().manager().notificationActivated(
-						NotificationId::FromTuple(
-							parameter.get_dynamic<NotificationIdTuple>()
-						)
-					);
-				} catch (...) {
-				}
-			});
-		});
-
-	app->add_action_with_parameter(
-		"notification-mark-as-read",
-		notificationIdVariantType,
-		[](const Glib::VariantBase &parameter) {
-			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-				try {
-					const auto &app = Core::App();
-					app.notifications().manager().notificationReplied(
-						NotificationId::FromTuple(
-							parameter.get_dynamic<NotificationIdTuple>()
-						),
-						{}
-					);
-				} catch (...) {
-				}
-			});
-		});
-
-	app->run(0, nullptr);
-}
-
 } // namespace
 
 std::unique_ptr<Integration> CreateIntegration() {
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 2049d28d1..5a52f4480 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -40,9 +40,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QWindow>
 
-#if __has_include(<giomm.h>)
-#include <giomm.h>
-#endif // __has_include(<giomm.h>)
+#if __has_include(<gio/gio.hpp>)
+#include <gio/gio.hpp>
+#endif // __has_include(<gio/gio.hpp>)
 
 namespace Window {
 namespace Notifications {
@@ -90,11 +90,12 @@ base::options::toggle OptionGNotification({
 	.description = "Force enable GLib's GNotification."
 		" When disabled, autodetect is used.",
 	.scope = [] {
-#if __has_include(<giomm.h>)
+#if __has_include(<gio/gio.hpp>)
+		using namespace gi::repository;
 		return bool(Gio::Application::get_default());
-#else // __has_include(<giomm.h>)
+#else // __has_include(<gio/gio.hpp>)
 		return false;
-#endif // __has_include(<giomm.h>)
+#endif // __has_include(<gio/gio.hpp>)
 	},
 	.restartRequired = true,
 });

From 1cad1966f7b296a6766aaf76610a98eb0e97a421 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 4 Aug 2023 07:47:14 +0400
Subject: [PATCH 554/676] Try to instantiate GApplication instance without
 nested event loop

---
 .../platform/linux/integration_linux.cpp      | 37 +++++++------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 5f22f596e..611e1275c 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -47,17 +47,6 @@ public:
 		}
 	}
 
-	void startup_() noexcept override {
-		// GNotification
-		InvokeQueued(qApp, [] {
-			Core::App().notifications().createManager();
-		});
-
-		Gio::impl::ApplicationImpl::startup_();
-		QEventLoop().exec();
-		quit();
-	}
-
 	void activate_() noexcept override {
 		Core::Sandbox::Instance().customEnterFromEventLoop([] {
 			Core::App().activate();
@@ -74,14 +63,6 @@ public:
 		});
 	}
 
-	int command_line_(Gio::ApplicationCommandLine) noexcept override {
-		return 0;
-	}
-
-	gboolean local_command_line_(char***, int*) noexcept override {
-		return false;
-	}
-
 	void add_platform_data_(GLib::VariantBuilder builder) noexcept override {
 		if (Platform::IsWayland()) {
 			const auto token = qgetenv("XDG_ACTIVATION_TOKEN");
@@ -188,6 +169,16 @@ Application::Application()
 	actionMap.add_action(notificationMarkAsReadAction);
 }
 
+gi::ref_ptr<Application> MakeApplication() {
+	const auto result = gi::make_ref<Application>();
+	if (const auto registered = result->register_(); !registered) {
+		LOG(("App Error: Failed to register: %1").arg(
+			QString::fromStdString(registered.error().message_())));
+		return nullptr;
+	}
+	return result;
+}
+
 class LinuxIntegration final : public Integration {
 public:
 	LinuxIntegration();
@@ -201,12 +192,14 @@ private:
 
 	void initInhibit();
 
+	const gi::ref_ptr<Application> _application;
 	XdpInhibit::InhibitProxy _inhibitProxy;
 	base::Platform::XDP::SettingWatcher _darkModeWatcher;
 };
 
 LinuxIntegration::LinuxIntegration()
-: _inhibitProxy(
+: _application(MakeApplication())
+, _inhibitProxy(
 	XdpInhibit::InhibitProxy::new_for_bus_sync(
 		Gio::BusType::SESSION_,
 		Gio::DBusProxyFlags::DO_NOT_AUTO_START_AT_CONSTRUCTION_,
@@ -241,10 +234,6 @@ LinuxIntegration::LinuxIntegration()
 
 void LinuxIntegration::init() {
 	initInhibit();
-
-	GLib::idle_add_once([] {
-		gi::make_ref<Application>()->run(0, nullptr);
-	});
 }
 
 void LinuxIntegration::initInhibit() {

From c2e96db358056a3cc4e6b3cd39c1a28af617eef2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 4 Aug 2023 08:14:50 +0400
Subject: [PATCH 555/676] Fix a typo in the LinuxIntegration event dispatcher
 warning

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

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 611e1275c..61248cc95 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -228,7 +228,7 @@ LinuxIntegration::LinuxIntegration()
 	if (!QCoreApplication::eventDispatcher()->inherits(
 		"QEventDispatcherGlib")) {
 		g_warning("Qt is running without GLib event loop integration, "
-			"except various functionality to not to work.");
+			"expect various functionality to not to work.");
 	}
 }
 

From 9ef780613024cdaebb28e6a11c42ce5e0668aef1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 4 Aug 2023 19:01:46 +0400
Subject: [PATCH 556/676] Update submodules

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 609a9e69f..1726a4fda 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 609a9e69f2a69fea050e75cbe2b546b4aa1e4914
+Subproject commit 1726a4fda092f910928f0e29eac358fc546d54a5
diff --git a/cmake b/cmake
index d1c98b4c4..002093a8d 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit d1c98b4c472c7b59c239006a06d7a784a60a347f
+Subproject commit 002093a8d0133f33758a8e559f53bef21175209b

From 38941eb3c8efc556f9dbf27f881464f6945cc34f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Aug 2023 13:24:27 +0200
Subject: [PATCH 557/676] Invoke linux prepare script the same way.

---
 Telegram/build/prepare/linux.sh |  1 +
 docs/building-linux.md          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Telegram/build/prepare/linux.sh b/Telegram/build/prepare/linux.sh
index 7a328bc31..d3ee5b5be 100755
--- a/Telegram/build/prepare/linux.sh
+++ b/Telegram/build/prepare/linux.sh
@@ -6,5 +6,6 @@ popd > /dev/null
 
 
 cd $FullScriptPath/../docker/centos_env
+poetry install
 poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t tdesktop:centos_env -
 cd $FullExecPath
diff --git a/docs/building-linux.md b/docs/building-linux.md
index 83906ac89..6be5a32b4 100644
--- a/docs/building-linux.md
+++ b/docs/building-linux.md
@@ -1,23 +1,23 @@
 ## Build instructions for Linux using Docker
 
+### Prepare folder
+
+Choose a folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document. All commands will be launched from Terminal.
+
 ### Obtain your API credentials
 
 You will require **api_id** and **api_hash** to access the Telegram API servers. To learn how to obtain them [click here][api_credentials].
 
-### Clone source code
+### Clone source code and prepare libraries
+
+Install [poetry](https://python-poetry.org), go to ***BuildPath*** and run
 
     git clone --recursive https://github.com/telegramdesktop/tdesktop.git
-
-### Prepare libraries
-
-Install [poetry](https://python-poetry.org), go to the `tdesktop/Telegram/build/docker/centos_env` directory and run
-
-    poetry install
-    poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t tdesktop:centos_env -
+    ./tdesktop/Telegram/build/prepare/linux.sh
 
 ### Building the project
 
-Go up to the `tdesktop` directory and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
+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 \

From f3ba8fea571f9edc81d55d365865bb81eaa3a821 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Aug 2023 19:32:13 +0200
Subject: [PATCH 558/676] Support vertical attach modify buttons layout.

---
 .../chat_helpers/chat_helpers.style           |  1 +
 .../ui/chat/attach/attach_album_thumbnail.cpp | 33 +++++++++++--------
 .../ui/chat/attach/attach_album_thumbnail.h   |  3 +-
 .../ui/chat/attach/attach_controls.cpp        | 29 ++++++++++++----
 .../ui/chat/attach/attach_controls.h          |  3 ++
 5 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index e791a7a35..aa5e8bdac 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -508,6 +508,7 @@ sendBoxAlbumGroupSkipRight: 5px;
 sendBoxAlbumGroupSkipTop: 5px;
 sendBoxAlbumGroupRadius: 4px;
 sendBoxAlbumGroupSize: size(62px, 25px);
+sendBoxAlbumGroupSizeVertical: size(30px, 50px);
 sendBoxAlbumSmallGroupSize: size(30px, 25px);
 
 sendBoxFileGroupSkipTop: 2px;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 2f847c7c0..3c8f155d6 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -259,8 +259,7 @@ void AlbumThumbnail::paintInAlbum(
 
 	_lastRectOfButtons = paintButtons(
 		p,
-		geometry.topLeft(),
-		geometry.width(),
+		geometry,
 		shrinkProgress);
 	_lastRectOfModify = geometry;
 }
@@ -460,8 +459,7 @@ void AlbumThumbnail::paintPhoto(Painter &p, int left, int top, int outerWidth) {
 
 	_lastRectOfButtons = paintButtons(
 		p,
-		topLeft,
-		st::sendMediaPreviewSize,
+		QRect(left, top, st::sendMediaPreviewSize, size.height()),
 		0);
 
 	_lastRectOfModify = QRect(topLeft, size);
@@ -521,7 +519,9 @@ AttachButtonType AlbumThumbnail::buttonTypeFromPoint(QPoint position) const {
 	}
 	return (!_lastRectOfButtons.contains(position) && !_isCompressedSticker)
 		? AttachButtonType::Modify
-		: (position.x() < _lastRectOfButtons.center().x())
+		: (_buttons.vertical()
+			? (position.y() < _lastRectOfButtons.center().y())
+			: (position.x() < _lastRectOfButtons.center().x()))
 		? AttachButtonType::Edit
 		: AttachButtonType::Delete;
 }
@@ -585,24 +585,31 @@ void AlbumThumbnail::finishAnimations() {
 
 QRect AlbumThumbnail::paintButtons(
 		QPainter &p,
-		QPoint point,
-		int outerWidth,
+		QRect geometry,
 		float64 shrinkProgress) {
 	const auto &skipRight = st::sendBoxAlbumGroupSkipRight;
 	const auto &skipTop = st::sendBoxAlbumGroupSkipTop;
-	const auto groupWidth = _buttons.width();
-
-	// If the width is tiny, it would be better to not display the buttons.
-	if (groupWidth > outerWidth) {
+	const auto outerWidth = geometry.width();
+	const auto outerHeight = geometry.height();
+	if (st::sendBoxAlbumGroupSize.width() <= outerWidth) {
+		_buttons.setVertical(false);
+	} else if (st::sendBoxAlbumGroupSize.height() <= outerHeight) {
+		_buttons.setVertical(true);
+	} else {
+		// If the size is tiny, skip the buttons.
 		return QRect();
 	}
+	const auto groupWidth = _buttons.width();
+	const auto groupHeight = _buttons.height();
 
 	// If the width is too small,
 	// it would be better to display the buttons in the center.
-	const auto groupX = point.x() + ((groupWidth + skipRight * 2 > outerWidth)
+	const auto groupX = geometry.x() + ((groupWidth + skipRight * 2 > outerWidth)
 		? (outerWidth - groupWidth) / 2
 		: outerWidth - skipRight - groupWidth);
-	const auto groupY = point.y() + skipTop;
+	const auto groupY = geometry.y() + ((groupHeight + skipTop * 2 > outerHeight)
+		? (outerHeight - groupHeight) / 2
+		: skipTop);
 
 	const auto opacity = p.opacity();
 	p.setOpacity(1.0 - shrinkProgress);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
index c3ffac584..1bfd8fc62 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
@@ -78,8 +78,7 @@ private:
 	void drawSimpleFrame(QPainter &p, QRect to, QSize size) const;
 	QRect paintButtons(
 		QPainter &p,
-		QPoint point,
-		int outerWidth,
+		QRect geometry,
 		float64 shrinkProgress);
 	void paintPlayVideo(QPainter &p, QRect geometry);
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
index 7ad686350..775218a87 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
@@ -25,10 +25,15 @@ void AttachControls::paint(QPainter &p, int x, int y) {
 
 	if (full) {
 		const auto groupHalfWidth = groupWidth / 2;
-		QRect leftRect(x, y, groupHalfWidth, groupHeight);
-		st::sendBoxAlbumGroupButtonMediaEdit.paintInCenter(p, leftRect);
-		QRect rightRect(x + groupHalfWidth, y, groupHalfWidth, groupHeight);
-		st::sendBoxAlbumGroupButtonMediaDelete.paintInCenter(p, rightRect);
+		const auto groupHalfHeight = groupHeight / 2;
+		const auto editRect = _vertical
+			? QRect(x, y, groupWidth, groupHalfHeight)
+			: QRect(x, y, groupHalfWidth, groupHeight);
+		st::sendBoxAlbumGroupButtonMediaEdit.paintInCenter(p, editRect);
+		const auto deleteRect = _vertical
+			? QRect(x, y + groupHalfHeight, groupWidth, groupHalfHeight)
+			: QRect(x + groupHalfWidth, y, groupHalfWidth, groupHeight);
+		st::sendBoxAlbumGroupButtonMediaDelete.paintInCenter(p, deleteRect);
 	} else if (_type == Type::EditOnly) {
 		st::sendBoxAlbumButtonMediaEdit.paintInCenter(p, groupRect);
 	}
@@ -36,7 +41,9 @@ void AttachControls::paint(QPainter &p, int x, int y) {
 
 int AttachControls::width() const {
 	return (_type == Type::Full)
-		? st::sendBoxAlbumGroupSize.width()
+		? (_vertical
+			? st::sendBoxAlbumGroupSizeVertical.width()
+			: st::sendBoxAlbumGroupSize.width())
 		: (_type == Type::EditOnly)
 		? st::sendBoxAlbumSmallGroupSize.width()
 		: 0;
@@ -44,7 +51,9 @@ int AttachControls::width() const {
 
 int AttachControls::height() const {
 	return (_type == Type::Full)
-		? st::sendBoxAlbumGroupSize.height()
+		? (_vertical
+			? st::sendBoxAlbumGroupSizeVertical.height()
+			: st::sendBoxAlbumGroupSize.height())
 		: (_type == Type::EditOnly)
 		? st::sendBoxAlbumSmallGroupSize.height()
 		: 0;
@@ -54,12 +63,20 @@ AttachControls::Type AttachControls::type() const {
 	return _type;
 }
 
+bool AttachControls::vertical() const {
+	return _vertical;
+}
+
 void AttachControls::setType(Type type) {
 	if (_type != type) {
 		_type = type;
 	}
 }
 
+void AttachControls::setVertical(bool vertical) {
+	_vertical = vertical;
+}
+
 AttachControlsWidget::AttachControlsWidget(
 	not_null<RpWidget*> parent,
 	AttachControls::Type type)
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_controls.h b/Telegram/SourceFiles/ui/chat/attach/attach_controls.h
index 9b7ad55c5..bf6992774 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_controls.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_controls.h
@@ -25,14 +25,17 @@ public:
 
 	void paint(QPainter &p, int x, int y);
 	void setType(Type type);
+	void setVertical(bool vertical);
 
 	[[nodiscard]] int width() const;
 	[[nodiscard]] int height() const;
 	[[nodiscard]] Type type() const;
+	[[nodiscard]] bool vertical() const;
 
 private:
 	RoundRect _rect;
 	Type _type = Type::Full;
+	bool _vertical = false;
 
 };
 

From 644126687961662c1f7c04e9fadaf77b363e9ccc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Aug 2023 11:48:42 +0200
Subject: [PATCH 559/676] Improve tabbed slider design.

---
 .../chat_helpers/chat_helpers.style           |  6 +-
 .../downloads/info_downloads_inner_widget.h   |  1 -
 .../SourceFiles/info/info_section_widget.h    |  4 -
 Telegram/SourceFiles/info/info_wrap_widget.h  |  1 -
 .../info/media/info_media_inner_widget.h      |  1 -
 .../info/stories/info_stories_inner_widget.h  |  1 -
 .../ui/widgets/discrete_sliders.cpp           | 90 +++++++++++++------
 .../SourceFiles/ui/widgets/discrete_sliders.h | 14 ++-
 Telegram/codegen                              |  2 +-
 Telegram/lib_ui                               |  2 +-
 10 files changed, 76 insertions(+), 46 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index aa5e8bdac..c21d75496 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -351,11 +351,7 @@ filtersRemove: IconButton(stickersRemove) {
 
 emojiPanMargins: margins(10px, 10px, 10px, 10px);
 
-emojiTabs: SettingsSlider(defaultTabsSlider) {
-	height: 43px;
-	barTop: 40px;
-	labelTop: 12px;
-}
+emojiTabs: defaultTabsSlider;
 
 emojiCategoryIconTop: 6px;
 emojiPanAnimation: PanelAnimation(defaultPanelAnimation) {
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.h b/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.h
index 2d2047f5e..65b55f4d0 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.h
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.h
@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unique_qptr.h"
 
 namespace Ui {
-class SettingsSlider;
 class VerticalLayout;
 class SearchFieldController;
 } // namespace Ui
diff --git a/Telegram/SourceFiles/info/info_section_widget.h b/Telegram/SourceFiles/info/info_section_widget.h
index 8ff1dbcfa..f53ed505f 100644
--- a/Telegram/SourceFiles/info/info_section_widget.h
+++ b/Telegram/SourceFiles/info/info_section_widget.h
@@ -10,10 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <rpl/event_stream.h>
 #include "window/section_widget.h"
 
-namespace Ui {
-class SettingsSlider;
-} // namespace Ui
-
 namespace Window {
 class ConnectionState;
 } // namespace Window
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h
index 47215d340..5445185e1 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.h
+++ b/Telegram/SourceFiles/info/info_wrap_widget.h
@@ -15,7 +15,6 @@ enum class SharedMediaType : signed char;
 } // namespace Storage
 
 namespace Ui {
-class SettingsSlider;
 class FadeShadow;
 class PlainShadow;
 class PopupMenu;
diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.h b/Telegram/SourceFiles/info/media/info_media_inner_widget.h
index 4e305de40..a3e485960 100644
--- a/Telegram/SourceFiles/info/media/info_media_inner_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.h
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/media/info_media_list_widget.h"
 
 namespace Ui {
-class SettingsSlider;
 class VerticalLayout;
 class SearchFieldController;
 } // namespace Ui
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index 3e6819af9..0aaeed54d 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unique_qptr.h"
 
 namespace Ui {
-class SettingsSlider;
 class VerticalLayout;
 } // namespace Ui
 
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index ff30d88c7..174d84d29 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -13,7 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
-DiscreteSlider::DiscreteSlider(QWidget *parent) : RpWidget(parent) {
+DiscreteSlider::DiscreteSlider(QWidget *parent, bool snapToLabel)
+: RpWidget(parent)
+, _snapToLabel(snapToLabel) {
 	setCursor(style::cur_pointer);
 }
 
@@ -80,9 +82,23 @@ void DiscreteSlider::setSections(const std::vector<QString> &labels) {
 	resizeToWidth(width());
 }
 
-int DiscreteSlider::getCurrentActiveLeft() {
-	const auto left = _sections.empty() ? 0 : _sections[_selected].left;
-	return _a_left.value(left);
+DiscreteSlider::Range DiscreteSlider::getFinalActiveRange() const {
+	const auto raw = _sections.empty() ? nullptr : &_sections[_selected];
+	if (!raw) {
+		return { 0, 0 };
+	}
+	const auto width = _snapToLabel
+		? std::min(raw->width, raw->label.maxWidth())
+		: raw->width;
+	return { raw->left + ((raw->width - width) / 2), width };
+}
+
+DiscreteSlider::Range DiscreteSlider::getCurrentActiveRange() const {
+	const auto to = getFinalActiveRange();
+	return {
+		int(base::SafeRound(_a_left.value(to.left))),
+		int(base::SafeRound(_a_width.value(to.width))),
+	};
 }
 
 template <typename Lambda>
@@ -138,11 +154,13 @@ void DiscreteSlider::setSelectedSection(int index) {
 	if (index < 0 || index >= _sections.size()) return;
 
 	if (_selected != index) {
-		auto from = _sections[_selected].left;
+		const auto from = getFinalActiveRange();
 		_selected = index;
-		auto to = _sections[_selected].left;
-		auto duration = getAnimationDuration();
-		_a_left.start([this] { update(); }, from, to, duration);
+		const auto to = getFinalActiveRange();
+		const auto duration = getAnimationDuration();
+		const auto updater = [=] { update(); };
+		_a_left.start(updater, from.left, to.left, duration);
+		_a_width.start(updater, from.width, to.width, duration);
 		_callbackAfterMs = crl::now() + duration;
 	}
 }
@@ -166,7 +184,7 @@ DiscreteSlider::Section::Section(
 SettingsSlider::SettingsSlider(
 	QWidget *parent,
 	const style::SettingsSlider &st)
-: DiscreteSlider(parent)
+: DiscreteSlider(parent, st.barSnapToLabel)
 , _st(st) {
 	if (_st.barRadius > 0) {
 		_bar.emplace(_st.barRadius, _st.barFg);
@@ -299,7 +317,7 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	auto clip = e->rect();
-	auto activeLeft = getCurrentActiveLeft();
+	auto range = getCurrentActiveRange();
 
 	const auto drawRect = [&](QRect rect, bool active = false) {
 		const auto &bar = active ? _barActive : _bar;
@@ -310,9 +328,14 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 		}
 	};
 	enumerateSections([&](Section &section) {
+		const auto activeWidth = _st.barSnapToLabel
+			? section.label.maxWidth()
+			: section.width;
+		const auto activeLeft = section.left
+			+ (section.width - activeWidth) / 2;
 		auto active = 1.
 			- std::clamp(
-				qAbs(activeLeft - section.left) / float64(section.width),
+				qAbs(range.left - activeLeft) / float64(section.width),
 				0.,
 				1.);
 		if (section.ripple) {
@@ -322,36 +345,47 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 				section.ripple.reset();
 			}
 		}
-		auto from = section.left, tofill = section.width;
-		if (activeLeft > from) {
-			auto fill = qMin(tofill, activeLeft - from);
-			drawRect(myrtlrect(from, _st.barTop, fill, _st.barStroke));
-			from += fill;
-			tofill -= fill;
-		}
-		if (activeLeft + section.width > from) {
-			if (auto fill = qMin(tofill, activeLeft + section.width - from)) {
-				drawRect(
-					myrtlrect(from, _st.barTop, fill, _st.barStroke),
-					true);
+		if (!_st.barSnapToLabel) {
+			auto from = activeLeft, tofill = activeWidth;
+			if (range.left > from) {
+				auto fill = qMin(tofill, range.left - from);
+				drawRect(myrtlrect(from, _st.barTop, fill, _st.barStroke));
 				from += fill;
 				tofill -= fill;
 			}
+			if (range.left + activeWidth > from) {
+				if (auto fill = qMin(tofill, range.left + activeWidth - from)) {
+					drawRect(
+						myrtlrect(from, _st.barTop, fill, _st.barStroke),
+						true);
+					from += fill;
+					tofill -= fill;
+				}
+			}
+			if (tofill) {
+				drawRect(myrtlrect(from, _st.barTop, tofill, _st.barStroke));
+			}
 		}
-		if (tofill) {
-			drawRect(myrtlrect(from, _st.barTop, tofill, _st.barStroke));
-		}
-		if (myrtlrect(section.left, _st.labelTop, section.width, _st.labelStyle.font->height).intersects(clip)) {
+		const auto labelLeft = section.left + (section.width - section.label.maxWidth()) / 2;
+		if (myrtlrect(labelLeft, _st.labelTop, section.label.maxWidth(), _st.labelStyle.font->height).intersects(clip)) {
 			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
 			section.label.drawLeft(
 				p,
-				section.left + (section.width - section.label.maxWidth()) / 2,
+				labelLeft,
 				_st.labelTop,
 				section.label.maxWidth(),
 				width());
 		}
 		return true;
 	});
+	if (_st.barSnapToLabel) {
+		const auto add = _st.barStroke / 2;
+		const auto from = std::max(range.left - add, 0);
+		const auto till = std::min(range.left + range.width + add, width());
+		if (from < till) {
+			drawRect(myrtlrect(from, _st.barTop, till - from, _st.barStroke), true);
+		}
+	}
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index 017108741..e1513e693 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -18,7 +18,7 @@ class RippleAnimation;
 
 class DiscreteSlider : public RpWidget {
 public:
-	DiscreteSlider(QWidget *parent);
+	DiscreteSlider(QWidget *parent, bool snapToLabel);
 
 	void addSection(const QString &label);
 	void setSections(const std::vector<QString> &labels);
@@ -49,10 +49,15 @@ protected:
 		Ui::Text::String label;
 		std::unique_ptr<RippleAnimation> ripple;
 	};
+	struct Range {
+		int left = 0;
+		int width = 0;
+	};
 
-	int getCurrentActiveLeft();
+	[[nodiscard]] Range getFinalActiveRange() const;
+	[[nodiscard]] Range getCurrentActiveRange() const;
 
-	int getSectionsCount() const {
+	[[nodiscard]] int getSectionsCount() const {
 		return _sections.size();
 	}
 
@@ -67,6 +72,7 @@ protected:
 
 	void stopAnimation() {
 		_a_left.stop();
+		_a_width.stop();
 	}
 
 	void setSelectOnPress(bool selectOnPress);
@@ -82,12 +88,14 @@ private:
 	std::vector<Section> _sections;
 	int _activeIndex = 0;
 	bool _selectOnPress = true;
+	bool _snapToLabel = false;
 
 	rpl::event_stream<int> _sectionActivated;
 
 	int _pressed = -1;
 	int _selected = 0;
 	Ui::Animations::Simple _a_left;
+	Ui::Animations::Simple _a_width;
 
 	int _timerId = -1;
 	crl::time _callbackAfterMs = 0;
diff --git a/Telegram/codegen b/Telegram/codegen
index 5a11029c4..2d03abc7d 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 5a11029c461416407a423ac9921356fba0088ab6
+Subproject commit 2d03abc7de8558ae8862688a226b3d5a817dc466
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 0f25a9451..5f2e0a32b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 0f25a9451012c7fba93777a009f3b5dcc0f1ca89
+Subproject commit 5f2e0a32b12df1468419b123ac8fb4bb17cf47cc

From 39a80c66041f692767653b406e05a778cba293c1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Aug 2023 12:46:30 +0200
Subject: [PATCH 560/676] Improve sticker sets box design.

---
 Telegram/SourceFiles/boxes/boxes.style        |  2 +-
 Telegram/SourceFiles/boxes/stickers_box.cpp   | 96 ++++++++++---------
 Telegram/SourceFiles/boxes/stickers_box.h     |  2 +
 .../chat_helpers/chat_helpers.style           | 18 +++-
 4 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 3758d8a61..00862eada 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -607,7 +607,7 @@ groupStickersField: InputField(defaultMultiSelectSearchField) {
 	textBg: boxBg;
 	heightMin: 32px;
 }
-groupStickersSubTitleHeight: 36px;
+groupStickersSubTitleHeight: 48px;
 
 proxyUsePadding: margins(22px, 6px, 22px, 5px);
 proxyTryIPv6Padding: margins(22px, 8px, 22px, 5px);
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 32295cf08..237306d84 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -250,6 +250,7 @@ private:
 	int countMaxNameWidth(bool installedSet) const;
 	[[nodiscard]] bool skipPremium() const;
 
+	const style::PeerListItem &_st;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
@@ -386,7 +387,8 @@ StickersBox::StickersBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	Section section,
 	bool masks)
-: _show(std::move(show))
+: _st(st::stickersRowItem)
+, _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _tabs(this, st::stickersTabs)
@@ -407,7 +409,8 @@ StickersBox::StickersBox(
 	QWidget*,
 	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<ChannelData*> megagroup)
-: _show(std::move(show))
+: _st(st::stickersRowItem)
+, _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(Section::Installed)
@@ -425,7 +428,8 @@ StickersBox::StickersBox(
 	QWidget*,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const QVector<MTPStickerSetCovered> &attachedSets)
-: _show(std::move(show))
+: _st(st::stickersRowItem)
+, _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(Section::Attached)
@@ -440,7 +444,8 @@ StickersBox::StickersBox(
 	QWidget*,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const std::vector<StickerSetIdentifier> &emojiSets)
-: _show(std::move(show))
+: _st(st::stickersRowItem)
+, _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(Section::Attached)
@@ -1131,6 +1136,7 @@ StickersBox::Inner::Inner(
 	std::shared_ptr<ChatHelpers::Show> show,
 	StickersBox::Section section)
 : RpWidget(parent)
+, _st(st::stickersRowItem)
 , _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
@@ -1150,11 +1156,11 @@ StickersBox::Inner::Inner(
 , _inactiveButtonBg(
 	ImageRoundRadius::Large,
 	st::stickersTrendingInstalled.textBg)
-, _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
+, _rowHeight(_st.height)
 , _shiftingAnimation([=](crl::time now) {
 	return shiftingAnimationCallback(now);
 })
-, _itemsTop(st::membersMarginTop)
+, _itemsTop(st::lineWidth)
 , _addText(tr::lng_stickers_featured_add(tr::now))
 , _addWidth(st::stickersTrendingAdd.font->width(_addText))
 , _undoText(tr::lng_stickers_return(tr::now))
@@ -1169,6 +1175,7 @@ StickersBox::Inner::Inner(
 	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<ChannelData*> megagroup)
 : RpWidget(parent)
+, _st(st::stickersRowItem)
 , _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
@@ -1188,11 +1195,11 @@ StickersBox::Inner::Inner(
 , _inactiveButtonBg(
 	ImageRoundRadius::Large,
 	st::stickersTrendingInstalled.textBg)
-, _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
+, _rowHeight(_st.height)
 , _shiftingAnimation([=](crl::time now) {
 	return shiftingAnimationCallback(now);
 })
-, _itemsTop(st::membersMarginTop)
+, _itemsTop(st::lineWidth)
 , _megagroupSet(megagroup)
 , _megagroupSetInput(_megagroupSet->mgInfo->stickerSet)
 , _megagroupSetField(
@@ -1328,8 +1335,8 @@ QRect StickersBox::Inner::relativeButtonRect(
 		buttonh = st.height;
 		buttonshift = 0;
 	}
-	auto buttonx = width() - st::contactsPadding.right() - st::contactsCheckPosition.x() - buttonw + buttonshift;
-	auto buttony = st::contactsPadding.top() + (st::contactsPhotoSize - buttonh) / 2;
+	auto buttonx = width() - st::contactsPadding.right() - buttonw + buttonshift;
+	auto buttony = (_st.height - buttonh) / 2;
 	return QRect(buttonx, buttony, buttonw, buttonh);
 }
 
@@ -1345,7 +1352,7 @@ void StickersBox::Inner::paintRow(Painter &p, not_null<Row*> row, int index) {
 			return -1;
 		}();
 		if (index >= 0 && index == selectedIndex) {
-			p.fillRect(0, 0, width(), _rowHeight, st::contactsBgOver);
+			p.fillRect(0, 0, width(), _rowHeight, _st.button.textBgOver);
 			if (row->ripple) {
 				row->ripple->paint(p, 0, 0, width());
 			}
@@ -1362,7 +1369,7 @@ void StickersBox::Inner::paintRow(Painter &p, not_null<Row*> row, int index) {
 					current = reachedOpacity;
 				}
 			}
-			auto rect = myrtlrect(st::contactsPadding.left() / 2, st::contactsPadding.top() / 2, width() - (st::contactsPadding.left() / 2) - _scrollbar - st::contactsPadding.left() / 2, _rowHeight - ((st::contactsPadding.top() + st::contactsPadding.bottom()) / 2));
+			auto rect = myrtlrect(_st.photoPosition.x() / 2, _st.photoPosition.y() / 2, width() - _st.photoPosition.x() - _scrollbar, _rowHeight - _st.photoPosition.y());
 			p.setOpacity(current);
 			Ui::Shadow::paint(p, rect, width(), st::boxRoundShadow);
 			p.setOpacity(1);
@@ -1383,27 +1390,27 @@ void StickersBox::Inner::paintRow(Painter &p, not_null<Row*> row, int index) {
 		p.setOpacity(st::stickersRowDisabledOpacity);
 	}
 
-	auto stickerx = st::contactsPadding.left();
+	auto stickerskip = 0;
 
 	if (!_megagroupSet && _isInstalledTab) {
-		stickerx += st::stickersReorderIcon.width() + st::stickersReorderSkip;
+		stickerskip += st::stickersReorderIcon.width() + st::stickersReorderSkip;
 		if (!row->isRecentSet()) {
-			st::stickersReorderIcon.paint(p, st::contactsPadding.left(), (_rowHeight - st::stickersReorderIcon.height()) / 2, width());
+			st::stickersReorderIcon.paint(p, _st.photoPosition.x(), (_rowHeight - st::stickersReorderIcon.height()) / 2, width());
 		}
 	}
 
 	if (row->sticker) {
-		paintRowThumbnail(p, row, stickerx);
+		paintRowThumbnail(p, row, stickerskip + _st.photoPosition.x());
 	}
 
-	int namex = stickerx + st::contactsPhotoSize + st::contactsPadding.left();
-	int namey = st::contactsPadding.top() + st::contactsNameTop;
+	int namex = stickerskip + _st.namePosition.x();
+	int namey = _st.namePosition.y();
 
-	int statusx = namex;
-	int statusy = st::contactsPadding.top() + st::contactsStatusTop;
+	int statusx = stickerskip + _st.statusPosition.x();
+	int statusy = _st.statusPosition.y();
 
 	p.setFont(st::contactsNameStyle.font);
-	p.setPen(st::contactsNameFg);
+	p.setPen(_st.nameFg);
 	p.drawTextLeft(namex, namey, width(), row->title, row->titleWidth);
 
 	if (row->isUnread()) {
@@ -1425,7 +1432,7 @@ void StickersBox::Inner::paintRow(Painter &p, not_null<Row*> row, int index) {
 		: tr::lng_stickers_count(tr::now, lt_count, row->count);
 
 	p.setFont(st::contactsStatusFont);
-	p.setPen(st::contactsStatusFg);
+	p.setPen(_st.statusFg);
 	p.drawTextLeft(statusx, statusy, width(), statusText);
 
 	p.setOpacity(1);
@@ -1457,15 +1464,15 @@ void StickersBox::Inner::paintRowThumbnail(
 		? row->stickerMedia->thumbnail()
 		: nullptr;
 	const auto paused = _show->paused(ChatHelpers::PauseReason::Layer);
-	const auto x = left + (st::contactsPhotoSize - row->pixw) / 2;
-	const auto y = st::contactsPadding.top() + (st::contactsPhotoSize - row->pixh) / 2;
+	const auto x = left + (_st.photoSize - row->pixw) / 2;
+	const auto y = _st.photoPosition.y() + (_st.photoSize - row->pixh) / 2;
 	if (row->lottie && row->lottie->ready()) {
 		const auto frame = row->lottie->frame();
 		const auto size = frame.size() / cIntRetinaFactor();
 		p.drawImage(
 			QRect(
-				left + (st::contactsPhotoSize - size.width()) / 2,
-				st::contactsPadding.top() + (st::contactsPhotoSize - size.height()) / 2,
+				left + (_st.photoSize - size.width()) / 2,
+				_st.photoPosition.y() + (_st.photoSize - size.height()) / 2,
 				size.width(),
 				size.height()),
 			frame);
@@ -1500,9 +1507,7 @@ void StickersBox::Inner::validateLottieAnimation(not_null<Row*> row) {
 		row->thumbnailMedia.get(),
 		row->stickerMedia.get(),
 		ChatHelpers::StickerLottieSize::SetsListThumbnail,
-		QSize(
-			st::contactsPhotoSize,
-			st::contactsPhotoSize) * cIntRetinaFactor());
+		QSize(_st.photoSize, _st.photoSize) * cIntRetinaFactor());
 	if (!player) {
 		return;
 	}
@@ -1572,15 +1577,12 @@ void StickersBox::Inner::updateRowThumbnail(not_null<Row*> row) {
 		}
 		Unexpected("StickersBox::Inner::updateRowThumbnail: row not found");
 	}();
-	const auto left = st::contactsPadding.left()
+	const auto left = _st.photoPosition.x()
 		+ ((!_megagroupSet && _isInstalledTab)
 			? st::stickersReorderIcon.width() + st::stickersReorderSkip
 			: 0);
-	update(
-		left,
-		rowTop + st::contactsPadding.top(),
-		st::contactsPhotoSize,
-		st::contactsPhotoSize);
+	const auto top = rowTop + _st.photoPosition.y();
+	update(left, top, _st.photoSize, _st.photoSize);
 }
 
 void StickersBox::Inner::paintFakeButton(Painter &p, not_null<Row*> row, int index) {
@@ -1818,7 +1820,7 @@ void StickersBox::Inner::updateSelected() {
 				actionSel = -1;
 			}
 			if (!_megagroupSet && _isInstalledTab && !row->isRecentSet()) {
-				auto dragAreaWidth = st::contactsPadding.left() + st::stickersReorderIcon.width() + st::stickersReorderSkip;
+				auto dragAreaWidth = _st.photoPosition.x() + st::stickersReorderIcon.width() + st::stickersReorderSkip;
 				auto dragArea = myrtlrect(0, 0, dragAreaWidth, _rowHeight);
 				inDragArea = dragArea.contains(local);
 			}
@@ -2142,7 +2144,7 @@ void StickersBox::Inner::rebuildMegagroupSet() {
 }
 
 void StickersBox::Inner::rebuild(bool masks) {
-	_itemsTop = st::membersMarginTop;
+	_itemsTop = st::lineWidth;
 
 	if (_megagroupSet) {
 		_itemsTop += st::groupStickersFieldPadding.top() + _megagroupSetField->height() + st::groupStickersFieldPadding.bottom();
@@ -2291,11 +2293,11 @@ bool StickersBox::Inner::skipPremium() const {
 }
 
 int StickersBox::Inner::countMaxNameWidth(bool installedSet) const {
-	int namex = st::contactsPadding.left() + st::contactsPhotoSize + st::contactsPadding.left();
+	int namex = _st.namePosition.x();
 	if (!_megagroupSet && _isInstalledTab) {
 		namex += st::stickersReorderIcon.width() + st::stickersReorderSkip;
 	}
-	int namew = st::boxWideWidth - namex - st::contactsPadding.right() - st::contactsCheckPosition.x();
+	int namew = st::boxWideWidth - namex - st::contactsPadding.right();
 	if (_isInstalledTab) {
 		if (!_megagroupSet) {
 			namew -= _undoWidth - st::stickersUndoRemove.width;
@@ -2401,17 +2403,17 @@ void StickersBox::Inner::fillSetCover(
 		: QSize(1, 1);
 	auto pixw = size.width();
 	auto pixh = size.height();
-	if (pixw > st::contactsPhotoSize) {
+	if (pixw > _st.photoSize) {
 		if (pixw > pixh) {
-			pixh = (pixh * st::contactsPhotoSize) / pixw;
-			pixw = st::contactsPhotoSize;
+			pixh = (pixh * _st.photoSize) / pixw;
+			pixw = _st.photoSize;
 		} else {
-			pixw = (pixw * st::contactsPhotoSize) / pixh;
-			pixh = st::contactsPhotoSize;
+			pixw = (pixw * _st.photoSize) / pixh;
+			pixh = _st.photoSize;
 		}
-	} else if (pixh > st::contactsPhotoSize) {
-		pixw = (pixw * st::contactsPhotoSize) / pixh;
-		pixh = st::contactsPhotoSize;
+	} else if (pixh > _st.photoSize) {
+		pixw = (pixw * _st.photoSize) / pixh;
+		pixh = _st.photoSize;
 	}
 	*outWidth = pixw;
 	*outHeight = pixh;
diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h
index fa3647691..f0e54374a 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.h
+++ b/Telegram/SourceFiles/boxes/stickers_box.h
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace style {
 struct RippleAnimation;
+struct PeerListItem;
 } // namespace style
 
 namespace Ui {
@@ -142,6 +143,7 @@ private:
 
 	std::array<Inner*, 5> widgets() const;
 
+	const style::PeerListItem &_st;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index c21d75496..79c85a03d 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -313,10 +313,26 @@ stickersUndoRemove: RoundButton(defaultLightButton) {
 }
 stickersRemoveSkip: 4px;
 stickersReorderIcon: icon {{ "stickers_reorder", menuIconFg }};
-stickersReorderSkip: 13px;
+stickersReorderSkip: 18px;
 
 stickersTabs: defaultTabsSlider;
 
+stickersRowItem: PeerListItem(defaultPeerListItem) {
+	height: 52px;
+	photoSize: 32px;
+	photoPosition: point(18px, 10px);
+	namePosition: point(66px, 7px);
+	statusPosition: point(66px, 26px);
+	button: OutlineButton(defaultPeerListButton) {
+		textBg: contactsBg;
+		textBgOver: contactsBgOver;
+		ripple: defaultRippleAnimation;
+	}
+	statusFg: contactsStatusFg;
+	statusFgOver: contactsStatusFgOver;
+	statusFgActive: contactsStatusFgOnline;
+}
+
 stickerEmojiSkip: 5px;
 
 stickersFeaturedBadgeFont: font(12px bold);

From c5718678ea9ffb7e82c8c3d19e36b4a9080965f7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 14:37:55 +0200
Subject: [PATCH 561/676] Disable OpenGL ANGLE backend.

Currently ANGLE can work through desktop OpenGL only with enabled
attribute EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE.

Qt can't work with it enabled and shows vertically flipped content.
---
 Telegram/SourceFiles/core/application.cpp         |  2 +-
 .../SourceFiles/settings/settings_advanced.cpp    | 15 ++++++++-------
 Telegram/lib_ui                                   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 6ac6a20b8..104d887c2 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -123,7 +123,7 @@ void SetCrashAnnotationsGL() {
 		case Ui::GL::ANGLE::D3D11: return "Direct3D 11";
 		case Ui::GL::ANGLE::D3D9: return "Direct3D 9";
 		case Ui::GL::ANGLE::D3D11on12: return "D3D11on12";
-		case Ui::GL::ANGLE::OpenGL: return "OpenGL";
+		//case Ui::GL::ANGLE::OpenGL: return "OpenGL";
 		}
 		Unexpected("Ui::GL::CurrentANGLE value in SetupANGLE.");
 	}());
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 0cd7c485f..1829f92a2 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -737,18 +737,19 @@ void SetupANGLE(
 		tr::lng_settings_angle_backend_d3d11(tr::now),
 		tr::lng_settings_angle_backend_d3d9(tr::now),
 		tr::lng_settings_angle_backend_d3d11on12(tr::now),
-		tr::lng_settings_angle_backend_opengl(tr::now),
+		//tr::lng_settings_angle_backend_opengl(tr::now),
 		tr::lng_settings_angle_backend_disabled(tr::now),
 	};
-	const auto backendIndex = [] {
+	const auto disabled = int(options.size()) - 1;
+	const auto backendIndex = [=] {
 		if (Core::App().settings().disableOpenGL()) {
-			return 5;
+			return disabled;
 		} else switch (Ui::GL::CurrentANGLE()) {
 		case ANGLE::Auto: return 0;
 		case ANGLE::D3D11: return 1;
 		case ANGLE::D3D9: return 2;
 		case ANGLE::D3D11on12: return 3;
-		case ANGLE::OpenGL: return 4;
+		//case ANGLE::OpenGL: return 4;
 		}
 		Unexpected("Ui::GL::CurrentANGLE value in SetupANGLE.");
 	}();
@@ -764,7 +765,7 @@ void SetupANGLE(
 					return;
 				}
 				const auto confirmed = crl::guard(button, [=] {
-					const auto nowDisabled = (index == 5);
+					const auto nowDisabled = (index == disabled);
 					if (!nowDisabled) {
 						Ui::GL::ChangeANGLE([&] {
 							switch (index) {
@@ -772,12 +773,12 @@ void SetupANGLE(
 							case 1: return ANGLE::D3D11;
 							case 2: return ANGLE::D3D9;
 							case 3: return ANGLE::D3D11on12;
-							case 4: return ANGLE::OpenGL;
+							//case 4: return ANGLE::OpenGL;
 							}
 							Unexpected("Index in SetupANGLE.");
 						}());
 					}
-					const auto wasDisabled = (backendIndex == 5);
+					const auto wasDisabled = (backendIndex == disabled);
 					if (nowDisabled != wasDisabled) {
 						Core::App().settings().setDisableOpenGL(nowDisabled);
 						Local::writeSettings();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5f2e0a32b..b49ee81df 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5f2e0a32b12df1468419b123ac8fb4bb17cf47cc
+Subproject commit b49ee81df9d285d08ef6bf834c6e14c5064b4070

From 56fa88f47f1e58e42c3b808a7a5ae4ebf5fdf312 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 15:00:31 +0200
Subject: [PATCH 562/676] Update ANGLE revision, workaround D3D11 memory leak.

---
 Telegram/build/prepare/prepare.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index a8f611a8c..1b8a37c47 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1210,7 +1210,7 @@ stage('tg_angle', """
 win:
     git clone https://github.com/desktop-app/tg_angle.git
     cd tg_angle
-    git checkout 0bb011f9e4
+    git checkout e3f59e8d0c
     mkdir out
     cd out
     mkdir Debug

From 21b06f390c1932bd119b0538ad4494cb32e08bf4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 17:13:16 +0300
Subject: [PATCH 563/676] Fix initial video playback speed.

Regression was introduced in b663edff09.
---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 2f06caa21..d0e19936a 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4051,8 +4051,8 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 		const auto messageId = _message ? _message->fullId() : FullMsgId();
 		options.audioId = AudioMsgId(_document, messageId);
 		options.speed = _stories
-			? Core::App().settings().videoPlaybackSpeed()
-			: 1.;
+			? 1.
+			: Core::App().settings().videoPlaybackSpeed();
 		if (_pip) {
 			_pip = nullptr;
 		}

From dfe36f638b40eb8000921d6c761a7cf503f5af63 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 18:10:58 +0300
Subject: [PATCH 564/676] Correctly apply editions to media-edit-in-progress.

---
 Telegram/SourceFiles/api/api_sending.cpp      |  2 +-
 .../data/data_scheduled_messages.cpp          | 19 ++++++-----
 Telegram/SourceFiles/history/history_item.cpp | 33 ++++++++++++++++---
 .../history/history_item_edition.h            |  1 +
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 9cfe272f8..291a2675a 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -456,7 +456,6 @@ void SendConfirmedFile(
 	}());
 
 	if (itemToEdit) {
-		itemToEdit->savePreviousMedia();
 		auto edition = HistoryMessageEdition();
 		edition.isEditHide = (flags & MessageFlag::HideEdited);
 		edition.editDate = 0;
@@ -468,6 +467,7 @@ void SendConfirmedFile(
 		edition.useSameMarkup = true;
 		edition.useSameReplies = true;
 		edition.useSameReactions = true;
+		edition.savePreviousMedia = true;
 		itemToEdit->applyEdition(std::move(edition));
 	} else {
 		const auto viaBotId = UserId();
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
index 820b7c0d2..7f5821b7c 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
@@ -467,16 +467,17 @@ HistoryItem *ScheduledMessages::append(
 			// probably this message was edited.
 			if (data.is_edit_hide()) {
 				existing->applyEdition(HistoryMessageEdition(_session, data));
+			} else {
+				existing->updateSentContent({
+					qs(data.vmessage()),
+					Api::EntitiesFromMTP(
+						_session,
+						data.ventities().value_or_empty())
+				}, data.vmedia());
+				existing->updateReplyMarkup(
+					HistoryMessageMarkupData(data.vreply_markup()));
+				existing->updateForwardedInfo(data.vfwd_from());
 			}
-			existing->updateSentContent({
-				qs(data.vmessage()),
-				Api::EntitiesFromMTP(
-					_session,
-					data.ventities().value_or_empty())
-			}, data.vmedia());
-			existing->updateReplyMarkup(
-				HistoryMessageMarkupData(data.vreply_markup()));
-			existing->updateForwardedInfo(data.vfwd_from());
 			existing->updateDate(data.vdate().v);
 			history->owner().requestItemTextRefresh(existing);
 		}, [&](const auto &data) {});
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index bc0fffeb7..55e1def49 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1467,6 +1467,12 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	//	}
 	//}
 
+	const auto updatingSavedLocalEdit = !edition.savePreviousMedia
+		&& (_savedLocalEditMediaData != nullptr);
+	if (!_savedLocalEditMediaData && edition.savePreviousMedia) {
+		savePreviousMedia();
+	}
+
 	if (edition.isEditHide) {
 		_flags |= MessageFlag::HideEdited;
 	} else {
@@ -1486,8 +1492,14 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 		setReplyMarkup(base::take(edition.replyMarkup));
 	}
 	if (!isLocalUpdateMedia()) {
-		removeFromSharedMediaIndex();
-		refreshMedia(edition.mtpMedia);
+		if (updatingSavedLocalEdit) {
+			_savedLocalEditMediaData->media = edition.mtpMedia
+				? CreateMedia(this, *edition.mtpMedia)
+				: nullptr;
+		} else {
+			removeFromSharedMediaIndex();
+			refreshMedia(edition.mtpMedia);
+		}
 	}
 	if (!edition.useSameReactions) {
 		updateReactions(edition.mtpReactions);
@@ -1498,10 +1510,18 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	if (!edition.useSameForwards) {
 		setForwardsCount(edition.forwards);
 	}
-	setText(_media
+	const auto &checkedMedia = updatingSavedLocalEdit
+		? _savedLocalEditMediaData->media
+		: _media;
+	auto updatedText = checkedMedia
 		? edition.textWithEntities
-		: EnsureNonEmpty(edition.textWithEntities));
-	if (!isLocalUpdateMedia()) {
+		: EnsureNonEmpty(edition.textWithEntities);
+	if (updatingSavedLocalEdit) {
+		_savedLocalEditMediaData->text = std::move(updatedText);
+	} else {
+		setText(std::move(updatedText));
+	}
+	if (!isLocalUpdateMedia() && !updatingSavedLocalEdit) {
 		indexAsNewItem();
 	}
 	if (!edition.useSameReplies) {
@@ -1650,6 +1670,9 @@ void HistoryItem::applySentMessage(
 void HistoryItem::updateSentContent(
 		const TextWithEntities &textWithEntities,
 		const MTPMessageMedia *media) {
+	if (_savedLocalEditMediaData) {
+		return;
+	}
 	setText(textWithEntities);
 	if (_flags & MessageFlag::FromInlineBot) {
 		if (!media || !_media || !_media->updateInlineResultMedia(*media)) {
diff --git a/Telegram/SourceFiles/history/history_item_edition.h b/Telegram/SourceFiles/history/history_item_edition.h
index 2ca37c71a..b24bf8836 100644
--- a/Telegram/SourceFiles/history/history_item_edition.h
+++ b/Telegram/SourceFiles/history/history_item_edition.h
@@ -29,6 +29,7 @@ struct HistoryMessageEdition {
 	bool useSameReplies = false;
 	bool useSameMarkup = false;
 	bool useSameReactions = false;
+	bool savePreviousMedia = false;
 	TextWithEntities textWithEntities;
 	HistoryMessageMarkupData replyMarkup;
 	HistoryMessageRepliesData replies;

From 12eed5f433a0d7ab1d0461ec9c441cd0bff87bb4 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 9 Aug 2023 20:43:54 +0400
Subject: [PATCH 565/676] Get optional string support in cppgir

---
 Telegram/SourceFiles/platform/linux/integration_linux.cpp | 6 +++++-
 Telegram/lib_base                                         | 2 +-
 Telegram/lib_webview                                      | 2 +-
 cmake                                                     | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 61248cc95..f13a96bce 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -241,7 +241,11 @@ void LinuxIntegration::initInhibit() {
 		return;
 	}
 
-	auto uniqueName = _inhibitProxy.get_connection().get_unique_name();
+	auto uniqueName = _inhibitProxy
+		.get_connection()
+		.get_unique_name()
+		.value_or("");
+
 	uniqueName.erase(0, 1);
 	uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
 
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 1726a4fda..e497dc134 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 1726a4fda092f910928f0e29eac358fc546d54a5
+Subproject commit e497dc134de3f8e2933ee0acdbba8bd702ce2130
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index ebb8b8b91..585056693 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit ebb8b8b91fe357b2c397a3eb98655c585b8c856e
+Subproject commit 5850566934f2f6cae56646c36cb95f85c8a9c752
diff --git a/cmake b/cmake
index 002093a8d..92e35993a 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 002093a8d0133f33758a8e559f53bef21175209b
+Subproject commit 92e35993aa437ee212f677c96a717078124cfd65

From 786d8dd22ee1e332df59a7016ee9352123fbcdb8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 17 Jun 2023 15:47:22 +0400
Subject: [PATCH 566/676] Get rid of QOpenGLWidget in main_window_mac

ui_window_mac has logic depending on Qt version to use Metal when possible, this will conflict once Qt is updated to 6.4+
---
 Telegram/SourceFiles/platform/mac/main_window_mac.mm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 71096fac0..6110d4ce8 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -238,7 +238,6 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 : Window::MainWindow(controller)
 , _private(std::make_unique<Private>(this))
 , psMainMenu(this) {
-	auto forceOpenGL = std::make_unique<QOpenGLWidget>(this);
 	_hideAfterFullScreenTimer.setCallback([this] { hideAndDeactivate(); });
 }
 

From 6408ab2c008a435b3116025ee99fb733814a5718 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 23 Mar 2022 13:47:31 +0400
Subject: [PATCH 567/676] Bring back vaapi/vdpau support to Dockerfile

---
 Telegram/build/docker/centos_env/Dockerfile | 30 ++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 121afb690..f0770e501 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -26,7 +26,7 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
 		autoconf automake libtool patch gperf flex \
 		fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
 		pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel \
-		libdrm-devel vulkan-devel boost169-devel fmt-devel \
+		libdrm-devel vulkan-devel libva-devel libvdpau-devel boost169-devel fmt-devel \
 		gtk3-devel perl-XML-Parser pkgconfig bison yasm file which xorg-x11-util-macros \
 		devtoolset-10-make devtoolset-10-gcc devtoolset-10-gcc-c++ \
 		devtoolset-10-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \
@@ -420,6 +420,17 @@ RUN git clone -b libXfixes-5.0.3 --depth=1 {{ GIT_FREEDESKTOP }}/libxfixes.git \
 	&& cd .. \
 	&& rm -rf libxfixes
 
+FROM builder AS libXv
+COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
+
+RUN git clone -b libXv-1.0.12 --depth=1 {{ GIT_FREEDESKTOP }}/libxv.git \
+	&& cd libxv \
+	&& ./autogen.sh --enable-static \
+	&& make -j$(nproc) \
+	&& make DESTDIR="{{ LibrariesPath }}/libXv-cache" install \
+	&& cd .. \
+	&& rm -rf libxv
+
 FROM builder AS libXrandr
 RUN git clone -b libXrandr-1.5.2 --depth=1 {{ GIT_FREEDESKTOP }}/libxrandr.git \
 	&& cd libxrandr \
@@ -482,6 +493,8 @@ FROM builder AS ffmpeg
 COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
 COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
 COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
+COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
+COPY --link --from=libXv {{ LibrariesPath }}/libXv-cache /
 COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache /
 
 RUN git init ffmpeg \
@@ -503,15 +516,29 @@ RUN git init ffmpeg \
 		--enable-libdav1d \
 		--enable-libopus \
 		--enable-libvpx \
+		--enable-vaapi \
+		--enable-vdpau \
+		--enable-xlib \
+		--enable-libdrm \
 		--enable-ffnvcodec \
 		--enable-nvdec \
 		--enable-cuvid \
 		--enable-protocol=file \
+		--enable-hwaccel=av1_vaapi \
 		--enable-hwaccel=av1_nvdec \
+		--enable-hwaccel=h264_vaapi \
+		--enable-hwaccel=h264_vdpau \
 		--enable-hwaccel=h264_nvdec \
+		--enable-hwaccel=hevc_vaapi \
+		--enable-hwaccel=hevc_vdpau \
 		--enable-hwaccel=hevc_nvdec \
+		--enable-hwaccel=mpeg2_vaapi \
+		--enable-hwaccel=mpeg2_vdpau \
 		--enable-hwaccel=mpeg2_nvdec \
+		--enable-hwaccel=mpeg4_vaapi \
+		--enable-hwaccel=mpeg4_vdpau \
 		--enable-hwaccel=mpeg4_nvdec \
+		--enable-hwaccel=vp8_vaapi \
 		--enable-hwaccel=vp8_nvdec \
 		--enable-decoder=aac \
 		--enable-decoder=aac_fixed \
@@ -839,6 +866,7 @@ COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache /
 COPY --link --from=xcb-cursor {{ LibrariesPath }}/xcb-cursor-cache /
 COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
 COPY --link --from=libXfixes {{ LibrariesPath }}/libXfixes-cache /
+COPY --link --from=libXv {{ LibrariesPath }}/libXv-cache /
 COPY --link --from=libXtst {{ LibrariesPath }}/libXtst-cache /
 COPY --link --from=libXrandr {{ LibrariesPath }}/libXrandr-cache /
 COPY --link --from=libXrender {{ LibrariesPath }}/libXrender-cache /

From 249f0890dff2f3a0e3677affacc0bd23dd3b68c6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 31 May 2023 08:28:00 +0400
Subject: [PATCH 568/676] Add implib support

---
 CMakeLists.txt | 7 ++++---
 cmake          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e456192cd..2979473c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,9 +19,9 @@ include(cmake/validate_special_target.cmake)
 include(cmake/version.cmake)
 desktop_app_parse_version(Telegram/build/version)
 
-set(project_langs C CXX)
+set(project_langs ASM C CXX)
 if (APPLE)
-    set(project_langs C CXX OBJC OBJCXX)
+    list(APPEND project_langs OBJC OBJCXX)
 endif()
 
 project(Telegram
@@ -43,9 +43,10 @@ endif()
 include(cmake/variables.cmake)
 include(cmake/nice_target_sources.cmake)
 include(cmake/target_compile_options_if_exists.cmake)
+include(cmake/target_link_frameworks.cmake)
+include(cmake/target_link_optional_libraries.cmake)
 include(cmake/target_link_options_if_exists.cmake)
 include(cmake/target_link_static_libraries.cmake)
-include(cmake/target_link_frameworks.cmake)
 include(cmake/init_target.cmake)
 include(cmake/generate_target.cmake)
 include(cmake/nuget.cmake)
diff --git a/cmake b/cmake
index 92e35993a..ae0986c9e 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 92e35993aa437ee212f677c96a717078124cfd65
+Subproject commit ae0986c9efd28c61783cfe106f8bd1b0ba3b3920

From 404ce2e011bff0c60c4c4a08428b7196cfbf33b6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 31 May 2023 08:27:47 +0400
Subject: [PATCH 569/676] Add check for vaapi/vdpau libraries before loading
 them with implib

---
 .../SourceFiles/ffmpeg/ffmpeg_utility.cpp     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index d1642c0d4..0d166a1e3 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -18,6 +18,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 extern "C" {
 #include <libavutil/opt.h>
+#if !defined DESKTOP_APP_USE_PACKAGED && !defined Q_OS_WIN && !defined Q_OS_MAC
+#include <dlfcn.h>
+#endif // !DESKTOP_APP_USE_PACKAGED && !Q_OS_WIN && !Q_OS_MAC
 } // extern "C"
 
 namespace FFmpeg {
@@ -85,6 +88,47 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
 #endif // LIB_FFMPEG_USE_QT_PRIVATE_API
 }
 
+#if !defined DESKTOP_APP_USE_PACKAGED && !defined Q_OS_WIN && !defined Q_OS_MAC
+[[nodiscard]] auto CheckHwLibs() {
+	auto list = std::deque{
+		AV_PIX_FMT_CUDA,
+	};
+	const auto vdpau = [&] {
+		if (const auto handle = dlopen("libvdpau.so.1", RTLD_LAZY)) {
+			dlclose(handle);
+		}
+		if (dlerror()) {
+			return false;
+		}
+		return true;
+	}();
+	if (vdpau) {
+		list.push_front(AV_PIX_FMT_VDPAU);
+	}
+	const auto va = [&] {
+		const auto list = std::array{
+			"libva-drm.so.1",
+			"libva-x11.so.1",
+			"libva.so.1",
+			"libdrm.so.2",
+		};
+		for (const auto lib : list) {
+			if (const auto handle = dlopen(lib, RTLD_LAZY)) {
+				dlclose(handle);
+			}
+			if (dlerror()) {
+				return false;
+			}
+		}
+		return true;
+	}();
+	if (va) {
+		list.push_front(AV_PIX_FMT_VAAPI);
+	}
+	return list;
+}
+#endif // !DESKTOP_APP_USE_PACKAGED && !Q_OS_WIN && !Q_OS_MAC
+
 [[nodiscard]] bool InitHw(AVCodecContext *context, AVHWDeviceType type) {
 	AVCodecContext *parent = static_cast<AVCodecContext*>(context->opaque);
 
@@ -125,6 +169,9 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
 		}
 		return false;
 	};
+#if !defined DESKTOP_APP_USE_PACKAGED && !defined Q_OS_WIN && !defined Q_OS_MAC
+	static const auto list = CheckHwLibs();
+#else // !DESKTOP_APP_USE_PACKAGED && !Q_OS_WIN && !Q_OS_MAC
 	const auto list = std::array{
 #ifdef Q_OS_WIN
 		AV_PIX_FMT_D3D11,
@@ -138,6 +185,7 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
 		AV_PIX_FMT_CUDA,
 #endif // Q_OS_WIN || Q_OS_MAC
 	};
+#endif // DESKTOP_APP_USE_PACKAGED || Q_OS_WIN || Q_OS_MAC
 	for (const auto format : list) {
 		if (!has(format)) {
 			continue;

From f7bff01793b622fc7f017fdd102ffbb149c19a83 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 6 Mar 2023 06:16:42 +0400
Subject: [PATCH 570/676] Fullscreen hack for Windows 11 native resize

---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp     | 5 ++++-
 Telegram/lib_ui                                              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index d0e19936a..fb30c3b4d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -900,7 +900,7 @@ void OverlayWidget::savePosition() {
 
 void OverlayWidget::updateGeometry(bool inMove) {
 	initFullScreen();
-	if (_fullscreen) {
+	if (_fullscreen && (!Platform::IsWindows11OrGreater() || !isHidden())) {
 		updateGeometryToScreen(inMove);
 	} else if (_windowed && _normalGeometryInited) {
 		_window->setGeometry(_normalGeometry);
@@ -3535,6 +3535,9 @@ void OverlayWidget::showAndActivate() {
 		_wasWindowedMode = true;
 	} else if (_fullscreen) {
 		_window->showFullScreen();
+		if (Platform::IsWindows11OrGreater()) {
+			updateGeometry();
+		}
 	} else {
 		_window->showMaximized();
 	}
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b49ee81df..4a41346a6 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b49ee81df9d285d08ef6bf834c6e14c5064b4070
+Subproject commit 4a41346a6428571ec57422ea86e426f252c8ce39

From 18fc09c8e7d4d0a329be9c8898218ece0dc87ebe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 22:20:45 +0200
Subject: [PATCH 571/676] Improve top resize area on Windows 11.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 4a41346a6..2631d64a5 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 4a41346a6428571ec57422ea86e426f252c8ce39
+Subproject commit 2631d64a5f11a084457210fe2419f42a5f15f7ae

From 7ee90287836551869a0aacf9c29c30102444a203 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 22:24:16 +0200
Subject: [PATCH 572/676] Beta version 4.8.11.

- Fix initial video playback speed.
- Use native window resize on Windows 11.
- Fix memory leak in Direct3D 11 media viewer on Windows.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/changelogs.cpp     | 10 +++++++++-
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 10 +++++-----
 changelog.txt                                |  6 ++++++
 7 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 9e1d43480..0fabf4cf8 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.8.10.0" />
+    Version="4.8.11.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 275685f7c..96d019b4e 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,8,10,0
- PRODUCTVERSION 4,8,10,0
+ FILEVERSION 4,8,11,0
+ PRODUCTVERSION 4,8,11,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.10.0"
+            VALUE "FileVersion", "4.8.11.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.10.0"
+            VALUE "ProductVersion", "4.8.11.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index e7bd1d0dc..14efb90a5 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,8,10,0
- PRODUCTVERSION 4,8,10,0
+ FILEVERSION 4,8,11,0
+ PRODUCTVERSION 4,8,11,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.10.0"
+            VALUE "FileVersion", "4.8.11.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.10.0"
+            VALUE "ProductVersion", "4.8.11.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index a3eeafb31..957b83f18 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -125,7 +125,15 @@ std::map<int, const char*> BetaLogs() {
 		"- Fix several possible crashes.\n"
 
 		"- Deprecate macOS 10.12, Ubuntu 18.04 and CentOS 7 in July.\n"
-	}
+	},
+	{
+		4008011,
+		"- Fix initial video playback speed.\n"
+
+		"- Use native window resize on Windows 11.\n"
+
+		"- Fix memory leak in Direct3D 11 media viewer on Windows.\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 6bbf2904d..cee5c672d 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 = 4008010;
-constexpr auto AppVersionStr = "4.8.10";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 4008011;
+constexpr auto AppVersionStr = "4.8.11";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index f7062fb28..41c79ecaa 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008010
+AppVersion         4008011
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.10
-AppVersionStr      4.8.10
-BetaChannel        0
+AppVersionStrSmall 4.8.11
+AppVersionStr      4.8.11
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.8.10
+AppVersionOriginal 4.8.11.beta
diff --git a/changelog.txt b/changelog.txt
index 28384f4b3..7fd07c141 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+4.8.11 beta (10.08.23)
+
+- Fix initial video playback speed.
+- Use native window resize on Windows 11.
+- Fix memory leak in Direct3D 11 media viewer on Windows.
+
 4.8.10 (28.07.23)
 
 - Send story sharing comments as separate messages.

From 8cc3eb4bfed06195d971885d11430229b48cc1d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 10:22:27 +0200
Subject: [PATCH 573/676] Change default URL scheme to https.

Fixes #26499.
---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 2631d64a5..18ac9868b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 2631d64a5f11a084457210fe2419f42a5f15f7ae
+Subproject commit 18ac9868bb24801c6d4bf7bd5d1e6197add2f4b4

From 58c91be156960fda0e1a010060c32389a71c0107 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 11:41:58 +0200
Subject: [PATCH 574/676] Fix location links with Bing Maps uninstalled.

Fixes #26506.
---
 Telegram/SourceFiles/platform/win/specific_win.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index f8c3e8074..0da6adae9 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -683,7 +683,10 @@ bool psLaunchMaps(const Data::LocationPoint &point) {
 		AT_URLPROTOCOL,
 		AL_EFFECTIVE,
 		handler.put());
-	if (FAILED(result) || !handler) {
+	if (FAILED(result)
+		|| !handler
+		|| !handler.data()
+		|| std::wstring(handler.data()) == L"bingmaps") {
 		return false;
 	}
 

From ff2df4b1e5f55014990775761d64305fb51db02a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 12:53:10 +0200
Subject: [PATCH 575/676] Beta version 4.8.12. (macOS only)

- Fix crash in file attachments by a full rebuild 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                                | 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 0fabf4cf8..05e0aa48e 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.8.11.0" />
+    Version="4.8.12.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 96d019b4e..8b33fbbbd 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,8,11,0
- PRODUCTVERSION 4,8,11,0
+ FILEVERSION 4,8,12,0
+ PRODUCTVERSION 4,8,12,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.8.11.0"
+            VALUE "FileVersion", "4.8.12.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.11.0"
+            VALUE "ProductVersion", "4.8.12.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 14efb90a5..c86c3585e 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,8,11,0
- PRODUCTVERSION 4,8,11,0
+ FILEVERSION 4,8,12,0
+ PRODUCTVERSION 4,8,12,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.8.11.0"
+            VALUE "FileVersion", "4.8.12.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.11.0"
+            VALUE "ProductVersion", "4.8.12.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index cee5c672d..13716a5c1 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 = 4008011;
-constexpr auto AppVersionStr = "4.8.11";
+constexpr auto AppVersion = 4008012;
+constexpr auto AppVersionStr = "4.8.12";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 41c79ecaa..a9da6aa89 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008011
+AppVersion         4008012
 AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.11
-AppVersionStr      4.8.11
+AppVersionStrSmall 4.8.12
+AppVersionStr      4.8.12
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 4.8.11.beta
+AppVersionOriginal 4.8.12.beta
diff --git a/changelog.txt b/changelog.txt
index 7fd07c141..c0521d01f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.8.12 beta (11.08.23)
+
+- Fix crash by a full rebuild on macOS.
+
 4.8.11 beta (10.08.23)
 
 - Fix initial video playback speed.

From 238d4b8e173f0f5bf61ed1d6960fe6edf65f0d04 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 15 Aug 2023 00:20:59 +0400
Subject: [PATCH 576/676] Build OpenAL in RelWithDebInfo mode on macOS

---
 Telegram/build/prepare/prepare.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 1b8a37c47..86f88dc49 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1077,6 +1077,7 @@ mac:
     cd openal-soft
     git checkout 716f5373cb
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -B build . \\
+        -D CMAKE_BUILD_TYPE=RelWithDebInfo \\
         -D CMAKE_INSTALL_PREFIX:PATH=$USED_PREFIX \\
         -D ALSOFT_EXAMPLES=OFF \\
         -D ALSOFT_UTILS=OFF \\

From 717041a462b430f13d9bc1a900f29a9e1f9ba8fb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 11 Aug 2023 15:23:27 +0300
Subject: [PATCH 577/676] Added ripple animation to message replies.

---
 .../history/history_item_components.cpp       | 20 +++++-
 .../history/history_item_components.h         |  6 ++
 .../history/view/history_view_message.cpp     | 62 ++++++++++++++++++-
 .../history/view/history_view_message.h       |  3 +-
 .../history/view/media/history_view_gif.cpp   | 12 +++-
 .../media/history_view_media_unwrapped.cpp    | 14 ++++-
 6 files changed, 111 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 05289283e..dc648b811 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -508,6 +508,8 @@ void HistoryMessageReply::paint(
 	const auto stm = context.messageStyle();
 
 	{
+		const auto opacity = p.opacity();
+		const auto outerWidth = w + 2 * x;
 		const auto &bar = !inBubble
 			? st->msgImgReplyBarColor()
 			: replyToColorKey
@@ -518,8 +520,22 @@ void HistoryMessageReply::paint(
 			y + st::msgReplyPadding.top() + st::msgReplyBarPos.y(),
 			st::msgReplyBarSize.width(),
 			st::msgReplyBarSize.height(),
-			w + 2 * x);
-		const auto opacity = p.opacity();
+			outerWidth);
+
+		if (ripple.animation) {
+			const auto colorOverride = &stm->msgWaveformInactive->c;
+			p.setOpacity(st::historyPollRippleOpacity);
+			ripple.animation->paint(
+				p,
+				x - st::msgReplyPadding.left(),
+				y,
+				outerWidth,
+				colorOverride);
+			if (ripple.animation->empty()) {
+				ripple.animation.reset();
+			}
+		}
+
 		p.setOpacity(opacity * kBarAlpha);
 		p.fillRect(rbar, bar);
 		p.setOpacity(opacity);
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 5a8db07c9..e743932b9 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "spellcheck/spellcheck_types.h" // LanguageId.
 #include "ui/empty_userpic.h"
 #include "ui/effects/animations.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/chat/message_bubble.h"
 
 struct WebPageData;
@@ -307,6 +308,11 @@ struct HistoryMessageReply
 	bool topicPost = false;
 	bool storyReply = false;
 
+	struct final {
+		mutable std::unique_ptr<Ui::RippleAnimation> animation;
+		QPoint lastPoint;
+	} ripple;
+
 };
 
 struct HistoryMessageTranslation
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index ad06f53c4..d3ea404c6 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1600,6 +1600,8 @@ void Message::clickHandlerPressedChanged(
 		toggleTopicButtonRipple(pressed);
 	} else if (_viewButton) {
 		_viewButton->checkLink(handler, pressed);
+	} else if (const auto reply = displayedReply()) {
+		toggleReplyRipple(pressed);
 	}
 }
 
@@ -1639,6 +1641,58 @@ void Message::toggleRightActionRipple(bool pressed) {
 	}
 }
 
+void Message::toggleReplyRipple(bool pressed) {
+	const auto reply = displayedReply();
+	if (!reply) {
+		return;
+	}
+
+	if (pressed) {
+		if (!reply->ripple.animation && !unwrapped()) {
+			const auto smallTop = displayFromName()
+				|| displayedTopicButton()
+				|| displayForwardedFrom();
+			const auto rounding = countBubbleRounding();
+
+			using Corner = Ui::BubbleCornerRounding;
+			using Radius = Ui::CachedCornerRadius;
+			const auto &small = Ui::CachedCornersMasks(Radius::ThumbSmall);
+			const auto &large = Ui::CachedCornersMasks(Radius::ThumbLarge);
+			const auto corners = std::array<QImage, 4>{{
+				((smallTop || (rounding.topLeft == Corner::Small))
+					? small
+					: large)[0],
+				((smallTop || (rounding.topRight == Corner::Small))
+					? small
+					: large)[1],
+				small[2],
+				small[3],
+			}};
+
+			const auto &padding = st::msgReplyPadding;
+			const auto geometry = countGeometry();
+			const auto size = QSize(
+				geometry.width()
+					- padding.left() / 2
+					- padding.right(),
+				st::msgReplyBarSize.height()
+					+ padding.top()
+					+ padding.bottom());
+			reply->ripple.animation = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				Images::Round(
+					Ui::RippleAnimation::MaskByDrawer(size, true, nullptr),
+					corners),
+				[=] { repaint(); });
+		}
+		if (reply->ripple.animation) {
+			reply->ripple.animation->add(reply->ripple.lastPoint);
+		}
+	} else if (reply->ripple.animation) {
+		reply->ripple.animation->lastStop();
+	}
+}
+
 BottomRippleMask Message::bottomRippleMask(int buttonHeight) const {
 	using namespace Ui;
 	using namespace Images;
@@ -2268,9 +2322,15 @@ bool Message::getStateReplyInfo(
 	if (auto reply = displayedReply()) {
 		int32 h = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
 		if (point.y() >= trect.top() && point.y() < trect.top() + h) {
+			const auto g = QRect(
+				trect.x(),
+				trect.y() + st::msgReplyPadding.top(),
+				trect.width(),
+				st::msgReplyBarSize.height());
 			if ((reply->replyToMsg || reply->replyToStory)
-				&& QRect(trect.x(), trect.y() + st::msgReplyPadding.top(), trect.width(), st::msgReplyBarSize.height()).contains(point)) {
+				&& g.contains(point)) {
 				outResult->link = reply->replyToLink();
+				reply->ripple.lastPoint = point - g.topLeft();
 			}
 			return true;
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index f9fd8afa7..2c0ebaf0e 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -187,7 +187,8 @@ private:
 	void createTopicButtonRipple();
 
 	void toggleRightActionRipple(bool pressed);
-	void createRightActionRipple();
+
+	void toggleReplyRipple(bool pressed);
 
 	void paintCommentsButton(
 		Painter &p,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 0bee2fbf0..074f89dab 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -1064,8 +1064,18 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 			recth -= skip;
 		}
 		if (reply) {
-			if (QRect(rectx, recty, rectw, recth).contains(point)) {
+			const auto replyRect = QRect(rectx, recty, rectw, recth);
+			if (replyRect.contains(point)) {
 				result.link = reply->replyToLink();
+				reply->ripple.lastPoint = point - replyRect.topLeft();
+				if (!reply->ripple.animation) {
+					reply->ripple.animation = std::make_unique<Ui::RippleAnimation>(
+						st::defaultRippleAnimation,
+						Ui::RippleAnimation::RoundRectMask(
+							replyRect.size(),
+							st::roundRadiusSmall),
+						[=] { item->history()->owner().requestItemRepaint(item); });
+				}
 				return result;
 			}
 		}
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 cd3674de1..3348a1855 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/media/history_view_media_unwrapped.h"
 
+#include "data/data_session.h"
+#include "history/history.h"
 #include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/history_view_element.h"
@@ -460,8 +462,18 @@ TextState UnwrappedMedia::textState(QPoint point, StateRequest request) const {
 					recth -= skip;
 				}
 				if (reply) {
-					if (QRect(rectx, recty, rectw, recth).contains(point)) {
+					const auto replyRect = QRect(rectx, recty, rectw, recth);
+					if (replyRect.contains(point)) {
 						result.link = reply->replyToLink();
+						reply->ripple.lastPoint = point - replyRect.topLeft();
+						if (!reply->ripple.animation) {
+							reply->ripple.animation = std::make_unique<Ui::RippleAnimation>(
+								st::defaultRippleAnimation,
+								Ui::RippleAnimation::RoundRectMask(
+									replyRect.size(),
+									st::roundRadiusSmall),
+								[=] { item->history()->owner().requestItemRepaint(item); });
+						}
 						return result;
 					}
 				}

From 8a24f33c062d63920736e7877b01450766adb972 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 11 Aug 2023 16:27:17 +0300
Subject: [PATCH 578/676] Added warning of limitation on excluding chats from
 filter from menu.

---
 .../SourceFiles/boxes/choose_filter_box.cpp   | 31 ++++++++++---------
 .../SourceFiles/boxes/choose_filter_box.h     |  4 ++-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.cpp b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
index 416b30ff1..181dccb1e 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
@@ -70,8 +70,6 @@ void ChangeFilterById(
 			MTP_int(filter.id()),
 			filter.tl()
 		)).done([=, chat = history->peer->name(), name = filter.title()] {
-			// Since only the primary window has dialogs list,
-			// We can safely show toast there.
 			const auto account = &history->session().account();
 			if (const auto controller = Core::App().windowFor(account)) {
 				controller->showToast((add
@@ -120,17 +118,19 @@ bool ChooseFilterValidator::canRemove(FilterId filterId) const {
 }
 
 ChooseFilterValidator::LimitData ChooseFilterValidator::limitReached(
-		FilterId filterId) const {
+		FilterId filterId,
+		bool always) const {
 	Expects(filterId != 0);
 
 	const auto list = _history->owner().chatsFilters().list();
 	const auto i = ranges::find(list, filterId, &Data::ChatFilter::id);
 	const auto limit = _history->owner().pinnedChatsLimit(filterId);
+	const auto &chatsList = always ? i->always() : i->never();
 	return {
 		.reached = (i != end(list))
-			&& !ranges::contains(i->always(), _history)
-			&& (i->always().size() >= limit),
-		.count = int(i->always().size()),
+			&& !ranges::contains(chatsList, _history)
+			&& (chatsList.size() >= limit),
+		.count = int(chatsList.size()),
 	};
 }
 
@@ -156,18 +156,21 @@ void FillChooseFilterMenu(
 
 		const auto contains = filter.contains(history);
 		const auto action = menu->addAction(filter.title(), [=] {
-			if (filter.contains(history)) {
-				if (validator.canRemove(id)) {
-					validator.remove(id);
-				}
-			} else if (const auto r = validator.limitReached(id); r.reached) {
+			const auto toAdd = !filter.contains(history);
+			const auto r = validator.limitReached(id, toAdd);
+			if (r.reached) {
 				controller->show(Box(
 					FilterChatsLimitBox,
 					&controller->session(),
 					r.count,
-					true));
-			} else if (validator.canAdd()) {
-				validator.add(id);
+					toAdd));
+				return;
+			} else if (toAdd ? validator.canAdd() : validator.canRemove(id)) {
+				if (toAdd) {
+					validator.add(id);
+				} else {
+					validator.remove(id);
+				}
 			}
 		}, contains ? &st::mediaPlayerMenuCheck : nullptr);
 		action->setEnabled(contains
diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.h b/Telegram/SourceFiles/boxes/choose_filter_box.h
index 8e32b267c..e6c5ad335 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.h
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.h
@@ -27,7 +27,9 @@ public:
 
 	[[nodiscard]] bool canAdd() const;
 	[[nodiscard]] bool canRemove(FilterId filterId) const;
-	[[nodiscard]] LimitData limitReached(FilterId filterId) const;
+	[[nodiscard]] LimitData limitReached(
+		FilterId filterId,
+		bool always) const;
 
 	void add(FilterId filterId) const;
 	void remove(FilterId filterId) const;

From 5575d50277d46d986b0098ce0c535365683c60d0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 31 Jul 2023 18:57:51 +0200
Subject: [PATCH 579/676] Update API scheme to layer161.

---
 .../SourceFiles/api/api_blocked_peers.cpp     |  3 ++
 Telegram/SourceFiles/api/api_updates.cpp      |  2 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 33 ++++++++++++-------
 Telegram/SourceFiles/mtproto/scheme/layer.tl  |  2 +-
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_blocked_peers.cpp b/Telegram/SourceFiles/api/api_blocked_peers.cpp
index bf3a061e8..9dfc886b1 100644
--- a/Telegram/SourceFiles/api/api_blocked_peers.cpp
+++ b/Telegram/SourceFiles/api/api_blocked_peers.cpp
@@ -79,6 +79,7 @@ void BlockedPeers::block(not_null<PeerData*> peer) {
 			Data::PeerUpdate::Flag::IsBlocked);
 	} else if (_blockRequests.find(peer) == end(_blockRequests)) {
 		const auto requestId = _api.request(MTPcontacts_Block(
+			MTP_flags(0),
 			peer->input
 		)).done([=] {
 			_blockRequests.erase(peer);
@@ -111,6 +112,7 @@ void BlockedPeers::unblock(
 		return;
 	}
 	const auto requestId = _api.request(MTPcontacts_Unblock(
+		MTP_flags(0),
 		peer->input
 	)).done([=] {
 		_blockRequests.erase(peer);
@@ -163,6 +165,7 @@ void BlockedPeers::request(int offset, Fn<void(BlockedPeers::Slice)> onDone) {
 		return;
 	}
 	_requestId = _api.request(MTPcontacts_GetBlocked(
+		MTP_flags(0),
 		MTP_int(offset),
 		MTP_int(offset ? kBlockedPerPage : kBlockedFirstSlice)
 	)).done([=](const MTPcontacts_Blocked &result) {
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 3d7584a64..c2a1399da 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1987,7 +1987,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updatePeerBlocked: {
 		const auto &d = update.c_updatePeerBlocked();
 		if (const auto peer = session().data().peerLoaded(peerFromMTP(d.vpeer_id()))) {
-			peer->setIsBlocked(mtpIsTrue(d.vblocked()));
+			peer->setIsBlocked(d.is_blocked());
 		}
 	} break;
 
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 9c54c97bc..c2e1a6481 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -221,7 +221,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#4fe1cc86 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?UserStories = UserFull;
+userFull#4fe1cc86 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?UserStories = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -350,7 +350,7 @@ updatePhoneCallSignalingData#2661bf09 phone_call_id:long data:bytes = Update;
 updateChannelMessageForwards#d29a27f4 channel_id:long id:int forwards:int = Update;
 updateReadChannelDiscussionInbox#d6b19546 flags:# channel_id:long top_msg_id:int read_max_id:int broadcast_id:flags.0?long broadcast_post:flags.0?int = Update;
 updateReadChannelDiscussionOutbox#695c9e7c channel_id:long top_msg_id:int read_max_id:int = Update;
-updatePeerBlocked#246a4b22 peer_id:Peer blocked:Bool = Update;
+updatePeerBlocked#ebe07752 flags:# blocked:flags.0?true blocked_my_stories_from:flags.1?true peer_id:Peer = Update;
 updateChannelUserTyping#8c88c923 flags:# channel_id:long top_msg_id:flags.0?int from_id:Peer action:SendMessageAction = Update;
 updatePinnedMessages#ed85eab5 flags:# pinned:flags.0?true peer:Peer messages:Vector<int> pts:int pts_count:int = Update;
 updatePinnedChannelMessages#5bb98608 flags:# pinned:flags.0?true channel_id:long messages:Vector<int> pts:int pts_count:int = Update;
@@ -385,6 +385,7 @@ updateGroupInvitePrivacyForbidden#ccf08ad6 user_id:long = Update;
 updateStory#205a4133 user_id:long story:StoryItem = Update;
 updateReadStories#feb5345a user_id:long max_id:int = Update;
 updateStoryID#1bf335b9 id:int random_id:long = Update;
+updateStoriesStealthMode#2c084dc1 stealth_mode:StoriesStealthMode = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -1530,18 +1531,18 @@ storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long>
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#ffadc913 flags:# close_friends:flags.8?true id:int date:int expire_date:int = StoryItem;
-storyItem#562aa637 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItem#945953ba flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia media_areas:flags.14?Vector<MediaArea> privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
-stories.allStoriesNotModified#47e0a07e state:string = stories.AllStories;
-stories.allStories#839e0428 flags:# has_more:flags.0?true count:int state:string user_stories:Vector<UserStories> users:Vector<User> = stories.AllStories;
+stories.allStoriesNotModified#1158fe3e flags:# state:string stealth_mode:StoriesStealthMode = stories.AllStories;
+stories.allStories#519d899e flags:# has_more:flags.0?true count:int state:string user_stories:Vector<UserStories> users:Vector<User> stealth_mode:StoriesStealthMode = stories.AllStories;
 
 stories.stories#4fe57df1 count:int stories:Vector<StoryItem> users:Vector<User> = stories.Stories;
 
 stories.userStories#37a6ff5f stories:UserStories users:Vector<User> = stories.UserStories;
 
-storyView#a71aacc2 user_id:long date:int = StoryView;
+storyView#d0b0a7de flags:# blocked:flags.0?true blocked_my_stories_from:flags.1?true user_id:long date:int = StoryView;
 
 stories.storyViewsList#fb3f77ac count:int views:Vector<StoryView> users:Vector<User> = stories.StoryViewsList;
 
@@ -1552,6 +1553,14 @@ inputReplyToStory#15b0f283 user_id:InputUser story_id:int = InputReplyTo;
 
 exportedStoryLink#3fc9053b link:string = ExportedStoryLink;
 
+storiesStealthMode#712e27fd flags:# active_until_date:flags.0?int cooldown_until_date:flags.1?int = StoriesStealthMode;
+
+mediaAreaCoordinates#3d1ea4e x:double y:double w:double h:double rotation:double = MediaAreaCoordinates;
+
+mediaAreaVenue#be82db9c coordinates:MediaAreaCoordinates geo:GeoPoint title:string address:string provider:string venue_id:string venue_type:string = MediaArea;
+inputMediaAreaVenue#b282217f coordinates:MediaAreaCoordinates query_id:long result_id:string = MediaArea;
+mediaAreaGeoPoint#df8b3b22 coordinates:MediaAreaCoordinates geo:GeoPoint = MediaArea;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1685,9 +1694,9 @@ contacts.getContacts#5dd69e12 hash:long = contacts.Contacts;
 contacts.importContacts#2c800be5 contacts:Vector<InputContact> = contacts.ImportedContacts;
 contacts.deleteContacts#96a0e00 id:Vector<InputUser> = Updates;
 contacts.deleteByPhones#1013fd9e phones:Vector<string> = Bool;
-contacts.block#68cc1411 id:InputPeer = Bool;
-contacts.unblock#bea65d50 id:InputPeer = Bool;
-contacts.getBlocked#f57c350f offset:int limit:int = contacts.Blocked;
+contacts.block#2e2e8734 flags:# my_stories_from:flags.0?true id:InputPeer = Bool;
+contacts.unblock#b550d328 flags:# my_stories_from:flags.0?true id:InputPeer = Bool;
+contacts.getBlocked#9a868f80 flags:# my_stories_from:flags.0?true offset:int limit:int = contacts.Blocked;
 contacts.search#11f812d8 q:string limit:int = contacts.Found;
 contacts.resolveUsername#f93ccba3 username:string = contacts.ResolvedPeer;
 contacts.getTopPeers#973478b6 flags:# correspondents:flags.0?true bots_pm:flags.1?true bots_inline:flags.2?true phone_calls:flags.3?true forward_users:flags.4?true forward_chats:flags.5?true groups:flags.10?true channels:flags.15?true offset:int limit:int hash:long = contacts.TopPeers;
@@ -1704,6 +1713,7 @@ contacts.exportContactToken#f8654027 = ExportedContactToken;
 contacts.importContactToken#13005788 token:string = User;
 contacts.editCloseFriends#ba6705f0 id:Vector<long> = Bool;
 contacts.toggleStoriesHidden#753fb865 id:InputUser hidden:Bool = Bool;
+contacts.setBlocked#94c65c76 flags:# my_stories_from:flags.0?true id:Vector<InputPeer> limit:int = Bool;
 
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0f4cb4f flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.Dialogs;
@@ -2088,8 +2098,8 @@ chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
 chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
-stories.sendStory#424cd47a flags:# pinned:flags.2?true noforwards:flags.4?true media:InputMedia caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int = Updates;
-stories.editStory#2aae7a41 flags:# id:int media:flags.0?InputMedia caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
+stories.sendStory#d455fcec flags:# pinned:flags.2?true noforwards:flags.4?true media:InputMedia media_areas:flags.5?Vector<MediaArea> caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int = Updates;
+stories.editStory#a9b91ae4 flags:# id:int media:flags.0?InputMedia media_areas:flags.3?Vector<MediaArea> caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
 stories.deleteStories#b5d501d7 id:Vector<int> = Vector<int>;
 stories.togglePinned#51602944 id:Vector<int> pinned:Bool = Vector<int>;
 stories.getAllStories#eeb0d625 flags:# next:flags.1?true hidden:flags.2?true state:flags.0?string = stories.AllStories;
@@ -2105,3 +2115,4 @@ stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:i
 stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
 stories.exportStoryLink#16e443ce user_id:InputUser id:int = ExportedStoryLink;
 stories.report#c95be06a user_id:InputUser id:Vector<int> reason:ReportReason message:string = Bool;
+stories.activateStealthMode#11d7ddae flags:# past:flags.0?true future:flags.1?true = Bool;
diff --git a/Telegram/SourceFiles/mtproto/scheme/layer.tl b/Telegram/SourceFiles/mtproto/scheme/layer.tl
index 5e910a52b..2f8c6ce82 100644
--- a/Telegram/SourceFiles/mtproto/scheme/layer.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/layer.tl
@@ -1 +1 @@
-// LAYER 160
+// LAYER 161

From c12297d8cb7a3cf16c6ebefdb32ce2072f0879a3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Aug 2023 19:09:09 +0200
Subject: [PATCH 580/676] Implement stealth mode in stories.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../icons/mediaview/download_locked.png       | Bin 0 -> 508 bytes
 .../icons/mediaview/download_locked@2x.png    | Bin 0 -> 915 bytes
 .../icons/mediaview/download_locked@3x.png    | Bin 0 -> 1313 bytes
 .../Resources/icons/menu/download_locked.png  | Bin 0 -> 516 bytes
 .../icons/menu/download_locked@2x.png         | Bin 0 -> 870 bytes
 .../icons/menu/download_locked@3x.png         | Bin 0 -> 1226 bytes
 Telegram/Resources/icons/menu/stealth.png     | Bin 0 -> 635 bytes
 Telegram/Resources/icons/menu/stealth@2x.png  | Bin 0 -> 1237 bytes
 Telegram/Resources/icons/menu/stealth@3x.png  | Bin 0 -> 1762 bytes
 .../Resources/icons/menu/stealth_locked.png   | Bin 0 -> 726 bytes
 .../icons/menu/stealth_locked@2x.png          | Bin 0 -> 1457 bytes
 .../icons/menu/stealth_locked@3x.png          | Bin 0 -> 2123 bytes
 .../stories_next.png => stories/next.png}     | Bin
 .../next@2x.png}                              | Bin
 .../next@3x.png}                              | Bin
 .../Resources/icons/stories/stealth_25m.png   | Bin 0 -> 885 bytes
 .../icons/stories/stealth_25m@2x.png          | Bin 0 -> 1778 bytes
 .../icons/stories/stealth_25m@3x.png          | Bin 0 -> 2566 bytes
 .../Resources/icons/stories/stealth_5m.png    | Bin 0 -> 791 bytes
 .../Resources/icons/stories/stealth_5m@2x.png | Bin 0 -> 1568 bytes
 .../Resources/icons/stories/stealth_5m@3x.png | Bin 0 -> 2309 bytes
 .../Resources/icons/stories/stealth_logo.png  | Bin 0 -> 1463 bytes
 .../icons/stories/stealth_logo@2x.png         | Bin 0 -> 2836 bytes
 .../icons/stories/stealth_logo@3x.png         | Bin 0 -> 4385 bytes
 Telegram/Resources/langs/lang.strings         |  18 +
 Telegram/SourceFiles/api/api_updates.cpp      |   5 +
 Telegram/SourceFiles/data/data_stories.cpp    |  33 ++
 Telegram/SourceFiles/data/data_stories.h      |  15 +
 .../stories/media_stories_controller.cpp      |  12 +
 .../media/stories/media_stories_controller.h  |   3 +
 .../media/stories/media_stories_stealth.cpp   | 407 ++++++++++++++++++
 .../media/stories/media_stories_stealth.h     |  18 +
 .../media/stories/media_stories_view.cpp      |   8 +
 .../media/stories/media_stories_view.h        |   3 +
 .../SourceFiles/media/view/media_view.style   |  74 +++-
 .../media/view/media_view_overlay_widget.cpp  |  11 +-
 Telegram/SourceFiles/ui/menu_icons.style      |   2 +
 38 files changed, 608 insertions(+), 3 deletions(-)
 create mode 100644 Telegram/Resources/icons/mediaview/download_locked.png
 create mode 100644 Telegram/Resources/icons/mediaview/download_locked@2x.png
 create mode 100644 Telegram/Resources/icons/mediaview/download_locked@3x.png
 create mode 100644 Telegram/Resources/icons/menu/download_locked.png
 create mode 100644 Telegram/Resources/icons/menu/download_locked@2x.png
 create mode 100644 Telegram/Resources/icons/menu/download_locked@3x.png
 create mode 100644 Telegram/Resources/icons/menu/stealth.png
 create mode 100644 Telegram/Resources/icons/menu/stealth@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stealth@3x.png
 create mode 100644 Telegram/Resources/icons/menu/stealth_locked.png
 create mode 100644 Telegram/Resources/icons/menu/stealth_locked@2x.png
 create mode 100644 Telegram/Resources/icons/menu/stealth_locked@3x.png
 rename Telegram/Resources/icons/{mediaview/stories_next.png => stories/next.png} (100%)
 rename Telegram/Resources/icons/{mediaview/stories_next@2x.png => stories/next@2x.png} (100%)
 rename Telegram/Resources/icons/{mediaview/stories_next@3x.png => stories/next@3x.png} (100%)
 create mode 100644 Telegram/Resources/icons/stories/stealth_25m.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_25m@2x.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_25m@3x.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_5m.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_5m@2x.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_5m@3x.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_logo.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_logo@2x.png
 create mode 100644 Telegram/Resources/icons/stories/stealth_logo@3x.png
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
 create mode 100644 Telegram/SourceFiles/media/stories/media_stories_stealth.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8fb9e62d1..10b47447d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -997,6 +997,8 @@ PRIVATE
     media/stories/media_stories_sibling.h
     media/stories/media_stories_slider.cpp
     media/stories/media_stories_slider.h
+    media/stories/media_stories_stealth.cpp
+    media/stories/media_stories_stealth.h
     media/stories/media_stories_view.cpp
     media/stories/media_stories_view.h
     media/streaming/media_streaming_audio_track.cpp
diff --git a/Telegram/Resources/icons/mediaview/download_locked.png b/Telegram/Resources/icons/mediaview/download_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..206d5893d729884b441805a2d3a6475091642d51
GIT binary patch
literal 508
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEX~u!F~mYJ
zIYA<)VI~jz%U7?WqN6{5{AgSKjc46l&U1&3&fsS&h}6~94G+H_zCLc|j2RJ;kq3`P
zKG2EbS@8En(5X|W)cxn#RDF5z`}=!eU*ATa4xPm23BHMmiHyHGX3mt%XqhlUfL-Fx
zkB`hN+Dw{ra&tpNLmO}L@bD;zRa924jo!|8LQTd^fL9<WAV6RycM9`eRzbzH3MRo5
zc1G|pxvgEiSb39@#qY<*`wPrk7{w0?xwW>oHa0fSoH=uI+F7T|Wlv5_<d?TAC@OL~
zQvd&7?bB1DCZ-(gR;+k&b94It|Nr9y0~tkZnb{oNYHDl@SQW1b9%efBv5}d*A+5Bu
z)RBkDsNv4b%gcoq%ewL!bmrXJ!nxw7sRV<hgI<7utKdYLgiq0XDhw}hC@>f`#3-32
z1s*$b;sz6&1Dn`ON8Of337VRk%F4=0cdOssv3&B0!&O{mmcl~s2`pM}*L<YK6>l4S
axyhh%Z~eT<3Ud-bA@Awx=d#Wzp$P!M#;?%;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/download_locked@2x.png b/Telegram/Resources/icons/mediaview/download_locked@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..46bac90860ae390508fd44db5db7675920183b35
GIT binary patch
literal 915
zcmV;E18n?>P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NE{YgYYR9Fe^SUYPfK@`?|uQ4$X
z(G)>QB^GJK!U#bERz3=?EK&sR#KOkPVE%%Qt&%#VFnv_)0s$2pg%r_5<l+NFA%>9n
zAosgj7>3o|tZ}!vmz_esIrE)!zCANLGpj-&H@O0<Rp94p?n`*Dt*!0v@9*vHy}!SY
z$73!}CD(wscB|FucDtboVLv`T%H?uCpI<2J$LfhK7R&F?2Cy(1>^`3lYWn>?h!AA6
z*}PuwLb3=`c7A^DbUJr-cJRbEH#e*_N~JOw460PBLZOh!WGa=))6<jLY&IAS4-XHc
z(TK$tp+f8H>r7Ar=p4JdyBdw=_4W1k_Li}?TCMy0dtfXnn#o`h1kDGfE!*4M=%Nys
zDPn(qeg;NSiG={k1(8ew!7qWl@6qs*I~<P5WTMq-BasLRvazuN<H5l}r_-s`YQzp8
zp&-0gfk0quYYS<xsOMK0mY3h}$Mj)U5ls?K8QvpC4M{c+@D7?xCfY8cAXJ6U#D!Tj
z2?cQ};J3?y`0JxkNLZoiboy2HzvHvnjHU?^WHcH}rBbn2wA<~pGe7QjyKirA{2Yun
zn@yS{NYLr&>EYoaj%eH&JRT42&x4`n>guZ9ZsP*9unmX9Y&Ki3*Li|09)c7U7KafU
zj`Wk06PlMwrI;ZA+WtK(s6v=8h+yth*fuUNFT>$5e?A<X^IJ2&%hIDRm+R%_g((Jp
z<MB8XV!lGLSPb`#Ua!a6g_lnGrNhzD(O@tjni7cwTv&o&B!o~X^kvLd3ApTGosyIn
z7Z>Stn&|?dONKzx>-DSV6XK6upwVcM#E*}U3?=|w5I_?WO&ktR@@ln8G_e4NKoBRB
z@F+T+?(Xi6B?Vm=F(f>Wn9R-1&0H==YeE-BF>@>%3)jNy>uW|60P`uhY!LDJ$Dd97
zxN=0f0{=q=IR76~tJTqHREq5%CrmP##FcHi`kkGf(L0{F7{R&J2)dwgIZI*Z{I*9`
pkx#lQlj33Im~sW=3jC85_yfR_5F!Z|4|)Iq002ovPDHLkV1fX3jwb*B

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/download_locked@3x.png b/Telegram/Resources/icons/mediaview/download_locked@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..57752e830b034464a028bd975d7eb3abccd427c3
GIT binary patch
literal 1313
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz|!sM;uw;_
z`Zmg2qt;R4`;L3-RXANgbxi%9yfDH;(e+evqV|+c(>86KvgwbycA|6Q;X_SMPiD3X
zX}`CboIdY={Qs4ivn;>g+4;Qa{U6ix!r#wkzyJO0`|q@KJB{yK#>M@*BzXZ0f7~}p
z*nD%(-o103-p<(?yfD_hud7Q-SJ&6ikB^V<-;W;_*4EMS@%QiDo7VZpE=lESe0;po
zhJ@gVh={PTXV0G>zxn?Cdw+lb`}gk`SFL+_cx(NNn>TM(R##US7c)Dib-a1=rmKr<
zqG(NUaImzLR85VHLizEY)YR16++0Ds85`%!k@@^oL{RYJwQFJ$5**@BlJfH2J$a&{
zqobp*&%e+^Mnha&yff#=>xS(M`!}Dub0_9i6YEK{mGeZoxVSj9*K9v{@ZjCMcX#jJ
z{rK_YlP6C;eVUpS855IZm-$ZN+3VM*A3d9uBR)}BSh$lx>iqfhYYzVT^XK_<b&~`+
zVd2ANg`2E93Z1QT+S=NLW`F)%eD25BuU~)tnx(PPVrSg8l}d)Yj@`R|KXQ%BGOy3|
zW}=;)DLNTBVl{PFSj!dmawaDyuk>O6`u)4QQRRUETlE#LJp5-qefreUz|gd5)22zy
zr_HjnvyF|6KBWKs^5w{@&NUZ;e7wC^uUofljmw%vYPPnrUtDZWxCFJew2WFZ)*W$U
ziT1karkHf`;zcDp$=-#FosPT+j%(w|R<=vHuv)-SZ1w9+YR{_p?n*nJpHcn!?XQge
ziN|<O^IqE?Vqt1xYO1((@#4k&{QT>lOFW-AVS)g6;S0yMuUjpW9UUE4uU=jMFV@=H
zT2oUqCm`GCQAB~u%U7R11(j^^;F&6x<KVet$r6<*@<ztSM_>45nwgn}g@y54pSsrq
z7y-bred2TWW<*Taom+=BYZDU}u3D9qnb|4ru#eMg^XAP!Z+`svk#GAUgMGVpSy@>*
z?G3EsI6m#hzcXjfC|Fh7+Sw(kxjvsZP3#(v@5N`gO~s}wrO7{MozoiOu;RL(udk_@
z*(NXllVY8W?@pigj*Y$h;e!FUtm?Um6DMA~78aJNcm2wh1lGRZ-iJ16c`vWUg@mxN
zvE7*J_GH~Uy{^M4numIRJ!(66cv_XF;+HR90%}5Dyne0x;EiB2qp6xxUEMyRng{_|
zS=k*QEfzRCJ6q^<9$DZbp5Bx0pOT^?9W1(Y=gyyR-}W|J8ya4`cki6m#g<7|9om%R
zOjjIoIntQL({)KEL*#xW?{ydPm<Jke!QR0^K~3cxI>N=0#|i?wn{7=r_>=ypoooMc
z=*+{@;?;{Q-1@ujKYX~*(p=)e8RH)@lBSA^iTU~G<;+VC9+>)L-WS)S`NhS-PuP|w
z8eW(jF;~{w#zscEewy^G04r&C*Xo=pzkdHNJa?4UacAx1F3Za^O4wkqE}bo9f1R`L
z%H6xI_4Lj)XIj|WzJ2@l=<=ldZH!ARYmOXw_uWR7x$Q|c)5={+UG8o7UFxErEn#MC
zOHuXil6dt}W1C0+zvi|EMgt>ekG)eYEG$;6UmyNNj#)x7>6Tl%0}4Fwl;;m?KX2QG
TZ5~@gK*f`%tDnm{r-UW|QbkN_

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/download_locked.png b/Telegram/Resources/icons/menu/download_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..824ca3707c41a7c4e18e00213dd1d891b59acc66
GIT binary patch
literal 516
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEYH)$F~maf
zZJ^=mrT~$1B9*#{@ASgF1v)f1FFg=(`M>DvR@)csF3$T8d{;hXzJ=A%nb*pCtJ=C}
z7nJ8Uzc0|glNXhdpH*@H%iQ-h_bu-wFa4C2@c)D3-Ms52XRG$gwJCOr^G{0Mc`?H!
zu*G<;U%G*W3?F-FXyrV6x&DatlP30`U}t)1Hrw}l>G$7%%Xa5(jdFR;QSGwo>T9FE
z#}8a}PQTiv*Y!yH(9@#EoR11sj{EQDZ@;}jqpRub!-5wUd>>w$S$*g@ywOPahu#_+
za}DEGz4ts#i=UW3_K`VWB4H8u?#_u#Yn~Qy{=e~gk5A6_+jISvN3Cu9s^VF5|9nN>
zsiR4ZjdAPQU#T+*_+D0<e6qJ+>zxhnuFEg4Y<v5)Dp!KdjQM7cS(8G*%}XVA^AB_G
z6KHUVw3=mnE^V_si^9%llMh)Rn!IrO=KkZ4KmYs_%ap)u{Fk9kPsLNJ*NvxG`4Zcq
m%O<gF!yE+!p3WDEe;|J5=8V?#u*PMe81QuUb6Mw<&;$T(63g@e

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/download_locked@2x.png b/Telegram/Resources/icons/menu/download_locked@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e2dde2cea12333bf2b63a6eaa06de92897d9f1f
GIT binary patch
literal 870
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz;waW#W5s;
z^KFE6wo;(P*IqTdE)k`UsR>%nNzxo))5NZ2rBC)V%g9vC;^_Rxyz!%chKE9+Qq$a~
z-c}AbZbN~C+jpdYKV)#mV%@pq?z=l%=Tz^z{&9EtvFcEbCyM0`5$snE9qRA6_OhgG
z_uZ_mdScyAi%yEJd}7pby4pr={&{v^kKK3kq<fEj{`}c5vVO6%xVU)T{`j?F{cejt
zR^%AXyr9*6^itmToAJ?ymsJ>i|NgyW*Y4fP$F-(<ePR1^`n31bAjSd<nS}u--j-c|
z{k3lYd5%ECXEw|9roTS^p78*my|uNqrR7Y&<yW(&MpW;Wd&&Fj$Tx9Efmajvh%A_X
zkSWn>rq6~_jeoy?OW(*b3+7>U5pa1b#M-gBeaDgqiu-r&j9eRb<Iwi)+o#Mvn7~k3
zS7#@|6SY?CD6@wK2Y;o3go#wI#^S44U#o2Q8W?N~R}eVxDKR`yjdS{$w9SI1A%<oL
zj9-*kz1-8%bV0OARqsr}<N$%`O@H_3WYpJ-aB*61iCh0a<nQ#_%{MRH<r8h$zTx`o
z)EtK@B{Mm`_Rl}(oHd@2x7|CPPjt%JwD|b=(@#IWe5q+$$KN(9Y2%NdKRcN(ocs9o
zYpB*#tGVaqsmxiHVbUe9+_QbVdD}8z*d#GM=$U?K!s(|T55Ipe|0SKjTwzY#x^?S9
zRyl_^EPt?kx%whbb!ji*XaS#shIFNg4<cWF*l_%~`y$Tg(nVVmIG8wvKX$q(wWmLO
z|MSBKhgY>VH4AKF1(qpvist>vmXYo>)?OL4`s%v%>p9sDOi3tOVQaQl;lGcXbC&sR
zU$zF%fUJ85SB7+XEUa&OGB=>*K#GxPc=JjQPu67ztcAnvco-U2J}KDA{6C5P+h5tq
ze#;L(+~B7C>@M%|6E$}7-A8xKI;qJq-8<&tkx*wB2jRT0n{VbUS38&A-%w%Gw|e=G
uSqqj0XcVlxsTrvDl<$P>1nUp;%O9vW%XCgS6>bm?O5>icelF{r5}E+YymW*B

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/download_locked@3x.png b/Telegram/Resources/icons/menu/download_locked@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d05e38d61f63b8b90a06ea3acd74de57783b43
GIT binary patch
literal 1226
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz+&R*;uw;_
z`Zmf}yUbDI*+K75p&Xj0gagfjA_BxBI$9%s@GlbaR5|7LL|J~~{scv@O_N%Mybc{Z
z=e|cygzIO``s-Ip%!}tdpYy!n%;$Z@Vc+i*-~AqQz4qKp<Mde*1ZrP$y#Pa&Xx2lA
z4?8<M=Wg8AzHRC)OAAB8jeGXodHvPR-F^SQee>qd&CShy`{qr=$u;XXJbLt~tE;P{
zgTwLI!-o$K9XfRP?%W6Bvl5-6C#E?%I{NzhM$BNey>qOmhv&}r@88RXx3NuB%TSNy
z<m3zt4D9dkubX`2_;GVHvqyWGKK=StRajV<nwnZ)fB*5vCCio_k`x#J{^w6kNlD72
zQ^}XUx5o1F^6t0Slc>8aCMvp+rQu=a?74GoEi88I+-YfPIdlH}`1ttrhf9|(y^uNS
z)SB}uXY#^>gD<b|=We@y<IEYKw#J_JcJ{9L*x1_Y>Sp#+!9hV8(-U^9@LZOXo*~V|
zf2*gnGx6-_&&99W|9<&WQd)X+&c=-!o%C~esr2x@y#DO`jnk*Qd7k-w)}P&VD8-Pm
z;@>$Nuh<!ne(KDhHtkrhpU`@(%{N&N|7}`0Z38eYR;^lf;)KVsO}lnQE%2UQT3T9J
zS@|R4{{8#G_M1hkM2d@wva+*xYRz2z=H%J4tu{CL`<)JXd3o_@&a&RTdGkiGiH2O9
z-hO`5enx(jVAE3RIsYl_NI;Lx!3E)piBnb=M{^g)IhPy1uzr@ecW(bT{X2$-<1<@Z
zKK>Wnz5TSog^3&1tXcE!-Mdq#ymp81eB8ZzcUxVt`nGj7cJq5UYXp1#F5bFzE6|rJ
z!042fm7Tiz_NScue05dT#Ntzb+`FIc*|B5B?AgixuUz4`E=ar)n7C>}YDx;r>$Zmv
z6BT!_Rg0VY^y$;HXMLA^-7UiQ<I|^4KYmF3?%n3Lkws2k{y4)Qpx=J$<Rm9IA55re
z3p~-E&bHelMxy82w=(BCM>QU)1-WTyZCS5hyqK_cCimfMqH?R2E>*R;SM;X8azSoY
z)vT=7Z{CR9n8Cq3<M_5MTR0l+@3d@Nxl;2Szgu{?_|q>l4Gv_4)YjVe1|4eK*4fE<
zN@%{txibM03?lZHmM1@+l00N{^YZ1x8mA6ja1B)qury>^xN)Q5sU6$5i!(S%%n@l8
zQ0!dfyT(c5{l0y6T0FkDUe}y_lqI@>YvCJzfB(qI(raE8Y<#pz#qP$13j$ZwZZi}V
zOpt7DZr&vK%rSgIr{D`d9-b4o9*873-aPW1E4x6ApY88H)}?Y@R`&Mt-d-^VE8=hO
zVuHawt%R>%r2V=d*l$|1rbo80$Ry3-pvAq$+%wOfrR{%y@6FQp@83@kcY9aua9AmS
zb@UyJqC~^T+YjxV$Hph{sAcZ&?Hzp_ObZe>7KGh5Tyl7sd{~wJkG{8W-`>4<FG^%t
hBFr8H{XdrV9|Mcz!beK-j<KL}#M9N!Wt~$(698WLI3EB2

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stealth.png b/Telegram/Resources/icons/menu/stealth.png
new file mode 100644
index 0000000000000000000000000000000000000000..af12353a97830a8dcad28f79c0240e569a2f53a7
GIT binary patch
literal 635
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?5U@VV~B;|
z(<!^xIR*-}ZMS9>bX2^kRg%?vPPK4egVS49o7OPJKu?iH0@M8#F21mWg|k!mB4?|U
z$n#|N<lEEUg*;!Alzwf^&;Pdn*F-MP{GXsI)ET4qo!cpKXWaT$Cq}*5XQ!P_%iemc
z#OiOI4$n4=w`IFOrJH?R7q<Fr+T{$BAMeU`SM9CaeRtR0ywz8wc-U^gHIwTP*P0r%
zvcyL2`RAPsqHR~RRF!S@yN`a7d-(b11FN}yf9vcec=oa1v7P9#<ofHMf9oCw9nXw1
zk&^8{-hGs*!}8eUj}vm2UoNzenZr5#`fFLf_SavfmOd<qNbp-eIYEKpXr=k8tFLm*
zig(|AB&s+4^wg6nZi_G0?KdwH<Y8IhU~(l+Z+eQ+&yq~3ogCtIUTor(lF1DWHDcQH
z&&%_%C$pG!oj7`8s^9X98C=X9GRt>qT67#uS{btHW=_&&;hNiTzZLB~@?*!8O972y
zdpT9~zeq)%xnxnTZ&tc=SHZ#)O9Gz<iOgo+S@$mVAE$U_p!loQRkpE<_SGFI5w~?)
zelh=0s*#Iwt@n2=sUY?iC&jAy;s>lBn9hi}5oGl6k?mggJr!L?m5R<iH@+UCH+{bx
zck|m6BTg2kLtmMK^Ja+7KgJ=<)^YA@_UG=%6=xpzTh=qYh*ITj-7>8Z6!D&}elF{r
G5}E+_x&3?q

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stealth@2x.png b/Telegram/Resources/icons/menu/stealth@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..50706a61f276fc95c6e33c38a0e486dff3a26573
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGKS@MER9Fe^n7K+UK@^6^H4&H4
z1rY@UQ9)n8R1pM06GOMi<VG53<_lbW0W%W~G!YftK_m46L`CGfWbWX8KjvHxHPzKU
zH9c2Mrh=xr>MVc%r%u(WP9$<I$3TvOA7Y@eu<(aGyWH;X?p|G8b#!#NCck$qFK8Za
zE-o%AD=VL#p1QlccXoDyGNq-ZU0q%6?d{do)iue6%%5btyu3U*I$Bv-d3bmTD#jdv
zo5#n;udgqjCQlU=6=P##tE;OoFE7kSGz1Vs7?q4bI2aOra4at`mz0#4JoWbW&d<;5
z@`91Gvok26p#@vC`uch(QxJD|cfXVE_V!i>V|JW8_4oI0Zf=f`k2g0rhuLKc0b;Eb
zf@Wf3B0oPrOvQKHiOE+vk!WjcTUc25{QMMTK&-2)^H+CEW{C--5C*A&399<~`rMwP
zM~8-nR5N=_1dAX_Dtvr=3=a=Sd$(uF4tRchdn4^-E_+PaVVgKVKZh!e<HGhD_C7E$
zAoQM`oR}eZVrpt?T3=r$*JxW?Ta%NMW{L$}U=XunA4fp}d!(_k@&5iEh2!JnplK&2
z@(wP=2hZo{=c%cwyu8p21+y4O5=XeR5t#4A#l?q*hhns~wbh)`z7rF%n3<W`-`{_I
zeHCPLb8``xFb-}cafeeiZg)mUN5vc~+MYAsotR|4rKRQI;6RMPlc8jHaUo(jwddr$
zprAmQ<U`#O#%KhlqM{<f1P8&O8#WR+0uxT%8)i>Wk3i<sG}Wv=t5`-NFu{|=jx}zn
zo3A($kGM9+|MjP*r<uOFxpB-HLmL|#tYR66z$9P4y}fOyI=Z;SDXtxJi;IiQQ8qZ{
zj3LsSoMIKrSQsYOIMxt0R2^O1A%<(6i*wp>+7Av6iV2P<Hcu)7>H?|*@X7e>?Cksd
zySj<f@eCPJ;G3+4@8pTdvS&s^i3*wLqGp`}h&9W~HJv#zX$F{*+E25n$vsK?y}dov
z33kY2+0)2vGTan!VloA+ewwsL+H+%M$Acsqn0$D$aL8-=jS)GYqXRL{1WpFQMC|xb
zaw=`!nXr714s@aqS2YSIc#_x&GWG(W{Rs;h9IoOoto%?k+QBqyoV;Vdp|NM`Dh^vu
z8J8d8ObRqUoq9@Rp*TD{PE2fCaG6<wCjLf7MyNHxMBPdC=|2C`L33iFGS+=Hoq^PO
z)&w=VED@^oh<i_}Udo#jQ;I}JFN9pLSMbc8hMP@B77+f=m<SekJf#Z4far5kgjCPG
zGrusj@->C%b4CA^Y~|(UI>lA`^z@YfBzl#us;X*eXwbTh^A$`>OG~K0Q}AxCreb#F
zXT#dsn$OP$#H^nUKC$y<$ohh^va-(3PId&y;0J?H0%1_aGvarQ@^pQDU0Yk5ZHZ#R
ziuVd8qRc<Bc<SGxr9X7O#d^+Yj)5ElkqrC=cu`1`BAHeR00000NkvXXu0mjfWwRsX

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stealth@3x.png b/Telegram/Resources/icons/menu/stealth@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c659d25b83a75d30e458772f5e0d926aafafe772
GIT binary patch
literal 1762
zcmV<81|9i{P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>Oi4sRRA>e5nmb5cOB9B^zTz7p
zjf$pG^rrFwX|#!zf?7ndjaG`Ch>g99A}A_i6}7Pu1Rte^LL$h8XyfB5C_Ye07Ze{M
z;=SKJ`(`<3pL1qE&OVylyHBBO_N=w`|If^xS+i#1;{2cA0)7klE#S9+-vWLM_$}~M
zEs&spQDS0ZM@L6fQ`64Q&gJE$Uinw5?d<IQEATrzJ1Z_O{)M0?>aphM=Nk%nd3h@<
zE7jH2`}_NP6QedaH@CdJ{P(~QIWsdeD=UjCy8Y_v>f++!&%keUa}(K)LyvU|3JT~e
zqtp1S?>EM6ZEfxN`1tPbu9#Q~C}V;l<{qQhyJG}eaw{q-8XX<|^5u&q4UGckIKh=3
zkC(N2ZnX6L{Cp(D4-XFvHoE1Hzz=~U4<qT{-``J9Pd^<!J-6iK<i*8B!Fq6T@ZrOU
z_wV1AmX@ZarG>UJ52<QyZbl7dF%-d|S6EmWYU}+IOKy{slYM=CAa?q0OfWn>Jr!bx
z@csMu!NEaV&8b7j`g(4T-31#!ptZI2@bJ(?kD2rJ>({}$F(}298+iF*TUuIJR8)F5
zH#hC=?J-~z>@wEecw0h3LRVMUw{PE6dJ78+>FMdgSfVSjy!Q9^t7H8MxB<DWtZaLG
zTjlog<43?m$L5E1c6Rpq`a0g3_nw|xYHI4(*qF)<FhKf&&h7t~FJFHC{8{|Y&CSKf
z$BVP4={H{2*w}b?cPB7_1TcZ&SYWl;*w_$ve8Dv}H6|~X+}^x-Gchr-yu8ey;)g)7
zzP>&sCB@`QU*y#Q5HJ7>yF%)n{98LaJ1dTeT;INZ8`ezEjnS*F-Qw`;*RS2(-Hf!b
zKEpl)05HS@@WQHDJY*XtE^cpcD=RBC2JX1w|LEw58A9XPR8>_~1sDMaNRxs^v81F#
z?RVBq3xl{gJ-4K!q=A8fPoF*=A0G=WL%6=auB)rF^e+m45f6X_s#IAEtE;PGJTo(6
zZ4l7Va}y^7xV^o-@R3&_JL)$ei7imYvxUHyEoKDc85tQC21>O}Zdkl}^-7(Y7?bwD
zHy{B_Kmu5S5Lr~`_ec{)WNV8tsTvYSsN9%K)LOj^Fd+tDz4AY`%+6x4w6tVx5KhBU
zzsZ<no^-SZ08gL-I~)+@*~rL<Xp`YkYAi%tyNgTMu*e(j4ypha;E5ryE%0q^Z5i4p
zCnpxF!PP9g?qV+H62XU)V6PS>KpM8d)~UXD@j~9gu2H8NQb$OEE!>#drPAh@lr;b+
zVrxg3nwk>8fLBc(13#YT<m5;l8$OZk2;}EbYiMZb>FE)Dwp9$6^Ye4#iIKyDttc1*
zduLHFRq2bQ6+}S=&%+>Muopeo0>Oc5Ylqv~+L~(OPS$~sekkIdaTSV8KPDNyMm*`^
zP&8wRX7Z5X9yWQV=Vrvpv6?(!>3X_X;}s$%bAtuSmfWnDBgL<?>E87M&DzQeYjhfG
zE)kQ0;Zf9cd(^WbIa{D{=sKh#CX&%etQ0Bn;t4m$Ar-{bLFFh2CW<ANRk_8e-&_X4
zaC5h9!I0gD#C|YD=6iE7m*7hCbGdE7qiLhr*4CzZjj4)Vqsq<bK-K_und~)P#3d&G
zfRRDrc%z9gQ)<Ap?3!L?D$;N2m=qic?&3-DA8l&DaAY%?BX3m&zBlF)nI}Er=1npO
zly=f@Dw$B3HGrvzWtWgbO~0AeD?9U~m+3cvni8gDE#JL+7fK-dCwgvVY01?}w?~^W
zHQ-8$Tl|u9cC^*CNn6iN@{``AxD8C418^E3#1I%)j`B)gapP>nvqK336JZ3WI4U>J
zcsS|dyvHVJn`-)gv+2aK8mDh+A{Cx&w>YQs_9nygaO2dJvs1O}klAjNpjDGOj@vBQ
z;CZ+~fHQASzD@Ml;YV}0PL@S&n&;t0`w{_iA%lAhCVCWYUWeemgy}j&lyOOLuSZwX
z&@%`-y}-g<81;*Nwth331$r!QF}iZ}%-mo|OULMvSSUAcujz-{Z~AK2wOr+^sHosp
zA3Gpq?(`W8D@T&t?BhDs-rgP;``BpPyw(Rd?iCu@OHd6D4|A8&HN2n8Q0=$>4lARL
z8G%DXL$FdOn4hcpeKdXx_$}bKfZqas3-~SYKWu@&0d&&#%0fzgYybcN07*qoM6N<$
Ef{rysi2wiq

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stealth_locked.png b/Telegram/Resources/icons/menu/stealth_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbc0cb5e3061ac930b90420f022812bdd872febc
GIT binary patch
literal 726
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfyu$s#WBP}
z@NS6j>Xm^acKc4cb9nw_K6SudGw-Csq92TQLCezI{xz&z$tXFoQRC-{BL{jKJA<4g
zcX+0WFi-hxF}wEM>1x02*1PW7-gv+HdffTX>$ZNo_51DHc<DX+IZou5?T*oFb=nxW
zUURPZ#G^@^EKDUoWesNf#H}yiefQSevgMagK4P1C`K3s&+s5OMKmMt!*PAZQ*S_DL
z%|UCbkyP)(0FH+T*t<Sf%;BnCW;Xx)^wX&uBaZBeTKnnepQlBcCQ?(qmfp=fpSIa)
z;fDL~*M_ZjP?&J~Y1Q7i#TR|lgm*ahIjb`6h{>~%X$w=Ds4@NY_19lt>uosxxN!H~
z_}<4Kcf_r~zvD`lfy9UZVXIk1GhCGfceyrtEnPH&VQZ8x!~7Z*A<yl%UCY`JFAUK-
z$f0|NMR@-F=eq;cCR@%w-@#=3bbr>{vfb*IZLFr&a{W(qR>+^~6khV&<Bih96KR|O
zR`IkSR-Ec(Imdlr^T7vcn->bPlvv4Lh}$~vPKuG_ug`fYqER|xcJuk=?6Vb_F1&YI
zvvOg7)m}Ny-`2Vz%%+TgjnCwmSxfaENisBjSz;BVnxUw7P39pFSI3khW{bKlVQa&L
zxmrt@qdK@P7sdH+buT_FDI&1)zw83V<(D(}-#^}3b+39&W}ny6O*eCzKHW&H+Zv^7
zCB1f{-|~-M2Il$NQ+l!<+U>P6(AgNl^YTGm*y^h(MxC$w7#p4@7#x_pAc{xob<_Fh
z`|Xq~LKBW~Gjm=1HTipY=={VMu6s^xFYROZF#EfxP1RVp#u1dJJYD@<);T3K0RZwc
BEII%H

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stealth_locked@2x.png b/Telegram/Resources/icons/menu/stealth_locked@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..979e23d5cd0f08ed07d7ad967d61e7af899639a8
GIT binary patch
literal 1457
zcmV;i1y1^jP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NH8%ab#R9Fe^n8`0^TM)<1f;J=;
zv>`-Th&f^*l4fP-1PPspSO{T7<ZZBE*Z+WsjYPsqNGw>O(}JLbh#_e@yy!OO84?kp
z%}u{goaearcZYX>e%@O-i{GzqRh_Eut*TS!+~ef*I$k5-SOi=hn{LN!4-b#9u&|(@
zpzG`Fo0}V>na)Onm*uCXrsm}2fC;m|fB&AJpC1_+(S>CgAvZU-`}_MBft8e$R9IN(
z>gsxQbaZ@t?Ca}GsQmr?S65fH_Fc3rI8#$oySuyZ-o4Y6+QoEsb|yAV866#MYisN1
z=;-R|`t|EqVq#)wXsFhdn-0s(Ejl_nI5>D{Xz2a>_mh*8S{>dpH#avWB_$*z1iQlY
zUk_t%Z*OU7>C>lAXJ=<j3=9nP_V&KGxcKtri?Fk^vqNkW5)z0LGi;3O00MqVNeO6t
ze0*#$1q1|?m6a6~6l7&(iGom?i;ayHkAFUluV26N2y}h{N9joA)6-LEKR-Xok%SH)
zWJHD7Xfb7GX127nP+np_@3*<RNk|xQh!!I}Jp99l4=XDx(uZAy*(#%k1g7)zbD2Aw
z)zs7s4-XFx4u1Rg&D<G_JTEVggx=lVi3|#TFE1}oPfy}BK0a;(-3$<ubupQPkWzA5
zS6BDu%^S(l66CS7vy-ZlBK=h+#Ugh^NYs;E>+bE_x8`W@!Wv`&Np}#2fGR61i;IiV
zcs3??cXy>HBicqy9}rbS!|3Vhp>!O<WCX&5uLG#Gw3H4;FiEW}+h@ng#J8@<7Enw~
zOnZAfs^7nVr((9Zx8=0|2a^gA>!P=}msWOpd0A9cq-~>iVWPpxmoXve2ui66P<eSd
zy8+_b+S=viWu=~^tz$YkIJmmHk`s-Ht*tGk=&28}8?UXcu?S~pXVcTul}cLLVt<N^
zjLgo?W;@ebfWrniH#avkGoveY%FoZIO)=Ot^)(*2a>D}C&!0ch=hv?OWMW(;`uOo9
z)(;O4Rb0)(*w`4mhhYD=nELzs0mQLEgF(e$H@&^R6{Uv2K}^(1a&mHgeZBOdDr(6!
zC)n*PDk_AI^%~c;$qvooDI+68N}m9UWhGx-YS<8BBTP$6lYB=o33vJ{+G0^RH8qi0
z&gb#*@e&inGjhl3!4w16N>l&PE-o(X>+6W8r>Awqk1P&1ELYSP78Y#wMSC%^;IV^K
zTtAvu|5sO6qrqUSS4&h+&CSh14NT9D6E1`ioT{uVAJ{q;7Z=eZ1{}hbA|=hf+uhwQ
z%#k}@w6(QW7N3<kVO)e6ciOYL(w7sPD<?~w5lQhap%OnnfQdK>qXHSdz+!*Gtf&nf
z;qK9-@ju58;p4}T9}y7|#)?jurp6~GCTLC!dgj0OaSUQs*vFBHag~Sz8lSC9<M<(S
zq0+GMpqo2Re8dvtxUgVDp;A><#lZkf+zm7|G#D-f#S|^6i;0u5?5o--W*lnb<m5zz
zm+zIhxHvOy1DP%+16>PjQcfcln22*<UmshKg?TEK7sf=g8XFsBr~n5<l4uezL?{qc
zi|bAa|LK6H<Z5ZY>i>8cT%$-SXWWgAjs5+7`6<n}SX5M$>=&G3!89;1z!c)7{SKC<
zo=E_U)$#fBXDVIf(dZWi)KF%MbY>-YRwE>h3WAFZZhhzo1cM6(5fTDMsQ6W0$Jk7i
zapJ_ywS>hF0UIMP{0Jtp%$?W^+jYd8ywGvP$m`tK2)st%c@g*<SSgwg&0_Xn00000
LNkvXXu0mjfu#l3k

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/stealth_locked@3x.png b/Telegram/Resources/icons/menu/stealth_locked@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..07278760a80a1a02a52ca0b6733583ec64669587
GIT binary patch
literal 2123
zcmV-R2(<T!P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?wMj%lRA>e5nptd4O&G^(-)c$3
zzErHAD^x5&f<}-c(hEymh$|uzL?qJ0O)oSRTM)5@xIu`D?FMN|h=^Dl^iv`Bo!EE!
z{dC%=W6qp8=k)abTJpX(?=#PNo|*rDmS<+3b5c^0zhn<2dmz~Z$sYLAdZ2#&`gQ8m
ziG(_ub)>4}8@F!Vdeo><J$m$L+O+A9A3q*HetiD?`OB9thpD;t5*spP$e1x>8Z>BN
z(71W?=AlD}-o1Ng=#64Mqg+dh0|pG3IB{aVdKP#LW7n=-8Mo5XQU_X#r*6&UUbt}K
zlqplLU%&qL?OXj(;^dYsTTY)oou+Bx)vH&B4<9~u?AWzy*Xq`-+rE8!lr37c`1bAF
zy?gf@7=AfBe)H$gU$tr#2GgcZ8$Eh-NlA&rxVjz<9z3{l<Hpp+eA~Kp>!(kjkl(y{
z^WedQj~_n{8#avMh!G>soH_IJ=TE;z1Bi9*+*x^c?AWoeurNHg4jno$o&G8NAvbT{
zoNlHnh8?(sfq%<>mo8mGHo&E&r6~>26)Q0~apJ_#p+gxun73=!&g(0d0mRm<S;JVt
z3Wq>$Odgi|q)C%9GBRK!ZMcQv;^Jk?mK{HS{MoZ-$}%-IRS8d?JTZK~e*OCL<;ym0
z+MuVis!r_w{rij(W98=7vu95xEnU#IZCeA1yT|~}n>Ua8bu$J;6~BM~uImk@duIz6
zG3sJnxw$b=D_5?ZJbAJg1R7%3)2B~gzkaO(G~L{)RV!wZg0*PTB7>E+k}4>JiBYMW
z8~r+U>ePMv_Av<+g4?%mvlvdEJbC5H6}BB#yn&1jw^y%T?7aK;?>8P1;w8$nI7Jq-
zh7B7kSp^u;8$yH)x_9s1GAF6!(W6ItETO$kn>Mj3_UzdMAETL&#eo9{jvYI;QKLp7
z?Fm3^*4~c8JpwVT-P}T=@iU|H88c@1J@wNwBX;iG>3v$hOuY}R8Z{>wEA>>xNdQ@m
zqbiBxQC+ZSN^=(RIz}Ugf8w~QAnt`2sIfYRB1S07%gd8hn;>oy<pY@*2HpUJK`=3*
zGrQ-KB}<5ViRNY?j#CUE#`G;HDBuP`8$|QnyLU^!CTQH^kkNfz#Mo^ZtMv4A<-oCR
z%a$$rxwAHNa}nFIV+RLW#p?b0_nDcQM~@!Wdj+}Ha`Ppou3?JC=g*(VjT^^d!eFI}
zwUe8jSf4(9a&vQq#)1V4xIswKE7UAE>s8uLZ1d*LO`0@O1a|G(#nSSUF*NbHaUU`2
z3|X`~T8NQs7&&sJs+7anoH=tsHV~6rQBhIIhIBKoWY3>J*ELGE5X;HQ5xco_=Mpxg
z7%0TycHzQ>vuDp*=apZ(+)deC^*}9_<{@~{ph4%(ol}pG962I45pf73#5pUob9U;~
zDe!;~{}(S_a1SQm7zR?x+O=!(Q9o`ap?u1W=n*-Wpn%)MhYu@iDn+iYvvPPyzgb?r
zdR3uuC%1m{DJyK;xRI+-E#<}pkUrkNeY+REL&F&bU%2VH+y8CcXjJ7P?Fh+x39+S1
zm)ebdv?Mf@@ABo#b(2JM>(;Fs`CQU?lC;xXFPBLj$0v6B^l78&#Brnd1u)?Cc7F@^
zq?6=X_wL<A4kO65x=WWXhJBnpz^KY7k`5A$4qlX%LY&|sokyCnvc?K25#vULQ;h<<
zq8*?ADu;W{D?*ISuC@B=<;HF#EdtxxVx^MpNUV9yQTZT9BFjfsRQZ1R@WGhz;$4m0
zfG1FaElv0e9Bssb7mB`io(I|4+2VNd;>Bjont4oqDXN7Vz@#kzTN^T!`lRBGfxIFx
z?L1{J1b6P-k@n!0pm75dz@#And$9N@xKoOoH67{Wm(ss~f99e1BD3DAJ(d7Tn(({+
z+7WWmByTLv;cqTfH(|mAotvuU?%liWZ|vRi&n18nV1NXwor9m2)PVSt#u+|*xSyq0
z&$#JxQtCm7d7cCYV5CAodRq_H?A^Ops^BG1q(H)YBbG><lzQTD0{}3jD&Pfkuv(CQ
zBLGN6j5{eEtEHckJ%E+X!Ji{Che>`26piQ{CQj0{zB&K~Jim5>^<4Y(=uf&TD=RD5
zExLu98(G@?{Cw$RAX#5TL~E85x4N-Qz3bPncfWLt)<A`|n;SPh)+ZPM1EdP4c>lbV
zICbij5JO;65h3E$YVi)_#=8-~SUjt&;uvx8;6a_+moHxyFJ5eY(^2JCaCCEvQ?tvL
zq?Nvc;mMU`)~s2s+pDWS`?H$i*0*n8uB-acA@eqU_Uzeu!ov<Zw6<orL14v-6@1NP
z&?6Z}V!U6!exdP~8{&c^Sr)x(YK9w#I05oHhHoJZdK7Qny0vZFwwW_$g4nv-pyUw-
zm|-k6#5|Wo?NFD!gPwv*nwBgyhjH?-{17Oj6f%Zz;J^WW#n#xkDbmnmb0h0upo~<+
zecifs-m5?jbAus0J%0T74I4J-m!&{%7~_JYK2XLa@pAK~j0_hucW*qda*?lvc*n~(
za9k^p`KC{8tej%`FpSxF<HikM<#6Of4$}(U^zVZBERXN7!Z`i`Hu|{zJ*-s6GXqzz
zUJWb9y!``)C<!sy1IZpp_CT@+l0A^@fxoN={sT8~dfu|Q7%2b%002ovPDHLkV1g0t
B1LXh!

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/mediaview/stories_next.png b/Telegram/Resources/icons/stories/next.png
similarity index 100%
rename from Telegram/Resources/icons/mediaview/stories_next.png
rename to Telegram/Resources/icons/stories/next.png
diff --git a/Telegram/Resources/icons/mediaview/stories_next@2x.png b/Telegram/Resources/icons/stories/next@2x.png
similarity index 100%
rename from Telegram/Resources/icons/mediaview/stories_next@2x.png
rename to Telegram/Resources/icons/stories/next@2x.png
diff --git a/Telegram/Resources/icons/mediaview/stories_next@3x.png b/Telegram/Resources/icons/stories/next@3x.png
similarity index 100%
rename from Telegram/Resources/icons/mediaview/stories_next@3x.png
rename to Telegram/Resources/icons/stories/next@3x.png
diff --git a/Telegram/Resources/icons/stories/stealth_25m.png b/Telegram/Resources/icons/stories/stealth_25m.png
new file mode 100644
index 0000000000000000000000000000000000000000..77fb7fdbb5f874b226f85ed0812f6279619f78bf
GIT binary patch
literal 885
zcmV-*1B(2KP)<h;3K|Lk000e1NJLTq000;O000;W0ssI2ZxyPq00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR917@z|H1ONa40RR917ytkO0OB=utpET5-$_J4R5%f}R82@?Q4~%K%&Zm>
z6dFZ~EC~u1rmkEBwlEn8%s^ZeL<_f~L8SXOEhGeqHf|L(5G)xe{GpO2u%JX+Ouwig
ziG`M7eR!Ypd^*U$%vt!(&v(9i?m6e$*7lF2y(Q1)=4O9?|Mm5COJoZ`AQ1Ta`ttkz
zV`F12pp9V;hojMGTrO8KnJkyfAcDNVzyBSVN~OBJz0G7YHk)l}Y3cOz6fA{8!D_X3
zbaXVH+T4SV6pKZR#nRc?Nf3vJhx_~cqobp>gq4+*_4W0d*+em!OfN4l3Wb6m<8rxl
z6S_nqd3}8~8jTD;Wy)l-kB^VJxw+=ydaqKcER{-PvAEt{v5t?A?RI;Uz#m+@ySu?)
zkQtnsn)>|w6bJ+)FgZE7x3}l@dY6}%;lb^;x3}Se?Ck9Dcsw|VhK4ZEiHQl4!X}^j
z`T3KRlgGzLn3(<1(NTAI_vPg!GSzCeR4PS-e^&)Z0`~Cm5Q#(<78VEtHBOX(F%uVy
z#d0_t7&a1CS64?yMxLLa@9yq!m%+ioSS*I_5ajv!`S|!a(W#0C1_n~86menv8yg#7
zF&GSNHrwrX_xARJE*g!7LLnrhSb}_ddgAl>bwn6vEldKad24G6`;BsZJ|9XO9v((V
zL?Th`I%wA0+glwGE=*s!+1XjA)2Y+x&@AAlr>AiYYD5|u3?a!#K_bzqUmTK7r*RS3
z_|0as`F#FYMQ}~<f(845>TYgsdU|>Y3@NqhC?XV@%jFgq7l|#G%YRgbJXE1jxVE;Y
z)oQ!Cx(Ehfq>xphSjYz_<E=9~RfnJ%fB}pYny;#2>n<)XJRVPbdy9WN000BH@flKN
zn9KeB{lUROUteF9pZP@y0Kfod#^^RyE*uV{*=Do3_F@PCCY%TX02n>1xsIvn_4=!;
zD~vfFkN>O)6qs-#M25>qW-)BKiFwV;%#hv15}%!&B@zib;J@hKW&C16d&^no00000
LNkvXXu0mjf?Vf(L

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_25m@2x.png b/Telegram/Resources/icons/stories/stealth_25m@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ec9a01f7a9fea5a69b67c02dc457808b57ef4a6
GIT binary patch
literal 1778
zcmV<O1`YX%P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NITuDShR9Fe^m|I9yT@c6ZOGzq{
zQo5IA7c?RZGKESkiV(~o#Cnjt6ckZXJ!DxX2?}Q6ix2rAXi(@&X%PrklvWgxT}Uj-
zGBYKu?Bb<N?fco#I@`7P+2`nYdiiKS9B0q`=Ra%DUTbEyUS5B%Kc0bk^X45qcyRpq
z@qav$n*mtO&!0b=o13?6+2W>)4eTEqo13Olqeg+8F=Iw)Y3bFgS3^QV+;p^rd0;_C
z-nDDjK6>=%#EBCleuIM#H-alXJbc}{btGfaqD6}rFZS{A(MaCDeH$4W`SRsUP4D5`
znKNe|IdbIb)2D12m)HLN`#l`qNayS8o0*x})6=8Y@#V{x+qZ8Q6%}2+d|4@#aPi{B
zNs}fS89XU(*s!6Yp+SQE`0;~aadB~D#*C2|X=!O{9S9&}Vq!cQUgO%kcW-}xzl1C=
zFP}4Kjs{Q*B7bC&TxtNh-MMpTVq&7D$z3Jqne!q`dGqE?bab?(=YazUz>v1NbLUzD
zP+}6EtgI|&7}xsT++1OK{P;0t#+k#oapP93SmDendY-MOrbgI!0DG{tb@S%U;(z`6
zbw58pYtV4C6DLljL<wh7Qqpi-y}TAKT*x89nH>tz@SL5ar%ajh{P}ZeJ3Bk6AkKj%
z%atovaO>{wUb=Lt$@rfXJnHxF-ytt6D|449Dk=&Gt`WX$S8=klvxT2N;|lxBe)Hx{
z9O&N84zOD+&Ou|xj(z?5H6iZZyJtq}y^Qm6_wHSAyLRm=EG#rTF#Uvug>mR!y?S-)
z)~$E%-Wf3j3k?nR_VzX^>1ebzqb4OKg%Xd3H^{Csnsk{u!P>um{i+JFLU6o`i;Go}
z1lHBnb@=dM1(-j7{<m-6&}-MgzyPaMFa(aR>?As)QEwsF*49FI;lc&8?fm)k5{Uyy
zwuKSRjvYG$ERz}<R$#oyf%!~bx^xL7g}@xhp_w*qnuOfGeY->ZOPV!nmY7(pB#+rc
zO2fm44+Wf;mj{N9tNB{qZrip^2&n}|z>ooL!GZ;1V{;fm$fHM(=AqdN<b&Lxsjsi6
z_#&tgQQCWZd%Naqc}w*d{p{JZjesG$j|_>ewYAj<LT+qqWII#PK79C~OpIp8>~7J>
zg5JM>&qJ?Svxffl;>C*_H*U1GwJ8@RsBO;Mv^;Ku$bI|vkw)sFa<dUgmE=4%HC15M
z)zxTVXWe4r_tU3O2?+_7JaPh<CM>OkN;zUwAg74m1`;5fngsARMXlN=qrus;XDRo*
zW!A(9wQSk4->#0o1j2g!_;H6ylXzATj5V5GyIsC~xol@<S$}_jW!<`UD+h|FQY9lk
zJ|04@bLY+}m=a|ER0&pkhrk>t{x%IYI5?PX3#_TBN!yPOB7^ko*)zaTo;)$=21P<h
zEP@(MLrz&sON-d1PoHiCDVY^iRaFH91hA&{>({d;WkTS%(FcthWI2+QQ%$czsGu5P
z@OJ9dsj_Nw9m2}nk;i49n)d`F7^`H{?B2awQ3LDi>w~kTq(mu2AcVvssAd{+d;k7@
zaLl7aw7+hyUAra}4<0<A6RC?`DHB{>U7Y~VoH;|cI(F>X$B!S;u&HT(8lhBb!fAT_
zHX|bg3bq@a%V?u(s$L;cjlXiR`Fi~P`Lj`v+}qo0KG=}UjwYNj3bNkqmn>N#{l(nv
zH*Va>_l@O8>Zwzwc#qIco;;cGt5>fM3=Cv*u$S}m^Er%KRK7q?pFWL}rmIS}hH>1|
zjCeBW$cjVjISE?G3E^hf^IElPm8AXX(W9PQhJy)O;a|COr9*2k@j-|W<Bs_>**m(l
zLI^G7gm4LV0Mu6pl|~y69H8M#P(jFQDD;FF9zkqutPF>|=?N1i4A0pL4T<bdXgMEN
z5LdcGhYrchrob?JxPsf+aaUCeT05w{?c~XmvL?nLXW#br3|Mi*U3egLiFW}=PEJ-O
zv9hvK8`tff0plV|fdndhyt`J;r+i64%?@C!rZn431egE-lU;}x?rt7(y;3_{BOi@>
z_UuVdPgm=pYu>qYhi@*boQ%9o!1VB-prD9|2=!^!(b18UlT%Poz<lV8eB^po!@s0x
z2=W%}e}Ms358!50cQd5XacVYg+C(Nu3732wkSDUmMdm6hD)`Td=JogXf0==Q0r7sc
UyviV4asU7T07*qoM6N<$f{Ry6bpQYW

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_25m@3x.png b/Telegram/Resources/icons/stories/stealth_25m@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1601cd0ece743163f3429d8bbe5cd689cc21061
GIT binary patch
literal 2566
zcmV+h3i<VkP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS^a7jc#RA>e5nsumE&lbn8-7VOO
z9oXH4fr^TOs3-=ah$1Q&s0fPKiX9jjDA=voB4T29f`#3!?|t4I?{a>#XYaGmKIfkM
zc--^PnOU>qyJpX<S+n+zi%a??&A|V}45Ww+ifYxWWz3lI)vH&rF&85%`Sa)h_3PJ<
zA3tW#o}D>!<``Lxfte~*s{AYd_w?!0?%lh`z-TN?=#D7|j~zQ!zI^#u*iKLzPRDTX
z|6yfX9aE1k;Z|m{gm_lDbLXyEvu5?`)hkx4SfD_G!i5VH5<LtZKYqMx*RGErKlb2B
z%pn{YIdbHwQ>T9a{v97I{Qhs+v?(#6yV-8sxbe1a+lc9Y{c!N@*|Wz@dE(HE6e+S}
z#|{V1KZG}L-kd&t`ryHXZVZZk=gytdrAsG{15T@H)21Cie*Bj&UkuPcfBxLNcW<v=
zy-JiQku2GN_OM6rKpZ8ga_UbUN~1=N?%us?xOC~#rQySe=gE`Dz~tuG_U+qw;0AMI
zc6;>b@%{UE-K$%-ZnbF9!VQztF(##T>(*}kLg#_EZQHg<lO{q*z{aRiqjZ-(efl(J
z%$PK3(s-EE9Sdvi&73(?*;=w>N%G{$JxoM2lp;ln1q&AFUL8JsxKN=&A(fUYRZ2;P
zyY|kVJ16E=uU-v+khX#_EM2-(%+Of3Ze8lsseLNy(4hlIf=^~)8!%viZgJJBRWcN{
zM&G`DbsN*BO;ZssY6e^s5sh@aqeqW+VGKlOlYIU9RSXOrIy8`)fI@=?4HDDjH0|28
z3#iBt%aJ3;g9i^p^}>Y<4TczWr%ah50A9X)nJZVWC>Y(kb*m^P5A?sUqF_5-1tC#~
zv1QAa_>rLhb?Vd+uU@=(L8=~9Q>1d)vuEdyBVZz3kOXwm#aS6Cy2#|)v}q$?u3o(w
z{AA<E7eyydoQMonbfmdM2&A4pdj?c`^5jX;LUI^TOH{?ml`AKgqbpag1kv5FVMFoi
zz<~pPRFD}IFJ7FBvojC&Bkq%D{rdF+tak0%KBfM$EnBus<m=Y0`**<BqH?%=`SSPg
z-;2oGw{Lgt+C^!=$(|}zs;N__k}h!#v;NpWbLY;@mMxo87E1m4^~K7H6)UVfu0&$`
z>({T9e8^J7kRd~yw=yNmvY9bshGE7?CIqF?7&dH}At>D&H*P3qK!%q<>a((V@nX^F
zY;^A2Ib?;SfB*iv;O5Pn4IixCE?v6lQhIyBgb5;2t5z+2NZKi-r8gQhXdvC4J9kRk
zXk^Kfg%v1C<L=$Nr%#{G6E0Jx%(!vmDpjha_~*=-Lo|E#?3wE3%$ZX)Zr;4PcI{e2
zC*5z~z8yJogqnhLNKy9f+lPMDZr;2(LC%fSr0?IqUrh;XEPeX)=5TzUoLy#)D~W!v
zP@{kN@S%+M?%g|HD2^?p=xf%j5n@;kmfyQ~@01c|(<*Dfy-8_>9P0Du&sIr@gaI{#
z|7;1?q;L{QcuLaMQx<XvMJJUJhOioJ-OHCRD-l+QRo3Ddk0@Whe2SaZVii+Fpl{r`
zk@JMo&F$N_4NfiuLeXC!iDRU*!Vqrb+O=y+q+r2<88T#Wid*&=mtxsAgkz_SP=Ma4
zQzz*fjaIE%356%G+LVMPjm9xBQ9<F%<mjWy0Nf25Hk>(gMg-j&GLJyzF;H}I<NQmn
zQKN=+Z~W!((IOIx5*;WLEOag-Po6xHu4=HJImEn6;@H<OzE!JM^?@iZPEQd%9*Bo7
zriPuVfbv#FH%zEBJh663P4!UZw8dc{g4UvgWsgZnKpoXjr&4bUby8}>>C&ZBY-7ic
zJ$v@7n+T=iMT-`3#8Yd~mp!@Cz<~qZq@Yv(lTlgQLa{eUpky-G0Cpx9D$!4m@|4XC
zMnFj3fJ=JbL_L@dCZ_Q@WlBp3PznJioFOy5KNu=hs30=l(`JC?<h_3Vy2uhUt;jgm
zSxEZ&6g^q9X2l=Tz`H0JG8zCAHUJx=_HN$1c|~UO<jHm>2Q^csOe{GOJap(#u!_9o
z2B`Ab;Q$j`0CvEMv+OY<)yIz?6>G_oC7m)(3O<l|P|Q+8gh8&``Z=bHu!m&_>U7m6
z=nGLl@r9@w0t~1CHbz~$QiAn!KCs^ON(<+;9KlWlWy_Z3_`+xF?&VO@w<uRTrv^m<
zn0jJBb>p$n^~;#`L5mDfR<2wrtK#0hd*1w$CQVYz90N_8HWfXpF?jG`QRNXl^vwcP
zLy79z!wx&7PoF-DgHysITjlMRUVGpw(7t_p!xA|mZ_LOZq06%2Idc=8IB_ELLgLTW
zyI;S4I3}`Om)s5;{on$sh=gvC;K<B*6!F+9au5r@wSjLcnIP^tU#vMrI1)U*;Q^9}
zgk6S^N)ERpiow>&;Ol^pw@g7$tXMIngskfR{rf_9HZESg$a{LLMTmd_l9CGJCMN3i
zHywNnAatWaPRI>_<lW=P^vk_aiF1Kq)#-6U0i~8cV#ElKn29)GWG(<{;0fI&vPmU_
zee4nFLhEwppbAg1ne)13%a&|2cg8;>z>pIhcmYw(n>SD9hC6>qt1(~zhCl*dK#Ob!
zdDqOz<LBjNKui9_000c-7{Gw%PtL~0)ktQDN~Mh@b~L?I3b2R_6P-C^#5et%iAZnw
z!ur__B!Gpl<DU|Iz9o)vVm52m?4RSY=wTGo0s~0VvC1c}qLiTICwxW6@PD;nP9h;N
z024Lk)bXfMif<fTF$*LZ!km}}MtC*tkaNJA)(t#={=8njdLgAEWWWT5#47+qVQV=t
zQOwYn1Ob;)k&`W26qL(hgKwAyK(v&bdiX-wNb}~;pU+j_<cqA2Le$EGqJhx_|2Ue$
z#?hlkb*o$)`SQd2b1I*nq6Aea)b(Rd-edUG6OfI&J>@6ewwly#-MV=f13l~^h`6yF
zP>UhG9O$7TYC~k!A3l6A+<Wxs5%pcFqEaOHwg(%`h#+XFLV1wnJ>Fij_(qU_-q6mP
zHLGLCj!t22F}&ltaNz=>jCujrXMn;+F^d~y(V|7E#^4e!;;ffF-gU4h@z$w1b`+|A
z9-jpp&mm+NRUYNU*m)(Eh*~^7J+TbwgU)~;;!zBJ5iLdWN*a`CSY5o<px#osa%Jy*
zPoe7k`SVm`_{^Ko=T^EA<zY3V?3ivFC)Hk}TE^Dm$0$3EAGIpA_oC~JZat};Gy_R9
ckgzlGZ|kC4DbHt4xBvhE07*qoM6N<$f<`Ib_5c6?

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_5m.png b/Telegram/Resources/icons/stories/stealth_5m.png
new file mode 100644
index 0000000000000000000000000000000000000000..51f1cdfc3b43b3df060ff7328aa69842ce040246
GIT binary patch
literal 791
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfvM5c#WBP}
zaBqmOcUGXt-nyv^m4&D1I0lMLJkY4*JLl;FH`hxp0!tf<FDjgof4IQYeqm!mbI3gf
z7hlIk?tC>bPlyDaZu+CK@m|%v_IZBW#osrVv+X(`mA$_D-M!y2Z9ns~larNY`2Jsg
z{H5ye$&)8vzs}a0`m0!ZhmEc6LDtt#pDqnrDI+VJo11&~+_``ARt9MFxG4RtlXv@B
zQ&(MWE!Dd%YHilmUE8*O+j;%nyLH!J&wa5aD%VENUv09El34fm@88**52}Z9voQ7d
z_lK=6O*+C>TwJX3sKDag`}fTU6*&EpyN?>l@P&tmFTZen;^mh$b#>crzm=I(VpUsF
zal)~NK~_d)&b)b-mR!tm$rckA_iQ@;cwun-@z;+YHLcp{wN$Ft?eyu>Ib9R}9=?*g
z`6kf)mon<=>VTG{r!T+!a>HKbn^k+~oqqbDkDc-P<~auwG{m}>@NM)_JN*9U&6{V=
zoO${*b@$z6EE3$CZ=Pwg?-dghlj>z#I@v?Tp|8LH;+vqATlVeq<IKy;6X7~4y*O|C
z>17jx=18hve_5h785kTt{?<)$)tTyLsF&XpAlvKa{PF^$5A*#0kFO|A<OufToZvKd
zs^iAlXVqpK2d=*Q>h|s1`H!!@{u&k*rY6GFF|o--DCI*OKR>_T^w+$n42pK%dHnH5
z&Az2eRlAxbG~aU{dh_<}!>-3$SF)VbO%YITZ9dv+WpCeqG>NIPp;=9VL!o)buI6CQ
zuAtRdg*sWR9fO-X92^-WkFfmF3(=Z7)92Z{cX}dR4}~V!Y-4Z)N_Z9?&uG8>_L#=w
zZ&Ob{)qmW|5Z$m~#j{O%HhG&3yVkEgn|Am@a{JEXK5?<Jf1Up4uXum%h0N{NduwKa
O5~ZiBpUXO@geCyXNm{A^

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_5m@2x.png b/Telegram/Resources/icons/stories/stealth_5m@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd0804feac5bd750936a23a93c6c570a59affd5f
GIT binary patch
literal 1568
zcmV+*2H*LKP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHib+I4R9Fe^SX(HiZ4^cfF=$W>
z)8vpTH%=EKE*vg2<(zOKhg@)haDkjDMD84NLvg2^MRF+3Ad*5(jYDBD$sv<tPX9Br
ze(!wWyT85nxA*+!;&1lF-tW8Cv!1oy<67_5(fRxN6EpDo_3PZ+Tqh@|KjBQRkJ#AQ
zuV24DJv|{NwP3XXeYFS`02ddRhK7c~z(B(2>guWh%T(#f#BngJQEhGQ;^HEUh68Bb
z)n-hNj*g!`eX_H&<GkM8-7POKudc4Ht*woXjm^%^a)6iW=H%pH$Ef|Rudf#t7QTD;
z?xo^jycQM~{r&xl0SyigwzRZNPfvgU{+(&Budho>OO1?-nE6XJLPA2ewzimKH1hKD
z$eE#`VRUpfg2o~e0Lb9r;QuC+#KgqZ)Kp0>j2olJ9FSKQ5ChxW+xPbNlJ?=@AtNJ$
zskCfVR8$b1gM))I3aDrWv9}~KA3uKF+uI`^oK5X-2ex@XfBvkN#mmdf#Kc50AP8|J
zmzI_&rka`>WiVCpq@*OW$7S>8%^Ouvc{+1*^NEQG;*5%ll4tac!dbnzxPbA-#)h@E
z^|SbQe=#sR2j}PKA3l80fUcvX1JT^x-fCth!-KoK`_<JI$Z>PZfd7O91qIQ>R#sNZ
zwb2B}wx++ozbw1Cxj6*1v$JDtY%I$_Ll7<tstzV6ClyWkT;}ZT{N>9R;8IdjT3cHc
z4TKUOAD_6mI4dhFq456xzO%D)U|>Kf<l4B{nwy&;#M#97IjyLR>_fW;heD)K=;-U~
z9~>Oe;&R`ZT?M#EfUBGi4emLSLPv+Mhhk!4fEXDW!9n1lTo+f%+qZ8a93LM)Iyz!n
zq>G-O9@dp?;JA#Ajz&a8Apew<lt^NJ2ywz`tO*GTN<q&G4-XFl<KR5YH2B4qAafcO
zvlJC*@87>C1#VS_P}V@sC)M%su`-Mb`P9@DX|ZdCFwv5++GT%#UkH+HTUuI@+`zz~
zyu94g(-R|JSXgLkYWnu=o1}?QczAe7U2cYi7#(C|klx(fh@?t7X=!NyKR!N!nkJvV
zPft%}*0pp)W@TjwJ&2Z!4zSE6(9`>2i=>N2b#*m(aTFjyerRiJGc`38x{+)nbjaD#
zOJFiHGciikHxfDp5ta;hNqv32@PcS>Z>M=efu>-=3#gESQ(nRPU?DoK(>t;OF_e{+
zF<Qw6Tu6p4S~6U8WNd3|E6E}h+Su4+XJ>P@05&*b)LvuE1#>DS|F;bv6g4gh3AI?%
z*w_d#9zC!k4fa!4R~In^1O$lTe2?8j%$!G1e|~-*j3`N^)dDF?+DH^AOwq+-jiN!;
zq%ALi^Gzf>fZ>i;aQ))qV&JgdRMewnf_yYIG(-^yzwsQyOOm7Ix*(?=4R@T1@4C9W
z61%dOhR^_O6d4)W-QA4`>*nSr<`ui@)vH%RjAR?+<OS{|0U{w@dO%~Zy-+;_S}GIZ
zNaR>q$Is7?!Y?W+Qik~*IcSOB*Vk7r554X#FE5eO<=V)@fe^F^2rlGV{6wL)r}z2p
z?k;!JXuzTX1r-Pp4ahZqK7@sZ;qeP&thAY#nF6`S0+7(|1Z`+&sK)j%$j{HG#a>xi
z`OW_iVGa^v1FbgEkWF1(9kHC8oZyMB9T5y+PCOvgj^vkBa&j_CV4@oy9(Hqc`=wLY
z0vIM_3ldPNvyi99`9yvoUhDwW@bU5SDk=h~004}3Aq-(I^N{oJGG!6sb(fx=UQkfL
z;=ucBW@cu4dmFbL)uSjzk;9QUyuH2gNFu7Uv$LwID*Rb1vk+AlfV3RZ;2$a^3Ysm|
z-+%$k1|ZF-AeB2qoFPt4cz8Hw0#kwy73!EL%oaYFxxT(W{L#T#{q6oQXW$=tn#_f=
Sf_HcT0000<MNUMnLSTZD1kr2&

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_5m@3x.png b/Telegram/Resources/icons/stories/stealth_5m@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c635dec9f23f0e1147a5886666627f11dce31dee
GIT binary patch
literal 2309
zcmV+g3HtVlP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@Z%IT!RA>e5npbERO%#R`dyft5
zEwL9wMG-4DR4^fk7gqGb8w-lyg$2<Iy%0qO8>k>6*szNY>?jsc#EM<)*n2Pk6UQ9q
z+nt>)*(B<p?;@F<dCz;!nVoXx%qArj{0e&D|JMTz8#Zj)w(URVce!%q7A#os<;$0E
z-@etTQR5%+ZRpUU4<A1Kk^O7arp;gPSc?`djvP6X?a{CQf45_5?0x<E)!`M7f3ahZ
zvFGqDZyZaGcet}KtX;ddbLY+$+P81t-oAbN?%lg*&z?PX>ePu7Cmua|WWoOtO`A4t
za=ahk$M4_2pFDYT(xgds>(>1vd@vfZd-rZ%PrLx^1lzW4>)yS)kvX3$n>1;1<Hijy
z(^dWc{ree#FJ8Rxf^FZvy<WX~`Rs{XeTfn!rca;#;ll?nyVc^6oSaM`GGfGtJ$v@J
z7f-|?fy&LF&oy*89dGo_y((6#R&C<MiRaFpbKrUT-MV$lJ5PG{?3s~~L6`fg?ANcK
zdt|yD6P`YO`dqzwRd?_6=g-524HH0a6$%w9v~1ZjrFh=Fc|p{;N2bLw2#XglK6UEU
zckkZm?oFONIf$-^n8Jk%uU@@c^qoF^IyjL&G8;8&<SSUGPMw1X4~i}dOO`Cb0AIl<
zfK{tj>6%838Wom>rM!Rt{sE<m6)U!8%^F?f^5x3|%7%bVnKDJ!!CVg^92Lqmo-=2T
zu6N|fkx|J^a+#T##0R2a?AWm;RBqKxm@q+9fBg8-K1D+qQKd?ir%#^>_3YWRLkPzN
zUAlCs7(kp^sZymFh_`InBBWclZe?MNfixrq^Nn~?HzOp03(g=EI!?hAD^_$t@~EO#
zty)i>JP~6$cI+5kF)!!h#f!p~o}M0^D-KDb0x^coAUfsn;lqW9xH~#ge3HkG9TSs!
z^ym?h_`-z?iiHD3^XAPXvcxJz=qQdIKYrZ8?HTWN=+J@gQIhM{ts69GkcGwA#7OSj
zw=Z!9Q{M<68^@Ax^ypDzt5@Z|ef#8H;pd@4hrE#H`jsnJO5b$p(!~t2*3uoqU@3$>
zS$68wN!UWiB1C0!5WIZ(vekZbBUvg2uvlOzj2Sb=OyOO7|NebN`26{Eui;?cl-jjx
zSH66C#k^s|25%LfEo60M$HPNTAMW4FmoGPN+_--IdQTRQhMhZis+I~BDztCk-UDT-
zo-t#F^f8mo1o5fU2h6~M1AWjTo7s58ylK;>8Kphnm_omP{hIl0l(bjsTR9u69UQim
ztO-G*lA;HV;%3L1Hf^fV=g*&KAQ>g?mAYeuns#v5*7xt<OLvQ@4ibZ7rAwEtUAwlz
zUAlD1ArSCUk5k35s#U9!#^P^45)16gl`E>1$y};bDL2yKSk0O>C7*Ha+BLUKkQ)7s
z(ZNjGJ9q97ZPHWxWm%g!b7oGGP}i?tS7u-;$8EPs2FJ>lEh{({eJO`3$QvWIwrkfe
za%n`d!ce_>brKt-xFa8~o;`aeY-}x3mV&`C9mnD!&`<>yVudeKq=?swOi;3U^X4*T
z%7kK8;5TpHh?J4R;F!MU5%q|Cr~-SG;6Hu(#0j6}i!sx?cW*MJ(!^w*HEWhU1}`uW
z1YEReQ7PLB`W6&9r`N1mGv*Sz4Hti@si_WqD^{$KjfkXg$&w`<0N+Op69%sp-$~N4
zWlND6J$kgWIq)-skQA>Go|2NnSP(5iEz`I#OvEu*Yxz|)3`KoE)n~k0*j~eE;iVZd
zuU@^9^%?+a6(h`2sT-ynEFuQS9z1x!-JC)MNp1?4Uf^{Ri&d^%S+CT~WPIh3yswl4
z7Q`@2#o&NaNo0A|izbsER3;IpZUEUWTDNYU*pl_c9<Ar|8aHn2#@K5l#UCmmoup50
z_8hwocPpEwOd<AS$5ka!KdZdV5YlOG273)Ai8!X(!3nK{2M-oWZpstdf;}*Wgn^K1
z{P^+QhOyiem~*6;CJN)mjSEKk8-+>2fT_P5d`qlmB1vA+7w-lP88So|ECn`$pu3Q!
zLr-;jExZ~$u_*n@_A2pFBE;v3{J#6DQg@Q<g&tD+&}BDc3??Zadp;*yBJn?$DPjay
z`iYG}pV*qoPP?ydxxD0(R*u*~>3-rcMhvsu_;_Zi=u76k3c!hv($dmMFod!|z%2dD
zuKM-s)7b>Cobf^|(8BVwfK^<Ps<Z`XP0lP)tXi~ak@U^nxpNa$<j)gkh)I|i(Fh_`
zGBApW?lB&FB2q^Z!vM@s_F$NthNF-zT)0qrh&*8wiuh#oL?wphh?vpLhfd;Kggqxm
z>NR0hiy4?C*+C5wvPg1U7+Jo1_39OpAO<)}^_?R^zTIpDU%iTNgntbhG%(|GrxtaR
zmc|T>iA@g~@4b8Xif@EVdA5+CNRQ4iBj%4H7}L6f$B!S|KT3?HQ&E8;y+dP|T5ijT
zV)Y@xf*bS435hBpm(2#>P>lhJkocbXc=^_?ThfIT7B61RIX^xPSxgW@t7}0is^it-
zWaChL`0!y}E2k1Z#n4a0PMN^ZkU#~Y&W}3FNjxxj03Zhq`BY3Spi?=jM2l<Di6G*R
z;Q%>`BAjaiIN=Q;vL<UOj;X@Ed-wRlrB$m|k|g&g$Z7!w7!d>=RFGSOcROtsvoFE|
zAj?00{`>(02DmXq@!SrR#AYqMdGjV2WtF=ne@>>E;|$ptT<Y4jtMRbMg&<=RZ{5s!
zS3?GS$BrG2{*L?zl~+nU?_AO~v1;-5^uRKdZwMkD<I<O-p{P5i%A6?~U3{*<w*VyG
z?DL*X)|oSB4jeeZ4JAt-(V&|!a!t&R>2~0xnoDHMm|Fa3Wv21t1g+*?yw2#_3(5sO
fP|yRp+XMdrZq99i6OxnL00000NkvXXu0mjf-8e;K

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_logo.png b/Telegram/Resources/icons/stories/stealth_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a249195359081142f13c54869a6d5821ae580f
GIT binary patch
literal 1463
zcmV;o1xWgdP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHAxT6*R9Fe^SVu^mOBA+7Y)Dj|
zScoMmiY*WmjVJ^QiADqq2#UQe3}&TRR=N>23lRhjN-QWAq8NxEq6@_m5ETo8#)?Lb
zF)H@@-bW4`=6TDDH*oV7_h0;c|2L=IGc)JRTs1Y-qso9P1F8&A2GrHnOG-)_8yjtH
zZT}ZJdH($Q-#?#~l@&`%%Re8JiHXVK;UUE|J3EWdKOa+IVBq=rImPt(^JfDC10}?y
zF5gFFWMpe=tEQ$V#QOUBUcGvS5J~0Uy?aldJaKn-|Lf;-b91w?vGMimS4{Ef=;+18
zg?!73kEW!gP?GTO=;)x}5a`Lt3G=rA=K8~j4@pT$`uh5cJC>uFot@1tYinysvZ|_z
zNm*cLXQ!Z`z{to*j&TKtii?Zc>)W?)VMRkjqot*VNjYGDe?L7vT|vi^YNn>9L{?W<
zv)BCme307O+DKk(Y^<lJr>m>$ix)2t_m?kUSWE;xJv~-dR+9Gb#=z6&=4N4GA=HqP
zwzf9*k&%%h)fN_6T3Xt{!2wG$zzjZp`c$gcFOi|4p~uI^WbVzIH_*Y(!Ve|p`uaLL
zI+_fbnVC5_IAE0RIy*bBuC8(@433VDLPA1V><+-k$LH+qj16H|$H&J*9~)<Qc$j$X
z?UyfKf<!<I3kz_DY2_vC=H|wwmF)naaQON8-60f+qJMq+_D!?`e0g~p78Zul`}glp
zO-<1#Qi#w&+Su5j4uM=>Uw{1gG5Hg>r)UkvAx|>D^zQBL74;dzCFz@+n=dXd62G^%
zhw=#C#l>ZJcNgUR{Jfr?9vB@Ro$uejv$_cS`}=<>6bNDIh?*jP|NcE&v9q&7U8Yei
z{D%)8VhC%Nrm3i?h$QRk>O>17M%`y?@<4lgyQn7O*RNlbriFzC09MJ5A3sQ7X=w>*
z0~rtyfW<d6GeeS45iN)q)tqGh<Bet{s);x%DvFfn=H?zecmVwD*)!gW)6>&fULeE6
z!%+-L5-Oqv5n~&YjQG|NKL}%0N|MAF8X6M7R>C?%R~;D{iHL}xR*Kr#-QA6C*xA{c
zkdSaoMbhTl+L|OOB_LE9NjYL@p#TpJ4LLeGLK2bT9Tyjex&YqW+Z)lKAa!+h-BO`X
z@h!)ZD5i!qY;SLixn(>#IZ2|A9z8-<zz+-z=<4c%M7LrwtU{D^l7tHLBG}s6;(Y(h
zz0?o1CsA3%T+{OM@`(TR=@Xh7?BwR=vgEsW@5pjxWhIj$fD5UvWs+rOWuiXgv9U33
z5iv0_RA!o*nkXfr7VZeJ4!*g$nbirDmX^wNENcLUWSuVR>+5+&jE#+P5JMc;Ze*&a
zriR_;<m7-v{*Xl`aRg;`S>C1dP^+k@U_&DK`0*p{a7j&cdlVQJPEAdP4A$A;;2_BI
z@^S^EVNY3ES*NF`?0^AEB2GnOOTtwST^5R%Q*J&u6j1fTex&xymK6t1PENRWa45F`
z>Kpq1`1m*~BsPCyVj?`@ioz;r??FL9io2JpiHX3*Mt`^!jpXOm)fFl=j9_`;LPr8P
znRt15Nwxf2q?VQzY9OjJCPFe4X3)$0{r%wyEpK^wnRpxoa2)t8_i~icG%z*T?I_uB
zi3m_9aX6Wnm}qEdNKQ_+wzej9dwYA-K#B<h%KN7PD_YhM@bK_Jucer91;A9wl2jh=
z>+8!G%goG7<vEt)DL6P7c|rxj1ze7pQisq@`3j&^$0}#445%`o%D^2m@DJICX-_x=
Ra^nC1002ovPDHLkV1iaRonrt1

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_logo@2x.png b/Telegram/Resources/icons/stories/stealth_logo@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4300b18f100b3d9863d75aa7a6e618823048844f
GIT binary patch
literal 2836
zcmZ`*S6CCu5>6l#QG*6VdJRMr0)!&Hh7urDDUlivARGfyl%fa-A}yiB&>?gY48;Ia
zLk9st6s3dG%b^I;1VwLrx%a%>huN9ke;#({pYPv^voJF}&&JCJ007RTjF47z@A}7B
z8R)C`$=qGK0|r<b>H;d?@vqZ2NOyab2O15yN{?9qz!)z8=uZmWc<BZJFy;dRjC2qD
zbC%EWU(_|9@qh83#4>poGXQ`s429IW5e(eQcBgQ@g+$1}*@M#Owjt^|QB3th$-+7u
ztk4D!!;`tkAXd<Mu9;c!hGrArn3#=I|D)D|ky-g>wcEqk;nqnl2PbPMC25;cjquau
zQ+4)W!5#IvkoLWZRp2lqndRRHk0+KN2XB8u=c?YXa;9Y|czxR#ubQsE+x!>g6%FAr
z_<d(y&vEewIzv|E7W)3}iKYH$zgKg@e;X2bmlJK=4sW)F(H4ZWXb+DPP476_EBel9
z&+2G}|H6G~rJeP;I3e!0&|PYtH}+_MYr4Ldz-O4>0XMys+v>OYbi2qrPt&H#d6ub*
zb(46_u9Agaa82{Uk3;YEkrJ`qIc3XN#lG{MEMR`4Y^93MrQ^L-o0qn<z^$yv`a2Tl
z<Q$RXyzsE#pKZT?er^egs@iJm<_$gmwk&5TWO%ea`<ATHoXe9bf7|Ed^P#~^d2_Nl
z9W<devqu%N3#cjtZO;g5JlH{OHbkqndJJXdX@!pwTKt!do9?X_A7W}eay1?*iJ8E_
zpuPR|k0mDQkXD#6$%sl|@~!b0Y7PHg$=46So)|HD3}zHOV@kjt4&`aJIX3ze0~)#n
z)B+Wz8iT$%cQTm#Xz*KvJG>q=T4xBMmorV;q4VQ{(3o~x*eTwi(xD#i-0}tE7YRD^
z8aH{X_+Ctl@4Rl20iknBG0nfoFiDBG(X}H|*)QyC28sw(3Es(18BruIw-}{}rb*17
z9n4aE>$yadv@RZzw0^E0u!8>s(+b0X|MIUjj@zF5a(C1zoR)q!)oZjo^_ORN>_x;^
z*ddl*+%zLOJ*j5mlS@nR;}8(=Co6K}Q`s|d6RzAO`IWT~MFOh#8p2MS<S~O9?%UM~
zs1OQb`n9(_7$nLYZKZUH`yI~auU@=gY%1PLGwkOCo#kr#mdT#+N~eT0<4Gy6kz$-&
z(;@V9YpTwgf4;syv>Pp?8Ty__)l~^Mkt~Hlv<()e2pcByr^B77H~1AilR49_+LZ6D
z4m+4j&(YiPU}HR;1nlh2r02Z)4r0jHewU-dxFmFo%D}`n(-!XXf$C82V`ci>G}GsE
zOWFJPZfrNotn{szSvmBEv#*=qUW+JDb*y&n0365QDZ#r7!(@$*qbIwIh8trQB^fh~
z0a_3CjY^@sa16D$*e%3o`nB{d>K>2Ow-g5X*?UjH-2S9nJ@JyJg|9MU=Hxd?LerAn
z=gRG>$eb><o*(S0oY(j1UDcm1lUM9^giZNoNmdI=bdo`5DG=LPYJ#imU+L2C&|&zZ
zqJ~Z5DeZWy!U0^q6FXY#zdT?S*b{&0OIvu=QPabtN`(EyBPb6e;l06^BvwV#KD5Lo
zqn|9I$6RK!HvfHh@#}Q`aMjfdEp$GRaS$uU$SfI`*0o2NmDG61E28e}kUbA2MF05=
zYL4Oz=YwVm>}827p}Lbf%6^5pIDz4F1KHQBIL&YMi<Vdmss)-(CehidOxEdokuno;
zS;m=?eC(Ylq~(l-P$hntRo}%o)rq#6q{9vP0=K5bU#e3OO}iu@rw?vkD#YMvppoed
z+ls7C7zkZk3h;o9g4+UC&72M+fQ<P4mv&WYUYr5g#a;qi3Ayg>msY2O-RYLlW5h9`
z(w-z+%o@hD0W!9C^OE(MQO@N)H)@l>9HCMd{yPj6=RFWfU`1UJ9_(R|yizXPm@3F|
zViVnAn(qmFNax-FEEPaCiRY9g$txE^QQ9~8HoFbs;sJPKXd&ns4>!Tj0CG*m$X%G?
z*f`RM-I?p4{&ljy?#`2)4g4lq-Gaipc_Qh}XEDFn>UH#*5Gf7yix;Kd8Ly<YauK6l
z-y{lf(LnjNeE_2qiioK<Qj<Z`Z{f)%pD^B%P3UOI)f$->KjUYC{M;CDd!!fz>9^!w
z=9`6TxQpZ!x`Il=1p0$Bbyv$=ldmbpL2&BswoB{i0ZROhLc_kNV1cW<P!4*rKQ-5c
zk5@R@S*1x@ugo?Fb&o;L;Du?;E_lJnE4V06|ImNz$Y$E^&M8=FaXOx!bcGKAzXvXs
zO1)}BBq{#=sXZIQxVg<5acW6_2+s|G_hiW7CPsgWtno0^JW~g{{jJQ2VKBeQUs&>B
zipi@&T)|g+5?&IUk3|f(GdYl?c;buayJ8&752!qeJ3~4Ny)4yys<4IDI@J1deHk9D
zKboIyEW2RWk`z&xMM7E{1b%w!amAbR5&?`0f?hjo@MMWc7_Y(=^BypieVyInHFOc4
zB^pLoU81&3wxtQ;xm^y}zs`2v;A8MCI$pLDovk#A(Z8gp>BYGc0cEl){zs9`7-Kw%
zFD#T>hfN7fS#S$#h0W*y7sZ^3olphzpsN+P{*(xcVIWQVWo-Jjlqxaz8r&omg=jvP
z&~DW)e;MxR37d_516sX=F2ATSQ)Ue-y1@cvQgXsO4+x*N*&gsUxaDRNDY|Dv{FTqp
z^Db9y<KzjXi^fs(8Eix|(CIA5TX-gSCCHt%nSg6_gQ6D>S%Zx5BsQxuE+Yw%D4uy+
z<)Ya7J491n^W;0D<t4a8-?Sk2ouXM0b|wxl2>HOFus4n>0c(!oeh$*P;JFGG6Wlt8
zl>B?1f%<og_M@?J%f@SZXS|296b;CndnMRGix}ePGV4+chY>>=(@cRB1KL({j>X##
z1siX?6cusXqF29WK8Ntzi;|e49a1<SP)fPll}kJdP4Ld=U~fA-jyF$w8&~WsjZb>F
zay;|(6S$}kfBig8<v<UJoy5g%LI|=o5)+K-W*E!^$F=SZ_tF~XXeM9Mjpjh_{%X25
z&Ilb|q};5Fe=M2Tt1u{v@L%e4O&~iacHmv_FUO|D_WRR+Hz=k+m#Lo+aMmgf+x4`7
z-2GcFW0)O(!1k6|puMyqF2X_uld4qhd!;l9^b+}5^*a25<k45%`?0(TmKsxE{l0B(
zy{w9Mdy}}B0-dpUN$%07tmD3Q1r`OmGjNH!Q?*{tM$f8ul(tf2LsS}zJiRQRinaT@
zUP?MR+5~s8AO<XjSonI2V?GAO1dx1pFVFYZdVR#d+1cht%A7K0GN0$&IY@n%yudSk
zr{R024tu35{AO)m25G~VDH6M9TW;dGEbjw$JpIw7mLBCoG6aR;B^JlwkCpWcu-~o<
z_3dv?S{Ljp*89xz4g~1*lqX-uSg8E7+{5eA@IhB?Y4oLCYDNZa#)z(2{+atRGcP=`
zeaAw1*LEH_;Uy8D#ZA(DRghIQvs~5DH8IWl_$D5a>6Iv}Xi;#C<4=3r?{XX%On={_
z9$8y>r}~1xAubI1XmbPn#vU2PPvFs#qzmw7vWQ;fh%_b6FPT`z{Gw8Cl0p|sAR^8e
z(M;tzD+B{y^a+hvnM@s;_{Fev;n;1{Z}Z+smcSj+BJN=QZe!yny%IU*rCy1PoA@yT
zXJXClqr*A*@58t~xj9@ScVi|Rm9%FzLgG$di~GN$-@j(To$$HGZNOnz)8&EM;PO8c
NDN5fAS*hz9`5)&SPB{Po

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/stories/stealth_logo@3x.png b/Telegram/Resources/icons/stories/stealth_logo@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..161618d2026318b47932dcdebc96b91058f15d9e
GIT binary patch
literal 4385
zcmbtYXEYqZw_i&VHo6tU2GPap!s^26yLy61u#4!ThbR#xtP(^b$Z8R*B+4QPQNrq?
zgb0bcdXKug|K_}N-uv>tyz@TXxpQZJGw00Q-^|=Q7-K^nIuHj4007YG>B3FPI{BYa
z1IeW`zyB6lQTUqbXaLIkAuD79?r5p^2#EyTBG;(_6frIUs(%o&aF7K6pv<KJP?9yp
zzqVZ9fA=QmQvOf<A5cvV6bk?_#_PfFm<Lj9WCe{_v~hP@N1ax}uUb{Uei$!cU2W-8
z?af~aS*^x`JYxA>^4h}&XCWhb(Hd7wUb>4^o9zilU-KAsw<3}hH@D=M0+wWCNGFY?
z2IT>n0q)x*U#FwK;3k>f@kgG~pz{H~8K%F~fmF&sE{ddZotFQrsT-xf05716CXLxA
znHi~kb{WQ9obC>cmRi$&QT_sBbRNci|NYtRddbXIB!epK^lw{y<n4jz7cC-%*qu)9
zXQ$69&Pf-w(_z8u_)ga#l{{+3bfqVr4%HEzbewXKr^|U-ExArNqtt(v+}&R(=y*)l
zpWS}ZJCeFJ_$p2|8@9&qnu*ETmi2xsQ^8vgo#jGLZc?cp&9j7JTfw6UL3B}+(KYb%
zfQ{eLF*=Cm<JFIMOUy-t-!*MB0vVM5hQka|#QE-2(Yqz!Tl1;Wnz`uqxB=x|L|`Cc
zFF#53K8!20SBbBpSG?itPLC)N7L9o_>Hn*L;nZxFQN1#dH2I{hjSqLSzh?1Y$Z)D=
zhi+zXEO>jX`J!nt(=9-JDaW1Kyt)x_T6VAW{#GN&=InT1>~>zg|MDQ}cyA?5nJ9YA
z#<jy3L$^@TM*q>ecGD(!<8JBw&ljgBosZFfYCP1=_RRiDEaKmYT7(^JO&{;C1&NNX
zU|3tcC+q!P^)Z-@Kee^aL%j5sSGWRaSS=oSU!0Nh2hNVy%F!N%!~wO7uU@knAI9Uw
z>z$`VNr}UrM?JoMQk@~Y-{k`!8CQgILMmggqL;><aze=~dbT&DbD&=t*qhl`A4<k&
z1ubUC@=F_YVJx?;vev_i3QEVz`C5KlLGw((<K|Og`#&x0I}#MO2`pM%JvZ=<y=l<U
z00%2&28DUX8ysOLEJB9WZ;{&`dU|?WQ;p;F{)Rnl(JFK0&F7VT@s{C5@8_7!YO5@=
zhyIW^?L0ep6U8u^A)@ozt-LYKqm6!o*dCuk@-s%S1|0Org!W1#bcYg{be2zFv*}-)
zpJf#_?)EFe-2C8!8|;Qo+aoeFOKoWZEfiOlp>MACRG`|h=}o6Qz0gQS2s9n~uAlg&
z>u;|_a{@%+6(e8P$4aB?@}5|h;liA-`{2(^2yA^;)y^lGkfVjSY&L<Yaqc`_2JiA2
z2k-X>gPIIlpvy_ZfFcU=EWLjxd<R$^qM;v3VmWsU-rCg9L|i4@G$G8k#V}l#hO3ki
z^n|kZMy(%jd|ApiK0n<xI;gqrHkzAv<r($WuNr~hT>a-$beL;c=gr$wg~Cp^JF``S
zcd86*?iLq6KLgn3`*KZqwb7y9R)kBYIS2NK7WgdmATwpZETmaW>MOkK6>cLRy6A0F
zhjK6rr>wIVnO$)<i=hYOoi4r_EOo0TAAhW>;iM5lX@K&C%L#qdcM>_}4dWYIe+}d9
zb=FJ$Xw%`I2h-0k$P}5NXNk8VldYXN&SX+5h|HWf2W>nku4VVG(0A(8V|s(upS^dl
zkyi>$piWT>;D|uBDeUh(Zay3RWF><S93^Ncax`vta6YvjHyQKP!ppfG?A-UNoeT)x
zZfD!i&WFW^K%Pu^2bS)gqCh7hs~uK6O=Q0fXS$jd8v1({p-EQ}1RurVgLTQ#TXeGQ
zMeuXjE;BUyR#o;`rQ=o897|=I?N<ik-g2cfe5Q+i8L9Q~%nxpxl_wju(=ps(!U2Lj
zyuP*}+wEwrB{GM|RPq$*6+Pv-!W~laZ)_Bc;UO_zVjbBTVnF(6QJx)@ar(xwI!(-a
zah<(kPhknmSJ|F4=`v!AM{6Z=+$IoV<=%QpTq^ZOIjUVsg;@ca&P3+k$~U-zq&c?R
z-okPZ*?Bo=uC!wFSshvmFrNI<<g3oYNx<2h*c17aJzDVrM27}A>-hGeAjfMyTCD%5
zRlf*V*~BZGYUh+L)Q9#6mCgFKGV(E~FQ7aY{ltvRx0j#vOU+i(K-m$b0D>lWI)LK^
z25hgLm9*XQDK9F+sFI0^21)juBf*BWsVmEtaDl;Ijhhqt5I`DV8WP_{=5U;!J-5t*
zx9D+btRPEG)^lugqRdT1<7dc?U^2mw1>n%r!|nG6k#-S*?<=EO)^iU6b+H8^id2{B
zI9~5kbQL{c{Qgd<JxbE%X=c9tSka!gNh3af?T8QjfwmC}1_MUIbsz2Pb|qTg;=$EP
z0_hp8e)p`2ex-dU|M;G;Lskn2T7q>?ta|j_=bq^OJqn;G_i9aXonCw)Pcv(nHZCIL
zhrH)R>?QGXN_$s?tdqm<93C~DPC`4~?Cu$9`pM|{M+=D*y@X?2ks0x&b*-mZT14Ra
z(UKBpV$O3)Ufhcv9UZ5*0lbWmsu;`Ka-QKnJ*R%5VHSa-E&;fU?*i-^B@BaBnF^5j
zY#2P^ht|OkoS*+i23O2bdQe%zrsCDLPmN^v*H}ak6Xu(n$=5pavSu&p^ICcH)D&9#
zv6NRl1uD&^@W^#}Fz-6vZJ=*;UY5>l@7oazYJZNI3!ih!1LsN)!R6XpR_0W*iB>Zr
z&p|1(vKWK}l=@n~bZGQL9{OjNr%flDO2G?ir++EKSnxG}9ydRPp3J8j#U0(mHQZ{o
zMhT94)J_T>D7*2Fs<AjQ9j_GT7!ooX^N{c4ev<dVR5B23gtGT#V)cq^NpCDgOiw*s
zE9JHSBJh6WQBRSIT20d-q}KIk&&piqUjH_KqaoE04U6D%U%I&fwCm|2KR5uL^>M;9
zc1X7sZ&`zCd%-)5yF>-aYPd>zF{3j0(NP*T99JO~ux_a$1ZIz)N1RiKqpiR2(sL=p
z6oykc5O|#lJv-^M{pBG(Q_Oj+o4#^P#LvU;^3$|S&&VFp`f3NoioKBq#Ca^l#om!&
zZMrMa<sxWv2Rldsq$bc(UZFRClg<qHU@XsN>nv)v`v$xVntU+8VvOxAFX4X_L3s^V
z<D-$}tEr9{jdZ6D6V#6U!!~61S3EArvIpxS6%5Y+7T=f)HO9Um9N$!oL}F>-(u~@6
zuA)MI!Bpx|UtmdxLCA!#v;ALp=%QLP`n-*lx1*|9cVdwczrj0Ey=D+PqdtI?n0z&w
zS-!lu6g!BaGxaEZ)iRAjgU=AR?{pPAk2oDj#+b{Q0VUp!fohrTnma~Bo1&?Maf(&>
zYA5SexSI7ns6+^{)3aQDxOQF2a-rR{Pf|;#u2uaL=ROk~W{%&`U;)fRd6|~+p;?je
zG7Z(=xB@%G1hBnN3Im~x&5+4*A8W2UakSFE;Xh)+>wApZ%aC!3%a503cPiDc0dq>P
zFi1W^DK%ICgm;ofc@2zLdlfB6n002x!pH~<vxE_yHJ_>RE<bn-%OB={kNvOfx*Dh>
z)(kdlqr}6RNCrXFeTn!tMh-788Sgz}QsG(bte>TofFqpf!0~JF)FYEE4FqU#rF0&v
zL4eo)rnzY>h(oIWFv-`(XjSl{4XWE>Zto<>^fSim#HQpb1b^<YB@8a`g5+AOPT6(R
z0|L|?)tQG2FuABtA-Amgy~%Myd>_iFRh+9E5=8hDzF`Y3i>-KF7VCVU-8^0a;WY{?
z4cr6hr#7dndTFZwYoD%<mcAR)`-&#sF9E$$Cso?601ReNX@(JNK-*LAxkP!vb<H{$
zF^5_OZaA9(tYYL9Z`?D*^GrD{)h9-ID3n5k&V?o}1#{HFRd;px-BsELd2`jy59g2*
z`C1t>cJ@4W+R!d=-hH!g;fB?*E9)9@f<P$XeGtMyDFz;J_2utzCd|dP#<A9qj=vnd
zJMbcD0+~JCfHd2ohv7Zg9*mltMk>pLd4*a6%!v(~Tuh5I6We<Z^Y7(|zBJAcCu}E~
z`7(z-*p?6s7p}EWcG-B(VBs*S$3KQlFr>9aGcE4Wn+c5J5!`0Hieu*bL&#$o$xht1
z>49UfEUHq;3FMP`#Pn>ATh=FF%t6Hz;!EAmpPLy)9YzJ8ReC3fne<;B@m`%nFVsyC
z_~c3?E*Z>N>#toCj-oaz%3S3tyEeQ*N6kc>tXMyK>Ja|YhdET)lrwzfla<-_13#LO
zg#Nm3x^EFl5VYhCP0$lgG0+v<xh9^PDWwaLLXoQavVkYei(9A|^vORuMY>?+)j~^b
z>`P2n4bue`pPWAtPNT;cLh*$@CvdtcR7;RAg#tH<L<292IVIolzu(FMF9YepyYG6U
zSs+p?W7~vwF%-$N5!rbLws(GvGY;JBtX!M(n|^OB=%6apF4g>^IjY#Wi}!ie2>5ww
zls_*ef(%V{FIdWYl0618c`X<UDem;#WEO=gGa2OXe#Jy|WX~Kb8WxW<IH+y1RYXBE
zO_Fa+!REV1tiGE?uV3?S%CzS$oe{fY1e4TLe^&p=xBTToo$X+?qdf6xo#bx1i|LZ&
z<axbY+vgq?&siG*Jr;_AjBY<Z=-*K#q?>ody76Vuj7~t3`aOlRreoKon9D>4{s#M{
z{wysS(|Z$lD<CAZ2UZd5Tw#Z^<mgbj0T*8j&U0AF{`1Y}keuFl|1{}Kaz!Tzxf4Dl
z`Euv4)a7u<m?b|{y)&@JTG>ZaHf4vbN(WUfD>EOQ9_^C3X+Pqmp%FQ79pwWLSYptm
z1i?su?AUM*A7sMNhodj27-Phc7PKGxb{D^EdVXNm5;>tcpe>~T5H|8f*RG^RfFBsz
zdE*JpI%MPXuQ-wqC*GnPgShSKqAP!|mBtSixlotW&YJ6*F72p4o+3eH5OPg!|57m6
zZPMy9A<;h$*_=$89+rNSs)V15T3bYqkzFu$0hLmVV`*YG!D;j6_cKm?e0e4e-$|aS
zMJsN0l5DZGmf}CUi%trpWg377g?{;RS+S|#{3eo&gF~hdI0mT(sSN}sM5Gg`J2%db
zz<M@;vzMf@Y2K)ls<mDu&nON1*NLD_K_x^>P15G1w_Iidk!glm)yF8N=tjqpBtx@U
z0MRtuCCrk)C)FsZB7bIG7j_HnU9vD`{54C^$py=>YZo}DlygM!VWc{OCXN~=zPl9e
z)%vZ?CBh(+GGjdx4MS6bo5JHMv>=bQ2$G3Qa;B2|onJF?rt@6Zl&Yq!z(f1Xxj$yp
zwGnn{Jp0A%iQbOxEgZH2_eA|9zQ(iT8JDeGWQZ}n^?2{G8<*JkkG@KJIGXzg4fHun
zxzlC~>+s)+S#gfrve-@7!dr{)8vLl2ct;1E0I$og`r3yUKe2xliNvR^{3_4MG{O<8
zU54Y{ocVOKMI^ZtfwNR3*v4RG69ZbQj=6??Qtsvf3S2{T<Oo%qGE0o_VM}ty(w&iz
zA1sEp&etj4gZ(LgqB|0<9~)nK4Q{5eijx!xxHq&gMBJAW6%oPYC$R;SdibB|{_TpI
zmC|ID$r44pRCoF8$G;U+f7=Ur^}x3OIZAt0+Yky}8QpT*{eNWg|I06cJ}dCzlC00G
VK>)R<-oNh&JuO3cnTB1&e*h$pQ7Hfb

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 38577fef1..e6dfeeb0a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3877,6 +3877,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_done_many#one" = "{count} story is hidden from your profile.";
 "lng_stories_archive_done_many#other" = "{count} stories are hidden from your profile.";
 
+"lng_stealth_mode_menu_item" = "Stealth Mode";
+"lng_stealth_mode_title" = "Stealth Mode";
+"lng_stealth_mode_unlock_about" = "Subscribe to Telegram Premium to hide the fact that you viewed peoples' stories from them.";
+"lng_stealth_mode_about" = "Turn Stealth Mode on to hide the fact that you viewed peoples' stories from them.";
+"lng_stealth_mode_past_title" = "Hide Recent Views";
+"lng_stealth_mode_past_about" = "Hide my views in the last 5 minutes.";
+"lng_stealth_mode_next_title" = "Hide Next Views";
+"lng_stealth_mode_next_about" = "Hide my views in the next 25 minutes.";
+"lng_stealth_mode_unlock" = "Unlock Stealth Mode";
+"lng_stealth_mode_enable" = "Enable Stealth Mode";
+"lng_stealth_mode_cooldown_in" = "Available in {left}";
+"lng_stealth_mode_cooldown_tip" = "Please wait until the **Stealth Mode** is ready to use again.";
+"lng_stealth_mode_enabled_tip_title" = "Stealth Mode On";
+"lng_stealth_mode_enabled_tip" = "The creators of stories you viewed in the last **5 minutes** or will view in the next **25 minutes** won't see you in the viewers' lists.";
+"lng_stealth_mode_countdown" = "Stealth Mode active – {left}";
+"lng_stealth_mode_already_title" = "You are in Stealth Mode";
+"lng_stealth_mode_already_about" = "The creators of stories you will view in the next **{left}** won't see you in the viewers' lists.";
+
 "lng_stories_link_invalid" = "This link is broken or has expired.";
 
 // Wnd specific
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index c2a1399da..78b286db0 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -2528,6 +2528,11 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		_session->data().stories().apply(update.c_updateReadStories());
 	} break;
 
+	case mtpc_updateStoriesStealthMode: {
+		const auto &data = update.c_updateStoriesStealthMode();
+		_session->data().stories().apply(data.vstealth_mode());
+	} break;
+
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 085958ea2..8aa84afd2 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -174,6 +174,14 @@ void Stories::apply(const MTPDupdateReadStories &data) {
 	bumpReadTill(peerFromUser(data.vuser_id()), data.vmax_id().v);
 }
 
+void Stories::apply(const MTPStoriesStealthMode &stealthMode) {
+	const auto &data = stealthMode.data();
+	_stealthMode = StealthMode{
+		.enabledTill = data.vactive_until_date().value_or_empty(),
+		.cooldownTill = data.vcooldown_until_date().value_or_empty(),
+	};
+}
+
 void Stories::apply(not_null<PeerData*> peer, const MTPUserStories *data) {
 	if (!data) {
 		applyDeletedFromSources(peer->id, StorySourcesList::NotHidden);
@@ -536,6 +544,10 @@ void Stories::loadMore(StorySourcesList list) {
 		}, [](const MTPDstories_allStoriesNotModified &) {
 		});
 
+		result.match([&](const auto &data) {
+			apply(data.vstealth_mode());
+		});
+
 		preloadListsMore();
 	}).fail([=] {
 		_loadMoreRequestId[index] = 0;
@@ -719,6 +731,7 @@ void Stories::applyDeleted(FullStoryId id) {
 				}
 			}
 			if (_preloading && _preloading->id() == id) {
+				_preloading = nullptr;
 				preloadFinished(id);
 			}
 			_owner->refreshStoryItemViews(id);
@@ -836,6 +849,26 @@ std::shared_ptr<HistoryItem> Stories::lookupItem(not_null<Story*> story) {
 	return j->second.lock();
 }
 
+StealthMode Stories::stealthMode() const {
+	return _stealthMode.current();
+}
+
+rpl::producer<StealthMode> Stories::stealthModeValue() const {
+	return _stealthMode.value();
+}
+
+void Stories::activateStealthMode(Fn<void()> done) {
+	const auto api = &session().api();
+	using Flag = MTPstories_ActivateStealthMode::Flag;
+	api->request(MTPstories_ActivateStealthMode(
+		MTP_flags(Flag::f_past | Flag::f_future)
+	)).done([=](const MTPBool &result) {
+		if (done) done();
+	}).fail([=] {
+		if (done) done();
+	}).send();
+}
+
 std::shared_ptr<HistoryItem> Stories::resolveItem(not_null<Story*> story) {
 	auto &items = _items[story->peer()->id];
 	auto i = items.find(story->id());
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 48ea79688..545acdfe0 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -116,6 +116,14 @@ struct StoriesContext {
 	friend inline bool operator==(StoriesContext, StoriesContext) = default;
 };
 
+struct StealthMode {
+	TimeId enabledTill = 0;
+	TimeId cooldownTill = 0;
+
+	friend inline auto operator<=>(StealthMode, StealthMode) = default;
+	friend inline bool operator==(StealthMode, StealthMode) = default;
+};
+
 inline constexpr auto kStorySourcesListCount = 2;
 
 class Stories final : public base::has_weak_ptr {
@@ -139,6 +147,7 @@ public:
 	void loadMore(StorySourcesList list);
 	void apply(const MTPDupdateStory &data);
 	void apply(const MTPDupdateReadStories &data);
+	void apply(const MTPStoriesStealthMode &stealthMode);
 	void apply(not_null<PeerData*> peer, const MTPUserStories *data);
 	Story *applyFromWebpage(PeerId peerId, const MTPstoryItem &story);
 	void loadAround(FullStoryId id, StoriesContext context);
@@ -227,6 +236,10 @@ public:
 	[[nodiscard]] std::shared_ptr<HistoryItem> lookupItem(
 		not_null<Story*> story);
 
+	[[nodiscard]] StealthMode stealthMode() const;
+	[[nodiscard]] rpl::producer<StealthMode> stealthModeValue() const;
+	void activateStealthMode(Fn<void()> done = nullptr);
+
 private:
 	struct Saved {
 		StoriesIds ids;
@@ -375,6 +388,8 @@ private:
 	base::Timer _pollingTimer;
 	base::Timer _pollingViewsTimer;
 
+	rpl::variable<StealthMode> _stealthMode;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 237401606..2ee9496dd 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_recent_views.h"
 #include "media/stories/media_stories_reply.h"
 #include "media/stories/media_stories_share.h"
+#include "media/stories/media_stories_stealth.h"
 #include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
 #include "ui/boxes/confirm_box.h"
@@ -1522,6 +1523,17 @@ void Controller::tryProcessKeyInput(not_null<QKeyEvent*> e) {
 	_replyArea->tryProcessKeyInput(e);
 }
 
+bool Controller::allowStealthMode() const {
+	const auto story = this->story();
+	return story
+		&& !story->peer()->isSelf()
+		&& story->peer()->session().premiumPossible();
+}
+
+void Controller::setupStealthMode() {
+	SetupStealthMode(uiShow());
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 35d82c9b0..a9703c423 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -167,6 +167,9 @@ public:
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
 	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
+	[[nodiscard]] bool allowStealthMode() const;
+	void setupStealthMode();
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
new file mode 100644
index 000000000..b5d441ee1
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -0,0 +1,407 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/stories/media_stories_stealth.h"
+
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_peer_values.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "info/profile/info_profile_icon.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_premium.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/painter.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_media_view.h"
+#include "styles/style_layers.h"
+
+namespace Media::Stories {
+namespace {
+
+constexpr auto kAlreadyToastDuration = 4 * crl::time(1000);
+constexpr auto kCooldownButtonLabelOpacity = 0.5;
+
+struct State {
+	Data::StealthMode mode;
+	TimeId now = 0;
+	bool premium = false;
+};
+
+struct Feature {
+	const style::icon &icon;
+	QString title;
+	TextWithEntities about;
+};
+
+[[nodiscard]] QString LeftText(int left) {
+	Expects(left >= 0);
+
+	const auto hours = left / 3600;
+	const auto minutes = (left % 3600) / 60;
+	const auto seconds = left % 60;
+	const auto zero = QChar('0');
+	if (hours) {
+		return u"%1:%2:%3"_q
+			.arg(hours)
+			.arg(minutes, 2, 10, zero)
+			.arg(seconds, 2, 10, zero);
+	} else if (minutes) {
+		return u"%1:%2"_q.arg(minutes).arg(seconds, 2, 10, zero);
+	}
+	return u"0:%1"_q.arg(left, 2, 10, zero);
+}
+
+[[nodiscard]] Ui::Toast::Config ToastAlready(TimeId left) {
+	return {
+		.title = tr::lng_stealth_mode_already_title(tr::now),
+		.text = tr::lng_stealth_mode_already_about(
+			tr::now,
+			lt_left,
+			TextWithEntities{ LeftText(left) },
+			Ui::Text::RichLangValue),
+		.st = &st::storiesStealthToast,
+		.duration = kAlreadyToastDuration,
+		.adaptive = true,
+	};
+}
+
+[[nodiscard]] Ui::Toast::Config ToastActivated() {
+	return {
+		.title = tr::lng_stealth_mode_enabled_tip_title(tr::now),
+		.text = tr::lng_stealth_mode_enabled_tip(
+			tr::now,
+			Ui::Text::RichLangValue),
+		.st = &st::storiesStealthToast,
+		.duration = kAlreadyToastDuration,
+		.adaptive = true,
+	};
+}
+
+[[nodiscard]] Ui::Toast::Config ToastCooldown() {
+	return {
+		.text = tr::lng_stealth_mode_cooldown_tip(
+			tr::now,
+			Ui::Text::RichLangValue),
+		.st = &st::storiesStealthToast,
+		.duration = kAlreadyToastDuration,
+		.adaptive = true,
+	};
+}
+
+[[nodiscard]] rpl::producer<State> StateValue(
+		not_null<Main::Session*> session) {
+	return rpl::combine(
+		session->data().stories().stealthModeValue(),
+		Data::AmPremiumValue(session)
+	) | rpl::map([](Data::StealthMode mode, bool premium) {
+		return rpl::make_producer<State>([=](auto consumer) {
+			struct Info {
+				base::Timer timer;
+				bool firstSent = false;
+				bool enabledSent = false;
+				bool cooldownSent = false;
+			};
+			auto lifetime = rpl::lifetime();
+			const auto info = lifetime.make_state<Info>();
+			const auto check = [=] {
+				auto send = !info->firstSent;
+				const auto now = base::unixtime::now();
+				const auto left1 = (mode.enabledTill - now);
+				const auto left2 = (mode.cooldownTill - now);
+				info->firstSent = true;
+				if (!info->enabledSent && left1 <= 0) {
+					send = true;
+					info->enabledSent = true;
+				}
+				if (!info->cooldownSent && left2 <= 0) {
+					send = true;
+					info->cooldownSent = true;
+				}
+				const auto left = (left1 <= 0)
+					? left2
+					: (left2 <= 0)
+					? left1
+					: std::min(left1, left2);
+				if (left > 0) {
+					info->timer.callOnce(left * crl::time(1000));
+				}
+				if (send) {
+					consumer.put_next(State{ mode, now, premium });
+				}
+				if (left <= 0) {
+					consumer.put_done();
+				}
+			};
+			info->timer.setCallback(check);
+			check();
+			return lifetime;
+		});
+	}) | rpl::flatten_latest();
+}
+
+[[nodiscard]] Feature FeaturePast() {
+	return {
+		.icon = st::storiesStealthFeaturePastIcon,
+		.title = tr::lng_stealth_mode_past_title(tr::now),
+		.about = tr::lng_stealth_mode_past_about(tr::now),
+	};
+}
+
+[[nodiscard]] Feature FeatureNext() {
+	return {
+		.icon = st::storiesStealthFeatureNextIcon,
+		.title = tr::lng_stealth_mode_next_title(tr::now),
+		.about = tr::lng_stealth_mode_next_about(tr::now),
+	};
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeLogo(QWidget *parent) {
+	const auto add = st::storiesStealthLogoAdd;
+	const auto icon = &st::storiesStealthLogoIcon;
+	const auto size = QSize(2 * add, 2 * add) + icon->size();
+	auto result = object_ptr<Ui::PaddingWrap<Ui::RpWidget>>(
+		parent,
+		object_ptr<Ui::RpWidget>(parent),
+		st::storiesStealthLogoMargin);
+	const auto inner = result->entity();
+	inner->resize(size);
+	inner->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(inner);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::storiesComposeBlue);
+		p.setPen(Qt::NoPen);
+		const auto left = (inner->width() - size.width()) / 2;
+		const auto top = (inner->height() - size.height()) / 2;
+		const auto rect = QRect(QPoint(left, top), size);
+		p.drawEllipse(rect);
+		icon->paintInCenter(p, rect);
+	}, inner->lifetime());
+	return result;
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeTitle(QWidget *parent) {
+	return object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
+		parent,
+		object_ptr<Ui::FlatLabel>(
+			parent,
+			tr::lng_stealth_mode_title(tr::now),
+			st::storiesStealthBox.title),
+		st::storiesStealthTitleMargin);
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeAbout(
+		QWidget *parent,
+		rpl::producer<State> state) {
+	auto text = std::move(state) | rpl::map([](const State &state) {
+		return state.premium
+			? tr::lng_stealth_mode_about(tr::now)
+			: tr::lng_stealth_mode_unlock_about(tr::now);
+	});
+	return object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
+		parent,
+		object_ptr<Ui::FlatLabel>(
+			parent,
+			std::move(text),
+			st::storiesStealthAbout),
+		st::storiesStealthAboutMargin);
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeFeature(
+		QWidget *parent,
+		Feature feature) {
+	auto result = object_ptr<Ui::PaddingWrap<>>(
+		parent,
+		object_ptr<Ui::RpWidget>(parent),
+		st::storiesStealthFeatureMargin);
+	const auto widget = result->entity();
+	const auto icon = Ui::CreateChild<Info::Profile::FloatingIcon>(
+		widget,
+		feature.icon,
+		st::storiesStealthFeatureIconPosition);
+	const auto title = Ui::CreateChild<Ui::FlatLabel>(
+		widget,
+		feature.title,
+		st::storiesStealthFeatureTitle);
+	const auto about = Ui::CreateChild<Ui::FlatLabel>(
+		widget,
+		rpl::single(feature.about),
+		st::storiesStealthFeatureAbout);
+	icon->show();
+	title->show();
+	about->show();
+	widget->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		const auto left = st::storiesStealthFeatureLabelLeft;
+		const auto available = width - left;
+		title->resizeToWidth(available);
+		about->resizeToWidth(available);
+		auto top = 0;
+		title->move(left, top);
+		top += title->height() + st::storiesStealthFeatureSkip;
+		about->move(left, top);
+		top += about->height();
+		widget->resize(width, top);
+	}, widget->lifetime());
+	return result;
+}
+
+[[nodiscard]] object_ptr<Ui::RoundButton> MakeButton(
+		QWidget *parent,
+		rpl::producer<State> state) {
+	auto text = rpl::duplicate(state) | rpl::map([](const State &state) {
+		if (!state.premium) {
+			return tr::lng_stealth_mode_unlock();
+		} else if (state.mode.cooldownTill <= state.now) {
+			return tr::lng_stealth_mode_enable();
+		}
+		return rpl::single(
+			rpl::empty
+		) | rpl::then(
+			base::timer_each(250)
+		) | rpl::map([=] {
+			const auto now = base::unixtime::now();
+			const auto left = std::max(state.mode.cooldownTill - now, 1);
+			return tr::lng_stealth_mode_cooldown_in(
+				tr::now,
+				lt_left,
+				LeftText(left));
+		}) | rpl::type_erased();
+	}) | rpl::flatten_latest();
+
+	auto result = object_ptr<Ui::RoundButton>(
+		parent,
+		rpl::single(QString()),
+		st::storiesStealthBox.button);
+	const auto raw = result.data();
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		std::move(text),
+		st::storiesStealthButtonLabel);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->show();
+
+	const auto lock = Ui::CreateChild<Ui::RpWidget>(raw);
+	lock->setAttribute(Qt::WA_TransparentForMouseEvents);
+	lock->resize(st::storiesStealthLockIcon.size());
+	lock->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = QPainter(lock);
+		st::storiesStealthLockIcon.paintInCenter(p, lock->rect());
+	}, lock->lifetime());
+
+	const auto lockLeft = -st::storiesStealthButtonLabel.style.font->height;
+	const auto updateLabelLockGeometry = [=] {
+		const auto outer = raw->width();
+		const auto added = -st::storiesStealthBox.button.width;
+		const auto skip = lock->isHidden() ? 0 : (lockLeft + lock->width());
+		const auto width = outer - added - skip;
+		const auto top = st::storiesStealthBox.button.textTop;
+		label->resizeToWidth(width);
+		label->move(added / 2, top);
+		const auto inner = std::min(label->textMaxWidth(), width);
+		const auto right = (added / 2) + (width - inner) / 2 + inner;
+		const auto lockTop = (label->height() - lock->height()) / 2;
+		lock->move(right + lockLeft, top + lockTop);
+	};
+
+	std::move(state) | rpl::start_with_next([=](const State &state) {
+		const auto cooldown = state.premium
+			&& (state.mode.cooldownTill > state.now);
+		label->setOpacity(cooldown ? kCooldownButtonLabelOpacity : 1.);
+		lock->setVisible(!state.premium);
+		updateLabelLockGeometry();
+	}, label->lifetime());
+
+	raw->widthValue(
+	) | rpl::start_with_next(updateLabelLockGeometry, label->lifetime());
+
+	return result;
+}
+
+[[nodiscard]] object_ptr<Ui::BoxContent> StealthModeBox(
+		std::shared_ptr<ChatHelpers::Show> show) {
+	return Box([=](not_null<Ui::GenericBox*> box) {
+		struct Data {
+			rpl::variable<State> state;
+			bool requested = false;
+		};
+		const auto data = box->lifetime().make_state<Data>();
+		data->state = StateValue(&show->session());
+		box->setWidth(st::boxWideWidth);
+		box->setStyle(st::storiesStealthBox);
+		box->addRow(MakeLogo(box));
+		box->addRow(MakeTitle(box));
+		box->addRow(MakeAbout(box, data->state.value()));
+		box->addRow(MakeFeature(box, FeaturePast()));
+		box->addRow(
+			MakeFeature(box, FeatureNext()),
+			(st::boxRowPadding
+				+ QMargins(0, 0, 0, st::storiesStealthBoxBottom)));
+		box->setNoContentMargin(true);
+		box->addTopButton(st::storiesStealthBoxClose, [=] {
+			box->closeBox();
+		});
+		const auto button = box->addButton(
+			MakeButton(box, data->state.value()));
+		button->resizeToWidth(st::boxWideWidth
+			- st::storiesStealthBox.buttonPadding.left()
+			- st::storiesStealthBox.buttonPadding.right());
+		button->setClickedCallback([=] {
+			const auto now = data->state.current();
+			if (now.mode.enabledTill > now.now) {
+				show->showToast(ToastActivated());
+				box->closeBox();
+			} else if (!now.premium) {
+				data->requested = false;
+				const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
+				if (const auto window = show->resolveWindow(usage)) {
+					Settings::ShowPremium(
+						window,
+						u"stories_stealth_mode"_q);
+					window->window().activate();
+				}
+			} else if (now.mode.cooldownTill > now.now) {
+				show->showToast(ToastCooldown());
+				box->closeBox();
+			} else if (!data->requested) {
+				data->requested = true;
+				show->session().data().stories().activateStealthMode(
+					crl::guard(box, [=] { data->requested = false; }));
+			}
+		});
+		data->state.value() | rpl::filter([](const State &state) {
+			return state.mode.enabledTill > state.now;
+		}) | rpl::start_with_next([=] {
+			box->closeBox();
+			show->showToast(ToastActivated());
+		}, box->lifetime());
+	});
+}
+
+} // namespace
+
+void SetupStealthMode(std::shared_ptr<ChatHelpers::Show> show) {
+	const auto now = base::unixtime::now();
+	const auto mode = show->session().data().stories().stealthMode();
+	if (const auto left = mode.enabledTill - now; left > 0) {
+		show->showToast(ToastAlready(left));
+	} else {
+		show->show(StealthModeBox(show));
+	}
+}
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.h b/Telegram/SourceFiles/media/stories/media_stories_stealth.h
new file mode 100644
index 000000000..d4ccae4b6
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.h
@@ -0,0 +1,18 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Media::Stories {
+
+void SetupStealthMode(std::shared_ptr<ChatHelpers::Show> show);
+
+} // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index dfbab352b..c3cdbd01b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -111,6 +111,14 @@ void View::tryProcessKeyInput(not_null<QKeyEvent*> e) {
 	_controller->tryProcessKeyInput(e);
 }
 
+bool View::allowStealthMode() const {
+	return _controller->allowStealthMode();
+}
+
+void View::setupStealthMode() {
+	_controller->setupStealthMode();
+}
+
 SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 4d6cdac1e..b3dee4aa5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -91,6 +91,9 @@ public:
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
 	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
+	[[nodiscard]] bool allowStealthMode() const;
+	void setupStealthMode();
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index adf770688..e291abe45 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -413,8 +413,8 @@ storiesSiblingWidthMin: 200px; // Try making sibling not less than this.
 storiesMaxNameFontSize: 17px;
 storiesRadius: 8px;
 storiesControlSize: 64px;
-storiesLeft: icon {{ "mediaview/stories_next-flip_horizontal", mediaviewControlFg }};
-storiesRight: icon {{ "mediaview/stories_next", mediaviewControlFg }};
+storiesLeft: icon {{ "stories/next-flip_horizontal", mediaviewControlFg }};
+storiesRight: icon {{ "stories/next", mediaviewControlFg }};
 storiesSliderWidth: 2px;
 storiesSliderMargin: margins(8px, 7px, 8px, 6px);
 storiesSliderSkip: 4px;
@@ -911,3 +911,73 @@ storiesInfoTooltipMaxWidth: 360px;
 storiesCaptionPullThreshold: 50px;
 storiesShowMorePadding: margins(6px, 4px, 6px, 4px);
 storiesShowMoreFont: semiboldFont;
+
+storiesStealthLogoIcon: icon{{ "stories/stealth_logo", storiesComposeWhiteText }};
+storiesStealthLogoAdd: 12px;
+storiesStealthLogoMargin: margins(0px, 28px, 0px, 7px);
+storiesStealthBox: Box(defaultBox) {
+	buttonPadding: margins(10px, 10px, 10px, 10px);
+	buttonHeight: 42px;
+	button: RoundButton(defaultBoxButton) {
+		height: 42px;
+		textTop: 12px;
+		font: font(13px semibold);
+
+		textFg: storiesComposeWhiteText;
+		textFgOver: storiesComposeWhiteText;
+		numbersTextFg: storiesComposeWhiteText;
+		numbersTextFgOver: storiesComposeWhiteText;
+		textBg: storiesComposeBlue;
+		textBgOver: storiesComposeBlue;
+
+		ripple: universalRippleAnimation;
+	}
+	margin: margins(0px, 56px, 0px, 10px);
+	bg: groupCallMembersBg;
+	title: FlatLabel(boxTitle) {
+		textFg: groupCallMembersFg;
+		align: align(top);
+	}
+	titleAdditionalFg: groupCallMemberNotJoinedStatus;
+}
+storiesStealthButtonLabel: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: storiesComposeWhiteText;
+	align: align(top);
+	minWidth: 20px;
+	maxHeight: 20px;
+}
+storiesStealthLockIcon: icon {{ "dialogs/dialogs_lock_on", storiesComposeWhiteText }};
+storiesStealthTitleMargin: margins(0px, 10px, 0px, 0px);
+storiesStealthBoxClose: IconButton(defaultIconButton) {
+	width: boxTitleHeight;
+	height: boxTitleHeight;
+
+	icon: icon {{ "box_button_close", storiesComposeGrayIcon }};
+	iconOver: icon {{ "box_button_close", storiesComposeGrayIcon }};
+
+	rippleAreaPosition: point(4px, 4px);
+	rippleAreaSize: 40px;
+	ripple: storiesComposeRippleLight;
+}
+storiesStealthAbout: FlatLabel(defaultFlatLabel) {
+	textFg: storiesComposeGrayText;
+	align: align(top);
+	minWidth: 20px;
+}
+storiesStealthAboutMargin: margins(0px, 5px, 0px, 15px);
+storiesStealthFeatureTitle: storiesHeaderName;
+storiesStealthFeatureAbout: FlatLabel(defaultFlatLabel) {
+	textFg: storiesComposeGrayText;
+	minWidth: 20px;
+}
+storiesStealthFeaturePastIcon: icon{{ "stories/stealth_5m", storiesComposeBlue }};
+storiesStealthFeatureNextIcon: icon{{ "stories/stealth_25m", storiesComposeBlue }};
+storiesStealthFeatureIconPosition: point(3px, 7px);
+storiesStealthFeatureMargin: margins(0px, 8px, 0px, 6px);
+storiesStealthFeatureLabelLeft: 46px;
+storiesStealthFeatureSkip: 2px;
+storiesStealthBoxBottom: 11px;
+storiesStealthToast: Toast(defaultMultilineToast) {
+	maxWidth: 340px;
+}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index fb30c3b4d..ee6b3bd53 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1631,6 +1631,15 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			}
 		}, &st::mediaMenuIconReport);
 	}();
+	if (_stories && _stories->allowStealthMode()) {
+		const auto now = base::unixtime::now();
+		const auto stealth = _session->data().stories().stealthMode();
+		addAction(tr::lng_stealth_mode_menu_item(tr::now), [=] {
+			_stories->setupStealthMode();
+		}, ((_session->premium() || (stealth.enabledTill > now))
+			? &st::mediaMenuIconStealth
+			: &st::mediaMenuIconStealthLocked));
+	}
 	if (story && story->canReport()) {
 		addAction(tr::lng_profile_report(tr::now), [=] {
 			_stories->reportRequested();
@@ -5249,6 +5258,7 @@ void OverlayWidget::setContext(
 			{ story->peer->id, story->id });
 		if (maybeStory) {
 			_stories->show(*maybeStory, story->within);
+			_dropdown->raise();
 		}
 	} else {
 		_message = nullptr;
@@ -5289,7 +5299,6 @@ void OverlayWidget::setStoriesPeer(PeerData *peer) {
 			updateControlsGeometry();
 		}, _stories->lifetime());
 		_storiesChanged.fire({});
-		_dropdown->raise();
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index f1b1a2029..dfe5430b2 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -134,6 +134,8 @@ mediaMenuIconProfile: icon {{ "menu/profile", mediaviewMenuFg }};
 mediaMenuIconReport: icon {{ "menu/report", mediaviewMenuFg }};
 mediaMenuIconSaveStory: icon {{ "menu/stories_save", mediaviewMenuFg }};
 mediaMenuIconArchiveStory: icon {{ "menu/stories_archive", mediaviewMenuFg }};
+mediaMenuIconStealthLocked: icon {{ "menu/stealth_locked", mediaviewMenuFg }};
+mediaMenuIconStealth: icon {{ "menu/stealth", mediaviewMenuFg }};
 
 menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }};
 menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }};

From 3adb0c1856d6d16566da0501bc1c9ed96501b007 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 2 Aug 2023 11:57:35 +0200
Subject: [PATCH 581/676] Show correct reply placeholder in stealth mode.

---
 .../media/stories/media_stories_reply.cpp     | 34 +++++++++++++++-
 .../media/stories/media_stories_stealth.cpp   | 40 +++++++++----------
 .../media/stories/media_stories_stealth.h     |  2 +
 .../media/view/media_view_overlay_widget.cpp  |  2 +-
 4 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 7ea8ce8b7..d6fbfd7c6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_sending.h"
 #include "apiwrap.h"
 #include "base/call_delayed.h"
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/send_files_box.h"
 #include "chat_helpers/compose/compose_show.h"
@@ -30,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
+#include "media/stories/media_stories_stealth.h"
 #include "menu/menu_send.h"
 #include "storage/localimageloader.h"
 #include "storage/storage_account.h"
@@ -42,6 +45,35 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_media_view.h"
 
 namespace Media::Stories {
+namespace {
+
+[[nodiscard]] rpl::producer<QString> PlaceholderText(
+		const std::shared_ptr<ChatHelpers::Show> &show) {
+	return show->session().data().stories().stealthModeValue(
+	) | rpl::map([](Data::StealthMode value) {
+		return value.enabledTill;
+	}) | rpl::distinct_until_changed() | rpl::map([](TimeId till) {
+		return rpl::single(
+			rpl::empty
+		) | rpl::then(
+			base::timer_each(250)
+		) | rpl::map([=] {
+			return till - base::unixtime::now();
+		}) | rpl::take_while([](TimeId left) {
+			return left > 0;
+		}) | rpl::then(
+			rpl::single(0)
+		) | rpl::map([](TimeId left) {
+			return left
+				? tr::lng_stealth_mode_countdown(
+					lt_left,
+					rpl::single(TimeLeftText(left)))
+				: tr::lng_story_reply_ph();
+		}) | rpl::flatten_latest();
+	}) | rpl::flatten_latest();
+}
+
+} // namespace
 
 class ReplyArea::Cant final : public Ui::RpWidget {
 public:
@@ -85,7 +117,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 		.mode = HistoryView::ComposeControlsMode::Normal,
 		.sendMenuType = SendMenu::Type::SilentOnly,
 		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
-		.customPlaceholder = tr::lng_story_reply_ph(),
+		.customPlaceholder = PlaceholderText(_controller->uiShow()),
 		.voiceCustomCancelText = tr::lng_record_cancel_stories(tr::now),
 		.voiceLockFromBottom = true,
 		.features = {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index b5d441ee1..7bf25a1cf 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -45,31 +45,13 @@ struct Feature {
 	TextWithEntities about;
 };
 
-[[nodiscard]] QString LeftText(int left) {
-	Expects(left >= 0);
-
-	const auto hours = left / 3600;
-	const auto minutes = (left % 3600) / 60;
-	const auto seconds = left % 60;
-	const auto zero = QChar('0');
-	if (hours) {
-		return u"%1:%2:%3"_q
-			.arg(hours)
-			.arg(minutes, 2, 10, zero)
-			.arg(seconds, 2, 10, zero);
-	} else if (minutes) {
-		return u"%1:%2"_q.arg(minutes).arg(seconds, 2, 10, zero);
-	}
-	return u"0:%1"_q.arg(left, 2, 10, zero);
-}
-
 [[nodiscard]] Ui::Toast::Config ToastAlready(TimeId left) {
 	return {
 		.title = tr::lng_stealth_mode_already_title(tr::now),
 		.text = tr::lng_stealth_mode_already_about(
 			tr::now,
 			lt_left,
-			TextWithEntities{ LeftText(left) },
+			TextWithEntities{ TimeLeftText(left) },
 			Ui::Text::RichLangValue),
 		.st = &st::storiesStealthToast,
 		.duration = kAlreadyToastDuration,
@@ -277,7 +259,7 @@ struct Feature {
 			return tr::lng_stealth_mode_cooldown_in(
 				tr::now,
 				lt_left,
-				LeftText(left));
+				TimeLeftText(left));
 		}) | rpl::type_erased();
 	}) | rpl::flatten_latest();
 
@@ -404,4 +386,22 @@ void SetupStealthMode(std::shared_ptr<ChatHelpers::Show> show) {
 	}
 }
 
+QString TimeLeftText(int left) {
+	Expects(left >= 0);
+
+	const auto hours = left / 3600;
+	const auto minutes = (left % 3600) / 60;
+	const auto seconds = left % 60;
+	const auto zero = QChar('0');
+	if (hours) {
+		return u"%1:%2:%3"_q
+			.arg(hours)
+			.arg(minutes, 2, 10, zero)
+			.arg(seconds, 2, 10, zero);
+	} else if (minutes) {
+		return u"%1:%2"_q.arg(minutes).arg(seconds, 2, 10, zero);
+	}
+	return u"0:%1"_q.arg(left, 2, 10, zero);
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.h b/Telegram/SourceFiles/media/stories/media_stories_stealth.h
index d4ccae4b6..f40b77bc4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.h
@@ -15,4 +15,6 @@ namespace Media::Stories {
 
 void SetupStealthMode(std::shared_ptr<ChatHelpers::Show> show);
 
+[[nodiscard]] QString TimeLeftText(int left);
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index ee6b3bd53..0cd3ca35e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1313,7 +1313,7 @@ void OverlayWidget::updateControls() {
 	}
 	_shareNav = navRect(index);
 	_shareNavOver = style::centerrect(_shareNav, overRect);
-	_shareNavIcon = style::centerrect(_shareNav, st::mediaviewSave);
+	_shareNavIcon = style::centerrect(_shareNav, st::mediaviewShare);
 	if (_shareVisible) {
 		++index;
 	}

From 4bd925ac2c730bca750fdf03dd0d1a0eee0c1e1c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 2 Aug 2023 21:41:58 +0200
Subject: [PATCH 582/676] Implement simple UI for single-type likes in stories.

---
 Telegram/Resources/icons/chat/input_like.png  | Bin 0 -> 699 bytes
 .../Resources/icons/chat/input_like@2x.png    | Bin 0 -> 1356 bytes
 .../Resources/icons/chat/input_like@3x.png    | Bin 0 -> 2003 bytes
 Telegram/Resources/icons/chat/input_liked.png | Bin 0 -> 559 bytes
 .../Resources/icons/chat/input_liked@2x.png   | Bin 0 -> 942 bytes
 .../Resources/icons/chat/input_liked@3x.png   | Bin 0 -> 1362 bytes
 Telegram/Resources/langs/lang.strings         |   2 +
 .../chat_helpers/chat_helpers.style           |   2 +
 .../chat_helpers/compose/compose_features.h   |   1 +
 Telegram/SourceFiles/data/data_story.cpp      |   9 +-
 Telegram/SourceFiles/data/data_story.h        |   3 +-
 .../view/controls/compose_controls_common.h   |   1 +
 .../history_view_compose_controls.cpp         |  49 +++++++-
 .../controls/history_view_compose_controls.h  |   7 ++
 .../stories/media_stories_controller.cpp      |  20 +++-
 .../media/stories/media_stories_controller.h  |   7 +-
 .../media/stories/media_stories_reply.cpp     |  11 ++
 .../media/stories/media_stories_reply.h       |   2 +
 .../media/stories/media_stories_stealth.cpp   |   2 +-
 .../SourceFiles/media/view/media_view.style   |   7 ++
 .../media/view/media_view_overlay_opengl.cpp  |  45 +++++---
 .../media/view/media_view_overlay_opengl.h    |   3 +-
 .../media/view/media_view_overlay_widget.cpp  | 107 +++++++++++++-----
 .../media/view/media_view_overlay_widget.h    |  13 ++-
 .../ui/effects/emoji_fly_animation.cpp        |   3 +-
 .../ui/effects/emoji_fly_animation.h          |   4 +-
 Telegram/SourceFiles/ui/menu_icons.style      |   1 +
 27 files changed, 235 insertions(+), 64 deletions(-)
 create mode 100644 Telegram/Resources/icons/chat/input_like.png
 create mode 100644 Telegram/Resources/icons/chat/input_like@2x.png
 create mode 100644 Telegram/Resources/icons/chat/input_like@3x.png
 create mode 100644 Telegram/Resources/icons/chat/input_liked.png
 create mode 100644 Telegram/Resources/icons/chat/input_liked@2x.png
 create mode 100644 Telegram/Resources/icons/chat/input_liked@3x.png

diff --git a/Telegram/Resources/icons/chat/input_like.png b/Telegram/Resources/icons/chat/input_like.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7ccead7e2d8a4b30fce9a3dcb2d7f254b984943
GIT binary patch
literal 699
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl1ZV#WBP}
z@NCH0?#e`weZ~<H9(I#9s01l(QgU+nDZXLzg#Jz6{5Nd7qLb1&_sBG%z)9yf9Xz(3
z_u2O|8FzM;|1sEYS$h9m^|{YB-}gSB^IPah{ATf6jVVSmk0w1Vu=rcIKSpo<`RCdV
z2NQ1OnC*<&cQZ$8>ZuZ|y~{NCW}o$2etG%jmw!*U9Zocns{OeoLdQ(1cc0Pw21Xt(
zS0-t(?$EVi{l}BFre1nk!qs}{@kfzvSA+X@ynYJ<3U=SMm>9O&S8X!G;~0gYEkd0v
z3mz8C5K`?(FyLU~;nNlEba7yu*yCJkH$Q!Iq|ukN+$>CW`~OEblsGa@w3%`+p<&zg
z*Q$!=D;G3ySUp%@aY1v<<daV<tvaRpkKgc65n3bf^!lsR>JY7?zqEz9S`X-paRY_U
zrU`#u6tuE#Dbt3VImcuY9(g3K49VIWHABMa%ZX&8nau|k=ARF4;A>}2<!*JF^5U+q
zjU4;YmnD}1XYBr4*PppWJ@2jI<lAq}rk}p+@u|Y*56g?YhgWsGD1G5hXmluW=1}Z)
z+Z?slYVNsuL6(EhKVOtFk!s(ywx}~|?X|-XFJzcF{OEjKwDW6~tmpyL560g83+fu2
zUK^=hH(8RsRVofBweBE$-`zZS-P>=sMd<8v2o$fmn77@zUVcJm=H!!GV)Ux_&Wl<b
zrZx3$o_OiOx$e!jTd%(Uy7?xLGymcG1QV(E7vy@3PCfbj)8OMwA2#!2vJ3Z5|HVF&
WLvRc8ElXEW!tr$Vb6Mw<&;$VDlp`?!

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_like@2x.png b/Telegram/Resources/icons/chat/input_like@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..965ae814b2c68d5018bda421299c1152271acb6a
GIT binary patch
literal 1356
zcmV-S1+)5zP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGwn;=mR9Fe^SXn5wT@*fkQ)G<H
zLo#HzAw%4lGe<uPNs24Utt+K)<4SHMS1w2rE>IFeD5QjxdAu=ap8fyx{i|=i@7LMq
zJ?Hq(`7XY^7w4?A*0Y|q_ImeTd+(!CeLvq7_`@n-qC6faC#S5etc;8dA0Hn_N5{Ln
zyS=@=rKP3*{{G|RV+CJdU*Cd)g6QaIe}8{lTifgF>%+st(b3V7k&%mw3k64wCL0@@
z#>U3S$H#v}&*$go`1p8COpLmJY;5f0<fO>yhYo~IO-&$IcT~~@1qJQz?`tBJ>$|$T
zPyphB(B0iFw`!6>ju1*2$Zb(kQD<jo%r!GJQ(avh85tQ65P;9Jva-IuzNe=r25fF_
zhK7cQg@r+2B`VR|+gn;%8Xg|*=jRs@5m8lDH9bAe0E7UWJg!)Fc6L5JJta51?3|n&
zA<oUst)rvk<Ku&nV8=r;l<n>9uCA^^$L#EE&=L}X5Kah_lo&mskB*LlgM%f5NWx^l
zyu2hled1?&db$WJ=|Vz6upkJJaFRh?0vF-l-`|B3R^0{cTpI}Zsg6<CfE*zxmeK$Q
z1_lV!+}y0rqDh1Kfp&lgf+mc*9w8_eI*7XUhsMRl<@NOyptrX-Oc60igZA(L9t}pZ
z+TGn9fe;Qs5n2E$EG(pyhlYj(W+SMEhleR5S}4>1#Zq8kAjxRNtTd{yxVT9C@}49}
zXlrZBsCh6s2jW`5BqhW+yjqrjk6>wO$$_MVuCA^~iw%{{Mio3gJ&7NEp94t=p{J1+
z8#SAaDtLH!5I?py4kRVSQ!Fhljm<_C;^N|ne|2?L5Xi#9;{N^~>kvl^efyArPMZq*
z60P}{mlr!bJBCXYLW7!^n1I2=#H6OCh7m>*Dk>_789{GvZ^cnkQ&TBxAdEV-9UL6a
z&(A3q_J46Uq@A0aBV0>MixTet+1lFLD9ZZ!I$nqp8D=y=ajZ#5NKk@))rNyMAEc6#
zleN?EG4$ZzKtA2Hd+LC&va-UOqA~aM^yuKBQsH)Sa&kgGI2&jwsZNv<sI#+^m~U=w
zxDQEYO%h%l7C(75G&E>}>8r1;ttC!;78Mog=U!i5&(1j5>*p*&BLf~}Yip|rqNu~0
z;`24O+uYn-MYtAYW@aXx{xC?~6-`Y|wKxdP*4EbZ^Yc_E?0-o~NkW)bWny9?UpR5t
z()*Su4}b~Iivk-<e0;pzs*8-?K|2x#wz08cfPRa8ZD(hP>I7=NniB@V*=%ob^Lay;
zktkujy}fsLcPXcbhX?F1O6Z@ql#~>J$qVjYUS2;fhWN(6A6zHQCoLP0N`*TlU$>DB
z+zpY%uN){i-`=rga7+2sF8#{O%X@x)rrO}(Y~b2Raa1bIr?s^;iiE3Yd3m|qN^(g_
z30=4V!z{-AOC4iK4VKCB@-pRwMu$H}<m{D|mArATtgMJ{fN}?e$oBU3v$M056F%_=
zl)1UNnVDH#T^;x0g@pyQ41<Kzi3B}!Y;25kLf_*B1?AM#6#t8*6P-aoxJ=>vz&Wun
zI5>zihCxDng(N>eA8!XM9LoyZLUD2NS6B@0g9(Jk;I!X_-xc^u1^xx$3&oh>MItu<
O0000<MNUMnLSTZ+C}hR}

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_like@3x.png b/Telegram/Resources/icons/chat/input_like@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb2285df9fa379bd6d931fcd7f198ab171da328d
GIT binary patch
literal 2003
zcmV;^2Q2uBP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?JxN4CRA>e5TWd%aTNKt_q@|fc
zRzG@3Wn~7^AECFx%?c!nj7Xs%$fU$TP$cL_(i`m|S(bu5D2YOgB2%yeMe|3gX{2aY
z^nP5!-df!c=eo~2YtD>&&r#3e-gExAX79DW^{q8~_Uyg(=;h`4c{1S1fF}c<4Ezr=
z;B75NZ*TA5;NY=6zmX$Hwzs!Gd-klmyW1L?uo^L9#FQyhCQqLH<HwJ`dwwrpzWn|B
zw@?@;Vf5(HYu2nOC@6UK>eV0nUsqRGOG`^mPR`=Ri-!yuBF|vx(4kRLQMtLfPo6ya
z_3M{C>Yul7-xd}Y#>K_KwLGSR=CEPIwr<_}=FJ=C*x@C@-nnz<s8OTL9f0euUAsWt
zAqZ=PT2fLHXqaQF_2MQpH8n9$eO|tP{Tft;4<D{~hQ@8%wn?UmI(qcz(V|6*^ng}c
zFbpu_DY}weU0pqC(j@8_mo+stN+47jWY(@-O936qeM}xm`LSci*faCx%a@9Ziqg{3
z=H}+k&Q3gCAt525p`lBcE_L{TefaPpK0f~D&6{AbeEITo=gtKN1~N8yx`2t_<HwKN
z+S+hS{rvo9%$Tuk*)lwVkf}bVlkMBLA3uJaHY&&|DJe8nkiUNYx@XTGe}8`?l!+53
zrlqC5fB&8tg36XHTM`o!A+WA@@7|@RrecmY!h}0Gg==OAdPXK@?Q`eO{rU4J#cF71
zz(j0j)7uvi5OCnY0o+Myj*wVXz~8rT-<UCDdhN{q!Zip`K#WO{G_%q7VI(|w@PMLJ
zR#xJrrPnlRS+HOM-a-_F$}e8Lm_L8MiMhTD1VDp=fTY98NpJga%kJH~sr|is_k4YQ
z4YiFs#*ZHlTMDJgm^@6zo-v*mXw=r$Qb15O(YNbDV!nO*CX6A^oH^4@L*)W!?B?SV
zV^syiPIuO<S&W|SP{JEVL<Ip)wjHqg#kg_fFxP3A5OArEVP^qKlpzS)bsJsK1mj7-
zlE+9>zJ2=i>Dt;4g1nWHCMeOT_x}C+Mw+(vdGqGcWMH1P^*JZ~)$?->!)CpA?_SCi
zv~7J3C9Ls;0cPiE)22C8b9p0(37!x@yAMhwB_+ZD&qE*DF73v;M^FWA#)a=M=mZE$
zrtMajlpYpzj2jP(zFw#$GjoSaN)IngMu`VTH&K{*n6_J8K7amP@L{WDwDZ6|e*7r3
zC0B7me~<;#5roI@-@gl46U+h&3JPM{ZgojldH<=vun822#@<KBn!xWEwo*c4&YU?y
zc0(aNJY2A9Y-|*=Ch)+js;Y!WSXh|k227X?nt)~W?Af!0yN3@S3Rx3)VA=*=D6L$%
zQpj#4tXQ#v?!@T*Fyx7auXv;1xN*Z!&!rv3#l?c;r%#{g3~9&<^-y7h8VkMShBkxS
zfoTI(XF>Af#fwt@qobpR4Fp*;DeV4HI(qadWr#|aEG~wuuynVZhWU){pi$wGjS6}(
zF)<=A2v@FLQ7|50)$`}iQ*N6!ZBlc{inZ(3ty8lf7;V&KX$=n>D>^qy`9#T<CI;19
z6hoyf2TTbI^w!o^%4*fBRaU%RzI>UYuveTFMCWWyoH#-Gl$V!V#G5c-LPtjj#X`m0
zB9_x;8#Zj9Og?}9Jay_+>!|D3ucvS*N-tTm#5$Z+ODqc!31yO;oNN`W*DgOlpCV$F
zOqbQYS_AkOyW^)%pHdE2uU^Gjv9m7m$kx@>QCzGz^*dH)-5A*GYuY%`l`Z`mVA`7T
zPGkqFw{G21o@Z@%vJzZezkZ$O6az9MB0|<)MsMN5h3r)6!i5X$Ku`upUI*ZCL8HPN
zC^j}$9zj-f^XARe4djz2Ps$pr>j9j(+p%MZI*gnJJ6?k0?CfkgQ#Gx_hYz!;_V3@X
z2BE5*mzT#}9y)YL6~tUWD=Uk+fKzjme(2Q?eULbK@L)ec_dp;`EUKcSq5*xFZOri%
z3EjYIJdkFahE)j(Vo_mZF$mMIjW4$1cuO)8_}<8w_vVo!M;IWE8U{5gEk49{?b<a)
z1rLLTVS{wA1ukF#E>+2}WxM|*IM$EJvuDpL9fBeew92Ao3d6x=QEB<XP`PyJ61#8M
z??}?Z<H~l#fP%RTMxg$F<NoN$p>F5n<D*xmEeIZS14{~ONB#VX8+EBFV>q2YeVS3c
zefze_S{Y$u=gLgZoH?U3j8%DB(Z>Y9s$w9G!ioNSFrXvgJ9qA|s7{?aWntp6!qtKe
zJIn|5`uci$N(xMDI#{I$YFI-#^Qy2wRoNsXBZJ)ve5NP%-I0-z_?VI@WM*b6yK#vD
zN+YyLriFnW9lkkbA>lGTJ>4ZFEjrz}aU(6S>*GNSf_Gtc$YNkHTfKTUtH99kaJZU~
zkYF9%wU#(KEGsLc@o4hhyLbC}hp&s%=~|BtQQv@rC>)63KLs%Fq27c-C#pkwHBXBt
l1D*_cGT_O8Cj-hE_y@$!OKwN9Y<2(u002ovPDHLkV1f}0vta-L

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_liked.png b/Telegram/Resources/icons/chat/input_liked.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a267ca1dcc25a971c766b452bb6fcd064def113
GIT binary patch
literal 559
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY^JA+V~B;|
z*(tW`njA!0ze;j(aZf!Ja7#+KV=5;b@4F`57i=+Hs-2>1bq#m%NOw-{VwJeq@XJr;
zX}Utk+{qd5=2o9Oo|-lz=;d{{nOPmrD?KNzy85bWubJ=Xy8Z1<UQ3lu7p=Zp6kEPA
zB4_*U4O2KGrd>7RJ$Jl1$87e;ikP~-lPO7&*LHtu;7N)Q;!xo^ye4e51?#-qZ`=Og
zEN;o1vo%I9(PzW5%b6<{FkM*5euUM)O(7uncHi{w;|6ZNor@yw%nUo!x9s1C!+x%B
zYvoO6pA|n*IOqM_iOKu#@1In)ci!eXFUvd6C!|~Ub+53f-uM2vsOuvIj%S}MT^vnh
z__{4FOSuLLDX3VKKVeyRb*6E~aRZ)NO?$#tKU8+GyzJ)d#8$ZY;t7VtRd@5|`z`OU
zZDfjEe);6G2{-HZ*YAxhj?jqJ6OUo86bU-~%W>Avz8Oc7-4<U==L+OuYySMxXXAvb
zdF_97y%cxFt#9YnNl`qo>%qC-eNI=J6lD0=H^m=+yz%ziX8|u(Pn-1U$LdvG)<M_5
g-pz9lt+)Qm&fjt`Y|kauhoH#vboFyt=akR{03!b3WdHyG

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_liked@2x.png b/Telegram/Resources/icons/chat/input_liked@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..600b472be6ef34c0a8ec2099cc66bf04ab7eb948
GIT binary patch
literal 942
zcmV;f15x~mP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF7)eAyR9Fe^SkFshQ53FmRPqNQ
zW>o%Y5xLN%DQ<KjQBgZx*niW){sI4oq=l#}K|;la2`NIP2wEwU8^sI@Dq1*m8i)HX
zzI*SC&)#Dge5>z%$8)~V^RD;3<HExHns?wo>%b!W`{?!h!^6Xag9D4jqSNVKUS68b
zW~o$)#bOT+4~*Q+&CNg{;B-2-wzjld?bFj!yWLKuQpsep-|sULsUeL<6AFc1UtfQa
zuF+_ePN!Wi7eC+ac4xC$Qqm^}1y4^;p*TO0#aOM@R;xuTit}e@XV8FgEdY^71dq}%
z6bA{G13b2~v(xMKXtnr!y<WH3Y<9aH06$7&K*Hg0;JReIva-_cc4<{;JXD8^7NzkZ
z1af2_h>b?0w0tpmkVDc0u)n`AhAO)zh!U)fsdzljP8K5yCkWZl>gwvp$A=h_?3y47
z(#X>{guGs_TrNjT$pDCYJRT&+8QR|7My$jDKa>6mLwGMZLlSodms2X0XvrBG3<ijm
z7`(l`Aw|y6<KrV@B?j<lLyDZCVzG!=iNVdy4N~OZhZG70+%>gYjbhROIEM@d!}Ig=
zSdQxu1TvY7G$wEr5Jhfq{uA%+?y^r+F``FDN0UDA_2uQI7^<|I)oOKdk=r)7lizr6
zZ;zHN2JiFv2qq?|zkCgy-QW57`Ghoi3DZTV)0th5U12yJZftCj9q?JWaWGe~E6x}V
z27`QE7ISiPGNU9TJsb|Rw23j;{35+y!>lNi$%vwVAXO?=p-^CaQ2`;CdZ(TeahtHg
z;Xxxnn3z(l)nGQq>kGkaYioCRcSM1y$lKdnqtPhD0YArVHs9ahPbEL`VMsTbO#I5i
z8Tj`@aG$^pqzl)kWkSQJn%>7vYBU;O+#B2<?59elGI2W?OW4Kh>+5)hugCB+DVNI(
z6DV|jeT`3mUvC9fTwY$z=krLI2(GTK;K)EJq60WHFD@>KR)Eaqa_C<y(XAi>7^dL;
zf$u4iNGvTap^r%o{C+>&9T=?M-{0Y}aD03$wF9Ew_g@z=G$-dBkh%ju0gw9pbUZyc
QRR91007*qoM6N<$f^i3!+5i9m

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/chat/input_liked@3x.png b/Telegram/Resources/icons/chat/input_liked@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d6c546e61902de675c4cd4131b4e8f09e0ed329
GIT binary patch
literal 1362
zcmV-Y1+DstP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<yh%hsRA>e5TT3W)Q560?Q%wGW
zJO&;kqLgHaGQmV5N>Y^a2r-kCM9EB2$}>tx<S{^$G7ux=l?*(}`|(Q#-u|!umX39f
zefQqZJ@=meb4GjZz4lt)xAwkg@3r^2zkXSd6#**(Rs^gF{09+mljG>-<`xhT@cZB6
z<KuI9czAq#{QCMTXYI3>x3_m#SXgLi=+o2FpMTHk>FN9X`=^4V3VwcmSy@@Vy}f5=
zXCGgmmzS6Q{r&d#_N1gFcXxMw1Rfq9$;rtb9UTV;2XAk0U#)&zUS9V1_vhr~z%{>3
z0ZmU&&(hM;i;D~5SW^V;y1F`FUthKZV6CsO2Xsv%q!ManWo3ZDwkg(%LD<>ZA)f4t
z=jZ2u;^pO~c81FG@^a2FDIM+Z?j|NCstwB2U>ab?E3FHaS5{U+LPC^|A+D~j3K>x<
z159>yw$h+X86j8Cd!-wm^7Zv~YHF&@eOg-D&CLx@FNO{v0hkOQTc4_`Du#8TCcN2-
zi;GK2N>C8$$WR768E!E#G0)G>47;LDprj)!c*mRsNHK2saj&nhi$XVEA0RbfPGIYy
z$+)4R0q+dWCYP!V3=G6pVR3O$jY?zZf$ap=d+aCF+Adi0`1lwc9E@EG!KSfA$ji$!
z3oDQTQ~)Ndv_(_=x|F}?wY4>ECd%5lxHx4Wvy=f_$pU3M6|sO44O56}*pyg&e7q@`
z5RhuvlvreBB<W)cF(M*@;H1QmJ`xR6h*;1FPP&dEU(`A0Ar2iQVzY*XRcV`!*zN7D
zve_(UEYk$4MT`W*#l)+tD}soQ7?MJwVG413dz;{-#Fm$riH0e}t*tGBlM<Vqoh2Hk
z5Y^*BU-zJKa&m%1z!ZFJAn)(*{r&xs?<+CW5kuSD+?-Ow^~*CeGlUf|YY-b89CUp$
zN`!rVeM*s4#*{Tn!m_!!$znp<a13Y`Vugi;1iT&bCx^9$1!Zq<@4Hi~Z|Na*GYp@!
zql}D<ZwW9O#>U2^T^i7FVPSy*p4Ai-6m)lYX8=SA7Y`2);o;#d^z63W+*}E-26U;c
ztYjm%-`dmDV*pSg7gJMHH~_W}ovne3$&HN-A;%6?#*Hq{s@a%%TXEaXd7<i1N-&O}
zR%~o6FK!;agoFfrZ<QoMfcw7m^mHDyVmd`dMG|Oq>{4A_Eryt1yRorRN1#HcT3TB8
zamr|Rc6JH@(nT3gWv~kM!N(~>Lqod2<uo!fG9vUvj1ZkK$~aM-n3&*%^+UDs@p0j8
z?ia9v0zP`eD)~ducDqkbP8!O}76fpco}RV~PFexR;X*LrI;q34gXScrgVR{qf`h3t
zIyx#nESepWE;(Tass|g_960~cgeXxtJUr||*FAV0cXxM7&>&p~1_sD&kUEY=*C3B*
zYilDwg~YC|E`!!9iP$tZHw%&ZRBml;)gi@_K+NBzwzl>YE@z>ssfpjdGc_wJD)>Ki
ztEs7RCRS131qB88sGB`vAde7;T6VsEW@aW5-tV~K);K>u-}xxz5JX2u&(F`Rxh*X%
z>73!K@csC#M`cl65fv4cl9Gad3gEqWbaaG+PMi*@)vOvT0#*d92v`xYA|M=rzw!y>
U<iB}b3;+NC07*qoM6N<$f<o0@l>h($

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e6dfeeb0a..70306ad8f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -272,6 +272,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_error_noforwards_channel" = "Sorry, forwarding from this channel is disabled by admins.";
 "lng_error_nocopy_group" = "Sorry, copying from this group is disabled by admins.";
 "lng_error_nocopy_channel" = "Sorry, copying from this channel is disabled by admins.";
+"lng_error_nocopy_story" = "Sorry, copying of this story is disabled by the author.";
 "lng_sure_add_admin_invite" = "This user is not a member of this group. Add them to the group and promote them to admin?";
 "lng_sure_add_admin_invite_channel" = "This user is not a subscriber of this channel. Add them to the channel and promote them to admin?";
 "lng_sure_add_admin_unremove" = "This user is currently restricted or removed. Are you sure you want to promote them?";
@@ -3876,6 +3877,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_done" = "This story is hidden from your profile.";
 "lng_stories_archive_done_many#one" = "{count} story is hidden from your profile.";
 "lng_stories_archive_done_many#other" = "{count} stories are hidden from your profile.";
+"lng_stories_save_promo" = "Subscribe to {link} to download other people's unprotected stories to disk.";
 
 "lng_stealth_mode_menu_item" = "Stealth Mode";
 "lng_stealth_mode_title" = "Stealth Mode";
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 79c85a03d..75fbfbbb0 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -196,6 +196,8 @@ ComposeControls {
 	send: SendButton;
 	attach: IconButton;
 	emoji: EmojiButton;
+	like: IconButton;
+	liked: icon;
 	suggestions: EmojiSuggestions;
 	tabbed: EmojiPan;
 	tabbedHeightMin: pixels;
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_features.h b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
index 2f9915679..ba6f43b4e 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace ChatHelpers {
 
 struct ComposeFeatures {
+	bool likes = false;
 	bool sendAs = true;
 	bool ttlInfo = true;
 	bool botCommandSend = true;
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index fbc678581..e8389ad2c 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -276,8 +276,13 @@ bool Story::edited() const {
 	return _edited;
 }
 
-bool Story::canDownload() const {
-	return /*!forbidsForward() || */_peer->isSelf();
+bool Story::canDownloadIfPremium() const {
+	return !forbidsForward() || _peer->isSelf();
+}
+
+bool Story::canDownloadChecked() const {
+	return _peer->isSelf()
+		|| (canDownloadIfPremium() && _peer->session().premium());
 }
 
 bool Story::canShare() const {
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 8ea17b7b7..70370f176 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -100,7 +100,8 @@ public:
 	[[nodiscard]] bool forbidsForward() const;
 	[[nodiscard]] bool edited() const;
 
-	[[nodiscard]] bool canDownload() const;
+	[[nodiscard]] bool canDownloadIfPremium() const;
+	[[nodiscard]] bool canDownloadChecked() const;
 	[[nodiscard]] bool canShare() const;
 	[[nodiscard]] bool canDelete() const;
 	[[nodiscard]] bool canReport() const;
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index 06f295ee8..8af04e830 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -41,6 +41,7 @@ struct SetHistoryArgs {
 	Fn<Api::SendAction()> sendActionFactory;
 	rpl::producer<int> slowmodeSecondsLeft;
 	rpl::producer<bool> sendDisabledBySlowmode;
+	rpl::producer<bool> liked;
 	rpl::producer<std::optional<QString>> writeRestriction;
 };
 
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 4901c3bf9..6990d5b22 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1069,9 +1069,10 @@ ComposeControls::ComposeControls(
 , _wrap(std::make_unique<Ui::RpWidget>(parent))
 , _writeRestricted(std::make_unique<Ui::RpWidget>(parent))
 , _send(std::make_shared<Ui::SendButton>(_wrap.get(), _st.send))
-, _attachToggle(Ui::CreateChild<Ui::IconButton>(
-	_wrap.get(),
-	_st.attach))
+, _like(_features.likes
+	? Ui::CreateChild<Ui::IconButton>(_wrap.get(), _st.like)
+	: nullptr)
+, _attachToggle(Ui::CreateChild<Ui::IconButton>(_wrap.get(), _st.attach))
 , _tabbedSelectorToggle(Ui::CreateChild<Ui::EmojiButton>(
 	_wrap.get(),
 	_st.emoji))
@@ -1138,6 +1139,7 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 		| rpl::then(std::move(args.slowmodeSecondsLeft));
 	_sendDisabledBySlowmode = rpl::single(false)
 		| rpl::then(std::move(args.sendDisabledBySlowmode));
+	_liked = args.liked ? std::move(args.liked) : rpl::single(false);
 	_writeRestriction = rpl::single(std::optional<QString>())
 		| rpl::then(std::move(args.writeRestriction));
 	const auto history = *args.history;
@@ -1153,6 +1155,7 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	initWebpageProcess();
 	initForwardProcess();
 	updateBotCommandShown();
+	updateLikeShown();
 	updateMessagesTTLShown();
 	updateControlsGeometry(_wrap->size());
 	updateControlsVisibility();
@@ -1559,6 +1562,15 @@ void ComposeControls::init() {
 		_botCommandStart->setClickedCallback([=] { setText({ "/" }); });
 	}
 
+	if (_like) {
+		_like->setClickedCallback([=] { _likeToggled.fire({}); });
+		_liked.value(
+		) | rpl::start_with_next([=](bool liked) {
+			const auto icon = liked ? &_st.liked : nullptr;
+			_like->setIconOverride(icon, icon);
+		}, _like->lifetime());
+	}
+
 	_wrap->sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
 		updateControlsGeometry(size);
@@ -1980,7 +1992,7 @@ void ComposeControls::fieldChanged() {
 	if (!_hasSendText.current() && _preview) {
 		_preview->setState(Data::PreviewState::Allowed);
 	}
-	if (updateBotCommandShown()) {
+	if (updateBotCommandShown() || updateLikeShown()) {
 		updateControlsVisibility();
 		updateControlsGeometry(_wrap->size());
 	}
@@ -2521,6 +2533,7 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 		- st::historySendRight
 		- _send->width()
 		- _tabbedSelectorToggle->width()
+		- (_likeShown ? _like->width() : 0)
 		- (_botCommandShown ? _botCommandStart->width() : 0)
 		- (_silent ? _silent->width() : 0)
 		- (_ttlInfo ? _ttlInfo->width() : 0);
@@ -2560,6 +2573,12 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 	right += _send->width();
 	_tabbedSelectorToggle->moveToRight(right, buttonsTop);
 	right += _tabbedSelectorToggle->width();
+	if (_like) {
+		_like->moveToRight(right, buttonsTop);
+		if (_likeShown) {
+			right += _like->width();
+		}
+	}
 	if (_botCommandStart) {
 		_botCommandStart->moveToRight(right, buttonsTop);
 		if (_botCommandShown) {
@@ -2584,6 +2603,9 @@ void ComposeControls::updateControlsVisibility() {
 	if (_botCommandStart) {
 		_botCommandStart->setVisible(_botCommandShown);
 	}
+	if (_like) {
+		_like->setVisible(_likeShown);
+	}
 	if (_ttlInfo) {
 		_ttlInfo->show();
 	}
@@ -2598,6 +2620,15 @@ void ComposeControls::updateControlsVisibility() {
 	}
 }
 
+bool ComposeControls::updateLikeShown() {
+	auto shown = _like && !HasSendText(_field);
+	if (_likeShown != shown) {
+		_likeShown = shown;
+		return true;
+	}
+	return false;
+}
+
 bool ComposeControls::updateBotCommandShown() {
 	auto shown = false;
 	const auto peer = _history ? _history->peer.get() : nullptr;
@@ -3100,6 +3131,10 @@ rpl::producer<not_null<QEvent*>> ComposeControls::viewportEvents() const {
 	return _voiceRecordBar->lockViewportEvents();
 }
 
+rpl::producer<> ComposeControls::likeToggled() const {
+	return _likeToggled.events();
+}
+
 bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
@@ -3123,6 +3158,12 @@ rpl::producer<bool> ComposeControls::fieldMenuShownValue() const {
 	return _field->menuShownValue();
 }
 
+not_null<QWidget*> ComposeControls::likeAnimationTarget() const {
+	Expects(_like != nullptr);
+
+	return _like;
+}
+
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
 	if (_voiceRecordBar->isActive()) {
 		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
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 de7002012..80ad5e7b2 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -161,6 +161,7 @@ public:
 	[[nodiscard]] rpl::producer<InlineChosen> inlineResultChosen() const;
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
 	[[nodiscard]] rpl::producer<not_null<QEvent*>> viewportEvents() const;
+	[[nodiscard]] rpl::producer<> likeToggled() const;
 	[[nodiscard]] auto scrollKeyEvents() const
 	-> rpl::producer<not_null<QKeyEvent*>>;
 	[[nodiscard]] auto editLastMessageRequests() const
@@ -221,6 +222,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> recordingActiveValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 	[[nodiscard]] rpl::producer<bool> fieldMenuShownValue() const;
+	[[nodiscard]] not_null<QWidget*> likeAnimationTarget() const;
 
 	void applyCloudDraft();
 	void applyDraft(
@@ -292,6 +294,7 @@ private:
 	bool showRecordButton() const;
 	void drawRestrictedWrite(QPainter &p, const QString &error);
 	bool updateBotCommandShown();
+	bool updateLikeShown();
 
 	void cancelInlineBot();
 	void clearInlineBot();
@@ -344,6 +347,7 @@ private:
 	Fn<Api::SendAction()> _sendActionFactory;
 	rpl::variable<int> _slowmodeSecondsLeft;
 	rpl::variable<bool> _sendDisabledBySlowmode;
+	rpl::variable<bool> _liked;
 	rpl::variable<std::optional<QString>> _writeRestriction;
 	rpl::variable<bool> _hidden;
 	Mode _mode = Mode::Normal;
@@ -354,6 +358,7 @@ private:
 	std::optional<Ui::RoundRect> _backgroundRect;
 
 	const std::shared_ptr<Ui::SendButton> _send;
+	Ui::IconButton * const _like = nullptr;
 	const not_null<Ui::IconButton*> _attachToggle;
 	std::unique_ptr<Ui::IconButton> _replaceMedia;
 	const not_null<Ui::EmojiButton*> _tabbedSelectorToggle;
@@ -386,6 +391,7 @@ private:
 	rpl::event_stream<not_null<QKeyEvent*>> _scrollKeyEvents;
 	rpl::event_stream<not_null<QKeyEvent*>> _editLastMessageRequests;
 	rpl::event_stream<std::optional<bool>> _attachRequests;
+	rpl::event_stream<> _likeToggled;
 	rpl::event_stream<ReplyNextRequest> _replyNextRequests;
 	rpl::event_stream<> _focusRequests;
 	rpl::variable<bool> _recording;
@@ -407,6 +413,7 @@ private:
 	mtpRequestId _inlineBotResolveRequestId = 0;
 	bool _isInlineBot = false;
 	bool _botCommandShown = false;
+	bool _likeShown = false;
 
 	FullMsgId _editingId;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 2ee9496dd..32eae7905 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -313,7 +313,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 			.type = Ui::MessageSendingAnimationFrom::Type::Emoji,
 			.globalStartGeometry = id.globalGeometry,
 			.frame = id.icon,
-		});
+		}, _wrap.get());
 		_replyArea->sendReaction(id.id);
 		unfocusReply();
 	}, _lifetime);
@@ -587,6 +587,18 @@ bool Controller::skipCaption() const {
 	return _captionFullView != nullptr;
 }
 
+bool Controller::liked() const {
+	return _liked.current();
+}
+
+rpl::producer<bool> Controller::likedValue() const {
+	return _liked.value();
+}
+
+void Controller::toggleLiked(bool liked) {
+	_liked = liked;
+}
+
 void Controller::showFullCaption() {
 	if (_captionText.empty()) {
 		return;
@@ -892,6 +904,7 @@ bool Controller::changeShown(Data::Story *story) {
 			story,
 			Data::Stories::Polling::Viewer);
 	}
+	_liked = false;
 	return true;
 }
 
@@ -1551,7 +1564,8 @@ void Controller::updatePowerSaveBlocker(const Player::TrackState &state) {
 
 void Controller::startReactionAnimation(
 		Data::ReactionId id,
-		Ui::MessageSendingAnimationFrom from) {
+		Ui::MessageSendingAnimationFrom from,
+		not_null<QWidget*> target) {
 	Expects(shown());
 
 	auto args = Ui::ReactionFlyAnimationArgs{
@@ -1568,7 +1582,7 @@ void Controller::startReactionAnimation(
 		Data::CustomEmojiSizeTag::Isolated);
 	const auto layer = _reactionAnimation->layer();
 	_wrap->paintRequest() | rpl::start_with_next([=] {
-		if (!_reactionAnimation->paintBadgeFrame(_wrap.get())) {
+		if (!_reactionAnimation->paintBadgeFrame(target)) {
 			InvokeQueued(layer, [=] {
 				_reactionAnimation = nullptr;
 				_wrap->update();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index a9703c423..115e7e80a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -123,6 +123,9 @@ public:
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
 	[[nodiscard]] bool skipCaption() const;
+	[[nodiscard]] bool liked() const;
+	[[nodiscard]] rpl::producer<bool> likedValue() const;
+	void toggleLiked(bool liked);
 	void showFullCaption();
 	void captionClosing();
 	void captionClosed();
@@ -236,7 +239,8 @@ private:
 
 	void startReactionAnimation(
 		Data::ReactionId id,
-		Ui::MessageSendingAnimationFrom from);
+		Ui::MessageSendingAnimationFrom from,
+		not_null<QWidget*> target);
 
 	const not_null<Delegate*> _delegate;
 
@@ -269,6 +273,7 @@ private:
 	Data::StoriesContext _context;
 	std::optional<Data::StoriesSource> _source;
 	std::optional<StoriesList> _list;
+	rpl::variable<bool> _liked;
 	FullStoryId _waitingForId;
 	int _waitingForDelta = 0;
 	int _index = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index d6fbfd7c6..53a5c3435 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -121,6 +121,7 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 		.voiceCustomCancelText = tr::lng_record_cancel_stories(tr::now),
 		.voiceLockFromBottom = true,
 		.features = {
+			.likes = true,
 			.sendAs = false,
 			.ttlInfo = false,
 			.botCommandSend = false,
@@ -620,6 +621,11 @@ void ReplyArea::initActions() {
 		sendInlineResult(chosen.result, chosen.bot, chosen.options, localId);
 	}, _lifetime);
 
+	_controls->likeToggled(
+	) | rpl::start_with_next([=] {
+		_controller->toggleLiked(!_controller->liked());
+	}, _lifetime);
+
 	_controls->setMimeDataHook([=](
 			not_null<const QMimeData*> data,
 			Ui::InputField::MimeAction action) {
@@ -660,6 +666,7 @@ void ReplyArea::show(ReplyAreaData data) {
 	const auto history = user ? user->owner().history(user).get() : nullptr;
 	_controls->setHistory({
 		.history = history,
+		.liked = _controller->likedValue(),
 	});
 	_controls->clear();
 	const auto hidden = user && user->isSelf();
@@ -718,6 +725,10 @@ void ReplyArea::tryProcessKeyInput(not_null<QKeyEvent*> e) {
 	_controls->tryProcessKeyInput(e);
 }
 
+not_null<QWidget*> ReplyArea::likeAnimationTarget() const {
+	return _controls->likeAnimationTarget();
+}
+
 void ReplyArea::showPremiumToast(not_null<DocumentData*> emoji) {
 	// #TODO stories
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 9b9662b4a..c3c13abdf 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -70,6 +70,8 @@ public:
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
 	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
+	[[nodiscard]] not_null<QWidget*> likeAnimationTarget() const;
+
 private:
 	class Cant;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index 7bf25a1cf..8bacca224 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -353,7 +353,7 @@ struct Feature {
 				if (const auto window = show->resolveWindow(usage)) {
 					Settings::ShowPremium(
 						window,
-						u"stories_stealth_mode"_q);
+						u"stories__stealth_mode"_q);
 					window->window().activate();
 				}
 			} else if (now.mode.cooldownTill > now.now) {
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index e291abe45..5eb311f76 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -109,6 +109,7 @@ mediaviewRight: icon {
 	{ "mediaview/next", mediaviewControlFg }
 };
 mediaviewSave: icon {{ "mediaview/download", mediaviewControlFg }};
+mediaviewSaveLocked: icon {{ "mediaview/download_locked", mediaviewControlFg }};
 mediaviewShare: icon {{ "mediaview/viewer_share", mediaviewControlFg }};
 mediaviewRotate: icon {{ "mediaview/rotate", mediaviewControlFg }};
 mediaviewMore: icon {{ "title_menu_dots", mediaviewControlFg }};
@@ -466,6 +467,10 @@ storiesAttach: IconButton(historyAttach) {
 	iconOver: icon {{ "chat/input_attach", storiesComposeGrayIcon }};
 	ripple: storiesComposeRippleLight;
 }
+storiesLike: IconButton(storiesAttach) {
+	icon: icon {{ "chat/input_like", storiesComposeGrayIcon }};
+	iconOver: icon {{ "chat/input_like", storiesComposeGrayIcon }};
+}
 storiesRecordVoice: icon {{ "chat/input_record", storiesComposeGrayIcon }};
 storiesRecordVoiceOver: icon {{ "chat/input_record", storiesComposeGrayIcon }};
 storiesRemoveSet: IconButton(stickerPanRemoveSet) {
@@ -676,6 +681,8 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 	}
 	attach: storiesAttach;
 	emoji: storiesAttachEmoji;
+	like: storiesLike;
+	liked: icon{{ "chat/input_liked", settingsIconBg1 }};
 	suggestions: EmojiSuggestions(defaultEmojiSuggestions) {
 		dropdown: InnerDropdown(emojiSuggestionsDropdown) {
 			animation: PanelAnimation(defaultPanelAnimation) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 7851ed7f9..570eed0af 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/view/media_view_overlay_opengl.h"
 
+#include "data/data_peer_values.h" // AmPremiumValue.
 #include "ui/gl/gl_shader.h"
 #include "ui/painter.h"
 #include "media/stories/media_stories_view.h"
@@ -122,7 +123,16 @@ OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 	crl::on_main(this, [=] {
 		_owner->_storiesChanged.events(
 		) | rpl::start_with_next([=] {
-			invalidateControls();
+			if (_owner->_storiesSession) {
+				Data::AmPremiumValue(
+					_owner->_storiesSession
+				) | rpl::start_with_next([=] {
+					invalidateControls();
+				}, _storiesLifetime);
+			} else {
+				_storiesLifetime.destroy();
+				invalidateControls();
+			}
 		}, _lifetime);
 	});
 }
@@ -648,8 +658,7 @@ void OverlayWidget::RendererGL::paintControl(
 		QRect inner,
 		float64 innerOpacity,
 		const style::icon &icon) {
-	const auto stories = (_owner->_stories != nullptr);
-	const auto meta = ControlMeta(control, stories);
+	const auto meta = controlMeta(control);
 	Assert(meta.icon == &icon);
 
 	const auto overAlpha = overOpacity * kOverBackgroundOpacity;
@@ -707,18 +716,25 @@ void OverlayWidget::RendererGL::paintControl(
 	FillTexturedRectangle(*_f, &*_controlsProgram, fgOffset);
 }
 
-auto OverlayWidget::RendererGL::ControlMeta(Over control, bool stories)
--> Control {
+auto OverlayWidget::RendererGL::controlMeta(Over control) const -> Control {
+	const auto stories = [&] {
+		return (_owner->_stories != nullptr);
+	};
 	switch (control) {
 	case Over::Left: return {
 		0,
-		stories ? &st::storiesLeft : &st::mediaviewLeft
+		stories() ? &st::storiesLeft : &st::mediaviewLeft
 	};
 	case Over::Right: return {
 		1,
-		stories ? &st::storiesRight : &st::mediaviewRight
+		stories() ? &st::storiesRight : &st::mediaviewRight
+	};
+	case Over::Save: return {
+		2,
+		(_owner->saveControlLocked()
+			? &st::mediaviewSaveLocked
+			: &st::mediaviewSave)
 	};
-	case Over::Save: return { 2, &st::mediaviewSave };
 	case Over::Share: return { 3, &st::mediaviewShare };
 	case Over::Rotate: return { 4, &st::mediaviewRotate };
 	case Over::More: return { 5, &st::mediaviewMore };
@@ -730,14 +746,13 @@ void OverlayWidget::RendererGL::validateControls() {
 	if (!_controlsImage.image().isNull()) {
 		return;
 	}
-	const auto stories = (_owner->_stories != nullptr);
 	const auto metas = {
-		ControlMeta(Over::Left, stories),
-		ControlMeta(Over::Right, stories),
-		ControlMeta(Over::Save, stories),
-		ControlMeta(Over::Share, stories),
-		ControlMeta(Over::Rotate, stories),
-		ControlMeta(Over::More, stories),
+		controlMeta(Over::Left),
+		controlMeta(Over::Right),
+		controlMeta(Over::Save),
+		controlMeta(Over::Share),
+		controlMeta(Over::Rotate),
+		controlMeta(Over::More),
 	};
 	auto maxWidth = 0;
 	auto fullHeight = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index a0342518a..f64fb7e58 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -149,7 +149,7 @@ private:
 	Ui::GL::Image _storiesSiblingParts[kStoriesSiblingPartsCount];
 
 	static constexpr auto kControlsCount = 6;
-	[[nodiscard]] static Control ControlMeta(Over control, bool stories);
+	[[nodiscard]] Control controlMeta(Over control) const;
 
 	// Last one is for the over circle image.
 	std::array<QRect, kControlsCount + 1> _controlsTextures;
@@ -158,6 +158,7 @@ private:
 	bool _shadowsForStories = false;
 	bool _blendingEnabled = false;
 
+	rpl::lifetime _storiesLifetime;
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 0cd3ca35e..119604e1c 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -86,6 +86,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session_settings.h"
 #include "layout/layout_document_generic_preview.h"
 #include "platform/platform_overlay_widget.h"
+#include "settings/settings_premium.h"
 #include "storage/file_download.h"
 #include "storage/storage_account.h"
 #include "calls/calls_instance.h"
@@ -130,6 +131,7 @@ constexpr auto kIdsPreloadAfter = 28;
 constexpr auto kLeftSiblingTextureIndex = 1;
 constexpr auto kRightSiblingTextureIndex = 2;
 constexpr auto kStoriesControlsOpacity = 1.;
+constexpr auto kStorySavePromoDuration = 3 * crl::time(1000);
 
 class PipDelegate final : public Pip::Delegate {
 public:
@@ -326,16 +328,18 @@ public:
 		return _widget->_body;
 	}
 	bool valid() const override {
-		return _widget->_storiesSession != nullptr;
+		return _widget->_session || _widget->_storiesSession;
 	}
 	operator bool() const override {
 		return valid();
 	}
 
 	Main::Session &session() const override {
-		Expects(_widget->_storiesSession != nullptr);
+		Expects(_widget->_session || _widget->_storiesSession);
 
-		return *_widget->_storiesSession;
+		return _widget->_session
+			? *_widget->_session
+			: *_widget->_storiesSession;
 	}
 	bool paused(ChatHelpers::PauseReason reason) const override {
 		if (_widget->isHidden()
@@ -1024,22 +1028,26 @@ QSize OverlayWidget::flipSizeByRotation(QSize size) const {
 	return FlipSizeByRotation(size, _rotation);
 }
 
-bool OverlayWidget::hasCopyMediaRestriction() const {
-	const auto story = _stories ? _stories->story() : nullptr;
-	return (story && !story->canDownload())
-		|| (_history && !_history->peer->allowsForwarding())
+bool OverlayWidget::hasCopyMediaRestriction(bool skipPremiumCheck) const {
+	if (const auto story = _stories ? _stories->story() : nullptr) {
+		return skipPremiumCheck
+			? story->canDownloadIfPremium()
+			: story->canDownloadChecked();
+	}
+	return (_history && !_history->peer->allowsForwarding())
 		|| (_message && _message->forbidsSaving());
 }
 
-bool OverlayWidget::showCopyMediaRestriction() {
-	if (!hasCopyMediaRestriction()) {
+bool OverlayWidget::showCopyMediaRestriction(bool skipPRemiumCheck) {
+	if (!hasCopyMediaRestriction(skipPRemiumCheck)) {
 		return false;
-	} else if (!_history) {
-		return true;
+	} else if (_stories) {
+		uiShow()->showToast(tr::lng_error_nocopy_story(tr::now));
+	} else if (_history) {
+		uiShow()->showToast(_history->peer->isBroadcast()
+			? tr::lng_error_nocopy_channel(tr::now)
+			: tr::lng_error_nocopy_group(tr::now));
 	}
-	Ui::Toast::Show(_widget, _history->peer->isBroadcast()
-		? tr::lng_error_nocopy_channel(tr::now)
-		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
 
@@ -1210,8 +1218,8 @@ void OverlayWidget::refreshNavVisibility() {
 	}
 }
 
-bool OverlayWidget::contentCanBeSaved() const {
-	if (hasCopyMediaRestriction()) {
+bool OverlayWidget::computeSaveButtonVisible() const {
+	if (hasCopyMediaRestriction(true)) {
 		return false;
 	} else if (_photo) {
 		return _photo->hasVideo() || _photoMedia->loaded();
@@ -1240,6 +1248,26 @@ void OverlayWidget::checkForSaveLoaded() {
 	}
 }
 
+void OverlayWidget::showPremiumDownloadPromo() {
+	const auto filter = [=](const auto &...) {
+		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
+		if (const auto window = uiShow()->resolveWindow(usage)) {
+			const auto ref = u"stories__save_stories_to_gallery"_q;
+			Settings::ShowPremium(window, ref);
+		}
+		return false;
+	};
+	uiShow()->showToast({
+		.text = tr::lng_stories_save_promo(
+			tr::now,
+			lt_link,
+			Ui::Text::Bold(tr::lng_send_as_premium_required_link(tr::now)),
+			Ui::Text::WithEntities),
+		.duration = kStorySavePromoDuration,
+		.filter = filter,
+	});
+}
+
 void OverlayWidget::updateControls() {
 	if (_document && documentBubbleShown()) {
 		_docRect = QRect(
@@ -1290,7 +1318,7 @@ void OverlayWidget::updateControls() {
 	const auto overRect = QRect(
 		QPoint(),
 		QSize(st::mediaviewIconOver, st::mediaviewIconOver));
-	_saveVisible = contentCanBeSaved();
+	_saveVisible = computeSaveButtonVisible();
 	_shareVisible = story && story->canShare();
 	_rotateVisible = !_themePreviewShown && !story;
 	const auto navRect = [&](int i) {
@@ -1320,6 +1348,7 @@ void OverlayWidget::updateControls() {
 	_saveNav = navRect(index);
 	_saveNavOver = style::centerrect(_saveNav, overRect);
 	_saveNavIcon = style::centerrect(_saveNav, st::mediaviewSave);
+	Assert(st::mediaviewSave.size() == st::mediaviewSaveLocked.size());
 
 	const auto dNow = QDateTime::currentDateTime();
 	const auto d = [&] {
@@ -1471,7 +1500,7 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			? &st::mediaMenuIconArchiveStory
 			: &st::mediaMenuIconSaveStory);
 	}
-	if ((!story || story->canDownload())
+	if ((!story || story->canDownloadChecked())
 		&& _document
 		&& !_document->filepath(true).isEmpty()) {
 		const auto text =  Platform::IsMac()
@@ -1533,11 +1562,13 @@ void OverlayWidget::fillContextMenuActions(const MenuCallback &addAction) {
 			[=] { deleteMedia(); },
 			&st::mediaMenuIconDelete);
 	}
-	if (!hasCopyMediaRestriction()) {
+	if (!hasCopyMediaRestriction(true)) {
 		addAction(
 			tr::lng_mediaview_save_as(tr::now),
 			[=] { saveAs(); },
-			&st::mediaMenuIconDownload);
+			(saveControlLocked()
+				? &st::mediaMenuIconDownloadLocked
+				: &st::mediaMenuIconDownload));
 	}
 
 	if (const auto overviewType = computeOverviewType()) {
@@ -2285,7 +2316,11 @@ void OverlayWidget::notifyFileDialogShown(bool shown) {
 }
 
 void OverlayWidget::saveAs() {
-	if (showCopyMediaRestriction()) {
+	if (showCopyMediaRestriction(true)) {
+		return;
+	} else if (hasCopyMediaRestriction()) {
+		Assert(_stories != nullptr);
+		showPremiumDownloadPromo();
 		return;
 	}
 	QString file;
@@ -2421,9 +2456,13 @@ void OverlayWidget::handleDocumentClick() {
 void OverlayWidget::downloadMedia() {
 	if (!_photo && !_document) {
 		return;
-	}
-	if (Core::App().settings().askDownloadPath()) {
+	} else if (Core::App().settings().askDownloadPath()) {
 		return saveAs();
+	} else if (hasCopyMediaRestriction()) {
+		if (_stories && !hasCopyMediaRestriction(true)) {
+			showPremiumDownloadPromo();
+		}
+		return;
 	}
 
 	QString path;
@@ -2478,7 +2517,7 @@ void OverlayWidget::downloadMedia() {
 					}
 				}
 			} else {
-				_saveVisible = contentCanBeSaved();
+				_saveVisible = computeSaveButtonVisible();
 				update(_saveNavOver);
 			}
 			updateOver(_lastMouseMovePos);
@@ -2498,7 +2537,7 @@ void OverlayWidget::downloadMedia() {
 		}
 	} else {
 		if (!_photo || !_photoMedia->loaded()) {
-			_saveVisible = contentCanBeSaved();
+			_saveVisible = computeSaveButtonVisible();
 			update(_saveNavOver);
 		} else {
 			if (!QDir().exists(path)) {
@@ -3899,8 +3938,7 @@ void OverlayWidget::initThemePreview() {
 					_themeShare->setClickedCallback([=] {
 						QGuiApplication::clipboard()->setText(
 							session->createInternalLinkFull("addtheme/" + slug));
-						Ui::Toast::Show(
-							_body,
+						uiShow()->showToast(
 							tr::lng_background_link_copied(tr::now));
 					});
 				} else {
@@ -4198,6 +4236,10 @@ not_null<Ui::RpWidget*> OverlayWidget::storiesWrap() {
 }
 
 std::shared_ptr<ChatHelpers::Show> OverlayWidget::storiesShow() {
+	return uiShow();
+}
+
+std::shared_ptr<ChatHelpers::Show> OverlayWidget::uiShow() {
 	if (!_cachedShow) {
 		_cachedShow = std::make_shared<Show>(this);
 	}
@@ -4778,6 +4820,13 @@ void OverlayWidget::paintSaveMsgContent(
 	p.setOpacity(1);
 }
 
+bool OverlayWidget::saveControlLocked() const {
+	const auto story = _stories ? _stories->story() : nullptr;
+	return story
+		&& story->canDownloadIfPremium()
+		&& !story->canDownloadChecked();
+}
+
 void OverlayWidget::paintControls(
 		not_null<Renderer*> renderer,
 		float64 opacity) {
@@ -4811,7 +4860,9 @@ void OverlayWidget::paintControls(
 			_saveVisible,
 			_saveNavOver,
 			_saveNavIcon,
-			st::mediaviewSave },
+			(saveControlLocked()
+				? st::mediaviewSaveLocked
+				: st::mediaviewSave) },
 		{
 			Over::Share,
 			_shareVisible,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 06d0c0468..864e21084 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -245,6 +245,7 @@ private:
 	void playbackPauseMusic();
 	void switchToPip();
 	[[nodiscard]] int topNotchSkip() const;
+	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow();
 
 	not_null<Ui::RpWidget*> storiesWrap() override;
 	std::shared_ptr<ChatHelpers::Show> storiesShow() override;
@@ -310,8 +311,9 @@ private:
 
 	void handleScreenChanged(QScreen *screen);
 
-	bool contentCanBeSaved() const;
+	[[nodiscard]] bool computeSaveButtonVisible() const;
 	void checkForSaveLoaded();
+	void showPremiumDownloadPromo();
 
 	Entity entityForUserPhotos(int index) const;
 	Entity entityForSharedMedia(int index) const;
@@ -495,8 +497,10 @@ private:
 	void validatePhotoImage(Image *image, bool blurred);
 	void validatePhotoCurrentImage();
 
-	[[nodiscard]] bool hasCopyMediaRestriction() const;
-	[[nodiscard]] bool showCopyMediaRestriction();
+	[[nodiscard]] bool hasCopyMediaRestriction(
+		bool skipPremiumCheck = false) const;
+	[[nodiscard]] bool showCopyMediaRestriction(
+		bool skipPRemiumCheck = false);
 
 	[[nodiscard]] QSize flipSizeByRotation(QSize size) const;
 
@@ -518,7 +522,8 @@ private:
 	[[nodiscard]] bool contentShown() const;
 	[[nodiscard]] bool opaqueContentShown() const;
 	void clearStreaming(bool savePosition = true);
-	bool canInitStreaming() const;
+	[[nodiscard]] bool canInitStreaming() const;
+	[[nodiscard]] bool saveControlLocked() const;
 
 	[[nodiscard]] bool topShadowOnTheRight() const;
 	void applyHideWindowWorkaround();
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
index 8e55994cc..c655ab678 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
@@ -95,8 +95,7 @@ void EmojiFlyAnimation::repaint() {
 	}
 }
 
-bool EmojiFlyAnimation::paintBadgeFrame(
-		not_null<Ui::RpWidget*> widget) {
+bool EmojiFlyAnimation::paintBadgeFrame(not_null<QWidget*> widget) {
 	_target = widget;
 	return !_fly.finished();
 }
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
index 7bfd08ce2..f5dc8102b 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
@@ -25,7 +25,7 @@ public:
 	[[nodiscard]] bool finished() const;
 
 	void repaint();
-	bool paintBadgeFrame(not_null<Ui::RpWidget*> widget);
+	bool paintBadgeFrame(not_null<QWidget*> widget);
 
 private:
 	const int _flySize = 0;
@@ -33,7 +33,7 @@ private:
 	Ui::RpWidget _layer;
 	QRect _area;
 	bool _areaUpdated = false;
-	QPointer<Ui::RpWidget> _target;
+	QPointer<QWidget> _target;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index dfe5430b2..641390f2e 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -126,6 +126,7 @@ mediaMenuIconCancel: icon {{ "menu/cancel", mediaviewMenuFg }};
 mediaMenuIconShowInChat: icon {{ "menu/show_in_chat", mediaviewMenuFg }};
 mediaMenuIconShowInFolder: icon {{ "menu/show_in_folder", mediaviewMenuFg }};
 mediaMenuIconDownload: icon {{ "menu/download", mediaviewMenuFg }};
+mediaMenuIconDownloadLocked: icon {{ "menu/download_locked", mediaviewMenuFg }};
 mediaMenuIconCopy: icon {{ "menu/copy", mediaviewMenuFg }};
 mediaMenuIconForward: icon {{ "menu/forward", mediaviewMenuFg }};
 mediaMenuIconDelete: icon {{ "menu/delete", mediaviewMenuFg }};

From 40b274e1b4a241ab5e75cb33aaf7a3e73cb11002 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 3 Aug 2023 15:28:38 +0200
Subject: [PATCH 583/676] Add effect animation for heart-like.

---
 .../stories/media_stories_controller.cpp      | 31 ++++++++++++-------
 .../media/stories/media_stories_controller.h  |  5 ++-
 .../media/view/media_view_overlay_widget.cpp  |  9 ++++--
 .../ui/effects/reaction_fly_animation.cpp     | 10 +++---
 .../ui/effects/reaction_fly_animation.h       |  1 +
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 32eae7905..9e74b82b8 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -114,6 +114,10 @@ struct SameDayRange {
 	return result;
 }
 
+[[nodiscard]] Data::ReactionId HeartReactionId() {
+	return { QString() + QChar(10084) };
+}
+
 } // namespace
 
 class Controller::PhotoPlayback final {
@@ -309,10 +313,11 @@ Controller::Controller(not_null<Delegate*> delegate)
 
 	_reactions->chosen(
 	) | rpl::start_with_next([=](HistoryView::Reactions::ChosenReaction id) {
-		startReactionAnimation(id.id, {
-			.type = Ui::MessageSendingAnimationFrom::Type::Emoji,
-			.globalStartGeometry = id.globalGeometry,
-			.frame = id.icon,
+		startReactionAnimation({
+			.id = id.id,
+			.flyIcon = id.icon,
+			.flyFrom = _wrap->mapFromGlobal(id.globalGeometry),
+			.scaleOutDuration = st::fadeWrapDuration * 2,
 		}, _wrap.get());
 		_replyArea->sendReaction(id.id);
 		unfocusReply();
@@ -597,6 +602,13 @@ rpl::producer<bool> Controller::likedValue() const {
 
 void Controller::toggleLiked(bool liked) {
 	_liked = liked;
+	if (liked) {
+		startReactionAnimation({
+			.id = HeartReactionId(),
+			.scaleOutDuration = st::fadeWrapDuration * 2,
+			.effectOnly = true,
+		}, _replyArea->likeAnimationTarget());
+	}
 }
 
 void Controller::showFullCaption() {
@@ -1045,6 +1057,8 @@ void Controller::ready() {
 	}
 	_started = true;
 	updatePlayingAllowed();
+	uiShow()->session().data().reactions().preloadAnimationsFor(
+		HeartReactionId());
 }
 
 void Controller::updateVideoPlayback(const Player::TrackState &state) {
@@ -1563,17 +1577,10 @@ void Controller::updatePowerSaveBlocker(const Player::TrackState &state) {
 }
 
 void Controller::startReactionAnimation(
-		Data::ReactionId id,
-		Ui::MessageSendingAnimationFrom from,
+		Ui::ReactionFlyAnimationArgs args,
 		not_null<QWidget*> target) {
 	Expects(shown());
 
-	auto args = Ui::ReactionFlyAnimationArgs{
-		.id = id,
-		.flyIcon = from.frame,
-		.flyFrom = _wrap->mapFromGlobal(from.globalStartGeometry),
-		.scaleOutDuration = st::fadeWrapDuration * 2,
-	};
 	_reactionAnimation = std::make_unique<Ui::EmojiFlyAnimation>(
 		_wrap,
 		&shownUser()->owner().reactions(),
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 115e7e80a..997590929 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -35,7 +35,7 @@ class CachedIconFactory;
 
 namespace Ui {
 class RpWidget;
-struct MessageSendingAnimationFrom;
+struct ReactionFlyAnimationArgs;
 class EmojiFlyAnimation;
 class BoxContent;
 } // namespace Ui
@@ -238,8 +238,7 @@ private:
 		int index);
 
 	void startReactionAnimation(
-		Data::ReactionId id,
-		Ui::MessageSendingAnimationFrom from,
+		Ui::ReactionFlyAnimationArgs from,
 		not_null<QWidget*> target);
 
 	const not_null<Delegate*> _delegate;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 119604e1c..1c010e0f0 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1031,8 +1031,8 @@ QSize OverlayWidget::flipSizeByRotation(QSize size) const {
 bool OverlayWidget::hasCopyMediaRestriction(bool skipPremiumCheck) const {
 	if (const auto story = _stories ? _stories->story() : nullptr) {
 		return skipPremiumCheck
-			? story->canDownloadIfPremium()
-			: story->canDownloadChecked();
+			? !story->canDownloadIfPremium()
+			: !story->canDownloadChecked();
 	}
 	return (_history && !_history->peer->allowsForwarding())
 		|| (_message && _message->forbidsSaving());
@@ -1261,9 +1261,12 @@ void OverlayWidget::showPremiumDownloadPromo() {
 		.text = tr::lng_stories_save_promo(
 			tr::now,
 			lt_link,
-			Ui::Text::Bold(tr::lng_send_as_premium_required_link(tr::now)),
+			Ui::Text::Link(
+				Ui::Text::Bold(
+					tr::lng_send_as_premium_required_link(tr::now))),
 			Ui::Text::WithEntities),
 		.duration = kStorySavePromoDuration,
+		.adaptive = true,
 		.filter = filter,
 	});
 }
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
index 361eb3b7b..e46820573 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
@@ -111,11 +111,13 @@ ReactionFlyAnimation::ReactionFlyAnimation(
 		});
 		return true;
 	};
-	if (!_custom && !resolve(_center, centerIcon, size)) {
+	generateMiniCopies(size + size / 2);
+	if (args.effectOnly) {
+		_custom = nullptr;
+	} else if (!_custom && !resolve(_center, centerIcon, size)) {
 		return;
 	}
 	resolve(_effect, aroundAnimation, size * 2);
-	generateMiniCopies(size + size / 2);
 	if (!args.flyIcon.isNull()) {
 		_flyIcon = std::move(args.flyIcon);
 		_fly.start(flyCallback(), 0., 1., kFlyDuration);
@@ -210,8 +212,6 @@ void ReactionFlyAnimation::paintCenterFrame(
 		QRect target,
 		const QColor &colored,
 		crl::time now) const {
-	Expects(_center || _custom);
-
 	const auto size = QSize(
 		int(base::SafeRound(target.width() * _centerSizeMultiplier)),
 		int(base::SafeRound(target.height() * _centerSizeMultiplier)));
@@ -222,7 +222,7 @@ void ReactionFlyAnimation::paintCenterFrame(
 			size.width(),
 			size.height());
 		p.drawImage(rect, _center->frame(st::windowFg->c));
-	} else {
+	} else if (_custom) {
 		const auto scaled = (size.width() != _customSize);
 		_custom->paint(p, {
 			.textColor = colored,
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
index 595e11e86..00d9d2e8d 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
@@ -28,6 +28,7 @@ struct ReactionFlyAnimationArgs {
 	QImage flyIcon;
 	QRect flyFrom;
 	crl::time scaleOutDuration = 0;
+	bool effectOnly = false;
 
 	[[nodiscard]] ReactionFlyAnimationArgs translated(QPoint point) const;
 };

From 7877cb0b3a60d1274b26fba3f3197fb1e57307a7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 4 Aug 2023 08:07:37 +0200
Subject: [PATCH 584/676] Implement stories premium promo.

---
 .../settings/premium/stories_caption.png      | Bin 0 -> 372 bytes
 .../settings/premium/stories_caption@2x.png   | Bin 0 -> 512 bytes
 .../settings/premium/stories_caption@3x.png   | Bin 0 -> 657 bytes
 .../icons/settings/premium/stories_links.png  | Bin 0 -> 467 bytes
 .../settings/premium/stories_links@2x.png     | Bin 0 -> 883 bytes
 .../settings/premium/stories_links@3x.png     | Bin 0 -> 1356 bytes
 .../icons/settings/premium/stories_order.png  | Bin 0 -> 835 bytes
 .../settings/premium/stories_order@2x.png     | Bin 0 -> 1637 bytes
 .../settings/premium/stories_order@3x.png     | Bin 0 -> 2339 bytes
 .../icons/settings/premium/timer.png          | Bin 0 -> 608 bytes
 .../icons/settings/premium/timer@2x.png       | Bin 0 -> 1250 bytes
 .../icons/settings/premium/timer@3x.png       | Bin 0 -> 1883 bytes
 Telegram/Resources/langs/lang.strings         |  26 ++++
 .../SourceFiles/boxes/premium_preview_box.cpp | 147 ++++++++++++++++--
 .../SourceFiles/boxes/premium_preview_box.h   |   6 +
 .../media/stories/media_stories_stealth.cpp   |   7 +-
 .../media/view/media_view_overlay_widget.cpp  |   5 +-
 Telegram/SourceFiles/settings/settings.style  |  12 ++
 .../SourceFiles/settings/settings_premium.cpp |  63 ++------
 .../ui/effects/premium_graphics.cpp           | 134 ++++++++++------
 .../SourceFiles/ui/effects/premium_graphics.h |   5 +-
 21 files changed, 292 insertions(+), 113 deletions(-)
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_caption.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_caption@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_caption@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_links.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_links@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_links@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_order.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_order@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/stories_order@3x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/timer.png
 create mode 100644 Telegram/Resources/icons/settings/premium/timer@2x.png
 create mode 100644 Telegram/Resources/icons/settings/premium/timer@3x.png

diff --git a/Telegram/Resources/icons/settings/premium/stories_caption.png b/Telegram/Resources/icons/settings/premium/stories_caption.png
new file mode 100644
index 0000000000000000000000000000000000000000..d73bc90686c44b5b3b693f2a7ff6b9ea68f0bbb5
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfU-Sc#D46zV=
z8?=$n#X;nV?0yBO#oxHSrs{uC-Ir$Xuztx`)<t0}Otj_}m@7{F{?4rW_T8tCM6>tI
z^hs0CmbhM%bzn)8MPIYR0%=ycwuPCqf)Dh(+SRw{#gi)wUhh)zyfW*5LZrKEV8y)c
z?>6U3?>qjJZ^Qg$n&*oH+y%>Txrc`Cdw>7iMxE}a>G1)5k7uZzc3fM>usP>M{_SmP
zt5PE`Oo_R(?X7dQ!ZJObK#8_>uY;l*j~BlA9jExi?C82_sgiO_OfK1+cj6GyNZpv?
qmKyoU(QB!J*JY9AQ}#}a;<aH^OYOdrx=bVx<YP})KbLh*2~7YWwu9yX

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_caption@2x.png b/Telegram/Resources/icons/settings/premium/stories_caption@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e67594df0d29958dce8d70d9d99ac879d24338c6
GIT binary patch
literal 512
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuFmgVW<7!twx
zc7|<Vvw=YC;eL$?7L3amELgn6O>@D5C5z4qW_Y@umdq$(csIerl9`oBONB+lyKGCQ
z$F)AO=HNBQSf%XWeEi{Dx9P^)4T_8^4J;E52s1uhY5w}gHrcj?i!_XLXBWsEH}U;!
z6F==;jotm7rXGH)-Ind`c>JTlqCjbi3TJNYm5B^O4}2T4dX{Bc^)a9Jzx?Iv<+!Hl
zdOVdH^%vJ)&%V8l`<ohvQ{=QeH6QPp^e)Rh(&Vy;YiUa4wePlXq>~=aFje}oR%f#9
z%wH#;y=FA<oa7SN^89^+<Ng@E(9pBf4@hwSiD!E6H*?jhEr)lqop@XJdRJay+vATv
z3>Kb!D|pGND9SM<x#i-t)W(AsmaV<0sH?I(bwQm`?Dg-zZI^4md0C>>)f6WD%7cNk
zK-IzaTc8N5<ADU%g6oB`<q~bWuiK;}W3Qi)%avd&Hhog9GUd_lea|a%TJHVvPS6uk
fR{{l!o$CW>vD6=Te3Z?XfI{EX)z4*}Q$iB}kvqdZ

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_caption@3x.png b/Telegram/Resources/icons/settings/premium/stories_caption@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..373884acea3047ca580662a60a7285959c2f99c2
GIT binary patch
literal 657
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}_S@6NF(iZa
z?M%Z}ha5y)ed`=pyCtNxyK@d6x^_-4L48NV4i@W;n~Ovhr)CG}uy7YLi#09a5bNq)
z@$;8Fmsr#p=^2KN^~-1VTsQwNE3sqdk{}5M1||ghaGpcrOdapx6KR`$Hrm~MS+eW?
z`%|y3XKlTk=PsHopVE9rBRj`z_R)KnPBYAWXp&asGW%?s^6$R1y>Z26Npm+QZM^Za
z#A~V0@<m~1v$nn}+kN|O*lRrvKA05?IvKPp1GcOW(b|@KKX3c};}w4Q<X(#3EcI$A
zG!tWS+<f!OlLxJji$8Jp#YLa+*?&Jg;n*gfTc1SNO*YV+e)`a{BQNc`7M)B{()r@+
zXf;<X@3>X+&X{!<Geo#pFPqfMJ<k2~&12H@u1{Z2KNV_A+<jNfjE#|_fdPyhm^e2~
zV*k19$c*#Plk*ey-w!?#oOby0p2r_&wEXZkJJGZ0*t5@-Lc6M}6pZHpZJM`AXS%oF
z+V>eV(scTy?|)wz<Mi%b^<KH-#wPF(<5W4|^}WPDVr`i0@xU7gzE;ikTW(nYU!I4}
z%IU+yf`Zs^MV*~NQSaYHubnnWdRx?-cQ23TS;%bS_To7I{BwoPv>(kqQ%a8+&GgwD
v7yg^gcaPiRi%A<N6msjrTn%=+hQbH-XRm_!B~K-=f|7%$tDnm{r-UW|LT3U5

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_links.png b/Telegram/Resources/icons/settings/premium/stories_links.png
new file mode 100644
index 0000000000000000000000000000000000000000..da8497860bd8cd3ceacfbd7818e16a773899e398
GIT binary patch
literal 467
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%+}MzF~maf
z>6DFKEe<?wU%9wzg+#Trt)s1_55~#6Y}xSfE=&C3I02FG%!xD3?kcXh{We$7Xr_<Z
z&wrA-ukZhlx!${o<9E4G=B&QQJKp~;l!>TO`hM!>Hd~&<yVm92ZcBV&!6!D~<Fbi)
z*4JA5^Tjg9ANfpDxw7kG_`K))-gj#~-}KrlZO@%u;yg_Zar2(<wPh1mTO>X)P{egw
zsuqX-jm3+*JlJ;?2nt^<-J2`DHN@=7%NK8R8{|b;@2*<4qA4`Ape~Wc{>oMUn6QWQ
zeO5X4<t<#nWq3MU-{<Tbfq=|QjWT~0tT0=!y4dpZiw3ETMVFQ^TV9-a#$a9jm3NzT
zE}KkEU8%I|u*>>#C;y61{#Pp){R2-o>BY?OIO6Lar`)wb_R7On*G#1griD9oJmcrr
mnSa@Jhpoh9ubS=e)qmONRV;V*TIIb46ri52elF{r5}E)ed$2_S

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_links@2x.png b/Telegram/Resources/icons/settings/premium/stories_links@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..26dfa285efff645450e8e87a5b0874ec3bab64df
GIT binary patch
literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NE-AP12R9Fe^m@%p<F%*V<SFJ2;
z1hvz`#!5F}FBVqf0u%&Sp_{O<w6_pkfjh9V&<!YPCtQT5?|pX;gu$0dGULd-@FrE}
z%*mfW$vOYYOe&SMWCxNR_|JCWSG?=3)oS&6y;LdzdpsU@yWQb%h<6Gnw0u54nN0Tk
z{hxmtMqc6I1Qd(Ya5%hNE`BDzz2>*zfLkonnLsj`%xpH3i64*0a=GmH`{i=^!)tVS
z#K<f0!I>c@#8=({&15pucDrpf8bN5h!a;Ega(l_{XR}(Za=Dxt4u|!6Eu7wRcH{9_
z(AlJHHfv@hZ{Z~SL_EbG<L!3)dc7_d3r9A>iL;Y<nog%KYY69)PN%~S@Vq7L(1HkK
z-!g=}le0!bwG(`3t?x5#HX8v)(6zHT5hACEV&X;%@nkF%3dLga$*3Mrr_=p@=TXXw
zvWMuX3@3`MantE^KD`#i3CTppIknMf6oQ0uRcwGDr<7gWfz9o9!xKvElhz0MmKf@G
zyIKc}QB?-3-Y7P3q92574eFqQUv?x_R)ZFs^~RA6n9<W7F_jvQyqYV6JDX;+DZ<Ew
z<ZH#D8e`ZV#v7_8fbMKwEgf>(VuuaOaA(7bbM6uVgTcUnsegrx%3xwp?-6EiU?ZUe
zCRq{$XtI-&LWnHY`jOS-Ha_N@lCkK8pg{{A(E?hGs1^_?7&@kPMfW`Y`{dNL4$6p@
zqNt!bvWdhum7)SvDiw;r`FvJ$YdiS#dcA73I-k#3q1MN4v>urqBC3b}MEIT(z*egj
z6*=y4E@>Y$r?mzL4K&%gWfF;2VSIuh!^tV4*zvCNG~D#)UOE(tUvIcSDSK=kRb2Uk
zF_$x@#6fAXV}?f|s;(dAPeH1teB!w4O%yhaL0A<h;)$hGOup@7SuKLIbNQVRrE01<
z!gh#p@=mmXbMZHf+*RWG7!Ccy>ZkmY3cI6;f3gF~4*b|1_zNQzqDTLv`#Asr002ov
JPDHLkV1gwNgiZhe

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_links@3x.png b/Telegram/Resources/icons/settings/premium/stories_links@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fef135b0dbd2215849e7011f6c91eac4e4905b5c
GIT binary patch
literal 1356
zcmY*ZeK->c7~hA_xy59uNo}*CO_-0CL#(hVcI+{940CSdlxZP7DTlHf))bY{CGvUq
zbiQXLjQLzi4BIZbp6)C{sHt<Mn}6<}-rw_kfA7~n@B7Eg52BKx5CjAO06_gIJ~XXT
zwrBv-dX*4kq7~q28u>8b-stXmZQ}ENxIZf}5P;Lh1^^&00id%rq9sC0003M81c0>)
z+^SW8{_9dI!2icvgM|dYHvoW6yT1=9Bwlx^^s&7i$!t))EtZLD;_4b1rR_kYB}Pb?
z@JAhEWT;0@cuZfZc_R{S8jHH}ljVW%4h(uxs{Z8LFLw2;QKzH|_Yhr;8Xk<grEb<9
z8YQP%zs!6N`VxfwD|qW}i*t#IiP6!sZ-mhd#*Ef(3ul*?m*?l}%O1IiRVvlo+}!Bs
z=yRjbuP*70xWFfcGje%rXXnSYHQLT#s&O$Mk58WGQL?xh86Q_y3FOr$JdsGm<LPf+
z=o<Rlcv>p;fgsE+o12@tOeTt~eE(i1llAxaZ*Fc53=A|h;4ZG*IKV;H5WS5F+`P-0
z^E$4st`QLt?bprC&8w=a;BYwV=$N~c6R7%eM^jU<y~4Y#rR6)ksI@hO!LS4kFK1un
zH!IJ!8jdIE2YGsW22!bC*Y)b1yKrGg`o1^Bsqyvo_IPl^ix*7&kX&6ybY9C{u~>OL
zByu1t3mA;G##QA#v|a_C(wv^-a5%)lGw8aYoKMzl!_C0?2YuUYi6@9eB9FJV)x^X^
zSy@@q;S=|!r^7O4#>Pw>T9kH*gP4=qd!Mmp^D?dGHYAiay2$b&%a!%kw^&`K(WD0d
zDiVdME+M@16sxOEG4b*7g=u$k-5sYqZQR*0sHekS>VV$-oi{Za%`oJ%jX=?x&ZMqO
zB$7<ag-|kiP<ttfgv4goUgftuO&^+^q+^e{G<!>3yu9`byo%-*7VdX<6Ti(4?4#--
zl~8?tE*238fJb%I*4kV(uz)K{h*0;l0)kE^o5gamgT)V7E(S<Z?FJRG&%=ul(4i?E
zg+fu1iv<am0!&G|)W25Jq?G-X;cB#1pLyAN=LS>1J#zZueP8)UT&C`V8uClgnf$<d
zX8jz=-=_;%S!LZq2p0Rk$3;q6G&if9G4=<FkPk7Gn@MZrD<KFxzvMjZaYGQ7v|}$k
zF)EkkfQd{fR_zyq{|Ps=JB0fIQceREOdNA-%_~T?t<>0ioeJ5wL$5>jT0k5-@8&{p
z<6+x7TP5{Ov(lbO7#tHFR(|UiJVxs3lt#(1^$*`21glcw3pX&QB8QSMGfYpK<do*6
z1e2s~dL>}o#qIQb#?ec8%&DoVM~-n&U(_y;6ReTI89C^PyzViivli!vy@_}JxvxOi
zEHxdIiOrw9-LvgT-0t-fnWO((GY4oSgE3q&8){GpyJgXzwY0RvPr1%({mjda`16WA
zm!2UXA0MBY5mdIdwW-x=GMUV`6?B)DmiE4_S+Djkf7MlJh-v>L?wixE2ZjgNnhbF-
zQ4`PZKkHELN-3B118|+m37_a)3@~R==9?5W(|9FXDf$gtPy$l%yj0cbP?&Jz1Y!hm
zPFw+UCOO_nGQBfiLF<_|dXdPFT1ygNb6Jc-V++82YPBq?QTHohW!%)o;tdWBNj=oP
zL7S;_P{ynuk9~p~Jo6#U$B_LYnC@`&i5uUzaN(L@Np_%k%qCK>uc6u**!94pTYhZu
zNPr19XM|xT;?Dg(^7?h66FBx&QPFmG-&sEn@C#(Uvs*FuNPeUuybJHy`egpTRG)i?
HW3vARc8g%i

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_order.png b/Telegram/Resources/icons/settings/premium/stories_order.png
new file mode 100644
index 0000000000000000000000000000000000000000..3051561dfe05210a7ae8e69b0d9df5a38b360414
GIT binary patch
literal 835
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfoZL$i(`m|
z;N1{!@1j7Fy(=Zd+NNZDQBdUOWHNST@6~Z^YFaQ~fm6{>Hl(?&aq@(sD@!I?2&%YG
z<Z@H|;c=nUg~c|6MfqsBYwhc*S5;qkHy@L|u>1V2?Dw1Fp9fr-A8R{jCNDq#Y#+5&
zCqoO18Rwrr{#aom_4n7Wq!U$p|2=!Q>}HOU$MyvwTDEfMj~_pN`0(MMKX;yg-pnnL
zki9kPXN{fVj=g)oR_(R5y;B%4d-m+BSy$hG2g-cobar;Wefu_tt^`kCPme>Yfkf8U
zTYvu8%>Jgke*OB#Pu8y0<%{K>bTVc7^ywQTd{l%OU%Y=W&cU*G?_SwI7cX8c+L^QY
zrqzZ2W*oY6{p984g?lf*bdj}+aCdi~=&^)((Ta^54HsX$!K$?K`}glRZ$>_lmX^-X
z&sT|@)yCny^wO<cQn%CU>-S&GSP=a9@#7qsA`6+eX%g?=zEyNTVe{uo*479ew|<4m
zM<0I-@Sddk@NdS8_cw3e{Pf9)#pL^wCoUQyPRnF{eS8)uTgV$l&YwS@ot@p^-{0Qh
z`1g13@`{QkIjp$;?wwxBEkUtMYKQXwP1HAb<Y+euWH|l%_wSV}HQ&7c`YT^1@e$DF
zoR^;#iFUi5C~=wT^X%!<)Y8(g=5YrYjYYTwjck%O-D+!ZZ{J~ETU(pku}DlzOlvCF
zJ6Y)~873<Z-?<~>Fx9Iy>)e?$TR4MOiU>25=dMs)SeuiQkf1QrXHhWAotrmLrftq)
z(w%)a%}2aMVs&0@cK-!EJw2f6c`Qx`B7n@I359p#;^QYizH~|GviJvqj-yGAmIc?J
z6j=(`Fz0QLUVgc-LQ%k~sH&<<%f{Y*a{7~3ueg+_oqqbJ%(~ds@TP|RJ(**I-<y>t
zdW40AEnB|a@MEi!;zW;_`1r-^dS)Jec;GEB3lq<$_SSk9SE+TKzc(d=60oPMpUXO@
GgeCwpK4DP+

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_order@2x.png b/Telegram/Resources/icons/settings/premium/stories_order@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b4f64ceb6a11804a5053b8126454e61a74cc447
GIT binary patch
literal 1637
zcmV-r2AcVaP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NH&q+i<R9Fe^m|I9zTM&S=EG&~!
z%komvMWrmkAdQf$s7z8QD=qCI$Opk94eSD<FI~i-KnsPUhoGn=#D@ay@>B?7_MlW4
z<+YMZvnVf>dA^#%{@1_$z5o4pl5@_3`(ZO{Zfo|;teIJR!i4c>+ymnt_`iC<%gbx#
z%$XA>PW;adoIH8*#*G`x%gY-Y8oIi=zJC2WIy(C8+qdrSZZH)U6`MD2o-$>M8~b25
zckWzxc(@xLk4SUp&OLwr{Kt<UvB3TF>C>kR7cPW_g_-Jo`SK;=&!0aJ2naA`0O@5#
z5d8G%(~llKnwOX7>+36+w{PFp)z!7NwY_=srnk2j)gd7vd^FAr4h|Ncp`jrhdE&$g
zzCqPrR#tZ4zyUD#?%l&%-@kuXsrK-~g$tXTo5dvrsIszh_3G7DNkdA-$H%iJ)`$q6
zSh{qnx(xw+@Zf<^_wL=RlI-F2>(}D|5x#!?`r^fl?PY#(;H}G-FN+`%OifKy1%rZu
zFcfNfdb*0Yf#c%h1_uWb8y+6c&d#>sHX~<bWDE=ppn<F>nktKrkI$k-i&TsaOiGd;
z=<4t9Cq_2h*5ugO*q)vq^nCd6Au1}$m680LHEWhD-U&mBaE8%B#w8^sInjQ9v1-*S
z@pNlzD~?eWgocJ<XkTAnL_~y&*I{xEYj_SGJgC$D(K;(DOB5bCazs^t&jf$w%o!E$
z1W%nhm5K*nV`C$y#);;<m@#8UQBhG%O%3}wQ%qL3ZrwsB2@n_<sFGV+TEM@1_s+7M
z=H}*#)oa(TRV6i;P`-NgN;pSGMyNv?gSK3@Y#9jvKb1)(<>%*%5^9o)cfj}W--m-z
z;Xt`Sr%s*v@#BXmlJ}M^TU@ww#Ely_U?!7Pg1^6iM@Pr!&!3~CqgDLhFgec=MeNX_
zLnh>3D0+w(ap%sRn>TNIZV**Rn6<rW0G0=B*REY6LxHw32z*XX&bDpa$S|6N=LXS&
zq=IXy?Yfa;cv!Gt0c5H(Ezp(Ez|cUdtE(}^z<2@>7rGFfT1oWw_TIN|-@0|{3?<$M
zB)R$e^=kt&wt#4+{HSWTZrytE;zgXt?vy1+4iAYz)M!;;3}Fr?+O#7n_E9s9Nx@+d
z{Tu;8Hiky1swB$VuwYCelO|0PW`{vCyJ)9C)%b_7_&`eu!wwF(=y&9h6bZ%*PSEe>
ztS7dbro`R5cd6hUBcnt)3}Q?{@3d*tIQB1IyzpcX&v|G{%a<>QUpvB2o;<-&8nB_t
z5wiOFdWq=HojVQkSOJVgd@9;*-@dKsRIP#JFzEgJ_YBLRJn5IPaaKjO0m#zyotBmc
zzO%Elsi{e2po{I_zu(9tmGl$N%*>SHyJ^!Vo#wJmNJwBpCAfsch3JGJ2bet3eD>^F
zm0;j4$64w@dwV;QPoF;J7N!cD!kFTIN)f4R*RG-S%a<=&5h^Y&2G8SexWKo<R9IMO
zYQ*m%Q&Lhy;ql|gHCdVViKER|(aBN4jPd8$%_Kxv(Z<~8=jW#y#Bd>omXwsJcoUcz
zLjp&(Y8M6*ZfjIzWTfaJSSwbn&=@J%^y%8#S}sN!$z-`?$r8qIzJNkdP*7mPVTVdi
zPNw3Cr?+q4ZpZEcoeP6phEPiJ!1*2s{bZRlXAXZ97;O=x#_ZX%M-!Yqdp37-nRYai
z&5}d$@Zm%B^02{`D_0T|6PaMF#A0G%7;qVVM1;R0D_5@6n8~DP&z`}+<gbxr>F#O)
z2Z#Ug;lo6YYla9A2<j&X1pjei;1>~HbKbmp8#Zh({<9EhrW{T+e<rkDtE#GY?AQUa
zw6xTAdemecOQ!LYCr?UN$=6%GiP6=oSFP@TyLayv!N-puYxhRSW}ZV7_%&<RoIZV;
zu1E2ZA67U6S3P?4=+dQ2jDOOwtaKhbb_|2~F!y7-mADO_YDT;)+mM+wm7N@)KYzX%
jaU3`9fpHJ~OCI<OBk_SJwIQ_T00000NkvXXu0mjfcBl<U

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_order@3x.png b/Telegram/Resources/icons/settings/premium/stories_order@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d550ddcef72a4bda5a20fb74582bf52696538497
GIT binary patch
literal 2339
zcmV+;3EcLHP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@jY&j7RA>e5nq{aKO%%ty*K6`B
zc6Ybfij6Ji2U{#u5Ia!8_@JQJsECM#ii-I~F;KC^M8qy^#SZLzf8K#}=h>azXLs-8
zy|28xpU%$wPfVRTb7s<{3BRxh!X5~FAnbv#2f`i*dmyEHATEZA^5)H3p+bc+Wy%yO
zQske+@B8=f@7}$8^XARXn>TOVxN+smm9JmF2GbZ97x(MeuVB1ExYDLg+p=ZLrAwDy
zyLJu5?%&6cANTFsH(|nrqD6~(SJtUhr<X5ZzIgGXLx&FDxq>6JX3aWn+O)@yAG<fk
zSo`zm&%=igw{6?ji~2iv?kFLjK7FcFr;ZnvfS3#!GK?NQnl3aNErmaR{1DoSICSVx
z-MV$%?YMB^g0Me%@}y9qLhks0wY_`yzIX4QXcB^jv~lCc!Gi}g4%Mnv%a<=-e0+SS
zOqoiSEZMMO!>(PsPM$pZ)TvX9m9Pl0ZQC|rP6jn<)QFWS;In7XBGw5Uq&$84^ea}Z
z5Cw{$J&P7CYSye-x^(Hh2+f~AKaJnNf4^N$n>KBnBn%ofNXO5gKi>)IyBv>q{P=NQ
zIx~Lm+_^b(=JYKqk%3`6apHt7kf}R<{CFp63l}aF@VRs6oM8USt5>i7;K2it3$b?X
z+QNkk`;%fq<MG%Dbjj=2ug{n<qaBO;-L-3%LQb4G(GKukQldl&-A{b^@@2q)0luX;
zGvHl!?%b)jZOfJ|>{@n?goK3l?c1~D>{Y%?(8{hVT5(GC>ecftB^m>6X6DS9q6LDD
zBpOpP>KXmryLXGeTeof%ELboZ@}jWz?b}!Pnccg0cV}Se8Z>C&jxpEHnKMUPh4(98
zzPuS1yV5CBriezIQ;ixmoMg|QJzF7hU``lwIZ+>xo??b*-MY0I7wggu8#YMWPM$pJ
zB%Vc~V4pvK&XFUB6U<P)W5*6rFm~)%10q@xYdue%Jke0rdR*d}GiO9KJG&K;_`he*
z9>I(lF~W#36gF<$SlBLIy2N5LfSikp7cY+2W-cKF--BOu#u{pB)v6_n?e^{41O|2x
zD^M&X=CT6}CAiwtr%wx;$52%Xf_LP|k*Y}|!S^yqlZNO_*hh^TWw(-em5^UBHEY(i
zW2_}jnlurH0|yRRtDXPxnVd?5R|sNDXC`wEW6t7H5*|HzWSlaDa-w3!j2UJ@dg<!b
ztA)Y4Kdn@$k}POpR|Fnam+z5YvSf+KF}kjb6)Vb&jqU}AWjXUIiJY~J5rEOMO`A4}
z9h{&zddhFGhOteF1R^-2(tiE=9X)!Kp);<-2$uTw>x(#yi>Pz`ku7M=nl;2LoNh!;
zu!a$iJbU&`31Kd{D)&$+_93xVt5zO3k|1;n6H@&rzhTJHPf6^nNt!%R@fJ+gs#R49
zYxm&6gO*zNU(Pk`4el6Uwd|#W=Y%1&7sA@GvSrIEHhfXwjFK0{UND?!1XiwGIiYo;
zUAuPV7gnuWl`UH~y*xqxftJk_&ta)b`Cr|JQl(1S4PY_jv@&PTOhkdt(|5dx5o5am
zr1)d7UhRhXEWzuLu~STz0a1k{cEn)3zb-zaVOg?dkvhG%q%h?PF+;aa%=q^0o6r`I
zAJMQ6A3op=6%<!1JgG>q1uN~w9aV1_F}H4KM8jYf{?esO>$udS$!aOp@87?-+n_gw
zvy~2rXc%sg$Wm34g4c1WLX-cO8Tj_?Te}T<3~BM<5e<V==JbDI#ALWIj4;jKu>1G#
z%Se!o)d3Onl8TELFIKKx8G<t+&J-W2qf?lcy$8M5uV1%o=X^wXG;G+gyLa!-nl;M~
zNGcgKW{kvm&6_t*s_;q0B&5=lq%QdnqiNQuNb*^5J$v>PI#q~{9Xl$$Y-s1tpHHq0
z#CvMcSg*#UtQQ5ndi9c#4;I~Xvmp|;Z{O}ksgALZ7<Hs86oNHIB&MUi(<EdBOrk+(
z??jg_T?9;~Kxm!l)29z3xq0(uV_c#mf74ty%E|P|kt5b>&;RSztz!el%?9Y5+_`fz
zU(|@be*KyZhg~ff!pK*cdGqGk0frLdWtj#&dh{?LycOljl}q1hyfOVoEnd7>3~)+!
zPntAIFw2%L^CX-Ey$ssJhY#5(J+Z|I#1<+yeNUf0b<(b1D!AOOS&ia^Fa1G2*;@U_
z{>cdJ-Md#*4;eDVsETu^U}(G^TN&|5h1|7DR)^8+)~#Do-JhgbEn+b*5u7a6?-fYq
z__IjgtjQE`2kDRBKYHN6fzm22I9s%6;Uq&Y0m0X<UE2v}E@xJ72Pc|dy?XUWFI)(Y
zWND$4hY4o05=(Ju>Qw?sd>5Ew6&v)iW5@Ki`B<ioQVkWuhYuIujk@K_mm5HlMdYm*
z(qLZqw<NC52|%T7^wZR-Q{~tesVm4IC*PGTSBiWHHXDy`5Q6B_d5E&P&eU~t(<%8Z
z9qE@Qh0ePTT{78!moS1GeV$%evH*USM&MDV-<V+vCsvYPzFtM?5;+`M1R`_6f(0&9
zi_?a>$03Z0<&ZM{n1pJ{N+0uxfaVc2d3-HH2eIzAZry5;gV!YyueaPnGgi-^KNr2e
zJ)uRM{g=0H#)od?$ru5A0FC7ARG>fs`kok%A?3AH=gytSjT^_Ml<pzKN*;{4CwiHC
zT-yqsFfx1g>~`CdTY|;?`}gP2Dw>RhWlW41E+f5MEb4bR$cg%(AXzP>7l#fVdiCm6
zqs37RStp#b*(#$Np<e(YmiRa-OKbonpV>^AX8QJOY#0D8E~ZbPZpqrZ+rj$}k;d~Y
zk8Z>8vd3MGODzY}DpjhGw<}hx7&K8iK_>Y?mIQa?Je|FK`7$|K7YW8HmJ{7U(8C=?
z)22<iEiuCW%0fnoIK$&u{go{YjShPt?18Wc!X5~F;Q!GB{{qmA1oUt#q2d4l002ov
JPDHLkV1jLNU<LpH

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/timer.png b/Telegram/Resources/icons/settings/premium/timer.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fe0383b45c56fd79820f1db2abba0c1edf0268b
GIT binary patch
literal 608
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?3AaAV~B;|
z)hT<kv;sw1L-iJEvi#p*z@oFKHA%VY0dq!j_C047`9p5pI|VLtmx<Xmv~n~h<t~nh
z(Cji(>Nq*wc*AoGW6uYZ)OJtUx_|4r!v5kuz3cB+tB2Yfd|$ol|D6+W%fhv$*6pvi
zk-HzFn9&&Vu)t!bPu+ggg)d90EM#V#P1_jpXZ5NOt&2?0KmRP+nX~=&{hTSMpMLvY
zyZttAtJ61)0t=Zqz3EO16Uu#sx{sR8_Fa9|XyWOwE4<WMIs~shocpfCYVpMrk3YWn
zGGA-1fPz~@`?5Z_#n)e7wfo$yWxQO(@Q{vRUR~wRn7H-VAAgM4qt5~qnRrG%5a<A-
znI77Q-hc1D#+o>d!%#ix+}kqkHpPbXtG+BZSaUaTxpT47y($%<jX6j751wXI(g`z=
zNYQV6=F)vsY4+K!L=L|Nh1Uhdx(&Q_J}iE^<4)doAGOC1ZVCV`*l5Z1rE2fNga>c#
z1}C+=pLtDHh*NH1-1_V@jzS7<Hx3FP(Y2j_zSr&W>#tlQj7O9ld>$-Unt#6dM%e1m
zwPD^%gZNhoY;n+Gny<G_!fyWhsI}+Pj31vr@nZ>VQsg1G*JVqXm>V5z<d#3(HQ!JD
d;eN+G%qQR77SR6ucseL{Jzf1=);T3K0RTPs_PGE6

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/timer@2x.png b/Telegram/Resources/icons/settings/premium/timer@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..28d3d1480711f6b8fa340b87299bce1914fdf360
GIT binary patch
literal 1250
zcmV<81ReW{P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGOi4sRR9Fe^n9D0RZy3kN@#maF
za!NVJhJ`2=Y!O+Y-V*<T6brxDun}cpft0Om9106%K~ffEK^8Vja@Zlq9OCzRU9a2o
z&fN1nGtcwZZ}FN1*L_{z@8`PbHZ%7O!}vbFSKxaEG%N7$$Dt|wFRA?e{P&N8An*wU
z2aZThO%;d=0%y7-1O)|ER8$NN4ejmi-Q3*B^2kqyBq<?4=8o%!IxH-#qod>O?96i#
zb}=%<Sfo*XeLWM6i;MH#*TqRRH8l+n59j9Q3X#QFSy|cH*}1s5I6prpnVz1WmX=ml
zR#sbEs~R629rg6|#K*@^O--?8ZEbDS)6?GP<hvRY5;8hEs#aoseZ8ipCOkac&PfRY
zGG&qA`1m+EIoZzTG|$PcuC5C4@bIv%uFk2`Fc4!A@8jcRadEM8uU;7%8oIW&Cd8$s
zrP$b5z0N+1Wp{U12%rGkYaLW3CMJZ%pDZ}o&u0Wi^%ox>A9v8!M#2RsvsqYJ@O}?>
zcXxMnb=hEkrm+JN8dxt%+fr0il-%C?`}@(+(Y89n$ji%<P6S?LKtQ1c8yOktMX4|K
z_V!Afs;Vlz;xk)XS}IC{&z$}@C{Y5}E9|ln5fRtd*O<AG?KCRyd_q{3mzTi;r-dT;
z4jLL7<W$Pb%YCX{O$eZnX`v<SZ=A-)M%1ULr`y}xTASZVfMBsp3oA!IA@&`li;Ig^
zL*N;~N((DZGohH6n3R+hq+45CRzu(!!P0_8R+?r)?2)3AEz{~TWfBt;C8Gk9z%*1?
z)yO0;538%I<+>{<C@|M7<D{e{8i<~Np+#a&fE7KB%r(Q%tdQEqUtV6U22-Y`rG-}x
zNfIzL39LhfRgF9~nhB{TRh>Kyrug~!*)wArdX`kIu&R+N=>skWS<>d_X1&5A%Z6}p
za3FdD@0*PHz=}R0A;E+6E7Yve<>lqw-5vFkk`k-Il)1mZ=UMmT;~-#Y5?F_VrN!0N
zm9?tR$j;1Os4oYWl`VFDe%=M9y}eylH76&>h0TE!ppa?dK>jJ=GU8sqIW{)-nfo)p
z0fGhY@S*k9b#ihNCwGnax12A7g9sEru)rP2f0uA`a@}F(g~9vl;_p7&5fFLz0ITkN
zTeY?@FfhP`IQskhwE|a3MI&%!{1WrgDc@FaZ*Q%wtzQNA5q2P)8$k6f>mFkm>`i=n
z0s`09*XIwyFfht&Ksnj$d~_))D&mXt=U?vqeRg&>BO}9y!J~|LZf;JzKne>BJ&FN@
zeE)84ZVLC|;bCxa(C3LFK!#Xc*#E#swC5?XGmngnJUu;010E!NhIV##R#sMKWo7;I
zaS$*hNl6}Kh_PVQZtR|XKjZA|?3tMvxgca_UVb7&jK$Ap&TTyY`A*%~*m!+?wN8j6
zB?SI$J1+h|WSuep1j@|J<V{pwMtQ&CI5|1Fy}h-Hzcb$}@VBnOf0Cm1i3An^j{pDw
M07*qoM6N<$f|##5F#rGn

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/timer@3x.png b/Telegram/Resources/icons/settings/premium/timer@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..173ad913dcd4e9e05a58a653e9cead549a49e8d7
GIT binary patch
literal 1883
zcmV-h2c-CkP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>#Ysd#RA>e5n%hfPOBBb=E=Hvl
zVb)3P@)A^3l08UwLoE6WETST)Hy`RT>;geT27&~F556cp6cL3~YMD?3Wms0A4_zMW
zM4j%Im73>#j&oX!dwzS*?BCv+aDMyY$J%Sw`hLGNzkQimv(wU2M`{F8Baj+_)Ci<T
zAjT0GH*~}ZI3}Qqii-XkIxxnBptwX_zkdDip#vi>%wU}K;O4kmv$C=jlo)X#`{9gu
z$EHk~vSi7UsZ*ya1sI&-^b-`9e_UKZI?jp}D>iT5ylK-WjNIH@o*H^9Hdp0~7cU+>
zc+lF~dhOaZ3{Sw=I?c(+IdteyS67$1o!oy(A(8a4)gRPMn>Ov}(W76!d~xrL8A&=I
zKuPzwAun9G@bTlv6DLlH)6wu=B#vnkHgV#_ef#zuK74rg?AhW}#?PNW@7}%p{Q2`g
ze;xS$_;oB;uweD-)#JyH_hh|!^XAyGW3{!llP6EUdi82yVWA3GxNsp*p5T!>g{-r)
z(=+y8zkWS`{`{_8yJpRr6--P3VFZ)n0eST3QG0v4I6r;*G=2K?V6@m;H*Vbc_U&8Y
z#`ygCb9s5WJOJI9NFkAQ9Zl@--@k9&y44*mQsn;q`}_L(gd4lMx;i^MI|?Z2fatK`
z_xJa2+qNwVY=~U$0qGLPlP6D>En5~MKQI(1-UK>6bb%Q$HI|l^>a4totoKq_W&j^Q
zeyp=V8Wtp6JkPOj-@XZDO-;>&2@}FWxJ3gCxDY{FP*C8O8a|2#^~;wpg{+~WAv{L7
z3@C&S>bZ00hRb)1zH;S?(A>Fmhxd$QB4O*+twR|HhI<wi5D6&)+;d$cnfnO=`uO);
zGl$|@T3S>(MyN#3WrB=Q>6Tz-vG?xXla3V^7h4jHW_jCU7>yPObV7{`b4qQ=4`|k(
zgiLb+BK?}8bPUX<rY7lIY){Da^mN`-3U_dDaOKLCe(D4K5jzGc)Jg+lkQBh>+N56z
z_4W0xX~W|pb__76<xg|D7wlc%xpSw8Jbn7K*rROd)Vic3W$>rJfB#+$)vH&plD=`H
z|6@=iKq*0z^=h>IWBK{{GiT0JqjKreC2*4*p~z`aBS66*$$G0>I;Ou*S<FV37YRTY
zuzvmeU@S|=s3=MP&6_vH{w;<sKo^!!jHP3X7cW+66eL&(CWII@CjyY6=tP(wyQO0?
zb)szH2VwP77nw6>jtaxz)SBWKATmUlU!<jDnVFd?lP8iNM6jO)2y3=^^X92A4658o
zFLp$R2=imNbW92uuV26Rg9!Fh!&<XujUKah?OL3=$K4hgBFrz>(y<>ueyGf(Ywpy1
zOzwnEGtBge3=w9=D37IMJv}`t&U#Jz5wQ3*n-V(BFw-M4M3@<)JeH2Vd-qPo38Ej6
zpTDuO(QHcSG{a1f$Pi&>jFacgnKNn@!{mC>q)ARWMo?W{odQw6oEjlc4g|;?A7Q~c
zmQqZ2cel!Cs<w3L(vFUfV7P>>d-m)(ckY~;k~cRuC;fLJKqjl~V<hBqb#B?RMF#uG
zkt42YBNK-J5reQuB<y`iX*RjPD-!+iWCW;=AxYnq86M?)cH_nk8K?R4=R4=c90;|@
zK#~>R@>C>WUo~&vzTJvALIFE=>=0yKk~l*f?BDeE_Nvihg(u6i&_EFqApP*+gVKPQ
z*tV1^Dk|hMIC=791cgbaLMj3flO&3nHe<#NUWf{s-KxC2JTqqGJkUX^*pY#lIJpiS
zI3Qzo`SN9J$ssOoh@cZ{WW<I1A5KO_23x>FP+3_SGl35rL_&%HWcUO|aF>*n3=9ki
z4co^Nz?@Qd@7^tRP$R%8Er}rgg5<g%L8i1cz~$DWd+}d{p8o4IT1K&~tjrS-%PFw>
z)sghPIfNLd*tc%ok}Cv*Z!)5kF+AKr0jT3cm-NEI18zCxfy<tY&drA^dIi#w@81jv
zP&zV1F+bn^+5c_fi<+vcDqR8g#fulM<vu@H5=r*}LScTo<A)HZfA8MC)E;y-+!$xi
zo@EQman?f^!KCPS6o9}29z|=^Z>d(TT6OBwsSO)8ctr5w33G6Ejh{VxMlq1GnW~(z
zLC(PnpU;(8Q&H71@6Wcjwu1)`vU%yj{0*mkJoE73L;bHaZC3TNus2(k2awVG4##nv
znEOxyxPSk?pXgveiM)<SZKmefsbOKumoGnl{P^wLx49aFJ3|0r1d}ohB94=&_gH`i
zR_~Nw*gaUZXc2`@Rg|V4$lk)!r%x#p@m-N@G6dkHno=W>8iCXZq(&e$0{_1e_y?0C
V`I`(6M6v(?002ovPDHLkV1l-wa@YU>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 70306ad8f..a5cf29ecd 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1828,6 +1828,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_summary_subtitle_gift#other" = "{user} has gifted you a {count}-months subscription for Telegram Premium.";
 "lng_premium_summary_subtitle_gift_me#one" = "You gifted {user} a {count}-month subscription for Telegram Premium.";
 "lng_premium_summary_subtitle_gift_me#other" = "You gifted {user} a {count}-months subscription for Telegram Premium.";
+"lng_premium_summary_subtitle_stories" = "Upgraded Stories";
+"lng_premium_summary_about_stories" = "Priority order, stealth mode, permanent views history and more.";
 "lng_premium_summary_subtitle_double_limits" = "Doubled Limits";
 "lng_premium_summary_about_double_limits" = "Up to 1000 channels, 20 folders, 10 pins, 20 public links, 4 accounts and more.";
 "lng_premium_summary_subtitle_more_upload" = "4Gb Upload Size";
@@ -1861,6 +1863,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_success" = "You've successfully subscribed to Telegram Premium!";
 "lng_premium_unavailable" = "This feature requires subscription to **Telegram Premium**.\n\nUnfortunately, **Telegram Premium** is not available in your region.";
 
+// Upgraded Stories.
+"lng_premium_stories_subtitle_order" = "Priority Order";
+"lng_premium_stories_about_order" = "Get more views as your stories are always displayed first.";
+
+"lng_premium_stories_subtitle_stealth" = "Stealth Mode";
+"lng_premium_stories_about_stealth" = "Hide the fact that you viewed other people's stories.";
+
+"lng_premium_stories_subtitle_views" = "Permanent Views History";
+"lng_premium_stories_about_views" = "Check who opens your stories – even after they expire.";
+
+"lng_premium_stories_subtitle_expiration" = "Expiration Durations*";
+"lng_premium_stories_about_expiration" = "Set custom expiration durations like 6 or 48 hours for your stories.";
+
+"lng_premium_stories_subtitle_download" = "Download Stories";
+"lng_premium_stories_about_download" = "Save other people's unprotected stories to your disk.";
+
+"lng_premium_stories_subtitle_caption" = "Longer Captions*";
+"lng_premium_stories_about_caption" = "Add ten times longer captions to your stories – up to 2048 symbols.";
+
+"lng_premium_stories_subtitle_links" = "Links and Formatting*";
+"lng_premium_stories_about_links" = "Add links and formatting in captions of your stories.";
+
+"lng_premium_stories_about_mobile" = "* Available when posting stories from Telegram apps for iOS and Android.";
+
 // Doubled Limits.
 "lng_premium_double_limits_subtitle_channels" = "Groups and Channels";
 "lng_premium_double_limits_about_channels#one" = "Join up to {count} channels and large groups";
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index 20581a726..6505e31e6 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/padding_wrap.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/painter.h"
+#include "settings/settings_common.h"
 #include "settings/settings_premium.h"
 #include "lottie/lottie_single_player.h"
 #include "history/view/media/history_view_sticker.h"
@@ -92,6 +93,10 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 
 [[nodiscard]] rpl::producer<QString> SectionTitle(PremiumPreview section) {
 	switch (section) {
+	case PremiumPreview::Stories:
+		return tr::lng_premium_summary_subtitle_stories();
+	case PremiumPreview::DoubleLimits:
+		return tr::lng_premium_summary_subtitle_double_limits();
 	case PremiumPreview::MoreUpload:
 		return tr::lng_premium_summary_subtitle_more_upload();
 	case PremiumPreview::FasterDownload:
@@ -122,6 +127,10 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 
 [[nodiscard]] rpl::producer<QString> SectionAbout(PremiumPreview section) {
 	switch (section) {
+	case PremiumPreview::Stories:
+		return tr::lng_premium_summary_about_stories();
+	case PremiumPreview::DoubleLimits:
+		return tr::lng_premium_summary_about_double_limits();
 	case PremiumPreview::MoreUpload:
 		return tr::lng_premium_summary_about_more_upload();
 	case PremiumPreview::FasterDownload:
@@ -1117,6 +1126,56 @@ void Show(std::shared_ptr<ChatHelpers::Show> show, QImage back) {
 	}
 }
 
+void DecorateListPromoBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Descriptor &descriptor) {
+	const auto session = &show->session();
+
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	Data::AmPremiumValue(
+		session
+	) | rpl::skip(1) | rpl::start_with_next([=] {
+		box->closeBox();
+	}, box->lifetime());
+
+	if (const auto &hidden = descriptor.hiddenCallback) {
+		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
+	}
+
+	if (session->premium()) {
+		box->addButton(tr::lng_close(), [=] {
+			box->closeBox();
+		});
+	} else {
+		const auto button = Settings::CreateSubscribeButton({
+			.parent = box,
+			.computeRef = [] { return u"double_limits"_q; },
+			.show = show,
+		});
+
+		box->setShowFinishedCallback([=] {
+			button->startGlareAnimation();
+		});
+
+		box->setStyle(st::premiumPreviewDoubledLimitsBox);
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			const auto &padding =
+				st::premiumPreviewDoubledLimitsBox.buttonPadding;
+			button->resizeToWidth(width
+				- padding.left()
+				- padding.right());
+			button->moveToLeft(padding.left(), padding.top());
+		}, button->lifetime());
+		box->addButton(
+			object_ptr<Ui::AbstractButton>::fromRaw(button));
+	}
+}
+
 void Show(
 		std::shared_ptr<ChatHelpers::Show> show,
 		Descriptor &&descriptor) {
@@ -1128,6 +1187,18 @@ void Show(
 			descriptor.shownCallback(raw);
 		}
 		return;
+	} else if (descriptor.section == PremiumPreview::DoubleLimits) {
+		show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+			DoubledLimitsPreviewBox(box, &show->session());
+			DecorateListPromoBox(box, show, descriptor);
+		}));
+		return;
+	} else if (descriptor.section == PremiumPreview::Stories) {
+		show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+			UpgradedStoriesPreviewBox(box, &show->session());
+			DecorateListPromoBox(box, show, descriptor);
+		}));
+		return;
 	}
 	auto &list = Preloads();
 	for (auto i = begin(list); i != end(list);) {
@@ -1240,11 +1311,13 @@ void PremiumUnavailableBox(not_null<Ui::GenericBox*> box) {
 void DoubledLimitsPreviewBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session) {
+	box->setTitle(tr::lng_premium_summary_subtitle_double_limits());
+
 	const auto limits = Data::PremiumLimits(session);
 	auto entries = std::vector<Ui::Premium::ListEntry>();
 	{
 		const auto premium = limits.channelsPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_channels(),
 			tr::lng_premium_double_limits_about_channels(
 				lt_count,
@@ -1256,7 +1329,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.dialogsPinnedPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_pins(),
 			tr::lng_premium_double_limits_about_pins(
 				lt_count,
@@ -1268,7 +1341,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.channelsPublicPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_links(),
 			tr::lng_premium_double_limits_about_links(
 				lt_count,
@@ -1280,7 +1353,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.gifsPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_gifs(),
 			tr::lng_premium_double_limits_about_gifs(
 				lt_count,
@@ -1292,7 +1365,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.stickersFavedPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_stickers(),
 			tr::lng_premium_double_limits_about_stickers(
 				lt_count,
@@ -1304,7 +1377,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.aboutLengthPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_bio(),
 			tr::lng_premium_double_limits_about_bio(
 				Ui::Text::RichLangValue),
@@ -1314,7 +1387,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.captionLengthPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_captions(),
 			tr::lng_premium_double_limits_about_captions(
 				Ui::Text::RichLangValue),
@@ -1324,7 +1397,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.dialogFiltersPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_folders(),
 			tr::lng_premium_double_limits_about_folders(
 				lt_count,
@@ -1336,7 +1409,7 @@ void DoubledLimitsPreviewBox(
 	}
 	{
 		const auto premium = limits.dialogFiltersChatsPremium();
-		entries.push_back(Ui::Premium::ListEntry{
+		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_folder_chats(),
 			tr::lng_premium_double_limits_about_folder_chats(
 				lt_count,
@@ -1350,7 +1423,7 @@ void DoubledLimitsPreviewBox(
 	const auto till = (nextMax >= Main::Domain::kPremiumMaxAccounts)
 		? QString::number(Main::Domain::kPremiumMaxAccounts)
 		: (QString::number(nextMax) + QChar('+'));
-	entries.push_back(Ui::Premium::ListEntry{
+	entries.push_back({
 		tr::lng_premium_double_limits_subtitle_accounts(),
 		tr::lng_premium_double_limits_about_accounts(
 			lt_count,
@@ -1366,6 +1439,60 @@ void DoubledLimitsPreviewBox(
 		std::move(entries));
 }
 
+void UpgradedStoriesPreviewBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session) {
+	using namespace Ui::Text;
+
+	box->setTitle(tr::lng_premium_summary_subtitle_stories());
+
+	auto entries = std::vector<Ui::Premium::ListEntry>();
+	entries.push_back({
+		.title = tr::lng_premium_stories_subtitle_order(),
+		.about = tr::lng_premium_stories_about_order(WithEntities),
+		.icon = &st::settingsStoriesIconOrder,
+	});
+	entries.push_back({
+		.title = tr::lng_premium_stories_subtitle_stealth(),
+		.about = tr::lng_premium_stories_about_stealth(WithEntities),
+		.icon = &st::settingsStoriesIconStealth,
+	});
+	entries.push_back({
+		.title = tr::lng_premium_stories_subtitle_views(),
+		.about = tr::lng_premium_stories_about_views(WithEntities),
+		.icon = &st::settingsStoriesIconViews,
+	});
+	entries.push_back({
+		.title = tr::lng_premium_stories_subtitle_expiration(),
+		.about = tr::lng_premium_stories_about_expiration(WithEntities),
+		.icon = &st::settingsStoriesIconExpiration,
+	});
+	entries.push_back({
+		.title = tr::lng_premium_stories_subtitle_download(),
+		.about = tr::lng_premium_stories_about_download(WithEntities),
+		.icon = &st::settingsStoriesIconDownload,
+	});
+	entries.push_back({
+		.title = tr::lng_premium_stories_subtitle_caption(),
+		.about = tr::lng_premium_stories_about_caption(WithEntities),
+		.icon = &st::settingsStoriesIconCaption,
+	});
+	entries.push_back({
+		.title = tr::lng_premium_stories_subtitle_links(),
+		.about = tr::lng_premium_stories_about_links(WithEntities),
+		.icon = &st::settingsStoriesIconLinks,
+	});
+
+	Ui::Premium::ShowListBox(
+		box,
+		st::defaultPremiumLimits,
+		std::move(entries));
+
+	Settings::AddDividerText(
+		box->verticalLayout(),
+		tr::lng_premium_stories_about_mobile());
+}
+
 object_ptr<Ui::GradientButton> CreateUnlockButton(
 		QWidget *parent,
 		rpl::producer<QString> text) {
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h
index 51f9bcfbd..dbe2be446 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.h
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.h
@@ -41,7 +41,13 @@ void DoubledLimitsPreviewBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session);
 
+void UpgradedStoriesPreviewBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session);
+
 enum class PremiumPreview {
+	Stories,
+	DoubleLimits,
 	MoreUpload,
 	FasterDownload,
 	VoiceToText,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index 8bacca224..04a78c7f2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
+#include "boxes/premium_preview_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
@@ -295,7 +296,7 @@ struct Feature {
 		label->resizeToWidth(width);
 		label->move(added / 2, top);
 		const auto inner = std::min(label->textMaxWidth(), width);
-		const auto right = (added / 2) + (width - inner) / 2 + inner;
+		const auto right = (added / 2) + (outer - inner) / 2 + inner;
 		const auto lockTop = (label->height() - lock->height()) / 2;
 		lock->move(right + lockLeft, top + lockTop);
 	};
@@ -351,9 +352,7 @@ struct Feature {
 				data->requested = false;
 				const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
 				if (const auto window = show->resolveWindow(usage)) {
-					Settings::ShowPremium(
-						window,
-						u"stories__stealth_mode"_q);
+					ShowPremiumPreviewBox(window, PremiumPreview::Stories);
 					window->window().activate();
 				}
 			} else if (now.mode.cooldownTill > now.now) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1c010e0f0..990936b29 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_peer_photo.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
+#include "boxes/premium_preview_box.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/file_utilities.h"
@@ -1252,8 +1253,8 @@ void OverlayWidget::showPremiumDownloadPromo() {
 	const auto filter = [=](const auto &...) {
 		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
 		if (const auto window = uiShow()->resolveWindow(usage)) {
-			const auto ref = u"stories__save_stories_to_gallery"_q;
-			Settings::ShowPremium(window, ref);
+			ShowPremiumPreviewBox(window, PremiumPreview::Stories);
+			window->window().activate();
 		}
 		return false;
 	};
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 2fd6327a4..ebb44cf0a 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -109,6 +109,7 @@ settingsIconTopics: icon {{ "settings/topics", settingsIconFg }};
 settingsIconTTL: icon {{ "settings/ttl", settingsIconFg }};
 settingsIconPhoto: icon {{ "settings/photo", settingsIconFg }};
 
+settingsPremiumIconStories: icon {{ "settings/stories", settingsIconFg }};
 settingsPremiumIconChannelsOff: icon {{ "settings/premium/channels_off", settingsIconFg }};
 settingsPremiumIconDouble: icon {{ "settings/premium/double", settingsIconFg }};
 settingsPremiumIconStatus: icon {{ "settings/premium/status", settingsIconFg }};
@@ -120,6 +121,14 @@ settingsPremiumIconVoice: icon {{ "settings/premium/voice", settingsIconFg }};
 settingsPremiumIconFiles: icon {{ "settings/premium/files", settingsIconFg }};
 settingsPremiumIconTranslations: icon {{ "settings/premium/translations", settingsIconFg }};
 
+settingsStoriesIconOrder: icon {{ "settings/premium/stories_order", premiumButtonBg1 }};
+settingsStoriesIconStealth: icon {{ "menu/stealth", premiumButtonBg1 }};
+settingsStoriesIconViews: icon {{ "menu/show_in_chat", premiumButtonBg1 }};
+settingsStoriesIconExpiration: icon {{ "settings/premium/timer", premiumButtonBg1 }};
+settingsStoriesIconDownload: icon {{ "menu/download", premiumButtonBg1 }};
+settingsStoriesIconCaption: icon {{ "settings/premium/stories_caption", premiumButtonBg1 }};
+settingsStoriesIconLinks: icon {{ "settings/premium/stories_links", premiumButtonBg1 }};
+
 settingsTTLChatsOff: icon {{ "settings/ttl/autodelete_off", windowSubTextFg }};
 settingsTTLChatsOn: icon {{ "settings/ttl/autodelete_on", windowActiveTextFg }};
 
@@ -473,6 +482,9 @@ settingsPremiumRowAboutPadding: margins(59px, 0px, 46px, 6px);
 settingsPremiumPreviewTitlePadding: margins(24px, 13px, 24px, 3px);
 settingsPremiumPreviewAboutPadding: margins(24px, 0px, 24px, 11px);
 settingsPremiumPreviewLinePadding: margins(18px, 0px, 18px, 8px);
+settingsPremiumPreviewIconTitlePadding: margins(62px, 13px, 24px, 1px);
+settingsPremiumPreviewIconAboutPadding: margins(62px, 0px, 24px, 0px);
+settingsPremiumPreviewIconPosition: point(20px, 7px);
 
 settingsPremiumTitlePadding: margins(0px, 18px, 0px, 11px);
 settingsPremiumAboutTextStyle: TextStyle(defaultTextStyle) {
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 2b359b984..75eb85370 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -203,13 +203,14 @@ struct Entry {
 	const style::icon *icon;
 	rpl::producer<QString> title;
 	rpl::producer<QString> description;
-	std::optional<PremiumPreview> section;
+	PremiumPreview section = PremiumPreview::DoubleLimits;
 };
 
 using Order = std::vector<QString>;
 
 [[nodiscard]] Order FallbackOrder() {
 	return Order{
+		u"stories"_q,
 		u"double_limits"_q,
 		u"more_upload"_q,
 		u"faster_download"_q,
@@ -228,12 +229,22 @@ using Order = std::vector<QString>;
 
 [[nodiscard]] base::flat_map<QString, Entry> EntryMap() {
 	return base::flat_map<QString, Entry>{
+		{
+			u"stories"_q,
+			Entry{
+				&st::settingsPremiumIconStories,
+				tr::lng_premium_summary_subtitle_stories(),
+				tr::lng_premium_summary_about_stories(),
+				PremiumPreview::Stories,
+			},
+		},
 		{
 			u"double_limits"_q,
 			Entry{
 				&st::settingsPremiumIconDouble,
 				tr::lng_premium_summary_subtitle_double_limits(),
 				tr::lng_premium_summary_about_double_limits(),
+				PremiumPreview::DoubleLimits,
 			},
 		},
 		{
@@ -1318,55 +1329,7 @@ void Premium::setupContent() {
 				_setPaused(false);
 			});
 
-			if (section) {
-				ShowPremiumPreviewToBuy(controller, *section, hidden);
-				return;
-			}
-			controller->show(Box([=](not_null<Ui::GenericBox*> box) {
-				DoubledLimitsPreviewBox(box, &controller->session());
-
-				box->addTopButton(st::boxTitleClose, [=] {
-					box->closeBox();
-				});
-
-				Data::AmPremiumValue(
-					&controller->session()
-				) | rpl::skip(1) | rpl::start_with_next([=] {
-					box->closeBox();
-				}, box->lifetime());
-
-				box->boxClosing(
-				) | rpl::start_with_next(hidden, box->lifetime());
-
-				if (controller->session().premium()) {
-					box->addButton(tr::lng_close(), [=] {
-						box->closeBox();
-					});
-				} else {
-					const auto button = CreateSubscribeButton({
-						controller,
-						box,
-						[] { return u"double_limits"_q; }
-					});
-
-					box->setShowFinishedCallback([=] {
-						button->startGlareAnimation();
-					});
-
-					box->setStyle(st::premiumPreviewDoubledLimitsBox);
-					box->widthValue(
-					) | rpl::start_with_next([=](int width) {
-						const auto &padding =
-							st::premiumPreviewDoubledLimitsBox.buttonPadding;
-						button->resizeToWidth(width
-							- padding.left()
-							- padding.right());
-						button->moveToLeft(padding.left(), padding.top());
-					}, button->lifetime());
-					box->addButton(
-						object_ptr<Ui::AbstractButton>::fromRaw(button));
-				}
-			}));
+			ShowPremiumPreviewToBuy(controller, section, hidden);
 		});
 
 		iconContainers.push_back(dummy);
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index a7ce3f922..693279537 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -1018,79 +1018,123 @@ QGradientStops GiftGradientStops() {
 	};
 }
 
+QGradientStops StoriesIconsGradientStops() {
+	return {
+		{ 0., st::premiumButtonBg1->c },
+		{ .33, st::premiumButtonBg2->c },
+		{ .66, st::premiumButtonBg3->c },
+		{ 1., st::premiumIconBg1->c },
+	};
+}
+
 void ShowListBox(
 		not_null<Ui::GenericBox*> box,
 		const style::PremiumLimits &st,
 		std::vector<ListEntry> entries) {
+	box->setWidth(st::boxWideWidth);
 
 	const auto &stLabel = st::defaultFlatLabel;
 	const auto &titlePadding = st::settingsPremiumPreviewTitlePadding;
-	const auto &descriptionPadding = st::settingsPremiumPreviewAboutPadding;
+	const auto &aboutPadding = st::settingsPremiumPreviewAboutPadding;
+	const auto iconTitlePadding = st::settingsPremiumPreviewIconTitlePadding;
+	const auto iconAboutPadding = st::settingsPremiumPreviewIconAboutPadding;
 
 	auto lines = std::vector<Line*>();
 	lines.reserve(int(entries.size()));
 
+	auto icons = std::shared_ptr<std::vector<QColor>>();
+
 	const auto content = box->verticalLayout();
 	for (auto &entry : entries) {
-		content->add(
+		const auto title = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				base::take(entry.subtitle) | rpl::map(Ui::Text::Bold),
+				base::take(entry.title) | rpl::map(Ui::Text::Bold),
 				stLabel),
-			titlePadding);
+			entry.icon ? iconTitlePadding : titlePadding);
 		content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				base::take(entry.description),
+				base::take(entry.about),
 				st::boxDividerLabel),
-			descriptionPadding);
-
-		const auto limitRow = content->add(
-			object_ptr<Line>(
-				content,
-				st,
-				entry.rightNumber,
-				TextFactory([=, text = ProcessTextFactory(std::nullopt)](
-						int n) {
-					if (entry.customRightText && (n == entry.rightNumber)) {
-						return *entry.customRightText;
-					} else {
-						return text(n);
-					}
-				}),
-				entry.leftNumber,
-				kLimitRowRatio),
-			st::settingsPremiumPreviewLinePadding);
-		lines.push_back(limitRow);
+			entry.icon ? iconAboutPadding : aboutPadding);
+		if (const auto outlined = entry.icon) {
+			if (!icons) {
+				icons = std::make_shared<std::vector<QColor>>();
+			}
+			const auto index = int(icons->size());
+			icons->push_back(QColor());
+			const auto icon = Ui::CreateChild<Ui::RpWidget>(content.get());
+			icon->resize(outlined->size());
+			title->topValue() | rpl::start_with_next([=](int y) {
+				const auto shift = st::settingsPremiumPreviewIconPosition;
+				icon->move(QPoint(0, y) + shift);
+			}, icon->lifetime());
+			icon->paintRequest() | rpl::start_with_next([=] {
+				auto p = QPainter(icon);
+				outlined->paintInCenter(p, icon->rect(), (*icons)[index]);
+			}, icon->lifetime());
+		}
+		if (entry.leftNumber || entry.rightNumber) {
+			auto factory = [=, text = ProcessTextFactory({})](int n) {
+				if (entry.customRightText && (n == entry.rightNumber)) {
+					return *entry.customRightText;
+				} else {
+					return text(n);
+				}
+			};
+			const auto limitRow = content->add(
+				object_ptr<Line>(
+					content,
+					st,
+					entry.rightNumber,
+					TextFactory(std::move(factory)),
+					entry.leftNumber,
+					kLimitRowRatio),
+				st::settingsPremiumPreviewLinePadding);
+			lines.push_back(limitRow);
+		}
 	}
 
 	content->resizeToWidth(content->height());
 
-	// Color lines.
-	Assert(lines.size() > 2);
-	const auto from = lines.front()->y();
-	const auto to = lines.back()->y() + lines.back()->height();
+	// Colors for icons.
+	if (icons) {
+		box->addSkip(st::settingsPremiumPreviewLinePadding.bottom());
 
-	const auto partialGradient = [&] {
-		auto stops = Ui::Premium::FullHeightGradientStops();
-		// Reverse.
-		for (auto &stop : stops) {
-			stop.first = std::abs(stop.first - 1.);
+		const auto stops = Ui::Premium::StoriesIconsGradientStops();
+		for (auto i = 0, count = int(icons->size()); i != count; ++i) {
+			(*icons)[i] = anim::gradient_color_at(
+				stops,
+				(count > 1) ? (i / float64(count - 1)) : 0.);
 		}
-		return PartialGradient(from, to, std::move(stops));
-	}();
-
-	for (auto i = 0; i < int(lines.size()); i++) {
-		const auto &line = lines[i];
-
-		const auto brush = QBrush(
-			partialGradient.compute(line->y(), line->height()));
-		line->setColorOverride(brush);
 	}
-	box->addSkip(st::settingsPremiumPreviewLinePadding.bottom());
 
-	box->setTitle(tr::lng_premium_summary_subtitle_double_limits());
-	box->setWidth(st::boxWideWidth);
+	// Color lines.
+	if (!lines.empty()) {
+		box->addSkip(st::settingsPremiumPreviewLinePadding.bottom());
+
+		const auto from = lines.front()->y();
+		const auto to = lines.back()->y() + lines.back()->height();
+
+		const auto partialGradient = [&] {
+			auto stops = Ui::Premium::FullHeightGradientStops();
+			// Reverse.
+			for (auto &stop : stops) {
+				stop.first = std::abs(stop.first - 1.);
+			}
+			return PartialGradient(from, to, std::move(stops));
+		}();
+
+		for (auto i = 0; i < int(lines.size()); i++) {
+			const auto &line = lines[i];
+
+			const auto brush = QBrush(
+				partialGradient.compute(line->y(), line->height()));
+			line->setColorOverride(brush);
+		}
+		box->addSkip(st::settingsPremiumPreviewLinePadding.bottom());
+	}
 }
 
 void AddGiftOptions(
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.h b/Telegram/SourceFiles/ui/effects/premium_graphics.h
index 089758d93..7f932a9bd 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.h
@@ -88,11 +88,12 @@ void AddAccountsRow(
 [[nodiscard]] QGradientStops GiftGradientStops();
 
 struct ListEntry final {
-	rpl::producer<QString> subtitle;
-	rpl::producer<TextWithEntities> description;
+	rpl::producer<QString> title;
+	rpl::producer<TextWithEntities> about;
 	int leftNumber = 0;
 	int rightNumber = 0;
 	std::optional<QString> customRightText;
+	const style::icon *icon = nullptr;
 };
 void ShowListBox(
 	not_null<Ui::GenericBox*> box,

From 6be1a0587617730bf5a9d3b3d78ee0cd4923a972 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 4 Aug 2023 08:40:40 +0200
Subject: [PATCH 585/676] Add NEW badge to stories premium promo.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 Telegram/SourceFiles/settings/settings.style  | 11 ++++++++
 .../SourceFiles/settings/settings_premium.cpp | 28 +++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index a5cf29ecd..3b86a7dda 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1860,6 +1860,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_summary_bottom_about" = "While the free version of Telegram already gives its users more than any other messaging application, **Telegram Premium** pushes its capabilities even further.\n\n**Telegram Premium** is a paid option, because most Premium Features require additional expenses from Telegram to third parties such as data center providers and server manufacturers. Contributions from **Telegram Premium** users allow us to cover such costs and also help Telegram stay free for everyone.";
 "lng_premium_summary_button" = "Subscribe for {cost} per month";
 
+"lng_premium_summary_new_badge" = "NEW";
+
 "lng_premium_success" = "You've successfully subscribed to Telegram Premium!";
 "lng_premium_unavailable" = "This feature requires subscription to **Telegram Premium**.\n\nUnfortunately, **Telegram Premium** is not available in your region.";
 
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index ebb44cf0a..8eaa3cd8f 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -129,6 +129,17 @@ settingsStoriesIconDownload: icon {{ "menu/download", premiumButtonBg1 }};
 settingsStoriesIconCaption: icon {{ "settings/premium/stories_caption", premiumButtonBg1 }};
 settingsStoriesIconLinks: icon {{ "settings/premium/stories_links", premiumButtonBg1 }};
 
+settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(semiboldTextStyle) {
+		font: font(10px semibold);
+		linkFont: font(10px semibold);
+		linkFontOver: font(10px semibold);
+	}
+	textFg: windowFgActive;
+}
+settingsPremiumNewBadgePosition: point(4px, 1px);
+settingsPremiumNewBadgePadding: margins(4px, 1px, 4px, 1px);
+
 settingsTTLChatsOff: icon {{ "settings/ttl/autodelete_off", windowSubTextFg }};
 settingsTTLChatsOn: icon {{ "settings/ttl/autodelete_on", windowActiveTextFg }};
 
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 75eb85370..b515e8fa1 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -204,6 +204,7 @@ struct Entry {
 	rpl::producer<QString> title;
 	rpl::producer<QString> description;
 	PremiumPreview section = PremiumPreview::DoubleLimits;
+	bool newBadge = false;
 };
 
 using Order = std::vector<QString>;
@@ -236,6 +237,7 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_stories(),
 				tr::lng_premium_summary_about_stories(),
 				PremiumPreview::Stories,
+				true,
 			},
 		},
 		{
@@ -1271,6 +1273,32 @@ void Premium::setupContent() {
 			descriptionPadding);
 		description->setAttribute(Qt::WA_TransparentForMouseEvents);
 
+		const auto badge = entry.newBadge
+			? Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
+				content,
+				object_ptr<Ui::FlatLabel>(
+					content,
+					tr::lng_premium_summary_new_badge(),
+					st::settingsPremiumNewBadge),
+				st::settingsPremiumNewBadgePadding)
+			: nullptr;
+		if (badge) {
+			badge->setAttribute(Qt::WA_TransparentForMouseEvents);
+			badge->paintRequest() | rpl::start_with_next([=] {
+				auto p = QPainter(badge);
+				auto hq = PainterHighQualityEnabler(p);
+				p.setPen(Qt::NoPen);
+				p.setBrush(st::windowBgActive);
+				const auto r = st::settingsPremiumNewBadgePadding.left();
+				p.drawRoundedRect(badge->rect(), r, r);
+			}, badge->lifetime());
+
+			label->geometryValue(
+			) | rpl::start_with_next([=](QRect geometry) {
+				badge->move(st::settingsPremiumNewBadgePosition
+					+ QPoint(label->x() + label->width(), label->y()));
+			}, badge->lifetime());
+		}
 		const auto dummy = Ui::CreateChild<Ui::AbstractButton>(content);
 		dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
 

From 318d75cc632ffdfcfc624d51ed031f9e10ad0972 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 4 Aug 2023 16:49:58 +0200
Subject: [PATCH 586/676] Update API scheme on layer 161.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 31 +++++---
 Telegram/SourceFiles/data/data_stories.h      |  8 +-
 Telegram/SourceFiles/data/data_story.cpp      | 66 +++++++----------
 Telegram/SourceFiles/data/data_story.h        | 18 +++--
 .../stories/media_stories_controller.cpp      | 74 +++++--------------
 .../media/stories/media_stories_controller.h  | 12 +--
 .../stories/media_stories_recent_views.cpp    | 23 +++---
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 14 ++--
 8 files changed, 100 insertions(+), 146 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 8aa84afd2..4107f7a79 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -862,7 +862,8 @@ void Stories::activateStealthMode(Fn<void()> done) {
 	using Flag = MTPstories_ActivateStealthMode::Flag;
 	api->request(MTPstories_ActivateStealthMode(
 		MTP_flags(Flag::f_past | Flag::f_future)
-	)).done([=](const MTPBool &result) {
+	)).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
 		if (done) done();
 	}).fail([=] {
 		if (done) done();
@@ -1233,11 +1234,11 @@ void Stories::sendIncrementViewsRequests() {
 
 void Stories::loadViewsSlice(
 		StoryId id,
-		std::optional<StoryView> offset,
-		Fn<void(std::vector<StoryView>)> done) {
+		QString offset,
+		Fn<void(StoryViews)> done) {
 	if (_viewsStoryId == id
 		&& _viewsOffset == offset
-		&& (offset || _viewsRequestId)) {
+		&& (!offset.isEmpty() || _viewsRequestId)) {
 		if (_viewsRequestId) {
 			_viewsDone = std::move(done);
 		}
@@ -1251,21 +1252,27 @@ void Stories::loadViewsSlice(
 	const auto perPage = _viewsDone ? kViewsPerPage : kPollingViewsPerPage;
 	api->request(_viewsRequestId).cancel();
 	_viewsRequestId = api->request(MTPstories_GetStoryViewsList(
+		MTP_flags(0),
+		MTPstring(), // q
 		MTP_int(id),
-		MTP_int(offset ? offset->date : 0),
-		MTP_long(offset ? peerToUser(offset->peer->id).bare : 0),
+		MTP_string(offset),
 		MTP_int(perPage)
 	)).done([=](const MTPstories_StoryViewsList &result) {
 		_viewsRequestId = 0;
 
-		auto slice = std::vector<StoryView>();
-
 		const auto &data = result.data();
+		auto slice = StoryViews{
+			.nextOffset = data.vnext_offset().value_or_empty(),
+			.total = data.vcount().v,
+		};
 		_owner->processUsers(data.vusers());
-		slice.reserve(data.vviews().v.size());
+		slice.list.reserve(data.vviews().v.size());
 		for (const auto &view : data.vviews().v) {
-			slice.push_back({
+			slice.list.push_back({
 				.peer = _owner->peer(peerFromUser(view.data().vuser_id())),
+				.reaction = (view.data().vreaction()
+					? ReactionFromMTP(*view.data().vreaction())
+					: Data::ReactionId()),
 				.date = view.data().vdate().v,
 			});
 		}
@@ -1274,7 +1281,7 @@ void Stories::loadViewsSlice(
 			.story = _viewsStoryId,
 		};
 		if (const auto story = lookup(fullId)) {
-			(*story)->applyViewsSlice(_viewsOffset, slice, data.vcount().v);
+			(*story)->applyViewsSlice(_viewsOffset, slice);
 		}
 		if (const auto done = base::take(_viewsDone)) {
 			done(std::move(slice));
@@ -1713,7 +1720,7 @@ void Stories::sendPollingViewsRequests() {
 		return;
 	} else if (!_viewsRequestId) {
 		Assert(_viewsDone == nullptr);
-		loadViewsSlice(_pollingViews.front()->id(), std::nullopt, nullptr);
+		loadViewsSlice(_pollingViews.front()->id(), QString(), nullptr);
 	}
 	_pollingViewsTimer.callOnce(kPollViewsInterval);
 }
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 545acdfe0..ae91d1ffc 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -179,8 +179,8 @@ public:
 	static constexpr auto kViewsPerPage = 50;
 	void loadViewsSlice(
 		StoryId id,
-		std::optional<StoryView> offset,
-		Fn<void(std::vector<StoryView>)> done);
+		QString offset,
+		Fn<void(StoryViews)> done);
 
 	[[nodiscard]] const StoriesIds &archive() const;
 	[[nodiscard]] rpl::producer<> archiveChanged() const;
@@ -366,8 +366,8 @@ private:
 	base::flat_set<PeerId> _incrementViewsRequests;
 
 	StoryId _viewsStoryId = 0;
-	std::optional<StoryView> _viewsOffset;
-	Fn<void(std::vector<StoryView>)> _viewsDone;
+	QString _viewsOffset;
+	Fn<void(StoryViews)> _viewsDone;
 	mtpRequestId _viewsRequestId = 0;
 
 	base::flat_set<FullStoryId> _preloaded;
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index e8389ad2c..8f629bd34 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -339,51 +339,35 @@ const std::vector<not_null<PeerData*>> &Story::recentViewers() const {
 	return _recentViewers;
 }
 
-const std::vector<StoryView> &Story::viewsList() const {
-	return _viewsList;
-}
-
-int Story::views() const {
+const StoryViews &Story::viewsList() const {
 	return _views;
 }
 
+int Story::views() const {
+	return _views.total;
+}
+
 void Story::applyViewsSlice(
-		const std::optional<StoryView> &offset,
-		const std::vector<StoryView> &slice,
-		int total) {
-	const auto changed = (_views != total);
-	_views = total;
-	if (!offset) {
-		const auto i = _viewsList.empty()
-			? end(slice)
-			: ranges::find(slice, _viewsList.front());
-		const auto merge = (i != end(slice))
-			&& !ranges::contains(slice, _viewsList.back());
-		if (merge) {
-			_viewsList.insert(begin(_viewsList), begin(slice), i);
-		} else {
-			_viewsList = slice;
-		}
-	} else if (!slice.empty()) {
-		const auto i = ranges::find(_viewsList, *offset);
-		const auto merge = (i != end(_viewsList))
-			&& !ranges::contains(_viewsList, slice.back());
-		if (merge) {
-			const auto after = i + 1;
-			if (after == end(_viewsList)) {
-				_viewsList.insert(after, begin(slice), end(slice));
-			} else {
-				const auto j = ranges::find(slice, _viewsList.back());
-				if (j != end(slice)) {
-					_viewsList.insert(end(_viewsList), j + 1, end(slice));
-				}
-			}
+		const QString &offset,
+		const StoryViews &slice) {
+	const auto changed = (_views.total != slice.total);
+	_views.total = slice.total;
+	if (offset.isEmpty()) {
+		_views = slice;
+	} else if (_views.nextOffset == offset) {
+		_views.list.insert(
+			end(_views.list),
+			begin(slice.list),
+			end(slice.list));
+		_views.nextOffset = slice.nextOffset;
+		if (_views.nextOffset.isEmpty()) {
+			_views.total = int(_views.list.size());
 		}
 	}
-	const auto known = int(_viewsList.size());
+	const auto known = int(_views.list.size());
 	if (known >= _recentViewers.size()) {
 		const auto take = std::min(known, kRecentViewersMax);
-		auto viewers = _viewsList
+		auto viewers = _views.list
 			| ranges::views::take(take)
 			| ranges::views::transform(&StoryView::peer)
 			| ranges::to_vector;
@@ -436,7 +420,7 @@ void Story::applyFields(
 			&owner().session(),
 			data.ventities().value_or_empty()),
 	};
-	auto views = _views;
+	auto views = _views.total;
 	auto viewers = std::vector<not_null<PeerData*>>();
 	if (!data.is_min()) {
 		if (const auto info = data.vviews()) {
@@ -457,7 +441,7 @@ void Story::applyFields(
 	const auto editedChanged = (_edited != edited);
 	const auto mediaChanged = (_media != media);
 	const auto captionChanged = (_caption != caption);
-	const auto viewsChanged = (_views != views)
+	const auto viewsChanged = (_views.total != views)
 		|| (_recentViewers != viewers);
 
 	_privacyPublic = (privacy == StoryPrivacy::Public);
@@ -468,8 +452,10 @@ void Story::applyFields(
 	_edited = edited;
 	_pinned = pinned;
 	_noForwards = noForwards;
+	if (_views.total != views) {
+		_views = StoryViews{ .total = views };
+	}
 	if (viewsChanged) {
-		_views = views;
 		_recentViewers = std::move(viewers);
 	}
 	if (mediaChanged) {
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 70370f176..21ab368b6 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/weak_ptr.h"
+#include "data/data_message_reaction_id.h"
 
 class Image;
 class PhotoData;
@@ -58,11 +59,18 @@ struct StoryMedia {
 
 struct StoryView {
 	not_null<PeerData*> peer;
+	Data::ReactionId reaction;
 	TimeId date = 0;
 
 	friend inline bool operator==(StoryView, StoryView) = default;
 };
 
+struct StoryViews {
+	std::vector<StoryView> list;
+	QString nextOffset;
+	int total = 0;
+};
+
 class Story final {
 public:
 	Story(
@@ -115,12 +123,9 @@ public:
 
 	[[nodiscard]] auto recentViewers() const
 		-> const std::vector<not_null<PeerData*>> &;
-	[[nodiscard]] const std::vector<StoryView> &viewsList() const;
+	[[nodiscard]] const StoryViews &viewsList() const;
 	[[nodiscard]] int views() const;
-	void applyViewsSlice(
-		const std::optional<StoryView> &offset,
-		const std::vector<StoryView> &slice,
-		int total);
+	void applyViewsSlice(const QString &offset, const StoryViews &slice);
 
 	void applyChanges(
 		StoryMedia media,
@@ -140,8 +145,7 @@ private:
 	StoryMedia _media;
 	TextWithEntities _caption;
 	std::vector<not_null<PeerData*>> _recentViewers;
-	std::vector<StoryView> _viewsList;
-	int _views = 0;
+	StoryViews _views;
 	const TimeId _date = 0;
 	const TimeId _expires = 0;
 	TimeId _lastUpdateTime = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 9e74b82b8..bc2233f3d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1254,12 +1254,17 @@ SiblingView Controller::sibling(SiblingType type) const {
 	return {};
 }
 
-ViewsSlice Controller::views(PeerId offset) {
+const Data::StoryViews &Controller::views(int limit, bool initial) {
 	invalidate_weak_ptrs(&_viewsLoadGuard);
-	if (!offset) {
+	if (initial) {
 		refreshViewsFromData();
-	} else if (!sliceViewsTo(offset)) {
-		return { .left = _viewsSlice.left };
+	}
+	if (_viewsSlice.total > _viewsSlice.list.size()
+		&& _viewsSlice.list.size() < limit) {
+		const auto done = viewsGotMoreCallback();
+		const auto user = shownUser();
+		auto &stories = user->owner().stories();
+		stories.loadViewsSlice(_shown.story, _viewsSlice.nextOffset, done);
 	}
 	return _viewsSlice;
 }
@@ -1268,27 +1273,25 @@ rpl::producer<> Controller::moreViewsLoaded() const {
 	return _moreViewsLoaded.events();
 }
 
-Fn<void(std::vector<Data::StoryView>)> Controller::viewsGotMoreCallback() {
-	return crl::guard(&_viewsLoadGuard, [=](
-			const std::vector<Data::StoryView> &result) {
+Fn<void(Data::StoryViews)> Controller::viewsGotMoreCallback() {
+	return crl::guard(&_viewsLoadGuard, [=](Data::StoryViews result) {
 		if (_viewsSlice.list.empty()) {
 			const auto user = shownUser();
 			auto &stories = user->owner().stories();
 			if (const auto maybeStory = stories.lookup(_shown)) {
-				_viewsSlice = {
-					.list = result,
-					.left = (*maybeStory)->views() - int(result.size()),
-				};
+				_viewsSlice = (*maybeStory)->viewsList();
 			} else {
 				_viewsSlice = {};
 			}
 		} else {
 			_viewsSlice.list.insert(
 				end(_viewsSlice.list),
-				begin(result),
-				end(result));
-			_viewsSlice.left
-				= std::max(_viewsSlice.left - int(result.size()), 0);
+				begin(result.list),
+				end(result.list));
+			_viewsSlice.total = result.nextOffset.isEmpty()
+				? int(_viewsSlice.list.size())
+				: std::max(result.total, int(_viewsSlice.list.size()));
+			_viewsSlice.nextOffset = result.nextOffset;
 		}
 		_moreViewsLoaded.fire({});
 	});
@@ -1439,46 +1442,9 @@ void Controller::refreshViewsFromData() {
 		return;
 	}
 	const auto story = *maybeStory;
-	const auto &list = story->viewsList();
+	const auto &views = story->viewsList();
 	const auto total = story->views();
-	_viewsSlice.list = list
-		| ranges::views::take(Data::Stories::kViewsPerPage)
-		| ranges::to_vector;
-	_viewsSlice.left = total - int(_viewsSlice.list.size());
-	if (_viewsSlice.list.empty() && _viewsSlice.left > 0) {
-		const auto done = viewsGotMoreCallback();
-		stories.loadViewsSlice(_shown.story, std::nullopt, done);
-	}
-}
-
-bool Controller::sliceViewsTo(PeerId offset) {
-	Expects(shown());
-
-	const auto user = shownUser();
-	auto &stories = user->owner().stories();
-	const auto maybeStory = stories.lookup(_shown);
-	if (!maybeStory || !user->isSelf()) {
-		_viewsSlice = {};
-		return true;
-	}
-	const auto story = *maybeStory;
-	const auto &list = story->viewsList();
-	const auto proj = [&](const Data::StoryView &single) {
-		return single.peer->id;
-	};
-	const auto i = ranges::find(list, _viewsSlice.list.back());
-	const auto add = (i != end(list)) ? int(end(list) - i - 1) : 0;
-	const auto j = ranges::find(_viewsSlice.list, offset, proj);
-	Assert(j != end(_viewsSlice.list));
-	if (!add && (j + 1) == end(_viewsSlice.list)) {
-		const auto done = viewsGotMoreCallback();
-		stories.loadViewsSlice(_shown.story, _viewsSlice.list.back(), done);
-		return false;
-	}
-	_viewsSlice.list.erase(begin(_viewsSlice.list), j + 1);
-	_viewsSlice.list.insert(end(_viewsSlice.list), i + 1, end(list));
-	_viewsSlice.left -= add;
-	return true;
+	_viewsSlice = story->viewsList();
 }
 
 void Controller::unfocusReply() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 997590929..f21b97d5b 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -104,11 +104,6 @@ struct Layout {
 	friend inline bool operator==(Layout, Layout) = default;
 };
 
-struct ViewsSlice {
-	std::vector<Data::StoryView> list;
-	int left = 0;
-};
-
 class Controller final : public base::has_weak_ptr {
 public:
 	explicit Controller(not_null<Delegate*> delegate);
@@ -158,7 +153,7 @@ public:
 	void repaintSibling(not_null<Sibling*> sibling);
 	[[nodiscard]] SiblingView sibling(SiblingType type) const;
 
-	[[nodiscard]] ViewsSlice views(PeerId offset);
+	[[nodiscard]] const Data::StoryViews &views(int limit, bool initial);
 	[[nodiscard]] rpl::producer<> moreViewsLoaded() const;
 
 	void unfocusReply();
@@ -221,9 +216,8 @@ private:
 	void moveFromShown();
 
 	void refreshViewsFromData();
-	bool sliceViewsTo(PeerId offset);
 	[[nodiscard]] auto viewsGotMoreCallback()
-		-> Fn<void(std::vector<Data::StoryView>)>;
+		-> Fn<void(Data::StoryViews)>;
 
 	[[nodiscard]] bool shown() const;
 	[[nodiscard]] UserData *shownUser() const;
@@ -285,7 +279,7 @@ private:
 	int _cachedSourceIndex = -1;
 	bool _showingUnreadSources = false;
 
-	ViewsSlice _viewsSlice;
+	Data::StoryViews _viewsSlice;
 	rpl::event_stream<> _moreViewsLoaded;
 	base::has_weak_ptr _viewsLoadGuard;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 806f21ebd..5a5567466 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -264,8 +264,8 @@ void RecentViews::showMenu() {
 		return;
 	}
 
-	const auto views = _controller->views(PeerId());
-	if (views.list.empty() && !views.left) {
+	const auto views = _controller->views(kAddPerPage * 2, true);
+	if (views.list.empty() && !views.total) {
 		return;
 	}
 
@@ -276,7 +276,7 @@ void RecentViews::showMenu() {
 		st::storiesViewsMenu);
 	auto count = 0;
 	const auto added = std::min(int(views.list.size()), kAddPerPage);
-	const auto add = std::min(added + views.left, kAddPerPage);
+	const auto add = std::min(views.total, kAddPerPage);
 	const auto now = QDateTime::currentDateTime();
 	for (const auto &entry  : views.list) {
 		addMenuRow(entry, now);
@@ -393,23 +393,18 @@ void RecentViews::addMenuRowPlaceholder() {
 }
 
 void RecentViews::rebuildMenuTail() {
-	const auto offset = (_menuPlaceholderCount < _menuEntries.size())
-		? (end(_menuEntries) - _menuPlaceholderCount - 1)->peer->id
-		: PeerId();
-	const auto views = _controller->views(offset);
-	if (views.list.empty()) {
+	const auto elements = _menuEntries.size() - _menuPlaceholderCount;
+	const auto views = _controller->views(elements + kAddPerPage, false);
+	if (views.list.size() <= elements) {
 		return;
 	}
 	const auto now = QDateTime::currentDateTime();
 	const auto added = std::min(
 		_menuPlaceholderCount + kAddPerPage,
-		int(views.list.size()));
-	auto add = added;
-	for (const auto &entry : views.list) {
+		int(views.list.size() - elements));
+	for (auto i = elements, till = i + added; i != till; ++i) {
+		const auto &entry = views.list[i];
 		addMenuRow(entry, now);
-		if (!--add) {
-			break;
-		}
 	}
 	_menuEntriesCount = _menuEntriesCount.current() + added;
 }
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index c2e1a6481..a4f1092f9 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -386,6 +386,7 @@ updateStory#205a4133 user_id:long story:StoryItem = Update;
 updateReadStories#feb5345a user_id:long max_id:int = Update;
 updateStoryID#1bf335b9 id:int random_id:long = Update;
 updateStoriesStealthMode#2c084dc1 stealth_mode:StoriesStealthMode = Update;
+updateSentStoryReaction#e3a73d20 user_id:long story_id:int reaction:Reaction = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -1527,11 +1528,11 @@ messagePeerVoteMultiple#4628f6e6 peer:Peer options:Vector<bytes> date:int = Mess
 
 sponsoredWebPage#3db8ec63 flags:# url:string site_name:string photo:flags.0?Photo = SponsoredWebPage;
 
-storyViews#d36760cf flags:# views_count:int recent_viewers:flags.0?Vector<long> = StoryViews;
+storyViews#c64c0b97 flags:# views_count:int reactions_count:int recent_viewers:flags.0?Vector<long> = StoryViews;
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#ffadc913 flags:# close_friends:flags.8?true id:int date:int expire_date:int = StoryItem;
-storyItem#945953ba flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia media_areas:flags.14?Vector<MediaArea> privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews = StoryItem;
+storyItem#44c457ce flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true id:int date:int expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia media_areas:flags.14?Vector<MediaArea> privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews sent_reaction:flags.15?Reaction = StoryItem;
 
 userStories#8611a200 flags:# user_id:long max_read_id:flags.0?int stories:Vector<StoryItem> = UserStories;
 
@@ -1542,9 +1543,9 @@ stories.stories#4fe57df1 count:int stories:Vector<StoryItem> users:Vector<User>
 
 stories.userStories#37a6ff5f stories:UserStories users:Vector<User> = stories.UserStories;
 
-storyView#d0b0a7de flags:# blocked:flags.0?true blocked_my_stories_from:flags.1?true user_id:long date:int = StoryView;
+storyView#b0bdeac5 flags:# blocked:flags.0?true blocked_my_stories_from:flags.1?true user_id:long date:int reaction:flags.2?Reaction = StoryView;
 
-stories.storyViewsList#fb3f77ac count:int views:Vector<StoryView> users:Vector<User> = stories.StoryViewsList;
+stories.storyViewsList#46e9b9ec flags:# count:int reactions_count:int views:Vector<StoryView> users:Vector<User> next_offset:flags.0?string = stories.StoryViewsList;
 
 stories.storyViews#de9eed1d views:Vector<StoryViews> users:Vector<User> = stories.StoryViews;
 
@@ -2111,8 +2112,9 @@ stories.toggleAllStoriesHidden#7c2557c4 hidden:Bool = Bool;
 stories.getAllReadUserStories#729c562c = Updates;
 stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
 stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
-stories.getStoryViewsList#4b3b5e97 id:int offset_date:int offset_id:long limit:int = stories.StoryViewsList;
+stories.getStoryViewsList#f95f61a4 flags:# just_contacts:flags.0?true q:flags.1?string id:int offset:string limit:int = stories.StoryViewsList;
 stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
 stories.exportStoryLink#16e443ce user_id:InputUser id:int = ExportedStoryLink;
 stories.report#c95be06a user_id:InputUser id:Vector<int> reason:ReportReason message:string = Bool;
-stories.activateStealthMode#11d7ddae flags:# past:flags.0?true future:flags.1?true = Bool;
+stories.activateStealthMode#57bbd166 flags:# past:flags.0?true future:flags.1?true = Updates;
+stories.sendReaction#49aaa9b3 flags:# add_to_recent:flags.0?true user_id:InputUser story_id:int reaction:Reaction = Updates;

From 4e78c24abf572f6c143cb5184dedcabc994ba489 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 4 Aug 2023 17:30:49 +0200
Subject: [PATCH 587/676] Show reactions count below my stories.

---
 Telegram/SourceFiles/data/data_stories.cpp    |  1 +
 Telegram/SourceFiles/data/data_story.cpp      | 20 ++++++++++++++++---
 Telegram/SourceFiles/data/data_story.h        |  2 ++
 .../stories/media_stories_controller.cpp      |  9 ++++-----
 .../stories/media_stories_recent_views.cpp    | 20 ++++++++++++++-----
 .../stories/media_stories_recent_views.h      |  2 ++
 6 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 4107f7a79..586104855 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1263,6 +1263,7 @@ void Stories::loadViewsSlice(
 		const auto &data = result.data();
 		auto slice = StoryViews{
 			.nextOffset = data.vnext_offset().value_or_empty(),
+			.reactions = data.vreactions_count().v,
 			.total = data.vcount().v,
 		};
 		_owner->processUsers(data.vusers());
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 8f629bd34..30596269f 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -347,10 +347,16 @@ int Story::views() const {
 	return _views.total;
 }
 
+int Story::reactions() const {
+	return _views.reactions;
+}
+
 void Story::applyViewsSlice(
 		const QString &offset,
 		const StoryViews &slice) {
-	const auto changed = (_views.total != slice.total);
+	const auto changed = (_views.reactions != slice.reactions)
+		|| (_views.total != slice.total);
+	_views.reactions = slice.reactions;
 	_views.total = slice.total;
 	if (offset.isEmpty()) {
 		_views = slice;
@@ -362,6 +368,11 @@ void Story::applyViewsSlice(
 		_views.nextOffset = slice.nextOffset;
 		if (_views.nextOffset.isEmpty()) {
 			_views.total = int(_views.list.size());
+			_views.reactions = _views.total
+				- ranges::count(
+					_views.list,
+					Data::ReactionId(),
+					&StoryView::reaction);
 		}
 	}
 	const auto known = int(_views.list.size());
@@ -421,10 +432,12 @@ void Story::applyFields(
 			data.ventities().value_or_empty()),
 	};
 	auto views = _views.total;
+	auto reactions = _views.reactions;
 	auto viewers = std::vector<not_null<PeerData*>>();
 	if (!data.is_min()) {
 		if (const auto info = data.vviews()) {
 			views = info->data().vviews_count().v;
+			reactions = info->data().vreactions_count().v;
 			if (const auto list = info->data().vrecent_viewers()) {
 				viewers.reserve(list->v.size());
 				auto &owner = _peer->owner();
@@ -442,6 +455,7 @@ void Story::applyFields(
 	const auto mediaChanged = (_media != media);
 	const auto captionChanged = (_caption != caption);
 	const auto viewsChanged = (_views.total != views)
+		|| (_views.reactions != reactions)
 		|| (_recentViewers != viewers);
 
 	_privacyPublic = (privacy == StoryPrivacy::Public);
@@ -452,8 +466,8 @@ void Story::applyFields(
 	_edited = edited;
 	_pinned = pinned;
 	_noForwards = noForwards;
-	if (_views.total != views) {
-		_views = StoryViews{ .total = views };
+	if (_views.reactions != reactions || _views.total != views) {
+		_views = StoryViews{ .reactions = reactions, .total = views };
 	}
 	if (viewsChanged) {
 		_recentViewers = std::move(viewers);
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 21ab368b6..50d1dbff8 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -68,6 +68,7 @@ struct StoryView {
 struct StoryViews {
 	std::vector<StoryView> list;
 	QString nextOffset;
+	int reactions = 0;
 	int total = 0;
 };
 
@@ -125,6 +126,7 @@ public:
 		-> const std::vector<not_null<PeerData*>> &;
 	[[nodiscard]] const StoryViews &viewsList() const;
 	[[nodiscard]] int views() const;
+	[[nodiscard]] int reactions() const;
 	void applyViewsSlice(const QString &offset, const StoryViews &slice);
 
 	void applyChanges(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index bc2233f3d..67fde0447 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -880,6 +880,7 @@ void Controller::show(
 	});
 	_recentViews->show({
 		.list = story->recentViewers(),
+		.reactions = story->reactions(),
 		.total = story->views(),
 		.valid = user->isSelf(),
 	});
@@ -951,6 +952,7 @@ void Controller::subscribeToSession() {
 		} else {
 			_recentViews->show({
 				.list = update.story->recentViewers(),
+				.reactions = update.story->reactions(),
 				.total = update.story->views(),
 				.valid = update.story->peer()->isSelf(),
 			});
@@ -1439,12 +1441,9 @@ void Controller::refreshViewsFromData() {
 	const auto maybeStory = stories.lookup(_shown);
 	if (!maybeStory || !user->isSelf()) {
 		_viewsSlice = {};
-		return;
+	} else {
+		_viewsSlice = (*maybeStory)->viewsList();
 	}
-	const auto story = *maybeStory;
-	const auto &views = story->viewsList();
-	const auto total = story->views();
-	_viewsSlice = story->viewsList();
 }
 
 void Controller::unfocusReply() {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 5a5567466..6155b9f0f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -131,7 +131,9 @@ void RecentViews::show(RecentViewsData data) {
 	if (_data == data) {
 		return;
 	}
-	const auto totalChanged = _text.isEmpty() || (_data.total != data.total);
+	const auto countersChanged = _text.isEmpty()
+		|| (_data.total != data.total)
+		|| (_data.reactions != data.reactions);
 	const auto usersChanged = !_userpics || (_data.list != data.list);
 	_data = data;
 	if (!_data.valid) {
@@ -148,7 +150,7 @@ void RecentViews::show(RecentViewsData data) {
 	if (!_userpics) {
 		setupUserpics();
 	}
-	if (totalChanged) {
+	if (countersChanged) {
 		updateText();
 	}
 	if (usersChanged) {
@@ -253,9 +255,13 @@ void RecentViews::updatePartsGeometry() {
 }
 
 void RecentViews::updateText() {
-	_text.setText(st::defaultTextStyle, _data.total
-		? tr::lng_stories_views(tr::now, lt_count, _data.total)
-		: tr::lng_stories_no_views(tr::now));
+	const auto text = _data.total
+		? (tr::lng_stories_views(tr::now, lt_count, _data.total)
+			+ (_data.reactions
+				? (u" "_q + QChar(10084) + QString::number(_data.reactions))
+				: QString()))
+		: tr::lng_stories_no_views(tr::now);
+	_text.setText(st::defaultTextStyle, text);
 	updatePartsGeometry();
 }
 
@@ -340,6 +346,7 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 		return Ui::WhoReactedEntryData{
 			.text = peer->name(),
 			.date = date,
+			.customEntityData = Data::ReactionEntityData(entry.reaction),
 			.userpic = std::move(userpic),
 			.callback = [=] { show->show(PrepareShortInfoBox(peer)); },
 		};
@@ -349,12 +356,14 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 		auto data = prepare(i->view);
 		i->peer = peer;
 		i->date = date;
+		i->customEntityData = data.customEntityData;
 		i->callback = data.callback;
 		i->action->setData(std::move(data));
 	} else {
 		auto view = Ui::PeerUserpicView();
 		auto data = prepare(view);
 		auto callback = data.callback;
+		auto customEntityData = data.customEntityData;
 		auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
 			_menu->menu(),
 			nullptr,
@@ -366,6 +375,7 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 			.action = raw,
 			.peer = peer,
 			.date = date,
+			.customEntityData = std::move(customEntityData),
 			.callback = std::move(callback),
 			.view = std::move(view),
 		});
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
index 14bbdba68..294ea86f9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
@@ -32,6 +32,7 @@ class Controller;
 
 struct RecentViewsData {
 	std::vector<not_null<PeerData*>> list;
+	int reactions = 0;
 	int total = 0;
 	bool valid = false;
 
@@ -55,6 +56,7 @@ private:
 		not_null<Ui::WhoReactedEntryAction*> action;
 		PeerData *peer = nullptr;
 		QString date;
+		QString customEntityData;
 		Fn<void()> callback;
 		Ui::PeerUserpicView view;
 		InMemoryKey key;

From ebe2088561878a03ef9050366f531950a1528b69 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 4 Aug 2023 18:33:31 +0200
Subject: [PATCH 588/676] Parse story location marks.

---
 Telegram/SourceFiles/data/data_story.cpp | 60 +++++++++++++++++++++++-
 Telegram/SourceFiles/data/data_story.h   | 27 +++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 30596269f..719c8a13c 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -31,6 +31,44 @@ namespace {
 
 using UpdateFlag = StoryUpdate::Flag;
 
+[[nodiscard]] StoryArea ParseArea(const MTPMediaAreaCoordinates &area) {
+	const auto &data = area.data();
+	return {
+		.geometry = { data.vx().v, data.vy().v, data.vw().v, data.vh().v },
+		.rotation = data.vrotation().v,
+	};
+}
+
+[[nodiscard]] auto ParseLocation(const MTPMediaArea &area)
+-> std::optional<StoryLocation> {
+	auto result = std::optional<StoryLocation>();
+	area.match([&](const MTPDmediaAreaVenue &data) {
+		data.vgeo().match([&](const MTPDgeoPoint &geo) {
+			result.emplace(StoryLocation{
+				.area = ParseArea(data.vcoordinates()),
+				.point = Data::LocationPoint(geo),
+				.title = qs(data.vtitle()),
+				.address = qs(data.vaddress()),
+				.provider = qs(data.vprovider()),
+				.venueId = qs(data.vvenue_id()),
+				.venueType = qs(data.vvenue_type()),
+			});
+		}, [](const MTPDgeoPointEmpty &) {
+		});
+	}, [&](const MTPDmediaAreaGeoPoint &data) {
+		data.vgeo().match([&](const MTPDgeoPoint &geo) {
+			result.emplace(StoryLocation{
+				.area = ParseArea(data.vcoordinates()),
+				.point = Data::LocationPoint(geo),
+			});
+		}, [](const MTPDgeoPointEmpty &) {
+		});
+	}, [&](const MTPDinputMediaAreaVenue &data) {
+		LOG(("API Error: Unexpected inputMediaAreaVenue in API data."));
+	});
+	return result;
+}
+
 } // namespace
 
 class StoryPreload::LoadTask final : private Storage::DownloadMtprotoTask {
@@ -399,6 +437,10 @@ void Story::applyViewsSlice(
 	}
 }
 
+const std::vector<StoryLocation> &Story::locations() const {
+	return _locations;
+}
+
 void Story::applyChanges(
 		StoryMedia media,
 		const MTPDstoryItem &data,
@@ -449,6 +491,15 @@ void Story::applyFields(
 			}
 		}
 	}
+	auto locations = std::vector<StoryLocation>();
+	if (const auto areas = data.vmedia_areas()) {
+		locations.reserve(areas->v.size());
+		for (const auto &area : areas->v) {
+			if (const auto parsed = ParseLocation(area)) {
+				locations.push_back(*parsed);
+			}
+		}
+	}
 
 	const auto pinnedChanged = (_pinned != pinned);
 	const auto editedChanged = (_edited != edited);
@@ -457,6 +508,7 @@ void Story::applyFields(
 	const auto viewsChanged = (_views.total != views)
 		|| (_views.reactions != reactions)
 		|| (_recentViewers != viewers);
+	const auto locationsChanged = (_locations != locations);
 
 	_privacyPublic = (privacy == StoryPrivacy::Public);
 	_privacyCloseFriends = (privacy == StoryPrivacy::CloseFriends);
@@ -478,8 +530,14 @@ void Story::applyFields(
 	if (captionChanged) {
 		_caption = std::move(caption);
 	}
+	if (locationsChanged) {
+		_locations = std::move(locations);
+	}
 
-	const auto changed = (editedChanged || captionChanged || mediaChanged);
+	const auto changed = editedChanged
+		|| captionChanged
+		|| mediaChanged
+		|| locationsChanged;
 	if (!initial && (changed || viewsChanged)) {
 		_peer->session().changes().storyUpdated(this, UpdateFlag()
 			| (changed ? UpdateFlag::Edited : UpdateFlag())
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 50d1dbff8..d288ee293 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/weak_ptr.h"
+#include "data/data_location.h"
 #include "data/data_message_reaction_id.h"
 
 class Image;
@@ -72,6 +73,29 @@ struct StoryViews {
 	int total = 0;
 };
 
+struct StoryArea {
+	QRectF geometry;
+	float64 rotation = 0;
+
+	friend inline bool operator==(
+		const StoryArea &,
+		const StoryArea &) = default;
+};
+
+struct StoryLocation {
+	StoryArea area;
+	Data::LocationPoint point;
+	QString title;
+	QString address;
+	QString provider;
+	QString venueId;
+	QString venueType;
+
+	friend inline bool operator==(
+		const StoryLocation &,
+		const StoryLocation &) = default;
+};
+
 class Story final {
 public:
 	Story(
@@ -129,6 +153,8 @@ public:
 	[[nodiscard]] int reactions() const;
 	void applyViewsSlice(const QString &offset, const StoryViews &slice);
 
+	[[nodiscard]] const std::vector<StoryLocation> &locations() const;
+
 	void applyChanges(
 		StoryMedia media,
 		const MTPDstoryItem &data,
@@ -147,6 +173,7 @@ private:
 	StoryMedia _media;
 	TextWithEntities _caption;
 	std::vector<not_null<PeerData*>> _recentViewers;
+	std::vector<StoryLocation> _locations;
 	StoryViews _views;
 	const TimeId _date = 0;
 	const TimeId _expires = 0;

From 066dbfe8fc5e5e8ea89df9b029ce26ef1c4b15cd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Aug 2023 11:21:03 +0200
Subject: [PATCH 589/676] Handle clicks on location areas in stories.

---
 Telegram/SourceFiles/data/data_story.cpp      |  5 +-
 .../stories/media_stories_controller.cpp      | 68 ++++++++++++++++++-
 .../media/stories/media_stories_controller.h  | 10 +++
 .../media/stories/media_stories_view.cpp      |  4 ++
 .../media/stories/media_stories_view.h        |  1 +
 .../media/view/media_view_overlay_widget.cpp  |  3 +
 6 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 719c8a13c..3ac256ffa 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -33,8 +33,11 @@ using UpdateFlag = StoryUpdate::Flag;
 
 [[nodiscard]] StoryArea ParseArea(const MTPMediaAreaCoordinates &area) {
 	const auto &data = area.data();
+	const auto center = QPointF(data.vx().v, data.vy().v);
+	const auto size = QSizeF(data.vw().v, data.vh().v);
+	const auto corner = center - QPointF(size.width(), size.height()) / 2.;
 	return {
-		.geometry = { data.vx().v, data.vy().v, data.vw().v, data.vh().v },
+		.geometry = { corner / 100., size / 100. },
 		.rotation = data.vrotation().v,
 	};
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 67fde0447..bdff3f368 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -118,6 +118,19 @@ struct SameDayRange {
 	return { QString() + QChar(10084) };
 }
 
+[[nodiscard]] QPoint Rotated(QPoint point, QPoint origin, float64 angle) {
+	if (std::abs(angle) < 1.) {
+		return point;
+	}
+	const auto alpha = angle / 180. * M_PI;
+	const auto acos = cos(alpha);
+	const auto asin = sin(alpha);
+	point -= origin;
+	return origin + QPoint(
+		int(base::SafeRound(acos * point.x() - asin * point.y())),
+		int(base::SafeRound(asin * point.x() + acos * point.y())));
+}
+
 } // namespace
 
 class Controller::PhotoPlayback final {
@@ -531,11 +544,30 @@ void Controller::initLayout() {
 			.nameBoundingRect = nameBoundingRect(right, false),
 			.nameFontSize = nameFontSize,
 		};
-
+		if (!_locationAreas.empty()) {
+			rebuildLocationAreas(layout);
+		}
 		return layout;
 	});
 }
 
+void Controller::rebuildLocationAreas(const Layout &layout) const {
+	Expects(_locations.size() == _locationAreas.size());
+
+	const auto origin = layout.content.topLeft();
+	const auto scale = layout.content.size();
+	for (auto i = 0, count = int(_locations.size()); i != count; ++i) {
+		auto &area = _locationAreas[i];
+		const auto &general = _locations[i].area.geometry;
+		area.geometry = QRect(
+			int(base::SafeRound(general.x() * scale.width())),
+			int(base::SafeRound(general.y() * scale.height())),
+			int(base::SafeRound(general.width() * scale.width())),
+			int(base::SafeRound(general.height() * scale.height()))
+		).translated(origin);
+	}
+}
+
 Data::Story *Controller::story() const {
 	if (!_session) {
 		return nullptr;
@@ -918,6 +950,14 @@ bool Controller::changeShown(Data::Story *story) {
 			Data::Stories::Polling::Viewer);
 	}
 	_liked = false;
+	const auto &locations = story
+		? story->locations()
+		: std::vector<Data::StoryLocation>();
+	if (_locations != locations) {
+		_locations = locations;
+		_locationAreas.clear();
+	}
+
 	return true;
 }
 
@@ -1082,6 +1122,32 @@ void Controller::updatePlayback(const Player::TrackState &state) {
 	}
 }
 
+ClickHandlerPtr Controller::lookupLocationHandler(QPoint point) const {
+	const auto &layout = _layout.current();
+	if (_locations.empty() || !layout) {
+		return nullptr;
+	} else if (_locationAreas.empty()) {
+		_locationAreas = _locations | ranges::views::transform([](
+				const Data::StoryLocation &location) {
+			return LocationArea{
+				.rotation = location.area.rotation,
+				.handler = std::make_shared<LocationClickHandler>(
+					location.point),
+			};
+		}) | ranges::to_vector;
+		rebuildLocationAreas(*layout);
+	}
+
+	for (const auto &area : _locationAreas) {
+		const auto center = area.geometry.center();
+		const auto angle = -area.rotation;
+		if (area.geometry.contains(Rotated(point, center, angle))) {
+			return area.handler;
+		}
+	}
+	return nullptr;
+}
+
 void Controller::maybeMarkAsRead(const Player::TrackState &state) {
 	const auto length = state.length;
 	const auto position = Player::IsStoppedAtEnd(state.state)
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index f21b97d5b..b4a37cc57 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -135,6 +135,7 @@ public:
 	void ready();
 
 	void updateVideoPlayback(const Player::TrackState &state);
+	[[nodiscard]] ClickHandlerPtr lookupLocationHandler(QPoint point) const;
 
 	[[nodiscard]] bool subjumpAvailable(int delta) const;
 	[[nodiscard]] bool subjumpFor(int delta);
@@ -188,6 +189,11 @@ private:
 			return peerId != 0;
 		}
 	};
+	struct LocationArea {
+		QRect geometry;
+		float64 rotation = 0.;
+		ClickHandlerPtr handler;
+	};
 	class PhotoPlayback;
 	class Unsupported;
 
@@ -203,6 +209,7 @@ private:
 	void updateContentFaded();
 	void updatePlayingAllowed();
 	void setPlayingAllowed(bool allowed);
+	void rebuildLocationAreas(const Layout &layout) const;
 
 	void hideSiblings();
 	void showSiblings(not_null<Main::Session*> session);
@@ -275,6 +282,9 @@ private:
 	bool _started = false;
 	bool _viewed = false;
 
+	std::vector<Data::StoryLocation> _locations;
+	mutable std::vector<LocationArea> _locationAreas;
+
 	std::vector<CachedSource> _cachedSourcesList;
 	int _cachedSourceIndex = -1;
 	bool _showingUnreadSources = false;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index c3cdbd01b..1aa545726 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -59,6 +59,10 @@ void View::updatePlayback(const Player::TrackState &state) {
 	_controller->updateVideoPlayback(state);
 }
 
+ClickHandlerPtr View::lookupLocationHandler(QPoint point) const {
+	return _controller->lookupLocationHandler(point);
+}
+
 bool View::subjumpAvailable(int delta) const {
 	return _controller->subjumpAvailable(delta);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index b3dee4aa5..e70b0a6c9 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -73,6 +73,7 @@ public:
 	void showFullCaption();
 
 	void updatePlayback(const Player::TrackState &state);
+	[[nodiscard]] ClickHandlerPtr lookupLocationHandler(QPoint point) const;
 
 	[[nodiscard]] bool subjumpAvailable(int delta) const;
 	[[nodiscard]] bool subjumpFor(int delta) const;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 990936b29..01e6ba1fc 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -5666,6 +5666,9 @@ void OverlayWidget::updateOver(QPoint pos) {
 		const auto point = pos - QPoint(_groupThumbsLeft, _groupThumbsTop);
 		lnk = _groupThumbs->getState(point);
 		lnkhost = this;
+	} else if (_stories) {
+		lnk = _stories->lookupLocationHandler(pos);
+		lnkhost = this;
 	}
 
 

From 13f67d68c47cdeeffa39c3a2bbf5beac617a18e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Aug 2023 10:55:12 +0200
Subject: [PATCH 590/676] Implement custom reactions in stories.

---
 Telegram/SourceFiles/data/data_changes.h      |   3 +-
 .../data/data_message_reactions.cpp           |   2 +-
 Telegram/SourceFiles/data/data_stories.cpp    |  15 +
 Telegram/SourceFiles/data/data_stories.h      |   2 +
 Telegram/SourceFiles/data/data_story.cpp      |  23 +-
 Telegram/SourceFiles/data/data_story.h        |   4 +
 .../history_view_compose_controls.cpp         |  11 +-
 .../controls/history_view_compose_controls.h  |   3 +-
 .../history_view_reactions_selector.cpp       |   9 +-
 .../history_view_reactions_selector.h         |   1 +
 .../stories/media_stories_controller.cpp      | 114 +---
 .../media/stories/media_stories_controller.h  |  23 +-
 .../media/stories/media_stories_reactions.cpp | 512 ++++++++++++++++--
 .../media/stories/media_stories_reactions.h   |  95 +++-
 .../media/stories/media_stories_reply.cpp     |  18 +-
 .../media/stories/media_stories_reply.h       |   8 +-
 .../SourceFiles/media/view/media_view.style   |   3 +-
 .../ui/effects/emoji_fly_animation.cpp        |   8 +
 .../ui/effects/emoji_fly_animation.h          |   3 +
 .../ui/effects/reaction_fly_animation.cpp     |  64 ++-
 .../ui/effects/reaction_fly_animation.h       |  15 +
 21 files changed, 744 insertions(+), 192 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index d4fee22c8..304749900 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -226,8 +226,9 @@ struct StoryUpdate {
 		NewAdded    = (1U << 2),
 		ViewsAdded  = (1U << 3),
 		MarkRead    = (1U << 4),
+		Reaction    = (1U << 5),
 
-		LastUsedBit = (1U << 4),
+		LastUsedBit = (1U << 5),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index e4279cbb3..7aa820101 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -381,7 +381,7 @@ void Reactions::preloadImageFor(const ReactionId &id) {
 		loadImage(set, document, !i->centerIcon);
 	} else if (!_waitingForList) {
 		_waitingForList = true;
-		refreshRecent();
+		refreshDefault();
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 586104855..d795b41e3 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -870,6 +870,21 @@ void Stories::activateStealthMode(Fn<void()> done) {
 	}).send();
 }
 
+void Stories::sendReaction(FullStoryId id, Data::ReactionId reaction) {
+	if (const auto maybeStory = lookup(id)) {
+		const auto story = *maybeStory;
+		story->setReactionId(reaction);
+
+		const auto api = &session().api();
+		api->request(MTPstories_SendReaction(
+			MTP_flags(0),
+			story->peer()->asUser()->inputUser,
+			MTP_int(id.story),
+			ReactionToMTP(reaction)
+		)).send();
+	}
+}
+
 std::shared_ptr<HistoryItem> Stories::resolveItem(not_null<Story*> story) {
 	auto &items = _items[story->peer()->id];
 	auto i = items.find(story->id());
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index ae91d1ffc..8d8b23da4 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -240,6 +240,8 @@ public:
 	[[nodiscard]] rpl::producer<StealthMode> stealthModeValue() const;
 	void activateStealthMode(Fn<void()> done = nullptr);
 
+	void sendReaction(FullStoryId id, Data::ReactionId reaction);
+
 private:
 	struct Saved {
 		StoriesIds ids;
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 3ac256ffa..d5faa4350 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -376,6 +376,17 @@ const TextWithEntities &Story::caption() const {
 	return unsupported() ? empty : _caption;
 }
 
+Data::ReactionId Story::sentReactionId() const {
+	return _sentReactionId;
+}
+
+void Story::setReactionId(Data::ReactionId id) {
+	if (_sentReactionId != id) {
+		_sentReactionId = id;
+		session().changes().storyUpdated(this, UpdateFlag::Reaction);
+	}
+}
+
 const std::vector<not_null<PeerData*>> &Story::recentViewers() const {
 	return _recentViewers;
 }
@@ -458,6 +469,9 @@ void Story::applyFields(
 		bool initial) {
 	_lastUpdateTime = now;
 
+	const auto reaction = data.vsent_reaction()
+		? Data::ReactionFromMTP(*data.vsent_reaction())
+		: Data::ReactionId();
 	const auto pinned = data.is_pinned();
 	const auto edited = data.is_edited();
 	const auto privacy = data.is_public()
@@ -512,6 +526,7 @@ void Story::applyFields(
 		|| (_views.reactions != reactions)
 		|| (_recentViewers != viewers);
 	const auto locationsChanged = (_locations != locations);
+	const auto reactionChanged = (_sentReactionId != reaction);
 
 	_privacyPublic = (privacy == StoryPrivacy::Public);
 	_privacyCloseFriends = (privacy == StoryPrivacy::CloseFriends);
@@ -536,15 +551,19 @@ void Story::applyFields(
 	if (locationsChanged) {
 		_locations = std::move(locations);
 	}
+	if (reactionChanged) {
+		_sentReactionId = reaction;
+	}
 
 	const auto changed = editedChanged
 		|| captionChanged
 		|| mediaChanged
 		|| locationsChanged;
-	if (!initial && (changed || viewsChanged)) {
+	if (!initial && (changed || viewsChanged || reactionChanged)) {
 		_peer->session().changes().storyUpdated(this, UpdateFlag()
 			| (changed ? UpdateFlag::Edited : UpdateFlag())
-			| (viewsChanged ? UpdateFlag::ViewsAdded : UpdateFlag()));
+			| (viewsChanged ? UpdateFlag::ViewsAdded : UpdateFlag())
+			| (reactionChanged ? UpdateFlag::Reaction : UpdateFlag()));
 	}
 	if (!initial && (captionChanged || mediaChanged)) {
 		if (const auto item = _peer->owner().stories().lookupItem(this)) {
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index d288ee293..dcfe4495c 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -146,6 +146,9 @@ public:
 	void setCaption(TextWithEntities &&caption);
 	[[nodiscard]] const TextWithEntities &caption() const;
 
+	[[nodiscard]] Data::ReactionId sentReactionId() const;
+	void setReactionId(Data::ReactionId id);
+
 	[[nodiscard]] auto recentViewers() const
 		-> const std::vector<not_null<PeerData*>> &;
 	[[nodiscard]] const StoryViews &viewsList() const;
@@ -170,6 +173,7 @@ private:
 
 	const StoryId _id = 0;
 	const not_null<PeerData*> _peer;
+	Data::ReactionId _sentReactionId;
 	StoryMedia _media;
 	TextWithEntities _caption;
 	std::vector<not_null<PeerData*>> _recentViewers;
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 6990d5b22..7ad07e755 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1241,9 +1241,12 @@ bool ComposeControls::focus() {
 	return true;
 }
 
+bool ComposeControls::focused() const {
+	return Ui::InFocusChain(_wrap.get());
+}
+
 rpl::producer<bool> ComposeControls::focusedValue() const {
-	return rpl::single(Ui::InFocusChain(_wrap.get()))
-		| rpl::then(_focusChanges.events());
+	return rpl::single(focused()) | rpl::then(_focusChanges.events());
 }
 
 rpl::producer<bool> ComposeControls::tabbedPanelShownValue() const {
@@ -3022,7 +3025,7 @@ bool ComposeControls::handleCancelRequest() {
 }
 
 void ComposeControls::tryProcessKeyInput(not_null<QKeyEvent*> e) {
-	if (_field->isVisible()) {
+	if (_field->isVisible() && !e->text().isEmpty()) {
 		_field->setFocusFast();
 		QCoreApplication::sendEvent(_field->rawTextEdit(), e);
 	}
@@ -3158,7 +3161,7 @@ rpl::producer<bool> ComposeControls::fieldMenuShownValue() const {
 	return _field->menuShownValue();
 }
 
-not_null<QWidget*> ComposeControls::likeAnimationTarget() const {
+not_null<Ui::RpWidget*> ComposeControls::likeAnimationTarget() const {
 	Expects(_like != nullptr);
 
 	return _like;
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 80ad5e7b2..925555832 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -147,6 +147,7 @@ public:
 	[[nodiscard]] int heightCurrent() const;
 
 	bool focus();
+	[[nodiscard]] bool focused() const;
 	[[nodiscard]] rpl::producer<bool> focusedValue() const;
 	[[nodiscard]] rpl::producer<bool> tabbedPanelShownValue() const;
 	[[nodiscard]] rpl::producer<> cancelRequests() const;
@@ -222,7 +223,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> recordingActiveValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 	[[nodiscard]] rpl::producer<bool> fieldMenuShownValue() const;
-	[[nodiscard]] not_null<QWidget*> likeAnimationTarget() const;
+	[[nodiscard]] not_null<Ui::RpWidget*> likeAnimationTarget() const;
 
 	void applyCloudDraft();
 	void applyDraft(
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 4aa2370a8..0f2874c4e 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -328,6 +328,10 @@ void Selector::updateShowState(
 	update();
 }
 
+int Selector::countAppearedWidth(float64 progress) const {
+	return anim::interpolate(_skipx * 2 + _size, _inner.width(), progress);
+}
+
 void Selector::paintAppearing(QPainter &p) {
 	Expects(_strip != nullptr);
 
@@ -340,10 +344,7 @@ void Selector::paintAppearing(QPainter &p) {
 	_paintBuffer.fill(_st.bg->c);
 	auto q = QPainter(&_paintBuffer);
 	const auto extents = extentsForShadow();
-	const auto appearedWidth = anim::interpolate(
-		_skipx * 2 + _size,
-		_inner.width(),
-		_appearProgress);
+	const auto appearedWidth = countAppearedWidth(_appearProgress);
 	const auto fullWidth = _inner.x() + appearedWidth + extents.right();
 	const auto size = QSize(fullWidth, _outer.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 b47dfa2d8..270644bdc 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -63,6 +63,7 @@ public:
 	[[nodiscard]] QMargins extentsForShadow() const;
 	[[nodiscard]] int extendTopForCategories() const;
 	[[nodiscard]] int minimalHeight() const;
+	[[nodiscard]] int countAppearedWidth(float64 progress) const;
 	void setSpecialExpandTopSkip(int skip);
 	void initGeometry(int innerTop);
 	void beforeDestroy();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index bdff3f368..b12e56585 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -7,19 +7,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_controller.h"
 
-#include "base/timer.h"
 #include "base/power_save_blocker.h"
 #include "base/qt_signal_producer.h"
 #include "base/unixtime.h"
 #include "boxes/peers/prepare_short_info_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/application.h"
+#include "core/core_settings.h"
 #include "core/update_checker.h"
-#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
-#include "data/data_message_reactions.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
@@ -40,22 +38,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/report_box.h"
-#include "ui/effects/emoji_fly_animation.h"
-#include "ui/effects/message_sending_animation_common.h"
-#include "ui/effects/reaction_fly_animation.h"
-#include "ui/layers/box_content.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/round_rect.h"
-#include "ui/rp_widget.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
-#include "styles/style_chat.h"
-#include "styles/style_chat_helpers.h"
+#include "styles/style_chat_helpers.h" // defaultReportBox
 #include "styles/style_media_view.h"
-#include "styles/style_widgets.h"
 #include "styles/style_boxes.h" // UserpicButton
 
 #include <QtGui/QWindow>
@@ -114,10 +105,6 @@ struct SameDayRange {
 	return result;
 }
 
-[[nodiscard]] Data::ReactionId HeartReactionId() {
-	return { QString() + QChar(10084) };
-}
-
 [[nodiscard]] QPoint Rotated(QPoint point, QPoint origin, float64 angle) {
 	if (std::abs(angle) < 1.) {
 		return point;
@@ -294,7 +281,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 
 	rpl::combine(
 		_replyArea->activeValue(),
-		_reactions->expandedValue(),
+		_reactions->activeValue(),
 		_1 || _2
 	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool active) {
@@ -302,38 +289,16 @@ Controller::Controller(not_null<Delegate*> delegate)
 		updateContentFaded();
 	}, _lifetime);
 
-	_replyArea->focusedValue(
-	) | rpl::start_with_next([=](bool focused) {
-		_replyFocused = focused;
-		if (!_replyFocused) {
-			_reactions->hideIfCollapsed();
-		} else if (!_hasSendText) {
-			_reactions->show();
-		}
-	}, _lifetime);
-
-	_replyArea->hasSendTextValue(
-	) | rpl::start_with_next([=](bool has) {
-		_hasSendText = has;
-		if (_replyFocused) {
-			if (_hasSendText) {
-				_reactions->hide();
-			} else {
-				_reactions->show();
-			}
-		}
-	}, _lifetime);
+	_reactions->setReplyFieldState(
+		_replyArea->focusedValue(),
+		_replyArea->hasSendTextValue());
+	if (const auto like = _replyArea->likeAnimationTarget()) {
+		_reactions->attachToReactionButton(like);
+	}
 
 	_reactions->chosen(
-	) | rpl::start_with_next([=](HistoryView::Reactions::ChosenReaction id) {
-		startReactionAnimation({
-			.id = id.id,
-			.flyIcon = id.icon,
-			.flyFrom = _wrap->mapFromGlobal(id.globalGeometry),
-			.scaleOutDuration = st::fadeWrapDuration * 2,
-		}, _wrap.get());
-		_replyArea->sendReaction(id.id);
-		unfocusReply();
+	) | rpl::start_with_next([=](Reactions::Chosen chosen) {
+		reactionChosen(chosen.mode, chosen.reaction);
 	}, _lifetime);
 
 	_delegate->storiesLayerShown(
@@ -624,23 +589,17 @@ bool Controller::skipCaption() const {
 	return _captionFullView != nullptr;
 }
 
-bool Controller::liked() const {
-	return _liked.current();
+void Controller::toggleLiked() {
+	_reactions->toggleLiked();
 }
 
-rpl::producer<bool> Controller::likedValue() const {
-	return _liked.value();
-}
-
-void Controller::toggleLiked(bool liked) {
-	_liked = liked;
-	if (liked) {
-		startReactionAnimation({
-			.id = HeartReactionId(),
-			.scaleOutDuration = st::fadeWrapDuration * 2,
-			.effectOnly = true,
-		}, _replyArea->likeAnimationTarget());
+void Controller::reactionChosen(ReactionsMode mode, ChosenReaction chosen) {
+	if (mode == ReactionsMode::Message) {
+		_replyArea->sendReaction(chosen.id);
+	} else if (const auto user = shownUser()) {
+		user->owner().stories().sendReaction(_shown, chosen.id);
 	}
+	unfocusReply();
 }
 
 void Controller::showFullCaption() {
@@ -902,14 +861,15 @@ void Controller::show(
 	_viewed = false;
 	invalidate_weak_ptrs(&_viewsLoadGuard);
 	_reactions->hide();
-	if (_replyFocused) {
+	if (_replyArea->focused()) {
 		unfocusReply();
 	}
 
 	_replyArea->show({
 		.user = unsupported ? nullptr : user,
 		.id = story->id(),
-	});
+	}, _reactions->likedValue());
+
 	_recentViews->show({
 		.list = story->recentViewers(),
 		.reactions = story->reactions(),
@@ -949,7 +909,8 @@ bool Controller::changeShown(Data::Story *story) {
 			story,
 			Data::Stories::Polling::Viewer);
 	}
-	_liked = false;
+	_reactions->showLikeFrom(story);
+
 	const auto &locations = story
 		? story->locations()
 		: std::vector<Data::StoryLocation>();
@@ -1099,8 +1060,7 @@ void Controller::ready() {
 	}
 	_started = true;
 	updatePlayingAllowed();
-	uiShow()->session().data().reactions().preloadAnimationsFor(
-		HeartReactionId());
+	_reactions->ready();
 }
 
 void Controller::updateVideoPlayback(const Player::TrackState &state) {
@@ -1291,7 +1251,7 @@ void Controller::contentPressed(bool pressed) {
 		_captionFullView->close();
 	}
 	if (pressed) {
-		_reactions->collapse();
+		_reactions->outsidePressed();
 	}
 }
 
@@ -1607,28 +1567,6 @@ void Controller::updatePowerSaveBlocker(const Player::TrackState &state) {
 		[=] { return _wrap->window()->windowHandle(); });
 }
 
-void Controller::startReactionAnimation(
-		Ui::ReactionFlyAnimationArgs args,
-		not_null<QWidget*> target) {
-	Expects(shown());
-
-	_reactionAnimation = std::make_unique<Ui::EmojiFlyAnimation>(
-		_wrap,
-		&shownUser()->owner().reactions(),
-		std::move(args),
-		[=] { _reactionAnimation->repaint(); },
-		Data::CustomEmojiSizeTag::Isolated);
-	const auto layer = _reactionAnimation->layer();
-	_wrap->paintRequest() | rpl::start_with_next([=] {
-		if (!_reactionAnimation->paintBadgeFrame(target)) {
-			InvokeQueued(layer, [=] {
-				_reactionAnimation = nullptr;
-				_wrap->update();
-			});
-		}
-	}, layer->lifetime());
-}
-
 Ui::Toast::Config PrepareTogglePinnedToast(int count, bool pinned) {
 	return {
 		.text = (pinned
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index b4a37cc57..d7a9c37ff 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -26,17 +26,16 @@ struct FileChosen;
 
 namespace Data {
 struct FileOrigin;
-struct ReactionId;
+class DocumentMedia;
 } // namespace Data
 
 namespace HistoryView::Reactions {
 class CachedIconFactory;
+struct ChosenReaction;
 } // namespace HistoryView::Reactions
 
 namespace Ui {
 class RpWidget;
-struct ReactionFlyAnimationArgs;
-class EmojiFlyAnimation;
 class BoxContent;
 } // namespace Ui
 
@@ -66,6 +65,7 @@ struct SiblingView;
 enum class SiblingType;
 struct ContentLayout;
 class CaptionFullView;
+enum class ReactionsMode;
 
 enum class HeaderLayout {
 	Normal,
@@ -118,9 +118,7 @@ public:
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
 	[[nodiscard]] bool skipCaption() const;
-	[[nodiscard]] bool liked() const;
-	[[nodiscard]] rpl::producer<bool> likedValue() const;
-	void toggleLiked(bool liked);
+	void toggleLiked();
 	void showFullCaption();
 	void captionClosing();
 	void captionClosed();
@@ -172,6 +170,9 @@ public:
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
+	class PhotoPlayback;
+	class Unsupported;
+	using ChosenReaction = HistoryView::Reactions::ChosenReaction;
 	struct StoriesList {
 		not_null<UserData*> user;
 		Data::StoriesIds ids;
@@ -194,8 +195,6 @@ private:
 		float64 rotation = 0.;
 		ClickHandlerPtr handler;
 	};
-	class PhotoPlayback;
-	class Unsupported;
 
 	void initLayout();
 	bool changeShown(Data::Story *story);
@@ -238,9 +237,7 @@ private:
 		const std::vector<Data::StoriesSourceInfo> &lists,
 		int index);
 
-	void startReactionAnimation(
-		Ui::ReactionFlyAnimationArgs from,
-		not_null<QWidget*> target);
+	void reactionChosen(ReactionsMode mode, ChosenReaction chosen);
 
 	const not_null<Delegate*> _delegate;
 
@@ -260,9 +257,7 @@ private:
 	bool _contentFaded = false;
 
 	bool _windowActive = false;
-	bool _replyFocused = false;
 	bool _replyActive = false;
-	bool _hasSendText = false;
 	bool _layerShown = false;
 	bool _menuShown = false;
 	bool _tooltipShown = false;
@@ -273,7 +268,6 @@ private:
 	Data::StoriesContext _context;
 	std::optional<Data::StoriesSource> _source;
 	std::optional<StoriesList> _list;
-	rpl::variable<bool> _liked;
 	FullStoryId _waitingForId;
 	int _waitingForDelta = 0;
 	int _index = 0;
@@ -297,7 +291,6 @@ private:
 	std::unique_ptr<Sibling> _siblingRight;
 
 	std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
-	std::unique_ptr<Ui::EmojiFlyAnimation> _reactionAnimation;
 
 	Main::Session *_session = nullptr;
 	rpl::lifetime _sessionLifetime;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 9d4265758..01cdcebec 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -7,13 +7,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/stories/media_stories_reactions.h"
 
+#include "base/event_filter.h"
 #include "boxes/premium_preview_box.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "data/data_changes.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
 #include "data/data_message_reactions.h"
 #include "data/data_session.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
+#include "ui/effects/emoji_fly_animation.h"
+#include "ui/effects/reaction_fly_animation.h"
+#include "ui/animated_icon.h"
+#include "ui/painter.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_media_view.h"
 #include "styles/style_widgets.h"
@@ -21,6 +29,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media::Stories {
 namespace {
 
+constexpr auto kReactionScaleOutTarget = 0.7;
+constexpr auto kReactionScaleOutDuration = crl::time(1000);
+constexpr auto kMessageReactionScaleOutDuration = crl::time(400);
+
+[[nodiscard]] Data::ReactionId HeartReactionId() {
+	return { QString() + QChar(10084) };
+}
+
 [[nodiscard]] Data::PossibleItemReactionsRef LookupPossibleReactions(
 		not_null<Main::Session*> session) {
 	auto result = Data::PossibleItemReactionsRef();
@@ -51,7 +67,50 @@ namespace {
 
 } // namespace
 
-struct Reactions::Hiding {
+class Reactions::Panel final {
+public:
+	explicit Panel(not_null<Controller*> controller);
+	~Panel();
+
+	[[nodiscard]] rpl::producer<bool> expandedValue() const {
+		return _expanded.value();
+	}
+	[[nodiscard]] rpl::producer<bool> shownValue() const {
+		return _shown.value();
+	}
+
+	[[nodiscard]] rpl::producer<Chosen> chosen() const;
+
+	void show(Mode mode);
+	void hide(Mode mode);
+	void hideIfCollapsed(Mode mode);
+	void collapse(Mode mode);
+
+	void attachToReactionButton(not_null<Ui::RpWidget*> button);
+
+private:
+	struct Hiding;
+
+	void create();
+	void updateShowState();
+	void fadeOutSelector();
+	void startAnimation();
+
+	const not_null<Controller*> _controller;
+
+	std::unique_ptr<Ui::RpWidget> _parent;
+	std::unique_ptr<HistoryView::Reactions::Selector> _selector;
+	std::vector<std::unique_ptr<Hiding>> _hiding;
+	rpl::event_stream<Chosen> _chosen;
+	Ui::Animations::Simple _showing;
+	rpl::variable<float64> _shownValue;
+	rpl::variable<bool> _expanded;
+	rpl::variable<Mode> _mode;
+	rpl::variable<bool> _shown = false;
+
+};
+
+struct Reactions::Panel::Hiding {
 	explicit Hiding(not_null<QWidget*> parent) : widget(parent) {
 	}
 
@@ -60,16 +119,24 @@ struct Reactions::Hiding {
 	QImage frame;
 };
 
-Reactions::Reactions(not_null<Controller*> controller)
+Reactions::Panel::Panel(not_null<Controller*> controller)
 : _controller(controller) {
 }
 
-Reactions::~Reactions() = default;
+Reactions::Panel::~Panel() = default;
 
-void Reactions::show() {
-	if (_shown) {
+auto Reactions::Panel::chosen() const -> rpl::producer<Chosen> {
+	return _chosen.events();
+}
+
+void Reactions::Panel::show(Mode mode) {
+	const auto was = _mode.current();
+	if (_shown.current() && was == mode) {
 		return;
+	} else if (_shown.current()) {
+		hide(was);
 	}
+	_mode = mode;
 	create();
 	if (!_selector) {
 		return;
@@ -82,8 +149,8 @@ void Reactions::show() {
 	_parent->show();
 }
 
-void Reactions::hide() {
-	if (!_selector) {
+void Reactions::Panel::hide(Mode mode) {
+	if (!_selector || _mode.current() != mode) {
 		return;
 	}
 	_selector->beforeDestroy();
@@ -97,20 +164,32 @@ void Reactions::hide() {
 	_parent = nullptr;
 }
 
-void Reactions::hideIfCollapsed() {
-	if (!_expanded.current()) {
-		hide();
+void Reactions::Panel::hideIfCollapsed(Mode mode) {
+	if (!_expanded.current() && _mode.current() == mode) {
+		hide(mode);
 	}
 }
 
-void Reactions::collapse() {
-	if (_expanded.current()) {
-		hide();
-		show();
+void Reactions::Panel::collapse(Mode mode) {
+	if (_expanded.current() && _mode.current() == mode) {
+		hide(mode);
+		show(mode);
 	}
 }
 
-void Reactions::create() {
+void Reactions::Panel::attachToReactionButton(not_null<Ui::RpWidget*> button) {
+	base::install_event_filter(button, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::ContextMenu && !button->isHidden()) {
+			show(Reactions::Mode::Reaction);
+			return base::EventFilterResult::Cancel;
+		} else if (e->type() == QEvent::Hide) {
+			hide(Reactions::Mode::Reaction);
+		}
+		return base::EventFilterResult::Continue;
+	});
+}
+
+void Reactions::Panel::create() {
 	auto reactions = LookupPossibleReactions(
 		&_controller->uiShow()->session());
 	if (reactions.recent.empty() && !reactions.morePremiumAvailable) {
@@ -119,13 +198,19 @@ void Reactions::create() {
 	_parent = std::make_unique<Ui::RpWidget>(_controller->wrap().get());
 	_parent->show();
 
+	const auto mode = _mode.current();
+
 	_parent->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			const auto event = static_cast<QMouseEvent*>(e.get());
 			if (event->button() == Qt::LeftButton) {
 				if (!_selector
 					|| !_selector->geometry().contains(event->pos())) {
-					collapse();
+					if (mode == Mode::Message) {
+						collapse(mode);
+					} else {
+						hide(mode);
+					}
 				}
 			}
 		}
@@ -137,17 +222,17 @@ void Reactions::create() {
 		_controller->uiShow(),
 		std::move(reactions),
 		_controller->cachedReactionIconFactory().createMethod(),
-		[=](bool fast) { hide(); });
+		[=](bool fast) { hide(mode); });
 
 	_selector->chosen(
 	) | rpl::start_with_next([=](
 			HistoryView::Reactions::ChosenReaction reaction) {
-		_chosen.fire_copy(reaction);
-		hide();
+		_chosen.fire({ .reaction = reaction, .mode = mode });
+		hide(mode);
 	}, _selector->lifetime());
 
 	_selector->premiumPromoChosen() | rpl::start_with_next([=] {
-		hide();
+		hide(mode);
 		ShowPremiumPreviewBox(
 			_controller->uiShow(),
 			PremiumPreview::InfiniteReactions);
@@ -165,13 +250,23 @@ void Reactions::create() {
 		_controller->layoutValue(),
 		_shownValue.value()
 	) | rpl::start_with_next([=](const Layout &layout, float64 shown) {
-		const auto shift = int(base::SafeRound((full / 2.) * shown));
-		_parent->setGeometry(QRect(
-			layout.reactions.x() + layout.reactions.width() / 2 - shift,
-			layout.reactions.y(),
-			full,
-			layout.reactions.height()));
-		const auto innerTop = layout.reactions.height()
+		const auto width = extents.left()
+			+ _selector->countAppearedWidth(shown)
+			+ extents.right();
+		const auto height = layout.reactions.height();
+		const auto shift = (width / 2);
+		const auto right = (mode == Mode::Message)
+			? (layout.reactions.x() + layout.reactions.width() / 2 + shift)
+			: (layout.controlsBottomPosition.x()
+				+ layout.controlsWidth
+				- st::storiesLikeReactionsPosition.x());
+		const auto top = (mode == Mode::Message)
+			? layout.reactions.y()
+			: (layout.controlsBottomPosition.y()
+				- height
+				- st::storiesLikeReactionsPosition.y());
+		_parent->setGeometry(QRect((right - width), top, full, height));
+		const auto innerTop = height
 			- st::storiesReactionsBottomSkip
 			- st::reactStripHeight;
 		const auto maxAdded = innerTop - extents.top() - categoriesTop;
@@ -186,11 +281,15 @@ void Reactions::create() {
 	}, _selector->lifetime());
 
 	_selector->escapes() | rpl::start_with_next([=] {
-		collapse();
+		if (mode == Mode::Message) {
+			collapse(mode);
+		} else {
+			hide(mode);
+		}
 	}, _selector->lifetime());
 }
 
-void Reactions::fadeOutSelector() {
+void Reactions::Panel::fadeOutSelector() {
 	const auto wrap = _controller->wrap().get();
 	const auto geometry = Ui::MapFrom(
 		wrap,
@@ -226,8 +325,8 @@ void Reactions::fadeOutSelector() {
 	});
 }
 
-void Reactions::updateShowState() {
-	const auto progress = _showing.value(_shown ? 1. : 0.);
+void Reactions::Panel::updateShowState() {
+	const auto progress = _showing.value(_shown.current() ? 1. : 0.);
 	const auto opacity = 1.;
 	const auto appearing = _showing.animating();
 	const auto toggling = false;
@@ -235,4 +334,355 @@ void Reactions::updateShowState() {
 	_selector->updateShowState(progress, opacity, appearing, toggling);
 }
 
+Reactions::Reactions(not_null<Controller*> controller)
+: _controller(controller)
+, _panel(std::make_unique<Panel>(_controller)) {
+	_panel->chosen() | rpl::start_with_next([=](Chosen &&chosen) {
+		animateAndProcess(std::move(chosen));
+	}, _lifetime);
+}
+
+Reactions::~Reactions() = default;
+
+rpl::producer<bool> Reactions::activeValue() const {
+	using namespace rpl::mappers;
+	return rpl::combine(
+		_panel->expandedValue(),
+		_panel->shownValue(),
+		_1 || _2);
+}
+
+auto Reactions::chosen() const -> rpl::producer<Chosen> {
+	return _chosen.events();
+}
+
+void Reactions::setReplyFieldState(
+		rpl::producer<bool> focused,
+		rpl::producer<bool> hasSendText) {
+	std::move(
+		focused
+	) | rpl::start_with_next([=](bool focused) {
+		_replyFocused = focused;
+		if (!_replyFocused) {
+			_panel->hideIfCollapsed(Reactions::Mode::Message);
+		} else if (!_hasSendText) {
+			_panel->show(Reactions::Mode::Message);
+		}
+	}, _lifetime);
+
+	std::move(
+		hasSendText
+	) | rpl::start_with_next([=](bool has) {
+		_hasSendText = has;
+		if (_replyFocused) {
+			if (_hasSendText) {
+				_panel->hide(Reactions::Mode::Message);
+			} else {
+				_panel->show(Reactions::Mode::Message);
+			}
+		}
+	}, _lifetime);
+}
+
+void Reactions::attachToReactionButton(not_null<Ui::RpWidget*> button) {
+	_likeButton = button;
+	_panel->attachToReactionButton(button);
+}
+
+Data::ReactionId Reactions::liked() const {
+	return _liked.current();
+}
+
+rpl::producer<Data::ReactionId> Reactions::likedValue() const {
+	return _liked.value();
+}
+
+void Reactions::showLikeFrom(Data::Story *story) {
+	setLikedIdFrom(story);
+
+	if (!story) {
+		_likeFromLifetime.destroy();
+		return;
+	}
+	_likeFromLifetime = story->session().changes().storyUpdates(
+		story,
+		Data::StoryUpdate::Flag::Reaction
+	) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+		setLikedIdFrom(update.story);
+	});
+}
+
+void Reactions::hide() {
+	_panel->hide(Reactions::Mode::Message);
+	_panel->hide(Reactions::Mode::Reaction);
+}
+
+void Reactions::outsidePressed() {
+	_panel->hide(Reactions::Mode::Reaction);
+	_panel->collapse(Reactions::Mode::Message);
+}
+
+void Reactions::toggleLiked() {
+	const auto liked = !_liked.current().empty();
+	const auto now = liked ? Data::ReactionId() : HeartReactionId();
+	if (_liked.current() != now) {
+		animateAndProcess({ { .id = now }, ReactionsMode::Reaction });
+	}
+}
+
+void Reactions::ready() {
+	if (const auto story = _controller->story()) {
+		story->owner().reactions().preloadAnimationsFor(HeartReactionId());
+	}
+}
+
+void Reactions::animateAndProcess(Chosen &&chosen) {
+	const auto like = (chosen.mode == Mode::Reaction);
+	const auto wrap = _controller->wrap();
+	const auto target = like ? _likeButton : wrap.get();
+	const auto story = _controller->story();
+	if (!story || !target) {
+		return;
+	}
+
+	auto done = like
+		? setLikedIdIconInit(&story->owner(), chosen.reaction.id)
+		: Fn<void(Ui::ReactionFlyCenter)>();
+	const auto scaleOutDuration = like
+		? kReactionScaleOutDuration
+		: kMessageReactionScaleOutDuration;
+	const auto scaleOutTarget = like ? kReactionScaleOutTarget : 0.;
+
+	if (!chosen.reaction.id.empty()) {
+		startReactionAnimation({
+			.id = chosen.reaction.id,
+			.flyIcon = chosen.reaction.icon,
+			.flyFrom = (chosen.reaction.globalGeometry.isEmpty()
+				? QRect()
+				: wrap->mapFromGlobal(chosen.reaction.globalGeometry)),
+			.scaleOutDuration = scaleOutDuration,
+			.scaleOutTarget = scaleOutTarget,
+		}, target, std::move(done));
+	}
+
+	_chosen.fire(std::move(chosen));
+}
+
+void Reactions::assignLikedId(Data::ReactionId id) {
+	invalidate_weak_ptrs(&_likeIconGuard);
+	_likeIcon = nullptr;
+	_liked = id;
+}
+
+Fn<void(Ui::ReactionFlyCenter)> Reactions::setLikedIdIconInit(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id,
+		bool force) {
+	if (_liked.current() != id) {
+		_likeIconMedia = nullptr;
+	} else if (!force) {
+		return nullptr;
+	}
+	assignLikedId(id);
+	if (id.empty() || !_likeButton) {
+		return nullptr;
+	}
+	return crl::guard(&_likeIconGuard, [=](Ui::ReactionFlyCenter center) {
+		if (!id.custom() && !center.icon && !_likeIconMedia) {
+			waitForLikeIcon(owner, id);
+		} else {
+			initLikeIcon(owner, id, std::move(center));
+		}
+	});
+}
+
+void Reactions::initLikeIcon(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id,
+		Ui::ReactionFlyCenter center) {
+	Expects(_likeButton != nullptr);
+
+	_likeIcon = std::make_unique<Ui::RpWidget>(_likeButton);
+	const auto icon = _likeIcon.get();
+	icon->show();
+	_likeButton->sizeValue() | rpl::start_with_next([=](QSize size) {
+		icon->setGeometry(QRect(QPoint(), size));
+	}, icon->lifetime());
+
+	if (!id.custom() && !center.icon) {
+		return;
+	}
+
+	struct State {
+		Ui::ReactionFlyCenter center;
+		QImage cache;
+	};
+	const auto fly = icon->lifetime().make_state<State>(State{
+		.center = std::move(center),
+	});
+	if (const auto customId = id.custom()) {
+		auto withCorrectCallback = owner->customEmojiManager().create(
+			customId,
+			[=] { icon->update(); },
+			Data::CustomEmojiSizeTag::Isolated);
+		[[maybe_unused]] const auto load = withCorrectCallback->ready();
+		fly->center.custom = std::move(withCorrectCallback);
+		fly->center.icon = nullptr;
+	} else {
+		fly->center.icon->jumpToStart(nullptr);
+		fly->center.custom = nullptr;
+	}
+	const auto paintNonCached = [=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto size = fly->center.size;
+		const auto target = QRect(
+			(icon->width() - size) / 2,
+			(icon->height() - size) / 2,
+			size,
+			size);
+		const auto scale = fly->center.scale;
+		if (scale < 1.) {
+			const auto shift = QRectF(target).center();
+			p.translate(shift);
+			p.scale(scale, scale);
+			p.translate(-shift);
+		}
+		const auto multiplier = fly->center.centerSizeMultiplier;
+		const auto inner = int(base::SafeRound(size * multiplier));
+		if (const auto icon = fly->center.icon.get()) {
+			const auto rect = QRect(
+				target.x() + (target.width() - inner) / 2,
+				target.y() + (target.height() - inner) / 2,
+				inner,
+				inner);
+			p.drawImage(rect, icon->frame(st::windowFg->c));
+		} else {
+			const auto customSize = fly->center.customSize;
+			const auto scaled = (inner != customSize);
+			fly->center.custom->paint(p, {
+				.textColor = st::windowFg->c,
+				.size = { customSize, customSize },
+				.now = crl::now(),
+				.scale = (scaled ? (inner / float64(customSize)) : 1.),
+				.position = QPoint(
+					target.x() + (target.width() - customSize) / 2,
+					target.y() + (target.height() - customSize) / 2),
+				.scaled = scaled,
+			});
+		}
+	};
+	icon->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(icon);
+		if (!fly->cache.isNull()) {
+			p.drawImage(0, 0, fly->cache);
+		} else if (fly->center.icon
+			|| fly->center.custom->readyInDefaultState()) {
+			const auto ratio = style::DevicePixelRatio();
+			fly->cache = QImage(
+				icon->size() * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			fly->cache.setDevicePixelRatio(ratio);
+			fly->cache.fill(Qt::transparent);
+			auto q = QPainter(&fly->cache);
+			paintNonCached(q);
+			q.end();
+
+			fly->center.icon = nullptr;
+			fly->center.custom = nullptr;
+			p.drawImage(0, 0, fly->cache);
+		} else {
+			paintNonCached(p);
+		}
+	}, icon->lifetime());
+}
+
+void Reactions::waitForLikeIcon(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id) {
+	_likeIconWaitLifetime = rpl::single(
+		rpl::empty
+	) | rpl::then(
+		owner->reactions().defaultUpdates()
+	) | rpl::map([=]() -> rpl::producer<bool> {
+		const auto &list = owner->reactions().list(
+			Data::Reactions::Type::All);
+		const auto i = ranges::find(list, id, &Data::Reaction::id);
+		if (i == end(list)) {
+			return rpl::single(false);
+		}
+		const auto document = i->centerIcon
+			? not_null(i->centerIcon)
+			: i->selectAnimation;
+		_likeIconMedia = document->createMediaView();
+		_likeIconMedia->checkStickerLarge();
+		return rpl::single(
+			rpl::empty
+		) | rpl::then(
+			document->session().downloaderTaskFinished()
+		) | rpl::map([=] {
+			return _likeIconMedia->loaded();
+		});
+	}) | rpl::flatten_latest(
+	) | rpl::filter(
+		rpl::mappers::_1
+	) | rpl::take(1) | rpl::start_with_next([=] {
+		setLikedId(owner, id, true);
+
+		crl::on_main(&_likeIconGuard, [=] {
+			_likeIconMedia = nullptr;
+			_likeIconWaitLifetime.destroy();
+		});
+	});
+}
+
+void Reactions::setLikedIdFrom(Data::Story *story) {
+	if (!story) {
+		assignLikedId({});
+	} else {
+		setLikedId(&story->owner(), story->sentReactionId());
+	}
+}
+
+void Reactions::setLikedId(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id,
+		bool force) {
+	if (const auto done = setLikedIdIconInit(owner, id, force)) {
+		const auto reactions = &owner->reactions();
+		done(Ui::EmojiFlyAnimation(_controller->wrap(), reactions, {
+			.id = id,
+			.scaleOutDuration = kReactionScaleOutDuration,
+			.scaleOutTarget = kReactionScaleOutTarget,
+		}, [] {}, Data::CustomEmojiSizeTag::Isolated).grabBadgeCenter());
+	}
+}
+
+void Reactions::startReactionAnimation(
+		Ui::ReactionFlyAnimationArgs args,
+		not_null<QWidget*> target,
+		Fn<void(Ui::ReactionFlyCenter)> done) {
+	const auto wrap = _controller->wrap();
+	const auto story = _controller->story();
+	_reactionAnimation = std::make_unique<Ui::EmojiFlyAnimation>(
+		wrap,
+		&story->owner().reactions(),
+		std::move(args),
+		[=] { _reactionAnimation->repaint(); },
+		Data::CustomEmojiSizeTag::Isolated);
+	const auto layer = _reactionAnimation->layer();
+	wrap->paintRequest() | rpl::start_with_next([=] {
+		if (!_reactionAnimation->paintBadgeFrame(target)) {
+			InvokeQueued(layer, [=] {
+				_reactionAnimation = nullptr;
+				wrap->update();
+			});
+			if (done) {
+				done(_reactionAnimation->grabBadgeCenter());
+			}
+		}
+	}, layer->lifetime());
+	wrap->update();
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.h b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
index ca2200d7e..5a16943a7 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
@@ -7,10 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_message_reaction_id.h"
 #include "ui/effects/animations.h"
 
 namespace Data {
+class DocumentMedia;
 struct ReactionId;
+class Session;
+class Story;
 } // namespace Data
 
 namespace HistoryView::Reactions {
@@ -20,47 +24,96 @@ struct ChosenReaction;
 
 namespace Ui {
 class RpWidget;
+struct ReactionFlyAnimationArgs;
+struct ReactionFlyCenter;
+class EmojiFlyAnimation;
 } // namespace Ui
 
 namespace Media::Stories {
 
 class Controller;
 
+enum class ReactionsMode {
+	Message,
+	Reaction,
+};
+
 class Reactions final {
 public:
 	explicit Reactions(not_null<Controller*> controller);
 	~Reactions();
 
-	using Chosen = HistoryView::Reactions::ChosenReaction;
-	[[nodiscard]] rpl::producer<bool> expandedValue() const {
-		return _expanded.value();
-	}
-	[[nodiscard]] rpl::producer<Chosen> chosen() const {
-		return _chosen.events();
-	}
+	using Mode = ReactionsMode;
+
+	template <typename Reaction>
+	struct ChosenWrap {
+		Reaction reaction;
+		Mode mode;
+	};
+	using Chosen = ChosenWrap<HistoryView::Reactions::ChosenReaction>;
+
+	[[nodiscard]] rpl::producer<bool> activeValue() const;
+	[[nodiscard]] rpl::producer<Chosen> chosen() const;
+
+	[[nodiscard]] Data::ReactionId liked() const;
+	[[nodiscard]] rpl::producer<Data::ReactionId> likedValue() const;
+	void showLikeFrom(Data::Story *story);
 
-	void show();
 	void hide();
-	void hideIfCollapsed();
-	void collapse();
+	void outsidePressed();
+	void toggleLiked();
+	void ready();
+
+	void setReplyFieldState(
+		rpl::producer<bool> focused,
+		rpl::producer<bool> hasSendText);
+	void attachToReactionButton(not_null<Ui::RpWidget*> button);
 
 private:
-	struct Hiding;
+	class Panel;
 
-	void create();
-	void updateShowState();
-	void fadeOutSelector();
+	void animateAndProcess(Chosen &&chosen);
+
+	void assignLikedId(Data::ReactionId id);
+	[[nodiscard]] Fn<void(Ui::ReactionFlyCenter)> setLikedIdIconInit(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id,
+		bool force = false);
+	void setLikedIdFrom(Data::Story *story);
+	void setLikedId(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id,
+		bool force = false);
+	void startReactionAnimation(
+		Ui::ReactionFlyAnimationArgs from,
+		not_null<QWidget*> target,
+		Fn<void(Ui::ReactionFlyCenter)> done = nullptr);
+	void waitForLikeIcon(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id);
+	void initLikeIcon(
+		not_null<Data::Session*> owner,
+		Data::ReactionId id,
+		Ui::ReactionFlyCenter center);
 
 	const not_null<Controller*> _controller;
+	const std::unique_ptr<Panel> _panel;
 
-	std::unique_ptr<Ui::RpWidget> _parent;
-	std::unique_ptr<HistoryView::Reactions::Selector> _selector;
-	std::vector<std::unique_ptr<Hiding>> _hiding;
 	rpl::event_stream<Chosen> _chosen;
-	Ui::Animations::Simple _showing;
-	rpl::variable<float64> _shownValue;
-	rpl::variable<bool> _expanded;
-	bool _shown = false;
+	bool _replyFocused = false;
+	bool _hasSendText = false;
+
+	Ui::RpWidget *_likeButton = nullptr;
+	rpl::variable<Data::ReactionId> _liked;
+	base::has_weak_ptr _likeIconGuard;
+	std::unique_ptr<Ui::RpWidget> _likeIcon;
+	std::shared_ptr<Data::DocumentMedia> _likeIconMedia;
+
+	std::unique_ptr<Ui::EmojiFlyAnimation> _reactionAnimation;
+
+	rpl::lifetime _likeIconWaitLifetime;
+	rpl::lifetime _likeFromLifetime;
+	rpl::lifetime _lifetime;
 
 };
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 53a5c3435..48ee62d2e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -623,7 +623,7 @@ void ReplyArea::initActions() {
 
 	_controls->likeToggled(
 	) | rpl::start_with_next([=] {
-		_controller->toggleLiked(!_controller->liked());
+		_controller->toggleLiked();
 	}, _lifetime);
 
 	_controls->setMimeDataHook([=](
@@ -649,7 +649,9 @@ void ReplyArea::initActions() {
 	_controls->showFinished();
 }
 
-void ReplyArea::show(ReplyAreaData data) {
+void ReplyArea::show(
+		ReplyAreaData data,
+		rpl::producer<Data::ReactionId> likedValue) {
 	if (_data == data) {
 		return;
 	}
@@ -666,7 +668,11 @@ void ReplyArea::show(ReplyAreaData data) {
 	const auto history = user ? user->owner().history(user).get() : nullptr;
 	_controls->setHistory({
 		.history = history,
-		.liked = _controller->likedValue(),
+		.liked = std::move(
+			likedValue
+		) | rpl::map([](const Data::ReactionId &id) {
+			return !id.empty();
+		}),
 	});
 	_controls->clear();
 	const auto hidden = user && user->isSelf();
@@ -697,6 +703,10 @@ Main::Session &ReplyArea::session() const {
 	return _data.user->session();
 }
 
+bool ReplyArea::focused() const {
+	return _controls->focused();
+}
+
 rpl::producer<bool> ReplyArea::focusedValue() const {
 	return _controls->focusedValue();
 }
@@ -725,7 +735,7 @@ void ReplyArea::tryProcessKeyInput(not_null<QKeyEvent*> e) {
 	_controls->tryProcessKeyInput(e);
 }
 
-not_null<QWidget*> ReplyArea::likeAnimationTarget() const {
+not_null<Ui::RpWidget*> ReplyArea::likeAnimationTarget() const {
 	return _controls->likeAnimationTarget();
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index c3c13abdf..34f40b856 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -41,6 +41,7 @@ class Session;
 namespace Ui {
 struct PreparedList;
 class SendFilesWay;
+class RpWidget;
 } // namespace Ui
 
 namespace Media::Stories {
@@ -60,9 +61,12 @@ public:
 	explicit ReplyArea(not_null<Controller*> controller);
 	~ReplyArea();
 
-	void show(ReplyAreaData data);
+	void show(
+		ReplyAreaData data,
+		rpl::producer<Data::ReactionId> likedValue);
 	void sendReaction(const Data::ReactionId &id);
 
+	[[nodiscard]] bool focused() const;
 	[[nodiscard]] rpl::producer<bool> focusedValue() const;
 	[[nodiscard]] rpl::producer<bool> activeValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
@@ -70,7 +74,7 @@ public:
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
 	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
-	[[nodiscard]] not_null<QWidget*> likeAnimationTarget() const;
+	[[nodiscard]] not_null<Ui::RpWidget*> likeAnimationTarget() const;
 
 private:
 	class Cant;
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 5eb311f76..0d6f31042 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -682,7 +682,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 	attach: storiesAttach;
 	emoji: storiesAttachEmoji;
 	like: storiesLike;
-	liked: icon{{ "chat/input_liked", settingsIconBg1 }};
+	liked: icon{};
 	suggestions: EmojiSuggestions(defaultEmojiSuggestions) {
 		dropdown: InnerDropdown(emojiSuggestionsDropdown) {
 			animation: PanelAnimation(defaultPanelAnimation) {
@@ -807,6 +807,7 @@ storiesReactionsPan: EmojiPan(storiesEmojiPan) {
 storiesReactionsWidth: 210px;
 storiesReactionsBottomSkip: 29px;
 storiesReactionsAddedTop: 200px;
+storiesLikeReactionsPosition: point(85px, 30px);
 
 storiesUnsupportedLabel: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewControlFg;
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
index c655ab678..16269c3ac 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
@@ -8,6 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/emoji_fly_animation.h"
 
 #include "data/stickers/data_custom_emoji.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/animated_icon.h"
 #include "styles/style_info.h"
 #include "styles/style_chat.h"
 
@@ -100,4 +102,10 @@ bool EmojiFlyAnimation::paintBadgeFrame(not_null<QWidget*> widget) {
 	return !_fly.finished();
 }
 
+ReactionFlyCenter EmojiFlyAnimation::grabBadgeCenter() {
+	auto result = _fly.takeCenter();
+	result.size = _flySize;
+	return result;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
index f5dc8102b..f868c7267 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
@@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
+struct ReactionFlyCenter;
+
 class EmojiFlyAnimation {
 public:
 	EmojiFlyAnimation(
@@ -26,6 +28,7 @@ public:
 
 	void repaint();
 	bool paintBadgeFrame(not_null<QWidget*> widget);
+	[[nodiscard]] ReactionFlyCenter grabBadgeCenter();
 
 private:
 	const int _flySize = 0;
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
index e46820573..8bf354c17 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
@@ -68,7 +68,8 @@ ReactionFlyAnimation::ReactionFlyAnimation(
 : _owner(owner)
 , _repaint(std::move(repaint))
 , _flyFrom(args.flyFrom)
-, _scaleOutDuration(args.scaleOutDuration) {
+, _scaleOutDuration(args.scaleOutDuration)
+, _scaleOutTarget(args.scaleOutTarget) {
 	const auto &list = owner->list(::Data::Reactions::Type::All);
 	auto centerIcon = (DocumentData*)nullptr;
 	auto aroundAnimation = (DocumentData*)nullptr;
@@ -86,12 +87,14 @@ ReactionFlyAnimation::ReactionFlyAnimation(
 		aroundAnimation = owner->chooseGenericAnimation(document);
 	} else {
 		const auto i = ranges::find(list, args.id, &::Data::Reaction::id);
-		if (i == end(list) || !i->centerIcon) {
+		if (i == end(list)/* || !i->centerIcon*/) {
 			return;
 		}
-		centerIcon = i->centerIcon;
+		centerIcon = i->centerIcon
+			? not_null(i->centerIcon)
+			: i->selectAnimation;
 		aroundAnimation = i->aroundAnimation;
-		_centerSizeMultiplier = 1.;
+		_centerSizeMultiplier = i->centerIcon ? 1. : 0.5;
 	}
 	const auto resolve = [&](
 			std::unique_ptr<AnimatedIcon> &icon,
@@ -139,21 +142,31 @@ QRect ReactionFlyAnimation::paintGetArea(
 		QRect clip,
 		crl::time now) const {
 	const auto scale = [&] {
-		const auto rate = _effect ? _effect->frameRate() : 0.;
-		if (!_scaleOutDuration || !rate) {
+		if (!_scaleOutDuration
+			|| (!_effect && !_noEffectScaleStarted)) {
 			return 1.;
 		}
-		const auto left = _effect->framesCount() - _effect->frameIndex();
-		const auto duration = left * 1000. / rate;
-		return (duration < _scaleOutDuration)
-			? (duration / double(_scaleOutDuration))
-			: 1.;
+		auto progress = _noEffectScaleAnimation.value(0.);
+		if (_effect) {
+			const auto rate = _effect->frameRate();
+			if (!rate) {
+				return 1.;
+			}
+			const auto left = _effect->framesCount() - _effect->frameIndex();
+			const auto duration = left * 1000. / rate;
+			progress = (duration < _scaleOutDuration)
+				? (duration / double(_scaleOutDuration))
+				: 1.;
+		}
+		return (1. * progress + _scaleOutTarget * (1. - progress));
 	}();
+	auto hq = std::optional<PainterHighQualityEnabler>();
 	if (scale < 1.) {
-		const auto delta = ((1. - scale) / 2.) * target.size();
-		target = QRect(
-			target.topLeft() + QPoint(delta.width(), delta.height()),
-			target.size() * scale);
+		hq.emplace(p);
+		const auto shift = QRectF(target).center();
+		p.translate(shift);
+		p.scale(scale, scale);
+		p.translate(-shift);
 	}
 	if (!_valid) {
 		return QRect();
@@ -169,8 +182,10 @@ QRect ReactionFlyAnimation::paintGetArea(
 		if (clip.isEmpty() || area.intersects(clip)) {
 			paintCenterFrame(p, target, colored, now);
 			if (const auto effect = _effect.get()) {
-				// Must not be colored to text.
-				p.drawImage(wide, effect->frame(QColor()));
+				if (effect->animating()) {
+					// Must not be colored to text.
+					p.drawImage(wide, effect->frame(QColor()));
+				}
 			}
 			paintMiniCopies(p, target.center(), colored, now);
 		}
@@ -359,6 +374,9 @@ void ReactionFlyAnimation::startAnimations() {
 	}
 	if (const auto effect = _effect.get()) {
 		_effect->animate(callback());
+	} else if (_scaleOutDuration > 0) {
+		_noEffectScaleStarted = true;
+		_noEffectScaleAnimation.start(callback(), 1, 0, _scaleOutDuration);
 	}
 	if (!_miniCopies.empty()) {
 		_minis.start(callback(), 0., 1., kMiniCopiesDurationMax);
@@ -382,7 +400,19 @@ bool ReactionFlyAnimation::finished() const {
 		|| (_flyIcon.isNull()
 			&& (!_center || !_center->animating())
 			&& (!_effect || !_effect->animating())
+			&& !_noEffectScaleAnimation.animating()
 			&& !_minis.animating());
 }
 
+ReactionFlyCenter ReactionFlyAnimation::takeCenter() {
+	_valid = false;
+	return {
+		.custom = std::move(_custom),
+		.icon = std::move(_center),
+		.scale = (_scaleOutDuration > 0) ? _scaleOutTarget : 1.,
+		.centerSizeMultiplier = _centerSizeMultiplier,
+		.customSize = _customSize,
+	};
+}
+
 } // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
index 00d9d2e8d..340deffa0 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.h
@@ -28,11 +28,21 @@ struct ReactionFlyAnimationArgs {
 	QImage flyIcon;
 	QRect flyFrom;
 	crl::time scaleOutDuration = 0;
+	float64 scaleOutTarget = 0.;
 	bool effectOnly = false;
 
 	[[nodiscard]] ReactionFlyAnimationArgs translated(QPoint point) const;
 };
 
+struct ReactionFlyCenter {
+	std::unique_ptr<Text::CustomEmoji> custom;
+	std::unique_ptr<AnimatedIcon> icon;
+	float64 scale = 0.;
+	float64 centerSizeMultiplier = 0.;
+	int customSize = 0;
+	int size = 0;
+};
+
 class ReactionFlyAnimation final {
 public:
 	ReactionFlyAnimation(
@@ -56,6 +66,8 @@ public:
 	[[nodiscard]] float64 flyingProgress() const;
 	[[nodiscard]] bool finished() const;
 
+	[[nodiscard]] ReactionFlyCenter takeCenter();
+
 private:
 	struct Parabolic {
 		float64 a = 0.;
@@ -98,6 +110,7 @@ private:
 	std::unique_ptr<Text::CustomEmoji> _custom;
 	std::unique_ptr<AnimatedIcon> _center;
 	std::unique_ptr<AnimatedIcon> _effect;
+	Animations::Simple _noEffectScaleAnimation;
 	std::vector<MiniCopy> _miniCopies;
 	Animations::Simple _fly;
 	Animations::Simple _minis;
@@ -105,6 +118,8 @@ private:
 	float64 _centerSizeMultiplier = 0.;
 	int _customSize = 0;
 	crl::time _scaleOutDuration = 0;
+	float64 _scaleOutTarget = 0.;
+	bool _noEffectScaleStarted = false;
 	bool _valid = false;
 
 	mutable Parabolic _cached;

From e6ad367c550e4834d43cacf590cbceeb168caf18 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Aug 2023 13:02:02 +0200
Subject: [PATCH 591/676] Show reactions in story viewers list.

---
 .../media/stories/media_stories_recent_views.cpp     | 12 +++++++-----
 .../media/stories/media_stories_recent_views.h       |  2 +-
 Telegram/SourceFiles/media/view/media_view.style     |  3 ++-
 .../ui/controls/who_reacted_context_action.cpp       |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 6155b9f0f..4bfe93d64 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_who_reacted.h" // FormatReadDate.
 #include "chat_helpers/compose/compose_show.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_peer.h"
 #include "data/data_stories.h"
 #include "main/main_session.h"
@@ -258,7 +259,7 @@ void RecentViews::updateText() {
 	const auto text = _data.total
 		? (tr::lng_stories_views(tr::now, lt_count, _data.total)
 			+ (_data.reactions
-				? (u" "_q + QChar(10084) + QString::number(_data.reactions))
+				? (u"  "_q + QChar(10084) + QString::number(_data.reactions))
 				: QString()))
 		: tr::lng_stories_no_views(tr::now);
 	_text.setText(st::defaultTextStyle, text);
@@ -281,6 +282,7 @@ void RecentViews::showMenu() {
 		_widget.get(),
 		st::storiesViewsMenu);
 	auto count = 0;
+	const auto session = &_controller->story()->session();
 	const auto added = std::min(int(views.list.size()), kAddPerPage);
 	const auto add = std::min(views.total, kAddPerPage);
 	const auto now = QDateTime::currentDateTime();
@@ -291,7 +293,7 @@ void RecentViews::showMenu() {
 		}
 	}
 	while (count++ < add) {
-		addMenuRowPlaceholder();
+		addMenuRowPlaceholder(session);
 	}
 	rpl::merge(
 		_controller->moreViewsLoaded(),
@@ -366,7 +368,7 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 		auto customEntityData = data.customEntityData;
 		auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
 			_menu->menu(),
-			nullptr,
+			Data::ReactedMenuFactory(&entry.peer->session()),
 			_menu->menu()->st(),
 			prepare(view));
 		const auto raw = action.get();
@@ -390,10 +392,10 @@ void RecentViews::addMenuRow(Data::StoryView entry, const QDateTime &now) {
 	}
 }
 
-void RecentViews::addMenuRowPlaceholder() {
+void RecentViews::addMenuRowPlaceholder(not_null<Main::Session*> session) {
 	auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
 		_menu->menu(),
-		nullptr,
+		Data::ReactedMenuFactory(session),
 		_menu->menu()->st(),
 		Ui::WhoReactedEntryData{ .preloader = true });
 	const auto raw = action.get();
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
index 294ea86f9..d469cbb5e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
@@ -70,7 +70,7 @@ private:
 	void showMenu();
 
 	void addMenuRow(Data::StoryView entry, const QDateTime &now);
-	void addMenuRowPlaceholder();
+	void addMenuRowPlaceholder(not_null<Main::Session*> session);
 	void rebuildMenuTail();
 	void subscribeToMenuUserpicsLoading(not_null<Main::Session*> session);
 	void refreshClickHandler();
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index 0d6f31042..db01d30fa 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -778,8 +778,9 @@ storiesViewsMenu: PopupMenu(storiesPopupMenuWithIcons) {
 	scrollPadding: margins(0px, 6px, 0px, 4px);
 	maxHeight: 320px;
 	menu: Menu(storiesMenuWithIcons) {
+		itemPadding: margins(54px, 8px, 17px, 8px);
 		widthMin: 215px;
-		widthMax: 215px;
+		widthMax: 250px;
 	}
 	radius: 7px;
 }
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index 4a7dcb337..3be58146a 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -617,7 +617,7 @@ void WhoReactedEntryAction::paint(Painter &&p) {
 			.textColor = (selected ? _st.itemFgOver : _st.itemFg)->c,
 			.now = crl::now(),
 			.position = QPoint(
-				width() - _st.itemPadding.right() - (size / ratio) + skip,
+				width() - _st.itemPadding.right() - size + skip,
 				(height() - _customSize) / 2),
 		});
 	}

From 2dfaf27884cfdd3627f3285f3a9deefe2324daa6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Aug 2023 15:46:54 +0200
Subject: [PATCH 592/676] Fix colors for colorized stories reactions.

---
 .../SourceFiles/boxes/peers/edit_forum_topic_box.cpp     | 1 +
 .../info/profile/info_profile_emoji_status_panel.cpp     | 1 +
 .../media/stories/media_stories_reactions.cpp            | 9 ++++++---
 Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp  | 4 +++-
 Telegram/SourceFiles/ui/effects/emoji_fly_animation.h    | 2 ++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index 9727f6c61..d5dbc6789 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -354,6 +354,7 @@ struct IconSelector {
 				&owner->reactions(),
 				std::move(args),
 				[=] { state->animation->repaint(); },
+				[] { return st::windowFg->c; },
 				Data::CustomEmojiSizeTag::Large);
 		}
 		state->iconId = id;
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 352aa8b45..7a9e18b92 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
@@ -229,6 +229,7 @@ void EmojiStatusPanel::startAnimation(
 		&owner->reactions(),
 		std::move(args),
 		[=] { _animation->repaint(); },
+		[] { return st::profileVerifiedCheckBg->c; },
 		_animationSizeTag);
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 01cdcebec..e9162d891 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -556,12 +556,12 @@ void Reactions::initLikeIcon(
 				target.y() + (target.height() - inner) / 2,
 				inner,
 				inner);
-			p.drawImage(rect, icon->frame(st::windowFg->c));
+			p.drawImage(rect, icon->frame(st::storiesComposeWhiteText->c));
 		} else {
 			const auto customSize = fly->center.customSize;
 			const auto scaled = (inner != customSize);
 			fly->center.custom->paint(p, {
-				.textColor = st::windowFg->c,
+				.textColor = st::storiesComposeWhiteText->c,
 				.size = { customSize, customSize },
 				.now = crl::now(),
 				.scale = (scaled ? (inner / float64(customSize)) : 1.),
@@ -650,11 +650,13 @@ void Reactions::setLikedId(
 		bool force) {
 	if (const auto done = setLikedIdIconInit(owner, id, force)) {
 		const auto reactions = &owner->reactions();
+		const auto colored = [] { return st::storiesComposeWhiteText->c; };
+		const auto sizeTag = Data::CustomEmojiSizeTag::Isolated;
 		done(Ui::EmojiFlyAnimation(_controller->wrap(), reactions, {
 			.id = id,
 			.scaleOutDuration = kReactionScaleOutDuration,
 			.scaleOutTarget = kReactionScaleOutTarget,
-		}, [] {}, Data::CustomEmojiSizeTag::Isolated).grabBadgeCenter());
+		}, [] {}, colored, sizeTag).grabBadgeCenter());
 	}
 }
 
@@ -669,6 +671,7 @@ void Reactions::startReactionAnimation(
 		&story->owner().reactions(),
 		std::move(args),
 		[=] { _reactionAnimation->repaint(); },
+		[] { return st::storiesComposeWhiteText->c; },
 		Data::CustomEmojiSizeTag::Isolated);
 	const auto layer = _reactionAnimation->layer();
 	wrap->paintRequest() | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
index 16269c3ac..559e4ed35 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
@@ -33,8 +33,10 @@ EmojiFlyAnimation::EmojiFlyAnimation(
 	not_null<Data::Reactions*> owner,
 	ReactionFlyAnimationArgs &&args,
 	Fn<void()> repaint,
+	Fn<QColor()> textColor,
 	Data::CustomEmojiSizeTag tag)
 : _flySize(ComputeFlySize(tag))
+, _textColor(std::move(textColor))
 , _fly(
 	owner,
 	std::move(args),
@@ -63,7 +65,7 @@ EmojiFlyAnimation::EmojiFlyAnimation(
 			QRect(
 				rect.topLeft() + QPoint(skipx, skipy),
 				QSize(_flySize, _flySize)),
-			st::infoPeerBadge.premiumFg->c,
+			_textColor(),
 			clip,
 			crl::now());
 		if (_areaUpdated || _area.isEmpty()) {
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
index f868c7267..cf0e60099 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.h
@@ -21,6 +21,7 @@ public:
 		not_null<Data::Reactions*> owner,
 		Ui::ReactionFlyAnimationArgs &&args,
 		Fn<void()> repaint,
+		Fn<QColor()> textColor,
 		Data::CustomEmojiSizeTag tag);
 
 	[[nodiscard]] not_null<Ui::RpWidget*> layer();
@@ -32,6 +33,7 @@ public:
 
 private:
 	const int _flySize = 0;
+	Fn<QColor()> _textColor;
 	Ui::ReactionFlyAnimation _fly;
 	Ui::RpWidget _layer;
 	QRect _area;

From 1207e84dcb4fdccb836c93f22ef85e031cea98a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Aug 2023 17:59:13 +0200
Subject: [PATCH 593/676] Add reaction menu to story context menu.

---
 .../history_view_reactions_selector.cpp       | 79 ++++++++++++-------
 .../history_view_reactions_selector.h         | 14 +++-
 .../stories/media_stories_controller.cpp      |  7 ++
 .../media/stories/media_stories_controller.h  |  7 ++
 .../media/stories/media_stories_reactions.cpp | 34 ++++++++
 .../media/stories/media_stories_reactions.h   |  7 ++
 .../media/stories/media_stories_view.cpp      |  7 ++
 .../media/stories/media_stories_view.h        | 13 +++
 .../SourceFiles/media/view/media_view.style   | 51 +++++-------
 .../media/view/media_view_overlay_widget.cpp  | 34 +++++---
 10 files changed, 182 insertions(+), 71 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 0f2874c4e..e24577962 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -1036,21 +1036,65 @@ AttachSelectorResult AttachSelectorToMenu(
 		Fn<void(ChosenReaction)> chosen,
 		Fn<void(FullMsgId)> showPremiumPromo,
 		IconFactory iconFactory) {
-	auto reactions = Data::LookupPossibleReactions(item);
+	const auto result = AttachSelectorToMenu(
+		menu,
+		desiredPosition,
+		st::reactPanelEmojiPan,
+		controller->uiShow(),
+		Data::LookupPossibleReactions(item),
+		std::move(iconFactory));
+	if (!result) {
+		return result.error();
+	}
+	const auto selector = *result;
+	const auto itemId = item->fullId();
+
+	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+		menu->hideMenu();
+		reaction.context = itemId;
+		chosen(std::move(reaction));
+	}, selector->lifetime());
+
+	selector->premiumPromoChosen() | rpl::start_with_next([=] {
+		menu->hideMenu();
+		showPremiumPromo(itemId);
+	}, selector->lifetime());
+
+	const auto weak = base::make_weak(controller);
+	controller->enableGifPauseReason(
+		Window::GifPauseReason::MediaPreview);
+	QObject::connect(menu.get(), &QObject::destroyed, [weak] {
+		if (const auto strong = weak.get()) {
+			strong->disableGifPauseReason(
+				Window::GifPauseReason::MediaPreview);
+		}
+	});
+
+	return AttachSelectorResult::Attached;
+}
+
+auto AttachSelectorToMenu(
+	not_null<Ui::PopupMenu*> menu,
+	QPoint desiredPosition,
+	const style::EmojiPan &st,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::PossibleItemReactionsRef &reactions,
+	IconFactory iconFactory)
+-> base::expected<not_null<Selector*>, AttachSelectorResult> {
 	if (reactions.recent.empty() && !reactions.morePremiumAvailable) {
-		return AttachSelectorResult::Skipped;
+		return base::make_unexpected(AttachSelectorResult::Skipped);
 	}
 	const auto withSearch = reactions.customAllowed;
 	const auto selector = Ui::CreateChild<Selector>(
 		menu.get(),
-		st::reactPanelEmojiPan,
-		controller->uiShow(),
+		st,
+		std::move(show),
 		std::move(reactions),
 		std::move(iconFactory),
 		[=](bool fast) { menu->hideMenu(fast); },
 		false); // child
 	if (!AdjustMenuGeometryForSelector(menu, desiredPosition, selector)) {
-		return AttachSelectorResult::Failed;
+		return base::make_unexpected(AttachSelectorResult::Failed);
 	}
 	if (withSearch) {
 		Ui::Platform::FixPopupMenuNativeEmojiPopup(menu);
@@ -1067,19 +1111,6 @@ AttachSelectorResult AttachSelectorToMenu(
 	selector->initGeometry(selectorInnerTop);
 	selector->show();
 
-	const auto itemId = item->fullId();
-
-	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
-		menu->hideMenu();
-		reaction.context = itemId;
-		chosen(std::move(reaction));
-	}, selector->lifetime());
-
-	selector->premiumPromoChosen() | rpl::start_with_next([=] {
-		menu->hideMenu();
-		showPremiumPromo(itemId);
-	}, selector->lifetime());
-
 	const auto correctTop = selector->y();
 	menu->showStateValue(
 	) | rpl::start_with_next([=](Ui::PopupMenu::ShowState state) {
@@ -1100,17 +1131,7 @@ AttachSelectorResult AttachSelectorToMenu(
 			state.toggling);
 	}, selector->lifetime());
 
-	const auto weak = base::make_weak(controller);
-	controller->enableGifPauseReason(
-		Window::GifPauseReason::MediaPreview);
-	QObject::connect(menu.get(), &QObject::destroyed, [weak] {
-		if (const auto strong = weak.get()) {
-			strong->disableGifPauseReason(
-				Window::GifPauseReason::MediaPreview);
-		}
-	});
-
-	return AttachSelectorResult::Attached;
+	return selector;
 }
 
 } // namespace HistoryView::Reactions
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 270644bdc..8d3b34a03 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -7,9 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "history/view/reactions/history_view_reactions_strip.h"
-#include "data/data_message_reactions.h"
+#include "base/expected.h"
 #include "base/unique_qptr.h"
+#include "data/data_message_reactions.h"
+#include "history/view/reactions/history_view_reactions_strip.h"
 #include "ui/effects/animation_value.h"
 #include "ui/effects/round_area_with_shadow.h"
 #include "ui/rp_widget.h"
@@ -210,4 +211,13 @@ AttachSelectorResult AttachSelectorToMenu(
 	Fn<void(FullMsgId)> showPremiumPromo,
 	IconFactory iconFactory);
 
+[[nodiscard]] auto AttachSelectorToMenu(
+	not_null<Ui::PopupMenu*> menu,
+	QPoint desiredPosition,
+	const style::EmojiPan &st,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::PossibleItemReactionsRef &reactions,
+	IconFactory iconFactory
+) -> base::expected<not_null<Selector*>, AttachSelectorResult>;
+
 } // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index b12e56585..0e776caaa 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -1552,6 +1552,13 @@ void Controller::setupStealthMode() {
 	SetupStealthMode(uiShow());
 }
 
+auto Controller::attachReactionsToMenu(
+	not_null<Ui::PopupMenu*> menu,
+	QPoint desiredPosition)
+-> AttachStripResult {
+	return _reactions->attachToMenu(menu, desiredPosition);
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index d7a9c37ff..f932c40a6 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -32,11 +32,13 @@ class DocumentMedia;
 namespace HistoryView::Reactions {
 class CachedIconFactory;
 struct ChosenReaction;
+enum class AttachSelectorResult;
 } // namespace HistoryView::Reactions
 
 namespace Ui {
 class RpWidget;
 class BoxContent;
+class PopupMenu;
 } // namespace Ui
 
 namespace Ui::Toast {
@@ -167,6 +169,11 @@ public:
 	[[nodiscard]] bool allowStealthMode() const;
 	void setupStealthMode();
 
+	using AttachStripResult = HistoryView::Reactions::AttachSelectorResult;
+	[[nodiscard]] AttachStripResult attachReactionsToMenu(
+		not_null<Ui::PopupMenu*> menu,
+		QPoint desiredPosition);
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index e9162d891..02b42d593 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -14,12 +14,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_message_reactions.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
 #include "ui/effects/emoji_fly_animation.h"
 #include "ui/effects/reaction_fly_animation.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/animated_icon.h"
 #include "ui/painter.h"
 #include "styles/style_chat_helpers.h"
@@ -389,6 +391,38 @@ void Reactions::attachToReactionButton(not_null<Ui::RpWidget*> button) {
 	_panel->attachToReactionButton(button);
 }
 
+auto Reactions::attachToMenu(
+	not_null<Ui::PopupMenu*> menu,
+	QPoint desiredPosition)
+-> AttachStripResult {
+	using namespace HistoryView::Reactions;
+
+	const auto story = _controller->story();
+	if (!story || story->peer()->isSelf()) {
+		return AttachStripResult::Skipped;
+	}
+
+	const auto show = _controller->uiShow();
+	const auto result = AttachSelectorToMenu(
+		menu,
+		desiredPosition,
+		st::storiesReactionsPan,
+		show,
+		LookupPossibleReactions(&show->session()),
+		_controller->cachedReactionIconFactory().createMethod());
+	if (!result) {
+		return result.error();
+	}
+	const auto selector = *result;
+
+	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+		menu->hideMenu();
+		animateAndProcess({ reaction, ReactionsMode::Reaction });
+	}, selector->lifetime());
+
+	return AttachSelectorResult::Attached;
+}
+
 Data::ReactionId Reactions::liked() const {
 	return _liked.current();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.h b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
index 5a16943a7..fbcf34b3c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
@@ -20,6 +20,7 @@ class Story;
 namespace HistoryView::Reactions {
 class Selector;
 struct ChosenReaction;
+enum class AttachSelectorResult;
 } // namespace HistoryView::Reactions
 
 namespace Ui {
@@ -27,6 +28,7 @@ class RpWidget;
 struct ReactionFlyAnimationArgs;
 struct ReactionFlyCenter;
 class EmojiFlyAnimation;
+class PopupMenu;
 } // namespace Ui
 
 namespace Media::Stories {
@@ -69,6 +71,11 @@ public:
 		rpl::producer<bool> hasSendText);
 	void attachToReactionButton(not_null<Ui::RpWidget*> button);
 
+	using AttachStripResult = HistoryView::Reactions::AttachSelectorResult;
+	[[nodiscard]] AttachStripResult attachToMenu(
+		not_null<Ui::PopupMenu*> menu,
+		QPoint desiredPosition);
+
 private:
 	class Panel;
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 1aa545726..41390c3c4 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -123,6 +123,13 @@ void View::setupStealthMode() {
 	_controller->setupStealthMode();
 }
 
+auto View::attachReactionsToMenu(
+	not_null<Ui::PopupMenu*> menu,
+	QPoint desiredPosition)
+-> AttachStripResult {
+	return _controller->attachReactionsToMenu(menu, desiredPosition);
+}
+
 SiblingView View::sibling(SiblingType type) const {
 	return _controller->sibling(type);
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index e70b0a6c9..730488253 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -17,6 +17,14 @@ namespace Media::Player {
 struct TrackState;
 } // namespace Media::Player
 
+namespace HistoryView::Reactions {
+enum class AttachSelectorResult;
+} // namespace HistoryView::Reactions
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
 namespace Media::Stories {
 
 class Delegate;
@@ -95,6 +103,11 @@ public:
 	[[nodiscard]] bool allowStealthMode() const;
 	void setupStealthMode();
 
+	using AttachStripResult = HistoryView::Reactions::AttachSelectorResult;
+	[[nodiscard]] AttachStripResult attachReactionsToMenu(
+		not_null<Ui::PopupMenu*> menu,
+		QPoint desiredPosition);
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index db01d30fa..a2426a990 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -145,29 +145,30 @@ mediaviewFileIconSize: 80px;
 mediaviewFileLink: defaultLinkButton;
 
 mediaviewMenuSeparator: MenuSeparator(defaultMenuSeparator) {
-	fg: mediaviewMenuFg;
+	fg: groupCallMenuBgOver;
 }
 mediaviewMenu: Menu(menuWithIcons) {
-	itemBg: mediaviewMenuBg;
-	itemBgOver: mediaviewMenuBgOver;
-	itemFg: mediaviewMenuFg;
-	itemFgOver: mediaviewMenuFg;
-	itemFgDisabled: mediaviewMenuFg;
-	itemFgShortcut: mediaviewMenuFg;
-	itemFgShortcutOver: mediaviewMenuFg;
-	itemFgShortcutDisabled: mediaviewMenuFg;
+	itemBg: groupCallMenuBg;
+	itemBgOver: groupCallMenuBgOver;
+	itemFg: groupCallMembersFg;
+	itemFgOver: groupCallMembersFg;
+	itemFgDisabled: groupCallMemberNotJoinedStatus;
+	itemFgShortcut: groupCallMemberNotJoinedStatus;
+	itemFgShortcutOver: groupCallMemberNotJoinedStatus;
+	itemFgShortcutDisabled: groupCallMemberNotJoinedStatus;
 
 	separator: mediaviewMenuSeparator;
+	arrow: icon {{ "menu/submenu_arrow", groupCallMemberNotJoinedStatus }};
 
 	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: mediaviewMenuBgRipple;
+		color: groupCallMenuBgRipple;
 	}
 }
 mediaviewMenuShadow: Shadow(defaultEmptyShadow) {
-	fallback: mediaviewMenuBg;
+	fallback: groupCallMenuBg;
 }
 mediaviewPanelAnimation: PanelAnimation(defaultPanelAnimation) {
-	fadeBg: mediaviewMenuBg;
+	fadeBg: groupCallMenuBg;
 	shadow: mediaviewMenuShadow;
 }
 mediaviewPopupMenu: PopupMenu(defaultPopupMenu) {
@@ -178,7 +179,7 @@ mediaviewPopupMenu: PopupMenu(defaultPopupMenu) {
 mediaviewDropdownMenu: DropdownMenu(defaultDropdownMenu) {
 	menu: mediaviewMenu;
 	wrap: InnerDropdown(defaultInnerDropdown) {
-		bg: mediaviewMenuBg;
+		bg: groupCallMenuBg;
 		animation: mediaviewPanelAnimation;
 		scrollPadding: margins(0px, 8px, 0px, 8px);
 		shadow: mediaviewMenuShadow;
@@ -312,7 +313,7 @@ mediaviewSpeedMenu: MediaSpeedMenu(mediaPlayerSpeedMenu) {
 	dropdown: DropdownMenu(mediaviewDropdownMenu) {
 		menu: Menu(mediaviewMenu) {
 			separator: MenuSeparator(mediaviewMenuSeparator) {
-				fg: mediaviewMenuBgOver;
+				fg: groupCallMenuBgOver;
 				padding: margins(0px, 4px, 0px, 4px);
 				width: 6px;
 			}
@@ -478,9 +479,7 @@ storiesRemoveSet: IconButton(stickerPanRemoveSet) {
 	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};
 	ripple: storiesComposeRippleLight;
 }
-storiesMenuSeparator: MenuSeparator(defaultMenuSeparator) {
-	fg: groupCallMenuBgOver;
-}
+storiesMenuSeparator: mediaviewMenuSeparator;
 storiesMenu: Menu(defaultMenu) {
 	itemBg: groupCallMenuBg;
 	itemBgOver: groupCallMenuBgOver;
@@ -498,22 +497,14 @@ storiesMenu: Menu(defaultMenu) {
 		color: groupCallMenuBgRipple;
 	}
 }
-storiesMenuShadow: Shadow(defaultEmptyShadow) {
-	fallback: groupCallMenuBg;
-}
-storiesMenuAnimation: PanelAnimation(defaultPanelAnimation) {
-	fadeBg: groupCallMenuBg;
-	shadow: storiesMenuShadow;
-}
+storiesMenuShadow: mediaviewMenuShadow;
+storiesMenuAnimation: mediaviewPanelAnimation;
 storiesPopupMenu: PopupMenu(defaultPopupMenu) {
 	shadow: storiesMenuShadow;
 	menu: storiesMenu;
 	animation: storiesMenuAnimation;
 }
-storiesMenuWithIcons: Menu(storiesMenu) {
-	itemIconPosition: point(15px, 5px);
-	itemPadding: margins(54px, 8px, 17px, 8px);
-}
+storiesMenuWithIcons: mediaviewMenu;
 storiesPopupMenuWithIcons: PopupMenu(storiesPopupMenu) {
 	scrollPadding: margins(0px, 5px, 0px, 5px);
 	menu: storiesMenuWithIcons;
@@ -779,8 +770,8 @@ storiesViewsMenu: PopupMenu(storiesPopupMenuWithIcons) {
 	maxHeight: 320px;
 	menu: Menu(storiesMenuWithIcons) {
 		itemPadding: margins(54px, 8px, 17px, 8px);
-		widthMin: 215px;
-		widthMax: 250px;
+		widthMin: 240px;
+		widthMax: 240px;
 	}
 	radius: 7px;
 }
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 01e6ba1fc..277538cad 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -56,6 +56,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_helpers.h"
 #include "history/view/media/history_view_media.h"
 #include "history/view/reactions/history_view_reactions_strip.h"
+#include "history/view/reactions/history_view_reactions_selector.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -5849,20 +5850,33 @@ bool OverlayWidget::handleContextMenu(std::optional<QPoint> position) {
 			const style::icon *icon) {
 		_menu->addAction(text, std::move(handler), icon);
 	});
+
 	if (_menu->empty()) {
 		_menu = nullptr;
-	} else {
+		return true;
+	}
+	if (_stories) {
+		_stories->menuShown(true);
+	}
+	_menu->setDestroyedCallback(crl::guard(_widget, [=] {
 		if (_stories) {
-			_stories->menuShown(true);
+			_stories->menuShown(false);
 		}
-		_menu->setDestroyedCallback(crl::guard(_widget, [=] {
-			if (_stories) {
-				_stories->menuShown(false);
-			}
-			activateControls();
-			_receiveMouse = false;
-			InvokeQueued(_widget, [=] { receiveMouse(); });
-		}));
+		activateControls();
+		_receiveMouse = false;
+		InvokeQueued(_widget, [=] { receiveMouse(); });
+	}));
+
+	using HistoryView::Reactions::AttachSelectorResult;
+	const auto attached = _stories
+		? _stories->attachReactionsToMenu(_menu.get(), QCursor::pos())
+		: AttachSelectorResult::Skipped;
+	if (attached == AttachSelectorResult::Failed) {
+		_menu = nullptr;
+		return true;
+	} else if (attached == AttachSelectorResult::Attached) {
+		_menu->popupPrepared();
+	} else {
 		_menu->popup(QCursor::pos());
 	}
 	activateControls();

From dbe7f4288135eeb384024277503a7e0a7fd5413a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Aug 2023 10:35:11 +0200
Subject: [PATCH 594/676] Update API scheme on layer 161.

---
 Telegram/SourceFiles/data/data_stories.cpp | 3 ++-
 Telegram/SourceFiles/mtproto/scheme/api.tl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index d795b41e3..420177a1e 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1266,8 +1266,9 @@ void Stories::loadViewsSlice(
 	const auto api = &_owner->session().api();
 	const auto perPage = _viewsDone ? kViewsPerPage : kPollingViewsPerPage;
 	api->request(_viewsRequestId).cancel();
+	using Flag = MTPstories_GetStoryViewsList::Flag;
 	_viewsRequestId = api->request(MTPstories_GetStoryViewsList(
-		MTP_flags(0),
+		MTP_flags(Flag::f_reactions_first),
 		MTPstring(), // q
 		MTP_int(id),
 		MTP_string(offset),
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a4f1092f9..bced7ee92 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -2112,7 +2112,7 @@ stories.toggleAllStoriesHidden#7c2557c4 hidden:Bool = Bool;
 stories.getAllReadUserStories#729c562c = Updates;
 stories.readStories#edc5105b user_id:InputUser max_id:int = Vector<int>;
 stories.incrementStoryViews#22126127 user_id:InputUser id:Vector<int> = Bool;
-stories.getStoryViewsList#f95f61a4 flags:# just_contacts:flags.0?true q:flags.1?string id:int offset:string limit:int = stories.StoryViewsList;
+stories.getStoryViewsList#f95f61a4 flags:# just_contacts:flags.0?true reactions_first:flags.2?true q:flags.1?string id:int offset:string limit:int = stories.StoryViewsList;
 stories.getStoriesViews#9a75d6a6 id:Vector<int> = stories.StoryViews;
 stories.exportStoryLink#16e443ce user_id:InputUser id:int = ExportedStoryLink;
 stories.report#c95be06a user_id:InputUser id:Vector<int> reason:ReportReason message:string = Bool;

From 88c7b16b44b8131696b4d30906829387d031b847 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Aug 2023 10:35:37 +0200
Subject: [PATCH 595/676] Fix reaction emoji disappearing.

---
 .../SourceFiles/media/stories/media_stories_recent_views.cpp     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 4bfe93d64..565cf5995 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -455,6 +455,7 @@ void RecentViews::subscribeToMenuUserpicsLoading(
 				entry.action->setData({
 					.text = peer->name(),
 					.date = entry.date,
+					.customEntityData = entry.customEntityData,
 					.userpic = std::move(userpic),
 					.callback = entry.callback,
 				});

From ae26c781c11b8155cba8f3601668fc6fd3364dbe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 22:27:11 +0200
Subject: [PATCH 596/676] Fix build with Xcode.

---
 Telegram/SourceFiles/media/stories/media_stories_stealth.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index 04a78c7f2..404ff1aea 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -138,7 +138,7 @@ struct Feature {
 	return {
 		.icon = st::storiesStealthFeaturePastIcon,
 		.title = tr::lng_stealth_mode_past_title(tr::now),
-		.about = tr::lng_stealth_mode_past_about(tr::now),
+		.about = { tr::lng_stealth_mode_past_about(tr::now) },
 	};
 }
 
@@ -146,7 +146,7 @@ struct Feature {
 	return {
 		.icon = st::storiesStealthFeatureNextIcon,
 		.title = tr::lng_stealth_mode_next_title(tr::now),
-		.about = tr::lng_stealth_mode_next_about(tr::now),
+		.about = { tr::lng_stealth_mode_next_about(tr::now) },
 	};
 }
 

From de4152496f52690e83a4295d5fc1916ba69ecff8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 16:20:38 +0200
Subject: [PATCH 597/676] Add archive settings to context menu.

---
 Telegram/Resources/langs/lang.strings         |  7 ++
 .../SourceFiles/api/api_global_privacy.cpp    | 19 +++-
 Telegram/SourceFiles/api/api_global_privacy.h |  7 +-
 .../settings/settings_advanced.cpp            | 93 ++++++++++++++++++
 .../SourceFiles/settings/settings_advanced.h  | 11 +++
 .../settings/settings_privacy_security.cpp    | 94 +++++++++----------
 .../settings/settings_privacy_security.h      |  4 +
 .../SourceFiles/window/window_main_menu.cpp   | 10 +-
 .../SourceFiles/window/window_peer_menu.cpp   |  7 ++
 9 files changed, 199 insertions(+), 53 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3b86a7dda..18396ecb4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -615,9 +615,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_security" = "Security";
 "lng_settings_passcode_title" = "Local passcode";
 "lng_settings_sessions_title" = "Active sessions";
+"lng_settings_archive_title" = "Archive Settings";
 "lng_settings_new_unknown" = "New chats from unknown users";
 "lng_settings_auto_archive" = "Archive and Mute";
 "lng_settings_auto_archive_about" = "Automatically archive and mute new chats, groups and channels from non-contacts.";
+"lng_settings_unmuted_chats" = "Unmuted chats";
+"lng_settings_always_in_archive" = "Always keep archived";
+"lng_settings_unmuted_chats_about" = "Keep archived chats in the Archive even if they are unmuted and get a new message.";
+"lng_settings_chats_from_folders" = "Chats from folders";
+"lng_settings_chats_from_folders_about" = "Keep archived chats from folders in the Archive even if they are unmuted and get a new message.";
 "lng_settings_destroy_title" = "Delete my account";
 "lng_settings_version_info" = "Version and updates";
 "lng_settings_system_integration" = "System integration";
@@ -2278,6 +2284,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_archive_to_menu" = "Move to main menu";
 "lng_context_archive_to_list" = "Move to chats list";
 "lng_context_archive_to_menu_info" = "Archive moved to the main menu!\nYou can return it from the context menu of the archive button.";
+"lng_context_archive_settings" = "Archive settings";
 
 "lng_context_mute" = "Mute";
 "lng_context_unmute" = "Unmute";
diff --git a/Telegram/SourceFiles/api/api_global_privacy.cpp b/Telegram/SourceFiles/api/api_global_privacy.cpp
index 89e1d57da..43a60e9a3 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_global_privacy.cpp
@@ -84,19 +84,29 @@ void GlobalPrivacy::dismissArchiveAndMuteSuggestion() {
 		u"AUTOARCHIVE_POPULAR"_q);
 }
 
-void GlobalPrivacy::update(bool archiveAndMute) {
+void GlobalPrivacy::updateArchiveAndMute(bool value) {
+	update(value, unarchiveOnNewMessageCurrent());
+}
+
+void GlobalPrivacy::updateUnarchiveOnNewMessage(
+		UnarchiveOnNewMessage value) {
+	update(archiveAndMuteCurrent(), value);
+}
+
+void GlobalPrivacy::update(
+		bool archiveAndMute,
+		UnarchiveOnNewMessage unarchiveOnNewMessage) {
 	using Flag = MTPDglobalPrivacySettings::Flag;
 
-	const auto unarchive = unarchiveOnNewMessageCurrent();
 	_api.request(_requestId).cancel();
 	const auto flags = Flag()
 		| (archiveAndMute
 			? Flag::f_archive_and_mute_new_noncontact_peers
 			: Flag())
-		| (unarchive == UnarchiveOnNewMessage::AnyUnmuted
+		| (unarchiveOnNewMessage == UnarchiveOnNewMessage::AnyUnmuted
 			? Flag::f_keep_archived_unmuted
 			: Flag())
-		| (unarchive != UnarchiveOnNewMessage::None
+		| (unarchiveOnNewMessage != UnarchiveOnNewMessage::None
 			? Flag::f_keep_archived_folders
 			: Flag());
 	_requestId = _api.request(MTPaccount_SetGlobalPrivacySettings(
@@ -108,6 +118,7 @@ void GlobalPrivacy::update(bool archiveAndMute) {
 		_requestId = 0;
 	}).send();
 	_archiveAndMute = archiveAndMute;
+	_unarchiveOnNewMessage = unarchiveOnNewMessage;
 }
 
 void GlobalPrivacy::apply(const MTPGlobalPrivacySettings &data) {
diff --git a/Telegram/SourceFiles/api/api_global_privacy.h b/Telegram/SourceFiles/api/api_global_privacy.h
index f569951ca..9e4b8e121 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.h
+++ b/Telegram/SourceFiles/api/api_global_privacy.h
@@ -28,7 +28,8 @@ public:
 	explicit GlobalPrivacy(not_null<ApiWrap*> api);
 
 	void reload(Fn<void()> callback = nullptr);
-	void update(bool archiveAndMute);
+	void updateArchiveAndMute(bool value);
+	void updateUnarchiveOnNewMessage(UnarchiveOnNewMessage value);
 
 	[[nodiscard]] bool archiveAndMuteCurrent() const;
 	[[nodiscard]] rpl::producer<bool> archiveAndMute() const;
@@ -43,6 +44,10 @@ public:
 private:
 	void apply(const MTPGlobalPrivacySettings &data);
 
+	void update(
+		bool archiveAndMute,
+		UnarchiveOnNewMessage unarchiveOnNewMessage);
+
 	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
 	mtpRequestId _requestId = 0;
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 1829f92a2..096bcbbdd 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -7,16 +7,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "settings/settings_advanced.h"
 
+#include "api/api_global_privacy.h"
+#include "apiwrap.h"
 #include "settings/settings_common.h"
 #include "settings/settings_chat.h"
 #include "settings/settings_experimental.h"
 #include "settings/settings_power_saving.h"
+#include "settings/settings_privacy_security.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
 #include "ui/gl/gl_detection.h"
+#include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/format_values.h"
 #include "ui/boxes/single_choice_box.h"
@@ -43,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "mtproto/facade.h"
 #include "styles/style_settings.h"
+#include "styles/style_layers.h"
 
 #ifdef Q_OS_MAC
 #include "base/platform/mac/base_confirm_quit.h"
@@ -710,6 +715,94 @@ void SetupAnimations(
 	});
 }
 
+void ArchiveSettingsBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller) {
+	box->setTitle(tr::lng_settings_archive_title());
+	box->setWidth(st::boxWideWidth);
+
+	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
+
+	PreloadArchiveSettings(&controller->session());
+
+	struct State {
+		Ui::SlideWrap<Ui::VerticalLayout> *foldersWrap = nullptr;
+		Ui::SettingsButton *folders = nullptr;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	const auto privacy = &controller->session().api().globalPrivacy();
+
+	const auto container = box->verticalLayout();
+	AddSkip(container);
+	AddSubsectionTitle(container, tr::lng_settings_unmuted_chats());
+
+	using Unarchive = Api::UnarchiveOnNewMessage;
+	AddButton(
+		container,
+		tr::lng_settings_always_in_archive(),
+		st::settingsButtonNoIcon
+	)->toggleOn(privacy->unarchiveOnNewMessage(
+	) | rpl::map(
+		rpl::mappers::_1 == Unarchive::None
+	))->toggledChanges(
+	) | rpl::filter([=](bool toggled) {
+		const auto current = privacy->unarchiveOnNewMessageCurrent();
+		return toggled != (current == Unarchive::None);
+	}) | rpl::start_with_next([=](bool toggled) {
+		privacy->updateUnarchiveOnNewMessage(toggled
+			? Unarchive::None
+			: state->folders->toggled()
+			? Unarchive::NotInFoldersUnmuted
+			: Unarchive::AnyUnmuted);
+		state->foldersWrap->toggle(!toggled, anim::type::normal);
+	}, container->lifetime());
+
+	AddSkip(container);
+	AddDividerText(container, tr::lng_settings_unmuted_chats_about());
+
+	state->foldersWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = state->foldersWrap->entity();
+	AddSkip(inner);
+	AddSubsectionTitle(inner, tr::lng_settings_chats_from_folders());
+
+	state->folders = AddButton(
+		inner,
+		tr::lng_settings_always_in_archive(),
+		st::settingsButtonNoIcon
+	)->toggleOn(privacy->unarchiveOnNewMessage(
+	) | rpl::map(
+		rpl::mappers::_1 != Unarchive::AnyUnmuted
+	));
+	state->folders->toggledChanges(
+	) | rpl::filter([=](bool toggled) {
+		const auto current = privacy->unarchiveOnNewMessageCurrent();
+		return toggled != (current != Unarchive::AnyUnmuted);
+	}) | rpl::start_with_next([=](bool toggled) {
+		const auto current = privacy->unarchiveOnNewMessageCurrent();
+		privacy->updateUnarchiveOnNewMessage(!toggled
+			? Unarchive::AnyUnmuted
+			: (current == Unarchive::AnyUnmuted)
+			? Unarchive::NotInFoldersUnmuted
+			: current);
+	}, inner->lifetime());
+
+	AddSkip(inner);
+	AddDividerText(inner, tr::lng_settings_chats_from_folders_about());
+
+	state->foldersWrap->toggle(
+		privacy->unarchiveOnNewMessageCurrent() != Unarchive::None,
+		anim::type::instant);
+
+	SetupArchiveAndMute(controller, box->verticalLayout());
+}
+
+void PreloadArchiveSettings(not_null<::Main::Session*> session) {
+	session->api().globalPrivacy().reload();
+}
+
 void SetupHardwareAcceleration(not_null<Ui::VerticalLayout*> container) {
 	const auto settings = &Core::App().settings();
 	AddButton(
diff --git a/Telegram/SourceFiles/settings/settings_advanced.h b/Telegram/SourceFiles/settings/settings_advanced.h
index 27afff623..21aa2014f 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.h
+++ b/Telegram/SourceFiles/settings/settings_advanced.h
@@ -11,10 +11,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Main {
 class Account;
+class Session;
 } // namespace Main
 
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
 namespace Window {
 class Controller;
+class SessionController;
 } // namespace Window
 
 namespace Settings {
@@ -37,6 +43,11 @@ void SetupAnimations(
 	not_null<Window::Controller*> window,
 	not_null<Ui::VerticalLayout*> container);
 
+void ArchiveSettingsBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionController*> controller);
+void PreloadArchiveSettings(not_null<::Main::Session*> session);
+
 class Advanced : public Section<Advanced> {
 public:
 	Advanced(
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index d9a1a97c3..63df59c3d 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -311,53 +311,6 @@ void SetupPrivacy(
 	AddDivider(container);
 }
 
-void SetupArchiveAndMute(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	using namespace rpl::mappers;
-
-	const auto wrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto inner = wrap->entity();
-
-	AddSkip(inner);
-	AddSubsectionTitle(inner, tr::lng_settings_new_unknown());
-
-	const auto session = &controller->session();
-
-	const auto privacy = &session->api().globalPrivacy();
-	privacy->reload();
-	AddButton(
-		inner,
-		tr::lng_settings_auto_archive(),
-		st::settingsButtonNoIcon
-	)->toggleOn(
-		privacy->archiveAndMute()
-	)->toggledChanges(
-	) | rpl::filter([=](bool toggled) {
-		return toggled != privacy->archiveAndMuteCurrent();
-	}) | rpl::start_with_next([=](bool toggled) {
-		privacy->update(toggled);
-	}, container->lifetime());
-
-	AddSkip(inner);
-	AddDividerText(inner, tr::lng_settings_auto_archive_about());
-
-	auto shown = rpl::single(
-		false
-	) | rpl::then(session->api().globalPrivacy().showArchiveAndMute(
-	) | rpl::filter(_1) | rpl::take(1));
-	auto premium = Data::AmPremiumValue(&controller->session());
-
-	using namespace rpl::mappers;
-	wrap->toggleOn(rpl::combine(
-		std::move(shown),
-		std::move(premium),
-		_1 || _2));
-}
-
 void SetupLocalPasscode(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
@@ -838,6 +791,53 @@ void AddPrivacyButton(
 	});
 }
 
+void SetupArchiveAndMute(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container) {
+	using namespace rpl::mappers;
+
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = wrap->entity();
+
+	AddSkip(inner);
+	AddSubsectionTitle(inner, tr::lng_settings_new_unknown());
+
+	const auto session = &controller->session();
+
+	const auto privacy = &session->api().globalPrivacy();
+	privacy->reload();
+	AddButton(
+		inner,
+		tr::lng_settings_auto_archive(),
+		st::settingsButtonNoIcon
+	)->toggleOn(
+		privacy->archiveAndMute()
+	)->toggledChanges(
+	) | rpl::filter([=](bool toggled) {
+		return toggled != privacy->archiveAndMuteCurrent();
+	}) | rpl::start_with_next([=](bool toggled) {
+		privacy->updateArchiveAndMute(toggled);
+	}, container->lifetime());
+
+	AddSkip(inner);
+	AddDividerText(inner, tr::lng_settings_auto_archive_about());
+
+	auto shown = rpl::single(
+		false
+	) | rpl::then(session->api().globalPrivacy().showArchiveAndMute(
+	) | rpl::filter(_1) | rpl::take(1));
+	auto premium = Data::AmPremiumValue(&controller->session());
+
+	using namespace rpl::mappers;
+	wrap->toggleOn(rpl::combine(
+		std::move(shown),
+		std::move(premium),
+		_1 || _2));
+}
+
 PrivacySecurity::PrivacySecurity(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.h b/Telegram/SourceFiles/settings/settings_privacy_security.h
index 350d6f1b5..83dd827ee 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.h
@@ -35,6 +35,10 @@ void AddPrivacyButton(
 	Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory,
 	const style::SettingsButton *stOverride = nullptr);
 
+void SetupArchiveAndMute(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container);
+
 class PrivacySecurity : public Section<PrivacySecurity> {
 public:
 	PrivacySecurity(
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index ba24fba90..52c3e67e3 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "storage/storage_account.h"
 #include "support/support_templates.h"
+#include "settings/settings_advanced.h"
 #include "settings/settings_common.h"
 #include "settings/settings_calls.h"
 #include "settings/settings_information.h"
@@ -63,6 +64,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_stories.h"
 #include "mainwidget.h"
+#include "styles/style_chat.h" // popupMenuExpandedSeparator
 #include "styles/style_window.h"
 #include "styles/style_widgets.h"
 #include "styles/style_dialogs.h"
@@ -602,7 +604,7 @@ void MainMenu::setupArchive() {
 		}
 		_contextMenu = base::make_unique_q<Ui::PopupMenu>(
 			this,
-			st::popupMenuWithIcons);
+			st::popupMenuExpandedSeparator);
 		const auto addAction = PeerMenuCallback([&](
 				PeerMenuCallback::Args a) {
 			return _contextMenu->addAction(
@@ -626,6 +628,12 @@ void MainMenu::setupArchive() {
 			[f = folder()] { return f->chatsList(); },
 			addAction);
 
+		_contextMenu->addSeparator();
+		Settings::PreloadArchiveSettings(&controller->session());
+		addAction(tr::lng_context_archive_settings(tr::now), [=] {
+			controller->show(Box(Settings::ArchiveSettingsBox, controller));
+		}, &st::menuIconManage);
+
 		_contextMenu->popup(QCursor::pos());
 	}, button->lifetime());
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 9098b9112..92025ae40 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -61,6 +61,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_adaptive.h" // Adaptive::isThreeColumn
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
+#include "settings/settings_advanced.h"
 #include "support/support_helper.h"
 #include "info/info_memento.h"
 #include "info/info_controller.h"
@@ -1276,6 +1277,12 @@ void Filler::fillArchiveActions() {
 		controller,
 		[folder = _folder] { return folder->chatsList(); },
 		_addAction);
+
+	_addAction({ .isSeparator = true });
+	Settings::PreloadArchiveSettings(&controller->session());
+	_addAction(tr::lng_context_archive_settings(tr::now), [=] {
+		controller->show(Box(Settings::ArchiveSettingsBox, controller));
+	}, &st::menuIconManage);
 }
 
 } // namespace

From 027e6624783eccf76647a1e704e74b9da8c71ae6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 17:48:38 +0200
Subject: [PATCH 598/676] Fix story links opening viewer in the background.

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

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index d18b842c0..61d31e64d 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -412,6 +412,7 @@ bool ResolveUsernameOrPhone(
 	}
 	const auto myContext = context.value<ClickHandlerContext>();
 	using Navigation = Window::SessionNavigation;
+	controller->window().activate();
 	controller->showPeerByLink(Navigation::PeerByLinkInfo{
 		.usernameOrId = domain,
 		.phone = phone,
@@ -447,7 +448,6 @@ bool ResolveUsernameOrPhone(
 			: std::nullopt),
 		.clickFromMessageId = myContext.itemId,
 	});
-	controller->window().activate();
 	return true;
 }
 

From d52475666d0167d891128312aaf5e5e0a7257e39 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 18:12:35 +0200
Subject: [PATCH 599/676] Suggest group-with-hidden-members admins in mentions.

---
 .../SourceFiles/api/api_chat_participants.cpp |  2 ++
 .../boxes/peers/edit_participants_box.cpp     |  5 ++++
 .../chat_helpers/field_autocomplete.cpp       | 24 +++++++++++++++----
 Telegram/SourceFiles/data/data_channel.h      |  1 +
 .../SourceFiles/history/history_widget.cpp    |  2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index aeb7bd0a6..0ee748f2b 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -439,6 +439,7 @@ void ChatParticipants::requestAdmins(not_null<ChannelData*> channel) {
 		MTP_int(channel->session().serverConfig().chatSizeMax),
 		MTP_long(participantsHash)
 	)).done([=](const MTPchannels_ChannelParticipants &result) {
+		channel->mgInfo->adminsLoaded = true;
 		_adminsRequests.remove(channel);
 		result.match([&](const MTPDchannels_channelParticipants &data) {
 			channel->owner().processUsers(data.vusers());
@@ -448,6 +449,7 @@ void ChatParticipants::requestAdmins(not_null<ChannelData*> channel) {
 				"channels.channelParticipantsNotModified received!"));
 		});
 	}).fail([=] {
+		channel->mgInfo->adminsLoaded = true;
 		_adminsRequests.remove(channel);
 	}).send();
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index e1d09efec..4ec1fd6be 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1505,6 +1505,11 @@ void ParticipantsBoxController::loadMoreRows() {
 			LOG(("API Error: "
 				"channels.channelParticipantsNotModified received!"));
 		});
+		if (_offset > 0 && _role == Role::Admins && channel->isMegagroup()) {
+			if (channel->mgInfo->admins.empty() && channel->mgInfo->adminsLoaded) {
+				channel->mgInfo->adminsLoaded = false;
+			}
+		}
 		if (!firstLoad && !added) {
 			_allLoaded = true;
 		}
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 7f5c7a52e..4285247a1 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -422,7 +422,9 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 		if (_chat) {
 			maxListSize += (_chat->participants.empty() ? _chat->lastAuthors.size() : _chat->participants.size());
 		} else if (_channel && _channel->isMegagroup()) {
-			if (!_channel->lastParticipantsRequestNeeded()) {
+			if (!_channel->canViewMembers()) {
+				maxListSize += _channel->mgInfo->admins.size();
+			} else if (!_channel->lastParticipantsRequestNeeded()) {
 				maxListSize += _channel->mgInfo->lastParticipants.size();
 			}
 		}
@@ -488,10 +490,22 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 				--i;
 				mrows.push_back({ i->second });
 			}
-		} else if (_channel
-			&& _channel->isMegagroup()
-			&& _channel->canViewMembers()) {
-			if (_channel->lastParticipantsRequestNeeded()) {
+		} else if (_channel && _channel->isMegagroup()) {
+			if (!_channel->canViewMembers()) {
+				if (!_channel->mgInfo->adminsLoaded) {
+					_channel->session().api().chatParticipants().requestAdmins(_channel);
+				} else {
+					mrows.reserve(mrows.size() + _channel->mgInfo->admins.size());
+					for (const auto [userId, rank] : _channel->mgInfo->admins) {
+						if (const auto user = _channel->owner().userLoaded(userId)) {
+							if (user->isInaccessible()) continue;
+							if (!listAllSuggestions && filterNotPassedByName(user)) continue;
+							if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue;
+							mrows.push_back({ user });
+						}
+					}
+				}
+			} else if (_channel->lastParticipantsRequestNeeded()) {
 				_channel->session().api().chatParticipants().requestLast(
 					_channel);
 			} else {
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index 9817da915..6c05d5c88 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -116,6 +116,7 @@ public:
 	QString creatorRank;
 	int botStatus = 0; // -1 - no bots, 0 - unknown, 1 - one bot, that sees all history, 2 - other
 	bool joinedMessageFound = false;
+	bool adminsLoaded = false;
 	StickerSetIdentifier stickerSet;
 
 	enum LastParticipantsStatus {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index d69117441..6c71cd83a 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7495,7 +7495,7 @@ void HistoryWidget::handlePeerUpdate() {
 		if (!channel->mgInfo->botStatus) {
 			session().api().chatParticipants().requestBots(channel);
 		}
-		if (channel->mgInfo->admins.empty()) {
+		if (!channel->mgInfo->adminsLoaded) {
 			session().api().chatParticipants().requestAdmins(channel);
 		}
 	}

From f1ab712f077ec73c42812995056b48c7f9a16ec8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 20:22:50 +0200
Subject: [PATCH 600/676] Fix outdated bar closing.

---
 Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp | 3 +++
 Telegram/SourceFiles/window/main_window.cpp              | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp b/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
index 538e3fcda..2ad527ce2 100644
--- a/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
+++ b/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
@@ -174,6 +174,9 @@ object_ptr<RpWidget> CreateOutdatedBar(
 		Closed(workingPath);
 	}, wrap->lifetime());
 
+	wrap->entity()->resizeToWidth(st::windowMinWidth);
+	wrap->show(anim::type::instant);
+
 	return result;
 #else // DESKTOP_APP_SPECIAL_TARGET
 	return { nullptr };
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 07c2d8a4d..c1d17fa74 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -375,9 +375,7 @@ MainWindow::MainWindow(not_null<Controller*> controller)
 
 	if (_outdated) {
 		_outdated->heightValue(
-		) | rpl::filter([=] {
-			return window()->windowHandle() != nullptr;
-		}) | rpl::start_with_next([=](int height) {
+		) | rpl::start_with_next([=](int height) {
 			if (!height) {
 				crl::on_main(this, [=] { _outdated.destroy(); });
 			}

From 94f842a81f8181decec275c6c49f9b0608400274 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 21:55:45 +0200
Subject: [PATCH 601/676] Fix Shift+F10 context menu in media viewer.

Fixes #26595.
---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 277538cad..350590a0d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -492,6 +492,15 @@ OverlayWidget::OverlayWidget()
 			return base::EventFilterResult::Cancel;
 		} else if (type == QEvent::ThemeChange && Platform::IsLinux()) {
 			_window->setWindowIcon(Window::CreateIcon(_session));
+		} else if (type == QEvent::ContextMenu) {
+			const auto event = static_cast<QContextMenuEvent*>(e.get());
+			const auto mouse = (event->reason() == QContextMenuEvent::Mouse);
+			const auto position = mouse
+				? std::make_optional(event->pos())
+				: std::nullopt;
+			if (handleContextMenu(position)) {
+				return base::EventFilterResult::Cancel;
+			}
 		}
 		return base::EventFilterResult::Continue;
 	});

From 59546e87dc2f9d795724126c9972c8762a68efe0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Aug 2023 14:04:22 +0200
Subject: [PATCH 602/676] Fix multi-monitor window adjust on Windows.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 18ac9868b..fd55e9b71 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 18ac9868bb24801c6d4bf7bd5d1e6197add2f4b4
+Subproject commit fd55e9b71b03282de682e9b8ac01f1b6801d25a9

From cc27b6c5c5ff06aba594ea4a1bd9b2d83ebab2f3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Aug 2023 14:04:33 +0200
Subject: [PATCH 603/676] Update icons in settings / manage layers.

---
 Telegram/Resources/icons/menu/antispam.png    | Bin 0 -> 761 bytes
 Telegram/Resources/icons/menu/antispam@2x.png | Bin 0 -> 1427 bytes
 Telegram/Resources/icons/menu/antispam@3x.png | Bin 0 -> 2160 bytes
 .../Resources/icons/menu/bot_commands.png     | Bin 0 -> 538 bytes
 .../Resources/icons/menu/bot_commands@2x.png  | Bin 0 -> 821 bytes
 .../Resources/icons/menu/bot_commands@3x.png  | Bin 0 -> 1153 bytes
 .../Resources/icons/menu/calls_receive.png    | Bin 0 -> 773 bytes
 .../Resources/icons/menu/calls_receive@2x.png | Bin 0 -> 1466 bytes
 .../Resources/icons/menu/calls_receive@3x.png | Bin 0 -> 2124 bytes
 .../Resources/icons/menu/chat_discuss.png     | Bin 0 -> 751 bytes
 .../Resources/icons/menu/chat_discuss@2x.png  | Bin 0 -> 1370 bytes
 .../Resources/icons/menu/chat_discuss@3x.png  | Bin 0 -> 2002 bytes
 Telegram/Resources/icons/menu/devices.png     | Bin 0 -> 402 bytes
 Telegram/Resources/icons/menu/devices@2x.png  | Bin 0 -> 595 bytes
 Telegram/Resources/icons/menu/devices@3x.png  | Bin 0 -> 840 bytes
 Telegram/Resources/icons/menu/dock_bounce.png | Bin 0 -> 497 bytes
 .../Resources/icons/menu/dock_bounce@2x.png   | Bin 0 -> 808 bytes
 .../Resources/icons/menu/dock_bounce@3x.png   | Bin 0 -> 1152 bytes
 .../Resources/icons/menu/experimental.png     | Bin 0 -> 582 bytes
 .../Resources/icons/menu/experimental@2x.png  | Bin 0 -> 991 bytes
 .../Resources/icons/menu/experimental@3x.png  | Bin 0 -> 1443 bytes
 Telegram/Resources/icons/menu/faq.png         | Bin 0 -> 539 bytes
 Telegram/Resources/icons/menu/faq@2x.png      | Bin 0 -> 1231 bytes
 Telegram/Resources/icons/menu/faq@3x.png      | Bin 0 -> 1832 bytes
 Telegram/Resources/icons/menu/group_log.png   | Bin 0 -> 539 bytes
 .../Resources/icons/menu/group_log@2x.png     | Bin 0 -> 941 bytes
 .../Resources/icons/menu/group_log@3x.png     | Bin 0 -> 1220 bytes
 .../Resources/icons/menu/group_reactions.png  | Bin 0 -> 629 bytes
 .../icons/menu/group_reactions@2x.png         | Bin 0 -> 1164 bytes
 .../icons/menu/group_reactions@3x.png         | Bin 0 -> 1774 bytes
 .../Resources/icons/menu/groups_create.png    | Bin 0 -> 717 bytes
 .../Resources/icons/menu/groups_create@2x.png | Bin 0 -> 1357 bytes
 .../Resources/icons/menu/groups_create@3x.png | Bin 0 -> 2010 bytes
 .../Resources/icons/menu/hide_members.png     | Bin 0 -> 809 bytes
 .../Resources/icons/menu/hide_members@2x.png  | Bin 0 -> 1675 bytes
 .../Resources/icons/menu/hide_members@3x.png  | Bin 0 -> 2426 bytes
 .../icons/menu/info_notifications.png         | Bin 0 -> 461 bytes
 .../icons/menu/info_notifications@2x.png      | Bin 0 -> 853 bytes
 .../icons/menu/info_notifications@3x.png      | Bin 0 -> 1302 bytes
 .../links_profile.png}                        | Bin
 .../links_profile@2x.png}                     | Bin
 .../links_profile@3x.png}                     | Bin
 Telegram/Resources/icons/menu/lock.png        | Bin 0 -> 555 bytes
 Telegram/Resources/icons/menu/lock@2x.png     | Bin 0 -> 932 bytes
 Telegram/Resources/icons/menu/lock@3x.png     | Bin 0 -> 1322 bytes
 Telegram/Resources/icons/menu/network.png     | Bin 0 -> 492 bytes
 Telegram/Resources/icons/menu/network@2x.png  | Bin 0 -> 818 bytes
 Telegram/Resources/icons/menu/network@3x.png  | Bin 0 -> 1249 bytes
 .../Resources/icons/menu/payment_email.png    | Bin 0 -> 757 bytes
 .../Resources/icons/menu/payment_email@2x.png | Bin 0 -> 1461 bytes
 .../Resources/icons/menu/payment_email@3x.png | Bin 0 -> 2254 bytes
 Telegram/Resources/icons/menu/power_usage.png | Bin 0 -> 511 bytes
 .../Resources/icons/menu/power_usage@2x.png   | Bin 0 -> 902 bytes
 .../Resources/icons/menu/power_usage@3x.png   | Bin 0 -> 1227 bytes
 .../Resources/icons/menu/recovery_email.png   | Bin 0 -> 508 bytes
 .../icons/menu/recovery_email@2x.png          | Bin 0 -> 734 bytes
 .../icons/menu/recovery_email@3x.png          | Bin 0 -> 1185 bytes
 Telegram/Resources/icons/menu/remove.png      | Bin 0 -> 516 bytes
 Telegram/Resources/icons/menu/remove@2x.png   | Bin 0 -> 823 bytes
 Telegram/Resources/icons/menu/remove@3x.png   | Bin 0 -> 1271 bytes
 Telegram/Resources/icons/menu/signed.png      | Bin 0 -> 578 bytes
 Telegram/Resources/icons/menu/signed@2x.png   | Bin 0 -> 1069 bytes
 Telegram/Resources/icons/menu/signed@3x.png   | Bin 0 -> 1528 bytes
 Telegram/Resources/icons/menu/stop_poll.png   | Bin 519 -> 0 bytes
 .../Resources/icons/menu/stop_poll@2x.png     | Bin 827 -> 0 bytes
 .../Resources/icons/menu/stop_poll@3x.png     | Bin 1285 -> 0 bytes
 Telegram/Resources/icons/menu/storage.png     | Bin 0 -> 670 bytes
 Telegram/Resources/icons/menu/storage@2x.png  | Bin 0 -> 1192 bytes
 Telegram/Resources/icons/menu/storage@3x.png  | Bin 0 -> 1816 bytes
 Telegram/Resources/icons/menu/timer.png       | Bin 0 -> 608 bytes
 Telegram/Resources/icons/menu/timer@2x.png    | Bin 0 -> 1250 bytes
 Telegram/Resources/icons/menu/timer@3x.png    | Bin 0 -> 1883 bytes
 Telegram/Resources/icons/menu/topics.png      | Bin 0 -> 345 bytes
 Telegram/Resources/icons/menu/topics@2x.png   | Bin 0 -> 418 bytes
 Telegram/Resources/icons/menu/topics@3x.png   | Bin 0 -> 775 bytes
 Telegram/Resources/langs/lang.strings         |  11 ++++
 .../SourceFiles/boxes/edit_privacy_box.cpp    |  16 ++----
 .../boxes/filters/edit_filter_box.cpp         |   8 +--
 .../boxes/peers/edit_linked_chat_box.cpp      |   5 +-
 .../boxes/peers/edit_members_visible.cpp      |   3 +-
 .../boxes/peers/edit_participants_box.cpp     |   2 +-
 .../boxes/peers/edit_peer_info_box.cpp        |  50 +++++++-----------
 .../boxes/peers/edit_peer_permissions_box.cpp |   7 +--
 Telegram/SourceFiles/boxes/ringtones_box.cpp  |   1 -
 .../admin_log/history_admin_log_inner.cpp     |   2 +-
 .../view/history_view_context_menu.cpp        |   2 +-
 Telegram/SourceFiles/info/info.style          |  13 ++---
 .../media/view/media_view_overlay_widget.cpp  |   9 ----
 .../menu/menu_antispam_validator.cpp          |   2 +-
 .../settings_cloud_password_manage.cpp        |   5 +-
 Telegram/SourceFiles/settings/settings.style  |  32 +----------
 .../settings/settings_advanced.cpp            |  49 +++--------------
 .../SourceFiles/settings/settings_advanced.h  |   4 +-
 .../settings/settings_blocked_peers.cpp       |   2 +-
 .../SourceFiles/settings/settings_chat.cpp    |  35 ++++++++----
 Telegram/SourceFiles/settings/settings_chat.h |   3 +-
 .../SourceFiles/settings/settings_common.cpp  |  33 +-----------
 .../SourceFiles/settings/settings_common.h    |  14 +----
 .../settings/settings_experimental.cpp        |   2 -
 .../SourceFiles/settings/settings_folders.cpp |   2 +-
 .../settings/settings_information.cpp         |   9 ++--
 .../SourceFiles/settings/settings_intro.cpp   |   2 +-
 .../settings/settings_local_passcode.cpp      |   5 +-
 .../SourceFiles/settings/settings_main.cpp    |  30 ++++++-----
 .../settings/settings_notifications.cpp       |  13 ++---
 .../settings/settings_privacy_controllers.cpp |  14 ++---
 .../settings/settings_privacy_controllers.h   |   5 +-
 .../settings/settings_privacy_security.cpp    |  31 +++++------
 Telegram/SourceFiles/ui/menu_icons.style      |  31 +++++++++--
 109 files changed, 184 insertions(+), 268 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/antispam.png
 create mode 100644 Telegram/Resources/icons/menu/antispam@2x.png
 create mode 100644 Telegram/Resources/icons/menu/antispam@3x.png
 create mode 100644 Telegram/Resources/icons/menu/bot_commands.png
 create mode 100644 Telegram/Resources/icons/menu/bot_commands@2x.png
 create mode 100644 Telegram/Resources/icons/menu/bot_commands@3x.png
 create mode 100644 Telegram/Resources/icons/menu/calls_receive.png
 create mode 100644 Telegram/Resources/icons/menu/calls_receive@2x.png
 create mode 100644 Telegram/Resources/icons/menu/calls_receive@3x.png
 create mode 100644 Telegram/Resources/icons/menu/chat_discuss.png
 create mode 100644 Telegram/Resources/icons/menu/chat_discuss@2x.png
 create mode 100644 Telegram/Resources/icons/menu/chat_discuss@3x.png
 create mode 100644 Telegram/Resources/icons/menu/devices.png
 create mode 100644 Telegram/Resources/icons/menu/devices@2x.png
 create mode 100644 Telegram/Resources/icons/menu/devices@3x.png
 create mode 100644 Telegram/Resources/icons/menu/dock_bounce.png
 create mode 100644 Telegram/Resources/icons/menu/dock_bounce@2x.png
 create mode 100644 Telegram/Resources/icons/menu/dock_bounce@3x.png
 create mode 100644 Telegram/Resources/icons/menu/experimental.png
 create mode 100644 Telegram/Resources/icons/menu/experimental@2x.png
 create mode 100644 Telegram/Resources/icons/menu/experimental@3x.png
 create mode 100644 Telegram/Resources/icons/menu/faq.png
 create mode 100644 Telegram/Resources/icons/menu/faq@2x.png
 create mode 100644 Telegram/Resources/icons/menu/faq@3x.png
 create mode 100644 Telegram/Resources/icons/menu/group_log.png
 create mode 100644 Telegram/Resources/icons/menu/group_log@2x.png
 create mode 100644 Telegram/Resources/icons/menu/group_log@3x.png
 create mode 100644 Telegram/Resources/icons/menu/group_reactions.png
 create mode 100644 Telegram/Resources/icons/menu/group_reactions@2x.png
 create mode 100644 Telegram/Resources/icons/menu/group_reactions@3x.png
 create mode 100644 Telegram/Resources/icons/menu/groups_create.png
 create mode 100644 Telegram/Resources/icons/menu/groups_create@2x.png
 create mode 100644 Telegram/Resources/icons/menu/groups_create@3x.png
 create mode 100644 Telegram/Resources/icons/menu/hide_members.png
 create mode 100644 Telegram/Resources/icons/menu/hide_members@2x.png
 create mode 100644 Telegram/Resources/icons/menu/hide_members@3x.png
 create mode 100644 Telegram/Resources/icons/menu/info_notifications.png
 create mode 100644 Telegram/Resources/icons/menu/info_notifications@2x.png
 create mode 100644 Telegram/Resources/icons/menu/info_notifications@3x.png
 rename Telegram/Resources/icons/{settings/premium/stories_links.png => menu/links_profile.png} (100%)
 rename Telegram/Resources/icons/{settings/premium/stories_links@2x.png => menu/links_profile@2x.png} (100%)
 rename Telegram/Resources/icons/{settings/premium/stories_links@3x.png => menu/links_profile@3x.png} (100%)
 create mode 100644 Telegram/Resources/icons/menu/lock.png
 create mode 100644 Telegram/Resources/icons/menu/lock@2x.png
 create mode 100644 Telegram/Resources/icons/menu/lock@3x.png
 create mode 100644 Telegram/Resources/icons/menu/network.png
 create mode 100644 Telegram/Resources/icons/menu/network@2x.png
 create mode 100644 Telegram/Resources/icons/menu/network@3x.png
 create mode 100644 Telegram/Resources/icons/menu/payment_email.png
 create mode 100644 Telegram/Resources/icons/menu/payment_email@2x.png
 create mode 100644 Telegram/Resources/icons/menu/payment_email@3x.png
 create mode 100644 Telegram/Resources/icons/menu/power_usage.png
 create mode 100644 Telegram/Resources/icons/menu/power_usage@2x.png
 create mode 100644 Telegram/Resources/icons/menu/power_usage@3x.png
 create mode 100644 Telegram/Resources/icons/menu/recovery_email.png
 create mode 100644 Telegram/Resources/icons/menu/recovery_email@2x.png
 create mode 100644 Telegram/Resources/icons/menu/recovery_email@3x.png
 create mode 100644 Telegram/Resources/icons/menu/remove.png
 create mode 100644 Telegram/Resources/icons/menu/remove@2x.png
 create mode 100644 Telegram/Resources/icons/menu/remove@3x.png
 create mode 100644 Telegram/Resources/icons/menu/signed.png
 create mode 100644 Telegram/Resources/icons/menu/signed@2x.png
 create mode 100644 Telegram/Resources/icons/menu/signed@3x.png
 delete mode 100644 Telegram/Resources/icons/menu/stop_poll.png
 delete mode 100644 Telegram/Resources/icons/menu/stop_poll@2x.png
 delete mode 100644 Telegram/Resources/icons/menu/stop_poll@3x.png
 create mode 100644 Telegram/Resources/icons/menu/storage.png
 create mode 100644 Telegram/Resources/icons/menu/storage@2x.png
 create mode 100644 Telegram/Resources/icons/menu/storage@3x.png
 create mode 100644 Telegram/Resources/icons/menu/timer.png
 create mode 100644 Telegram/Resources/icons/menu/timer@2x.png
 create mode 100644 Telegram/Resources/icons/menu/timer@3x.png
 create mode 100644 Telegram/Resources/icons/menu/topics.png
 create mode 100644 Telegram/Resources/icons/menu/topics@2x.png
 create mode 100644 Telegram/Resources/icons/menu/topics@3x.png

diff --git a/Telegram/Resources/icons/menu/antispam.png b/Telegram/Resources/icons/menu/antispam.png
new file mode 100644
index 0000000000000000000000000000000000000000..201dd2fbb917fffdf5c57b0b309621a6923c241e
GIT binary patch
literal 761
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhpP3#WBP}
z@N9^6c9x^Sw`1W=ZjLS;N!iJX0@;oRS{Z^YN1cLJb}aLlwS_B5UBgT%f<^bpA+HS{
zQ|lM_2Dk`L6^K{Z_qplL`y##SKDmwOH2IA0n{VE2{P}H>#s0UC<?JT}Xl#klnLd5`
z<Bt`aZ_4o79hf&~&J3SrF?!~+&n~;1x%=+FU%ys`Xvy_IfAi*z1C#Wn*Izqb9)0~<
zx;IX|+qM1h!RMa^(+nggoqSSY5u+p4-`}6MS#tKq%l{Q)^tMN>O-lc>H*S4|PTFzB
zV_93pxLU7fg|5H;w8+xBtvTx1=bc_ltqyEdnCNjO!=&k;LgI_ZE3dwaTi?Ejqx^`&
z!@GImYLh2QR4KMP8P4?KD7>&^*RDlTY~MbA4ptDDU{IxKlDacSs416)sd4#o^<FpU
zKzn=pGj*4_YwPP5Pk&Rxbunw}$`Gx&e*5?A2{`fdr)6<+)x!RM{$*}6f|=vArp`M1
z?C@dco1R)zlPr!b<=uY!?#mL5`NtnGoIBB@rD*d_9W!;;K!q(_rWb!6x%9GR1z+*f
z3BP|=moU~(Kh661*|Rp6LkBt-<6>eA4*oZ@GMDO|<EQ?xK*{BC#?P904O19d9o?%H
z-liEzo@xDNIVVEr+n+yY-iSw>SrWF|b#Y+YlfJbfS{J$RoROXKbivd7{CuI#mZJs?
z^Ur_(_b+ezZOI#boTiEg(l)<cz&^LYg6Hb7#~&|W4o+j>I&yf^-Msbd*U$W6css*n
zTa@k!MG>yVzJTWY@85s_z2jrRvyDDx?1K01-sNRue!*IA^7PxcX_Y&_1^s*Tvs!On
nl#RoS?42=gfz@x`m;Gnb*8k~hI>S^Nl<YiR{an^LB{Ts5$}dU1

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/antispam@2x.png b/Telegram/Resources/icons/menu/antispam@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f465352f2da3adc5814f03ab218b2546f51da142
GIT binary patch
literal 1427
zcmV;E1#J3>P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG{YgYYR9Fe^SXn4_Z4~~@vrvYR
zDMJ|wCFMr0L>VrSc`7#&7iN+&M7TgGG9(EX;!cL56f(P@kP8tRl6fA!=lj;*+dg|Z
z=Wz7h{PxA^-D^E-t>>)0-u14%fBpKoelqZr0htWg+S=yl=TA>hZ*6V$_xFc|g=uMN
z$sqpCjj5?=Mn=ZW%*^}y`-kjxetzE8))o*D@GqF?>FLG9#Eg!PK0Q4#8ZR#|V`F12
zEiHR{drXK0ZYwG(+}zy0pP7b+MsRR&Z*TAQ^))x-+}vDNR+hQBISYxzAU#MD7q+yt
zl#`QVX=%w|Utjq9`!_c?pPZa<1E5?=OG_Oc9i{xDj8IHNLqiV_56tlO^%aRsNJua+
zFpx5oCwF#sURYRQ?yxvGIH<3$_xARdXC|vNHa1R6OPiXSdV70gu8`*3++10pqC0DA
z>&weaa&d8S(b3Tn7#OIgrl!bFQg35plb4sbzP`?Afv6-}s3<Hfgyr+|b8Kv^wzjqq
z@MVdYm)FL|2AnT0E`GvES63Ho=I7@>VWTv(sHh0e&(6+7E!0J&78Vweqn1UrDheMT
zAK^hN@#2JNCrkYa6$zmdzDVfw^i;*zqULC-pC&|)OhrQ2R_LYNwn_XbL+a}4=(nPb
z`9eTZbhuJeQ~5fj@3XVB$w@&$0nZ3KmsB{2cq-hA)DX@~!hxC4KpBaTk564)9guK^
zL4apMof@2|x_MghkT@@a)6~@Dp_REcG&CF>9MsX#0l2EF3I`d_3hf(`o0}VO;;C>e
zP6+1?bjm(sS+A|Ft*)-Fkj>7{;<T4l{<$+UGQ#iG)s;{Mi9AAI$WT&JQgU)K{Nlig
zkB`R@CX7lM!igqSNfILZq5}h-h>MGhs4vJddypzUJ^k?TP!vX67-yxZR$Pcm!~;et
z@YHCp2m@7hb+u5ny1EJ#E=(*uE%z2x1x$B$H&>`&-QL~~o8{$Y9u6CXiV@o4;$p70
zv9S?CTx)A<RMA{5TVrG(59m@%sCWT1T#IHkF)@+N(V3Z<<O}22Uos!Jx3^T$QZel8
z><AeW5+a2Wk%xwck{PB2p&C3$3udTd%sOmlO-V@+;<=LO=xDM9Gp=00T3=uP{{9}8
zWo2ceP#PfsK!d<UOELQT`b5E8;lRKEz}wr~T%l6yk&zKtuB@y`p=)YthzI@d?Cf9z
zN`Xm^+M?G4;hvCh_(zN6QzTDMPboBdAYpKT`}+Dy!I&JKiSWvRnbm&_6B85qH^Re+
zL9u1<+B!Ko86F<agi;ISk6H%0gA_)Ayt1;A{!m<8oC2s4>V}2}c*8#U`b#Z({Qmwv
zyc``JIXE~d5mXWq5fOm{8?JhKdL%*0D1w55=#>i0oSdALF%e?$Krxho4IUYt8$!${
zB&_Seozy8N$6aJ(Bz*`tK0f}o_xzHQ68t}0Xn^R1a>8>}y1KeeO-<C+F%7%ByK}Xw
zu5o%(+Cgi4d|b|pJw?LM$QmX-gNSx~RXO?j`R(rR{>{|K-Q8VzdAV?aM+^)tNDO0-
zDyE4{)$pSB=q1>_EEqm+bar;Ke{W`HR$E&Ou0$F$T2xe&sGn~ZqBe(zhuN8r@c6!g
z4-y#bhzb~EQnRwM`sTp$-FbL;;G-g!7O|O_m{754$&af*Yj1ClNev$xH#ax&_)upG
h41Ux<8Tj92;5YroZXIuc0jmH2002ovPDHLkV1hSGhSdN7

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/antispam@3x.png b/Telegram/Resources/icons/menu/antispam@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..43e7f8778c40fba0e72e5785bf6fe55358ebb123
GIT binary patch
literal 2160
zcmYLKX*kqt6d%io8M5zdV;MD4k}Nl2vNS}<lE#*?<PJiEgt~^rSjt|OjIGGlNJG{v
zV-T`LWf`OzOlFXsa{s>E`{BIjyyrd7?>X;ze&?J7Yb!H8h!g|_0`Z|P8QTK-(xGs(
z1LwpeB>_OO-L^GDf~p5)7J-Yg*EN*4r6uSDU~_}m9{Pef4?_Tv0t5u&AhLlt0L^yj
zBeMVZdWp#KzkL|^Si_VB0v(w^85`N%1TW`!mD!^Os5P!lXhFsVSOr2@ZSN4H7#dMH
zZ7z#QLrpYDjF(T`6+DVP6!6gr)6<`$W>_SebhZz5V(-<K{tE4_JZ|v1=D|}ZT}>=p
zsq5gYqJVt#Hg}iV?ETa13FY&cM%>~FyE5z7-UDZSN1CJd&M7M^hpfkyg0+`E)wFr`
zra9KQ&L!<etS=1rKh>;osFKPWw+^bXD?fwjPTJdI9WYV`4zkr<q_qCFBY9AeZ<Hif
zN=izGi_P3xBfoU>KYZ@ic28C}xFn24dmH>6(j5=7S)+e2aDVrYFx*N<q9FKtUnU7d
z4P6+zvAe!#HM;%%eRdVPo{asZeld=hZ9<ICj_miPF?6{xVvEU|X`5_ZUzzK4dhKmr
z;b3XzGq2_MIgmmST@oQdTJQb7yEsznXQdO;KD4;LI9l)bCAc$=Pu}2OU5*Jf>!e$&
z3}f`UCBwtAJ4te~{#IMm-e!$k+r-zYmWZ&4I$u$Q1CEV{n7CTuSVQ|tNd&&&i>1;(
z6aYXYWPfxU_IMa`>i6!(U!gxG_6Eduetvlk;3J$H0zm=BhPcI%?>`1|$=C1iZ<FpH
z{9#Tv`Fwb$kL+W85K=Y|+<bM+U-b9>&TRm|BvEVw%IGoh9Z^DCzOc%dI(yT)9S@dO
zE?zEkZP^8Ifu#M$_Ga5-(v&Ssp_RR3RcLLG2hJ^bL-w~<OD(d;8<59@g@vWH1Dd@D
za<*7A3_0dx{V7ls_EWX!PzYmutjtCcWL+TORO>mn{XI$4g8fMy<5LZy;WmA6rw;BO
znxY((gcz2cUe<9)t9=j;pCWZITS6FFWj*QeM?>V;c8%&B8QoyjUZ4Pz$dc>xFRm0A
zizi;aiSC${Af?4qrZm2?X{cbwE0L2zTvUjNs)ENU*Jc4dm00HI`+s-GU-B|cZco0^
zy<RG@nMBf?qDM3AWHh^}TvWhAlk4mot8g@k*!<a>4o{ZS5@INFPit(gNEyXoVqf5`
z`qgo-y5a>D@2)SfslZpd5`^>L#o&^l!zfGZ<u}+*&(3%eh=Te&vPRZ|X=3aih5kI9
zNsD{-)Hf7Dk%rG;9#9&k_N%ostx<}@p&h+>y03AmFdlyk2^mFYLDFd%G}%wmOUTB^
zpAIm4O%vafaXh__b5Vjsp5;OU?0JEqrm&kN++a?<T^luD&@_$i>Lb=mc&jy+Ug|Ko
zMLVzY;A5iQSd;~QAlGrbJe&Iv8tQxe%x13ktt`pe2F7@mwCEAEaH$4BB&75y`xwk_
z(%YG5MI+F|{Q5ExQ2NL6tNij8)C}^u-BNU;_eW_j?GdPGfQ$1TRpvo_QfC9_Y+Oog
z@jOO+)OqG%BXMV)u<tADNiK}sS;L#;_atQYECXC6q$7)jrI$0X>%lOsC>BMMkZcZ?
zHV)txcL{L0#!J8#ul(rh(<E&3&xz;<-pD&2ZcE3xfd!Y2%IFY1Z_TvI4vP+4S#tn~
zt;`z1!(peQ<YwjdaAlcKcgf5#JQ!MeUj3wPUB^Z7b2TnNE834+XNRQv(wcRHVgj^T
zym|&3Dpm$Jh<N1PYR!hx2M|#qr>!w&%CDxdKl?k7)RoJ9oNY~7gh??u8~*9?tMIWa
zbKig>k8I3!J_Lq<Z;^K`&=oMNjd3;iZwq4;*$Sb|sW18R-ci?|T;zoz3WZb^1g0oV
zopDzh1YCIe=@|#EnUlQa{?6x?xk+olun>eQa4)U*DV-F7Co4F_LB-Wouelahw%Cwm
z4DLBcw?=FYK1naebj0!yW_DT0(%MC;tKz3zor!m-2_t+J653B@&tb>=``rBt*VJLi
z6=!1`TA!bvq;^2wKi228)*`%!&(s<aj@9d`-9v;77#F|XPa6jxMfFs~L+JGTv|$Qg
zom!CTG^Wzf39o;=b$ROTD6z8;ZSosJWsT86<yyZ^!&QVPZt4dp#aQZNfZ3pQFiaVm
z3h9zG*AfgrO)m^MLy{D)vwe50cQTD8Emy^|XEnVm(ASUH%s^p=&4L<sMzbFik03<C
zJ9c5Q5m|7jRex%VtlTJH+aJ|G=9wp2!he~5+*qE})|0tnYeEni&IE^-?w1$z&Y>Kd
zCxEso_<d|2wvl1XMM)Gp35lesK3s53U9>5Mwu?eb?jgTQ)9>Km&%oO(uGWV5?V|qq
zWsk%kO{uldD~02K(LcOajx4^$8OJX__*A_o_Cd*tSoLG+-7Qv44GQmaA^G$LypE(v
zBc(slLLf3%U|eItGq$ciU^=JYygshK&7tag$872>Y>sk~ddzGbYbzIo_e7w{KLH|y
z<n~b0($n>io-4q}>ETq7k!#<2yB&)Zq5?Z$s&ly(QBEGJ$A7%EuLzt(5pp>Wlt-_&
zPB(?spwd;WU?g99`be?aqa_S~^7JIxA3IT3et|>D5g>u*m8JfE&14Zc2Ge4L7>oZa
zjJY6&$m!O=bPv5hYx*(LeKxmJFJwug9n){P`nc1ul}^$tuNSyB@Bh)qm)BWYrqGy@
zTGdoI8tWbD`=f$goI^X$uJ+9xHTqnhN5Y+u<%u`Z97p0>@@*H3(QDzs#!S!!6#OVo
kD*jGHB<FuC_uUNlJ~%kTF0gT!5O}!lQ6^T#)kt^zzctt&E&u=k

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/bot_commands.png b/Telegram/Resources/icons/menu/bot_commands.png
new file mode 100644
index 0000000000000000000000000000000000000000..198b475be98b943b87579a9457dd3a87f4a2cc4a
GIT binary patch
literal 538
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfti{vCF~maf
zZOF#HCI<o0_ZeT<e{e2VHQYGqP(WbRt>`H3gD%-p(%SzRm^l@*QWMv1+_GWAHfABG
zMc*fRwoPq1{dC<9r>>`aEA!j$&Wz34`u%e(>yk+e@8)ICQak<W^G}=k=MyD1IbQ!7
zwp!IQXx{VPci)v*Z46<X>!*Ht)89II*NbVJJ0Dlr$W7*C5OMS{IMC)l?YZ%MA2kER
zxo6WH1q4_bQaR0L%w)Ra+9bO)^ORtMOGlVTN`+_3t}CxyStJBMg?gm?SR&rL0%-10
zu?=D=lD%%Pzs^z(cyRpj#SD{Och^0(P`McKPO8gFf@eqewp?{jrtHl(x9D{5Zkwb(
z-P`cu|HJj$w(=L|TkKwa_0;D*r=J$>zT0+q;UbOOZ^h>QtjUvTd;k0T>#ueDXD_R?
zkxP91Qa{#Nm%p9aN9TK$?V$-V*JE|WTtY)#UG_K}UD?R|o#XCPodX>LYbTueFo|Qk
zV0w!%qq5T$r=)tuy5h{!vCix2_Mc}DT62iMPWkAqdmbweh#%R<;^wrvX$mM_JYD@<
J);T3K0RYD4(+vOs

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/bot_commands@2x.png b/Telegram/Resources/icons/menu/bot_commands@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ab6754f85ba47b1d4c1fde7f18a6ff076101cea
GIT binary patch
literal 821
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz%<{}#W5s;
z^X-g{Sy_$(ZN;G`vo85<*buO03*VBn&Kyb|tq~Ew`93o0u<F(@$2&CVzHvEt>6}vQ
zf<@2j5)&fIzIGIRd=~djB(dyY{lCrWn~ZnAKHOYi!v=wQCmpQjzWZ8r`st_371v&W
z{r$UoZP@N5EG&$(1iy501aZW5?Ruv!adG|W^S5u$UVSNVyS{skqJ+)z_;rh_e*LZ6
z8FTM#+1<QyyZNi_rFy4%Elt{3VKw*D&p$~U12krzJ(spQK*MCNAA9q`y8YoA(@%%4
zz8ay^ma{Y{@INn`=d)<*xqZ@;y_WK|Gp|rRE1)jGV$P)*kP_=*tGG2rd8W@Jlj6m5
zu4Zk$nIpmF{?~}5X@Q@q%PFqFke&sckyn26{B2qH)KbHFjqjnAn&B;0T`o#LS{JiO
zGC2k;mr_b?)zCUN(;zkAz>Sa{p+<Yw#I08s;tY5gq39s6#!|6qiu9t5*LkJ%LQfqw
zpJ_W?Nyt9*^N$}HTt^=l&S`QoUMwJ3@6c_&^xW+&cOQS$aJm*B7o#C^$3SY?xszOu
zuX2jbU7M`7e#qE&{`~p0&kv%1`uDmmep{BEwbFN9TwGknqfO_IoL^=*)91{#bv5}v
zc>bK^`IFr}OKWfOP4?8^$4%YN9WB|`-_KwEI>SWj(wDgS__O&*8g(4+t~H8iY)U)9
zyG>?A^xA3Chfk+4XPV7cJ2fGkDRQ$QU(kXRvlOSvZrSNI-}L-ZsWX{TX1SZin@<UF
zG)=lHpsDQ=XxOBd68PTui}0>#&lm8VeD&DwX;(nGzrX*FwW3<i3abrV9ha;T@c#2#
zqUxn&|M8hVZMS7v`YgOAcPClMq&+QK6kyNhJjdbi!w+v<1^GZu`4+#^D}JVY@h?Yv
lvzVD{+H1kd=ihmrKWu(G?g&*olv;z5tf#A=%Q~loCIHV#Re}Hj

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/bot_commands@3x.png b/Telegram/Resources/icons/menu/bot_commands@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d0974ca44457fb55886a26eece170046f430004
GIT binary patch
literal 1153
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}{@T;UF(iZa
z?X10exsD>oCw4ozbg&0#=CkN4EL;>8)E%TP$iE=e>jPKF9;TzA9wLtzJAP<QD5y8w
z`04zad&S50K3Ds_<F!fp*;)U8&9ODkPJ6#j?|&tm4f8z4^9|_-j2}pT;HhByx0$Ep
zzvCWfXXnY2CqI7t*w)r|;*ZatKd<k<fBLldmC);NUcdhR^W*FH@B0n%^Yg{U#g{K%
zUS3`v7(RP8Gc)t;+qZ92pZ_N(FCQKrzI%6c3NM4ffymVNGY)GkyDihR()sJppOyDG
z-`>4{-~6T*Q^TXrCd>YZ<}A_8w|*NN6SIbgQ!Q50?)<?<t6a_fM=vKaommYu@<T~%
zeEj;gYv<0H^I?L7g20){t*xzR&z?2-J3}rwI9O24L@<4k)8drm<i`&lH2joQ3~c&w
z?b@{$FEnCXY;A1rJo{;8Y@GZuCMv4Srel`1wKd}zp-Fn24T+aT4H}d`uIRKh?v)PA
zk2Q|F_Nrh_<2Bb!z3WtXF5JFtZDuwtDdCdn4>rF<O^3TH4zt%~ChXd@+&>}3nNcgl
zAXV!IgO`Q_tLWrQOB<I?;(cC`z$?Gth^_oa6;<B!DSb2E&6^rM`PfPZQIj4c(HsU<
zkp)d%o-Z#Q(75S4<JO@UUP*Ozb|2*B<kqcQ7sTVUi|PIWO`U=(b9M!`^Z&UtscXyK
zJ9k=)ru3$kmrw5vEuXP~PonSKxpQsLK7Rao=T6L0c6WDoE^8YbANS_i?nzmdm6kd2
z{{H^T%F0jK7kTX#_34ucyER3i!obilaN&z)*Xg05s<#e2aG1Mo|D#~W>GCE8RjH|}
z`TP!*IWzJq51gKzeerZ*bGyOg3xEIG_D80zxdM#7jw`%UZ3fdV|E(}v>ivAiDF@@}
z8Y!1g^;RA_G~wJ{51Xt-?76#su`*O$m<HtDnGH=(7mS$q-Kk%;BG~MOe?9lV{kfi3
zBV7w#%KYATeA>&GnX7}ZU%&p@U#~QmA^7gHuPU1i)_!1}bG;1|6_p#lPMf!&vN_f0
z&SvRY&w?zTKL-yU+%-F47t^r=Q&%OdvMgQ9C;ww<W9G}do9=`)aLv*_6|#YGN<agb
zmfBKpW^YyLa~}^#**SDp+a-B=NuAS>HQak_#hqCueyl4NBu-hGz^t*5K{Uk2YdYJp
z?_z2(-=i#9_w3tu?Jmn@(GO2=9at@$wr<joz>~f+_o$`+<~Oh2^Oh~3T=-0{N%?li
z!#8iveCM=GOfB}|Q>zE3PoMsC`l~_*^NvKXTW%%So(sft{9Y};;mzB(Pq$9LuWcOm
z{{yqw9u>1=y^=YhnW`6C{QJE6b!Yv~|1oh!+w(2(oCnQ_3!IHVNH<-)`B^^C)DD#W
NJzf1=);T3K0RX#q1#kcW

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/calls_receive.png b/Telegram/Resources/icons/menu/calls_receive.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfe1f6699ca38b31c7a57865a6c0e13a2a0b339c
GIT binary patch
literal 773
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhph9#WBP}
z@NV$^?3alW^L^{K>^L}gg7mg0T`fYVRKqpiO^=G!Hr@G&y}&uDvrPGtN|4j)rRSz-
zZ=I>KRxO)bcgd3z>p#!=Z2SD_hqGnnul9tW|6F4?|9S1a=e76t?*0EwARwKcon2g9
zylCefr-fT?zb&w+sju(9klXCGxYup*(WFMl-yMZ@b?*u+=FOjf`l-=Gk3GA08%y<a
z+%@Ry?{8dr{k8cc`@0c3&%XZ_EU2uETp2PUdiB-5zCHu-O(j-y6AU~Q)<{K#n#lDp
zv|h4j?_SYPmlPw(?g9%Lwq{1N6ipGXmnFB-HtSCJJ`%6G>iTP^g#wIg!?^WQHs93P
zq|EJ5uiA8bLXO$&#=UXM{l^clW%aC+_E9Ugn(MVR=#0IsZR?@{rHTb{>$e+DKPz(L
ze2P)rdhz1fXP@1?DcK~|%Xa0*-}5_n?sODL6S)4@LxqX|dC|_c!-_e=GA*Z4j2ayp
z?p(hfp7L1Y!ime5C*OX{b|%5VM@@LDSL@;5ULLEjHp$Jl3Y+D&_-9waRtt&WPoK7)
ze{MbZT!zW4^UoI^d;K~)qU49(22-KVCr_TRh)G>zI`;MB$BnP~ggU>xy>4k^!!j>w
zZC!P>wpjPg9I<C}Pd|P1v0`h~-1E;r$Y0$2D7{6suA-u%rshe}&I1hJU%k>2;8=4$
zdS%GB-?f`>_RME;T{tJj=;qrpU9r=@<~y+%2z9z>h(z^2xV>Qe?YGSb7ldfNEZOz<
z?^W{yEOztxcO4ebcaPK&`@%Z=@4tV1ud|G19!WC1vN}K`;riOJ*V|IUS*9%TTpILY
zjX_$4qr{%$k8dvhDY7_dr9r9H+<%&%=L^*_L@0{&hCBMd2PHvIS3j3^P6<r_+1F8&

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/calls_receive@2x.png b/Telegram/Resources/icons/menu/calls_receive@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..83e8e622da86d4e3855c3dec95570cb86fdc7be6
GIT binary patch
literal 1466
zcmV;r1x5OaP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHBuPX;R9Fe^SXn4_UlhOQ%t_|q
z$&}1<p$uhsAVd^JDaxDqg))_rkQ60El8~uLNXd{4$%7XU=6U`iL#FTdef!^Tch0%T
zy|`cf>z;?xI&1u$z1LcMog<MbFXaj-S3t2Vpd#Yl+S=O1#l^<PMn&b1+R4eu#>U3}
z{=SHbqD1=o`U3+4A41pS;-ZI#$2S9edwXkZYs=xJzrSAy%zwPs*Vl-M2szv_s%mO#
z-QC@AG&D5CutiBLE32267ua-kbYR!0uDQ8+W@hHa#RWuHS6A3dDw2_)XyBotp+QC~
zNmNu63~*UmTJmkYyu6;Co**qPE#*sVYHE&;kKNqd_#zg~@bIvPh6Z0pn3I&0^cT;E
zrlzK#Mqgha6xP<(_);W3M8(C$9Fgp3R5_OHBT}1vr1bp!JZM)}S5;N6IpL71r20V9
z+1Z(znhMUy$Ov8-DM6(ig6k3D!^1<O#3m4HMk*g`j;vz&f;5X}baYf44Lpbel9sl#
z71`R_3WA_a4w}ToM3J>2Rsw*Km5+~)5Th$n*DN6;pf8|76aheQZ*S}C>yY{S`m#7E
zeR+8a9XuKv8&f8S_!=5G5dZ}4%E}7v0RaJ=^dwQ8oSYC3^!fQY;c)IqZJNc%8(DUW
z<AM7aA0JODKPV`OE0aj->+2y!H!?CZ;z-ZV&LF}96LZv*9Q}sli+$A9)kPY?X-i8B
z%Li>{W_Evn4-xt}M}$WL=!emeFk@q5@QWjY^NNj)jo{-rb98j%13Ef7f)p9{{QUfj
zckS-(hJ}Uktz_aPCnu8^jg5_^21u#v>ud1a+S(|SCEDBDiIuc_MMVXx&!^S-EW*KQ
zjGQ$!HO<J#Kw=Um!eBQ+W7h-?v$C=#Cnqf|ECi)DH#e9g1Vu72D=RC3;Qjp_<wgy9
zdwU5pJUpB-{}EweU~qbRitx+J%e4N{dvLaZiF84N|05_g3<e;?#)XZe%+SzKq%D}3
zX!(^-)f7UY#jUQcA~xm<_V6z%D*6NS<6~)QNl#BtA+e=74Gat<v0GbPS)Hn?D#Axw
z$B@a26i(wDAhGlF^VwjeWkZDX*w4?86;T>f9tKF9(^^_ul=)pkM@I+CfWSx{wk^SL
zK|uk@Cv<keC1)IohmVu4uCBYgJMuE<rCVED7+%ZE%kAy$zl#a2<>24|uF-)!Jv~`>
zn89yvZ%I_tBPK~_XXnAeLBbKdqm`hyp^8~Qa?^NY^13K^cXxNz-p<Z$c6OE@8;3_-
zU0rZ+a7ai<PEJl!Q`5}M3|%vP;(fOuVq#**24S5r5wMuhsIs%Ofq=k5)UvWNLqkJW
zhtR0j+S*#8R#;fbSCEer7Z*of5zAguQo=FDQInRImXeYpGP@BIBoi?0?d`E?$MGiX
zBdP}HHhD#yB!bKEsW1BV=iuP*sq*IvCMG6xb8`d}zGaag>grO@X+d{rUBo;xGEz`M
zZYCN`b8|B`j`-c&+>DNnmfZ_l2{BAhPnX^5b4?!~AG%ZsFg-nu1R^7fxUs*#KLLcj
z6W9ET6l47M_BIKCJ8H0}rw1h|?PDA<CMG7J`S9@Y-O87S7binrUf#~m4uu5*6WRFq
zIHtsegarH(!j~?>V^PU`3<a1-bNDlSOb19(lpbwJEItm6MWSQY&x9B8f=>gCl-1SM
zQ&Ur93}?}xljY{-3U(l|e~cpW<Q3s4#IFlnIKR*)78Vw;gz`F3>MK{^|G5Ic0mcW?
UyZmchJpcdz07*qoM6N<$f<fb&pa1{>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/calls_receive@3x.png b/Telegram/Resources/icons/menu/calls_receive@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a74e596a73236e9a2be87b9a23377405465dd588
GIT binary patch
literal 2124
zcmV-S2($NzP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?wn;=mRA>e5npbEQO%%tC#@<_0
zEQkf`gBp#!pkkt+v4I5@u{@}#FQOt6!SbNkzy>xf7^7Igf}+^4H|(Nf)Yv~`u=nzP
zKbVihvSoJn-p%z2d!Npo`Olp5pK@l-nJrKt{DmVBjzBm9;Ru8y5RO3HjX;7gixLtN
zDpaUYq(~8I_3`7!4<A0r-@i;KUcC6!sZ%dszWn|B_kS(F_wV2D-Me?_(4mD275bZq
z)vsUw?%lf<IyMEjZ{Kd-ym`KIYuK>i#EBCzDOxQhOP0KK>y`}(hoY}vzow<7MXS}J
zefRF&KY#v=<~MKNRIFIh0rh`zqP}{<gb9rsH&&Q0U%u?#z5CIlM?Zf2kXBWzR&Ca-
zSxQO@+mFJcMT_p*wX0RDRt$$=0uf-fXU`rs1-+FkSFUc|x_Nndk@tM{>Qyy23{{&p
zZJauy>e{tyGK=TVopVA;xf%%hs~2Rhl!_B4PDHhz6B84E{raW)+P{ClUN_$I!Gj0F
ztxK0K8hoEVeOOM9A3yf8CrzwQpFUl>bZJfJ?p2j5R~ADTELh;$pljEzf?u_2l?H$1
z$`yso%*@olsEU|XK~2BEfB%+R>=4;WIDY*2t5>g7ZR^&ponVxgEn8OAieL*i?kfOi
z&YZzBc|10C#5jCKpO@KZAWoe+rJ6+Vk)vUS4LV}qzI}WB`n58&MvWRmQX}N#<fz(G
zrAn1AUtWXMS4GK+&UM77e){yOvcMxT{DD|pt5z+MeF@RCLR~%*t68(AFFpz!2rGAD
zPo6wc`tXot%9L?6RPZ1pn6aQ(xf8p2^QMq#*|Md`PC_(GF+f)C#4cXEC>*>H!`%}B
zs3ujaRFSr>La?k*=d#DRD2bum0A20lu2{HmVFi<huB`%R<xULau3x{dENkDsz3T<9
zXV0F3A&POO1Ry_HdC^;7(V|6iQF2|42M-<;aDxU7oD|5d^8ESpDiTqx0=Ne{skD}J
zofTVW&z@}sND1+aAms`owMIdR{rve;n#7b9)^Nus@=@y9az^`1G6@2)a^S#$rds1)
zAtv}(vr^V<-n>~XAUHRgC~}7m9R$N6QLv!SEt!b1lX0j2IQ*VJf4*hQ7Tl8P3QXwR
zx33tzbm>ytehF^{lb)V#i;==($BqfuqcCE`2x%Uez-oN<?3uEF0I@`g5~i-1AEF5b
zz#o`ut$%y>?oBA*k&=SpZ>{}kN?dXtswG=|&6+i{X3gR+`G&!R2d`hh-q<O+RW^dc
z7cX8It88U<W2a7?h71`}sZu3dfU%G$o*6!H;DE6(Fu8j5>f*uf+__^-Io!K<Pi6p%
z15+G>j<#>#E~bwhIntz&gsIfNefzd{?b;?l{Qe~mC%K)64<8y6-OA{V8#f9!+_!aB
z<Coi}O`F8@$&)9W3?+SV|NeaetX;cSu2&{x-2JUnrw(V1GM$vYHIyWCDga<kXG7c(
z!ys&xIl;MEO`J4ok^m6q%$Z}w#A69r8ZtIwI<DVpWkyDZ01#%*oN2|xV@a=Gy~J+L
zYu2aL%K7u>3kG4sh7I|0C$cJzvV_Z<*iBluSg~T(4wo-qE*J#ToxWmfYlpEY;r@}G
zoh^2oE+WbTT;h@?O9X>JMx;fH78?7Kl9I-Z8MAZe&I=bVT)K3L1USpMfB*i3c3kT;
z4TG%WJ%NWMv3uIIX|}zO9zB}GtHAJ?xD)HLY|^C3x^?S#UK6BAppzRnZm<gU&mFcl
z_%0kZYLrp^*s)`6yCA3V^5sh-lB_|ycI_0nUcGu-w{G=yC*~PR6Q0}J;Ja|yvSng1
z_Y$Z0k`s@mB}fFoEMS}p&xpoyWM-9p%hRFpNHk$^T10@p&Gp`ZfQ6kPS}|q#@Zq-2
z*(5V&%+M@0Iw1h%iCLauNq9AC)QG|2{K(46A{#4;5OQ;Ktv3W))e#n=o@YT($)cJv
zWr|Z@ETNMpPYPHBT+y&$!}QlnYWwx;XFNsOa!!hZDJK{^di1DRiLiL_Vkax{mgC2d
z=ea}SxnA<pE!jv{gV>XVe5x%EUHE6$CQ$)!bUSwJFmmG^uv)chnofD$_44dy?Ex<(
ziZrXk+AzWr_S=dTD?}v%>6vcbx<%NXb2F}Wl8GSK;tUM5hHrQz)`lD256|i4rN);P
zM~)m(BPfY#U(F)~ckbMooSAXz$OR1;Fd)M2?3zhXOY~${pKoPcjt(C_Y~+S~=+Ghk
zqq}!=jF;?u_a7#+*m8J3@*gI8`}XZiPEIy~{r=syZJX+r)5V&k@Y`D?cpRfK3nV1*
zndE=0mqw2|`0`10C9mWj8wLzZO-<#iKw%{UUnOwjahY^F^la@IH*TEtuzK}sTTDy~
zNqx)5Sz?(IU`VED(4axCFV`JAcKr0|lQeJJwrxx~I4R@W0X?44G}n0^D9HQHojaH4
zp+}D%r2Y7Shgi00)21s|t~54er#UJ5W94L2=gpgEIu&Fdya>cTvG#}FM+?u%CxI|D
zeii726;B^z-MuUNlSp<KIj@Ba7veBEcAe-EtxTUj-POhW`-(eeyxEHIB-~<J)DNET
z-n~0}_AHOU1a&d9BvcfRKsW;72!taLj=-N7f&TzPvJ-qiOfdog0000<MNUMnLSTZ_
CAN0Tg

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/chat_discuss.png b/Telegram/Resources/icons/menu/chat_discuss.png
new file mode 100644
index 0000000000000000000000000000000000000000..014033429909a91b01164a493f50a4556c3e831c
GIT binary patch
literal 751
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhp3{#WBP}
z@M*~T?!rV7IW||X6D@*~H#A(AP2e>(TcV?pdiX|!wzltCr_4>k!8vL9N3T3_Kb0hw
zW_D$UTIZ~d6KfJbDgP9_KlA;$J>Pe|`@{VCF6;BkdEafn?>le#+}7&XR{pokC!b6)
zntnQUV}zf-|IM6l2?iCFl_#Hnp6Zpl{kH78MIJ|<e_p?S{olI(uU}{HjH#=xj@A)V
zS663iKA5(-boX5kl^`84{^GZWQoYaq{@ok3c9zdF+lTTGK30T>ho63GB-Smv%3^VV
zM%CUpt*J={5*F10lD)@1R><_a@lVNL6rgeE?%j(SBG3QEefr9OZ|(K$wPD_m>=)k5
zVbed5%+=eqYwzB(Pm4Sb#?SLnTN<?T_S<77d*k${pT1}%a^-dD2Wf?h{~tam2z9DW
z<_xlDUXg7f<0caFi~nkIWo75ug_mEhzWVCT8=mGJE1eb=Sja4LDcdc3bjrc9-G6`l
z5a3{W;&P!VX`{qj#?$@%{emqCn{Nszb{}mj|NgtSXNmILmoH!b`6F}i_;L3Y+#h%D
z-07&r61KY3Z1&bD-JT<7!&YBCfBt+y+7DLVDlesp0_EFo=RUf*Fnqzwrh^KFXTy0!
z*Ivz%;cIugy<AUE??G|h8&SRKw{y&dJCFR+GvZ=lGEkN4Z`TnhTzrwE)ybtz!dW|g
z^UaqfufA4w+8n9)$#~#MQ}6}H3(9u$`IlvyNF`o7@a1ra=G0R@YKt$ww3^GODVS%*
z@v`LB!-6~a?_1CH+tK{!<BuA<@RcC}X>aVbrh2Wox5TA7o`sifJOAX9Ez<1E#5YX{
c`#=AK{-bT2r(@?cZUZGYPgg&ebxsLQ0ErPs^#A|>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/chat_discuss@2x.png b/Telegram/Resources/icons/menu/chat_discuss@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b266a33d93b60ab8c92e2efbfd5223be713e137
GIT binary patch
literal 1370
zcmV-g1*Q6lP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG#7RU!R9Fe^SXn4-T^v7#%tMlS
zdLcsQBEt&_A?3{zDIsO16nPMege2lYgh!vLWJ-}lNfCw2Lp+dq=6=8Kx_8}e?|t?@
z>)i9z_i*;ZK5PHyVg3K>zm7toeY6qKM&Q4VfR5VY4Gj&WqM|%KJ?-u7?d<HVtgNoC
zt}ZVxFD@=NH#e7-mfqjr)fUdcXkucLlan((KK}Ul_(S<~dwV-HG?bB%VPIguAf1WS
z)YP=BtPC;Wn(_4Xw7<WPcuY)8EH5t~9v(hFKXVC=kB{^6@(@lYUGl`Sv9ZVn)wHm%
zP*G746cnVR!%w=du5MUZSao&v%E}6*KR7r5P+pBH6nc7kH8nM#pP!Ka_4PG8JRBSx
ztO_G&u*s&TrifW@Z*L_fB|-;O6!nV?)?h0TiAP6A5fKq={6DGV<Kt<fySuy9kno2E
z{KT4(krC9<9|Ysd!NFl}ZjOkmtE*$={!Lz0RYgP~NC?$$u$sTv*VLx$>}+N!US3|v
zIt+poP1T5ng~jUXDrDZ@-#a=wve`5<GXu_>n;Y~!Hcm-u4-b!*mlsGL92}G+{Eoyn
z1P`A4{QU124Sb<yiE!1cRWUFy03LL_zu!7S4~&hCudlBmzqz?th!uf=0XYUkZEdXx
zS`#2ryk}=;=%PG%{5}hGQc}{`*ccXmetsJp8$5=<z`)$xTo}!REBoBq+G=QMKwsq&
zL`O%@&dvf78XAg*&P9o=3knJl9t24Qr%=$&3mO$4^lP3d_(OQp($aV+ecm@dot>TW
zK0Q4Zq5$dW=&-i7W{MC>ohJ$hFlH6VadC0sp_mQ&=jX$dqQ)m2hCxnFPCQ=zo&p-?
z<85SQ#3R-0C*~@uiz`{gp!4%{PzY`3vi<#9*~Sn_8LAQb(AsfgyuQ8)bz=yW?oZ&t
zpdw_X5RANJ7oMD)P@vL9KtKQ~f#l?5AyIjGIXUAbN(?T!ySoc{DI_y9ld!wFxly3h
zVsCE`3_U$PLZZ>pQ3+EhDlsup$V(y9)6<~D;7cKNA<`IuYiw*REiJ{oj7tTt{%ve*
zQd3i<%O3vV766r04R-;VxRxO4g@uK!t*u;?(zUCrE1A{%`uda-sf!@t!5jhK7-V3s
zgNxXk81EU_<Vew)Nm_9p$kBeso12>>Szv}MK0ZF*k!pU0hli8f-1_>uzP?C-%gDvN
zLilmpVjl1Wvi<%2$<%?j`W|LwWswMngoFrGFaXli(;prlAPR+|-qq!ovf|=mk~Qg0
zC}A3o&;I^?;?>>VT|z>F1hG77etsUZaGuJO3Mf$CU0q%1+Qgc*wKWXX0xCX0YG;8z
zGBOezlarHNK9nnlNnc;z#l=P3=h1aAOCTdSy>TYs5X1l!7Z*pHH9AOpdwXSNrRYJ#
zl`OMvX=#CT&}3<8Nl4KTi;9X+cf@JgH)^7(sYx^U7Be$5{G|ewot>SwwzkN9Z*MO)
z0Wkvq{UB^O8bxiwKORUH8aggwGES?G#^sXg=4pi~-rn9s6uifj9TO9il9Gb_B28#u
zs%v4Oq_-z(4gPGXudm0}VUWU3s&rGgwY8xcetdlF?Ck9B?&7_@y$$2oRcJZ15zt29
c{}q9M0UaQg)&P#xq5uE@07*qoM6N<$f=eZ7ng9R*

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/chat_discuss@3x.png b/Telegram/Resources/icons/menu/chat_discuss@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a54806d8542e833adf08207ceadb22383a04be5
GIT binary patch
literal 2002
zcmV;@2QB!CP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?JV``BRA>e5T3bk!OBB{F+Eu%t
zM++?URF*-OA^9YP)<Y4Mh!ANPuosIcF-giOyNQ&cMQP+ik#<2OC``!e!HOugGQ~@l
zrKdVtUNg(6bH3xSm(%b5XaASkC5Qii*=x_N`PQ1-nzh!9i;MMHBVdhyH3HTMSR-JK
zz_1$uSEp(;Wy+L42R<(^uL%<-j2}P#>({Tny}eysU9Vofdhz1Ln>TNM{P^Ki9i)M~
zySqn5MjktMth&1TA4lKEj~_2xy0mfQMqgiFX&OieTDfxN_3PI$A&$CZzy8USC%bp=
z_VDnKu9!hUS6A27t5=tom)qA@XK8zT`@VhqCQX`TP#aq_vwIA)bnxK81q&9~00(~?
z8yibXO0XdRwta1FZP;ml417L5K7M|FOP4MU3kw@HYSdt}0ScQiD=X{Bkt2P5eTpil
z|HWQ9b?TI2K41xM-n^NRkN}gRQ3I?!O!%2IXF5AO6=+peRe^zl8gb;XLGOx+3SN)z
z-@jkIde!dKX%y+{>A7dmo(~^B@UWjgeTt2Z)rer0ZOxiBSSq~uD_5?}ojcbo?m&C2
z)ug1P?(S|L|J=EAqeqXHg0Bj)V#SJY-@cJljA&e3oGQ1`idnN}DOSYAix**~jN&<J
zhmFo#^QTXrI&TkP4`*j*(+Gmd%*=G8prQJC^XB0^B}q4K+!!-vj3Fc)jc|6uAd%4I
z<YXO<wXni=!Tlit_wL;rH*TDkhUR&;Z{JRGL12fQ#~egBe*8G0!wOHHJbAFr`4o;y
zlHT0h44+eu%=z=@lfl4hoHlKm99%sp1qB7vHyqr0nyT~Oy?d8Hw`|#>&gjG%Z*T98
zjt-^<LWJ3~XPXrk9UV=*die0+h!G>qA{uSKb?a8r1g6U<jICW+Ss8<aZxIp_Vk`a)
zzavMEq{9uS5@(%pC4z#2XpoAFi;V+GY8ev~L;7T7WEe+HO-&^rXLuNTHNzPLUx%sm
z^5sjt%?J4(Jb1uR5Izi(5HLSKpT>I5oH>KKYNy7I9gBU%PznnR#SP&EBi6)ln*87f
zz+4Grty;B;I%d#BFIu#SAhvDWCJ=@yIQYbDl0XnGkcEXq_y|VTI7PM_&LK5>{`@)7
zb_s-ucFPSEilGqEU{)EdAXZYw<h&lpnbF_ZuU`{wmp~o{<pvi$hX~ImEiH{JutP!_
zq!mzsQ`=7UK#{0pytTkMsX?%EC}eQOi*fDMk}|x83P#aVbaQhf?qQYI?C<YqiV4DM
zQOA0EdZ=T=Dxpae#cN2aGD6fbBsPe9`t<2U|8`>P)TvAdUPFaeqK+ZAPTa$%WAMVs
zL<yV^k@2Xlt)-43BqLft&>|7=@Ks;Fe4!1)mkVfQS>QP^24rIeoT4gZbJ=Mq7#r3;
zG&J<>+qZOdY9tW99zJ|nq`{E7y?gf(`10k;htz8;fCo(|3l}aFG%6}8B2K*oe_#qk
zu&SDx8ixP*^JhUeNwmiR#Jh-5QBeY^O-)ULT0s>KKsuKMY^(~IX7V=f+_{65tky)d
z$Iu2LGZq+2a>U2Sr>Cc@Sy*JJVWY6Eb)_|dcKY;bg!*dwDato*-b^KVd3i(|A&wqB
zN=r*x7R87nF7RDpX_zwa-n|=oN23oFS5<UTfT(Q7j2Zgc%j3q{qal{#z9D8I#B0~C
z=~`^E`n7J|I@00MqepUbN|<z<X@q;|&>>msYQ#b61vZ8$0IwBCi^hhI*_JI^M$t3`
zAf@iOjU)~%{+5;&8rHLC&q@Ne!6YUo5;`_<L_~zG#)-c;;_B+^Nba*|&u~8|Umh-0
zNd_*K<qP;35l0pxcan&wA<oLKW3wS4!6e<kfB$DSB>%%|M_!0})!N!BA+4>ZBcd{r
zbmGJbH8zvwSZwFdpC>^ekOf)1c(F-XQFELgBu|_q6QQWrA<#m?L-Bmz@#Dw-{{HHX
zWYi$b%{m4rNN<E9mLCuh!2C5DI7T4B#%CzRAO>r(4(XOmkjD=X5686=%*=)j8^o?7
z9thz5%gK``8yXrE{lQ<nc3Hc2twCLNHA_iJA@S?iuOHeLk8LhoxIjFNfU&_9$*o(r
zE?>T!laqt{yW6*KBS3_k#$PV;tzaj1?b?NI4;3N51TG9>O(q@}aEd?({^b7s`*|bA
zE2^D_YrAvj&R=%B{ogQQRgivorNBlG*)KeX%FWH?-$)Rfb^;TKXMlJNh$j%T=0xk0
z5S&_g<iVsKIB)<n791Rml8F;1DpbMc_l_MqN=r-O(JfiB1aUXK2beoN%EXmCb}1$n
zksD51<Q*z2EAfzwQq~G6r~l<|Cj|2VGmS(yWm=rBmU#i2Hf<902UYO>5!%Q-0L-iH
z7-8njnTX*PeS81@J&Zmcbn%xmj<J3fht@p?e-z0aoXdX=eD(G9uwcJRNlT730@esv
kBVdhyH3HTM{7**UUy^lRvf3}EZU6uP07*qoM6N<$f=ynGtpET3

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/devices.png b/Telegram/Resources/icons/menu/devices.png
new file mode 100644
index 0000000000000000000000000000000000000000..19214024945b905265396ef4b3fb89e47b2b1700
GIT binary patch
literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfU{qb~h46zVQ
zPLN<N;bwG8na#q&vdnjOT6Xs7Lx-Al`li<Y`SEeV0)-tSU2VH|S=rj|ZE9+gx34=8
z`XI@s>I=tok;Cuq?$*}QD)4$d)uB*OSore(`u`tRJb(K1>({SOA3bVX@$>KR@890u
zj^A6w`eczr%W;m5D_>q-e*5-q{Qf%Lho3%vOif9Nh>Dt&Ghx%FB6s)WS5^iqvhCcx
zTR(CW%b~QUfGLv~vkCG!uWA*%vZ|e5{@>r<;xnWg8BQEv$<57mSjsJ~SM%@BPg4no
zS5{SDG>&j&EDH?`6ciFVG<j40{e6G`{jE-z_3g_S7r&dk%idOfe<zzbzkk(&G!6!a
XMYjuMW+w9sgTlkp)z4*}Q$iB}RSB9}

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/devices@2x.png b/Telegram/Resources/icons/menu/devices@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ac88a975201af9e504efd5b34e19a70e8a99683
GIT binary patch
literal 595
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuFw%60eF(iWX
z?R4AKO$8#ywDVX5O}1Q<@whO-SvTmSkjv)XEy=U1-(H*(UEP%II63~%FD72zKtT@G
zvhznzFI<r9DZzVOk?;8DPhY$r|2&>lW5}p>fMv#ka^Vj4)7m0jf9v8!j^>z2$Nc;i
zd%TdX`C!t<ioH+wZ@QQv!`Gh8ay`dv@s$ZJMl*YIZ~v^3+czO|*6+Xbqy)|QnM-5i
z*I$1qb^GnMez!?W3g*5KRbTNfXeG<`zT=BiBSU;eDuV)yX13H$KdsuemeJVLk<oVI
zy<eRrRoicehMG=4ZF`5w|9g#{e6QQO*GY~oO<7x|_RRZe@l&a}qiXLwucd8=AF8vI
zTFC}5|4(U4e6a8Kf~d7zO$;LTDjIYB4*xovwpioTTE3p+j}19Koi_Mc%5Tbj=zbf=
z3;{;A%RU@|0*t~+2NGs+Dsm|$II&3h-2b`oWr^15P45$gI_)bStUdSKILw|mY_({_
zoV$7KQ<q=nw0n5RNw(_LQ=@6NGkCbR-G2MK-M}LB*JbUgToDJCGn@ME4lPc9-gPu-
z^;M^Sc02nuC)u4&KNS);nSC~Hy?9Qd`sB{%l{XGC3MVl6G;kU;PGG5H?DVoy+1=mn
P2Z~TnS3j3^P6<r_V*um!

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/devices@3x.png b/Telegram/Resources/icons/menu/devices@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5b443200eeed47816e4da2f7a65f9866c662cd0
GIT binary patch
literal 840
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz_iKJ#W5s<
z_3cdC6P1Ay2QGTsP11-|(Ug|Vopdm3o1)~2w2&n}YMzmjXEsf`nG)cYCcm^sH0a5H
z`=#@~m#v@O{dm`2+hxz^eXjX8ulU_nOC!mD6BvXXm^>Ib6&O_-Siqb~Y6|sc*0axw
z@wMB^^<T`Wx%RF0@5PKM=bwN7{rC5}I@=RZKZR(y&iVKI)%pmXf6tES|NY><G5yrj
zBCEM+{aycZ3?y2Pi0l$!ZgkjwTh({B<=z;*?xRi~3|&?!3nwg<=s*7av!&_w=7S7k
z2@3-*WSCruslPb!W=`9xTW`OK8w<)sDY{(E+S(Mg{4!(Ysip;oLbOD$6j;bOOxvWe
z!a!5}!1UYmb>DQpmynm<^*C$mt%n5~BK@7~!&aBuTgI&yzt^=fq9;%FL2pgv>#x6l
z*0e?Nw|=a6^ZDn2!<U;ZTDL~6ZJ$~odgAn%mnB8sRd)*4omF@9C|Vfsg7tjV+G&59
zpGtY9_V2u#=dmtmrH`6$#S`I8H`g3ZQrxUJy?eFt)I(FeR8`!srL4c+>~7a+@+wT?
zvoZInpvbNX0=kUci(P|s>~9!u^tjyBEK3Tfep_-mU-1b=Prd1vUw>toUa1$o`s%8y
zT0VQ#a?ED?s9nx6JNT!>s!^uX<xicx%_q($MX$|{Zh0C!ZKCkA<>!)is?T6@zxLYH
zm~;1Cy$cgohiOfnvF_dJC6=3S_GJ6irdY^qGRiQK(s#L;xBbj(>klX6x~{)AmEcjE
z?D;HcPv+~AU5`I{BsG6L%@o=7WYxUXc^)d$PN$kkna=cCvvPO;6S+P2-%su}p6j=h
z%Sr$G&S~?d6=%2aT>X>jZJD*>?(Xw)$0uSWB##HeEdQ7#HeTqh{&{c}C>49U`njxg
HN@xNA54B}A

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/dock_bounce.png b/Telegram/Resources/icons/menu/dock_bounce.png
new file mode 100644
index 0000000000000000000000000000000000000000..b538f11e001f7434ceeb4c937804614d6602815b
GIT binary patch
literal 497
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEZWn>F~maf
zZScmfW(NV^N0SsXPK7kB&B(HMc*7#iyz-0rAGZC6y#n~wsMaqGD>KVnEYQ-j`}kYe
z6x(9CnBob!b8dcr_V$d$=7>G#{ADBj1XVnRSQ;H~Z(I9%*3LO4-+$N6d;VUSU4Y~9
zgM1^cu17U?zxUPejG58!woIDkVBYr2CcTXj;-ZS8vDYIXJY;5K+;aTr_41=Xw&*{O
zsgi0v_BOfoSHpd&dNr31n;u)VB?>rQGFiJSD@|`&>dkGnyYKof51ypLqLnCdtgvQp
z-1XOAeMB#4M2fh!99BKSsx|L<Ag60!TGrlLIj^=8T%wB8?IbpHOMkv}-+--Eqt}U}
zox^dW$NKbS=2M%FT(On(@Oe`ZSTQeuR+{A-!Q+J!ZseE+imY69Yc)Ub3Yq@n>t27j
z^tZ14)Wd>;*y#%%KDfA_En?bJozoi_&riQ*;yWQwps0~cRC3?<P5)il?HJ70Z<GG}
SnSBZ<xIJC{T-G@yGywqoJH0ai

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/dock_bounce@2x.png b/Telegram/Resources/icons/menu/dock_bounce@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..232aaa82c17a5ab5816c64c8cc618d40a9a89179
GIT binary patch
literal 808
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz%<Fz#W5s;
z^KH2OdP_$US2<fpC*{E3!4o?2744dY)_P0{aq8^rZ<yt;pr~}kONhm^^Skx$-TIRw
zzrB6)uG(z<3|+I$#^2{ve>-z#t~FnK%@U>{#+3~r4oe$?zpDQFP+_w&L`#BaSB&1o
zwU0km$ndovO)A`dx8>L}-Z_5h8zc6_t)H(ZzvF=5yJgO=EEw`kq-LfpGHT!L=-1Zq
zSbX<gJ&Aa|>3+*M-^_XUefK&33lna??K_(EwCLvRuZxz4Xnn1+T{!&)!|S%RS2cF-
zN`f1kZ!zf=w8StlPN}+ZDco$f>ets_cd0VCFTSY2;=n0*WHxJcSAapVlZ9{d*DBw?
zJYJW3td6$a;4|NpXQFKA&bBl&ZOVkc&(>{6xb`Zq;#;P&METtRh4#xYu%EY(>J188
z>NltR&kOx+g-*sMDgWP=ownQ0A<EU7w)y4v-!~bg*!<=19ZjgVoBw&*^2;lu*7C72
zmuR&dSa$#YXEC$wiY$T*>a7A>4pwiC3e^&wV{Nv<bNOYRuJg~cw?>^z5i${RiZC|`
zPB5P9H}h_^wEt@1h3b<zGa7oj*CthOx%kIlOe*EbZMmr$3m5FW*dknJ1a$9XCAF4a
zGyVkTzGQgGbM$ecRBC|LF}@`%T46u#9I(C-u;8PN-Gu2HHeuH1o3|FGueh3}k!X1E
z^wUd4oZJ)Muanm?IiX?t^<%{muKK&*E~J^wPJA>`vHftO-t=Uhvu4L07uwA~9<o5?
zREm*}@rKOpw>w>!UK$E;Xq@oqG09$^AM#8@dQRO_DV77*HLfsAb$l&-eZj`cV9)Kh
z6OMfQZF{jPZASiS@uLA6EzZg^e8N)IpWWMENqs5VVJBOC=6^eH^`bu$mXu8A@?eD|
coK)6-j7s<a*9)e)uLq@4Pgg&ebxsLQ09AHN#Q*>R

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/dock_bounce@3x.png b/Telegram/Resources/icons/menu/dock_bounce@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bc6d3dd3c0a1845a3fccee06c08bad87fe0c12b
GIT binary patch
literal 1152
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}{>szEF(iZa
zZKSn-lB3A9Qd1GPo>o@Qj{YERoh^-CR(}|$%n&d&3^V)3AZ^WUI{Su{R<<&)2n%;^
z!zGD>hmIUtVR+GD<L`~he1~JERhPeui7{_)np0W(yym{mI~z8(AIG^iFs)(GK7gS9
zw=>x(o4C2VKmJ%@A;ZVQbgSX~`SV|^_6BI|*|R63St8rQ+IsfcH0j=B{?7Iei~<{u
zIbC7!S{js}pWh}?dVoRffs~?T2GeobjTI9L4*M4OC9Vk365W5_pG&c_urP4-Rfh>i
zbEWO(=NA<f6&4oO)y<3AyMMoOWo@mm<vi&bY*(DuuV4SN<kl2#2gV5p9-a`{WXpHW
zp>nIi39lb)3WCkbJ2v;9^yr;BRkSEZZ+dTnmO_K7_{o$Y&C*GKo-LUaq%Oi0=(jRN
z>GlG}!;e0%Xk6p$^N;KC<W&!^ZtLXH-n}{3L$stLFj+#vpy<++w{q8X4TF7p9vc`w
zo>awi!uHw51IHfjJl^B|%246^jN?qw?f><Z-ION!sBPY`!NAT=@A=_>AAc`T`DWkw
z;Y08rJ3G6$xHzQ)w{J&lWeG<|N8i4ETUt_bq0vnaw&tQwn{!$Od)?OFn?8NIxw-lF
z?c4kN`dnVJ8*Z?&vDsqw!^!f6kfUQkw%}n7mw3VU<;$1Po-Lg!T~%N2FKTzuK_Wan
zyog~(@Qiu$<fNsAXDSqxm3=c*D=#m98B$(QU|?dRvVF@fYisKe`E6U9e$Uxo)Yu?s
z*2-eVv0&?+<gEe=7p&j5ZQHD~%YL8u)!6`)Y7+NjohxP-#cas5Uq;)JEm655k=sgE
zJ|i`*vnu{+Jm<dV8EoulVtd23`QADFO5pHoM%QKKmz~c3PkHcZN>@txl+5fG0=swb
zR=%@zsp=+PsU1RUCO?zfjdFQqlYZ9ByCxCiSY4RtC4RS{rCl{z>Kd2q5t+W6J@Iqr
z%@exz@83ShyapzP#={d2KQ~hSaqWt|z5VexZZ<nsVPWAb(k*$WyX?FkOcOrr7CCoK
z?(Sy_IzHh%Ij^)sivMXe=6^YSxcNr?lcJq2N*6ypDtK;aVWDyS%Kvl~RR*qQug@*M
zntVh1kzmKSud&~|0!p&7w8XkYSBE;WY=8VX`KMuLSB%t))mN`xojh6i(9GGh52qYf
z3y>7#$Vp3U%j^Ca)NGeOKYqh*cjnvi8zW@o<kZp)etiz%US5zZEvMDc!Lj~t<=a|0
zWg`ozoSdA1APE7Uxt*R)r!+<9s8rjmOYYyjZ{Iy>mRi;M$8R0Ez>_TW{PH^Wj45Td
yE54Pbt@<*b_l$_+u|(Dg#;^v_1Ptmh*B_>c=Z~js4`#Oo<$h0BKbLh*2~7YVm(~3M

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/experimental.png b/Telegram/Resources/icons/menu/experimental.png
new file mode 100644
index 0000000000000000000000000000000000000000..f84b745a9a6ecaabe9f29bbe58c792deb3d8458b
GIT binary patch
literal 582
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY=ftZV~B;|
z+YsN=jDaF)Qi-Z!D%O#jre04LuMshuvT63QL-q@Ep84O1xZyobh@0EYD`G={-6^q&
zd(O|^RXj`b@UORXuNKeye5d%lt$ec4-<#*x{N5C!C(hNnChYass#K=gXW5F)W|!`c
zbu&6(?Bb|3RZFbfZhpSeOanWy?zLg7{gyA5?l^g6LDX8m<-w=&w%>MI=pfl;nHBJ-
z#%?9&n$#5!auqg5#@gwA4pn&jH|p7HhmbG4b-%Z`C^gDm6gd6VXr@olGh;E=k3~CM
z4kv2)F2B6}_Spr6A%D7A9WCacpX%lMbi?hpn{*C~_PT}Y$zFb1wD$Vz#~*KGZB?3h
z!n^Tgj)~Or%bb#mm(Qj>F0d%!Gwyo4BW}I93}0Y(+3wo?_xanI`)uX<FJ^@3O|P7H
z{9e!T<TK_+-Yk&1^7`xDyysu5;`thC?BcbiHXT%$s&w#gUHs~+8Y>g}k2i}L&Fpd7
z>wYsw?0m`YyFQDSJTI}D_%mr^f*rHL{PVhE++3$jPRS)O|N2{}ARxiRcFdV4)ke<U
z-$1~s(cxjgvgf4x@6F@1W19I)X8ZOqaev{r3xB}Ac+=7otMiglKym2l>gTe~DWM4f
DccbK`

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/experimental@2x.png b/Telegram/Resources/icons/menu/experimental@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e56b0c3ed42d568bea8c7f69291c5d6668f291e5
GIT binary patch
literal 991
zcmV<510ei~P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFNl8ROR9Fe^SWQSOVHC}bevk?i
z3K9zpK@5s^m5XQ-ng*>RRA^TgNSoTWXcy7Sg$NM@LW_bZ5y6e%CQB-`+!!qcAu25T
zqa^FS^SB`Dn;B<(!+VQ2E(Yh`bI!fro$u$))YM2nsRB|3{<8|m_>b3YHoM*KmX;P!
z>gww9`8)@=0C;|WcDY=^V2}e`r3=~osOkqI|BwPIq*AFI4o7oy^X%-bMx!}9JKNvi
zXN*(~czJp8`Fz=ImJunA@#yFXmD<|cVw0-~U?aj_%i;ScE-9f(WtS=>Rj5)0D*2^3
zBzlG9ayiZo$UZ$iv5AvQtJSgr#I&!kuhR)TF)_iWyS%(in7O$*HjFs-si`T76bJ-3
z6dM~GFD@>C%;j=MqmcvoN3P!9-q+Vxgt@-HRw|X;T0K2I4-XFj-`w1&)oN~VHQv_N
z)>JBm0B>(^{r&xXB*w<Z(8Pgqe0<!{(7=bn7bBC&4i66@ji1eC<3rQy_4D)dkw}DC
zB6o}{D=Vb?@$s>?w${<n!Il$JpPZbGMx%r;zM_$3V+pg5kB@(Ue?uCJnF74OzoRQf
z4T^>8>+7edr{nQ>A&IZAudA!8^Ye2I1IEwK&ykUlVoEjtF*hF{A0d~?WUN*zno*h-
z6czFOe*f<7Za5q+qze~j8x}mK9fj=f?!LdjhyCvEuB)r7nmmZ3P$&|K1cb192L}hq
zh!nkEFN#Dtm0gp`q}^`E=2;eXbaWII0{Haww5h47%**$7XJ?1v{l33p^fNOv9*+kV
z3WY*@dwZ*^tHZ;?9MX%6i=>7!bHG?#3kwUx-`w0}1qpO)Z*P;P)9DmOMFH^Q0`kep
ziHKVWcJNp%2HD%&Tg(RmIbr_NQ2P4%1kiXuv8j?W+fm5e4|R5SLLBQBlaxmk0T7&V
z*hD~RZ*OO$F((8X&{!-clZla5wb5d+)YkqAimicBg!xq(^9DKTbUM5UZ)|K_US86$
z7$tZbk%z%xSXx@b=ZbVXjc!Sp=Frd(o$d6<MZDs89vB$lIgAn*_CS12pyeh?LijXu
zaBzS&rX)=14f7)_#niO5wb6qwvkSV#kf=iv#FD^L1*8f{75M8F_z8|dyFPDt3+4a-
N002ovPDHLkV1h^;w+a9N

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/experimental@3x.png b/Telegram/Resources/icons/menu/experimental@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2c1efdd2693ed60d535ba4e3a9845b8299c4592
GIT binary patch
literal 1443
zcmZ8hdo+{@6#tkR#(3;ttUP8gzL0Ecme`1ycBW9sE6k8Mv4)PBlwD#~D9>qxwxvYl
z5yGG{-lHOq##rVg=FxK2GkL@skCGk#?C$B_^Si(M`sdzr?oB`Kc0v`QivR#X)!B*Y
zDPyNyz~yCD$OMrxlDp)2;uuiN*PoLG#85xyFjrT=T;{_8xl}3u-EEOUR|Wup6w3h+
z8O!bFisk>UIu%3y^LHDw4;^0u0GO&Xk>DK;TOj+J#RQ>tcsNbm&GRl8Ck!e-1H`q*
z-qv=(DmhOQG(r;$_vW#BlUJ}Lb;Q*3JdLvKxCfgZK|7RryIb)~Kg>M%E0Oc%lS9pu
zbs=|66j{{1PM#MBaYvbP*Z!yYAk4uWni&X!INb2)sGkE0>EP(->+8$maI^>lG<f*1
zbbEW7!*T>(b#=}1=eW0{CHe*iw2%;NE|g{qXliK0GPV*`l$BdMI?h~vo(MtK;eKLu
zVlL6?a5c48nAO!)Jq+fI`uo}0J$ibY;M>vBH0xBML=x!Yf`ERgFDyj!T<O(6!@L$G
zAy)_?adA2YHa0e;T$waAIWY@TGBcHZw550U{OW4^r)X-ieko01_=QQBp|Vkd0_D(9
zEe=U)3{hx6vZ!@hnhWL-kMsM#Dq_EVA(0e5U0hmn9>E%_daaQu6w%libtq3*Hkx5H
zR9#htU8PVcV5GX!fLPqt(BPRl?Kpqzz$sV~gQ0r+2GY`!-P3d84StfZqocEPK|Vq?
z85yq5EiDC~MMUUDMn?7-%Qj{<UFq{lk#YU{bu$FAxuxZZGnkc?WnyYd-B?_#ZEtS}
zQw%&B>+8qFVvt-6XL)`%F^ZQ<#g~_t=b3X|LRWkZ%FM7}&lrI~5QowtBDNxb-0_Tw
zu^vFo#D|Ah=&Mnw)TbVD_i}TM6<ycsZH=0`7sTQKNu7m-MZ=RPc6N3%Gc$vHey<ms
z&0cw3p0jUrW8;2Nk)~3f;_Lo?dY_B@id4Gz{(VbJ3s(O@9fvbBISDFx{nk)cHYF75
zGNBlEclVFcLZJ}B`n0trU0Z8!YfDg^cy`L&J+n;%#z5>>QB%v=eDugP$LGb=)ZWHK
zJpLNFxT2y$HZ_N1^Ulm3gGLVw3`_(B`uUA_OxD!YL_9=ASsXZE;`X~waIn$z=I76+
z7@%Q*uC8uGR8%dSO`}p}TO~;DU2*PAkYzt_Z#NTjb8{UX9GpxoEt#UnZTe_5<EX0?
zfk1d4Mt*7Ja2)OJPv6}$vAkSYS_-vnB(u`&m7u}Cv9V2LYnZM?EFKTUjR*uUAu$&(
z61vioQ!ZO6*=l8EWFR+Ikg?2?l9CiUoj(5I1JCR9_z;h$(sL-^pG+PmDlg>c=f^62
zY`zn387!)1v)854SKZy|S#H(U)dy3u_<Vjrf%$UWY^GgHYinO;UtfA^YR}y$)o;?W
zme+U!f#yU}l!pf2eX%`h-Yt1wVS&2lAJz2Yz8$<pI!Sgm>)E{i{v4}-5?rnNeVSGM
z@USPN%5lWw>{&PHEhf`?L7plV2n0%(6A}W1=cb;TnwX^B<WGpSkMy$P>XmQrIvjNv
z|K4V(^9?rKziFC~OMs?y5s@ELQQ39D@sB$L0|Q|-aCeot76dHV)&-T6=2!{{nxehO
zy+y+zCu2i4AV>zgveL+ZQ2y=T{rws8BWN_bnX18xKHrL^`E5=I!-GMVzVKXccsGhf
zd}Er;TlvCBf@^u)NO+e7ZyJfCo+Ob-6w1AEd_6+kn|%M#)rVYe5C?u-Wba|$HC3_G
zS7CwG>Kz=^=E8{W8CHQPk*AlJF&2yL&EybX#vqsZ##;Crw6HLRxgs_A1^6oPm3HoQ
aL#_f<K*TeZU#zgZ57L?BMyx${F6kf0AB`pe

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/faq.png b/Telegram/Resources/icons/menu/faq.png
new file mode 100644
index 0000000000000000000000000000000000000000..e280515e69f45e0681f3c455a2714c9680c2a57a
GIT binary patch
literal 539
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgftku)SF~maf
z>XeOrO%5Wiowo$Gf9L<Eykx^d(`{lbCJR4m=dAJYFfqJ!^CRa!Zjmc1I$On#<bBs^
zKCH7~_f6HCZ%p=--`_iZ=Jy1XxBu5p&-q($f3Dy0!a0BI>i5Ro-{k7R<?(X&vbIE*
zz!D1?oAbuLpG~7#mNZOJsCjED*Pp*#dRE@{=v3yQCWf_9x&m>mnMN~30%A?(`Yp7*
zBi^2Vdrv^t?YG<B|Mr|D(|`PJ+3MH3bR3&w?(0i=a$gZXo3{D$&z#%aQX>mx^39|(
zS$K_vIz<?r1GhUT?u^kB<36}RbNS_!3E5I9Dq53{^US!oqBU%_YOu^<gDIMfK(SAP
zpD%vgY4D;*@pSBU-^*L>zh51C!b4!y1LMU96AtvaExxGUxa_L5<0?5{jq=@htM=;c
zoN!IP*J<lbr#r8|UJ3L%-hOsnUwlT`>Z=77Q>p|*j>n%-<!Czn)M);BZ>fE5AA~q~
z1w1*=UrwtNOuTl+UwhAuaOUeBAF`e$ot7@E|MP0q-r0YSewLlc_O0d0Q(Iq9#CW>;
KxvX<aXaWG-Le?(;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/faq@2x.png b/Telegram/Resources/icons/menu/faq@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4491407883e0ed6f4963e4b3b7d7610e206e6cd
GIT binary patch
literal 1231
zcmV;=1Tg!FP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGIY~r8R9Fe^n9nP1Q547hDv|**
zKqdw#WX3=#kr)`6`0)oANl^w;Z)#vhnJO|dl_Etc6B+t7GVnV;3;9vxeOT}Ax6e6y
zpS#b!ulMx2XK?R6Yk${wt-bf!Yp;FM(o#=q2L7`dNKbw|d3kxIrKRwkot-^CJ|<5X
znIS7HtEHu7a&mHaclZAO{zH3sMMxI_V3Db#DijnHOiWDN-rj0HSew8AqY}xA>yl+>
zXAcezj*gBh16Nm9OG`^TJ3Hs+=PVXhS-6stlG@tZ&d$!Fq9XC*?(S}Ue4IIZeSMAO
zSr`~gTU%Q)74Prwv$L~JO-&gY88)5F%uE2l0E-st5@$A*2=e;+`qR@>;ay%{uB)qa
zR|brV=t2UOyRI1t#naOhjBjsm!^6X7P&_G$s6zr(Qa&-sGB@m<j*gCacEkEnm;DG~
zf@?<<OWZKHB)t(&A(4547V<FnjeR2{BeM1(D@9!Q_xG=^uAZEnu+i4n*N29Na&mHv
zgb1M$PRMN-vz)yx$%c?LBhu1H&}!?68TmarI;yCsuxUw*L$1<?4e61S&|qiNhU}@C
znHlk5V`JmT*R!&+B9g<y!~Fbw4`b{FLdgY~h{@vplk#PHNF+9FZf>pw#MIQ3j_L01
z7JCB&1G-#qLyO;-a6MaETU%wIBsZN%Z#OnJ3Z|x}Mwio;dD`6E^vTsLw4%#-r-We*
z(mV>6mzN>AxVX5OA#QJPr>FZ5A65_b<KttS4QL?;gCQHnBj4NG15Jo{q=6T9lhNb3
zxjEGL_xA%DzXcM182T-WwG0(PSy>sqoSHF=`TynRCD_r{*4EqGi+pi$G1#jlLN11s
z(A;1%Gd>>SHG?eDuCA`<=Vx>|{|gHXEvQd1<X=WUFc$**?5eD+6limEa~!C*n+z%Y
z>*nUBp`pRs>3@S<tYFU9XIL^H!sV5XIXyis(Mmh+a=UQ;!l)(d>+5q=qxv~GIAFvV
z7Z=sl)h=3)+m_5<WKpF*JUl>3?dL)bhMZJYRYhZLY|OZEf;>Wwq2Q&!?-0t8La0Q8
zL`I3kFLlNI{Jaqm6bgAruJWk3Bt~6<&|%lO4*)#%I7{Z57|H0ez#&J6?oiZr<fFso
zaMhhCFE8ilZf|ebg(2<8hbvqz<%cr4wzkHMa?5ckaS|y%u;fypDTfvo7I5hL`kI<V
z32lu83pD6lN?5UqA3Z%iES${=B~QGBh2q;4`S|p`u0b--f9j$r=WenWMdg!R7l~X#
zGNkMmy#5PVq8MFBlDf9)ysVwN@i0~r3CYb^E{Yai0D#HF;0@}I7gm2otoxz2Lq5lF
zMWiAF%#n%JzwtRnc}9LBXUZjsafd&^0J~&M#h+k<vxO>*qmg36_DK(b>$S`4h3k@e
twLEXsbP^x`?4zg0ozzQe2EN-2`~)zoe%f~Xm8bv!002ovPDHLkV1n`JGMNAX

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/faq@3x.png b/Telegram/Resources/icons/menu/faq@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..853065e0b7958f074889b24447fad036acd07ed8
GIT binary patch
literal 1832
zcmV+@2iN$CP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>l1W5CRA>e5n%_%ROBBcZ;SY*5
zGz{}03yZWM>d7ck>Y<>ADDp+42qb(HUw!L8kO;(=q$CogBGC&%(St}o423c?C=~6N
z{Q#q+l9YQtG?&F<&e{9S-e;eC>#)zmVeOgq<GW_h%v!T%uUHZP;t_~PARd8u1mY3+
zb4OrhrlA)U6l~tSxv;Ph0$X3de*N<0%k1ndL`F?V?^sSwPIYzlp+kpiYioDz+*wvu
zmehf_Z{I$9_H1Zq=<eOS4<9~UT3SlV_FFXW*|X=ug$o}(eE2)y4-o_r|1I3mAa?B7
zar5TQfbJw=M+vI5=FoJyQ?azP^!)krO-)VAKnuk8@82Ihc<}uB^A|5(%+Jr8Ma4=h
zDk|E(eS2kP<-UFU)~s1$NiiocUAlzMxw$#3>%V(!X=zzlSg=O^)2C0DFJC@!;>6mu
zYyF|X02|DRSV~Zfa)0rR^ycN|F|HPx$;nB8u3o)5s7XW+MBGw{2@D0*7M_3O#*M?n
z!x{uz+_`h-Lb#+sAdV7LY0VhIoMy`uy=&L5nVA`FyS=?V<*ai@gDMni{g}h3yM{2F
z44(FCadGkN*|T93rIJA{%Edj5X7If+-SrH7|Ni~{{rgiP4BwA(Oo(ro&eVGA>gp0R
znB2N`Yk1Udl9<rGv6r~X1>s`z6|a~i8GTn87l!nlj5r1mg>}3Nw64e)8R@4_pML!K
zk$6RZ*xlWI^ypEI-k-*tj43bx<If+Ux3jZTRI_C{N|u+G_xARRpheujfB)dYgN~~7
zJ_#5{sT6D^Z$E$jG_VLVjywDA-Mc@3{%kp8JuWXVpFDXoh529I7?t=2m}v4zo!t^Z
zU2w2{ksoR|c>L?vkJM4O|M>BvuCC5SC#FRZNG>9NJRBuN9m~Tpx6mM_rlvTXX&Za@
z?!9y8j;MY0>Xpkrj%l59rF+KVm?Q{D=QKVadT?;iNHJ}2BastNv~P`#jfp&oEdUTO
z083<WZQ&#$r$#n3$Jd2+PW}eL=;)}IF&3eqymIA=7n^PefSdyWmUvLo%&YW+MRUS0
zDJe0H0|NuBb&J94Q8t*du`w^6Cr_R*wM?&LDhL2z7!iO0&r3P&evaw2aqHGCA1zi_
zM@I)OoGkrwh1aiN8$lTeOHblsUtgazYIxG<MBKi8+su}4-@duqHma#itzW<1-^|OG
zFOB~3@o|4n=>-O0j1=&sJs2UOgF;d;NeAxZ$B)Yza}W9`28<B|o`anP7K#&M*i5Yi
zmhcT#RaLSLU?ouI2^axpYL!WGc&;%LA`u|G3Y|WI8=OHlY}jB_u_fNSch6m|2E&B+
z67+OT4+b?RFZrPD#3CYCadEK`oSvR;ZEX#tM1!Hg>?P~uSXAZcQ>RW{zkXdxZfy7D
z{-l&%;F7j$FnaVYW>3c~zVsidBC`9hTJ^8Rk&zL+k{v&N{gwt##~cU7Qs?!Uo11&}
z>ec-Ge8WJT<;=qV;l=OMuHTXdX^Gh7Tj}ObL}+TaLWd)oo0}^tDvT^!MSXoe=i+dx
zG#Cxi(&qWb$oGVminP$-h%;x-7(x6wefo50uTY}FXpjMbMHQe)K}hpV@agI434kCO
zs|4sbZ{8&9cW6r|rPAujgIEm4F(#qz3QD`DRGw22libP~!)(w;jvNUJLiow<NT4|O
zwzak0xN$?;LlD4_Xd&<d>p5`XfFv*6i3FC<fB-NA67WJ=2z}5DX)l#nWCu;|;AE|n
z+8sM~ER|``{%zZ~H8eDA*|Nox!=VEJl3@ZYt!ryt%pn7EuMTLOhYue%)m-j4YieqA
zmphH=D2q854pDxy;P&_T%fh&J?V8o=_^2yi5tQGs8m?ff;p!EC@#00@<w&#3OHhrh
zV2bT<C2j%D(eCl%$Go&hj~<1qyl14u4Zd_PCB(gT>(&V!h{)ij1URzu8p#YWrzzP3
zvghIt->6Gx=T$AfW#{F(nULA}IfU_z_onA03y&Z}01cOy7@hnhjuMGiW<6slgC9bO
zZ6R21`Xd4Zf(taNYa!f21VO}Qb20?mmCMzcpo)wj2Ixz7gN70fsRjoy(glA@FyIf&
zx+-jxr2moFN`Koadx_my_*tL0O+Kk}Wot&cKcXa>i*rF13BeiX_xW@--Km&3BAmPB
zV`pN+rcIj?d1!g}?%l-1MCLwrj@~iL4GOpa%jfA9jQBAgfp`Ss5r{`19)Uk<1pWar
Wq%JsXpUlSq0000<MNUMnLSTY%17_g>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/group_log.png b/Telegram/Resources/icons/menu/group_log.png
new file mode 100644
index 0000000000000000000000000000000000000000..5452f7975ee42aa2a75f83859c91f1429db98fc5
GIT binary patch
literal 539
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgftku)SF~maf
z?i9nWLk<$Ho844;Z{IkT)Fq=_(HW!IJ6D78V8_ISSt5$hH(Wn=$oNK7rlLp5R1Rs^
z?-M6l%$$2hFIxAv_@{sWYb$3?oau2Xezo|=Ca<NF*1b*;>puFnO!#oCUeL13FWsXA
zGPnabUd%BQ{4`CBCCc!BiS|@40hZTaf7!0J=$ovfD8;0Ek)eUH&Q8-ab=O9n(*`|p
z>)EHwGu{=qzIxvF+izp8r>=3go`3%LU%UIK{TmsVrSJUjA2{XkLx<b0QW6Qb&gSYG
zoA^riAK#>tF0AzJ_ukA|cZv`2TgmmGe!3|p?XE`G4$TVQ?n&nP+iyQC@c6=C|I@M8
z?eMnTch{`u@|6evS#bJk)7@I$LzcVlzrSPpso89{@9w+L>;g=lunS5>u39D3`?e)<
zN7ULn;V-ko#E#tIR14gqbi7a^>cTU>Z$E3+UCm;$+T6f+E~?{BSK8*t?YEES{`q!k
zTa@no?=KhJ5f^f=G>~|}9I!Slv*Y6O%b7+qd)yYk{(36n|E9kz394H@q}fK@1x1Xf
LtDnm{r-UW|&h*<E

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/group_log@2x.png b/Telegram/Resources/icons/menu/group_log@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b372a0cf6a4180dd64d52d0d73b8a22cb2bd7c04
GIT binary patch
literal 941
zcmV;e15*5nP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF7fD1xR9Fe^SUqSWK^TqEL>s}v
zB3MK_8w(3D*oCAr*ric4m91FVSO@_di<FTRsq+I7QbsGWun@)5#zKjOpv8d(Qm7Gs
za`!F+vfS>BJEM08hf~P--h6M~e&4J!<Ic{uZ8PwnWk9p$^B4?<U@+)*yP;F5R3084
zCX>mUn&ROOhojkS{*W|$1t_k#P9$=(bo1@25n}*Bt)na$8xDtw1Ha!-B+wxUC_&M6
z!ftPGF+EZv6~R}4prjyIf5oEK>2#4u<mBW8D`RhOPbzITn^77p;lW_A#1%oXv)QcC
zXyo(xo12^Ye7+pd*RfbE<cUckHu4EU$TEDeGL+3`y<RVZ3xz_tT*gx}gxJ*n{{GR?
z(ed#yhUId(v$Heycm>wu@sN}x5(x!b2!a&RggCcAG#W+la5&UzwcNp!07yX)vJj^X
z+1aHLHk%Dpuh&~F7PK+EIHVwmD67><i=`T(1#AS@XsB!V-xy*%m5#y5DZO5g_s(cE
z$|*&pR4TRGZAFR(@)=5{Qn6T!rX|O*gbxl5Mx&9Oq9J@GtJP{BA0IR=IbN^V$K$aa
zXCQnT!g1&6=?VJ@Ls3czoQ>2<FQ>syB)%CfRp=eQlF@ZG#&BoI<#MTi%dm#t-`}~+
z@)=4dlb4s5>L=*;`-g{zTq}vMWN&Y8*oo8|LV9=?9AAd6udg$ijLMS1dZ*L*vxbnH
z?_W)Ql6Xh*m5f(iU_4*Rq!ZwL^4lq!uvo&~ZdW>zt1oEi@$oSb2+(G_y1I(T<206y
z3ziJG3x+P6Wdwo}%#hFL!=YVqQ$xvcBVf<UU<D0Lr_*Aw$j}w01WP77-^xI$A@YmN
zIQ*`ZRvbVCKR-VeS%6eSudlD5aXrAXl@`p4<LXWB8@%V*UlTc<P9zB}olfuWQhlrU
z1QAFPO^DM1sn-z%+}+)ULLqcotyZ;KUFRx|pHQ4z>~=fU?(gp}E-q+>Sh&e#dU<&v
z&$Ove2tt-ID=R}J?EL)v^z>BzcML;RPA&hAd47JDvs+}Ffo%r<W(Ix&uAS`Y4qxz?
P00000NkvXXu0mjfgo2ub

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/group_log@3x.png b/Telegram/Resources/icons/menu/group_log@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..678b9dc62b2eb25e1246ae954b283290fc609a15
GIT binary patch
literal 1220
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz@q2r;uw;_
z`ZmhiTg6eJ?7LVg^L6nTS{)rfn3P#llUsRPf_r*;OiV7v9F1TW7QFbzAfWkhyyB)#
zwnb|ce$*}KSY0&dUagOFw3YR4+uKji%)2h@;p-b(8y|Xoi>-BRKtkKf1}J1mX5AOr
zY`Eb3LM?6W=g*!^I{73&+u?xf6uZlpTI3}pEbQ(7Crbx>`~E$f?fY5T$eTu0%NrW=
zpA@mVZN9kE%G&yOA}@!LrNp0V+fH^*wGI3B#RUZ^Ww9_$|0H&%Xx&`<z6ceTYM+T`
zyq>8&=S}<f;WV!(xAioKi4sy5<XF54#nTM7Nx#Tu%5!FEKKTAxMqZwtzP|r!zS-BV
zg%!Sj_UzfCM~|8#OG~%b?E3cYTU>m+y~G2dnfLGBef$3X|1EA&(!0a^W}Q2CZth&!
zz#RSmOd=O7C!KqB?egW%KYqMOwG-jKpfF+T5|e=3qqlC|x_dYFR&@jeA3uMpLYblf
zhlz>Fl`B_HoY=m7``fo~moHx)bXY-0Pw&*P+PvgF>c1EMbbS1`cJJy%ix&O<T|M!}
z)vKYQp;O~*%I`HWuW(@Joly9E{=r?VS9|+izj7sn?X>?c)&Nh2l#qZXEw?Qfg*#ii
zxYzTtE=@67prINT5uxF{BuG=US}h>JOO2Uv=@FwJ&)@1!j=1O7%e-+y^S!NBB3z>4
z;=9X~`S!1I6p2#uPZAauHa0fy>fb6HpHn=2`gC`9_qjYVFD2(0?kRtf&U&drT|!ba
zGc&VrYQtnh=Olf7{feChOa)7iS95J!ur6j!Pi2&$T>s)56FrV_y1D-U^JmYlU0uGD
zy9&dk=N;Mbc;38u=eV9NWpviA@(h<ft+Fg`^`8xYHW?q=T*1S~_h{<MEn7m;w*gg&
ziHYr~b4vB#`5zG;7G`q2DsbY>n>TxVdlxTOp3B4;-xhWx?8U=}j`O*c61I0#CUYJ&
zNPf_m@AUZb<6mn#_C9+0G*wP@+upslCMHLmI<z^QwTl8D_9hEGUi<vH`)`niT9-Ii
ztY1HW&YT{%#UV4pj-BdDEhsKFejDqnTA$?Y?Y(#J-mWdbe*Jp&>eY^E6<nw8cdgr|
z@METm3}3KQjM4udpj*zKKfn5qfUa4)j<iO#<qzT8w{E?9_imeV<(h~2uKmIVO~##;
zp=$A8|9|hfSiYpIi|f65XH$@o<P43oH$Hyc$RpT&bjh2U4vw0Vu}l>|k3Vy$VRbwB
zWTo`o9a;aN@g4X%c=Mrj_Mer%fBmYesF<;>J&NagSObH=0~M1D4Yxqs15Ld``wGm>
z%r5Qt(Z=AhDsf6-!_qZtdf1Kx?(FO1TPOehzS8!sTj$Q1bK+5@&V!3gjpk;1gvuJS
zv$N%vvsg5&%CXDbv}&zKZNUP5_TRH+&3bWBE9-#j;}2I39%S_UT3B2ESSjt%3@!wG
b64toihV8A{9JBdFpc2H>)z4*}Q$iB}@KGIc

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/group_reactions.png b/Telegram/Resources/icons/menu/group_reactions.png
new file mode 100644
index 0000000000000000000000000000000000000000..c941a59552777ddb5884c93bba069702c01b4c75
GIT binary patch
literal 629
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?7pXqV~B;|
z+bO44uMCtpcGpuwa>tYj3ps<H`SA3d>EV^sYW}OP;r5SBs7Q0^l#NC55+`aG#T1=1
z3@DnndG55m*MFJSAF#~+vhV!o>igHC?pN8%z5icT&Rio_ursD^|NQgM&1avDT3fdJ
z?g5TgCm^?M_xtbFOM^1EM&&#V7UW==>GP~=Z`kUqK`TovWYi{i-pwnwkm30DyLMwl
z3#-ChKjylypg<eBc)jUrlV2`8{q$3c(a+b#szRJg`0wVJF*Ey2{qLJ=CcW)#iIwK>
z$Hjq41_v}2ezDKg5tHU?mpR5SlrTl$bEV(jxchI*IzO7dD6wK|ZcI4uw)!g9-j0uE
z7cxv{pKW92W?{PhHcV+^K}FA!0F86cH(!69DkJBwHhJy!*98`59vTLjNX<R}+<sp}
zfJTXp+}beh;2*vlB6OBt)|B9>3tp)*{q)!0wNt%ZU#c9<e)YBLK*u532Or*+?T%aT
zy)<ar0p6qxwq{0yYfDAfhFMGXo_e||Lg(MBPM1YBcJ^}prB-*t|Ayw6NTqL%To|CR
z_k!x|vwC9OXO6G-x_0=8@ABXty}stM8{E4d%!>T9u;7myM^~+>RPX7hO&f!>rpooR
z&!4j+<ije#fUQxooh~2py_N>;zT2nu&;8Q<e?@!hI2WDS35s%0S3j3^P6<r_4ZZ>T

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/group_reactions@2x.png b/Telegram/Resources/icons/menu/group_reactions@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..406d42273c8c0ad56c7363fea09341c41b8fe98b
GIT binary patch
literal 1164
zcmV;71atd|P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF_DMuRR9Fe^mpLqLK^VtvL1!oS
zr4dAgM4_Xh(O43NC`4?bLqjAIJB@~lXpo3TB1%DNi!F#P@`6Nx5Q*?&dB11gy{>!a
z+%xCio4n>uaqpaO{{R2?&39(Lnd9Z<X`T#tGT_O;|IL7}y8FPu!1(z1sHmvlU(Jvh
z6cm(_lEUxH%gfu_n;~8m;O*^QRaLdLw1nuVr5zj`^!NA2#>Q$@;^N{42M3Rijx5+u
zh|9~%h#;lKo3kV*C$F!sTczzfOnqo*C?Fs}h|(Dz9)5j&wS!q7kxEKRG8cg@IxQ{j
z`ubYP?d<HdwY3!$6%`Z|)YR0>&COXI@9yp<BqSszCejgLhGu7HtE;Q?^YaS}3tL-T
zp^Krbt1Dz}y{Pti_mEK`;Z03V+H4cV!oq@Z^XsdL{`~wrLw0U_e0&fQFCAIL?EuD)
z6B83S`1trJFE7_a<7QxBK*S+_dDMn(r6YwP$no)Ut5K<wnwlycjE;^P5^8H}1-P!R
z&Ja8{HYUKhFa&=C*g?>qpPv<TOJbmW^YwcOB8#{p{-4t6=_#D4sVRNsA0xaw+7FZd
z!}Rnt;wL93Qiw#w-`}6z4tjNURm#yCSs65~U20ibS;0=t#E}*t35ZhR>-)EYpPij)
z39eht&(9ITg|sF~0<zAP#JcWYtKjG7Cydlp?WiQ6`}=!=3kwU=5?r@LM@J*VY;SIE
zv}%%o9v&W^o}PeaWo2mzu3N;Ly1TpMj8;{n+A@QUjSW?T8QlK<KH`guizY~ojg4?v
zOc@y&CTI%KoSYn#X%!U}3UCV~I5_z6@e$h0%#6k6p8v_oNn}|S+^)<i_Vx9_e1Csu
zPUe{U=-k{~vX1P?$cR2lXCxvbf^`R(S1zq!Iy_x7rF?B|4Z+*n+mMhDU7Uk~%F0Uk
zG>$3<FvX$H&Q76LUth0Ck-)@uBhMuzC6Zxf6E{0?8RFbfKlLQ?;o;%jy_gx5DKj%u
zf>1D}r>C=u5up;s#Kb5t973|Qv&Dsh>n!(FhgiuVA1arZmqf!sk(ZYzK{#P5EiGlc
zA$oj#%wktph>VOBpC8c86&^z$4Gj$hMB^qO8X9Vd2LQ}^?Qd>wR-u@~baZrxn6|dI
z4EHU7&CN}LZ*Olm=Sdyi-Q8`C$w8iMqk*EX?+miHw^zipy}d2HpV&r2xp&5gSx!$+
zkBDh+Z;xebOD9AE6{F^^@wO^X^t-ycgxABvLvi6kgbhfD!cHQckadZ|QWd_rBbSwx
zQOYR_!a}$%Njpt$X=xD=*#5E^ofdQhkwc1)6A{qG#YJ&(u^U8PmtYyW;gE7Y4v&H-
e1D*^hWZ)0#`M<mJ&h|+F0000<MNUMnLSTZOdJpmd

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/group_reactions@3x.png b/Telegram/Resources/icons/menu/group_reactions@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..caf8ae470f5c664fb35b8c26d89afb57f6fac847
GIT binary patch
literal 1774
zcmV<K1`+v*P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>SV=@dRA>e5T3JX|TNEy}dzHcz
zXG^S{Cmcb|EYyM=KwlgX93C7%5<=f26vSQ<M8V1zUxXw=EOEl<A;g#TLDAHlQ*$US
zEK|$wN9VHI{r`W?+5dlzzh3S+PwVWx*0+Ye&)#dVeNLRv9xVb|1hfcf5zr!_ML>&y
z76B~+|Fa03RN`-Vcz9Y`+NDdE+}+)+t*uv9R+g5Q1_lQD`uaY9{>+Jd_Uzf4H*dzq
z#-2NO&dtqjXJ-dEGcz;Ko;`d0`ZXtrI&7AfmbY%*g6^Lp&)(i%XJ==8e7v;2YuB!I
zcX#ja?~B0voST~~FE58WX&iNW<Kp5*Mn=R;(P@AA@?}U!h`!>murPG#FpIrH9hB;W
zsM(T{k@4-@HysNQ^5x~_w{PEm{rXj>3$Ng>sHix3^4~cRqO!7bcXwBxb9;MxVq)Um
zyLbA%0D)>XJz=r(^Yg!d|4s(MpN9`0CM6|VSy>U=g$oxjOYxZzn?SU;xBva?>FDUt
z>3a3*Rase?hldA&05CBz@xg-!>@0=qyu3W(QH{89<Ho_k0oep=0s;ag(7``6G(`L$
zu%h5$Td+1DE)pRA{{B!zA~4|k_3IM+Mt7Y#a|YirDR}<;Io3c~lvAfp-Me@1$B!Q*
zNCZr*t*r%vEQpPb4b~wNoSmJ8F|ty;42_MA1l`ru#bXdb=j7zDGYU9(&C1Fm23Z2?
zuy~RIFh*8{i^0pwizeab<|ei*E-{8FJw2U#!%l!#rjv_=(ygs6!8aI#os&yUnyI?F
znxa)yR3yzT)>~RyDu9%fl!)<2w-*-|lNnW2RnpAzy%rW0^Yilp;_B+EQIk*y9jjbZ
zQ<F|3|0`6lt*r@`z$6&PFKd7k*#pJt{{8y~IJles`t@+L8(^%ft0QBsT)AR^gK3iS
zJ2*I)nA_Ugh&F-1*M-LfK@wpNU=1S%mXLAG$H#}b$H&KsJ`!SVY>f1>hEXF+@H)1>
zzW(XcCsxw@Gz@?lf?lPL+1c3%K!j+1e^`z0-@g}L9UUFnc70lA#ISJ*GUTB?ggIM~
zZwl&=7E9}uaqQ#AkAl2|gM&1Xd3x>b?FB_RNl0ttbqt|8a^GNplarI+4^Byn9K#`x
z<fSulVmmw{GBT3D*%gu+Swd#SdV70`J2^R-=p!LeUm?ANgM&nyNQ{n-3i~~3EM_V{
z7_t<q7Z(>Pr830wN1M!uffq*xLBiG5H8(f+4{0;Lpfqs){CPnk&f_X*_V)IsiU5)i
zrP-&c7E!qY#}?_syAc{%TU#mn%+Ag>LQ*AG9O1|Snn5aHBjcpACXNiYwzevOazo%$
z@aD}Ma_s8WtK6a-j8C3CA?Qbs9&t#h#)4xdsYZENHCzD*hjXM?qyR-}l@*A<Vei6W
zN6?Ej%FoYFgi%3rK|ujIhO#Cl0SX{xL^0=)VUW^0ckajtnB0xR8>vB!nk|)@j439F
zn(@=8Pe~n$koefdn3c9;LgM^F%IfRul_HAE*VNRIBHZ0z*AeGcqbDIDfof?`jN*|R
zsJa-1g@xo57Uay#OkIw{c)xx7HfhD)osyEGu9no)R5o^Z@7`4xUka_IrG<R^^5u()
z*F2XmUuJJ@9zT9eH#JfQsnv%nUw?l;`G%bUS6<4&BO)T$P36Ul7j$G+4$g~!wV1t6
z!J-lr6vQiRh!6SA#>NH(Yj}9r%qh-qqnw?caaBjApwfbipWofaP}q4PPEde#ad9yQ
zKy6-J*x_o248obsgyg{2*B7_)1cKXbI-#g-uQ7NRFJ7c0AdJJctx>+|cm*h2iyEW<
zFnMv+#QKJD3k(e8QK;h;#!a>o$^)w=4>AKJkTjieH6vSI$G~EEN#r<sB}53mvEzny
zGBh+)EO;1FcC|RZUI`B1u95E3Fccp?e29vQ()SHNf6!$Y*p9nbf&=*U*>w_EtT8b$
ztZ&%L+5Ku^Vd2mdTvojj8hgOh)D(R@$jvE>MQspebLzs+2v}5==rXq~4mc=jkpm#G
zRAS1pEz{G}o}QlOwoJJ`qz)2)T}@6-9*bSrG(S(DKHbpJKou?;uIA=u{LN<?Ca095
z{}nlPL`O%X?vJtz4j@QvdwP2CBN3;p#->F;i+~mZEdp8uv<PSs_zy(jACX<Xz%HUE
Q>;M1&07*qoM6N<$g84i%qW}N^

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/groups_create.png b/Telegram/Resources/icons/menu/groups_create.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d6bb4c00e7cfa05599dfe555d6350845ff9a2b7
GIT binary patch
literal 717
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfyvy{#WBP}
z@NLNX?4N}a|9@0Yik~jJwrs<tM=CobZa&$xrTdY?6+XX7F;@co_@*5?c|Re2|DzVA
zwXzY{CiFUqY>HWPGA^}tU(LQ#-*<n$xBPjft-am)=U;7VIUarg>%-W6G)Qmy{rmS{
zf2~pwNZ5SS{$+7_x%vF_wsQS$i+AqanYlG;X;A0Egg^26OM`aC=!tT%Mjm_oao62-
zr=Q+Zh|#;AV`e?qZ)c3(vp0r$`T52(c~l>K{(0%8i9@H$rPp7r=JHw8)znP5E4U~)
zi-qZ6j@jY{haWX|2Qo~!-un6bU(NdZ^=qkyh?S+~LY4a6Zi@>oWSah$S<F6rEXh#e
z!n;qOCh<7hO+M+e%bIQS$u(iCcgDQ?@k4@<ubo*eK}D?lp_vqK`{9k60$i=#N13ja
zy?W^I?CdO8r9h*ZG3&24AAIonv+z-l+)cS=(p`Jw)?dx4t*Fot>n^bhl}WOZ%fEc=
zL)G3mwaI~E{gGU)hb~_ZRuNjL@xeFOXy%I&E3NbO-!j>n59V!G{{QIFqOjEqV>jO{
z*?qUug-P7y+d<8{_wO$c(o_g|`{oVLvD2r$ZRFUkZ}5n9vu57AckkT!^PhkIdHh)U
z*29I|er(kTv$x+4u$ACh7p5H};FoAMci+B!kN6HfELa+JFm>X56~4Y@SF;LR+}+*l
zvp5dD|88$@pRdfaYgNc9*%$ihCQ`AnvAKtLl)e%FGE+rss@F%yOLw!s{I2!cE_-O5
sAy-vybNk!9|AnP`%XWM+XXdJ5T*Usr^VyrL=AfkH>FVdQ&MBb@0B&eC)Bpeg

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/groups_create@2x.png b/Telegram/Resources/icons/menu/groups_create@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf110c03039fecd484c62fd8e93704bea285d1d1
GIT binary patch
literal 1357
zcmV-T1+w~yP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGw@E}nR9Fe^S4k+fZxlCW%v8q6
z6pEBg8A23gAyO6=7KRO$NJ>PKaYwQ+M2Qk2Qx-zV0-<DDATox`v+w))PMu!wz3%&d
z-2cD6y3gWvo^yWZJm;S2d0s6o&C*0b69G*G{-p@Gy1JH^moF?VoS&aRJUr~|>~wc`
zCnqQC=;-|4e?w1CucoHv>FMd0vbD0Z;_K_H7N4}`STQg#7#bRiiHQOD@$qqFWCTIF
zySsC7afy$Q_weul|Nj0yDJf}ud|ZyfpJLkD+9)nFGc%r^o<eiFy1E4g1xOzNS65de
zsSv3)IwB&1ycrxE{Hj(WBO~A5-T*`J)OPS!h6V-(aMIb?nXRquR~YcCtE<UxZ*OlA
zEG#Unudna;_!uR)ySv-c(&FakCc?<w8X6i>I!a1PRO^_UnxeemQ(<8tBlY$5>+0$#
zc;qhq-rnA3Wo0q!F9_5GnTU>#mQ<Ucp9i?LwUv?ZhSU!Z4jLL7^78UfjyE?q#7s#^
zVWeClC@6@O{rvnSb;icV0PgMWB_uLMu|d+!&COXI!)$eR6-W#-J3Bk(%OaedoXDYs
zgak>2wY4>X8yg!5iMqiSu@QPhA|D^0=jUfgi;9XQ&3*!)tx$~6Y;JD;Bv9D6ySoF1
zm6@4ILQ+Jg6tEu*%J1;-ut+K~^55UzDFtb1X-I)cnYY^7+D%PO*rJax9f)sfX$b<?
z3&Vs2@d+d3OVf^yj+nyu>)YGg&d$z?3h<_^tn5#8exZsPu(!7dCaRb@LW0VO3r;AK
zrjZ3Y4-Jx?osDK@9WO7hsi`TFE-x>en3%8#^9FpVpo*DEL|j}PspRD3h(vO?=vW>n
z*Vosxv$MFiwzjs&E`FDmmK+=$gyt~)FmE72Fi^!Tf;T58C*W^xZW<XGG5<>fBL|&g
zZ*MO`L`6m6RQ7-gB($=!(%9HogvS=)Bp7-MRovCpMVSKg_4PG0G*nSV31@L}5emh{
z#fmbNOK@;-X=!PDdwWk$PknuTYHF(L!o>8$ykYN&Ky2iC11C_tP^+!2Rdnck985pV
z8+7>G+#ISHb)zCvdfz+aue30bDk>^usz}TsnO4*Y`-o6@csMG9japb(fDQ}{L}wB6
z<>jTnzkh#!A6vW|Lqb9rEFvy1FL8n39fz6~iqL>~Pa;!z&|yJ(cz8HDIY~B!NG)q?
zYluZfr?{P-o`#x@jSV-yB8E8_iLtS<!eb^TCRi#YIyySUJ%QT_w=~8VFFF#9${e&w
zettd<02o&$rijvYdU}ehhR+jD?cChli;D}qabXHDSY{YP<?rt=^j=K=q|40A%<$|d
z3pf&ANMh@M_81?yjH{}uC^;J&8!Gxv4Q-DhiE9K7AsFI}e0DG~F_A)rZ>-M}!R{v!
zVl&7Bos^N0!Azw@XJ;pnc(c<N#DCTHxMYrwj^IH+K!8#|m^nH+3fjub3eO4<N*uz)
z370WdS?7Di`uaK)(Z#COag7iFK7ml;P<nbgZdME))rKUc=+=(|q(1uz#@3WLgz%uN
z8S!lbk%lh)sxX2<if0TK2o*5(h-7|LAc~TKRF6X%E1C#sBA|)DKNx}EQ>dR<IKt<z
P00000NkvXXu0mjf-u+U^

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/groups_create@3x.png b/Telegram/Resources/icons/menu/groups_create@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b453493228ecb1559dfc9348a37a43e9dcc350f5
GIT binary patch
literal 2010
zcmV<02POE4P)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?L`g(JRA>e5nrTQ@O%%s7D{V8=
zii-9Ui}oT~h*p9i+XG9Y0{alC_`z1_Lq)VgAEKQK+EX#mAS8(vHCs?aqimynp@pJ-
z@BO{+#A&>bcb<D6HRa_#A1-HR{^!h@b7#(+bM8~8j`#B{;90=4fM)^E0-gmt3wRdr
zEKsopf-3HI-#cKyfJu`kjUGL^UAuN|+O+xd<;&BjPw(8hbK=B_<HwIbdi2P>$eQLD
zJ9g~l%a?!I|9<@Vaq!^5&Ye5gw5E>dZ`iQm;lqdRS5$6<cbJfn;8=Fe0b93jT~t(5
zPWNBGUcP*plaq7cz=5>1wEX;h7GnYI+O?~0-MTfWwZEBpSC=kb(v@aC9I)WvV4byT
z)24Ih&gG=($aU-1>6qF@@7uRebp7z*!_1j84f@ruUw`xF&4P!Bjg2+nYiwxf(4nH`
z$B!R}3>o4?m1WD82^UV1ckYBMU`)B4<50?>Lx(zc?5M!;@$ooxCyaS{dEL8r@71dp
z;IOc;ckkYD2n~$v>fytOj~h2`{P^*3wQSk)$&)AFzI`*WRBDJNiQ&=Jm8`aH+p=#J
z`_-#g?RX<1A~tT^`0CXwnMe`r4z7)^UAx*bR;oWaIa%hLHf@?)S$p>E5%#F4C|`D7
zk?)d(1>)=1uhnvGun*NVpFe+Y)ToiKX67EE6VWm*F3tkRseJ$bT>u7R&6+h9-pV#l
zpFXYTyLt0w0J3;XqVB?l3v~(o`}b$F$>{s{?^mr_HEh_hPMtb2#7=qm@S%)C%$_}4
zXRj<>T3V{4n~%QTG~walqMYSIJAeMX4CUtLcInc^BBWWfX8ZT=7tD(nFK|K@OyJEk
zXU-_mWo2anNa5&<W{Vdu76}|J>A!pTZj&ZWWXM8fXJ-p?>C&Z^QE9r4Zt%H^8TS|(
z8Y+Su64BAof_(h=vCuPS%n+I@gncMY3o(EGe69-BsdHIiuA3<-DPpjR6DPXm-?3wd
zu=nWEL)fofyQcb`Yy@#&ums@1WYThkzL!p&I#q7WUxQ2b?c28%F5u0ZH>y81HPxS(
zI*S%9Qed8T*P83CNJM+_;zc$0m@#9fPoM5r4*{%Szn-vIHL<$%Ll94@rjyu$D?xaL
zQF;O=MvWRJ24lPT?c3LhtfZtQ;d=J$nZ-Tax^+v9k~H|0wtf3{5rwPti+2G?Pfr)o
z?4k)1CK#AWz*etbEqI7|^X6Ib>_7$h`SYjlU@S12ScIa30^h!U+ZRx&9;BC)l<2x<
zWMm8+IM5=rL4yWUr%sitPvN(0*<yjwB=Hex1qB6`yiUh&+qO-Rgp~SF)zBR}bhv)~
zy3C=72M-<`J9cdA)~&mD@8-f0S0S(?M~+meG)D#V3vB1koxXWZP*9K_sebzO2^|7l
z46^vyF>~=#ff8-Z1SK6(GCNW9>tQ6KZrr#rdGcg+RjL$5qB%9uiWMsi(o91mM~-~{
z{5i2UVSxcRWy%z}h3wXrnVH$MXHSC=HMDZ&N{a-J917qnE&W+pS%KG1PM$oe#GN~L
z&a4v_#Z_+Fw5hnbm=F$aP=%QF?AfzRmMkH^G_&iYM8>>Z%Q7s@y?gg^dUY;$^o0u-
zl*B7nuDIglz!)~LUr~bw4YKSySr}V`4dPb<fO<|qZZS?SS%XZ<uN1txb?ZjRMw-*A
zRjb#pU*ErfA8%AxSjZv`ypDzfeq)ZLS2M_UNL9`HRGIky?ZSSavB=0sK9N|=C08Vu
zi7K1v0OCCg+R_se64JYOZ=TX)M{r2+;N*3ZR@ot&H*Zd13zu8(zaIoXiBye{3g2tT
z^{1Z_3Z)<MJPrvw#GE;EloXO8%4rT61xD$A`SRry+y1DcQ3P2Atw>Ty?fk^wcD_|K
zup<cSlqOu|b{N0?csv4sZAHIH?m)l1T$ofrYy*6XL4HM42-vV;gVKUM!_KS_<FFI`
zESc5XwQC*n60-WHoBzgvY}}Zb7^zx|@u&h&`l88uw^Wqqr2bBz#M}zcZA0GaBp_fq
zj&#3%{Rj?qV-xr;Sg=4z;|Yvdv3>jY1R`XXJozzQ<Hn8E6~|M+q;rD@59Z}dkBO-6
zdkkBU3h1w8)~s13g|smo2}Ldfd|@YV(#DNsbuUa!P6<tvyLa!N6Td22_vzC|J_aC!
zj~Fs!BL2?8*mAn}a{K8lF)>l>a`fm?(|Tm=?<|bzIQsZEr5~B7DBy&^F7m~gyjBi*
zt%y9Re4(6LhHrhrygbaoK~)$^VDjGt)55qP6@w7wIVv+szO2{@HQdV4OFF`CTA1t#
zA>2;s9M3LNV7$58)L5^F!>;6*@-fPHeDz=&3R2EhtR+a(!cfuhLA7cZAiG_aH(UwF
z;|pG=rL!i95hF&Zf4dM{xzz(tr~*r#;uYNrsYX089p5i;-+|51qD70q7(Fh}0-gmt
s3wRdrEZ|wdvw&v-&jOwWYPSXc0e9-qa1+f|{{R3007*qoM6N<$f~c+4mH+?%

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/hide_members.png b/Telegram/Resources/icons/menu/hide_members.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e81f7655e53d26e435d0af9987d15e24c9c5aa8
GIT binary patch
literal 809
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfoZa*i(`m|
z;Mov+k5_>rVaDwLMNCXO7A$BI;Z<U3@?v%D;#7K)@PnUar9g1W#tqY^O)JPMED}gx
z%O>sA>TvXEy@x<Xv+1-%DUbKf+Oytw{)oEwo44wm?epK~c0RBB9;EUAwz;#^rl_^?
z@$vfl`u6Yo-6l9K{P6BwUTNvq<1Wq*e*XOV`t|A<z3E;{zkmOppPzp;>En|pEe8{L
zCNJA^?%cVkwbO!DhO7+9&dx5|{rBNR#mOhnocW?|pvvERGG*SpdHeS7U%!66@R>h<
zYWBvJ@4kCv?(EsdGkx@?XQ!s73avc;Sg`wOqr-x`dHH#HldddYym<C(=^IKDS6s}n
zv9nur{QUXzjK3w^dNgJDlplQlX=i6=BE|dW@88-Uo?}<9hU$nZ-@bF}7SnVGg#*84
z<fo@EznN2HA#)^P!{wJRN~{)Nl;CRJ(6so*jT;gN4D4Fi-gP)Gzr6Woj?v5~A1gTC
zynS1`JGS}YfwavJ!?dP0H#0LuL_{3W5al|`@o)Fxr$rlCJA_#$J}<C1;Hnj^Bi3N(
zxcTOs^Up88H0ixI{b6~Vp!DqPSzEomy+gD_7ag}KD=(kOcq~LKRBNi9o?bzd@{CLw
z8Ot3xX17~Xekp9*v*%5Tm8#Im{7;9k?TOR3>T*%qym|A}B1;LLMVF)2mQ_}EzT;q?
z`sbm=I$(%(y68=R{k4j@OyWSow~rMv)tzpOFG!Uv30s|Nbo1LcGqr;1YU?xVrEUM@
z#kTOhW#IIck&~PB<KxG|tx>Yi7K!w6&XUvX-3*KZF>&#W+*@9K|2>guEptcq6@T`N
zpFbO4d}z`3FKS_c!gsd)JDhh|Nl4Dyu-|Uq`}dsp*fO}xYn&ctI#1BPr?WTCUN^x>
kZvOf7jS<2^|1w{QpHvp?pa1)uKPZ`cy85}Sb4q9e0Cyo@o&W#<

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/hide_members@2x.png b/Telegram/Resources/icons/menu/hide_members@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e100565145ecaba06fa9bbafda99ab73dda55062
GIT binary patch
literal 1675
zcmV;626Xv}P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NH^+`lQR9Fe^m}^XqZy3OJAeBhc
zA`zi!EtO%ILo?}MG-I)vG;6CqSk_qPgSO0&!w0e1(AZkGmd)g})yjt~)1u>wB<bkT
zlv9qcU;j(@|Jl<k@2g&Y>G|+>J=giUPWN>;X3Xd_8iC=BfV;c<@G2aVwxpyagTZj)
z#tnOW`ynYBg0Qt#*4EaR*YNQ0{QP_e2L~-_WMFG+>x&mJ5+t6xckfP^Fkxi;&|0;!
zvO0I}ocL5yQZjMkM4`@}Jv%);y{xS4&6_u$K7D%j?AetoSGH`~!Z&EeEdt|HW@e`N
zbpQT+XJ=>3oH%hpFuLE0ii(8`7h1#*ozhdMPKj-z;^N{0_2|)~d3kyJ_wV1md-utc
zCm%n4EDRq$d<Y2%(TQ8+6%WMZqeqWiU0roHY;0`y?b}EC;OXw}o<D!Sj=>_YhYlSQ
zpQ@^=+}zv-+E}$})%Wk;;kkM9=0NH&W5$gehsJ{k4~kE<wYAfxO&e%K1=82oS4UmG
zeEHR@S35d7K7an))YNq0!i70==ID4#eH}l3{PpYCWkRN=rixG0jfaPaPKA?`Q*UoC
z46rE@A9MWpaS5Kt%J2L4?-LRd6q^|UHGztPf&yvml#~?F`1I-1nKNhV6qS~iLS=?2
zJl+U@OG^tqi+EO6*1LD_1i5Y7HpOWwuz2xe5uP`1p2*N#f+6^fC9R^{w{JtD2L(x{
zBsSNsU7Iv%lHx?Fva%9RhMC!iCSefs8#iuL8j1FgA3wl1H#g6nJ6GXrYHC29J$qI#
z)D5r1M(d4`{QUgBeE9<Pz<~ow+$4ZZQH)5QKYv~;uxr;Y`TEw@Rv#Z9NK8)HcpwR<
z2$CtSpn@g89N`LMDsbk^8O(h9_Kg&1Wp?b?AwFSPI*V*l*HfoX6*hVbLFz^;rQn>L
z9H{s1-BTD-ff+MqeEj$k;U`a?%$hYzE4F?6b{vKD^5si^e}70TR;*AA&!0bsL=`KH
z7LYPh1*awb872#;=Al6n6BA`JiP+YyTfct&3hDLh*MWh7T3yT=5z*B?JfWeXed-Jb
zb}y}n88DGo<D{pjhZTTSO0`BtMoM<Ny1M8}rIhK%yum8Lpo$e9Z#p|W!PnQ<4`~Nn
zvt~_sd3oP=^*;|EKAbXT3YIo(*dSB!?c2A@mMv4Z38(PVQ&cf^Bbfq8uC<&>#5{nV
zWa-kSX=!PfE?vsa%{_hkbVNi1NVKe9zg~`5;<s|;N~M?S$GqwPgkOJ&%`kYQZ2S&b
zyLK&02sX)7aB#3<WBM^~=x}<9DyD9Rlqsdx6kzr0)p9b>nCsT9GeyMWJaj%;BTi&6
zEG+Er?DZ9a(T5>K@TX6oK6dO_qYPRkT}Ew@HR|lnojdd(wamsX`$Ak?oTH;73mp#?
z-PYDtTwMI(#S5*5!C=%e(|#49$$uE0d;@wHEn0+s$l=rG&6~k69pwDdD!Y97^5n^r
z2lGQ{Z0z{1Bq<9f#~&Z&HHR*niKnM0dIAChUcGvS5+-L<R1_F8*xud_o7zC25~`q}
zpuv2yv$LzNu7;IKn30je;vtPam`p#73llS`sHjK|8Rj9Mfhuwo9Ua}zH3o&O2}h0`
zk&~ycu5Pft<K~459@4K=m<4d(y>;uBoEQrhEFdaq<MVdz+^N&EY15|vOc{<HJEkN3
zdc}8<XYLv2Fbzu<*p|G#y<unVWGlij35}1B*D1)(&W1#Cjo&s&zqlM58>^Ev_m$$H
z5apJFXL9)ClkPx`iHQ-519##+i=5a(Ub19~xgO~F3kwTT#g$y}US3{}jg6u_IXPJ|
zt1Veu+W+6oRsGT$O6KnXiUvVBeF50Pnd1!&4ZvK8_wL;*YX4w}0mu!N$CODZ8h`gI
zSGhfV_GlTHvGkP0Nfv5Khb4mJmhRSaS_C$FsQ@Y00o-D75W~hR+9FOFQ_9}07Nf(5
z4;y3o=QwIht$X}0<)7O(W{^|t!Gi}Rj$dQ+k-%}(aC!Pi|Lhux4;-~Q8iD=@`~>sU
VZijJPoCyE`002ovPDHLkV1fsF8zBGy

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/hide_members@3x.png b/Telegram/Resources/icons/menu/hide_members@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..011d3c42590da4e88cf9800977aa182b2a45cf86
GIT binary patch
literal 2426
zcmV-=35E8FP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@<Vi$9RA>e5nsum@OBBHE?k;Sx
zyHHeYMX^w95W!XyF)%T}!oV(6unQFxM6tUSRP1i-?sz}mJPzm1_wDZ8x~})_{o`_G
z=FEwiGpD{ykRbXOJ%Q*6L{A`k0{_nwNR%kilqpm8@893Lb?bO_0`1$k|NZaZuV24<
z_UsvdbQ8tU4&D0p?Hf;Y!xT4f-fS+-{2w@QU_8++Ns=TRH*VCr4IMf(p6Hf1apE;=
z)@a>Ej2Pk6twMzgW5<p?c<|t@Tem)a`t<ts>&urfZ{NPXckkYL^5k*iN5l*^xqSI@
zt=qV9<3zGz#fqIieOj+t@Xwz=SFKuApg;lH5<vjEEm^WeOFU`PBqLwKgb5ccSfH0&
z;jdr6MyUI7Dll!@G|_GD+_~uU;>C;IyLYc#xpKpX4M&e2MHx%U#fuknMiF#lBFgO9
zv$d?VX3dhNB1MYuAY}-UHf`E2UApk<^p?q!Cu^Jtf~QZPt_8&oxlAweB~6;tI*xYj
z+IhkMlS@1>tsBqJr-2P0K3ujueE2YB%9L@VKnxS|$#U=By@a@0wQ3nmd_7KY+qP|p
z?rHClBS-L`rAn0oAziw3@87@Y5qd&q9;>cVqeg=U4H`FY%&x3ivp#<O`1|+oUbY0a
zlqO9Y**|L3D7gdx!kzWT1k(Vya^?E?@uS&t>Cz=@Rfd@|Wtuv5>dTieHF03VBVnUZ
zp+bTgN?^c%0o}TF6N)4vnmx{to0L^2uypBC!N=J+5x63!O0osu+qZ9F2^*_duO=bx
z)vK4tL;|T9Z`raXS+ZoZY5~ogHy7lN9Xnd9IF%nieh7jWVB*Ay*4|);lxOfmw@#fp
z2`!G08IglbDtYqcvZ?`YNzeul9;}zjmoJa8$?As>AI6U#U%h(u{Q2{<grz)q@IY1p
zI(P1@w+9Pfym--2x1N5F9zC>fJ9q9(ks^hYS%wT5L^vy;9XobRmJT02T(Dq4YkT_i
z=~t{+Avn*UKgS7KIDroj95`S|U%h(OqSCc%SJFaZyl2mzRH;%~I6Qqp(1ij|OXly~
zxuac_MS&v|%wfZZS*w8$CDZ@>`Lpv*Fc1AmI0Z|@CQX`%SlXBuEm|b=b?eskA|JKF
zyLayl@|iPdykPpbG-%Kuk)T<#X3otx0HTfH5WYyP1a0BMg|bw<cyXDh#xe6wLl7JR
za9~2jX%vFyAE0fCFzvdT<_}I;c%L|Ng6Cl{2^HokS_-^*^Tyz>U%%d!rk)%!WQY(C
zWmrQ{q3fxEg<IFDJvNguV@4xf_wL=%ZS?5TT2=|%gkU}I3hMwvHsgvD$Ykx>wM8*9
zqq1eox>Dgeefjc5FwdVqpCwBcgV~`&2kY(KxN*Z^o;r2Pm71Q^<)7GsMhG0%jS#G;
zY15{zv>G;Ss6!K>B3rg>u9#S$QH;whTC}Juj+x{{o;-PCkZ<0+=>;>8C8%Gxa6xVZ
zVAG~e6)RSB(yCLZ4xv^saS}Ol<Zz<tR^RdC$Gzm7^XJbOYNV7-Qo+vT&71eil`F!-
z0Qc|Tr(-v7-n_PL+X{o4HEUwAf_d%QwcNRL%c=pW**Jc|!TUSw8md0>55XbcAcI9G
zG(!SE*^_XxfSEIA3Y%)xs=a;tRuIs^DU(hk!9@QSEn1jRX-XKA%?S~jVnRPGK+Bdb
zB?<{w1I(E-M_5*=QiYzJAdp@-`&Kl+1i=72Ig))H7|lGjpU=`(SO*SpqPWT#GiKoW
zNa2tMQOH?oGvYslF7>D`NwC|(g$v870mzJXUS{cOhRc>M^HM-q1VcIG!FcL|lqpl@
z*|TRN?xRPKoIbE}<;s@T2|lKQf%qk>w{DDIgnS~GELoD2C42Vl2J`9Dr}gU9Lt<+q
zmr2S-nL~uYhVR|GNBVpA>{*nwFe7M4x<CU%?twcjUAlAx$rp?$T!k(i>9kT!2177{
z_EJjTy?a;g?bWMSl`2&VxqN=SF;YJIO}ZHIOB&p!$qd<*FJHcW`}Rq(Osu2XMv`p^
zQf?E<ak(^z_yfQvk;jlyLBubn-jI0)q%-t7<%|OcNHr1EFr#q1e*L<TqKKrOXqHG>
zbUG$D0Ju|1J5TwyH#PJcnIUa6pW#I__6d`D5fu!VoH=vq><ndyie?EVrCxT@Bw*47
z2{6GY_mKvUlXNgMTeohNIE(kEg(}o2&+6B&Z*-$krPDFN5r9MSQf|7xF&+{YU!p__
z!-M~~Z{H@J;gN8zGU*q<JIS0mbGdTmNDgTnP^warLV>4C|3|EgTCP>AR>Urr2xW~L
zHR6q-OzPCBO^DN33-VO0T9t4YTS=&A<zQexa^y&P8?hzf84qzW$Q?U&NK=UBwh6(8
zDZ06~RUnCyG`UFdMLg;z&#Ypu;CwM+;X$Sob3HU8T4=j=?GoMageOm)6mjXDaBrSC
zk)TOWfi2>7JmLR0ue+1<Pkdkpx{PI#8S))e3NWf6y0M}g`LwR?EI$4E^%Kl>>(*JT
zE<;RCGI5@DSZf5HKBhrHlU^Er_|Tz4A~C&6-GtQQaxUl2oimvDPw_??CkCvW?D{tX
zF_1zxppAuaG+5={P?B6(bR*dC)z_7w{+i{i73?j1)Dxo4&muN<&|~R=Vv|A)C3$`#
z2DhreU<sP;m(XI7c>~yA@^!zTE4HvhJ`@&&FEM+Z9w7m@Y1m<P{OF)hpFS3M9e4-^
z)~c<Twfv`s#2CCHk<$o(Zgh%h>BL?hTQT}dvRT728Cn3hZU~z8h9=HZn>KB9n4(Rj
zzpYUg2tM9lV0VBBXgW~*2X;pa-7HVqw8V)qu2k{TYuB!o_XZ$8>Eaqq1D6(yZ?9;m
z#}?037C$E`VMq&+($hZ9m*4zo-NuX=BgkYe0{?vgeuWm5)@{Os34fm&t`c*l`YRzy
zhNaQ%$~)YX=te76-y1E>a5IfN`Y5Ayql+GQyu;0jU(btf^82T7GmRtq{rmT)6xQxB
sju=PTL{A`k0?`wQo<Q^j;^GAU0T$Y@=GpuJmjD0&07*qoM6N<$f-#VPG5`Po

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/info_notifications.png b/Telegram/Resources/icons/menu/info_notifications.png
new file mode 100644
index 0000000000000000000000000000000000000000..3686dba726cb47f3e44fba7aa533ca6729e796dc
GIT binary patch
literal 461
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%-qw(F~maf
z>g0`mt_~t?>Dv{BKFTeMU|rjm$Gz9<(BzKq7hddXh+BJDc)@~z4wtRp_p59!OERm@
zHQQai>i?hT*8e5GD?Ryt^>x_&+Pu@7?rm$@F+;U0N#^)vledln8Hsjc%QK@co0P_~
zJAT+C$`Un0qSloAc#@*0(6gE?28KyBd3x&_4*O@$;9xosYsYtM+fmoPbAj!N91mX1
z$#xC=Q1&tE-0_wdyZ9I+m~D*r>YOh4wJ*KqR#`0j-sCGS3C(?*+rQlBFOo@@Xe*Sd
z{C<do!9cFyduZs~=QqFqJ+I&d43U~X&ZdA+(SN(2KknBvI1sV$n{eoleV=W<+vG=z
zWqoQ<@ywicYg??y(Q|v)741$NT{fva-4j1;>FZsucNzWj-`1A+KzM2Ew_lloA`g$d
fImY<^oO@RKYTA^^iCkv!prG`0^>bP0l+XkKJ#nz3

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/info_notifications@2x.png b/Telegram/Resources/icons/menu/info_notifications@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed724c7f240bc277888089bbdff3af686ebd5215
GIT binary patch
literal 853
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz_j1f#W5s;
z^KFFfc}+)&uUCI~Wn_A0h@6W4$=uZ9*X$)C^slMS$!U=o@7#{2Fqh^@E<YIap16s)
zEPAk4UG3(ZTQ}z(-JMr-f3DNB%6Y}-=G2y@iCfJz+rpP2D^PME!(^J*()-^VIh`DT
zes<g#@#j&m)4~sx{7s_jlR3|y7Y7O_H=a!KQW2W#_q=NFCtgJtAyo#uG&k{1m$22M
z_uDJ@7!p=hA1XDM;?4W{wJKI``s0s3*8e`hqBu#0Awe{n_2t6?53$3mHb(fYV$>+y
z<`8&V`1<U;?b%zSmfo3Q!_Xl3UEx%7{K_O}fl{5t*I!TdU^rI!>)GFy<FYr8?hrh4
z@55fEJvVa-R2S4gHx@oVV~cy*{SUPto-Yv4bNTUe`?I%Y(u;OnyB^{(S>cn^+(T9}
zd<G#aLo`fTH3b~oJDAp-JHTQ&*RTCB<Bc4%<ffGkKWqAITohbcKTOVX)|=if@WJi5
z@znF%Z|edh(I{q{;_S0-KaM{Rbn{qtM9@-G(%|+4p2*%wX&qNX*E;`CY!}&gJ2HIT
zmUH)<4<=0Lc>BG2=_)4~_a{qQzNRb9Ki_^_>YmHxmtQ3BDT|eKIB+%fn?BumG$~R?
zOu%aX`9=o^%fKEMS)~b03Moe!TxX_j=H%=tv0B@qz<nyk$c1;)CWp=>t*J_X!d9y?
zR$B3DF5>+7{6yUP=_M6AWA@!kyf_P})5h`6<BuJ$E_Ft&WxMsV<kRoJmsW&p3AE@O
zS$$P&s{j9k*=DmF_r>Vl%$ep@t<D))^K<*{xBeY1P780pb$hp6YW@#y2JZk~&wq!w
z+7IuHIrp|KIP<+q`R>@gaqqwXe&6vYVciqm<ZmkT&wIaZzL?Qcd@5uC(~IRjT(usL
zB87V0<R_`f@UUIkv&*yj;Dy&;kE9EDPPq~r?Ip{tKKbOwia*co3><%)zvHp<$|w7^
a%=L__{7Q0x9nqnnB<<<y=d#Wzp$Pz@uWal9

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/info_notifications@3x.png b/Telegram/Resources/icons/menu/info_notifications@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..de98cf241167b8f7bacae998c7d719dbf7e9b83d
GIT binary patch
literal 1302
zcmV+x1?l>UP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<fJsC_RA>e5S~*K4K@fgE@j^vG
z!4nff@jwj3z{r0ff`J#}`7Z=9Gcgxb5CucgKn+yz0Kp^i48+J|1s4(T6L&wHrM7u9
zv(vAqW=7eb;89au^?g;<$D5h%P)J|80=fda0=feKK?P#`$+4oMqNb(>T<h!WySuyo
zkb29KkdQDsI{Hhva0{iktUjO*3=9ZK{Sl$`f!ad~^vvt)t2wckmlv-)E$m@hp-_2w
zd0bqanIb+uzO1awtY_53GGd8PIXOAa&CR{Nz4`h1qMqc+%F1v!e13j@e}7NPFD;ao
zmd?z~e0+SEN1#~)GZ@3=OQ)2Tl{GRl^8WsAPT=1fxWEzajOnrck5yGwq4v4Cxngi{
zZ*R-X%bS~<KRz!s!2nlvb#-lRZN&70NnKst_V%`j5U||T)b#lHD0a)<-d;;fOIli*
zU1Vs2!T$cf=mii!*}3?wZ)|K7gS)u6=;-Lc!XOg|%wP-`5dnZQzTVnk1d4ryQHPNh
zEhSvwNVx$Ju+f5W+GDz(ot;rYQ&UrkiHT|iaD+QS0hV_yi7u+);b95|C0EYMV1>Kb
zZvc-j8ZPUSk`h|kF-a6gpg9tN(0l_pD9kpVYo@2Csk=HmJGuA(MX;dYf|bR|&d#Q1
z3oO~Ov22fKfTI5ZP=H7_CKkJ%o*t@eYilbDCV>Euz(GWMKZM!YS%VvICF$wuyp#Z>
zmmLuCf;*tmf7imof`h42^Wx&7Q8*AO0feNU4<ev5GBT2qk__e6)>cF-%PrP@0|!K)
zQ@~V7OkCOV<f_2x=pw?3bdHW>pcA7~ghDAPDRg&tcSka#Ai|1t@)RmPCXXJVrA{os
z;ww?>9#bk?fKIx{0xZ4~weB&cvIXd*drT;PObpxiV*!;}ROzvzq9Tgo`udt=MnQxv
zE-q$7wuM4gx3{;(Tj0~vQ*v^$t*MI!zyjQ00i9S%7pV5Gc<tNS*)jO=J2*IKZ|k-N
z;6wycdbM?nYw3^89wIwBI!aAVwKQW<0vr@X2Wl2r3y`+9Hlo2e!3hToBUTkCXh4D*
z0kFb<f??C~;o*T2>+0&_=deQT?(Qa11i-xaiK%>ect`}}<KtE_c%=g!Q6mh_<!WML
zf}jr$4mhDDssTEXQUC}>!b!rUp`n35vBMw8Mgc}3s40y4`g)1LolLMPOo;4Xvz^HQ
zwu|4rH#Ro@HYiKa&(B6;b8~abAS{ma^Yca|H#awqfX+{S$H&Kog@pjZ5rC7E6Guev
z3<?SgjDrTJr>BtJ5?P+|qQM!6z;nh7JE*IxtAQk7NxHJKB6GmZc_^aCacH5vy&XqR
z^78WB4geSamzS4IOG{&8W7x%Y0i#`Y1$?c5)EtX8BAm1A@9&rN>g(&n#;l}q@Mc$6
zSC(s9gc4>R#j5hnLnaigU5sWjP(ImUw~mf$MD!Bf!a!|P&!-&hXfiW1CnqQAoD1ax
z0ZKH%z|Qv@=<#|#G&Hofw)XS$f`D5eJ}Z2K(&!L%1#|^;1$?Z)Zw)omB}lGaTmS$7
M07*qoM6N<$f_}3{-v9sr

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/settings/premium/stories_links.png b/Telegram/Resources/icons/menu/links_profile.png
similarity index 100%
rename from Telegram/Resources/icons/settings/premium/stories_links.png
rename to Telegram/Resources/icons/menu/links_profile.png
diff --git a/Telegram/Resources/icons/settings/premium/stories_links@2x.png b/Telegram/Resources/icons/menu/links_profile@2x.png
similarity index 100%
rename from Telegram/Resources/icons/settings/premium/stories_links@2x.png
rename to Telegram/Resources/icons/menu/links_profile@2x.png
diff --git a/Telegram/Resources/icons/settings/premium/stories_links@3x.png b/Telegram/Resources/icons/menu/links_profile@3x.png
similarity index 100%
rename from Telegram/Resources/icons/settings/premium/stories_links@3x.png
rename to Telegram/Resources/icons/menu/links_profile@3x.png
diff --git a/Telegram/Resources/icons/menu/lock.png b/Telegram/Resources/icons/menu/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e7c58bbbc1134acc9aabed7ed69349ecc66bc1a
GIT binary patch
literal 555
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY^tY=V~B;|
z*^rH0ha5z{Oloe(Y?`2?(D>SEmjes;#!VlX|1jAfFk8EIsr&<f8O^37LDqxE{B+g{
z1l?qDKHxS*nnx%9a9VN9)78(;`lOXlo}O!RZ>^n*bdX4@g-n^1Y{j?VwIZ(Pp9en@
z_uiJ9Z#LV+cYi!<gV>TAu}4>}+I9QwA%mQ)QLXF@x*i^({+vH9W|ZuV;W@lODr&+6
zjguP=39#PHE8iOzzdqb+5i4isB%bc(TW`xIshl~&;Nh`mse_D*?EfQw>+Jg;>zw{%
zb3D?ERY-_u!&I>c&rTH1IsDLI{`v6LS08`Wi0l@N&oz+nQ4>D@*>Cye3zuj3EuUev
z@z~}K2YoEx$wp2qwVS^(rZus7=BgM0QHf*yO-Z?;D+*^U`}tX`VO2-ddd^R^|6hkP
zd|KeYv**0|?6VId^`;l4`(F54$KT{27r5fiMFZ>lKRXk(d8NclY~-r<&RdrGN%sJQ
z^qDKie7CK8y@PY(t+L&^x+mr}c8RRmVVS>O`teSM4QJDeZRB>Zi!OC@Nzm^;+O%xL
cj&i2`L6<ij*q*=n1t_9CUHx3vIVCg!0GR>V&;S4c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/lock@2x.png b/Telegram/Resources/icons/menu/lock@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2887113a802a56e31424dff079e2114d3ea2ee0d
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF4oO5oR9Fe^STSoNK@?UI6;u$3
zAWBH5h>*tO%ABnTTG(2p@(&mrD=qA-1O=<KHiAFE`U(pXL7PMnBg7;KDi{%S-#N#!
zX0y9*XO}zfa0;1u@B6;@_Ra3jb4{l6I9EVl1<d;Bzt}F9D-Z}^^7QnyUa$2Faw>Q{
zo?@}s@Ap4M14|g;;uPhkWwY7W*H=*{CsVip;1<_RER{+^{7$EHdwcu+I55FdZ~>-S
znuCC-EaYr9OC%Cf1sLIC7=Wb!BQ1WvAGa-nJw85qy<RzKxBvhQU{K^>2H30BD#9EN
zhj=`$EC&E!0E428<oBA*X0{ji_xBVPz>p9qAX4y}F`-Zh0WgxuB!vtZ!-Gh{GmM1}
z4F-b@JQ|HCECD7EDJ%^M39q~5a!HXEU;>fC(vT2EPCw?HkXjAZA4sd!n#<)<sZ=-|
zzPPx6;9{}BJ4Q{}WU*L$J|AE&FE8WqxZQ5o>-GJ9uS!$`L?V%1ug9KV{lAccpi(@O
zNvT3^w|g)cTwPs3;>U6DwL55-z8wd2CX>na_4R7CQcmk@Z>?5CRj@mT^b!zZhY4iA
zj;Cz3+wJTe#l|Zm>E1@8fh&Y8#ObWxNUaA2B>?3xk$n&024XSh^Eo9L1tUla;!>7u
zLQ?3TvHYhAp+&?nq=b4a<Zw7ztrq@fU|@o!&b0I<ba!``$z)g(nB?>Mznsv`&5bw%
z{2dZ6Ip%sRgrh(l_0v-9BF^<DR4$jFpPyMUOt2&dmV;U497OxW!$UM0O{deqqrpI@
zK_tq-^d<ydB++a(<pOB6>)kS~@l^5uPC~ogj$Mt@=~TTeB0!K5#HB>p3Qea|^e!Nv
z*OSutEKCZr5a&_ocDo?sOt`$f<l&!kAOa}}LiW^ivQp})@jRm~M|b!3_ExD>&{c0X
zn-ex|ft^Ba3WWj=;P?0USS&Ui4rx>g3SXSI+bu53kO3(JK4GCwC^GBMxzhq2B9M|?
z@@Iq6mWi?WV1S#zX0wTn#5tZR+{MDT2O{eXJ6C|S0zUy@6=t;JA3A6N0000<MNUMn
GLSTYo0)<Eb

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/lock@3x.png b/Telegram/Resources/icons/menu/lock@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f960d6a5de50a6e172d057142e03bc7ccde2375a
GIT binary patch
literal 1322
zcmV+_1=aeAP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<lu1NERA>e5n!8FROB9C3gMrsT
z!8<A<Vqjt*CW3<a0A3J$0>MB8U%@Lz2EKxciK3|p3L=V_C=3S#1M!BSpm+g=Gv8Rl
zIyJlZKD)XuTRGD^*i==o_5c4`)zw|Sy1#u(en|$B3?vyyGVljvATMZ)g@uKEeSO{C
z-F0<!H8nMGU0q#WTwLtz>}+mszP!8yWe)=0($ccLy!`a^^iPH#hcLh_2z?09qN1Xu
zrKPvGw+s>eHjEj@xP(yR6SKa){^;oFH|-yt$H&LNKYlc#M{&W?rw+eZO-)TKAze4I
zOioTVH#h4<bQ$E3ZiyrAy4hE0mzI{EoScYOmeAPPSblzfCVd>jKwpH%$H#zVvj4Pk
zt^^X*`T2Q!d%KAg%rF*5Kuo-HXVcl)DdHX;9@^U4%(*efMcjch_YH2jwY4S6Mn*>B
z^5G)xK*e<rW#7=yAhP!M_UveI6c7OIKs<YmkB^I{p`jr=bQ}c)Ksyl6UhC`YN)ub8
z;^JaEbR2P4H~`v#=w5&69lN&NTe)6y`L+YW5qIS)fOb&I%R^wbwY3WC^77I}int4)
z3z~<(%F4==g8Tb>7b)T{fG%hr0uy>xh_o#lj_xUpJ_AdE{@iX7*yrXyKKuW6#w=?d
z)z#Gl0|PxhJrpy#y1Mf6e&XES-LX}VpWI&_+`h`o%js|x+1=fxG_t+Dy}G)3eSK|>
z8N-qK%)-Kg>=M*oA>2Pi&_NnQqJ=3Fb$ECfE{sgbkU||xaEw!tv{5$e=;+W1IQL}7
zppQGY*?gpItcZ;=9uw$@oW^~AeqJ(4b!lp9s<N^&jh&|<z@gBqT?p`mt-(Me>+1de
zoy&%HFkllR=u|=x;6Ih4qoXoi)6>%dLy17o%*+TiG9t&_2J~8uDptGU#qfqs0yD4n
znBJhdUnwnIDyRX*(B*6jom`(pMpjhQz)DI=6jqL-N+A^)-U7=C^wkVZXY8x#&Z;K~
zENhCsm_f#u27Yz2{cmk;1yj9b@e7_7Ef=Ta@bK`>&CU0ZAI~6k(@OC>7(B54{{EGf
zm5PcArJFqwT?YMz5k(6g*y7@1lr`;O)XZfhY+yWnG&VLy^)cwBDjG$Wk+6ZW#}lTM
z#(x}2v9#-k4UGNQ+1XiC8H1s>W?=&(q=|`%Xkcjvqh>B6!2{da*ccofl=-1Smq8cN
zCce42K~q9oTU%2fMVy|Vn#gju$wgqO<WiBdkW^BFpNj6ew?jw*v&-A(dHwM-##d`9
z`=Pf&Y3Eo-MMhdPeb98qc=w^)D254*4iv5pofP~;Mpio0z<8r0SULW{M5ohbh#sc~
z4^+?3&#G`q&AGR?*9p$p86qihBS4<(i~$S`XJ=<sVEjWiH#ZmboCF*Si3(B#7|8r(
z65};eK|uj$Lds`%?ER!nYtEY0QeRif_~77x7Zk6ruUUO<463TC_V@Q?-g4G}6lxpA
z=040Dr-ZDx(6K=T9i-+8m1T@mQHN#`Q;<<F*F${B%l%5dT<5Xi_V!k%PTENZk_;pn
gNHUOQ;NJ}V02bAzHBewwX8-^I07*qoM6N<$g8Lp_<NyEw

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/network.png b/Telegram/Resources/icons/menu/network.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f4b98291052cccc0cefa5602b434c267fe90c7
GIT binary patch
literal 492
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEX>ozF~maf
zZLncibAUi;s7nq@GT#E<0GE@RMXLIV$*U{6Ly|UZ6#K|f_KMRb=*7Of2cFFSt5cSl
zr1*aS%*tQs_c#tcuS{ppxy^U@f&tGv{}?@S&q+HL@>W{S{k1Rt`qp)?4?o<{$;qTL
zE%l?#`_|)uDVoO%Pi=a$i|>hv@AlhgO?=HBzWy$F)K_%&hvwMpvd0ZiZ~FYR$No~O
z?4sP;a{caJQ&S}s?|<)n*sw@rlFC8#W(5bcEE8X5$>WBp?}dUwzXm!uSv(T!TJ%P+
z>R#ErbS;I3YxmxlTm566=QO3ITJRpfg;U05Z`-`%b45y-f66Qr7nND8aq6?o-sJ*z
z)0VybTBX{?Y;gDZ6%97_1MCINHjM&*7^ff5F5r1uz+i34b$F)l<&aQT#Xaqb4b_^b
z*l#fKyngSLn7qMU;1FNp<R3?MxH)swP754UOP;TLTIm_{y^D?cnhx!GQ(wwef<oHU
L)z4*}Q$iB}53aPN

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/network@2x.png b/Telegram/Resources/icons/menu/network@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..76f22a6ae18b1abc466fb3a3eab2157ed0febe3e
GIT binary patch
literal 818
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz%<9x#W5s;
z^X+u+)sBH8$8A4pwRz2y(44e!<-$n;Mn>OQd3<VEiiJESB{~~bo<>V(dUa~F#XbF(
zeYe_bZt>jB{J-z<e3QJhTR!{k*U$Fp@3(F{sUo+qA;3XHLF7jc>zX$eaqGW-thn>O
zylndZO(wI?Ud<9UIsVviqK5=mu-4S7z4LCrHG8r&m1kDfUOuU+bI*&7W?m_paQ0@-
zw%1>|j>qV!OV=&toaMIoBlG9K|BH4m3DTSvI@eGArwA9TShcKl_t8sPTQiPceyNiG
zpnUn|OxgO$o$3M^x89mL`YgYkw9(^jgie`-%mub!v)NbE9<i~^@>}lAGWq0@r$vs%
zuaw+Or0%}|{^DMq`P=?x{s~vJ-j?kask4zw4m_d2?qn|1`KHV|>D2Sj=Sv<jhv-f3
zOf!+Pl;PuA#&9UXLgrrH_6<i)itw=2r&ckZSQN)mE!uqep~2*n3C<H4x6M9OWH<l#
z<Bw<4nALXQT{q+D9bOiuF43!86B$iD{H)<hUU}MGQD=M9+9j@Ar7hGyKH8GYbN1h-
zQ#?P5&BYw5CULd?3s!tn|E73v$NkT*Cbz2X*lVOR`D@kQ2py+|6U>DD{vS-(5TmC(
zwd>X-X@N=he#QIm+s{5bA@s_`3>K5Wb@NYYK6#d&_UrL^zpS0=n{<*CCM&#mGVsy#
z%PN_;Rx?nkUb*}9-QKN{4I7kJ2_`w!Hfg!?wMel|<+-?En`3Kok3-^F4i^28+z|K0
zea@!tEGymzJPnjCy}#Rp<1imfa>({0OEhX2ujH6nUXWmIvbBqzqNmdNMf^K!sU-8`
zaJd?p2=V>1SE)`@Er@o~Rk(O1%QVk~<Ne2qg8PTp_OrTfI=EJ-+}q&cypxmNxIQ>B
o&*m=wATHC|4Nf`&Ts140;sdk48f<anwE?A9Pgg&ebxsLQ00ZAkga7~l

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/network@3x.png b/Telegram/Resources/icons/menu/network@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0e8a6fad420c17ad1d3f568daeee7175b893d4
GIT binary patch
literal 1249
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz~b%c;uw;_
z`ZmhiTia2hH(&7Jj{}$790j<!MMVV#<Cpqs9aMMxD1RgRR%FzVx&$RHrAMnbbS`+r
zEPr<Ie#Opw)fao&pFc~!d3N1y>zikF_vIS>K6}Re`J9_6>F16-e%LLVz#73A)__7O
zh;pTz;E4(gGcz<aG%=YneR_Fqt?p#6o7*>SG7{^qt*OyyemC{?t5=5}ewhEm)ZBdf
zym@-|f4+P%335}K`07>G&zxz-SFT@oUwqMGW&Ql_?rurRpniw4vTx6yFZXCqKWL<L
zl8={{m!F?sE9_BOWo2YrbX}d@(z$cyOgWOdwmLZY^5e(Kyz6z>tXr3smKNnLl|R=g
z>Fn9F{{H?^MypQTx;4u-Z>8e3OP3a<lvY=F>x%|T$;&S{;(Go1b!24Z$C(DdXEG(N
zUAy-D`SUD)pFLZ)Ws68Wa~H$q8#iuTzb@`-W@fggsCafnboA}hr@0l6X|G<ggk|#r
zrM43<UaXjO``R_Jx)*28O+WrvYvZ?X->zQ|PbvkvF(yW5LsqBayYIiJ-r2T&dvQ^b
zPf>AyM0)!3+qb1R?%J_KLrY6(3TNlSvWkisaqcg6Z{D0dX}0%~tgNglYtEfN&&|!<
zDauuKB*4_bV8N4Zn>H<avm)G2$#Ai20MK7~dFvPo%gWl)g|uaDeOCQ=^XAQi2MY5%
z1;78SG1AWqEi&HjcI4al?;9mtr%j$bxv!6J&B8M&OUyoh{#;vIt91C@Jvp@rt70@H
zbOoIj284!&y1E{{cyZ!^<xEqiO<UHrB5(S%X@36xr%#`r=otF+%UVIhp1;3;Ut(^Q
zXWOgQ_5att7uU8nU0nP^ibI_(Damies}#R^hU!;KmCVo25ME_9b8`9_&(gUk-hS&z
z^uK%eZf|Oolac+pix*B?FfT2gedF1)XYby<`}?;xKVQFb!J+=_Elo{Lj~^#bWUP}c
zy&@K)+BVlaJY3wtp>*T7>r6%+6?^YBH#Z+U<~EUWc0%*9bwY>FsY>v0nS3~$o|d*j
z-jreannQBmKYS3_w~J%n{{6|Hrt(gTG`r#WnwPns!H=<$cLA4tqtxrS3m&>3n7SbD
z#&v0ban&u68ytC*8>MCBoH}F8{>V2fC>mC{hlht>kvk{!?UR|{>^Eus5|a*3ZZ>w0
zIGCG~!cwSf_@k!a_X^b*hl)nEhd1-nW=pgkdCx8r>co@xAv*NPgOi75E;TF2d3gI)
zd-lHNJcb8({VX23Ili2H*na=+-HW4ky#8?GZ1UtRO;4WW$8VU_C0gRvGlW_2Pdt>h
za<dIkxw?PV6oKO_r+(ahLntk{cd`?Y^24LO!iQV#6ddX(b_>p!bc190N+#Yo_i23c
zTO<zTCMG%_<@HlL*Rr)&w*SE&>3aqj9=OER8LV+FaPq%XP!t~>tv&x*8rvGLkMCJ$
z&lN6x{r){a3sZ1#@Q?Mbi>mrIGOc0IKESmBh5B=!>kli>AuaAwHr`F3;>FX|&t;uc
GLK6U|Z!MGn

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/payment_email.png b/Telegram/Resources/icons/menu/payment_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a1c5886335ef2a20ce8b3f83c09cde985f0bcea
GIT binary patch
literal 757
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfhpe8#WBP}
z@M?%<c2b~3=^fKR$Brh28yU%pDhCg_xhiR7sCG0pNp0!)$!>N~Y3@{m6_;<ch$v-D
z3<(S4yrq$)oT1nx!O`VyW>oxvFTD4WPte&rkM_QwlV5rNn_lzB|8xKTt)1xc<>;Q7
zKFhAZ))nhseDTHeM?T9h2dylrtJ}AI`}ggR{e69}zWyq(@KF&8TOGRi;)<(TlTVfu
z7GBKT&feU3`|ZDCo#mG;XP=#Pa!G{Fy)9{*Z(htOv73MV@kigclN|Lrm@cbs^)-^<
zSz#i>mmh2-@xps;n6qBU*~cH58V`Iw+Q{G$YBxXMM(*^}qEkAoCEp)DbX1xs;I;ay
z+3d4^%ReU<DljxH;VUmMzs;>9!u3LL<Kg2Er=3mvS!0(7lBt|Kcdn@vuT;5a!lfC4
z2Q^qUFKC#Ed92{Dv9qhIu1?+<!D4i>`}ET!pSyX}9rnicudS@AQkr1H=;-9C@QopG
zNswmae&)oNVYOu^yp|S){{HoAml#Kd(aeCwzkgSEAKer=>ug%^%8(<%JNNA0pB#IQ
ziE+y5r;{fOABu~OO?(}+QlytvajxIvYOdC%KUHPBWt*!jD;4!lryEGT`Tm=!u^}M(
z`1;E)wWfM)jXIlRbmHjKqQL+8A&&|y)`q?Q^~*}ETTm#n!ba{=tVp-X{Q2|w`S_G3
za?ENd-MMq;!gtwC7c*Kk=Ul(Bo^k*E{)mXksK;3{Gkx0RbEn=^oqaYfMtpDF`%j;Q
zHXk-Es;H=_s_MFzylH1l-t^DxvcE*RTJ!SrKc-LWe*5vG;r#Q~GJX8h<~QsRYIS<3
dF7r?Ha{O*tS>8ux!R(+U=jrO_vd$@?2>>11J?;Pi

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/payment_email@2x.png b/Telegram/Resources/icons/menu/payment_email@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8af89a41e31ea3a387669df22bd6c9035dc012d
GIT binary patch
literal 1461
zcmV;m1xosfP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHA4x<(R9Fe^SV<_iT@*KDmLX(F
zGK7T%$~=SxS%}R`gaty`(Z@nchLR!{WTR{>WQtOh9b#opC?YbGnatnsbL#eg@4f%$
z|2(g3zSpyOy7!#lIrlv0+<VTskCD;O^W%a4nFmb2{yjD}Hs0ReE-o&wudh!}PhVH4
zS%Zm*NnBi9YisN3>gv_i)rZdW`1rWJz1`E(lbM-mZ*Q+zwN?Q*qqes8`1n}I2ED_V
zmzRNofuNuuO{*BIM4OtL78VxP*VntbxseEbGd4E1va)h`czAGd0J~gWUBL|u3`|W;
z_4V~7*!%l?e}8{<b@k59j>@$R!yFtOCMPGED~5-MlarIp%*+%d0|El->grfPFE20C
z($W<08d(1R{+pYdWX;^%Tx@KtdSORL$A*Rm>~x63RT!(6l_T+?7Z(>~O;b~ov9a0^
z>#7S658vJ0B_)lGjk+vtV?>I4gHO!Q&(|jWJKD*~X=Y}IY$_@$`kkq6hFv@{F+nQw
z^77OPDWMR)_4Rcq#OZ_2l%P^xad9zO)7;!F1rX8N+BzmC=GW(g0j3II<j=FSGpL=N
zomGHISkQ~Z3`y)_q(KS7$S5QvWN2vU;o*VorZ=V_f+ZCJv9z?5kU2Ry`Y;lDO-&7n
zAtQ@yM6<1}4W~xe6x}gc001VHU0z-W7`s#C$|-OO<>HZ%5fOo9kPm73ySqD_<gl<X
z><>H`U<x8}0h8K<szQL^;9ya|gn~>%0?2+M8=p?xsi`SHKR*!wB3Oh0SOj1{P@s|b
zMXrR>($WHT$gN^7#^#_%VM%>^3mU;9n*f&XC+ssUv9PcpSzaWeJOSO?+bgn25rQK1
zjV>MliXB9B=`^mYs=^W|EFw!nxxT&zy0Ws8<1tsOtN?&P527RHg52C(u<)RL;8x*}
zG!S-nb^xJ(b5J<n%E}7F(a}+kC7lusB4X5-at{v=PL?-_br;A(9Fz&81>;!KDT6UV
z24lezn>gN}x3@PEgFl)47Y8V0oCZ`6qKJ8cH|X^Al%VeJ?wl6pGlM&t1Q`rPnp4Hj
zFZ+H5;0?kayuZH(TlDkN(h^!`ure|-n7qP(!A?$2I2f`hQBc}A7H<&P`}_NNi@h*x
z9UmVDtGv9NeLbg+O#uLmrlPaaW`TuU3Q7VK(L3nq=)eX7RBXqzCdU6x_QwZm2)9^Y
zUmxi6^Ya{CK21qU`PB0f6%{2SG?fl&%CLo_qobKBA0Hot9!se09?i|oZ*FcN(B0k5
zw6KAu;_B(?No8wqZ!bGL+u7MUAt8a<G<2a}US3SCfkAtFI}AdMai<ZXunB%r*?yFj
zm65->cSS{os97%s_hNFAv=Wh6XlN+7<N&r9rXX^u85cSnG={;g0aof=TOR{AR8mn=
zQlbw7I_i{~7S__z5?u|t#Kgozj1?5>Wud51Yxn&8EbSZhN`4;$$Km|^9Dc$(K0f~Y
z7Sf<ODJcmaf=xIS1qB5fB)<=egGzpaS%ZUvxLK=TD?L3OIS~6sy@)C#er2q!t<fGw
zmh0;3ij0gD^ElIGVPSznHa$H}BKSGMSOy1b@9Nm&|9n2Swzj17=;#PFVPj(hT>!?g
z5A_%i4jpa>47Rnkm6esXxVUK0ls^IB4^U@kC#5L*dWAO{G~^rP{XbbrlML3tFDV2L
z?zz3a)wKz>qGY0*j);g*h^fMIYD1==0?|RF06^?;(@;SEuzo!7S9;)IpZWN<iAu#q
P00000NkvXXu0mjfSh|ZC

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/payment_email@3x.png b/Telegram/Resources/icons/menu/payment_email@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b47586e27554598c283cf4f5897fb267ed64cea7
GIT binary patch
literal 2254
zcmV;<2r>7GP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS@I7vi7RA>e5nptQTNf5_1(e+-9
z=X#-Nydrp^c;84Q1O+2%5D_GTL45N9QM^z=-_~0nL{vQR2tm;YHDJ_8L=jQ(7V*CD
zSnp%^x9PRgJ3Z4g-+c2Km;L4;sj05|cUO0Hb#={GsZ#Pu&OmYok~5H;f#eMQcW0n-
zqK96qR;^a8TK!t~(AOVj&%Jy1Uc7jb(5|C5EF~qSd-v|chYue*bZF<!om;eMQMs~9
zFBo?1+O<=sPMtV$qNu3o<;#}|wKFd8^z`(lOPAigd-u;6pN}6u78Vxf=H^zZQYEet
zM6TSlY12)cHhuZ>B}R*!;x}&Gm^^uMYHDiyBXn_+m_TdSu03nkteG=s)~s36q4??3
zr!!~HT)A@P>eZ__-kUdXs#dM~TiMg3NfYLxSFc|6>(_T^@rsKsTC`~A&Yj=BeKT8s
z1Scma=h34_j%g=4?Afyizan1P2f@np?b~<Bk|k%)p2Y?S4%@GJ^X7JhgtRVLu)r}I
zV%?M}Q>s_59-_Z??b>bKy4B&#j~_oCHf&f3w2&$_YSh3_^a+0b`t`hd^WcX>{I1r%
zefw?OwtfBjRlqTI&YU@}arL`WME}_%rKP3PF$9j+xN+l%;Qxl{-MhCVv~J$KIYN9F
zDAt7ipj)+Y;le~rXTydKj~qFocQk+ge3t=5#nL_S-Me?=$B&N+*~H<XC$8wWO`0^x
z6pMhvE|PArs!yLj5rFzZEL*lrI_3NzoAJ|#v3>OD(RvIVH*Q>v03pTkbHa((_VD4u
zI(6!V#4^=5h4u3a4>4tYIlq)WzG9{TddH6+7u#4vQzj&b2qC!p_wNrFEyy!Qj2N+c
z_38^3E<Anu6a>~Bf>)R{ArNptWGb&-y;5WN@Zm%2)~y37+Qf+OBohjh^D0PWCzs97
z&({}O=0ztEKrCS5JA3wQ(cQg!w{64$+t#gHCx}5}ZntjTNDf8Cmp~X5-@)LJq{xES
zvu96V6`MetHf=tC{;c30Ja}Mcx(;Qs$G30aO81IjKzsM@{k`mg(8s3)P(jfFWxkFX
zGe(d%Y}jB5#K2j+c(GtjojTR7Id<$=J#rGA*-P9tO)Z!-At2x=`r5|HMpRTPY`O3m
z96{pt?b`~7ZD!AIaVLGP&Ye3)UTd19a}YpGY(w4GC)ciBEAp9{nL1hwbdMfA1cijq
zqDcVI_Z8P+U#C@Qh#@S!0Ai0NB>N(~YSk*skZeudAO&UO#EBMBf}2RP2m!4U+w^q<
z%F+>6ICXN+9k*DEq^;@T!GmhJY=(OE>UoKB97$wH($@n`98_e#0cAhm3JMC;s5pB}
zs6ZUKJ5WfnC~(xuauE_Nl9nbE1q48g<cbw5MACA_PVs`E9!TX(wO+n_*-H#QX{5Ar
z=m{MYp)2ZuCdi#TcZ5ksBD90>G>j^zq)t><9BTUOz<~qR>&=@tFI~E%HwC9rL|w@X
zpsTv>ftG~W)3CaA>k97k=g);U3GoM#K(jSCN7Mz-RhNTD_+;loI|xt1^vR%d=1`MY
zGMxqu8mL!N6XAy-L>)k2y%4CbN|WVm@H9-6eF?U*uS^gD@q7S<HWf+nglQ?QdK#v$
zl4ZpS)8eSjnl+OyLlBful@_~5Uls=xH7w!8Ygk%ZnqZlPxKP)wUCq|u98uSIfvK*y
zl7*Q9isQLr9Acuw*9M_YLQc81ZQHu0yrzoDK@oMuC)u@Z9zCi(dGf@B`Uk|T0e>I~
zP^}$1cJva1Pbwg-_Jl~pOv0hqs8J(RMsYZYq{(8K$hZ(kj~-QLJS%RwBSf20sU8Op
z9_%upGS-eAJ7iRrh4pkrK*YyLYWa}o)e~Wgk0YuTBX{lE6>AcViX%Vl-@m_WcSOrU
zg9fQ4O1BiiUB!HuOq-e;{%+j3(IU;vMRIMCs{Q%%=UuxSGGvGhiKNk0#-GV4Nhnu9
zgg(pJ0#+m!%>xGx$hghYB|)X6q(lU|bm`)6gO|km_3H&_<j9d;Vu~MsX`o-fe$pMO
zQ&v`%^hi>^efxH4EiNvWrZ5C`Y{B9>XkRosz&5==pmbv@=IEaXQ0F$eX3ZK*65oNz
z)?y06*rV$lI&?^En=oO5-sDQ-llp!WT`vM*z0^UXNSf~@toT8yfUaZv7n5G4_H_OF
zbxVX5HDoxK<XY`DN(2xy0Xf7@o;>NQMFgHPV}^7TFCj+<o$-Y>ARG~#yD(Q{?jz5h
zJyQdP2vXw4=d-i3sq@^we;>v7@87eqD_5?x=Rg4mRxU=eBQ*(DZ`7z!<!yl}Vk}Q!
z@p8eKPQ`MyfD{WQzCpH?k&zKl@n;vqH}>t@C$_QKEa}|OZj57m+{!LqyePKax^*jb
zF7H6D_*cGB=;sLqbo~si`0>Rv0)9)wWkJ@B>~8MdxsDVz9(*dZmYYO8$o{%~P}F@A
zBdO1kbNFjoCD^q5o`aJLM_~G_vI%SCey)E^Pz!ka^l858`=(vyp!jIIeED+u7z^5#
zEn7^nAH*To=GTc-UBoRF!I4T?mv212rxw+lyu3Uv;CxngfJ~b<ElxAy{aGL3gwOa~
zG0cUc&czy%F_8Q515#f3!bT;F2a`H<=s>b&YO#U&@l-{wm_DO?5!QdP;F$h^uf$t!
z;(Dz{@1i2<0Rsl`J5v@Xpe0I-XmRY=vFX#NbK{C|^zpi)Ih1PEs&QH3(<63v>eR{g
zg9u3(S8^_RM4-cm4=3W6&e0p@FcsHo*|H^3l!r)zJv^2|r$asYnw){;3?yeDIRnWV
c_+QSzU%GBtl_rN<MF0Q*07*qoM6N<$f+zYn+W-In

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/power_usage.png b/Telegram/Resources/icons/menu/power_usage.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6a8015c66fe139d10b17ce709d4465e0079cb18
GIT binary patch
literal 511
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEYs7)F~maf
zZSd}OO%5U~?|3;c-nezcgH<Fdz%$>2<0Jc<j#kmBqVf)h)h}eGC%M1l7uc{+rRC7H
zV-iuEoK^lYPG)Ov+;LaEI%j6;w>NWQyQ=E{Ph+_I=F0o;yoUu`CnnBlQ#tsx>TB))
z0*ft6_(Ph#MO-)Oq(_$RzaQQGp~yfY$87e;iZ_*V=dRx{IjiCsF|Bry;1m_l?YDcM
zSH`ULXH@5ETA<?{;~a7Qs~BhWyz}Xf0tNfbnqm@!V;m~%=3DnUf7-A^^y%uD_QMbJ
zwtHWmV&c@ZEHhD}&rMmwx;JCiy}a!YOy~MB`ltzC;+r+=Y}&Ncy+%=M!wU2w7@1#v
zttyn6>}GNK=ET>#KGcVX8niqu`f1{*(0_b!?(GLZI(Ki|ut;P1<;;x{BCZ!F1^oQ_
zLtve?(sG7RPm2OWP0tr!TAF?8%6a{izt=7ZH||rIxV+HBw@`*Xyk!6V_19mwv3$tx
g7c;MYZ149#dhXK+txLYW{|gFyPgg&ebxsLQ04u}Cr2qf`

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/power_usage@2x.png b/Telegram/Resources/icons/menu/power_usage@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf2e46f6cb8cb6cebd7a1fd6e27ce54c8181a9f9
GIT binary patch
literal 902
zcmV;119|+3P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NE@JU2LR9Fe^S5HVfQ4mhC%uGQ$
z6ck>>po5SSh*t{~0--KlL=Z2E1S$x1@+b&`hfvUShc4c_bPQ61u5~a91Oxw}5LiK0
zzmMO-W4E^F?kd<}_aL(~-^_f@yti-O%#8fV6_6_+S3s`7->!gyLeFS4uC1-j&dyRW
zBTZjlU;Tc+Uax<CevSnH3b5I1S65dEfp8Ofn$2b`7E>yfzow)ZB9X}Z`};(Ad<$}U
zdAYE#KuHbL_m<i1_Ur3wl}goaw^OOq&CSj0>nlA3-KtP1%w}^S5OBNQK%ShO93CFh
zT{u>B3V*BBYOSoSa13L=6bc1I#xk&4twMt>EiEzYCK`<j^%0EI>-EFo5S)&Vjwnu?
zRkpgiiV6dbPEmZMnVz4YYqc7Dv2!UAIE2U!7qxCep%9iGB?mFRyu3grS%{u3a0syt
z0_Dxk&1^P{MhL`@gpEZ=tJR*JovGF8+uPfbnFIpHB9zPJ*4NjO>F(}MU_Lesr7f4s
zdwY9qrF23*pU?02GqI!*(r7eJr?XTlu{X7f%}%&%u~_o?Ji%{lY+y^{_3`oX;o*Vk
z1q%2ApPrs}IvwDpRA_E)4ohcoagpT9WHJ~3pF|=-l){Di`FV%K!QiD3N~hB}eShYw
zR4O<@f9gePL=!R?48dR!4f^=_U}w6&zxR5*qCQ~6{q60Ie91%;!f>P0>F{ww<9fXw
z6BH-0$K&aCyCjDw;rRHNSwQd-O^9SNnM|1A@H!X_c6WENoQX-GfO1x=)&2c_?0@1S
zahJh=XJ-e$XxzcUfwZ%az1s;P=@r`E-bR#gIDCG7PQr~ZNGG(syqruXi^byjB-jx+
zEyLu>*zgTygLq|^%f+jwD4F?{WZ^|}D)jX9#GKn(TU)&7ag-R)n1ip;Xo!e2^%3^Z
z5BVtObgx1D-Na>R;upnuJTBy-_`PLpg1CfW?5B^wY&@@wT{3~IG;e5GDOW(QfLsB&
c0#m8LKO^&IsWn@r4gdfE07*qoM6N<$f-`cJNB{r;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/power_usage@3x.png b/Telegram/Resources/icons/menu/power_usage@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb81ed700dc2843e7897dcb96daf0bcaaeb01831
GIT binary patch
literal 1227
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz+&p@;uw;_
z`Zmg2qcl*YY`u3}Wvfd^$^wHAUJ`*ylTtDi0+W`_PFW^l94yBy!YLdqtSa<0RLw>1
zV|&XU`M>|K*Z&ItT`u?C=G)Gq+vQu%-O66SbzlDazgEwG{p_5d;9#I2A;81I#=_jh
zc(4J=tzl>8vvm{}7JmKem6w;7kdTm*lhc=yjY*$BeJUy}+_-I<nZ12|MMcKZsaf|o
zY}nA)*m(W=_51ff{{HhvMq0YNvorAQ`55P*piAe@ohw)PrT^^W#lW<*Wq};4mUe86
zii|vY>Qs{Lyg74XVq-T-SwC5^V#Ss%CfAG~J$wE<J}z#P*W^zR9w>Zl3wrbNWoK`%
z>C4j<<_X#P`9Lcd$fTvE_3WPb^+1;6XD%m4$Hp^9q`P{0dT!s2J~VCe<Ydz<cX#%k
zha)0O(-+nU2MecOx_&+V;N|=4E?>U<<lJmgjq|sk7TMa{d!N+N)ji33#l-I@+nex7
z_pDd9Ch<-B^!Radb#?S4O>N%ltRObG-3IGTH*DLsZN-X?MN&c<?H4Wt{FROU<?9=L
z?fUie=gz%*_bx3xeRf&Wmc^esB)=|7oIh!jk&zKo^XARQyvFZ*zcC%YGJn=ApaWg*
zRaaNv*?heqLx01)dvUX(_A#&7vuDrh)!iOX`Eu&(>x+vwZ{93i>KJIlAuTO^=^Ep~
z=9ON>F)=dh<hDpUaq#npZ~VF-E+S&WpE>jAZ(de0<;&~WuV21=nIoJM?RD{CK~I1G
z@#DvX4c5qf|Ni~UiSQGrPtTq`o12Fx<?bz}GjGenLqawr=H=xzOuPDF>c)vB<>j00
zellz8=uDA+CGg|duV2^q%RgiLJ~^tm*qGbr`<7(um8S&-1tac@rWco#n0&Riv)i|O
z_hNTFrgcYmI6qpZT>020>G0vhD_5?()hQ<<6A~W2fA8MR*^xO<IoB**x^&?}M{7ly
zKU&(_FMll0%~|pF%a<u_+_II^l=PZR`23a!$4&6}_ct{)l`wRcd~G5pEBiGkvsRv)
zgX6$#<1+cftSl>Rj!%oMxN}^9HC#Gh=lcm><zw%XFFXkA6G_c14oHwFXk3sq(dLtm
ztJ(2Kj~+dEkZ|eC_wW3?ycd<l8C&;m-D+xS+4<d1qg~(bEmK%nnA=1(HMKVtg-Z5r
zfi4_2;jY*8{SI7u4AeS(?PSx<{@Yk3^b&UN-02}zEOqt&zkhl145sI|F&t(*b^pG+
zw0CIe)Y|lTQ;$ja#1dAoUY(np3-n~Xp46?CA96$EY&JabNIWAO8dxoJ-Qm>3j~@f=
zE1n7}FPl7h^2zme%Vl&6YZjW{o-$SL|EUAhrcYm4oSm(G@}9Vqv~+V*(~=!IVQR)7
zZ}tm4V3s#}x#aoZ^By-0bn4uK_OAQ=rrn<BR{y_{*NH;^?)1N2we*D2w}bngH+*Q(
h!OXd!j4UJhgL&l*nGcprz4Ac?iKnZd%Q~loCIH^>BvSwY

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/recovery_email.png b/Telegram/Resources/icons/menu/recovery_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9d149fed2905b951987a59045dc16d7527210d8
GIT binary patch
literal 508
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEX~u!F~maf
zZLs3{rT~erwlg^YGP2F?6*T$4FVQN0;F-7CKgOP8ZW{$PM4F^IR~ZZ6;9+~NzhRck
ztl9fEmv864(mgBg6I<Ck%jeej%k?k3thu)T?t$>lmn&?{d^g{JZ|<q5ciPBv(%CfU
zSLO>(rUZ$!>YP4e!?@vK&oP<vHFoiO(`6R6Hc6_gToZoi^82scp&YZ|(5W)z3_?5#
ziFt8OvM#L62Nlj2UoT~KR1ji_o-iRH;}cJJ|CHyIufJOLCHr1pc3D%p*g{56tovd{
zio~(3tyOCt`LGDD=~^VyfBbFP@6X#AHn5)bb>vJ}y7sofV!_VTNJoK&LK$@)XSKrl
zYaP$@KGNuFIRD&u`@9q4j_+MI==_rnod4ZXwq$SI`+MI%iv)`3Pv@?DwfJqB_3dpR
z_ip^|%cpnX`hwTH-v5@_di!l!WSg4A+ow&szQI!hE}Xs3A2w-8+<NySX^Xjjp`lw>
e%FnB3-oGe*QN!`cIlvHSVDNPHb6Mw<&;$Upj=%f>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/recovery_email@2x.png b/Telegram/Resources/icons/menu/recovery_email@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd378b84681a5cc27236c91a26e0e7629c20ab7c
GIT binary patch
literal 734
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz~tfS;usRa
z`8IsxIz~s4yW1->{xo!iDFu4CEL?OUIAH(!0FM`cj{RcO;$0Y?>G2|T(eldoM|{)L
z%hJ-1>nT=lzIxaC`JC$KXWpb8D}0kIyMZr)eGT*cw+E*0+goB4t0QJSvqvt?qH1p(
zfBWILWyVLiH`LhK&-GLM`1=Zb(}dO?0Xm;pTR#8%bH$Ivu%rF!k~kxuMR)TK-~L#!
zCqgG_md;se=>=D_c-x&>Hs4%x`K5<IC{sq1ra|aq&*H@wIm#BYa7kuPJ)Qb#d)#_y
zK{*!3X<q_8mhCF)stx|*^|Z)RGIQR;mp;=(AC-#mempGl{rBI?FSkUk<!WuRS#`c)
zQ`~yT_6|AE#csSygESY+KKra}_uI1FYP(t(C8oG7ZVVSPeE#c1)>g0Vo`y~9Uh}ar
zNBCBr|Gequ8vg)S1_rkZ0mpU@#?;!W4AZ%luVig~{L#Zy;K5X7&V_Q4%k(`y=u0s@
zvz_TP<+ECA!*qtzaamt}n*Fhubm8?^z3JRrTX|2HS-p)v#mq26|CH;*Uozk1W(hED
zt$)|Q>GXnKk7vB#)^T=9C^dPlv10!^MXlz)-Tbq6IWD;Qa*giami>}?aT{*tXifE6
z8NyV%|Ni356;?e{w<vNf?7W+ITtt}7t^QSusobL5ZHwM);yYTv(e9lzQ_gU47R#}j
zI@(8=MZAx#^Rt-n`9k_pm2P8Bu9LI6{tGPl{8MH-pUkI^{gHapPn<X-Az9(Pov$G9
z5#vqsd#9bAch0+4R2&*F5;@!8XYjjkYt*Gdv3;$v{@DTfw>4}Z%)NLxKxxa<)z4*}
HQ$iB}aF8%>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/recovery_email@3x.png b/Telegram/Resources/icons/menu/recovery_email@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1372dd22cd3ba51100ed356d8912dae1f4cec9f8
GIT binary patch
literal 1185
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz{2h6;uw;_
z`Zm(mTRTwT>W3=}1OlZG9&%C=t5e)2_OB^n`P5!B{v+qkSw%%~gf+EJRk(4Zv!mYO
zkAhg!4bGK+j)+`*QT@EKbk5z~<=@lFH$ObM<igFJ#_8wg+@0(D&CKM4yNCd*3uB-I
z3bjCv%jA~0ti1gEnKLD2WZt}bwds79>Zf<_-hKL1l%D?l$rBZ^1NsxLUAy-6>(~DN
ze*4nD4Gb9#J~n$9R|IHW*{bYbIAP<<x8Vujf7ZxNmv6PTx4(bqj)TpoE4MtB2G!Qq
z&h&8;Ws(etiizn75&te4+Xyt|^5x6Dy`gueP0ZSyB69RCFVm|#jY1t8zrH%Vb*t$v
zz6+sW84A-Dm@6?SO<cgw$0u^_^5x*zbE4_|ObZtNXpo4%^mfX-M{={?>{#D$V)~@*
zjtnLtu}W!+1TRP|RkhSzu_Eur<qf%KLY3$G<>%zc$jLn`vb-Lo)84>p;k6(@ry)<k
z=H*q>w^dK{b#yfB|K;W7-Li?ebD=HSfpNltzz+6VKR!sLw%a7vOgMA?{QP<I`g(g`
zzPMV&P*hgN=HT_D^@L<|V$h1EOH<3sr<b&T{Pk<smMtQ)*o7wY3G{UeX&kw2@bRHx
z*f#qMckbLdeVTiDQAx>_%a@Z`&o)hHa_M7^XxKbK|ML8Px%@9IOkcl$5AI27%YPIc
z9PH+j%XrY^VJxG-hNuVj>{pu}N+!JC!kCqn6%`v>TVMbDNsd}qwx5EmLIcx+&iTCZ
z!Rrp^^P5;&R#sP^uHL<C*Qc2p5l#&K?p6*mPq#8x+eNLq94Hz9jKzER<etB>477R9
zA~f-x&bz`8QThIwqE?1a^EJK|H(3-Yv&hf;m)y?$X^zHzd;4$2kJ?!_ANrWca6c_W
zfu~{WRMG1$55qO52|O@X-=}Huul?C$hl7qT3bl(?+{<~^GW*o?jkfbA#ILkj{p#G~
z$B!RAe7JV)TCb&x!V(_{`02d-Xjs*BztTmgtiHa#aMPYWHda<#D?WezoU~Cw@Uq(8
zXT6$28EP}@Ry@BI*A=2x=`7_P_c=rKX^-n={hv9O$tSbr)-IZ}G2@r&eA$9yr=D(l
zbmiW?c{Y}Nl`bkIRrP#gF=<=>P>atx<nG<OYEx4FC@@H^5)(9@%9p{De>6m`?)>Aw
zKE=hGIage(o5IFemG61Pr<A$u<E>k_^z`&R)N>~1<>$x8$KTH9o56Ma_r}FD&!(lP
zr?<DYg@}ENadUI?S~|(L!~MyTBQ59o6aOu?kd#hwIN6-RA%5l1wPK?^e^)oKooLB8
zIOEdo+q?Jg|NrgVv-lllt2KC;79=it5yP?L_?&~hva+(w%*>6uJJ+pw(O$8=b^B_5
oe*TLKSsYO^BPeVBGiUwB)c^l$`h?v(K&1nNr>mdKI;Vst0FDg_T>t<8

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/remove.png b/Telegram/Resources/icons/menu/remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8c9534cde412f43878f9ed9efef9c45c893b46b
GIT binary patch
literal 516
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfEYH)$F~maf
zZix1}W(SeCza?0t8W%{v;PZIJ5a=q){er3Bhnhu*p#{&nCKjPA4-a9P#w9unIKmp7
z_f9^3nj!VpGt(7)yXF_an`2#^F4nz0R{pz{FiYa@yX&rJ&wJju^0k%cq{km4LPe*3
zGVR@@lN~wj^)8v?OEaa87fwsfy}fGHuKVu=ZRVdZSbijs#p%?hGoNEbjs`xu?zlk%
z7$~#TesgSLc=Frsut9A}jv^~V0z<zs^Z9ML8I=J`4>K{uwjWM(kew0GeQu>JZ$Q0T
z0>fqLE2XmSR!{GAGw^VotP|okmvt2^oG-QfGN%aBZ#A)Jsyv6!-OVwZwQS;*3m<Is
zIhb75U0<!@sd80YY2o#rIKi~(GIHPEY^x0@*%{O1#IRRs4})u<$D@^sr;Rj3Zsc6=
zzcpi{B%4rcTD8)OR<`)+EmQt;?DDyM=WW^a)2zz3Y8`Gcgl~*mD|6hCXL07N*~!a9
kUI`@pd!4*{<!`@t{E3BIA6u8EP6Ne&r>mdKI;Vst015)UBLDyZ

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/remove@2x.png b/Telegram/Resources/icons/menu/remove@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b064e3efeba522b84d08b3a70de077c6d26d4826
GIT binary patch
literal 823
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz_ifQ#W5s;
z^X-g-T}p-mZFf_@sx;k;aTIhtzvu_Uz6SQaKY1P<T)lo7&u6B2qOLYO<ZLuFDg^HQ
zz1Fl)J=65$8=lA)GPB-!U5&5T@?3gpW5kt394>-C?r_u;xA`x>yf$ogfX1IarUi9(
zZ&mG`=cD%f?>)(z=M1KLef|CSV@1u*n7aF!B?}v*PL;g~yVdEEWFYaTY_~%1<Bt~e
z&&TKWirY2s)ktnyI8|BsY1-zUF?vUDeyyslt(E0#e_9l2?&cxRwW8CmZN}?a?<U2q
zFSnb|I(O%a>#x-!RxH#Bo57rv^fe~kM2hpp!-9<Mx6kw5%T8!osKD@b-{pVZiJW4u
z7e}qV#r$XM0fFL!KLh5>sF<nwz-VTVwDiV9F&2z3cFemWwW*79M{!P5GK0%AzKH3y
z$IGTFSg)C_(Eq?Xpoz00;NPFQEowj8azDk~c60tF`=HEnvdZZI50y6SJ9B~-U!3r#
zg}Zq5jGpEvX^F{exO5h8?XX?GY)-IBOtQXM*8wLEaSJ1(*JZmmeeqg4X=3A2q4e$t
z<yNwHzwFjK_53r3|8n8q!SDa>NZA;{z{j_=yYHK`c;G#SCEG6UF4`HhHth0KewE8F
zOE%xs;A#lh5-nU(a#wZB-8|9I8*9Q=SJ<pOAz!~Ktn28aL!2L~Tb!1?+1Pyk9dG9Z
zpD?r8p*6-{$A0-QdvkEr4sVT;riU)U9ac4`GMuMpo|qE2^s(|xpEj`;zIUR+35@O<
zeN*mD@P99)Ec4gOO5w@fhp%FPI!^ebbwS}tEGM`6{;nF1i+^^pajNgv>pIkFQCTuo
z%x{hQ&Simb_WsS`(AC`kD80EL>Hb9SFZT^M-}I?F{^3*U{^S;6|01=@Ih$Sen1W=r
z{dWa8oPGDH^z+C6|1VW@hkg-qRp@GnWckOCwBd~GsT(i)K#A7V)z4*}Q$iB}ths1s

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/remove@3x.png b/Telegram/Resources/icons/menu/remove@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b1b337d0deeb891fb5f85e6dae2c176477be9c
GIT binary patch
literal 1271
zcmV<T1PJ?yP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<VM#<mRA>e5nmsRcK@`UqPoc01
zr9z0r%2HB_s6?aCDYo|ob`u{!!6)zq^a}CPP|$d(6oQ6Os3>fr!}EJGPfm_|_s-tE
zckZse8HLQw%=w@HIrDO7&Y42N|9KC14|orF4|orF5Bxe0^km1Vudi=(bhK0|jg5^B
z4h|NJMRe8c_4oJphlhu|ySvB7$Is8t><BnU9v>gCR;&B_``GYp{i6fj=!}SC5)R>d
zdwVOD%GueO)t1Oc1Q7?sAteV;OG``F*VmD(V>bW-lmkMALfSPpGc&WbwY9LY5MYBX
zmzS4EM@Kg|H~07VZ*Ol*Jo>QGhK7bFCML?|^5Wv+?Cfk$PmsgO$w{qNySlmxV7Bk)
z`uh6U*Owj-HiN^%!?m@w;o;#pJm^MeL=e<Czyclz!EvAd{{Eev9ZiMu-rnBy^mH;!
z2qGQ;L<NeH0Va{c%@-FJn#B3}`TYER60DyxfB>bDQ519Ve<HR13pLNr&sz7!#zuIZ
zv=01V0w@4A{?pS_=C(00^jLj-e5|gnCbq#M2rS@Y9!j&FlX_jfyu7d_TF9kr0vr`$
z8>&+RMvAjdi5lFQsa1vqD)hKzvQP5C(K~xaGcfE_6p1$>;NF|Z$H$_8#T{mlU5(yL
zpy5&x#~iVW?bzWS7>6b5^f$oOnXACTRG$N#e6Qlzqx+y#JPR2&XJroE0?Oe)>uYCO
zpG%<RK(*XNIL;+LF{S5$YB^6rDJ>vZKp8HMs%hcU$wNTMG`*WPx!A3&tO%Li-CZen
zq@W3CVoAsx92^)Y@eRrRz}Ac)1ms%^v1Z+)+lj_V+=2}^x?}rVWZ#Dv^el>PQ<3P>
zz`%eJ<}PeOX<L)ffEXb#i(Z>yM9xH#8@`k~SkN>yy)Y%4VcI3cEyBX>uhBG^P!<Az
zENw(NrIl!mlmmsixw-A_?U9j@Kz*{GTq}u!oSvRG6xTE~y>MrnVJ3EKWK4`HEKdzq
z5prtSl%NtQ0H>y=8p>)KnqIiGZ7PO)cTtUP!~*VleSK|c7&FKDRBWh-N<B)NUbw%_
zFtP_CK$Mdlg8bA4)<e|H(cPSsp&>Y$o>WS~HWjrc#BN2Vg9S~4l#PXn%`h@OBI$5@
z5X=MxO+(Xb4XUe;R836%wTEC5Yj*0ksfeTmPY66LFE87%vTlWdgj>kSq*B+t7tQ8o
z=QA{b-MJ0s<Tm`qpye}QYF1%BL)_R#Hb4R?gm?0jl)$!prjg8q%xB^c+j5(##Wtdr
zge4@@Od$`+bu%HcO{dtgjX0*0^in6ELm1nblX|_G0qpt*EXFqevrp=80OtLkCr7~t
zT0%Nzfu#H9=4Rd=iHY%?xpX?$%*+J;9X{(5ZfOggmAMDV9j8^R5JcQfayhLj5%Szk
zc@0ZUfw-UDJUY-Vqo=cJ*I0yg|EkSn=gG-Qk{f}?&II;uZ*RNov9rZg-{d{uJ>Wgy
hJ>WgyJrK_We*q~~w0$fjd}IIs002ovPDHLkV1h0RN8A7a

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/signed.png b/Telegram/Resources/icons/menu/signed.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab59a070d4213c59200094294108434c1403cf1d
GIT binary patch
literal 578
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY>lUjV~B;|
z-QeA;4h0C9NYsdnbuC@WqVtC#Femql)0C2^s0?8rL4l2%xPLH4-E{dP{fFIEP$cIH
zhnSe%qu+fjE<*aA51I=6ry5&Z-<)fkZS?oH^NG1T@8<2kyKevKvuVXUW2V$hKV51!
zU*3)H{AaGI_G>*B{(bs-vuTsUr=NQ+zYMvq)U`-~BP*uYrd5W|ef{<3r>{OFZ9I`;
zWRzz%JJ;-X-Tv^)JPIpAvi8Q^&oggJ<XNJ*Vq=8QB$a8Y-b*jl*oC`%je97Y_0WQk
zGo#pOX3ZIu##Ode+m}V?<ZZuQwU;l=LPn0SeLt6M|8c+NpY2R}ULQS|wz=1h`Q3rc
zkPr=#I7Mc8vF@jJ``euqpM+>ly_u7?HR@^2{PXD!93f|{g*sgpU%dQMr2ly1fv&LC
ztyf(dw?^gejQRDqF85;H{`+ssHom)>CHlre!9aq?ZL#32xqizFg!P@HS$m3h_RKe*
z?K?@u@Za6M>v`L4<<5VtYUOeb+!a!^Qzq_0h0U=CVXH-VHGD5hGm!XFwRcy@q?1n`
y7A(k=Iz7>Exp3!^<EEFc9csStbkVj;;S%=tUml!hKL1D!6n~zselF{r5}E+NJLPHs

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/signed@2x.png b/Telegram/Resources/icons/menu/signed@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8a3faaf1b9ebe3a1f637b75e7f389e72837df27
GIT binary patch
literal 1069
zcmV+|1k(G7P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFmq|oHR9Fe^SX(G`Q51HWVG1FX
z5{e=c<$+Pk<xPr+(#$-$y?9Zc=3yd4lqVj95>GDW_C#Kkn(^W`4Khedxtp31gIvD<
zU$tjv{(m|%on!t#=RBO&{`Q*nt@G`@*4_jJ$d9amtiTUbAdvswsHmva)Knf3*FHNt
zyS=>?8Z$mV{^8-_L(0eLbf%@Hc}^(E^Yr)6{=-Z5{bI<BvI0Lt0aw|FgoI2_PiJRm
z3;%F5(TRzPuC6ZOKk>pdGc(hNE`4!v;RS~PR|WIg-{042wO%Ro{{FtSw8SFtMtFF5
zY;5e^-JQeX;Bi0LiHV6=`j?j%=#9hCU@-V02}W5|R0LJNEPZWlEpzx*BR@YM3xsTN
zs&{sFmY0{C&1MY$wye@77ZVe6etr&myWL(;P(Wn;{ry0WkB^0Oi+24O9v)6eNB}(+
z$Ye5627!UDwjw+y5j;yvOOXnmfq?-&+~VRQz}3}N9`tOx${v0ijmAUSQ;~0MY`914
z?(PP7e}CW6(ZObegM$kT3o+c;*<qj;hLFbi$2O=|tADHWq1WqqzT)Cy!l56Jd$wH)
zVe2g{EO<}|(Q#0?heJCBXtUV{2M77t=H_M$udlDy*VlPma{J`u1i6lnkMm3^DJjp-
z&%k?odwE=PJ1i^=dke(%_4Pa%ZRf|wM>K98m)xdOM?zIqRgA2xtPBXA_V#uLG9x`b
zy|S_rmkWl7X+%dy6L(8X3&l-NPQJRj0(g3Qs#2+VGRTQ`MgC)BW0*pts;;iaCc_R!
zRq@Wg+c!5i;Ghl!%H7>v3}0VgOG--kpx`?=IG}9s-rCxVh=^EOSz$;`O%3nwyFEWY
zkD$;4tAJyR2$*0Lx2~>^{aO6>_6DEj<>j@tHF7>YJZxxa@I8YszpSXJptzfxn`B^J
zm``YEDB1zx*yA96dV0c;Y7oZI&`?m2XeZb&UWGz&d3i~cc+bqtD3wY|C@U*#dwZLv
zj*gDd<WO|X6UOA^r1<AuTwL7V-X75yjYgap$Obn?+_jkuv$M02k&%==bRy@esVQ=%
z?8SNK=H}v`Ec{2~x;Qd2!meq!jWjhi@nkqjMn^{*8ym&fMyJ!!=b|_E_4T22`OIL?
z&CMkxCGpuvXt%Ys5j`|OqXQGlxTmKFXS>B>fd+Ybc@omQho;?XwOTVWGTdkVfaK)l
nw6?a=R`mnDOerhy-ze}2%QE>YpU;B300000NkvXXu0mjfQDf_l

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/signed@3x.png b/Telegram/Resources/icons/menu/signed@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a9e1011f005dd8c558503ad3338245871d77a4b
GIT binary patch
literal 1528
zcmV<U1qb?xP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=Vo5|nRA>e5T5Bj}Z4@4S<IWiI
z2Sb?LrbxLBg-DYWVUmB!{6L{7_b^R<F({Xka?j<TC@Cc*xrJO3GjhxQ7UO=M@A=wa
zt9SN3`98-v$Dw_GJ$tRS-}hN-y_faAXTN$S{=^7~5fCFFMnH^!7y&T?Vgw!;0Tto<
zMn*=iuC8ioYC_eMNREz<1_lQ1?(QDdyScgf{{H@NCHu9sv^>fyyc`u3rDRV1L+A4H
zQbk3=;JU|KRi3V=r|00{fG2$N$JW+Xxc49$62kB@=h%ayA{vVk5F;Q)K#YJG0Wkvd
ziGX}757`vvGVxsI)x8V~bD20M^XguT!dxbf@EdtC8B>ZmW^HY4X=!<Wem*=rd~<Wd
z5B9Tre*OA&Oiawg!~`8}*Vot6)6<`wBYzOKu&@{!8X}iikd>A7hv_qVaC39RIh}Qe
z#kjYzv$K0f?)*#D#>QrMcb7c5zP@g1YKn}EEGjA@VOm<+Gjq()&~RyKi5ys4TXS)7
zAs;q3H#t>zcQ*;22WV_;B(GLhR!mJzS>7WfBb;`0bd;4VI}QyEC9e(-4;>sFc#O$0
zER{T!@;+*7Yj139kYkusLay7}+nhmXXQxoBq>_w`4DzbExmn24*w~m1ii?Yd1`m?_
zCA5C%z2g5V;SCH7Qd3j8zD`e1larH${rdX)l5l2bhOlgabhYAtmheeQNtBK3>}-i#
z>+9>u#>~u2qK))I>8kttOL$zn|NQxrBmL{wFMWM|AwNw`P1>?2CntplkCn(HW8U80
zlnU&^5-G9){rdH*M4JZ*`EzV_b=B6^_Cf!TadYgRUW0>!Nn2A>Lzo3|adF(^?d@$<
zRTZmJUOYQH%Vq4xj~^0Q`uqD+O557nB-$vQP(wolM=Xwab#=9nA7&tqVdNN`6xt}G
z1OuB$r=+9^DdI>*2EDz#LIdd}{5d9FEBCww(xgQpPnZK(tMc>nISkADPnkGqfByU#
zD=;Q1CN{4rML(LDm{3A;a&p-2ae^Kk93*Xdc{!_Pv5t;TMMVY9X`J!c*ckiIEzYdp
zzkkO;VS0Mn-rk;lQH~f4j*pKyLcB_<w6v7GLZz>#rzeqzlatf@{5)B5;KPRxFh-Gt
zB@_dJv~_iL5*v|=kZN|E#HfRWgal%9b#>+8;Xx`EV1GM1J0nX1?(XhL)Z*eINjQ*~
zm&d*?UtCa7K;3`*_z|6jhlgXoB4J`;qL2ZWQw%?{;Q>cS$AyIjR=Bmbm7AN3w}ef}
zOA-(eKn%*t%7TJ|umF&xva(XxF|t8<<}6WX?d<GucyDiSe0-c*z=tWZv9StuiDRs;
zu1=R6Sj||kIyyRpp8$n~gz!G1!OX#-hD|bgg$fhd6NW}XlET75qC%j*zaPsT%Roy@
ztE8la3;+-XWCJ!}&&oNB>F4R`$+n<qY-MG|u3eyo&!cp8by*%>US6oVSoT;daZ$(F
zI6FJDDq#2=7#PU5plGbBs)}8hrG?w<ckkX25A1cdwY9WOahCWR=k43KWP|aHsYQ*P
zoSa~;lJ*Gz(t^5{2oac@n~RQ)j);iB`SRl8g5&@=V#mkF3%O#{p{m66YiMXd6(TfH
zoCMuZO--?+d1+x)9PaDud;k8u;wVbd6OLiHV<YNtDKj$@I~Wo|LKdJV`ts!qTPsP?
zsoY=r_U#*+95@pe7RL38g`}&ii(R|1N8wTgOQPIqJ+cEIA0IXqC=pQa@!EXz=FO*1
zpRji;`@my)`}z5iW9{wjxO-!@iotUE@OOE68B+yA3soY<7#2OnI3xBVMnH^!7y&T?
eVgz1F1pWpVA)A-pRbi?C0000<MNUMnLSTZ{dA)D|

literal 0
HcmV?d00001

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

literal 519
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgftkBcNF~maf
z?v(vq%?<*`il3WmUW&*NykP!;H7Fu$ZR-SakKF9}C1GKi!8bU~nx-mrOjTUqKfxhN
z+FG$d{`tmrJ3Ku$bX_$!-am70;r}yf^1o~E&i0w4a@iy_G*)kV!n*6(vz9pu#OR5q
zahZS96XU*K%HQ6s(N#H5-LuF>?)ElQp5)zkxtb=VN}efvbfDR7)hesGeygu$3H&gA
z;KISMp>WIh1>z2g66c<OzGof6!N|Z?A+b>B{O1i1nzdxP86*<4rcQbxHrZHx(TaLb
z9)oI!+uOPqNj$&vnZb>#vrf2mZr|e>GyGW-mI%CQ*O)V1qswaYV~hLWf%aeYyHdJ0
zZhiiC=`){yuE~^Q{MFa-+V*03%VzD<Md7U3QPaNePy*^(_MXGs;d-f1g%*QyYoqVB
zzbkCdHo7c4xsD?%@xXUI-N&|0@w@NlZN51rwKKT=a}(<Z_aD2v7QOjieY|kivc}2(
mBwBYFL{+~`T-;qZ;~(qt>>Wn2zYkskMS`cRpUXO@geCwK5ylb#

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

literal 827
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz_irU#W5s;
z^X&}#^NEfk$8H7)dF4BLbc8Jmyrf;SkC|)fd9~doQns9(8F8J*<~u1SecygA?eSjY
z=`*u)m+c7dm}z;wcwTkdvokx*g*c-n8V#7<_d1vu)M`y#b^Z0un0Jq_J@~n2>(?q<
zsornDYZKC}6O<;tD6u;H@I#H=|1X(7i4Bs+%HD)s`&hB(_S?Mex2q-F4=0+<{=38U
z--W&Nk4kVjXuG=|yP8$HGp1|v>#tUF{lEX#+073>$Ya#Xn3l9ZLZ@N%w1e)q-hO*o
zB2;#5QP9d61&M7N7c@90HC5#qOYpRmY`<+f`|R_E^<oYTT+AWy>Tj!UrWKrh{yAu6
zivI^`Mu8n4_K2v9#f5S0DzTFF>0Qv!t;WIpPQ9<~O%hX_j#zx4a>OH*?BjC$MenNi
z&SSAWu<v6q|I~s>+<$VuJXSF|X)YtY*Y!f6W%-2LPkkoo^gAgT+B|&rNny&L7VhE@
zmwC-k(i#oTTBj}F+F`qW*_~jOm}GsiwhKxe;uc0tTcdPuR^6I?u;bA}!7YdSm9Ku7
zZRO&6@WIE5n6+WA-n>@6;KbK&@k!vAP3^8J=6`~2uL$m$a80V$&E(gf2}(R7jF(@A
zJZ-d@>C>fre$CtkK5E7@eUc1$PaW32d;005vuWnDd(*`npB6=Gdu&c&GV5$S-dh=d
zf^#9)MVr++Vh01(R$hx*o3=G2t73s@(c3BO6>@DJCi!P<Z(a58;ECqkRgp%kN_N~R
z$+!B}>cm(S)3KO+*MA?&=@J*8Uc1_;@LVta`6>RUCt;0k3afmwe2b=QtLn_UqxDJ9
zWp_O<SIjHsKj!Nl7oA)y?t0N>j!e~5G2b`p?RI7zYUk$Oe?H^=_HXg_$2-*OPR@K%
z_->kc?S`tj&VN%M{d{~%-L`+t25C2io&%dX{xBWgdm+)g^ZEl&!u53Zb6Mw<&;$V7
CyJi^x

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

literal 1285
zcmV+g1^W7lP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS<Z%IT!RA>e5nmsRcK@`V#H;-sg
zP*4el2pyF~BO<6I3WX1_A3#B`^(}k@Lg6h!LsX)Xpdds^vR*1L&+|(rIXQOL>~-(V
z+P%+J$n4y6{^x(ryxcQqZZ4PoWf90CkVPPiKo)^40(BRGd^kphLZQ36yT8A`x3{;g
zt*y1S6<g2G&reTJ*Voq<7Z<m;x1XP%;Rtv}?&;}SSXkKD*eI1sf1Q5_Acin1o=JFw
z%jfg+^Ye#?hYW(#oeB?8K@oL8JW}!iH90wXdU{%c@(;TJ0m=iRTrO#ZhK7b#R#qk^
zCd$|_2qz~eTU%S_=jT^fSC5a6tS)3&Y3=RpeSLj{gM-u4(<37z_9*S`?JX@W;ba+R
z?S3vUE`EG`=uvrpf8X5PEEbEMot;s5Acin1C~6#F0gr;<S*E$Ud3AMFQ=z@Kwl**@
z5YG~dsFwj^0z>ft<7jntbsZlcYZ6CCN28;oaj?GX00NXo#t`PdN`?7_nVXv%vCUdq
zUS77>No?al0jRfD%mw$2iJ`~p_4RdbZZ5VD4n<%Am+)aU?3~o=>i+(oEzv<P;UmB?
zA--WcA>g;_Y*S)}a0d0tkidi<w;=oE@bIwg>@0vlGtdqyhGe}#z<)G%cXwsDSll*)
za6On4)6no~h%`r_*^WK#fl*juPQL?u<y<*%bsp&DeHFzYErU^sEM)vdmZV!iNe;BV
zTDEmw0woWoIZznKNatc_Ov!m*TJlLKB?aUND4P<gYErml`VcT7hEmnDX~Au4c6L@K
z^!oa`TR8MnApj+aB{Ij+-2{nuNW_y!B706{2*|q>Voq7-L#i=Sw_w9{%GT(i?E4Ud
zp2Mo^88s%VOGcTqumh!LkAw!qpy#mba*WEEXmY}r_AfRx4NcFc^vCX!9_oS8rfwna
ziVYStl?+ontSC^mlcES#SkewjO+(YORa}nAJVfo`;lWmxo~EXzot>Sru`%h1*El#h
zAY*!ad;3mZ)6n#6dDm3b;eUB~v6ZD~YHBLESD*m`l)%~zO+(YOC0&l$(hbz(a?Df$
zjWh1>Y;SKfi;}wy2v80jO+(YORa|R~+XGRc%6WHpCqK&?tcvmR@fvI%&=Av_o^(pX
z<rsG&A_wWSvorZ=H`vWCFE8zWzdg_pKuu3NrQw>2-1LYX6=`YzVnfr=^nOOEp;M|V
zt~PEG?3#)=y}!S2TxaxVW@f5{A@E}eNa8ERV%lungJyMy(^(q8@6;A^NZZp{eq+$m
zSui!LFr6iCeB(Ai3Mr|&l)$%iUL%<ana+zpd`s<BExx7ma@|ZweA8F#oW!VOdbwWu
z&Cel>Z_G)(-b@+1;Xhz8zVV-ZQr-c^xBB_yC@(DIHF&>8`ACd<psAd-w6t_|ba2A2
z>yN}F7UWzypERQv<3AwYu9$^f!UnlA=K#()a#0xFF;q}Q9gu`H0;+R1t%px%14f8r
ve5yWn4mcSy=qv(R1hNQZ5y&F&zeM046=cM4wIyJ&00000NkvXXu0mjfs~J5L

diff --git a/Telegram/Resources/icons/menu/storage.png b/Telegram/Resources/icons/menu/storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6ffd0a337441afb9ec4705bc829336c3476046
GIT binary patch
literal 670
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfr-P@#WBP}
z@NJ0q>dZumdwn8;oiXmGbQg&z+BY|Leq#T_u#`u_V96OC5#~byKbfC|>AB`P@4OOr
zq9N$pX8yHXzel}(Q|p&rW|h66YXA4zdCz~}JN<p{o<INht!C&JTyXt$t=;^SDM4CO
zwWe~-_*%91W{%oq&!s^#&p$5_3qA4rtDBPG>Z`Z%woCUOE8EQ~Z=#_k!qtELafy}t
z;y@d@^<k?^b}m<+=`-*A^8yQ<>8I;ioj4c{Fr*#Z5wq^})1>XUXC9uvm#>{UA%NpM
z{~@Ow1BowHwue5qUVK~Deppe1XU2Y;i|R-1R|P6f{NeF$S$2k`6gyK?+p*e<ra>L2
zpT@1f{`)WAt@mdHXP<rc`RDS>FCXu`_cmx{h=z!QJFmgoN}ITyF?wR%JdShy%x9ks
zTODd5Wh&LHBUTx~#Jl`vPT$cak4hW4Y!fLXmk0w3nZEn)`CFZ4EIa)0!u#*#yYJTR
zclS`5xWLD3wy%arnbq77t=8Q|yYF&X?Ob~>;ecKLoTEt_Z@)d}I?-$C1cqN<pSPdB
zm}3U?zH`*tu*1$7w!JZW?U`4ywq9YlEVVPaYV%DU=KvL<h4(CS*M@PkFlk82w&bxj
zAFSHT7hyMFoP(w0%;n~_Ml*TjxXv&JMd*kDRp}or+Uatwz;F5G5-Z>PZEFNwqtzxy
q>P&O*J>Y&aP&I_5p6k>6_<fAccA^zx=l`>V(uSw2pUXO@geCwbQ48q+

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/storage@2x.png b/Telegram/Resources/icons/menu/storage@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c38320ba7bfa2e189a213de8ecfbafa45371c8a1
GIT binary patch
literal 1192
zcmV;Z1XufsP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG5=lfsR9Fe^nA<C@K^Vp@hvcwx
z*c3VBP!vkeirkR6ASvZg%8d(h$R8jjE+nU-C>N3olv`JFfkGlV6p~{(6I(gk`<JP2
ze=Xl<&9bz&i!~Qtvu57snRlLf=bf2lV`D8=1*{5K75Kjj7(Ow4P*6}rL_~Oacvx7N
zhlj_Hw*t?vw{mrLwYj;uv9YnfzP`J=`w4z2h@G8XZf<UGZ|}~|&Tr|0F%W>jrG~Mw
zF|ClBn_G2tb$NNYzrVkl^x@%Qdwcun=;-$L7HQ~0DOXolUtizQ&`?K5N44?c;bC82
zUsqSx_4T#7-Ryc{VIe~*itO+2!&_Wj%&OVi+Un8Kg#l(515w~mL8yl^(QYspn2^FX
zHa3=#k@0~OdUQYl0#~S@g<Q{Gx4omILr|=&tRyEV>)J_oKmwKEgj^c;W|)+e^!oY=
zczk@EurLp-Zw(cM&_d1-`iAd%hKGlN5sB{Z?(aG+YJd=0$Qi;6qOGkhFrA&9W?-aE
zp@p0wG!eQxMbr9A8bw6olNoH^Zppq~P$TB|+V(i~?GmGiILnWYgM$O&R}`6}!*mKa
zdAM@2a=tQwe{r}9o%q_@+jEQHur&Aj0pts=A0Z(jNd5Hmq&TFmSbjm{42g=0nw_0h
z)9Tjq^YdBqsi`SvXJ=g_3p$8_<>h6DC@CqCqRGq46ETQSh#`fMHsa#Du&^NbGcz+~
zaoyeB0z<U6wY3EV1jr)w?YKtv^z_`{-wWpE=4O3ct)8l?Dh2%V@-jI&Sy@@h{IqO8
zY9m%^Yinm_W`rMnnPgd6nI7h&Z66pISYKaXT3YJh;Gp1-kB^s@mI#8qy}b)n;b!<#
zRaooj=;)Z37;kTH1<MTk`}-Rk8&6J7lt!~FFfzrtxjA%FW@%RC`T2Qzdb*;bLgse$
zkwQkkdwP1Nr>7?-CNgi{WjIQ5GO`grA0Hpj&d%1>*3fc(etu$N!lK6p^Jr~tO-V`7
z98BHF1}0-ABqU^KXJ=()#mC172M3d{)i#>-oSdA&!9gD%AI)ClMqXj8$lcvtT3VWM
z-&g#`dr~e#)YQ~S@v%QIFE0V0d_zNni;IgCOu`67TUuH~EV4QL{QM+9Zzid!scZxh
zx$LB-rY3?$7OZ8*jw1|+B*Dq+F)l7n%TT|K7xC!msCWzs7J`&F9tVp|`sO-?(gg(t
zBt!mt5Da{gXJBB!%gak|WD~nAHa51dt_~-hoSf7YH#axTQk8}-@PIVLNFo`L!;Btu
z<inAXk@oiX)zwus)o1FgJ?U|1Xz29xRGF(}g-aQd6crU2`KRZH35DLnSTFKWWMm|H
zNQfa+!N2qKb2JlQT<8Cx#l=OgG4DyNEmj4r3Ro5RtH2+nfRadR6W62w0000<MNUMn
GLSTX*cpw%4

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/storage@3x.png b/Telegram/Resources/icons/menu/storage@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..532f2ec0f115a06a9bc9e31ff1f8e271b1e20821
GIT binary patch
literal 1816
zcmV+z2j}>SP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>f=NU{RA>e5np;Q~TNKAXH9^!O
z4KGDuX;CRuLSZFQc0=jKO2~vH1Pv>}P_ZX{G3Ww536;GBK2$<r7f7w_Lf%q1CPW@A
zyNBKLoU$9%`QgxRJI*-YT+Ua??1%4LvuCgWy3F2duf1kG9=Ew3a6RC9!1aLZ0oMbr
z2V4)h9?<rHpLVys-iZ?@&K+*i(b3SMp`rZJK>c^Py?_6n|Nj2|zlR&NJ%JkB&KMRL
z7`Sxl(sk?BB_}7(n>TOTv}qcm^t+xtd)Cv_)7;#A@#4j{wzjWdzv_?m$(^8}pzYhY
zpFMjPmw$Jt0R<qifcwOVkwW6);tm};^!oK{FU=Vm8v19rL3qgmI3f@<QnI&Krl(?9
zSlIsk`*U-1{rog|Sv<@o=2dTR@7=q1@7=ri?%g{&2L}hS2c_T&4i0A3O`bd%rDxBc
zJ!j4wW-l|D&e2-Kb?n%&y?gh*efxIwUB`O1ZQJ(z`E!-azkU05_3G8q($b`)qzMxy
zSQ7>#?0^6Tph^Tn5p50GfD2C_K73du@BaP!<>lowXU;TWHhCLBU;$T&LjlccViH~&
z9uN>vQ&S_0!G*ha?IIXTqZ}pyM}%sEpa#k~Ch6$Wqq0>@dd>CVm^=vxL5P#3A31VF
zx^IJAzka>IWrx|hbEge3i>wGmv`_<;ECR`Ft*xyBv81F#zU50A(LxPWvMV|!CPu(r
zyLQdtwQEK@M5BOE2F1qa_8<H9k|j&TfK#VVfh#V3OduKsgiu*A(J2!KhJ}ZRi_zWP
z-Gcrlgsgz9n5HrYhP`?7MzAedut3nigpd`G6|<tupS#A4tsS3H5xd9jK89`MGxNZ(
zahoe*8~dYXc3)Oj_J3se!1^M)$1tVooyV?Rx$?W6$23mCKdjLH_x=RUA-b=xj}tUy
zjE^5bDp?CpUYwv~V`Di!{}v}`Ve9W-^AM_9A(SfBxpU{7tx^GKze;6#Dr!1FsVlPM
zEnmLea$T{drKPd4(W$zkfngC55!66$+_>@T)hkVtG&?E!%9UU)IS7kNuu=x*AzP~i
z$H&K~rlwxFaN*9KJDSpsJE@RSqh-<aYk2-KhI3*Bc`)TkRKh#d&n-f(TD1xYrQx0_
zQ>Iu1a)@olj2Vv~KmMW7_Z2HvSOg|66S4)+lP6Eo($Xwq*=Ebk%;cydl(~8HrmY&;
z{Q2|Qhy)x&U0ofOP1|~!09d_xbyHK5tOGT<>C>m1fY2O@84n*mlyRY{*XHEpun09-
z9O)!(?cTk+qoYG5`u6SH1YSo(csPgipi~05{PgJ)Z$=6V3K9|$9Fas`l9-rSTwF}t
zm+Ngp^zq}zLqb9vk@XW~&6+iAGD3!mAa<WWe}3P-eOtC{!OlsOCjI2pr+DTI7cR`o
z$~t)PU_(O#n~DlnTwc0#$*_PU%Q4u;<e>^p{K(78+puAS;o2oG6K`I=e95a8r74Lb
zF^Lu#8A+5gbU%~g^y$;p)z#OpUmvZE^F1tpJ$v@B(!PB8BAn_VLDF1bU!R|!Z+RJ;
zeqt&oky50jq^w=LcJboH?4EXN`U3+4U0q$Bot?a}r8dg5QpqxPY1c4Wn7_Y2FY;J3
zq$x}@rLowQxyLV$^vA3m#0+*@+M`F09z1w(>((vhWGMsc(F8MF<u{fDZ#vk=_(f?w
zF~02QJaPH*WgNt><(G_}Wy_X{Wm8pE<x2xJW#MS0%&us)a^*_RVaA=aX3df}6JAUi
z1~Fq$t0S0xwY9av(Hst<qN1#Vc|61=fd#?)^7Qm{JZBxzJSS5wJ3IU7)2Ff~n>TMZ
zk2I2lZv<pSXp$OExOM{INC~=EJSE=NQaF(n;Dd^yq9R=$Q#Ud)GE}KBl8A37PoCVg
zX_MuxMo$MeNpg`hXU=^7{8=^$`o)VEBtUwMR{DwHyx7+K{De+Y)dL3(U_T`%3-ObJ
zEa&2_TentLRucC|e-433WC8>*@)a+&H@8|y0x4x~+_-U!eCor851dMsJ<2ep;`D*b
z$kxaBz=)|qFs!JkU`~2zmBnF9mBPY8T&tQVj$gL7x9`}o!^?cyqA{9m6t_u;NmBV9
z$SJExnopcKL2#Nnb*iRNFFVamMLke90FtRiixzR35-F88o+c)Vl<KeHMtY?u#Z<pD
zhG~k#Fw(`bb47|xn!IkO>jBpTt_NHXxE^pl;CkRs^1y%C((IbwkS?$Q0000<MNUMn
GLSTYq%2@&c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/timer.png b/Telegram/Resources/icons/menu/timer.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fe0383b45c56fd79820f1db2abba0c1edf0268b
GIT binary patch
literal 608
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf?3AaAV~B;|
z)hT<kv;sw1L-iJEvi#p*z@oFKHA%VY0dq!j_C047`9p5pI|VLtmx<Xmv~n~h<t~nh
z(Cji(>Nq*wc*AoGW6uYZ)OJtUx_|4r!v5kuz3cB+tB2Yfd|$ol|D6+W%fhv$*6pvi
zk-HzFn9&&Vu)t!bPu+ggg)d90EM#V#P1_jpXZ5NOt&2?0KmRP+nX~=&{hTSMpMLvY
zyZttAtJ61)0t=Zqz3EO16Uu#sx{sR8_Fa9|XyWOwE4<WMIs~shocpfCYVpMrk3YWn
zGGA-1fPz~@`?5Z_#n)e7wfo$yWxQO(@Q{vRUR~wRn7H-VAAgM4qt5~qnRrG%5a<A-
znI77Q-hc1D#+o>d!%#ix+}kqkHpPbXtG+BZSaUaTxpT47y($%<jX6j751wXI(g`z=
zNYQV6=F)vsY4+K!L=L|Nh1Uhdx(&Q_J}iE^<4)doAGOC1ZVCV`*l5Z1rE2fNga>c#
z1}C+=pLtDHh*NH1-1_V@jzS7<Hx3FP(Y2j_zSr&W>#tlQj7O9ld>$-Unt#6dM%e1m
zwPD^%gZNhoY;n+Gny<G_!fyWhsI}+Pj31vr@nZ>VQsg1G*JVqXm>V5z<d#3(HQ!JD
d;eN+G%qQR77SR6ucseL{Jzf1=);T3K0RTPs_PGE6

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/timer@2x.png b/Telegram/Resources/icons/menu/timer@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..28d3d1480711f6b8fa340b87299bce1914fdf360
GIT binary patch
literal 1250
zcmV<81ReW{P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGOi4sRR9Fe^n9D0RZy3kN@#maF
za!NVJhJ`2=Y!O+Y-V*<T6brxDun}cpft0Om9106%K~ffEK^8Vja@Zlq9OCzRU9a2o
z&fN1nGtcwZZ}FN1*L_{z@8`PbHZ%7O!}vbFSKxaEG%N7$$Dt|wFRA?e{P&N8An*wU
z2aZThO%;d=0%y7-1O)|ER8$NN4ejmi-Q3*B^2kqyBq<?4=8o%!IxH-#qod>O?96i#
zb}=%<Sfo*XeLWM6i;MH#*TqRRH8l+n59j9Q3X#QFSy|cH*}1s5I6prpnVz1WmX=ml
zR#sbEs~R629rg6|#K*@^O--?8ZEbDS)6?GP<hvRY5;8hEs#aoseZ8ipCOkac&PfRY
zGG&qA`1m+EIoZzTG|$PcuC5C4@bIv%uFk2`Fc4!A@8jcRadEM8uU;7%8oIW&Cd8$s
zrP$b5z0N+1Wp{U12%rGkYaLW3CMJZ%pDZ}o&u0Wi^%ox>A9v8!M#2RsvsqYJ@O}?>
zcXxMnb=hEkrm+JN8dxt%+fr0il-%C?`}@(+(Y89n$ji%<P6S?LKtQ1c8yOktMX4|K
z_V!Afs;Vlz;xk)XS}IC{&z$}@C{Y5}E9|ln5fRtd*O<AG?KCRyd_q{3mzTi;r-dT;
z4jLL7<W$Pb%YCX{O$eZnX`v<SZ=A-)M%1ULr`y}xTASZVfMBsp3oA!IA@&`li;Ig^
zL*N;~N((DZGohH6n3R+hq+45CRzu(!!P0_8R+?r)?2)3AEz{~TWfBt;C8Gk9z%*1?
z)yO0;538%I<+>{<C@|M7<D{e{8i<~Np+#a&fE7KB%r(Q%tdQEqUtV6U22-Y`rG-}x
zNfIzL39LhfRgF9~nhB{TRh>Kyrug~!*)wArdX`kIu&R+N=>skWS<>d_X1&5A%Z6}p
za3FdD@0*PHz=}R0A;E+6E7Yve<>lqw-5vFkk`k-Il)1mZ=UMmT;~-#Y5?F_VrN!0N
zm9?tR$j;1Os4oYWl`VFDe%=M9y}eylH76&>h0TE!ppa?dK>jJ=GU8sqIW{)-nfo)p
z0fGhY@S*k9b#ihNCwGnax12A7g9sEru)rP2f0uA`a@}F(g~9vl;_p7&5fFLz0ITkN
zTeY?@FfhP`IQskhwE|a3MI&%!{1WrgDc@FaZ*Q%wtzQNA5q2P)8$k6f>mFkm>`i=n
z0s`09*XIwyFfht&Ksnj$d~_))D&mXt=U?vqeRg&>BO}9y!J~|LZf;JzKne>BJ&FN@
zeE)84ZVLC|;bCxa(C3LFK!#Xc*#E#swC5?XGmngnJUu;010E!NhIV##R#sMKWo7;I
zaS$*hNl6}Kh_PVQZtR|XKjZA|?3tMvxgca_UVb7&jK$Ap&TTyY`A*%~*m!+?wN8j6
zB?SI$J1+h|WSuep1j@|J<V{pwMtQ&CI5|1Fy}h-Hzcb$}@VBnOf0Cm1i3An^j{pDw
M07*qoM6N<$f|##5F#rGn

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/timer@3x.png b/Telegram/Resources/icons/menu/timer@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..173ad913dcd4e9e05a58a653e9cead549a49e8d7
GIT binary patch
literal 1883
zcmV-h2c-CkP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>#Ysd#RA>e5n%hfPOBBb=E=Hvl
zVb)3P@)A^3l08UwLoE6WETST)Hy`RT>;geT27&~F556cp6cL3~YMD?3Wms0A4_zMW
zM4j%Im73>#j&oX!dwzS*?BCv+aDMyY$J%Sw`hLGNzkQimv(wU2M`{F8Baj+_)Ci<T
zAjT0GH*~}ZI3}Qqii-XkIxxnBptwX_zkdDip#vi>%wU}K;O4kmv$C=jlo)X#`{9gu
z$EHk~vSi7UsZ*ya1sI&-^b-`9e_UKZI?jp}D>iT5ylK-WjNIH@o*H^9Hdp0~7cU+>
zc+lF~dhOaZ3{Sw=I?c(+IdteyS67$1o!oy(A(8a4)gRPMn>Ov}(W76!d~xrL8A&=I
zKuPzwAun9G@bTlv6DLlH)6wu=B#vnkHgV#_ef#zuK74rg?AhW}#?PNW@7}%p{Q2`g
ze;xS$_;oB;uweD-)#JyH_hh|!^XAyGW3{!llP6EUdi82yVWA3GxNsp*p5T!>g{-r)
z(=+y8zkWS`{`{_8yJpRr6--P3VFZ)n0eST3QG0v4I6r;*G=2K?V6@m;H*Vbc_U&8Y
z#`ygCb9s5WJOJI9NFkAQ9Zl@--@k9&y44*mQsn;q`}_L(gd4lMx;i^MI|?Z2fatK`
z_xJa2+qNwVY=~U$0qGLPlP6D>En5~MKQI(1-UK>6bb%Q$HI|l^>a4totoKq_W&j^Q
zeyp=V8Wtp6JkPOj-@XZDO-;>&2@}FWxJ3gCxDY{FP*C8O8a|2#^~;wpg{+~WAv{L7
z3@C&S>bZ00hRb)1zH;S?(A>Fmhxd$QB4O*+twR|HhI<wi5D6&)+;d$cnfnO=`uO);
zGl$|@T3S>(MyN#3WrB=Q>6Tz-vG?xXla3V^7h4jHW_jCU7>yPObV7{`b4qQ=4`|k(
zgiLb+BK?}8bPUX<rY7lIY){Da^mN`-3U_dDaOKLCe(D4K5jzGc)Jg+lkQBh>+N56z
z_4W0xX~W|pb__76<xg|D7wlc%xpSw8Jbn7K*rROd)Vic3W$>rJfB#+$)vH&plD=`H
z|6@=iKq*0z^=h>IWBK{{GiT0JqjKreC2*4*p~z`aBS66*$$G0>I;Ou*S<FV37YRTY
zuzvmeU@S|=s3=MP&6_vH{w;<sKo^!!jHP3X7cW+66eL&(CWII@CjyY6=tP(wyQO0?
zb)szH2VwP77nw6>jtaxz)SBWKATmUlU!<jDnVFd?lP8iNM6jO)2y3=^^X92A4658o
zFLp$R2=imNbW92uuV26Rg9!Fh!&<XujUKah?OL3=$K4hgBFrz>(y<>ueyGf(Ywpy1
zOzwnEGtBge3=w9=D37IMJv}`t&U#Jz5wQ3*n-V(BFw-M4M3@<)JeH2Vd-qPo38Ej6
zpTDuO(QHcSG{a1f$Pi&>jFacgnKNn@!{mC>q)ARWMo?W{odQw6oEjlc4g|;?A7Q~c
zmQqZ2cel!Cs<w3L(vFUfV7P>>d-m)(ckY~;k~cRuC;fLJKqjl~V<hBqb#B?RMF#uG
zkt42YBNK-J5reQuB<y`iX*RjPD-!+iWCW;=AxYnq86M?)cH_nk8K?R4=R4=c90;|@
zK#~>R@>C>WUo~&vzTJvALIFE=>=0yKk~l*f?BDeE_Nvihg(u6i&_EFqApP*+gVKPQ
z*tV1^Dk|hMIC=791cgbaLMj3flO&3nHe<#NUWf{s-KxC2JTqqGJkUX^*pY#lIJpiS
zI3Qzo`SN9J$ssOoh@cZ{WW<I1A5KO_23x>FP+3_SGl35rL_&%HWcUO|aF>*n3=9ki
z4co^Nz?@Qd@7^tRP$R%8Er}rgg5<g%L8i1cz~$DWd+}d{p8o4IT1K&~tjrS-%PFw>
z)sghPIfNLd*tc%ok}Cv*Z!)5kF+AKr0jT3cm-NEI18zCxfy<tY&drA^dIi#w@81jv
zP&zV1F+bn^+5c_fi<+vcDqR8g#fulM<vu@H5=r*}LScTo<A)HZfA8MC)E;y-+!$xi
zo@EQman?f^!KCPS6o9}29z|=^Z>d(TT6OBwsSO)8ctr5w33G6Ejh{VxMlq1GnW~(z
zLC(PnpU;(8Q&H71@6Wcjwu1)`vU%yj{0*mkJoE73L;bHaZC3TNus2(k2awVG4##nv
znEOxyxPSk?pXgveiM)<SZKmefsbOKumoGnl{P^wLx49aFJ3|0r1d}ohB94=&_gH`i
zR_~Nw*gaUZXc2`@Rg|V4$lk)!r%x#p@m-N@G6dkHno=W>8iCXZq(&e$0{_1e_y?0C
V`I`(6M6v(?002ovPDHLkV1l-wa@YU>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/topics.png b/Telegram/Resources/icons/menu/topics.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e5eed67b49fad29561419763f848cc511c686f8
GIT binary patch
literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfU9rko_46zVQ
zPLN<N;bwH(;d|@Wt=R_^?Cs?>Uc7yK_V{u3=|@v){`@Gsy)Cz(u*I>ku#j6^Z%_UI
zeUl~$NlV|JsO<jZ=g)_)3?v<zb8>R({{Cv!W4*#-!u>+8q%-kgct8L{)dZXM3QV^T
zA7+-|R`;K`Wy=;7<qeS=Zt?eYx3#e~ZERCLrEo0pk?9&fsQ|~c9d8dX^!4@q`~3X;
z>+9<uHXSh*Xp|Kcbo3N+lqh+3$1=f<IW2mDwnne%BU__YljaC8Fz9cIb5gpqr55BZ
MPgg&ebxsLQ05b(}djJ3c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/topics@2x.png b/Telegram/Resources/icons/menu/topics@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..789d9cf60cbde9aad929eebbd0dac4370a688d5c
GIT binary patch
literal 418
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuF#^dSY7!twx
zcDf^<i-Aa+?<;}Woo%e%eGeqo>})hWp6GeVROiS&#<Vykxrtq8BrZ?<6Z>KNt?%>B
zd(W3*lj3M#;Al7?%Na2(ROF~dUy179)8Q2wa|31OJ@@TDwdqUk{N+ar-&pXK+Y6V*
zF3<dREGp^q9O=wB&82hN&)+*KGCP*L_-^7|6JBAZvyTrOsCa%7bxP?vE63eySt28o
z1~h$+vck7%yVpsxGzu(wy=$*!c+YBYcZs&hX}<p!X`K2zr}nj`Z0-HxOog)-Gqh!8
z4!Qx!FDGXRy!4HjUUt>eMNe~O?(MwW+g7deR&FR1U})U0u;8P3*k1mJ5?h|I_BnEM
hYX~qf0>!I^Dj1{1+OAxFC(Ho~A5T|5mvv4FO#qe?jGF)e

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/topics@3x.png b/Telegram/Resources/icons/menu/topics@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c03b336571479a6b33cf086a0bc251f8276833
GIT binary patch
literal 775
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz*Okz;uw;_
z`gYddbD54JZT9o$?_dbjG|_WV6cki+(snu+y5fq))^!d`1;2<`akU1Sc&wO^q4IC;
zXEi^UG(V%?HOIxG<F2mRn6}pR{F}W-*=hB)AKjT$98eIOdcxKy?$$#UHurMO-j>~d
z{Z%T-NiB8C*DBk&e)q5T9bbI^y*yw0_j%Qa^R`FpOxwM}{c(wvEML2N1Ro32{w4C)
zd=38o{d+gVWZm`EOMXA$+tHxBLzwADy5aQGCl@}PDZ<0r>=^00Uk)fZ!S(2s>8F?4
zxV@WmHtqM{xNBDyv-dsl%Z&W!Rbn;wYt`EV3pw7aSzFx&-yTg8<Z7LCa>>~=;eS=@
zI?VT6%{q8j_{_1SjaRcu>(@>2o}fNIAv|69)tU~54M{WRU4ALU!?rih|M`TBc`P0c
zVDuoFGviie%i)JPX4SVVL$s#8E&Kh?=8Ev?=bxVz-Awtl*mAC4V8$uwn)&CyZ}K%L
zEBo(#?eWJ28GGM1<o9N6)w)r-GiLW)zkti0Eg&yVaCNm6>vVaNWiQvy-F7F>{2XhG
z-&_}qChMhzM~_T-oX_>QZvV}kq)wAp|08(y9(Z`SF4QpDefQnZ8Zj|nyU#mf^j3zP
z@@Tho=zj9C!pnH3&jh*po<FI~S0e=%KJY!AVsy;wyS}oAJ3NMNan9Jf;!%h7L=Tt6
zftzpI%s;=C$FSjCdYo6nTDQd$3wlFz#JrbI+Mvd^dO_h8Me##BGQ`tT_i+7MFWPnI
zXPfAjhBy(^xOK`a_uPKEYnR;bGv^gIG_n0{aIN{KF`0pL0x~)<Tkr>O+|4wt(-Fox
PphW2D>gTe~DWM4f!$Cb<

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 18396ecb4..2703e2c71 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -600,6 +600,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_username_label" = "Username";
 "lng_settings_phone_label" = "Phone number";
 "lng_settings_username_add" = "Add username";
+"lng_settings_username_about" = "Username lets people contact you on Telegram without needing your phone number.";
+"lng_settings_add_account_about" = "You can add up to four accounts with different phone numbers.";
 "lng_settings_peer_to_peer_about" = "Disabling peer-to-peer will relay all calls through Telegram servers to avoid revealing your IP address, but may slightly decrease audio quality.";
 "lng_settings_advanced" = "Advanced";
 "lng_settings_stickers_emoji" = "Stickers and emoji";
@@ -612,9 +614,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_theme_accent_title" = "Choose accent color";
 "lng_settings_data_storage" = "Data and storage";
 "lng_settings_information" = "Edit profile";
+"lng_settings_my_account" = "My Account";
 "lng_settings_security" = "Security";
 "lng_settings_passcode_title" = "Local passcode";
 "lng_settings_sessions_title" = "Active sessions";
+"lng_settings_sessions_about" = "Review the list of devices where you are logged into your Telegram account.";
 "lng_settings_archive_title" = "Archive Settings";
 "lng_settings_new_unknown" = "New chats from unknown users";
 "lng_settings_auto_archive" = "Archive and Mute";
@@ -642,6 +646,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_sensitive_about" = "Display sensitive media in public channels on all your Telegram devices.";
 "lng_settings_security_bots" = "Bots and websites";
 "lng_settings_clear_payment_info" = "Clear Payment and Shipping Info";
+"lng_settings_logged_in" = "Logged In with Telegram";
+"lng_settings_logged_in_about" = "Websites where you've used Telegram to log in.";
+"lng_settings_logged_in_title" = "Logged In with Telegram";
+"lng_settings_logged_in_description" = "You can log in on websites that support signing in with Telegram.";
+"lng_settings_disconnect_all" = "Disconnect All Websites";
+"lng_settings_connected_title" = "Connected websites";
+"lng_settings_connected_about" = "Click to disconnect from your Telegram account.";
 
 "lng_settings_power_menu" = "Battery and Animations";
 "lng_settings_power_title" = "Power Usage";
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 51be4cd11..0baadc182 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -298,17 +298,11 @@ void EditPrivacyBox::setupContent() {
 				CreateButton(
 					content,
 					rpl::duplicate(text),
-					st::settingsButton,
-					{
-						(always
-							? &st::settingsIconPlus
-							: &st::settingsIconMinus),
-						always ? kIconGreen : kIconRed,
-					})));
+					st::settingsButtonNoIcon)));
 		CreateRightLabel(
 			button->entity(),
 			std::move(label),
-			st::settingsButton,
+			st::settingsButtonNoIcon,
 			std::move(text));
 		button->toggleOn(rpl::duplicate(
 			optionValue
@@ -384,9 +378,9 @@ void EditPrivacyBox::setupContent() {
 	});
 	addButton(tr::lng_cancel(), [this] { closeBox(); });
 
-	const auto linkHeight = st::settingsButton.padding.top()
-		+ st::settingsButton.height
-		+ st::settingsButton.padding.bottom();
+	const auto linkHeight = st::settingsButtonNoIcon.padding.top()
+		+ st::settingsButtonNoIcon.height
+		+ st::settingsButtonNoIcon.padding.bottom();
 
 	widthValue(
 	) | rpl::start_with_next([=](int width) {
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 724dd7c47..88bbdca03 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -666,7 +666,7 @@ void EditFilterBox(
 		content,
 		tr::lng_filters_add_chats(),
 		st::settingsButtonActive,
-		{ &st::settingsIconAdd, 0, IconType::Round, &st::windowBgActive });
+		{ &st::settingsIconAdd, IconType::Round, &st::windowBgActive });
 
 	const auto include = SetupChatsPreview(
 		content,
@@ -693,7 +693,7 @@ void EditFilterBox(
 		excludeInner,
 		tr::lng_filters_remove_chats(),
 		st::settingsButtonActive,
-		{ &st::settingsIconRemove, 0, IconType::Round, &st::windowBgActive });
+		{ &st::settingsIconRemove, IconType::Round, &st::windowBgActive });
 
 	const auto exclude = SetupChatsPreview(
 		excludeInner,
@@ -746,13 +746,13 @@ void EditFilterBox(
 		state->hasLinks.value() | rpl::map(!rpl::mappers::_1),
 		tr::lng_filters_link_create(),
 		st::settingsButtonActive,
-		{ &st::settingsFolderShareIcon, 0, IconType::Simple });
+		{ &st::settingsFolderShareIcon, IconType::Simple });
 	const auto addLink = AddToggledButton(
 		content,
 		state->hasLinks.value(),
 		tr::lng_group_invite_add(),
 		st::settingsButtonActive,
-		{ &st::settingsIconAdd, 0, IconType::Round, &st::windowBgActive });
+		{ &st::settingsIconAdd, IconType::Round, &st::windowBgActive });
 
 	SetupFilterLinks(
 		content,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
index 9e0bfa2d9..507023aa9 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
 #include "styles/style_settings.h"
@@ -271,7 +272,7 @@ void Controller::choose(not_null<ChatData*> chat) {
 				above,
 				tr::lng_manage_discussion_group_create(),
 				st::infoCreateLinkedChatButton,
-				{ &st::settingsIconChat, Settings::kIconLightBlue }
+				{ &st::menuIconGroupCreate }
 			)->addClickHandler([=, parent = above.data()] {
 				const auto guarded = crl::guard(parent, callback);
 				navigation->uiShow()->showBox(Box<GroupInfoBox>(
@@ -291,7 +292,7 @@ void Controller::choose(not_null<ChatData*> chat) {
 					? tr::lng_manage_discussion_group_unlink
 					: tr::lng_manage_linked_channel_unlink)(),
 				st::infoUnlinkChatButton,
-				{ &st::settingsIconMinus, Settings::kIconRed }
+				{ &st::menuIconRemove }
 			)->addClickHandler([=] { callback(nullptr); });
 			Settings::AddSkip(below);
 		}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
index 5ef44326a..b51451817 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 #include "styles/style_info.h"
+#include "styles/style_menu_icons.h"
 
 namespace {
 
@@ -53,7 +54,7 @@ namespace {
 			rpl::single(QString()),
 			[] {},
 			st::manageGroupTopicsButton,
-			{ &st::infoRoundedIconHideMembers, Settings::kIconDarkBlue }
+			{ &st::menuIconHideMembers }
 	))->toggleOn(rpl::single(
 		(megagroup->flags() & ChannelDataFlag::ParticipantsHidden) != 0
 	) | rpl::then(state->toggled.events()));
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 4ec1fd6be..425e21c75 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1684,7 +1684,7 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 			result->addAction(
 				tr::lng_context_restrict_user(tr::now),
 				crl::guard(this, [=] { showRestricted(user); }),
-				&st::menuIconRestrict);
+				&st::menuIconPermissions);
 		}
 	}
 	if (user && _additional.canRemoveParticipant(participant)) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index febf08ed6..135fc46c9 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -61,6 +61,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_icon.h"
 #include "api/api_invite_links.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
 #include "styles/style_settings.h"
@@ -307,11 +308,9 @@ private:
 	void fillPendingRequestsButton();
 
 	void fillBotUsernamesButton();
-#if 0 // Enable after design improvements.
 	void fillBotEditIntroButton();
 	void fillBotEditCommandsButton();
 	void fillBotEditSettingsButton();
-#endif
 
 	void submitTitle();
 	void submitDescription();
@@ -348,9 +347,7 @@ private:
 	void continueSave();
 	void cancelSave();
 
-#if 0 // Enable after design improvements.
 	void toggleBotManager(const QString &command);
-#endif
 
 	void togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
@@ -605,7 +602,7 @@ object_ptr<Ui::RpWidget> Controller::createStickersEdit() {
 			controller->show(
 				Box<StickersBox>(controller->uiShow(), channel));
 		},
-		{ &st::settingsIconStickers, Settings::kIconLightOrange });
+		{ &st::menuIconStickers });
 
 	Settings::AddSkip(container, bottomSkip);
 
@@ -770,9 +767,6 @@ void Controller::fillPrivacyTypeButton() {
 			&& _peer->asChannel()->requestToJoin()),
 	};
 	const auto isGroup = (_peer->isChat() || _peer->isMegagroup());
-	const auto icon = isGroup
-		? &st::settingsIconGroup
-		: &st::settingsIconChannel;
 	AddButtonWithText(
 		_controls.buttonsLayout,
 		(hasLocation
@@ -798,7 +792,7 @@ void Controller::fillPrivacyTypeButton() {
 					: tr::lng_manage_private_peer_title)();
 		}) | rpl::flatten_latest(),
 		[=] { showEditPeerTypeBox(); },
-		{ icon, Settings::kIconLightBlue });
+		{ &st::menuIconCustomize });
 
 	_privacyTypeUpdates.fire_copy(_typeDataSavedValue->privacy);
 }
@@ -839,7 +833,7 @@ void Controller::fillLinkedChatButton() {
 		std::move(text),
 		std::move(label),
 		[=] { showEditLinkedChatBox(); },
-		{ &st::settingsIconChat, Settings::kIconGreen });
+		{ isGroup ? &st::menuIconChannel : &st::menuIconGroups });
 	_linkedChatUpdates.fire_copy(*_linkedChatSavedValue);
 }
 //
@@ -867,7 +861,7 @@ void Controller::fillForumButton() {
 			rpl::single(QString()),
 			[] {},
 			st::manageGroupTopicsButton,
-			{ &st::settingsIconTopics, Settings::kIconPurple }));
+			{ &st::menuIconTopics }));
 	const auto unlocks = std::make_shared<rpl::event_stream<bool>>();
 	button->toggleOn(
 		rpl::single(_peer->isForum()) | rpl::then(unlocks->events())
@@ -924,7 +918,7 @@ void Controller::fillSignaturesButton() {
 		tr::lng_edit_sign_messages(),
 		rpl::single(QString()),
 		[] {},
-		{ &st::infoRoundedIconSignature, Settings::kIconLightBlue }
+		{ &st::menuIconSigned }
 	)->toggleOn(rpl::single(channel->addsSignature())
 	)->toggledValue(
 	) | rpl::start_with_next([=](bool toggled) {
@@ -986,7 +980,7 @@ void Controller::fillHistoryVisibilityButton() {
 				: tr::lng_manage_history_visibility_hidden)();
 		}) | rpl::flatten_latest(),
 		buttonCallback,
-		{ &st::settingsIconChat, Settings::kIconGreen });
+		{ &st::menuIconChatBubble });
 
 	updateHistoryVisibility->fire_copy(*_historyVisibilitySavedValue);
 
@@ -1001,11 +995,9 @@ void Controller::fillManageSection() {
 
 		AddSkip(container, 0);
 		fillBotUsernamesButton();
-#if 0 // Enable after design improvements.
 		fillBotEditIntroButton();
 		fillBotEditCommandsButton();
 		fillBotEditSettingsButton();
-#endif
 		Settings::AddSkip(
 			container,
 			st::editPeerTopButtonsLayoutSkipCustomBottom);
@@ -1174,7 +1166,7 @@ void Controller::fillManageSection() {
 					Data::PeerAllowedReactions(_peer),
 					done));
 			},
-			{ &st::infoRoundedIconReactions, Settings::kIconRed });
+			{ &st::menuIconGroupReactions });
 	}
 	if (canEditPermissions) {
 		AddButtonWithCount(
@@ -1193,7 +1185,7 @@ void Controller::fillManageSection() {
 				});
 			}) | rpl::flatten_latest(),
 			[=] { ShowEditPermissions(_navigation, _peer); },
-			{ &st::settingsIconKey, Settings::kIconGreen });
+			{ &st::menuIconPermissions });
 	}
 	if (canEditInviteLinks) {
 		auto count = Info::Profile::MigratedOrMeValue(
@@ -1227,7 +1219,7 @@ void Controller::fillManageSection() {
 					0,
 					0));
 			},
-			{ &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange });
+			{ &st::menuIconLinks });
 		wrap->toggle(true, anim::type::instant);
 	}
 	if (canViewAdmins) {
@@ -1246,7 +1238,7 @@ void Controller::fillManageSection() {
 					_peer,
 					ParticipantsBoxController::Role::Admins);
 			},
-			{ &st::infoRoundedIconAdministrators, Settings::kIconLightBlue });
+			{ &st::menuIconAdmin });
 	}
 	if (canViewMembers) {
 		AddButtonWithCount(
@@ -1266,7 +1258,7 @@ void Controller::fillManageSection() {
 					_peer,
 					ParticipantsBoxController::Role::Members);
 			},
-			{ &st::settingsIconGroup, Settings::kIconDarkBlue });
+			{ &st::menuIconGroups });
 	}
 
 	fillPendingRequestsButton();
@@ -1283,7 +1275,7 @@ void Controller::fillManageSection() {
 					_peer,
 					ParticipantsBoxController::Role::Kicked);
 			},
-			{ &st::settingsIconMinus, Settings::kIconRed });
+			{ &st::menuIconRemove });
 	}
 	if (hasRecentActions) {
 		auto callback = [=] {
@@ -1295,7 +1287,7 @@ void Controller::fillManageSection() {
 			tr::lng_manage_peer_recent_actions(),
 			rpl::single(QString()), //Empty count.
 			std::move(callback),
-			{ &st::infoRoundedIconRecentActions, Settings::kIconPurple });
+			{ &st::menuIconGroupLog });
 	}
 
 	if (canEditStickers || canDeleteChannel) {
@@ -1337,7 +1329,7 @@ void Controller::fillPendingRequestsButton() {
 			: tr::lng_manage_peer_requests_channel()),
 		rpl::duplicate(pendingRequestsCount) | ToPositiveNumberString(),
 		[=] { RequestsBoxController::Start(_navigation, _peer); },
-		{ &st::infoRoundedIconRequests, Settings::kIconRed });
+		{ &st::menuIconInvite });
 	std::move(
 		pendingRequestsCount
 	) | rpl::start_with_next([=](int count) {
@@ -1396,10 +1388,9 @@ void Controller::fillBotUsernamesButton() {
 		[=] {
 			_navigation->uiShow()->showBox(Box(UsernamesBox, user));
 		},
-		{ &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange });
+		{ &st::menuIconLinks });
 }
 
-#if 0 // Enable after design improvements.
 void Controller::fillBotEditIntroButton() {
 	Expects(_isBot);
 
@@ -1409,7 +1400,7 @@ void Controller::fillBotEditIntroButton() {
 		tr::lng_manage_peer_bot_edit_intro(),
 		rpl::never<QString>(),
 		[=] { toggleBotManager(u"%1-intro"_q.arg(user->username())); },
-		{ &st::settingsIconChat, Settings::kIconLightBlue });
+		{ &st::menuIconEdit });
 }
 
 void Controller::fillBotEditCommandsButton() {
@@ -1421,7 +1412,7 @@ void Controller::fillBotEditCommandsButton() {
 		tr::lng_manage_peer_bot_edit_commands(),
 		rpl::never<QString>(),
 		[=] { toggleBotManager(u"%1-commands"_q.arg(user->username())); },
-		{ &st::settingsIconChat, Settings::kIconLightBlue });
+		{ &st::menuIconBotCommands });
 }
 
 void Controller::fillBotEditSettingsButton() {
@@ -1433,9 +1424,8 @@ void Controller::fillBotEditSettingsButton() {
 		tr::lng_manage_peer_bot_edit_settings(),
 		rpl::never<QString>(),
 		[=] { toggleBotManager(user->username()); },
-		{ &st::settingsIconChat, Settings::kIconLightBlue });
+		{ &st::menuIconSettings });
 }
-#endif
 
 void Controller::submitTitle() {
 	Expects(_controls.title != nullptr);
@@ -1910,7 +1900,6 @@ void Controller::saveHistoryVisibility() {
 		[=] { cancelSave(); });
 }
 
-#if 0 // Enable after design improvements.
 void Controller::toggleBotManager(const QString &command) {
 	const auto controller = _navigation->parentController();
 	_api.request(MTPcontacts_ResolveUsername(
@@ -1926,7 +1915,6 @@ void Controller::toggleBotManager(const QString &command) {
 		}
 	}).send();
 }
-#endif
 
 void Controller::togglePreHistoryHidden(
 		not_null<ChannelData*> channel,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index 420d5dc52..579049f28 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_window.h"
 #include "styles/style_settings.h"
 
@@ -818,7 +819,7 @@ void AddSuggestGigagroup(
 		rpl::single(QString()),
 		std::move(callback),
 		st::manageGroupTopicsButton,
-		{ &st::settingsIconAskQuestion, Settings::kIconGreen }));
+		{ &st::menuIconChatDiscuss }));
 
 	container->add(
 		object_ptr<Ui::DividerLabel>(
@@ -854,7 +855,7 @@ void AddBannedButtons(
 				ParticipantsBoxController::Role::Restricted);
 		},
 		st::manageGroupTopicsButton,
-		{ &st::settingsIconKey, Settings::kIconLightOrange }));
+		{ &st::menuIconPermissions }));
 	if (channel) {
 		container->add(EditPeerInfoBox::CreateButton(
 			container,
@@ -868,7 +869,7 @@ void AddBannedButtons(
 					ParticipantsBoxController::Role::Kicked);
 			},
 			st::manageGroupTopicsButton,
-			{ &st::settingsIconMinus, Settings::kIconRed }));
+			{ &st::menuIconRemove }));
 	}
 }
 
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.cpp b/Telegram/SourceFiles/boxes/ringtones_box.cpp
index ef2d096ec..eb06f7066 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.cpp
+++ b/Telegram/SourceFiles/boxes/ringtones_box.cpp
@@ -278,7 +278,6 @@ void RingtonesBox(
 			st::ringtonesBoxButton,
 			{
 				&st::settingsIconAdd,
-				0,
 				Settings::IconType::Round,
 				&st::windowBgActive
 			}),
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 f6e5c92d5..e45f961c9 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1468,7 +1468,7 @@ void InnerWidget::suggestRestrictParticipant(
 				editRestrictions(false, ChatRestrictionsInfo());
 			}).send();
 		}
-	}, &st::menuIconRestrict);
+	}, &st::menuIconPermissions);
 }
 
 void InnerWidget::restrictParticipant(
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index be51f4b50..409ae264d 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -1199,7 +1199,7 @@ void AddPollActions(
 				.confirmText = tr::lng_polls_stop_sure(),
 				.cancelText = tr::lng_cancel(),
 			}));
-		}, &st::menuIconStopPoll);
+		}, &st::menuIconRemove);
 	}
 }
 
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index c5567dd79..b1d81d809 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -410,15 +410,6 @@ infoIconMediaStories: icon {{ "info/info_media_stories", infoIconFg }};
 infoIconMediaStoriesArchive: icon {{ "info/info_stories_archive", infoIconFg }};
 infoIconMediaStoriesRecent: icon {{ "info/info_stories_recent", infoIconFg }};
 
-infoRoundedIconRequests: icon {{ "info/edit/group_manage_join_requests", settingsIconFg }};
-infoRoundedIconRecentActions: icon {{ "info/edit/group_manage_actions", settingsIconFg }};
-infoRoundedIconAdministrators: icon {{ "info/edit/group_manage_admins", settingsIconFg }};
-infoRoundedIconInviteLinks: icon {{ "info/edit/group_manage_links", settingsIconFg }};
-infoRoundedIconReactions: icon {{ "info/edit/group_manage_reactions", settingsIconFg }};
-infoRoundedIconSignature: icon {{ "info/edit/channel_manage_signature", settingsIconFg }};
-infoRoundedIconAntiSpam: icon {{ "info/edit/antispam", settingsIconFg }};
-infoRoundedIconHideMembers: icon {{ "info/edit/hidden_members", settingsIconFg }};
-
 infoIconShare: icon {{ "info/info_share", infoIconFg }};
 infoIconEdit: icon {{ "info/info_edit", infoIconFg }};
 infoIconDelete: icon {{ "info/info_delete", infoIconFg }};
@@ -473,8 +464,10 @@ infoBlockButton: SettingsButton(infoProfileButton) {
 	textFg: attentionButtonFg;
 	textFgOver: attentionButtonFgOver;
 }
-infoCreateLinkedChatButton: SettingsButton(infoMainButton) {
+infoCreateLinkedChatButton: SettingsButton(infoProfileButton) {
 	padding: margins(74px, 10px, 8px, 8px);
+	textFg: lightButtonFg;
+	textFgOver: lightButtonFgOver;
 }
 infoUnlinkChatButton: SettingsButton(infoCreateLinkedChatButton) {
 	textFg: attentionButtonFg;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 350590a0d..4078f03f6 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -549,15 +549,6 @@ OverlayWidget::OverlayWidget()
 			handleMouseRelease(mousePosition(e), mouseButton(e));
 		} else if (type == QEvent::MouseMove) {
 			handleMouseMove(mousePosition(e));
-		} else if (type == QEvent::ContextMenu) {
-			const auto event = static_cast<QContextMenuEvent*>(e.get());
-			const auto mouse = (event->reason() == QContextMenuEvent::Mouse);
-			const auto position = mouse
-				? std::make_optional(event->pos())
-				: std::nullopt;
-			if (handleContextMenu(position)) {
-				return base::EventFilterResult::Cancel;
-			}
 		} else if (type == QEvent::MouseButtonDblClick) {
 			if (handleDoubleClick(mousePosition(e), mouseButton(e))) {
 				return base::EventFilterResult::Cancel;
diff --git a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
index b15ad5809..50dfea593 100644
--- a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
+++ b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
@@ -73,7 +73,7 @@ object_ptr<Ui::RpWidget> AntiSpamValidator::createButton() const {
 			rpl::single(QString()),
 			[] {},
 			st::manageGroupTopicsButton,
-			{ &st::infoRoundedIconAntiSpam, Settings::kIconPurple }
+			{ &st::menuIconAntispam }
 	))->toggleOn(rpl::single(
 		_channel->antiSpamMode()
 	) | rpl::then(state->toggled.events()));
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
index 7295604d2..2bc8e3964 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 
 /*
@@ -133,7 +134,7 @@ void Manage::setupContent() {
 		content,
 		tr::lng_settings_cloud_password_manage_password_change(),
 		st::settingsButton,
-		{ &st::settingsIconKey, kIconLightBlue }
+		{ &st::menuIconPermissions }
 	)->setClickedCallback([=] {
 		showOtherAndRememberPassword(CloudPasswordInputId());
 	});
@@ -143,7 +144,7 @@ void Manage::setupContent() {
 			? tr::lng_settings_cloud_password_manage_email_change()
 			: tr::lng_settings_cloud_password_manage_email_new(),
 		st::settingsButton,
-		{ &st::settingsIconEmail, kIconLightOrange }
+		{ &st::menuIconRecoveryEmail }
 	)->setClickedCallback([=] {
 		auto data = stepData();
 		data.setOnlyRecoveryEmail = true;
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 8eaa3cd8f..4b95c2a5d 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -74,40 +74,10 @@ settingsUpdate: SettingsButton(infoMainButton, settingsButtonNoIcon) {
 settingsUpdateStatePosition: point(22px, 29px);
 settingsDividerLabelPadding: margins(22px, 8px, 22px, 16px);
 
-settingsIconAccount: icon {{ "settings/account", settingsIconFg }};
-settingsIconNotifications: icon {{ "settings/notifications", settingsIconFg }};
 settingsIconChat: icon {{ "settings/chat", settingsIconFg }};
-settingsIconFolders: icon {{ "settings/folders", settingsIconFg }};
-settingsIconGeneral: icon {{ "settings/advanced", settingsIconFg }};
-settingsIconLock: icon {{ "settings/lock", settingsIconFg }};
-settingsIconLanguage: icon {{ "settings/language", settingsIconFg }};
-settingsIconBattery: icon {{ "settings/battery", settingsIconFg }};
 settingsIconInterfaceScale: icon {{ "settings/interface_scale", settingsIconFg }};
-settingsIconFaq: icon {{ "settings/faq", settingsIconFg }};
-settingsIconCalls: icon {{ "settings/calls", settingsIconFg }};
-settingsIconAskQuestion: icon {{ "settings/ask_question", settingsIconFg }};
-settingsIconTips: icon {{ "settings/tips", settingsIconFg }};
 settingsIconStickers: icon {{ "settings/stickers", settingsIconFg }};
 settingsIconEmoji: icon {{ "settings/emoji", settingsIconFg }};
-settingsIconThemes: icon {{ "settings/palette", settingsIconFg }};
-settingsIconGroup: icon {{ "settings/group", settingsIconFg }};
-settingsIconChannel: icon {{ "settings/channel", settingsIconFg }};
-settingsIconUser: icon {{ "settings/user", settingsIconFg }};
-settingsIconKey: icon {{ "settings/key", settingsIconFg }};
-settingsIconPlus: icon {{ "settings/plus", settingsIconFg }};
-settingsIconMinus: icon {{ "settings/minus", settingsIconFg }};
-settingsIconTimer: icon {{ "settings/timer", settingsIconFg }};
-settingsIconLaptop: icon {{ "settings/laptop", settingsIconFg }};
-settingsIconArrows: icon {{ "settings/arrows", settingsIconFg }};
-settingsIconEmail: icon {{ "settings/email", settingsIconFg }};
-settingsIconSound: icon {{ "settings/sound", settingsIconFg }};
-settingsIconDock: icon {{ "settings/dock", settingsIconFg }};
-settingsIconPin: icon {{ "settings/pin", settingsIconFg }};
-settingsIconDownload: icon {{ "settings/download", settingsIconFg }};
-settingsIconMention: icon {{ "settings/mention", settingsIconFg }};
-settingsIconTopics: icon {{ "settings/topics", settingsIconFg }};
-settingsIconTTL: icon {{ "settings/ttl", settingsIconFg }};
-settingsIconPhoto: icon {{ "settings/photo", settingsIconFg }};
 
 settingsPremiumIconStories: icon {{ "settings/stories", settingsIconFg }};
 settingsPremiumIconChannelsOff: icon {{ "settings/premium/channels_off", settingsIconFg }};
@@ -127,7 +97,7 @@ settingsStoriesIconViews: icon {{ "menu/show_in_chat", premiumButtonBg1 }};
 settingsStoriesIconExpiration: icon {{ "settings/premium/timer", premiumButtonBg1 }};
 settingsStoriesIconDownload: icon {{ "menu/download", premiumButtonBg1 }};
 settingsStoriesIconCaption: icon {{ "settings/premium/stories_caption", premiumButtonBg1 }};
-settingsStoriesIconLinks: icon {{ "settings/premium/stories_links", premiumButtonBg1 }};
+settingsStoriesIconLinks: icon {{ "menu/links_profile", premiumButtonBg1 }};
 
 settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(semiboldTextStyle) {
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 096bcbbdd..08d8355b2 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -11,7 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "settings/settings_common.h"
 #include "settings/settings_chat.h"
-#include "settings/settings_experimental.h"
 #include "settings/settings_power_saving.h"
 #include "settings/settings_privacy_security.h"
 #include "ui/wrap/vertical_layout.h"
@@ -46,8 +45,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "mtproto/facade.h"
-#include "styles/style_settings.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 
 #ifdef Q_OS_MAC
 #include "base/platform/mac/base_confirm_quit.h"
@@ -96,7 +96,7 @@ void SetupConnectionType(
 			tr::lng_connection_auto_connecting() | rpl::to_empty
 		) | rpl::map(connectionType),
 		st::settingsButton,
-		{ &st::settingsIconArrows, kIconGreen });
+		{ &st::menuIconNetwork });
 	button->addClickHandler([=] {
 		controller->show(ProxiesBoxController::CreateOwningBox(account));
 	});
@@ -106,9 +106,7 @@ bool HasUpdate() {
 	return !Core::UpdaterDisabled();
 }
 
-void SetupUpdate(
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
+void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 	if (!HasUpdate()) {
 		return;
 	}
@@ -140,24 +138,6 @@ void SetupUpdate(
 		tr::lng_settings_install_beta(),
 		st::settingsButtonNoIcon).get();
 
-	if (showOther) {
-		const auto experimental = inner->add(
-			object_ptr<Ui::SlideWrap<Button>>(
-				inner,
-				CreateButton(
-					inner,
-					tr::lng_settings_experimental(),
-					st::settingsButtonNoIcon)));
-		if (!install) {
-			experimental->toggle(true, anim::type::instant);
-		} else {
-			experimental->toggleOn(install->toggledValue());
-		}
-		experimental->entity()->setClickedCallback([=] {
-			showOther(Experimental::Id());
-		});
-	}
-
 	const auto check = AddButton(
 		inner,
 		tr::lng_settings_check_now(),
@@ -996,9 +976,7 @@ void Advanced::setupContent(not_null<Window::SessionController*> controller) {
 			addDivider();
 			AddSkip(content);
 			AddSubsectionTitle(content, tr::lng_settings_version_info());
-			SetupUpdate(content, [=](Type type) {
-				_showOther.fire_copy(type);
-			});
+			SetupUpdate(content);
 			AddSkip(content);
 		}
 	};
@@ -1029,24 +1007,13 @@ void Advanced::setupContent(not_null<Window::SessionController*> controller) {
 	if (cAutoUpdate()) {
 		addUpdate();
 	}
-	if (!HasUpdate()) {
-		AddSkip(content);
-		AddDivider(content);
-		AddSkip(content);
-		content->add(
-			CreateButton(
-				content,
-				tr::lng_settings_experimental(),
-				st::settingsButtonNoIcon)
-		)->setClickedCallback([=] {
-			_showOther.fire_copy(Experimental::Id());
-		});
-	}
 
 	AddSkip(content);
 	AddDivider(content);
 	AddSkip(content);
-	SetupExport(controller, content);
+	SetupExport(controller, content, [=](Type type) {
+		_showOther.fire_copy(type);
+	});
 
 	Ui::ResizeFitChild(this, content);
 }
diff --git a/Telegram/SourceFiles/settings/settings_advanced.h b/Telegram/SourceFiles/settings/settings_advanced.h
index 21aa2014f..a54e625f2 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.h
+++ b/Telegram/SourceFiles/settings/settings_advanced.h
@@ -30,9 +30,7 @@ void SetupConnectionType(
 	not_null<::Main::Account*> account,
 	not_null<Ui::VerticalLayout*> container);
 bool HasUpdate();
-void SetupUpdate(
-	not_null<Ui::VerticalLayout*> container,
-	Fn<void(Type)> showOther);
+void SetupUpdate(not_null<Ui::VerticalLayout*> container);
 void SetupWindowTitleContent(
 	Window::SessionController *controller,
 	not_null<Ui::VerticalLayout*> container);
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
index c9dce22cd..45f2376df 100644
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
+++ b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
@@ -77,7 +77,7 @@ QPointer<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> parent) {
 		content,
 		tr::lng_blocked_list_add(),
 		st::settingsButtonActive,
-		{ &st::menuIconBlockSettings, 0, IconType::Round, &st::transparent }
+		{ &st::menuIconBlockSettings, IconType::Round, &st::transparent }
 	)->addClickHandler([=] {
 		BlockedBoxController::BlockNewPeer(_controller);
 	});
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 188d70140..6b353438b 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "settings/settings_common.h"
 #include "settings/settings_advanced.h"
+#include "settings/settings_experimental.h"
 #include "boxes/connection_box.h"
 #include "boxes/auto_download_box.h"
 #include "boxes/reactions_settings_box.h"
@@ -67,6 +68,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat_helpers.h" // stickersRemove
 #include "styles/style_settings.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_window.h"
 
 namespace Settings {
@@ -805,7 +807,7 @@ void SetupStickersEmoji(
 		container,
 		tr::lng_stickers_you_have(),
 		st::settingsButton,
-		{ &st::settingsIconStickers, kIconLightOrange }
+		{ &st::menuIconStickers }
 	)->addClickHandler([=] {
 		controller->show(Box<StickersBox>(
 			controller->uiShow(),
@@ -816,7 +818,7 @@ void SetupStickersEmoji(
 		container,
 		tr::lng_emoji_manage_sets(),
 		st::settingsButton,
-		{ &st::settingsIconEmoji, kIconDarkOrange }
+		{ &st::menuIconEmoji }
 	)->addClickHandler([=] {
 		controller->show(Box<Ui::Emoji::ManageSetsBox>(session));
 	});
@@ -1016,11 +1018,13 @@ void SetupMessages(
 
 void SetupExport(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void(Type)> showOther) {
 	AddButton(
 		container,
 		tr::lng_settings_export_data(),
-		st::settingsButtonNoIcon
+		st::settingsButton,
+		{ &st::menuIconExport }
 	)->addClickHandler([=] {
 		const auto session = &controller->session();
 		controller->window().hideSettingsAndLayer();
@@ -1029,6 +1033,15 @@ void SetupExport(
 			session,
 			[=] { Core::App().exportManager().start(session); });
 	});
+
+	AddButton(
+		container,
+		tr::lng_settings_experimental(),
+		st::settingsButton,
+		{ &st::menuIconExperimental }
+	)->addClickHandler([=] {
+		showOther(Experimental::Id());
+	});
 }
 
 void SetupLocalStorage(
@@ -1038,7 +1051,7 @@ void SetupLocalStorage(
 		container,
 		tr::lng_settings_manage_local_storage(),
 		st::settingsButton,
-		{ &st::settingsIconGeneral, kIconLightOrange }
+		{ &st::menuIconStorage }
 	)->addClickHandler([=] {
 		LocalStorageBox::Show(&controller->session());
 	});
@@ -1069,7 +1082,7 @@ void SetupDataStorage(
 				container,
 				tr::lng_download_path(),
 				st::settingsButton,
-				{ &st::settingsIconFolders, kIconLightBlue })));
+				{ &st::menuIconShowInFolder })));
 	auto pathtext = Core::App().settings().downloadPathValue(
 	) | rpl::map([](const QString &text) {
 		if (text.isEmpty()) {
@@ -1097,7 +1110,7 @@ void SetupDataStorage(
 		container,
 		tr::lng_downloads_section(),
 		st::settingsButton,
-		{ &st::settingsIconDownload, kIconPurple }
+		{ &st::menuIconDownload }
 	)->setClickedCallback([=] {
 		controller->showSection(
 			Info::Downloads::Make(controller->session().user()));
@@ -1155,15 +1168,15 @@ void SetupAutoDownload(
 	add(
 		tr::lng_media_auto_in_private(),
 		Source::User,
-		{ &st::settingsIconUser, kIconLightBlue });
+		{ &st::menuIconProfile });
 	add(
 		tr::lng_media_auto_in_groups(),
 		Source::Group,
-		{ &st::settingsIconGroup, kIconGreen });
+		{ &st::menuIconGroups });
 	add(
 		tr::lng_media_auto_in_channels(),
 		Source::Channel,
-		{ &st::settingsIconChannel, kIconLightOrange });
+		{ &st::menuIconChannel });
 
 	AddSkip(container, st::settingsCheckboxesSkip);
 }
@@ -1507,7 +1520,7 @@ void SetupCloudThemes(
 		edit,
 		tr::lng_settings_bg_theme_edit(),
 		st::settingsButton,
-		{ &st::settingsIconThemes, kIconGreen }
+		{ &st::menuIconPalette }
 	)->addClickHandler([=] {
 		StartEditor(
 			&controller->window(),
diff --git a/Telegram/SourceFiles/settings/settings_chat.h b/Telegram/SourceFiles/settings/settings_chat.h
index e97653516..ad5b4f067 100644
--- a/Telegram/SourceFiles/settings/settings_chat.h
+++ b/Telegram/SourceFiles/settings/settings_chat.h
@@ -29,7 +29,8 @@ void SetupSupport(
 	not_null<Ui::VerticalLayout*> container);
 void SetupExport(
 	not_null<Window::SessionController*> controller,
-	not_null<Ui::VerticalLayout*> container);
+	not_null<Ui::VerticalLayout*> container,
+	Fn<void(Type)> showOther);
 
 void PaintRoundColorButton(
 	QPainter &p,
diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp
index e48d6b742..27f125a09 100644
--- a/Telegram/SourceFiles/settings/settings_common.cpp
+++ b/Telegram/SourceFiles/settings/settings_common.cpp
@@ -47,38 +47,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QAction>
 
 namespace Settings {
-namespace {
-
-base::options::toggle OptionMonoSettingsIcons({
-	.id = kOptionMonoSettingsIcons,
-	.name = "Mono settings and menu icons",
-	.description = "Use a single color for settings and main menu icons.",
-});
-
-} // namespace
-
-const char kOptionMonoSettingsIcons[] = "mono-settings-icons";
 
 Icon::Icon(IconDescriptor descriptor) : _icon(descriptor.icon) {
 	const auto background = [&]() -> const style::color* {
 		if (descriptor.type == IconType::Simple) {
 			return nullptr;
-		} else if (OptionMonoSettingsIcons.value()) {
-			return &st::transparent;
-		} else if (descriptor.color > 0) {
-			const auto list = std::array{
-				&st::settingsIconBg1,
-				&st::settingsIconBg2,
-				&st::settingsIconBg3,
-				&st::settingsIconBg4,
-				&st::settingsIconBg5,
-				&st::settingsIconBg6,
-				(const style::color*)nullptr,
-				&st::settingsIconBg8,
-				&st::settingsIconBgArchive,
-			};
-			Assert(descriptor.color < 10 && descriptor.color != 7);
-			return list[descriptor.color - 1];
 		}
 		return descriptor.background;
 	}();
@@ -111,11 +84,7 @@ void Icon::paint(QPainter &p, int x, int y) const {
 			_backgroundBrush->first,
 			_backgroundBrush->first);
 	}
-	if (OptionMonoSettingsIcons.value()) {
-		_icon->paint(p, { x, y }, 2 * x + _icon->width(), st::menuIconFg->c);
-	} else {
-		_icon->paint(p, { x, y }, 2 * x + _icon->width());
-	}
+	_icon->paint(p, { x, y }, 2 * x + _icon->width());
 }
 
 int Icon::width() const {
diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h
index 9ee703093..d601a1c1d 100644
--- a/Telegram/SourceFiles/settings/settings_common.h
+++ b/Telegram/SourceFiles/settings/settings_common.h
@@ -48,8 +48,6 @@ struct IconDescriptor;
 
 namespace Settings {
 
-extern const char kOptionMonoSettingsIcons[];
-
 using Button = Ui::SettingsButton;
 
 class AbstractSection;
@@ -129,15 +127,6 @@ public:
 	}
 };
 
-inline constexpr auto kIconRed = 1;
-inline constexpr auto kIconGreen = 2;
-inline constexpr auto kIconLightOrange = 3;
-inline constexpr auto kIconLightBlue = 4;
-inline constexpr auto kIconDarkBlue = 5;
-inline constexpr auto kIconPurple = 6;
-inline constexpr auto kIconDarkOrange = 8;
-inline constexpr auto kIconGray = 9;
-
 enum class IconType {
 	Rounded,
 	Round,
@@ -146,10 +135,9 @@ enum class IconType {
 
 struct IconDescriptor {
 	const style::icon *icon = nullptr;
-	int color = 0; // settingsIconBg{color}, 9 for settingsIconBgArchive.
 	IconType type = IconType::Rounded;
 	const style::color *background = nullptr;
-	std::optional<QBrush> backgroundBrush; // Can be useful for gragdients.
+	std::optional<QBrush> backgroundBrush; // Can be useful for gradients.
 
 	explicit operator bool() const {
 		return (icon != nullptr);
diff --git a/Telegram/SourceFiles/settings/settings_experimental.cpp b/Telegram/SourceFiles/settings/settings_experimental.cpp
index 9c9f3ccb6..74af35edf 100644
--- a/Telegram/SourceFiles/settings/settings_experimental.cpp
+++ b/Telegram/SourceFiles/settings/settings_experimental.cpp
@@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
 #include "window/notifications_manager.h"
-#include "settings/settings_common.h"
 #include "storage/localimageloader.h"
 #include "data/data_document_resolver.h"
 #include "styles/style_settings.h"
@@ -144,7 +143,6 @@ void SetupExperimental(
 	addToggle(Ui::kOptionUseSmallMsgBubbleRadius);
 	addToggle(Media::Player::kOptionDisableAutoplayNext);
 	addToggle(kOptionSendLargePhotos);
-	addToggle(Settings::kOptionMonoSettingsIcons);
 	addToggle(Webview::kOptionWebviewDebugEnabled);
 	addToggle(kOptionAutoScrollInactiveChat);
 	addToggle(Window::Notifications::kOptionGNotification);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 9b1087ac3..18a3630a7 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -543,7 +543,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		container,
 		tr::lng_filters_create(),
 		st::settingsButtonActive,
-		{ &st::settingsIconAdd, 0, IconType::Round, &st::windowBgActive }
+		{ &st::settingsIconAdd, IconType::Round, &st::windowBgActive }
 	)->setClickedCallback([=] {
 		if (showLimitReached()) {
 			return;
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index fd04b4af8..da3f97859 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -370,7 +370,7 @@ void SetupRows(
 		Info::Profile::NameValue(self) | Ui::Text::ToWithEntities(),
 		tr::lng_profile_copy_fullname(tr::now),
 		[=] { controller->show(Box<EditNameBox>(self)); },
-		{ &st::settingsIconUser, kIconLightBlue });
+		{ &st::menuIconProfile });
 
 	const auto showChangePhone = [=] {
 		controller->show(
@@ -383,7 +383,7 @@ void SetupRows(
 		Info::Profile::PhoneValue(self),
 		tr::lng_profile_copy_phone(tr::now),
 		showChangePhone,
-		{ &st::settingsIconCalls, kIconGreen });
+		{ &st::menuIconPhone });
 
 	auto username = Info::Profile::UsernameValue(self);
 	auto empty = base::duplicate(
@@ -426,9 +426,10 @@ void SetupRows(
 				session->api().usernames().requestToCache(session->user());
 			}, box->lifetime());
 		},
-		{ &st::settingsIconMention, kIconLightOrange });
+		{ &st::menuIconUsername });
 
 	AddSkip(container);
+	AddDividerText(container, tr::lng_settings_username_about());
 }
 
 void SetupBio(
@@ -556,7 +557,6 @@ void SetupBio(
 void SetupAccountsWrap(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller) {
-	AddDivider(container);
 	AddSkip(container);
 
 	SetupAccounts(container, controller);
@@ -786,7 +786,6 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AccountsList::setupAdd() {
 				st::mainMenuAddAccountButton,
 				{
 					&st::settingsIconAdd,
-					0,
 					IconType::Round,
 					&st::windowBgActive
 				})))->setDuration(0);
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index feea99acd..83c930c1a 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -69,7 +69,7 @@ object_ptr<Ui::RpWidget> CreateIntroSettings(
 	if (HasUpdate()) {
 		AddDivider(result);
 		AddSkip(result);
-		SetupUpdate(result, nullptr);
+		SetupUpdate(result);
 		AddSkip(result);
 	}
 	{
diff --git a/Telegram/SourceFiles/settings/settings_local_passcode.cpp b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
index 19b07ad24..e1c5d56d8 100644
--- a/Telegram/SourceFiles/settings/settings_local_passcode.cpp
+++ b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 
 namespace Settings {
@@ -442,7 +443,7 @@ void LocalPasscodeManage::setupContent() {
 		content,
 		tr::lng_passcode_change(),
 		st::settingsButton,
-		{ &st::settingsIconLock, kIconLightBlue }
+		{ &st::menuIconLock }
 	)->addClickHandler([=] {
 		_showOther.fire(LocalPasscodeChange::Id());
 	});
@@ -473,7 +474,7 @@ void LocalPasscodeManage::setupContent() {
 			: tr::lng_passcode_autolock_inactive)(),
 		std::move(autolockLabel),
 		st::settingsButton,
-		{ &st::settingsIconTimer, kIconGreen }
+		{ &st::menuIconTimer }
 	)->addClickHandler([=] {
 		const auto box = _controller->show(Box<AutoLockBox>());
 		box->boxClosing(
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 488676af2..9e6c8a2af 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -63,6 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_settings.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
+#include "styles/style_menu_icons.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
@@ -263,7 +264,7 @@ void SetupPowerSavingButton(
 		container,
 		tr::lng_settings_power_menu(),
 		st::settingsButton,
-		{ &st::settingsIconBattery, kIconDarkOrange });
+		{ &st::menuIconPowerUsage });
 	button->setClickedCallback([=] {
 		window->show(Box(PowerSavingBox));
 	});
@@ -282,7 +283,7 @@ void SetupLanguageButton(
 			Lang::GetInstance().idChanges()
 		) | rpl::map([] { return Lang::GetInstance().nativeName(); }),
 		icon ? st::settingsButton : st::settingsButtonNoIcon,
-		{ icon ? &st::settingsIconLanguage : nullptr, kIconLightBlue });
+		{ icon ? &st::menuIconTranslate : nullptr });
 	const auto guard = Ui::CreateChild<base::binary_guard>(button.get());
 	button->addClickHandler([=] {
 		const auto m = button->clickModifiers();
@@ -324,22 +325,23 @@ void SetupSections(
 		AddSkip(container);
 	} else {
 		addSection(
-			tr::lng_settings_information(),
+			tr::lng_settings_my_account(),
 			Information::Id(),
-			{ &st::settingsIconAccount, kIconLightOrange });
+			{ &st::menuIconProfile });
 	}
+
 	addSection(
 		tr::lng_settings_section_notify(),
 		Notifications::Id(),
-		{ &st::settingsIconNotifications, kIconRed });
+		{ &st::menuIconNotifications });
 	addSection(
 		tr::lng_settings_section_privacy(),
 		PrivacySecurity::Id(),
-		{ &st::settingsIconLock, kIconGreen });
+		{ &st::menuIconLock });
 	addSection(
 		tr::lng_settings_section_chat_settings(),
 		Chat::Id(),
-		{ &st::settingsIconChat, kIconLightBlue });
+		{ &st::menuIconChatBubble });
 
 	const auto preload = [=] {
 		controller->session().data().chatsFilters().requestSuggested();
@@ -352,7 +354,7 @@ void SetupSections(
 				container,
 				tr::lng_settings_section_filters(),
 				st::settingsButton,
-				{ &st::settingsIconFolders, kIconDarkBlue }))
+				{ &st::menuIconShowInFolder }))
 	)->setDuration(0);
 	if (controller->session().data().chatsFilters().has()
 		|| controller->session().settings().dialogsFiltersEnabled()) {
@@ -387,11 +389,11 @@ void SetupSections(
 	addSection(
 		tr::lng_settings_advanced(),
 		Advanced::Id(),
-		{ &st::settingsIconGeneral, kIconPurple });
+		{ &st::menuIconManage });
 	addSection(
 		tr::lng_settings_section_call_settings(),
 		Calls::Id(),
-		{ &st::settingsIconCalls, kIconGreen });
+		{ &st::menuIconPhone });
 
 	SetupPowerSavingButton(&controller->window(), container);
 	SetupLanguageButton(&controller->window(), container);
@@ -440,7 +442,7 @@ void SetupInterfaceScale(
 		container,
 		tr::lng_settings_default_scale(),
 		icon ? st::settingsButton : st::settingsButtonNoIcon,
-		{ icon ? &st::settingsIconInterfaceScale : nullptr, kIconLightOrange }
+		{ icon ? &st::menuIconShowInChat : nullptr }
 	)->toggleOn(toggled->events_starting_with_copy(switched));
 
 	const auto ratio = style::DevicePixelRatio();
@@ -584,7 +586,7 @@ void SetupFaq(not_null<Ui::VerticalLayout*> container, bool icon) {
 		container,
 		tr::lng_settings_faq(),
 		icon ? st::settingsButton : st::settingsButtonNoIcon,
-		{ icon ? &st::settingsIconFaq : nullptr, kIconLightBlue }
+		{ icon ? &st::menuIconFaq : nullptr }
 	)->addClickHandler(OpenFaq);
 }
 
@@ -600,7 +602,7 @@ void SetupHelp(
 		container,
 		tr::lng_settings_features(),
 		st::settingsButton,
-		{ &st::settingsIconTips, kIconLightOrange }
+		{ &st::menuIconEmojiObjects }
 	)->setClickedCallback([=] {
 		UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
 	});
@@ -609,7 +611,7 @@ void SetupHelp(
 		container,
 		tr::lng_settings_ask_question(),
 		st::settingsButton,
-		{ &st::settingsIconAskQuestion, kIconGreen });
+		{ &st::menuIconDiscussion });
 	const auto requestId = button->lifetime().make_state<mtpRequestId>();
 	button->lifetime().add([=] {
 		if (*requestId) {
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index 6e0163629..87abcbc01 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_settings.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_chat.h"
 #include "styles/style_window.h"
 #include "styles/style_dialogs.h"
@@ -826,7 +827,7 @@ void SetupNotificationsContent(
 	).make_state<rpl::event_stream<bool>>();
 	const auto desktop = addCheckbox(
 		tr::lng_settings_desktop_notify(),
-		{ &st::settingsIconNotifications, kIconRed },
+		{ &st::menuIconNotifications },
 		desktopToggles->events_starting_with(settings.desktopNotify()));
 
 	const auto flashbounceToggles = container->lifetime(
@@ -837,7 +838,7 @@ void SetupNotificationsContent(
 			: Platform::IsMac()
 			? tr::lng_settings_alert_mac
 			: tr::lng_settings_alert_linux)(),
-		{ &st::settingsIconDock, kIconDarkBlue },
+		{ &st::menuIconDockBounce },
 		flashbounceToggles->events_starting_with(
 			settings.flashBounceNotify()));
 
@@ -875,7 +876,7 @@ void SetupNotificationsContent(
 		tr::lng_settings_sound_notify(),
 		soundLabel->events_starting_with(label()),
 		st::settingsButton,
-		{ &st::settingsIconSound, kIconLightBlue });
+		{ &st::menuIconSoundOn });
 
 	AddSkip(container);
 
@@ -902,7 +903,7 @@ void SetupNotificationsContent(
 	) | rpl::then(session->api().contactSignupSilent());
 	const auto joined = addCheckbox(
 		tr::lng_settings_events_joined(),
-		{ &st::settingsIconPlus, kIconGreen },
+		{ &st::menuIconInvite },
 		std::move(joinSilent) | rpl::map(!_1));
 	joined->toggledChanges(
 	) | rpl::filter([=](bool enabled) {
@@ -914,7 +915,7 @@ void SetupNotificationsContent(
 
 	const auto pinned = addCheckbox(
 		tr::lng_settings_events_pinned(),
-		{ &st::settingsIconPin, kIconLightOrange },
+		{ &st::menuIconPin },
 		rpl::single(
 			settings.notifyAboutPinned()
 		) | rpl::then(settings.notifyAboutPinnedChanges()));
@@ -935,7 +936,7 @@ void SetupNotificationsContent(
 	const auto authorizations = &session->api().authorizations();
 	const auto acceptCalls = addCheckbox(
 		tr::lng_settings_call_accept_calls(),
-		{ &st::settingsIconCalls, kIconGreen },
+		{ &st::menuIconCallsReceive },
 		authorizations->callsDisabledHereValue() | rpl::map(!_1));
 	acceptCalls->toggledChanges(
 	) | rpl::filter([=](bool toggled) {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 349741dfb..f34691241 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -58,6 +58,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_boxes.h"
 #include "styles/style_settings.h"
 #include "styles/style_info.h"
+#include "styles/style_menu_icons.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
@@ -762,7 +763,7 @@ object_ptr<Ui::RpWidget> CallsPrivacyController::setupBelowWidget(
 		controller,
 		content,
 		tr::lng_settings_calls_peer_to_peer_button(),
-		{ &st::settingsIconArrows, kIconLightBlue },
+		{ &st::menuIconNetwork },
 		UserPrivacy::Key::CallsPeer2Peer,
 		[] { return std::make_unique<CallsPeer2PeerPrivacyController>(); },
 		&st::settingsButton);
@@ -1038,9 +1039,10 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupAboveWidget(
 	return nullptr;
 }
 
-object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupBelowWidget(
+object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 		not_null<Window::SessionController*> controller,
-		not_null<QWidget*> parent) {
+		not_null<QWidget*> parent,
+		rpl::producer<Option> optionValue) {
 	const auto self = controller->session().user();
 	auto widget = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 		parent,
@@ -1082,7 +1084,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupBelowWidget(
 		container,
 		state->setUserpicButtonText.value(),
 		st::settingsButtonLight,
-		{ &st::settingsIconPhoto, kIconLightBlue });
+		{ &st::menuBlueIconPhotoSet });
 	const auto &stRemoveButton = st::settingsAttentionButtonWithIcon;
 	const auto removeButton = container->add(
 		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
@@ -1112,7 +1114,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupBelowWidget(
 	removeButton->entity()->heightValue(
 	) | rpl::start_with_next([=,
 			left = stRemoveButton.iconLeft,
-			width = st::settingsIconPhoto.width()](int height) {
+			width = st::menuBlueIconPhotoSet.width()](int height) {
 		userpic->moveToLeft(
 			left + (width - userpic->width()) / 2,
 			(height - userpic->height()) / 2);
@@ -1173,7 +1175,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupBelowWidget(
 	};
 
 	widget->toggleOn(rpl::combine(
-		_option.value(),
+		std::move(optionValue),
 		_exceptionsNever.value()
 	) | rpl::map(rpl::mappers::_1 != Option::Everyone || rpl::mappers::_2));
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index d6f57b9db..e2c8c187f 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -235,9 +235,10 @@ public:
 		rpl::producer<Option> optionValue,
 		not_null<QWidget*> outerContainer) override;
 
-	object_ptr<Ui::RpWidget> setupBelowWidget(
+	object_ptr<Ui::RpWidget> setupMiddleWidget(
 		not_null<Window::SessionController*> controller,
-		not_null<QWidget*> parent) override;
+		not_null<QWidget*> parent,
+		rpl::producer<Option> optionValue) override;
 
 	void saveAdditional() override;
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 63df59c3d..e20d500db 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -58,6 +58,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "apiwrap.h"
 #include "styles/style_settings.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 
@@ -332,7 +333,7 @@ void SetupLocalPasscode(
 		tr::lng_settings_passcode_title(),
 		std::move(label),
 		st::settingsButton,
-		{ &st::settingsIconLock, kIconGreen }
+		{ &st::menuIconLock }
 	)->addClickHandler([=] {
 		if (controller->session().domain().local().hasLocalPasscode()) {
 			showOther(LocalPasscodeCheckId());
@@ -382,7 +383,7 @@ void SetupCloudPassword(
 		tr::lng_settings_cloud_password_start_title(),
 		std::move(label),
 		st::settingsButton,
-		{ &st::settingsIconKey, kIconLightBlue }
+		{ &st::menuIconPermissions }
 	)->addClickHandler([=, passwordState = base::duplicate(passwordState)] {
 		const auto state = rpl::variable<PasswordState>(
 			base::duplicate(passwordState)).current();
@@ -580,7 +581,7 @@ void SetupBlockedList(
 		tr::lng_settings_blocked_users(),
 		std::move(blockedCount),
 		st::settingsButton,
-		{ &st::settingsIconMinus, kIconRed });
+		{ &st::menuIconBlock });
 	blockedPeers->addClickHandler([=] {
 		showOther(Blocked::Id());
 	});
@@ -612,10 +613,13 @@ void SetupSessionsList(
 		tr::lng_settings_show_sessions(),
 		std::move(count),
 		st::settingsButton,
-		{ &st::settingsIconLaptop, kIconLightOrange }
+		{ &st::menuIconDevices }
 	)->addClickHandler([=] {
 		showOther(Sessions::Id());
 	});
+
+	AddSkip(container);
+	AddDividerText(container, tr::lng_settings_sessions_about());
 }
 
 void SetupGlobalTTLList(
@@ -635,7 +639,7 @@ void SetupGlobalTTLList(
 		tr::lng_settings_ttl_title(),
 		std::move(ttlLabel),
 		st::settingsButton,
-		{ &st::settingsIconTTL, kIconPurple });
+		{ &st::menuIconTTL });
 	globalTTLButton->addClickHandler([=] {
 		showOther(GlobalTTLId());
 	});
@@ -644,9 +648,6 @@ void SetupGlobalTTLList(
 	) | rpl::start_with_next([=] {
 		session->api().selfDestruct().reload();
 	}, container->lifetime());
-
-	AddSkip(container);
-	AddDividerText(container, tr::lng_settings_ttl_about());
 }
 
 void SetupSecurity(
@@ -657,19 +658,19 @@ void SetupSecurity(
 	AddSkip(container, st::settingsPrivacySkip);
 	AddSubsectionTitle(container, tr::lng_settings_security());
 
+	SetupCloudPassword(controller, container, showOther);
+	SetupGlobalTTLList(
+		controller,
+		container,
+		rpl::duplicate(updateTrigger),
+		showOther);
 	SetupBlockedList(
 		controller,
 		container,
 		rpl::duplicate(updateTrigger),
 		showOther);
-	SetupSessionsList(
-		controller,
-		container,
-		rpl::duplicate(updateTrigger),
-		showOther);
 	SetupLocalPasscode(controller, container, showOther);
-	SetupCloudPassword(controller, container, showOther);
-	SetupGlobalTTLList(
+	SetupSessionsList(
 		controller,
 		container,
 		rpl::duplicate(updateTrigger),
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 641390f2e..13aed59aa 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -38,10 +38,9 @@ menuIconInfo: icon {{ "menu/info", menuIconColor }};
 menuIconInvite: icon {{ "menu/invite", menuIconColor }};
 menuIconPromote: icon {{ "menu/admin_promote", menuIconColor }};
 menuIconAdmin: icon {{ "menu/admin", menuIconColor }};
-menuIconRemove: icon {{ "menu/stop_poll", menuIconColor }};
-menuIconStopPoll: icon {{ "menu/stop_poll", menuIconColor }};
+menuIconRemove: icon {{ "menu/remove", menuIconColor }};
 menuIconRetractVote: icon {{ "menu/retract_vote", menuIconColor }};
-menuIconRestrict: icon {{ "menu/permissions", menuIconColor }};
+menuIconPermissions: icon {{ "menu/permissions", menuIconColor }};
 menuIconShare: icon {{ "menu/share", menuIconColor }};
 menuIconArchive: icon {{ "menu/archive", menuIconColor }};
 menuIconUnarchive: icon {{ "menu/unarchive", menuIconColor }};
@@ -112,6 +111,30 @@ menuIconArchiveOpen: icon {{ "menu/archive_open", menuIconColor }};
 menuIconGroups: icon {{ "menu/groups", menuIconColor }};
 menuIconSavedMessages: icon {{ "menu/saved_messages", menuIconColor }};
 menuIconNightMode: icon {{ "menu/night_mode", menuIconColor }};
+menuIconNotifications: icon {{ "menu/info_notifications", menuIconColor }};
+menuIconLock: icon {{ "menu/lock", menuIconColor }};
+menuIconPowerUsage: icon {{ "menu/power_usage", menuIconColor }};
+menuIconFaq: icon {{ "menu/faq", menuIconColor }};
+menuIconEmojiObjects: icon {{ "emoji/emoji_objects", menuIconColor }};
+menuIconUsername: icon {{ "menu/payment_email", menuIconColor }};
+menuIconDevices: icon {{ "menu/devices", menuIconColor }};
+menuIconNetwork: icon {{ "menu/network", menuIconColor }};
+menuIconStorage: icon {{ "menu/storage", menuIconColor }};
+menuIconExperimental: icon {{ "menu/experimental", menuIconColor }};
+menuIconCallsReceive: icon {{ "menu/calls_receive", menuIconColor }};
+menuIconDockBounce: icon {{ "menu/dock_bounce", menuIconColor }};
+menuIconRecoveryEmail: icon {{ "menu/recovery_email", menuIconColor }};
+menuIconTimer: icon {{ "menu/timer", menuIconColor }};
+menuIconTopics: icon {{ "menu/topics", menuIconColor }};
+menuIconGroupReactions: icon {{ "menu/group_reactions", menuIconColor }};
+menuIconLinks: icon {{ "menu/links_profile", menuIconColor }};
+menuIconGroupLog: icon {{ "menu/group_log", menuIconColor }};
+menuIconGroupCreate: icon {{ "menu/groups_create", menuIconColor }};
+menuIconSigned: icon {{ "menu/signed", menuIconColor }};
+menuIconAntispam: icon {{ "menu/antispam", menuIconColor }};
+menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }};
+menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
+menuIconHideMembers: icon {{ "menu/hide_members", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
@@ -121,6 +144,8 @@ menuIconMuteForAny: icon {{ "menu/mute_for_plain", menuIconColor }};
 menuIconMuteForAnyTextPosition: point(14px, 9px);
 menuIconMuteForAnyTextFont: font(8px semibold);
 
+menuBlueIconPhotoSet: icon {{ "menu/photo_set", lightButtonFg }};
+
 mediaMenuIconStickers: icon {{ "menu/stickers", mediaviewMenuFg }};
 mediaMenuIconCancel: icon {{ "menu/cancel", mediaviewMenuFg }};
 mediaMenuIconShowInChat: icon {{ "menu/show_in_chat", mediaviewMenuFg }};

From 79e8b1dbca861de081358a17f0fabb558947d220 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Aug 2023 22:17:40 +0200
Subject: [PATCH 604/676] Don't check contact status for bots / service.

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

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 420177a1e..642265b6d 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -345,7 +345,9 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 		}
 		sort(list);
 	};
-	if (result.user->isContact()) {
+	if (result.user->isBot()
+		|| result.user->isServiceUser()
+		|| result.user->isContact()) {
 		const auto hidden = result.user->hasStoriesHidden();
 		using List = StorySourcesList;
 		add(hidden ? List::Hidden : List::NotHidden);

From 10829d4a6c2b84e3b23da2296671434accecae92 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Aug 2023 16:08:24 +0300
Subject: [PATCH 605/676] Added glare effect to inline bot buttons while
 waiting response.

---
 .../SourceFiles/chat_helpers/bot_keyboard.cpp |   8 +-
 .../history/history_item_components.cpp       |   2 +-
 .../history/history_item_components.h         |   4 +-
 .../history/view/history_view_message.cpp     | 143 ++++++++++++++++--
 Telegram/SourceFiles/ui/effects/glare.cpp     |  34 +++--
 Telegram/SourceFiles/ui/effects/glare.h       |   1 +
 Telegram/lib_ui                               |   2 +-
 7 files changed, 162 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
index 93ee5f624..5344d1184 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
@@ -52,7 +52,9 @@ protected:
 	void paintButtonLoading(
 		QPainter &p,
 		const Ui::ChatStyle *st,
-		const QRect &rect) const override;
+		const QRect &rect,
+		int outerWidth,
+		Ui::BubbleRounding rounding) const override;
 	int minButtonWidth(HistoryMessageMarkupButton::Type type) const override;
 
 private:
@@ -107,7 +109,9 @@ void Style::paintButtonIcon(
 void Style::paintButtonLoading(
 		QPainter &p,
 		const Ui::ChatStyle *st,
-		const QRect &rect) const {
+		const QRect &rect,
+		int outerWidth,
+		Ui::BubbleRounding rounding) const {
 	// Buttons with loading progress should not appear here.
 }
 
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index dc648b811..f9e1c403f 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -1068,7 +1068,7 @@ void ReplyKeyboard::Style::paintButton(
 		|| button.type == HistoryMessageMarkupButton::Type::Game) {
 		if (const auto data = button.link->getButton()) {
 			if (data->requestId) {
-				paintButtonLoading(p, st, rect);
+				paintButtonLoading(p, st, rect, outerWidth, rounding);
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index e743932b9..75581f969 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -426,7 +426,9 @@ public:
 		virtual void paintButtonLoading(
 			QPainter &p,
 			const Ui::ChatStyle *st,
-			const QRect &rect) const = 0;
+			const QRect &rect,
+			int outerWidth,
+			Ui::BubbleRounding rounding) const = 0;
 		virtual int minButtonWidth(
 			HistoryMessageMarkupButton::Type type) const = 0;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index d3ea404c6..e562ce6c6 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -21,10 +21,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_view_button.h" // ViewButton.
 #include "history/history.h"
 #include "boxes/share_box.h"
+#include "ui/effects/glare.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/chat/message_bubble.h"
 #include "ui/chat/chat_style.h"
+#include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_entity.h"
 #include "ui/cached_round_corners.h"
@@ -65,7 +67,7 @@ std::optional<Window::SessionController*> ExtractController(
 
 class KeyboardStyle : public ReplyKeyboard::Style {
 public:
-	using ReplyKeyboard::Style::Style;
+	KeyboardStyle(const style::BotKeyboardButton &st);
 
 	Images::CornersMaskRef buttonRounding(
 		Ui::BubbleRounding outer,
@@ -93,11 +95,29 @@ protected:
 	void paintButtonLoading(
 		QPainter &p,
 		const Ui::ChatStyle *st,
-		const QRect &rect) const override;
+		const QRect &rect,
+		int outerWidth,
+		Ui::BubbleRounding rounding) const override;
 	int minButtonWidth(HistoryMessageMarkupButton::Type type) const override;
 
+private:
+	using BubbleRoundingKey = uchar;
+	mutable base::flat_map<BubbleRoundingKey, QImage> _cachedBg;
+	mutable base::flat_map<BubbleRoundingKey, QPainterPath> _cachedOutline;
+	mutable std::unique_ptr<Ui::GlareEffect> _glare;
+	rpl::lifetime _lifetime;
+
 };
 
+KeyboardStyle::KeyboardStyle(const style::BotKeyboardButton &st)
+: ReplyKeyboard::Style(st) {
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		_cachedBg = {};
+		_cachedOutline = {};
+	}, _lifetime);
+}
+
 void KeyboardStyle::startPaint(
 		QPainter &p,
 		const Ui::ChatStyle *st) const {
@@ -112,6 +132,15 @@ const style::TextStyle &KeyboardStyle::textStyle() const {
 
 void KeyboardStyle::repaint(not_null<const HistoryItem*> item) const {
 	item->history()->owner().requestItemRepaint(item);
+	if (_glare && !_glare->glare.birthTime) {
+		constexpr auto kTimeout = crl::time(0);
+		constexpr auto kDuration = crl::time(1100);
+		_glare->validate(
+			st::premiumButtonFg->c,
+			[=] { repaint(item); },
+			kTimeout,
+			kDuration);
+	}
 }
 
 Images::CornersMaskRef KeyboardStyle::buttonRounding(
@@ -143,15 +172,42 @@ void KeyboardStyle::paintButtonBg(
 		float64 howMuchOver) const {
 	Expects(st != nullptr);
 
-	const auto sti = &st->imageStyle(false);
-	const auto &small = sti->msgServiceBgCornersSmall;
-	const auto &large = sti->msgServiceBgCornersLarge;
-	auto corners = Ui::CornersPixmaps();
 	using Corner = Ui::BubbleCornerRounding;
-	for (auto i = 0; i != 4; ++i) {
-		corners.p[i] = (rounding[i] == Corner::Large ? large : small).p[i];
+	auto &cachedBg = _cachedBg[rounding.key()];
+
+	if (cachedBg.isNull()
+		|| cachedBg.width() != (rect.width() * style::DevicePixelRatio())) {
+		cachedBg = QImage(
+			rect.size() * style::DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
+		cachedBg.setDevicePixelRatio(style::DevicePixelRatio());
+		cachedBg.fill(Qt::transparent);
+		{
+			auto painter = QPainter(&cachedBg);
+
+			const auto sti = &st->imageStyle(false);
+			const auto &small = sti->msgServiceBgCornersSmall;
+			const auto &large = sti->msgServiceBgCornersLarge;
+			auto corners = Ui::CornersPixmaps();
+            int radiuses[4];
+			for (auto i = 0; i != 4; ++i) {
+				const auto isLarge = (rounding[i] == Corner::Large);
+				corners.p[i] = (isLarge ? large : small).p[i];
+				radiuses[i] = Ui::CachedCornerRadiusValue(isLarge
+					? Ui::CachedCornerRadius::BubbleLarge
+					: Ui::CachedCornerRadius::BubbleSmall);
+			}
+			const auto r = Rect(rect.size());
+			_cachedOutline[rounding.key()] = Ui::ComplexRoundedRectPath(
+				r - Margins(st::lineWidth),
+				radiuses[0],
+				radiuses[1],
+				radiuses[2],
+				radiuses[3]);
+			Ui::FillRoundRect(painter, r, sti->msgServiceBg, corners);
+		}
 	}
-	Ui::FillRoundRect(p, rect, sti->msgServiceBg, corners);
+	p.drawImage(rect.topLeft(), cachedBg);
 	if (howMuchOver > 0) {
 		auto o = p.opacity();
 		p.setOpacity(o * howMuchOver);
@@ -195,11 +251,74 @@ void KeyboardStyle::paintButtonIcon(
 void KeyboardStyle::paintButtonLoading(
 		QPainter &p,
 		const Ui::ChatStyle *st,
-		const QRect &rect) const {
+		const QRect &rect,
+		int outerWidth,
+		Ui::BubbleRounding rounding) const {
 	Expects(st != nullptr);
 
-	const auto &icon = st->historySendingInvertedIcon();
-	icon.paint(p, rect.x() + rect.width() - icon.width() - st::msgBotKbIconPadding, rect.y() + rect.height() - icon.height() - st::msgBotKbIconPadding, rect.x() * 2 + rect.width());
+	if (anim::Disabled()) {
+		const auto &icon = st->historySendingInvertedIcon();
+		icon.paint(
+			p,
+			rect::right(rect) - icon.width() - st::msgBotKbIconPadding,
+			rect::bottom(rect) - icon.height() - st::msgBotKbIconPadding,
+			rect.x() * 2 + rect.width());
+		return;
+	}
+
+	const auto cacheKey = rounding.key();
+	auto &cachedBg = _cachedBg[cacheKey];
+	if (!cachedBg.isNull()) {
+		if (_glare && _glare->glare.birthTime) {
+			const auto progress = _glare->progress(crl::now());
+			const auto w = _glare->width;
+			const auto h = rect.height();
+			const auto x = (-w) + (w * 2) * progress;
+
+			auto frame = cachedBg;
+			frame.fill(Qt::transparent);
+			{
+				auto painter = QPainter(&frame);
+				auto hq = PainterHighQualityEnabler(painter);
+				painter.setPen(Qt::NoPen);
+				painter.drawTiledPixmap(x, 0, w, h, _glare->pixmap, 0, 0);
+
+				auto path = QPainterPath();
+				path.addRect(Rect(rect.size()));
+				path -= _cachedOutline[cacheKey];
+
+				constexpr auto kBgOutlineAlpha = 0.5;
+				constexpr auto kFgOutlineAlpha = 0.8;
+				const auto &c = st::premiumButtonFg->c;
+				painter.setPen(Qt::NoPen);
+				painter.setBrush(c);
+				painter.setOpacity(kBgOutlineAlpha);
+				painter.drawPath(path);
+				auto gradient = QLinearGradient(-w, 0, w * 2, 0);
+				{
+					constexpr auto kShiftLeft = 0.01;
+					constexpr auto kShiftRight = 0.99;
+					auto stops = _glare->computeGradient(c).stops();
+					stops[1] = {
+						std::clamp(progress, kShiftLeft, kShiftRight),
+						QColor(c.red(), c.green(), c.blue(), kFgOutlineAlpha),
+					};
+					gradient.setStops(std::move(stops));
+				}
+				painter.setBrush(QBrush(gradient));
+				painter.setOpacity(1);
+				painter.drawPath(path);
+
+				painter.setCompositionMode(
+					QPainter::CompositionMode_DestinationIn);
+				painter.drawImage(0, 0, cachedBg);
+			}
+			p.drawImage(rect.x(), rect.y(), frame);
+		} else {
+			_glare = std::make_unique<Ui::GlareEffect>();
+			_glare->width = outerWidth;
+		}
+	}
 }
 
 int KeyboardStyle::minButtonWidth(
diff --git a/Telegram/SourceFiles/ui/effects/glare.cpp b/Telegram/SourceFiles/ui/effects/glare.cpp
index e5cda2a29..e326982df 100644
--- a/Telegram/SourceFiles/ui/effects/glare.cpp
+++ b/Telegram/SourceFiles/ui/effects/glare.cpp
@@ -21,6 +21,24 @@ float64 GlareEffect::progress(crl::time now) const {
 		/ float64(glare.deathTime - glare.birthTime);
 }
 
+QLinearGradient GlareEffect::computeGradient(const QColor &color) const {
+	auto gradient = QLinearGradient(
+		QPointF(0, 0),
+		QPointF(width, 0));
+
+	auto tempColor = color;
+	tempColor.setAlphaF(0);
+	const auto edge = tempColor;
+	tempColor.setAlphaF(kMaxGlareOpaque);
+	const auto middle = tempColor;
+	gradient.setStops({
+		{ 0., edge },
+		{ .5, middle },
+		{ 1., edge },
+	});
+	return gradient;
+}
+
 void GlareEffect::validate(
 		const QColor &color,
 		Fn<void()> updateCallback,
@@ -53,21 +71,7 @@ void GlareEffect::validate(
 		newPixmap.fill(Qt::transparent);
 		{
 			auto p = QPainter(&newPixmap);
-			auto gradient = QLinearGradient(
-				QPointF(0, 0),
-				QPointF(width, 0));
-
-			auto tempColor = color;
-			tempColor.setAlphaF(0);
-			const auto edge = tempColor;
-			tempColor.setAlphaF(kMaxGlareOpaque);
-			const auto middle = tempColor;
-			gradient.setStops({
-				{ 0., edge },
-				{ .5, middle },
-				{ 1., edge },
-			});
-			p.fillRect(newPixmap.rect(), QBrush(gradient));
+			p.fillRect(newPixmap.rect(), QBrush(computeGradient(color)));
 		}
 		pixmap = std::move(newPixmap);
 	}
diff --git a/Telegram/SourceFiles/ui/effects/glare.h b/Telegram/SourceFiles/ui/effects/glare.h
index cebf1a9a0..ce416bc2d 100644
--- a/Telegram/SourceFiles/ui/effects/glare.h
+++ b/Telegram/SourceFiles/ui/effects/glare.h
@@ -16,6 +16,7 @@ struct GlareEffect final {
 		crl::time timeout,
 		crl::time duration);
 	[[nodiscard]] float64 progress(crl::time now) const;
+	[[nodiscard]] QLinearGradient computeGradient(const QColor &color) const;
 
 	Ui::Animations::Basic animation;
 	struct {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index fd55e9b71..70867536a 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit fd55e9b71b03282de682e9b8ac01f1b6801d25a9
+Subproject commit 70867536a4f499f64c0efea18b870a24043c7ce0

From 751af75f3ee13f0da19eba8a47681c1f90e7bccf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Aug 2023 22:24:45 +0200
Subject: [PATCH 606/676] Version 4.9.

- Gradual stories rollout.
---
 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                                |  4 ++++
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 05e0aa48e..0844307ba 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.8.12.0" />
+    Version="4.9.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 8b33fbbbd..3957f630e 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,8,12,0
- PRODUCTVERSION 4,8,12,0
+ FILEVERSION 4,9,0,0
+ PRODUCTVERSION 4,9,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.8.12.0"
+            VALUE "FileVersion", "4.9.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.12.0"
+            VALUE "ProductVersion", "4.9.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c86c3585e..b1e629e09 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,8,12,0
- PRODUCTVERSION 4,8,12,0
+ FILEVERSION 4,9,0,0
+ PRODUCTVERSION 4,9,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.8.12.0"
+            VALUE "FileVersion", "4.9.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.8.12.0"
+            VALUE "ProductVersion", "4.9.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 13716a5c1..0ec67688a 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 = 4008012;
-constexpr auto AppVersionStr = "4.8.12";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 4009000;
+constexpr auto AppVersionStr = "4.9";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index a9da6aa89..f0f807c07 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4008012
-AppVersionStrMajor 4.8
-AppVersionStrSmall 4.8.12
-AppVersionStr      4.8.12
-BetaChannel        1
+AppVersion         4009000
+AppVersionStrMajor 4.9
+AppVersionStrSmall 4.9
+AppVersionStr      4.9.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.8.12.beta
+AppVersionOriginal 4.9
diff --git a/changelog.txt b/changelog.txt
index c0521d01f..759572a27 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.9 (14.08.23)
+
+- Gradual stories rollout.
+
 4.8.12 beta (11.08.23)
 
 - Fix crash by a full rebuild on macOS.

From b3525372796f6eb0e8a4417ac258ce251dfeb839 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Aug 2023 22:58:42 +0200
Subject: [PATCH 607/676] Version 4.9: Fix build with Xcode.

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

diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 4285247a1..8f5f5fec5 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -496,7 +496,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 					_channel->session().api().chatParticipants().requestAdmins(_channel);
 				} else {
 					mrows.reserve(mrows.size() + _channel->mgInfo->admins.size());
-					for (const auto [userId, rank] : _channel->mgInfo->admins) {
+					for (const auto &[userId, rank] : _channel->mgInfo->admins) {
 						if (const auto user = _channel->owner().userLoaded(userId)) {
 							if (user->isInaccessible()) continue;
 							if (!listAllSuggestions && filterNotPassedByName(user)) continue;

From b1cf6c57b31dfbf11296b9daf7ed00bc5c8f6ddb Mon Sep 17 00:00:00 2001
From: c0re100 <corehusky@gmail.com>
Date: Mon, 14 Aug 2023 12:36:31 +0800
Subject: [PATCH 608/676] Update CMakeLists.txt

Move `ASM` to Linux only
To avoid `cannot open file 'dxguid.obj'` on Windows.

Closes #26646
---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2979473c4..9248d33c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,9 +19,11 @@ include(cmake/validate_special_target.cmake)
 include(cmake/version.cmake)
 desktop_app_parse_version(Telegram/build/version)
 
-set(project_langs ASM C CXX)
+set(project_langs C CXX)
 if (APPLE)
     list(APPEND project_langs OBJC OBJCXX)
+elseif (LINUX)
+    list(APPEND project_langs ASM)
 endif()
 
 project(Telegram

From 2e6abf0bede8b39c7c066b2db12d5f67b5ee8421 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 00:33:18 +0200
Subject: [PATCH 609/676] Version 4.9: Fix build with GCC.

---
 Telegram/SourceFiles/boxes/edit_privacy_box.cpp | 1 -
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 0baadc182..e5c601881 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -291,7 +291,6 @@ void EditPrivacyBox::setupContent() {
 				return Settings::ExceptionUsersCount(exceptions(exception));
 			}));
 		auto text = _controller->exceptionButtonTextKey(exception);
-		const auto always = (exception == Exception::Always);
 		const auto button = content->add(
 			object_ptr<Ui::SlideWrap<Button>>(
 				content,
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index 0d166a1e3..e105cd441 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -16,6 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <private/qdrawhelper_p.h>
 #endif // LIB_FFMPEG_USE_QT_PRIVATE_API
 
+#include <deque>
+
 extern "C" {
 #include <libavutil/opt.h>
 #if !defined DESKTOP_APP_USE_PACKAGED && !defined Q_OS_WIN && !defined Q_OS_MAC

From 29a458c8a0552a66a3a32f748720d8a46bfcfa87 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 00:04:43 +0300
Subject: [PATCH 610/676] Added ability to jump between channel posts with Ctrl
 + arrow shortcuts.

---
 .../history_view_highlight_manager.cpp        | 10 +++++-
 .../history/history_view_highlight_manager.h  |  5 +++
 .../SourceFiles/history/history_widget.cpp    | 34 ++++++++++++++++---
 Telegram/lib_ui                               |  2 +-
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_view_highlight_manager.cpp b/Telegram/SourceFiles/history/history_view_highlight_manager.cpp
index 137cd30e0..939e56980 100644
--- a/Telegram/SourceFiles/history/history_view_highlight_manager.cpp
+++ b/Telegram/SourceFiles/history/history_view_highlight_manager.cpp
@@ -115,6 +115,7 @@ void ElementHighlighter::updateMessage() {
 void ElementHighlighter::clear() {
 	_animation.cancel();
 	_highlightedMessageId = FullMsgId();
+	_lastHighlightedMessageId = FullMsgId();
 	_queue.clear();
 }
 
@@ -139,10 +140,17 @@ float64 ElementHighlighter::AnimationManager::progress() const {
 	}
 }
 
+MsgId ElementHighlighter::latestSingleHighlightedMsgId() const {
+	return _highlightedMessageId
+		? _highlightedMessageId.msg
+		: _lastHighlightedMessageId.msg;
+}
+
 void ElementHighlighter::AnimationManager::start() {
 	const auto finish = [=] {
 		cancel();
-		_parent._highlightedMessageId = FullMsgId();
+		_parent._lastHighlightedMessageId = base::take(
+			_parent._highlightedMessageId);
 		_parent.checkNextHighlight();
 	};
 	cancel();
diff --git a/Telegram/SourceFiles/history/history_view_highlight_manager.h b/Telegram/SourceFiles/history/history_view_highlight_manager.h
index df43f446b..43372a8b9 100644
--- a/Telegram/SourceFiles/history/history_view_highlight_manager.h
+++ b/Telegram/SourceFiles/history/history_view_highlight_manager.h
@@ -34,6 +34,7 @@ public:
 	void clear();
 
 	[[nodiscard]] float64 progress(not_null<const HistoryItem*> item) const;
+	[[nodiscard]] MsgId latestSingleHighlightedMsgId() const;
 
 private:
 	void checkNextHighlight();
@@ -47,10 +48,12 @@ private:
 		[[nodiscard]] float64 progress() const;
 		void start();
 		void cancel();
+
 	private:
 		ElementHighlighter &_parent;
 		Ui::Animations::Simple _simple;
 		std::optional<base::Timer> _timer;
+
 	};
 
 	const not_null<Data::Session*> _data;
@@ -58,9 +61,11 @@ private:
 	const RepaintView _repaintView;
 
 	FullMsgId _highlightedMessageId;
+	FullMsgId _lastHighlightedMessageId;
 	std::deque<FullMsgId> _queue;
 
 	AnimationManager _animation;
+
 };
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 6c71cd83a..138a12a31 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -6212,6 +6212,16 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
 			return;
 		}
 		_scroll->keyPressEvent(e);
+	} else if (e->key() == Qt::Key_Up
+		&& commonModifiers == Qt::ControlModifier) {
+		if (!replyToPreviousMessage()) {
+			e->ignore();
+		}
+	} else if (e->key() == Qt::Key_Down
+		&& commonModifiers == Qt::ControlModifier) {
+		if (!replyToNextMessage()) {
+			e->ignore();
+		}
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		if (!_botStart->isHidden()) {
 			sendBotStartCommand();
@@ -6268,20 +6278,28 @@ bool HistoryWidget::replyToPreviousMessage() {
 	if (!_history || _editMsgId || _history->isForum()) {
 		return false;
 	}
-	const auto fullId = FullMsgId(_history->peer->id, _replyToId);
+	const auto fullId = FullMsgId(
+		_history->peer->id,
+		_field->isVisible()
+			? _replyToId
+			: _highlighter.latestSingleHighlightedMsgId());
 	if (const auto item = session().data().message(fullId)) {
 		if (const auto view = item->mainView()) {
 			if (const auto previousView = view->previousDisplayedInBlocks()) {
 				const auto previous = previousView->data();
 				controller()->showMessage(previous);
-				replyToMessage(previous);
+				if (_field->isVisible()) {
+					replyToMessage(previous);
+				}
 				return true;
 			}
 		}
 	} else if (const auto previousView = _history->findLastDisplayed()) {
 		const auto previous = previousView->data();
 		controller()->showMessage(previous);
-		replyToMessage(previous);
+		if (_field->isVisible()) {
+			replyToMessage(previous);
+		}
 		return true;
 	}
 	return false;
@@ -6291,13 +6309,19 @@ bool HistoryWidget::replyToNextMessage() {
 	if (!_history || _editMsgId || _history->isForum()) {
 		return false;
 	}
-	const auto fullId = FullMsgId(_history->peer->id, _replyToId);
+	const auto fullId = FullMsgId(
+		_history->peer->id,
+		_field->isVisible()
+			? _replyToId
+			: _highlighter.latestSingleHighlightedMsgId());
 	if (const auto item = session().data().message(fullId)) {
 		if (const auto view = item->mainView()) {
 			if (const auto nextView = view->nextDisplayedInBlocks()) {
 				const auto next = nextView->data();
 				controller()->showMessage(next);
-				replyToMessage(next);
+				if (_field->isVisible()) {
+					replyToMessage(next);
+				}
 			} else {
 				_highlighter.clear();
 				cancelReply(false);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 70867536a..0ea27ae05 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 70867536a4f499f64c0efea18b870a24043c7ce0
+Subproject commit 0ea27ae051774047cc00b92778f98c2f243712e8

From 3d0b139c40b55657712f832c41bd469e8fdc41aa Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 02:00:41 +0300
Subject: [PATCH 611/676] Removed text transform from update application
 button.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp     | 4 ++--
 Telegram/SourceFiles/settings/settings_advanced.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 11e7b2f1b..a5a26e309 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -121,7 +121,7 @@ Widget::BottomButton::BottomButton(
 	const style::icon &icon,
 	const style::icon &iconOver)
 : RippleButton(parent, st.ripple)
-, _text(text.toUpper())
+, _text(text)
 , _st(st)
 , _icon(icon)
 , _iconOver(iconOver) {
@@ -129,7 +129,7 @@ Widget::BottomButton::BottomButton(
 }
 
 void Widget::BottomButton::setText(const QString &text) {
-	_text = text.toUpper();
+	_text = text;
 	update();
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 08d8355b2..0d1b7ddad 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -144,7 +144,7 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
 		st::settingsButtonNoIcon);
 	const auto update = Ui::CreateChild<Button>(
 		check.get(),
-		tr::lng_update_telegram() | Ui::Text::ToUpper(),
+		tr::lng_update_telegram(),
 		st::settingsUpdate);
 	update->hide();
 	check->widthValue() | rpl::start_with_next([=](int width) {

From a0fb81b871d61b6c9cf10fb38ad7c7e614c7ad2c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 02:10:26 +0300
Subject: [PATCH 612/676] Removed text transform from send button in toasts.

---
 Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp | 2 +-
 Telegram/SourceFiles/data/data_media_types.cpp            | 3 +--
 Telegram/SourceFiles/settings/settings_advanced.cpp       | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
index 507023aa9..48bc383c9 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
+#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue
 #include "boxes/peer_list_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "boxes/add_contact_box.h"
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 19d89c500..7a36a5515 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -1848,8 +1848,7 @@ ClickHandlerPtr MediaDice::MakeHandler(
 			.multiline = true,
 		};
 		if (CanSend(history->peer, ChatRestriction::SendOther)) {
-			auto link = Ui::Text::Link(
-				tr::lng_about_random_send(tr::now).toUpper());
+			auto link = Ui::Text::Link(tr::lng_about_random_send(tr::now));
 			link.entities.push_back(
 				EntityInText(EntityType::Semibold, 0, link.text.size()));
 			config.text.append(' ').append(std::move(link));
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 0d1b7ddad..3f6bf052e 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/gl/gl_detection.h"
 #include "ui/layers/generic_box.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/format_values.h"
 #include "ui/boxes/single_choice_box.h"
 #include "ui/painter.h"

From f5399124050a57b83a20ac08e5e510565e2abbf4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 09:46:32 +0300
Subject: [PATCH 613/676] Fixed overriding all link handlers in messages with
 reply.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index e562ce6c6..b2b9fe281 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1719,7 +1719,8 @@ void Message::clickHandlerPressedChanged(
 		toggleTopicButtonRipple(pressed);
 	} else if (_viewButton) {
 		_viewButton->checkLink(handler, pressed);
-	} else if (const auto reply = displayedReply()) {
+	} else if (const auto reply = displayedReply();
+			reply && (handler == reply->replyToLink())) {
 		toggleReplyRipple(pressed);
 	}
 }

From 9bf5f992a37f55716eae1e5ec90b426bc7dc7879 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 10:26:52 +0300
Subject: [PATCH 614/676] Removed not really necessary
 HistoryView::Media::dragItem method.

---
 .../history/admin_log/history_admin_log_inner.cpp |  3 +--
 .../SourceFiles/history/history_inner_widget.cpp  |  6 ++----
 .../history/view/history_view_list_widget.cpp     | 15 +++------------
 .../history/view/media/history_view_media.h       |  5 -----
 .../view/media/history_view_media_unwrapped.h     |  3 ---
 .../info/media/info_media_list_widget.cpp         |  2 +-
 6 files changed, 7 insertions(+), 27 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 e45f961c9..2b49f8c1c 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1892,8 +1892,7 @@ void InnerWidget::performDrag() {
 	//	auto pressedMedia = static_cast<HistoryView::Media*>(nullptr);
 	//	if (auto pressedItem = Element::Pressed()) {
 	//		pressedMedia = pressedItem->media();
-	//		if (_mouseCursorState == CursorState::Date
-	//			|| (pressedMedia && pressedMedia->dragItem())) {
+	//		if (_mouseCursorState == CursorState::Date) {
 	//			forwardMimeType = u"application/x-td-forward"_q;
 	//			session().data().setMimeForwardIds(
 	//				session().data().itemOrItsGroup(pressedItem->data()));
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index eedd0b81c..2f1dabec2 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1690,8 +1690,7 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
 					_mouseAction = MouseAction::PrepareDrag; // start text drag
 				} else if (!_pressWasInactive) {
 					const auto media = Element::Pressed()->media();
-					if ((media && media->dragItem())
-						|| _mouseCursorState == CursorState::Date) {
+					if (_mouseCursorState == CursorState::Date) {
 						_mouseAction = MouseAction::PrepareDrag; // start sticker drag or by-date drag
 					} else {
 						if (dragState.afterSymbol) ++_mouseTextSymbol;
@@ -1804,8 +1803,7 @@ std::unique_ptr<QMimeData> HistoryInner::prepareDrag() {
 		} else if (view->isHiddenByGroup() && pressedHandler) {
 			forwardIds = MessageIdsList(1, _dragStateItem->fullId());
 		} else if (const auto media = view->media()) {
-			if (media->dragItemByHandler(pressedHandler)
-				|| media->dragItem()) {
+			if (media->dragItemByHandler(pressedHandler)) {
 				forwardIds = MessageIdsList(1, _dragStateItem->fullId());
 			}
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 1e2648125..3de0cb20e 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1302,16 +1302,8 @@ auto ListWidget::itemUnderPressSelection() const
 		: _selected.end();
 }
 
-bool ListWidget::requiredToStartDragging(
-		not_null<Element*> view) const {
-	if (_mouseCursorState == CursorState::Date) {
-		return true;
-	} else if (const auto media = view->media()) {
-		if (media->dragItem()) {
-			return true;
-		}
-	}
-	return false;
+bool ListWidget::requiredToStartDragging(not_null<Element*> view) const {
+	return (_mouseCursorState == CursorState::Date);
 }
 
 bool ListWidget::isPressInSelectedText(TextState state) const {
@@ -3625,8 +3617,7 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 			}
 		} else if (const auto media = pressedView->media()) {
 			if (pressedView->data()->allowsForward()
-				&& (media->dragItemByHandler(pressedHandler)
-					|| media->dragItem())) {
+				&& media->dragItemByHandler(pressedHandler)) {
 				forwardIds = MessageIdsList(1, exactItem->fullId());
 			}
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index 108dffc83..768107f65 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -126,11 +126,6 @@ public:
 	[[nodiscard]] virtual bool toggleSelectionByHandlerClick(
 		const ClickHandlerPtr &p) const = 0;
 
-	// if we press and drag on this media should we drag the item
-	[[nodiscard]] virtual bool dragItem() const {
-		return false;
-	}
-
 	[[nodiscard]] virtual TextSelection adjustSelection(
 			TextSelection selection,
 			TextSelectType type) const {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
index 1ebe55e71..8b03a801d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
@@ -73,9 +73,6 @@ public:
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return true;
 	}
-	bool dragItem() const override {
-		return true;
-	}
 	bool dragItemByHandler(const ClickHandlerPtr &p) const override {
 		return true;
 	}
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index ae029cf9e..5bc2155cb 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -1815,7 +1815,7 @@ void ListWidget::performDrag() {
 	//	auto pressedMedia = static_cast<HistoryView::Media*>(nullptr);
 	//	if (auto pressedItem = _pressState.layout) {
 	//		pressedMedia = pressedItem->getMedia();
-	//		if (_mouseCursorState == CursorState::Date || (pressedMedia && pressedMedia->dragItem())) {
+	//		if (_mouseCursorState == CursorState::Date) {
 	//			session().data().setMimeForwardIds(session().data().itemOrItsGroup(pressedItem));
 	//			forwardMimeType = u"application/x-td-forward"_q;
 	//		}

From fd6e135700f351ba02b2f5dfcd8c98b182702fd6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 10:13:26 +0300
Subject: [PATCH 615/676] Ignored drag action on reply links in unwrapped
 media.

---
 .../history/view/media/history_view_media_unwrapped.cpp     | 6 ++++++
 .../history/view/media/history_view_media_unwrapped.h       | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

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 3348a1855..4ff49e604 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -519,6 +519,12 @@ bool UnwrappedMedia::hasTextForCopy() const {
 	return _content->hasTextForCopy();
 }
 
+bool UnwrappedMedia::dragItemByHandler(
+		const ClickHandlerPtr &p) const {
+	const auto reply = _parent->displayedReply();
+	return !(reply && (reply->replyToLink() == p));
+}
+
 QRect UnwrappedMedia::contentRectForReactions() const {
 	const auto inWebPage = (_parent->media() != this);
 	if (inWebPage) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
index 8b03a801d..ca80a80c1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
@@ -73,9 +73,7 @@ public:
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return true;
 	}
-	bool dragItemByHandler(const ClickHandlerPtr &p) const override {
-		return true;
-	}
+	bool dragItemByHandler(const ClickHandlerPtr &p) const override;
 
 	DocumentData *getDocument() const override {
 		return _content->document();

From 80fb506f84d9c6f43d69d7a83bb88597afa9bcd7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 12:11:45 +0200
Subject: [PATCH 616/676] Use underlying QPlatformSystemTrayIcon on Windows.

Fixes #26655.
---
 .../SourceFiles/platform/win/tray_win.cpp     | 58 +++++++++++++------
 Telegram/SourceFiles/platform/win/tray_win.h  |  4 +-
 Telegram/lib_base                             |  2 +-
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/platform/win/tray_win.cpp b/Telegram/SourceFiles/platform/win/tray_win.cpp
index 13a30858c..a0927702e 100644
--- a/Telegram/SourceFiles/platform/win/tray_win.cpp
+++ b/Telegram/SourceFiles/platform/win/tray_win.cpp
@@ -18,7 +18,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_window.h"
 
-#include <QtWidgets/QSystemTrayIcon>
+#include <qpa/qplatformscreen.h>
+#include <qpa/qplatformsystemtrayicon.h>
+#include <qpa/qplatformtheme.h>
+#include <private/qguiapplication_p.h>
+#include <private/qhighdpiscaling_p.h>
 
 namespace Platform {
 
@@ -96,28 +100,45 @@ Tray::Tray() {
 
 void Tray::createIcon() {
 	if (!_icon) {
-		_icon = base::make_unique_q<QSystemTrayIcon>(nullptr);
+		if (const auto theme = QGuiApplicationPrivate::platformTheme()) {
+			_icon.reset(theme->createPlatformSystemTrayIcon());
+		}
+		if (!_icon) {
+			return;
+		}
+		_icon->init();
 		updateIcon();
-		_icon->setToolTip(AppName.utf16());
-		using Reason = QSystemTrayIcon::ActivationReason;
+		_icon->updateToolTip(AppName.utf16());
+
+		using Reason = QPlatformSystemTrayIcon::ActivationReason;
 		base::qt_signal_producer(
 			_icon.get(),
-			&QSystemTrayIcon::activated
-		) | rpl::start_with_next([=](Reason reason) {
-			if (reason == QSystemTrayIcon::Context && _menu) {
-				_aboutToShowRequests.fire({});
-				InvokeQueued(_menu.get(), [=] {
-					_menu->popup(QCursor::pos());
-				});
-			} else {
-				_iconClicks.fire({});
-			}
+			&QPlatformSystemTrayIcon::activated
+		) | rpl::filter(
+			rpl::mappers::_1 != Reason::Context
+		) | rpl::map_to(
+			rpl::empty
+		) | rpl::start_to_stream(_iconClicks, _lifetime);
+
+		base::qt_signal_producer(
+			_icon.get(),
+			&QPlatformSystemTrayIcon::contextMenuRequested
+		) | rpl::filter([=] {
+			return _menu != nullptr;
+		}) | rpl::start_with_next([=](
+				QPoint globalNativePosition,
+				const QPlatformScreen *screen) {
+			_aboutToShowRequests.fire({});
+			const auto position = QHighDpi::fromNativePixels(
+				globalNativePosition,
+				screen ? screen->screen() : nullptr);
+			InvokeQueued(_menu.get(), [=] {
+				_menu->popup(position);
+			});
 		}, _lifetime);
 	} else {
 		updateIcon();
 	}
-
-	_icon->show();
 }
 
 void Tray::destroyIcon() {
@@ -155,7 +176,7 @@ void Tray::updateIcon() {
 	forTrayIcon.addPixmap(iconSizeWidth >= 20
 		? iconSmallPixmap32
 		: iconSmallPixmap16);
-	_icon->setIcon(forTrayIcon);
+	_icon->updateIcon(forTrayIcon);
 }
 
 void Tray::createMenu() {
@@ -199,7 +220,8 @@ void Tray::showTrayMessage() const {
 		_icon->showMessage(
 			AppName.utf16(),
 			tr::lng_tray_icon_text(tr::now),
-			QSystemTrayIcon::Information,
+			QIcon(),
+			QPlatformSystemTrayIcon::Information,
 			kTooltipDelay);
 		cSetSeenTrayTooltip(true);
 		Local::writeSettings();
diff --git a/Telegram/SourceFiles/platform/win/tray_win.h b/Telegram/SourceFiles/platform/win/tray_win.h
index b71785b17..e399e5945 100644
--- a/Telegram/SourceFiles/platform/win/tray_win.h
+++ b/Telegram/SourceFiles/platform/win/tray_win.h
@@ -19,7 +19,7 @@ namespace Ui {
 class PopupMenu;
 } // namespace Ui
 
-class QSystemTrayIcon;
+class QPlatformSystemTrayIcon;
 
 namespace Platform {
 
@@ -60,7 +60,7 @@ public:
 		bool supportMode);
 
 private:
-	base::unique_qptr<QSystemTrayIcon> _icon;
+	base::unique_qptr<QPlatformSystemTrayIcon> _icon;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
 	rpl::event_stream<> _iconClicks;
diff --git a/Telegram/lib_base b/Telegram/lib_base
index e497dc134..185679354 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit e497dc134de3f8e2933ee0acdbba8bd702ce2130
+Subproject commit 185679354c7d0b7dd8d719daaaf806d177cb20bf

From 5285f74b13940d00348282ffddf5386112573759 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 13:07:29 +0200
Subject: [PATCH 617/676] Use outline premium icon.

---
 Telegram/Resources/icons/menu/premium.png     | Bin 0 -> 687 bytes
 Telegram/Resources/icons/menu/premium@2x.png  | Bin 0 -> 1416 bytes
 Telegram/Resources/icons/menu/premium@3x.png  | Bin 0 -> 2145 bytes
 .../boxes/peers/edit_members_visible.cpp      |   4 +-
 Telegram/SourceFiles/info/info.style          |  15 ++++--
 .../SourceFiles/settings/settings_main.cpp    |  43 +++++++++---------
 Telegram/SourceFiles/ui/menu_icons.style      |   2 +-
 7 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/premium.png
 create mode 100644 Telegram/Resources/icons/menu/premium@2x.png
 create mode 100644 Telegram/Resources/icons/menu/premium@3x.png

diff --git a/Telegram/Resources/icons/menu/premium.png b/Telegram/Resources/icons/menu/premium.png
new file mode 100644
index 0000000000000000000000000000000000000000..56e0e0e94905ee2ba207343847721d6c8ed9667f
GIT binary patch
literal 687
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl1QS#WBP}
z@amMat1}Ztj_ve|P4k+m5$M(t#5O~Ljm>Lfy#w2nIU5^0?HzbrmhqhMm?G#^u9I4&
zoai!Tz3@Z3^!?x8{M~jtUHaZTt;%bg>)zk`{r8s8$$Bxr<)6ic1s<)}6V=of>AIP7
z?PbZl^XUc>S6+Xee%iI=|2C2S<I_(+l@=E8*zbCj`|?YZ$tMNam{wZo$9(-+^Zaw<
z(x8b(EI~64ZE^W@Ol*qRQn$qi8H6@QtchEnzdf4CLE-GvBCEN4vyNnKz4iWkPP>1g
z-t_n1t;N2USm}y&f2_Fkw#=}tZNecJP6mSm5<zRjERUsaK3KFfrfBD!;&{yieC?0R
zcHewkw!!{GwT)cH|AR+XKa83CA!wzD{=uC;YyMT(xG4#qt6J)`@WR6a4YBSTgNYt7
z>#s+xZL^f>b=!Y`zTa}~si!hbxLBA>dbgiQ+uRVmQsiy%tsJxMQMxkmXGAvMe(SYV
zD3VER(#ezrv)R4JA1C@I25N|GSZQ&*DSQ3ZtdBf#<&AD?lR2dmw??sM#b2x1+vm18
z{^tGv=VKQu&-B@L`|ZgTr`a~P5<GYE%+EhD|5UYiZ(M(?!R~Uk7nywRhsC*<gsnEL
zZ$9WC)q40L(9N?sIhGt@XW%jTZL{xyI6KR?b4eS&{H~p&6Z31nkAp&Mrw~Iz!_UVr
z_gu`F(A=lpW$iN^7(m<%XVWI@ac1X8zTb68#_LhF*Wv#m{~1{|<xU%X;q3(_7Ef0{
Jmvv4FO#np|8k_(C

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/premium@2x.png b/Telegram/Resources/icons/menu/premium@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..64913421b526d2d26305a7590bca6577a3defd1e
GIT binary patch
literal 1416
zcmV;31$X+1P)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG@<~KNR9Fe^S6L`-Uljk$GLL00
zN&O8Wd66MQ=7<+w<V_(d$^#FS@qssaFcguJh<H#UGL=jb9w<CerawjI;ojf9>vrt#
zoP9pu_nrH_+?<Eg+H3vRZ>>G8y|+sB{e6#svJo&+=B_d`Gb<`8iiwE<&;0y+XJ_Zj
z%Zoxz{oU>D?YFnLe=y(H)|R8AqyCHvJ^T9lC>e~+($W&i{r&w4Y4vpX_xJz!_&^dZ
zEiFXR)zyV2lrZT@s>H3WtqtKH9v+;Xorwnmnoz=|gjpY7te(5OJH*DQu>LeiFaf~o
z4K7zyR3ICC!NI|7Ff>VDUS7`X4J#WP8y_AXBJlL|v@{ZwFaZFV)M^k-c6K%mLuO{C
zGys%j1x#u+h-P+n79kG~4!C0gB}@PSW{~hA($LUQ8i2C0GLcDW!bBK=1*Mh(=jgDs
zv<wRib9HsaHkN)~US6ohx3{+tu$#DHY;A2%PEPFX>~3yuApFn!E-x=p)*l}qxeR}l
zNCo?rY6*2w?q6G5tBFXZ0zl4J&?B4P-d<~KYnDoFgl1-D5)u+v^Zot3w0r2;=;$aa
zGK&<+SV=iKIhZo(7>hDkSXhXSjTO27YNn;7QSKcb9pT~O9v&VR78V?wVijmXju7qb
z?GzEIb6D%@>R`r{bN3F%L9xon$mr<k2tk{gngp`X+C_Poo12@OnhIuv3J64#fXq07
zqN1W`07phftgNg!h`*}B1{xe3q=<2GaeQt%8Uezx_4W1TgZ_pVC1Z7Um9oJ`lcmIc
zw7a{Ta93AXiHV7_Pz44|#o5^zMZp#C>#b8#Qi6Li9NymEYHDhbrCfAxZ|{_p6rB9%
zMq^{69E{Z$78X7~KNC3|S(7Fih2i}CoH}uQd|Y2&k0UcWIyx&WtFp4Pr>AFSWd+5W
z0Q8@ln$pCm`t=+T_WAYoby8B2X1v(y>FGH!F~Nr9%18?@jmXGIvA=p72hrTz95L+d
z?D+ZlsoS+~rKYA14-eDjkWC0>8UYFl3bfgeHa0f<`}^cRHa3QnPV4wGKnDj0bc-0V
z*c%!ebn0SydOG<wH#hT3j!axx^}xUYF=FxJ441{p7(zlq$UP$?Lk6OY8nZ@pSdzN<
zePS^x7*~+Awzht1^_DQ};KCglwN-BtEJTp3t*z<J@W&Canb+4>a8*}VE8!|FEd|N@
z`#YAS5+0RsV;4PlbR`W63PM8oP{}m=exCMRTzq^y^tf*B?(T8{r2OyqrvU)>i;D{Y
zWY19z&a7!;V*}k98X97itc?9XK0f}t^FJVHC<h<`Y;$vyb=OVCWgfE*7MyNUPn0{<
zm8YjC%7*@ELJ5-;UtC-a3@WOVlath{l_ohknZg7F1h5X+#`*dAr>Cc6#iIaMdVIp`
z044xLH4w8(c+j$JI>>o>c|^gU4-pX&%gf88#~%~n<Ksi55NKY=3K+mbJdlt+H#b*M
z>Lv&k7JDAub#rq=rN)>OFD`N16$&Lxgu#r%1&(m9s;VL-9(}sy!J_d-Ar@>jDoAMJ
zVT4s>Vq(G~Ss5k(03%;G!ky&B#YGmWv+UyHvcA4fT=?V4h66;)RS6ita1q?GXK@eF
zoCNQ>ukL}-#*-~DFc6PMybp2vRJVW8a(8#fvkMDoZ*OmMauUgX;qYz#9)W*t1bzaA
W!sqP{=*5Wu0000<MNUMnLSTaF(RDZg

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/premium@3x.png b/Telegram/Resources/icons/menu/premium@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ba0e8b9fc51a9573a1d25309aeeeafe120029d2
GIT binary patch
literal 2145
zcmV-n2%h(eP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?%Sl8*RA>e5npcPvOB9C9Sy#EJ
zpeP1Ri#e<r6@4(f>Z)J_6F#U5iUABL3W_f(qJmjb1Vvp}1u<X_4`PlhD5e#aYtG@`
z`*Djs)>O}QSNF{9tT6Mid+OAGLRD8+opY)S6-xe+GmxBt<P0Qd;P(s^{!PY>s#dL9
zw{G2<HEWiVl5+d@?LB+;Jbn5!Zr1WeagicLGBYzjeE9IM_WS(#Gt9z;^J7lqHOjSX
z*J>jQA=j^8A1|x%*4w8~AAKnQ{QuKA{rdHbw-2$`U$kh^hYughFy_ynU!g(;-m!V}
z<_Yt`g9pH3Z#%9U2M!!41K7TOyKal7bOF=5{s8*asZ-*8<Hn73k7-I5Fukjw)6JVV
z7uSy+JLYs3rT_pt0R@z^dGluRJM0btQviSq=r9bos#K}+_3KyV_x=0#Im!$GO_+2k
z3}8f@m?$}6tVXGE(xgcxOO{khR;^maCht@TlP<*vjEECcus9`3lz9I9xq1}u-n}bd
zzI-JA=mMaSh#(jVSs?hMMvYRw@^|_2<?cQK5HN!7-~{(xx^zkT`s>%PI(6!}dsDY=
zU0@22pgTB`y&XGtlqax%|9%@+fQbm=HX;eY?B2awyd+Pt@c@{J?Ao=<M#K^mRqnus
z_E+AodiCmCw{BIj-;EnLnl^1}>B05u*PAqH0+?kvX3Usp&z}9A_xtwko23#b%xz%A
ztb_$MYShSc-uz#-Y+0v9IOE5U-?(vO*e)k?+_-TYHf(V6;e7h^DQ}GCe^S+}SFgT(
z`!=j#L?#}SFUdJ8tHp-EWT{f6BC2+D07k?{vw`7xZrQShq`{#w0;6WlnoNeF#j=Tu
zZQHhupg1BMkzixPtGjpaHfYemsoGqM9F$kCTuDt$bwc5M{P@va6I%Plix=0fT?-p(
zgw>`q39=}PRIOUoT<%)CT)A?(h|oCPx^-(0yAvl)l!t@QGiJ=_+O;b$Hw769ltg1b
z6F7hyID<>mrcGlW#nrK6$9g!Em6fH?KY#vIo0W$^;=1eCug`0yy!FoOE?&H-py$q=
zOPtTPmX9AluDm7MG-S-^Ue<A>t=y1LY*U<MeR+7Ydi82G2mDP>PxnA4w7X}|o@^M(
z+k*!Wdic_#M-LeoE109!Lm)xjBSwt)^5u)TI&|nzZ$~z5+9U!HYu2nOUc9)sSbiah
z+LkR_rhB+!#||sw9Azg@p425zpFSOr?A^+nP*BB+6%QXitowH1!UZ3J4kw23+@3sn
z!XX%HCBIvZ8a2wv$<ar(bLY;|rAzzvWAfz5KYsiWMXYIx6Miofz}Ko(t9S3-ob@wj
z&J29Y_wV2T{rmUg45`5E*|U8QNd&rd>GJaBOHl{GD(%prg8&SI$cVg{>KazJZQDj(
zOoXnBj~+eR5V2{_ojX@HK(rCmGgIz@W~}H$6BF;-x36W(mU`E{d-skUIYIzR*hPHJ
z8%TJ`uVKT6E-U`#&70g*JbwIGSLIG~QW3&uWMl{o(*p(!;ID9k6RhKvD_2T=LVp4_
zG@&zZZ0F9M{d&L}CaTs=a9)um`qkrsZ{NPXVMaF@mOgv-Ea9m{Gad#)yLk&<y?Ujq
zU9x0J*z#+rT+kN7Teof<3A}F7pmTF`mo8lzHchfLOQGTQ>(`=|7j@XMVV1Jd!dkRw
zq1(oZ@87@g-MhDM-@eh`da)tPs2)9fgso`ZwUp<e#GcsZRNyf(&6eVxFnwU28=$8)
z9{~OGjyIuQyLLW=Eud}Mw2@g`xNxC`L@Xfewqli0)vH%87Ft7eu$ZN?Pe2#a7r(}d
z6DMR~g9Z(Xlc56#4k#-m8A0MEzits&NDy%7&>_F#_W0@3r_1zp@7~>BP$A6>+Eaey
z$dM8*vSE1Q0|QtWB5PSN7km)n%$YN4A_>@v6)P4*g`Es%@tZeql&!cIV9Jy!BZZ;t
z>})#^gQKKm#tA9q4NG<YmLhSzTs`Vb#nPBx7@33;A%*vQ$>eWf`dYUi7&+LiS+l6u
z@`JEX$#fICX}=TXjX!_>yjt`GQ<m{4r7k`#lKl;Wre*z$U5d0w$x;IF_AeNMAYBq_
zGBi&mq-RHu9@U4W({uswR6_8nq%a*UOYk&Nh&rBlHg)P$7Xc#46)RTAEGQ{1rHp$i
z0KfpdsG2fmiWu$HtCtHhco+8oVk1&npY=Im!UQ9aLW(C`yLN4^+aW}WA}Bo|5@}&$
zNbr0)7u<Un$ps4*h>fr@PNz<tE?>SZ7)9K=b&Ddbu9hZD1BM{tI!w_R5+t8>Isq}@
z@XevvFiLSGEL1I}R}mbqd?Fk65Qj;ZoWCN75+nC%)vA^BE?TrG2E%Zw(7$P;M!?-P
z7|zW(bLLRh5c3dJM~Jp6SFY?-qH_QMGfF9_LZLd2F~JETnvH^zt}0quuXzv+P^B`e
zYdAs7<tyRET}mV3y&@RiojZ3hA$&eAh}L@-dG6Yr8-v*99(nli;V$AXT?o2dLvxx@
z*mDt&L04K@no(zFVC>_I7ccf3&KceyjuQP2MNJtc!~hw(cfr&!Pm}a^$dDnNDwQf#
zf+i;5s}AR#qEpa@gU-Q&2UANX>>!DzkjMu=9v9~}dXt#s3?yeDIRnWVNY22YGz0$u
Xpvy`M66r?|00000NkvXXu0mjfj-Bf4

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
index b51451817..ed0a363a2 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
@@ -53,8 +53,8 @@ namespace {
 			tr::lng_profile_hide_participants(),
 			rpl::single(QString()),
 			[] {},
-			st::manageGroupTopicsButton,
-			{ &st::menuIconHideMembers }
+			st::manageGroupNoIconButton,
+			{}
 	))->toggleOn(rpl::single(
 		(megagroup->flags() & ChannelDataFlag::ParticipantsHidden) != 0
 	) | rpl::then(state->toggled.events()));
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index b1d81d809..d54deb94b 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -600,15 +600,20 @@ manageGroupTopicsButton: SettingsCountButton(manageGroupTopButtonWithText) {
 		}
 	}
 }
+manageGroupNoIconButtonInner: SettingsButton(infoProfileButton) {
+	padding: margins(25px, 11px, 24px, 8px);
+}
+manageGroupNoIconButton: SettingsCountButton(manageGroupTopButtonWithText) {
+	button: manageGroupNoIconButtonInner;
+	labelPosition: point(22px, 11px);
+	iconPosition: point(0px, 0px);
+}
 
-manageDeleteGroupButton: SettingsCountButton(manageGroupTopButtonWithText) {
-	button: SettingsButton(infoProfileButton) {
-		padding: margins(25px, 11px, 24px, 8px);
+manageDeleteGroupButton: SettingsCountButton(manageGroupNoIconButton) {
+	button: SettingsButton(manageGroupNoIconButtonInner) {
 		textFg: attentionButtonFg;
 		textFgOver: attentionButtonFg;
 	}
-	labelPosition: point(22px, 11px);
-	iconPosition: point(0px, 0px);
 }
 
 infoEmptyFg: windowSubTextFg;
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index 9e6c8a2af..f00224827 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -312,9 +312,6 @@ void SetupSections(
 			st::settingsButton,
 			std::move(descriptor)
 		)->addClickHandler([=] {
-			if (type == PremiumId()) {
-				controller->setPremiumRef("settings");
-			}
 			showOther(type);
 		});
 	};
@@ -398,27 +395,28 @@ void SetupSections(
 	SetupPowerSavingButton(&controller->window(), container);
 	SetupLanguageButton(&controller->window(), container);
 
-	if (controller->session().premiumPossible()) {
-		AddSkip(container);
-		AddDivider(container);
-		AddSkip(container);
+	AddSkip(container);
+}
 
-		const auto icon = &st::settingsPremiumIconStar;
-		auto gradient = QLinearGradient(
-			0,
-			icon->height(),
-			icon->width() + icon->width() / 3,
-			0 - icon->height() / 3);
-		gradient.setStops(QGradientStops{
-			{ 0.0, st::premiumButtonBg1->c },
-			{ 1.0, st::premiumButtonBg3->c },
-		});
-		addSection(
-			tr::lng_premium_summary_title(),
-			PremiumId(),
-			{ .icon = icon, .backgroundBrush = QBrush(gradient) });
+void SetupPremium(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void(Type)> showOther) {
+	if (!controller->session().premiumPossible()) {
+		return;
 	}
+	AddDivider(container);
+	AddSkip(container);
 
+	AddButton(
+		container,
+		tr::lng_premium_summary_title(),
+		st::settingsButton,
+		{ .icon = &st::menuIconPremium }
+	)->addClickHandler([=] {
+		controller->setPremiumRef("settings");
+		showOther(PremiumId());
+	});
 	AddSkip(container);
 }
 
@@ -686,6 +684,9 @@ void Main::setupContent(not_null<Window::SessionController*> controller) {
 		SetupInterfaceScale(&controller->window(), content);
 		AddSkip(content);
 	}
+	SetupPremium(controller, content, [=](Type type) {
+		_showOther.fire_copy(type);
+	});
 	SetupHelp(controller, content);
 
 	Ui::ResizeFitChild(this, content);
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 13aed59aa..7aaf32213 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -134,7 +134,7 @@ menuIconSigned: icon {{ "menu/signed", menuIconColor }};
 menuIconAntispam: icon {{ "menu/antispam", menuIconColor }};
 menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }};
 menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
-menuIconHideMembers: icon {{ "menu/hide_members", menuIconColor }};
+menuIconPremium: icon {{ "menu/premium", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);

From 3c246fa49d70bfa3f1a78e97e0782d53fd2d51e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 13:31:39 +0300
Subject: [PATCH 618/676] Fixed crash on destroying message view with reply
 ripple animation.

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

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index b2b9fe281..a90580228 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1791,6 +1791,7 @@ void Message::toggleReplyRipple(bool pressed) {
 
 			const auto &padding = st::msgReplyPadding;
 			const auto geometry = countGeometry();
+			const auto item = data();
 			const auto size = QSize(
 				geometry.width()
 					- padding.left() / 2
@@ -1803,7 +1804,7 @@ void Message::toggleReplyRipple(bool pressed) {
 				Images::Round(
 					Ui::RippleAnimation::MaskByDrawer(size, true, nullptr),
 					corners),
-				[=] { repaint(); });
+				[=] { item->history()->owner().requestItemRepaint(item); });
 		}
 		if (reply->ripple.animation) {
 			reply->ripple.animation->add(reply->ripple.lastPoint);
@@ -3814,6 +3815,7 @@ int Message::resizeContentGetHeight(int newWidth) {
 
 		if (reply) {
 			reply->resize(contentWidth - st::msgPadding.left() - st::msgPadding.right());
+			reply->ripple.animation = nullptr;
 			newHeight += st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
 		}
 		if (needInfoDisplay()) {

From 87f52cf7df75632d6409e6988612f7c241687a56 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 15 Aug 2023 12:42:06 +0400
Subject: [PATCH 619/676] Downgrade libwayland to the version before thread
 safe API was introduced

This API sadly not present on older systems and we have to use the thread unsafe one if we want to be compatible with them
---
 Telegram/build/docker/centos_env/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f0770e501..e83f2df0e 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -470,12 +470,12 @@ RUN git clone -b libXcomposite-0.4.5 --depth=1 {{ GIT_FREEDESKTOP }}/libxcomposi
 FROM builder AS wayland
 COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache /
 
-RUN git clone -b 1.21.0 --depth=1 {{ GIT_FREEDESKTOP }}/wayland.git \
+RUN git clone -b 1.19.0 --depth=1 {{ GIT_FREEDESKTOP }}/wayland.git \
 	&& cd wayland \
+	&& sed -i "/subdir('tests')/d" meson.build \
 	&& meson build \
 		--buildtype=plain \
 		--default-library=both \
-		-Dtests=false \
 		-Ddocumentation=false \
 		-Ddtd_validation=false \
 		-Dicon_directory=/usr/share/icons \

From d57d95c53fd0e7ff79d46fefed26c969e4f9c73e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 15:01:18 +0200
Subject: [PATCH 620/676] Pass context chat from one webview to another.

---
 .../SourceFiles/core/click_handler_types.h    |  1 +
 .../SourceFiles/core/local_url_handlers.cpp   |  6 ++++--
 Telegram/SourceFiles/data/data_stories.cpp    |  3 ++-
 .../inline_bots/bot_attach_web_view.cpp       | 19 ++++++++++++++++---
 .../inline_bots/bot_attach_web_view.h         |  5 +++++
 .../window/window_session_controller.cpp      |  5 ++++-
 .../window/window_session_controller.h        |  1 +
 7 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index de5708322..15a7dc1f9 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -38,6 +38,7 @@ class SessionController;
 class PeerData;
 struct ClickHandlerContext {
 	FullMsgId itemId;
+	QString attachBotWebviewUrl;
 	// Is filled from sections.
 	Fn<HistoryView::ElementDelegate*()> elementDelegate;
 	base::weak_ptr<Window::SessionController> sessionWindow;
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 61d31e64d..9daf74d62 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -447,6 +447,7 @@ bool ResolveUsernameOrPhone(
 			? std::make_optional(params.value(u"voicechat"_q))
 			: std::nullopt),
 		.clickFromMessageId = myContext.itemId,
+		.clickFromAttachBotWebviewUrl = myContext.attachBotWebviewUrl,
 	});
 	return true;
 }
@@ -473,7 +474,7 @@ bool ResolvePrivatePost(
 	if (!channelId || (msgId && !IsServerMsgId(msgId))) {
 		return false;
 	}
-	const auto fromMessageId = context.value<ClickHandlerContext>().itemId;
+	const auto my = context.value<ClickHandlerContext>();
 	using Navigation = Window::SessionNavigation;
 	controller->showPeerByLink(Navigation::PeerByLinkInfo{
 		.usernameOrId = channelId,
@@ -487,7 +488,8 @@ bool ResolvePrivatePost(
 				Navigation::ThreadId{ threadId }
 			}
 			: Navigation::RepliesByLinkInfo{ v::null },
-		.clickFromMessageId = fromMessageId,
+		.clickFromMessageId = my.itemId,
+		.clickFromAttachBotWebviewUrl = my.attachBotWebviewUrl,
 	});
 	controller->window().activate();
 	return true;
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 642265b6d..661c28777 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -345,7 +345,8 @@ void Stories::parseAndApply(const MTPUserStories &stories) {
 		}
 		sort(list);
 	};
-	if (result.user->isBot()
+	if (result.user->isSelf()
+		|| result.user->isBot()
 		|| result.user->isServiceUser()
 		|| result.user->isContact()) {
 		const auto hidden = result.user->hasStoriesHidden();
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index e00e50d43..be7a81472 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "inline_bots/bot_attach_web_view.h"
 
 #include "api/api_common.h"
+#include "core/click_handler_types.h"
 #include "data/data_bot_app.h"
 #include "data/data_user.h"
 #include "data/data_file_origin.h"
@@ -568,7 +569,7 @@ void AttachWebView::cancel() {
 	_session->api().request(base::take(_requestId)).cancel();
 	_session->api().request(base::take(_prolongId)).cancel();
 	_panel = nullptr;
-	_context = nullptr;
+	_lastShownContext = base::take(_context);
 	_bot = nullptr;
 	_app = nullptr;
 	_botUsername = QString();
@@ -713,6 +714,14 @@ void AttachWebView::removeFromMenu(not_null<UserData*> bot) {
 	});
 }
 
+std::optional<Api::SendAction> AttachWebView::lookupLastAction(
+		const QString &url) const {
+	if (_lastShownUrl == url && _lastShownContext) {
+		return _lastShownContext->action;
+	}
+	return std::nullopt;
+}
+
 void AttachWebView::resolve() {
 	resolveUsername(_botUsername, [=](not_null<PeerData*> bot) {
 		if (!_context) {
@@ -1049,7 +1058,7 @@ void AttachWebView::show(
 		}
 		crl::on_main(this, [=] { cancel(); });
 	});
-	const auto handleLocalUri = [close](QString uri) {
+	const auto handleLocalUri = [close, url](QString uri) {
 		const auto local = Core::TryConvertUrlToLocal(uri);
 		if (uri == local || Core::InternalPassportLink(local)) {
 			return local.startsWith(u"tg://"_q);
@@ -1058,7 +1067,10 @@ void AttachWebView::show(
 		}
 		close();
 		crl::on_main([=] {
-			UrlClickHandler::Open(local, {});
+			const auto variant = QVariant::fromValue(ClickHandlerContext{
+				.attachBotWebviewUrl = url,
+			});
+			UrlClickHandler::Open(local, variant);
 		});
 		return true;
 	};
@@ -1142,6 +1154,7 @@ void AttachWebView::show(
 		}
 	});
 
+	_lastShownUrl = url;
 	_panel = Ui::BotWebView::Show({
 		.url = url,
 		.userDataPath = _session->domain().local().webviewDataPath(),
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index 658f59940..0cbd71ab4 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -122,6 +122,9 @@ public:
 		PeerTypes chooseTypes);
 	void removeFromMenu(not_null<UserData*> bot);
 
+	[[nodiscard]] std::optional<Api::SendAction> lookupLastAction(
+		const QString &url) const;
+
 	static void ClearAll();
 
 private:
@@ -180,6 +183,8 @@ private:
 	const not_null<Main::Session*> _session;
 
 	std::unique_ptr<Context> _context;
+	std::unique_ptr<Context> _lastShownContext;
+	QString _lastShownUrl;
 	UserData *_bot = nullptr;
 	QString _botUsername;
 	QString _botAppName;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 657876a59..d37fd7bd0 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -521,10 +521,13 @@ void SessionNavigation::showPeerByLinkResolved(
 		const auto contextPeer = item
 			? item->history()->peer
 			: bot;
+		const auto action = bot->session().attachWebView().lookupLastAction(
+			info.clickFromAttachBotWebviewUrl
+		).value_or(Api::SendAction(bot->owner().history(contextPeer)));
 		crl::on_main(this, [=] {
 			bot->session().attachWebView().requestApp(
 				parentController(),
-				Api::SendAction(bot->owner().history(contextPeer)),
+				action,
 				bot,
 				info.botAppName,
 				info.startToken,
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 509fa2818..9536894ee 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -217,6 +217,7 @@ public:
 		InlineBots::PeerTypes attachBotChooseTypes;
 		std::optional<QString> voicechatHash;
 		FullMsgId clickFromMessageId;
+		QString clickFromAttachBotWebviewUrl;
 	};
 	void showPeerByLink(const PeerByLinkInfo &info);
 

From 4e95d62018f8ddfb0a2f35a3f470ab98abacd270 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 15:53:31 +0200
Subject: [PATCH 621/676] Version 4.9.1.

- Fix a crash in reply area ripple animation.
- Fix a crash on start in some Linux distributions.
---
 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 0844307ba..42ecb47c1 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.9.0.0" />
+    Version="4.9.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 3957f630e..b875881fd 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,9,0,0
- PRODUCTVERSION 4,9,0,0
+ FILEVERSION 4,9,1,0
+ PRODUCTVERSION 4,9,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.9.0.0"
+            VALUE "FileVersion", "4.9.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.9.0.0"
+            VALUE "ProductVersion", "4.9.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index b1e629e09..bc11fbd4a 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,9,0,0
- PRODUCTVERSION 4,9,0,0
+ FILEVERSION 4,9,1,0
+ PRODUCTVERSION 4,9,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.9.0.0"
+            VALUE "FileVersion", "4.9.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.9.0.0"
+            VALUE "ProductVersion", "4.9.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 0ec67688a..4dcb11ba6 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 = 4009000;
-constexpr auto AppVersionStr = "4.9";
+constexpr auto AppVersion = 4009001;
+constexpr auto AppVersionStr = "4.9.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index f0f807c07..97868a621 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4009000
+AppVersion         4009001
 AppVersionStrMajor 4.9
-AppVersionStrSmall 4.9
-AppVersionStr      4.9.0
+AppVersionStrSmall 4.9.1
+AppVersionStr      4.9.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.9
+AppVersionOriginal 4.9.1
diff --git a/changelog.txt b/changelog.txt
index 759572a27..ae189b0d4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+4.9.1 (15.08.23)
+
+- Fix a crash in reply area ripple animation.
+- Fix a crash on start in some Linux distributions.
+
 4.9 (14.08.23)
 
 - Gradual stories rollout.

From 3fe9ba41ba5703a4e1f13e8e3bc8a75ba54ed463 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 16:50:35 +0200
Subject: [PATCH 622/676] Improve chats expand animation.

Fixes #25890.
---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a5a26e309..7997b183f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1446,6 +1446,8 @@ void Widget::startWidthAnimation() {
 		st::columnMinimalWidthLeft,
 		scrollGeometry.height());
 	_scroll->setGeometry(grabGeometry);
+	_inner->resize(st::columnMinimalWidthLeft, _inner->height());
+	_inner->setNarrowRatio(0.);
 	Ui::SendPendingMoveResizeEvents(_scroll);
 	auto image = QImage(
 		grabGeometry.size() * cIntRetinaFactor(),
@@ -1457,7 +1459,10 @@ void Widget::startWidthAnimation() {
 		Ui::RenderWidget(p, _scroll);
 	}
 	_widthAnimationCache = Ui::PixmapFromImage(std::move(image));
-	_scroll->setGeometry(scrollGeometry);
+	if (scrollGeometry != grabGeometry) {
+		_scroll->setGeometry(scrollGeometry);
+		updateControlsGeometry();
+	}
 	_scroll->hide();
 	updateStoriesVisibility();
 }

From b871a29275f61d77f3219d715ecb29a0209dbf20 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 19:16:50 +0200
Subject: [PATCH 623/676] Version 4.9.1: Fix states of archive settings.

Fixes #26510.
---
 Telegram/SourceFiles/api/api_global_privacy.cpp     | 8 ++++----
 Telegram/SourceFiles/settings/settings_advanced.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_global_privacy.cpp b/Telegram/SourceFiles/api/api_global_privacy.cpp
index 43a60e9a3..219d335f1 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_global_privacy.cpp
@@ -103,10 +103,10 @@ void GlobalPrivacy::update(
 		| (archiveAndMute
 			? Flag::f_archive_and_mute_new_noncontact_peers
 			: Flag())
-		| (unarchiveOnNewMessage == UnarchiveOnNewMessage::AnyUnmuted
+		| (unarchiveOnNewMessage == UnarchiveOnNewMessage::None
 			? Flag::f_keep_archived_unmuted
 			: Flag())
-		| (unarchiveOnNewMessage != UnarchiveOnNewMessage::None
+		| (unarchiveOnNewMessage != UnarchiveOnNewMessage::AnyUnmuted
 			? Flag::f_keep_archived_folders
 			: Flag());
 	_requestId = _api.request(MTPaccount_SetGlobalPrivacySettings(
@@ -125,10 +125,10 @@ void GlobalPrivacy::apply(const MTPGlobalPrivacySettings &data) {
 	data.match([&](const MTPDglobalPrivacySettings &data) {
 		_archiveAndMute = data.is_archive_and_mute_new_noncontact_peers();
 		_unarchiveOnNewMessage = data.is_keep_archived_unmuted()
-			? UnarchiveOnNewMessage::AnyUnmuted
+			? UnarchiveOnNewMessage::None
 			: data.is_keep_archived_folders()
 			? UnarchiveOnNewMessage::NotInFoldersUnmuted
-			: UnarchiveOnNewMessage::None;
+			: UnarchiveOnNewMessage::AnyUnmuted;
 	});
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 3f6bf052e..8ac221a4f 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -726,6 +726,7 @@ void ArchiveSettingsBox(
 	))->toggledChanges(
 	) | rpl::filter([=](bool toggled) {
 		const auto current = privacy->unarchiveOnNewMessageCurrent();
+		state->foldersWrap->toggle(!toggled, anim::type::normal);
 		return toggled != (current == Unarchive::None);
 	}) | rpl::start_with_next([=](bool toggled) {
 		privacy->updateUnarchiveOnNewMessage(toggled
@@ -733,7 +734,6 @@ void ArchiveSettingsBox(
 			: state->folders->toggled()
 			? Unarchive::NotInFoldersUnmuted
 			: Unarchive::AnyUnmuted);
-		state->foldersWrap->toggle(!toggled, anim::type::normal);
 	}, container->lifetime());
 
 	AddSkip(container);

From bc523c2685893bd4164f1cbe2c0defa90fc19873 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Aug 2023 20:04:03 +0200
Subject: [PATCH 624/676] Version 4.9.1: Allow highlighting client side
 messages.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 138a12a31..3f10e3cc3 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2014,6 +2014,7 @@ void HistoryWidget::showHistory(
 				return;
 			}
 			if (!IsServerMsgId(showAtMsgId)
+				&& !IsClientMsgId(showAtMsgId)
 				&& !IsServerMsgId(-showAtMsgId)) {
 				// To end or to unread.
 				destroyUnreadBar();
@@ -5613,6 +5614,7 @@ int HistoryWidget::countInitialScrollTop() {
 		return _list->historyScrollTop();
 	} else if (_showAtMsgId
 		&& (IsServerMsgId(_showAtMsgId)
+			|| IsClientMsgId(_showAtMsgId)
 			|| IsServerMsgId(-_showAtMsgId))) {
 		const auto item = getItemFromHistoryOrMigrated(_showAtMsgId);
 		const auto itemTop = _list->itemTop(item);

From 19d5b17d2e1a763c40c55d38ffb2e413de03d858 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Aug 2023 12:39:41 +0200
Subject: [PATCH 625/676] Call file dialog from InvokeQueued.

Otherwise for some reason timerEvent-s stop being delivered on
the background thread that processes audio data from the voice chat.

Fixes #24002.
---
 .../data/data_file_click_handler.cpp          | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_file_click_handler.cpp b/Telegram/SourceFiles/data/data_file_click_handler.cpp
index 9fee965f5..ec746f566 100644
--- a/Telegram/SourceFiles/data/data_file_click_handler.cpp
+++ b/Telegram/SourceFiles/data/data_file_click_handler.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_download_manager.h"
 #include "data/data_photo.h"
+#include "main/main_session.h"
 
 FileClickHandler::FileClickHandler(FullMsgId context)
 : _context(context) {
@@ -79,7 +80,14 @@ void DocumentSaveClickHandler::Save(
 	}
 
 	auto savename = QString();
-	if (mode != Mode::ToCacheOrFile || !data->saveToCache()) {
+	if (mode == Mode::ToCacheOrFile && data->saveToCache()) {
+		data->save(origin, savename);
+		return;
+	}
+	InvokeQueued(qApp, crl::guard(&data->session(), [=] {
+		// If we call file dialog synchronously, it will stop
+		// background thread timers from working which would
+		// stop audio playback in voice chats / live streams.
 		if (mode != Mode::ToNewFile && data->saveFromData()) {
 			return;
 		}
@@ -92,16 +100,15 @@ void DocumentSaveClickHandler::Save(
 		const auto filename = filepath.isEmpty()
 			? QString()
 			: fileinfo.fileName();
-		savename = DocumentFileNameForSave(
+		const auto savename = DocumentFileNameForSave(
 			data,
 			(mode == Mode::ToNewFile),
 			filename,
 			filedir);
-		if (savename.isEmpty()) {
-			return;
+		if (!savename.isEmpty()) {
+			data->save(origin, savename);
 		}
-	}
-	data->save(origin, savename);
+	}));
 }
 
 void DocumentSaveClickHandler::SaveAndTrack(

From ec9f8943dee55094a42e7bcd94097a1749b0c674 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 16 Aug 2023 14:54:31 +0400
Subject: [PATCH 626/676] Use QEvent::registerEventType for custom event types

---
 Telegram/SourceFiles/core/sandbox.cpp | 2 +-
 Telegram/lib_base                     | 2 +-
 Telegram/lib_ui                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index d477101f4..1a6c949cf 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -582,7 +582,7 @@ void Sandbox::registerEnterFromEventLoop() {
 
 bool Sandbox::notifyOrInvoke(QObject *receiver, QEvent *e) {
 	const auto type = e->type();
-	if (type == base::InvokeQueuedEvent::kType) {
+	if (type == base::InvokeQueuedEvent::Type()) {
 		static_cast<base::InvokeQueuedEvent*>(e)->invoke();
 		return true;
 	} else if (receiver == this) {
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 185679354..9c68fbe3c 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 185679354c7d0b7dd8d719daaaf806d177cb20bf
+Subproject commit 9c68fbe3cc4242a5f5f76dfda8ceab511cc08c70
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 0ea27ae05..632626b19 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 0ea27ae051774047cc00b92778f98c2f243712e8
+Subproject commit 632626b1921e99aaea6d02a9f7ebbb6354161365

From f502229cc8fbc0e6a94cc86ce3e2a678dbe80de4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Aug 2023 12:58:26 +0200
Subject: [PATCH 627/676] Disable zoom glitches on stories.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 4078f03f6..0a58cdb5e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1893,6 +1893,7 @@ void OverlayWidget::resizeContentByScreenSize() {
 		_y = content.y();
 		_w = content.width();
 		_h = content.height();
+		_zoom = 0;
 		updateNavigationControlsGeometry();
 		return;
 	}
@@ -2054,6 +2055,9 @@ void OverlayWidget::zoomOut() {
 }
 
 void OverlayWidget::zoomReset() {
+	if (_stories) {
+		return;
+	}
 	auto newZoom = _zoom;
 	const auto full = _fullScreenVideo ? _zoomToScreen : _zoomToDefault;
 	if (_zoom == 0) {
@@ -4371,7 +4375,9 @@ int OverlayWidget::storiesTopNotchSkip() {
 void OverlayWidget::playbackToggleFullScreen() {
 	Expects(_streamed != nullptr);
 
-	if (!videoShown() || (!_streamed->controls && !_fullScreenVideo)) {
+	if (_stories
+		|| !videoShown()
+		|| (!_streamed->controls && !_fullScreenVideo)) {
 		return;
 	}
 	_fullScreenVideo = !_fullScreenVideo;
@@ -5166,7 +5172,7 @@ void OverlayWidget::handleWheelEvent(not_null<QWheelEvent*> e) {
 }
 
 void OverlayWidget::setZoomLevel(int newZoom, bool force) {
-	if (!force && _zoom == newZoom) {
+	if (_stories || (!force && _zoom == newZoom)) {
 		return;
 	}
 

From b5d3391956c113612fe3e4c643735d7e700819b4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Aug 2023 13:23:06 +0200
Subject: [PATCH 628/676] Fix album part edit/delete/replace after reorder.

---
 Telegram/SourceFiles/boxes/send_files_box.cpp |  6 ++++++
 .../ui/chat/attach/attach_album_preview.cpp   | 20 ++++---------------
 .../ui/chat/attach/attach_album_preview.h     |  1 -
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 335582ceb..c639460ba 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -760,6 +760,8 @@ void SendFilesBox::pushBlock(int from, int till) {
 	) | rpl::filter([=] {
 		return !_removingIndex;
 	}) | rpl::start_with_next([=](int index) {
+		applyBlockChanges();
+
 		_removingIndex = index;
 		crl::on_main(this, [=] {
 			const auto index = base::take(_removingIndex).value_or(-1);
@@ -780,6 +782,8 @@ void SendFilesBox::pushBlock(int from, int till) {
 	const auto show = uiShow();
 	block.itemReplaceRequest(
 	) | rpl::start_with_next([=](int index) {
+		applyBlockChanges();
+
 		const auto replace = [=](Ui::PreparedList list) {
 			if (list.files.empty()) {
 				return;
@@ -855,6 +859,8 @@ void SendFilesBox::pushBlock(int from, int till) {
 	const auto openedOnce = widget->lifetime().make_state<bool>(false);
 	block.itemModifyRequest(
 	) | rpl::start_with_next([=, show = _show](int index) {
+		applyBlockChanges();
+
 		if (!(*openedOnce)) {
 			show->session().settings().incrementPhotoEditorHintShown();
 			show->session().saveSettings();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index d33681b9f..34a76e274 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -142,8 +142,8 @@ void AlbumPreview::prepareThumbs(gsl::span<Ui::PreparedFile> items) {
 			layout[i],
 			this,
 			[=] { update(); },
-			[=] { changeThumbByIndex(thumbIndex(thumbUnderCursor())); },
-			[=] { deleteThumbByIndex(thumbIndex(thumbUnderCursor())); }));
+			[=] { changeThumbByIndex(orderIndex(thumbUnderCursor())); },
+			[=] { deleteThumbByIndex(orderIndex(thumbUnderCursor())); }));
 		if (_thumbs.back()->isCompressedSticker()) {
 			_hasMixedFileHeights = true;
 		}
@@ -218,8 +218,7 @@ not_null<AlbumThumbnail*> AlbumPreview::findClosestThumb(
 	return result;
 }
 
-int AlbumPreview::orderIndex(
-	not_null<AlbumThumbnail*> thumb) const {
+int AlbumPreview::orderIndex(not_null<AlbumThumbnail*> thumb) const {
 	const auto i = ranges::find_if(_order, [&](int index) {
 		return (_thumbs[index].get() == thumb);
 	});
@@ -400,17 +399,6 @@ void AlbumPreview::paintFiles(Painter &p, QRect clip) const {
 	}
 }
 
-int AlbumPreview::thumbIndex(AlbumThumbnail *thumb) {
-	if (!thumb) {
-		return -1;
-	}
-	const auto thumbIt = ranges::find_if(_thumbs, [&](auto &t) {
-		return t.get() == thumb;
-	});
-	Expects(thumbIt != _thumbs.end());
-	return std::distance(_thumbs.begin(), thumbIt);
-}
-
 AlbumThumbnail *AlbumPreview::thumbUnderCursor() {
 	return findThumb(mapFromGlobal(QCursor::pos()));
 }
@@ -439,7 +427,7 @@ void AlbumPreview::modifyThumbByIndex(int index) {
 void AlbumPreview::thumbButtonsCallback(
 		not_null<AlbumThumbnail*> thumb,
 		AttachButtonType type) {
-	const auto index = thumbIndex(thumb);
+	const auto index = orderIndex(thumb);
 
 	switch (type) {
 	case AttachButtonType::None: return;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
index 7811910da..11eda122f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
@@ -64,7 +64,6 @@ private:
 	void updateSize();
 	void updateFileRows();
 
-	int thumbIndex(AlbumThumbnail *thumb);
 	AlbumThumbnail *thumbUnderCursor();
 	void deleteThumbByIndex(int index);
 	void changeThumbByIndex(int index);

From 3aebf59a61644d5691685a808f134d99bcd4ecca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Aug 2023 14:08:42 +0200
Subject: [PATCH 629/676] Attempt to fix selection loss on Ctrl.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 3f10e3cc3..28b06d829 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1806,7 +1806,10 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(
 void HistoryWidget::tryProcessKeyInput(not_null<QKeyEvent*> e) {
 	e->accept();
 	keyPressEvent(e);
-	if (!e->isAccepted() && _canSendTexts && _field->isVisible()) {
+	if (!e->isAccepted()
+		&& _canSendTexts
+		&& _field->isVisible()
+		&& !e->text().isEmpty()) {
 		_field->setFocusFast();
 		QCoreApplication::sendEvent(_field->rawTextEdit(), e);
 	}

From e4811505c8fa52e9dc4a6f739016a7aae9cec418 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 10:04:56 +0200
Subject: [PATCH 630/676] Fix stale mention / reaction badges.

---
 Telegram/SourceFiles/history/history_item.cpp | 12 +++++++++---
 Telegram/SourceFiles/history/history_item.h   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 55e1def49..495519c1e 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1522,7 +1522,7 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 		setText(std::move(updatedText));
 	}
 	if (!isLocalUpdateMedia() && !updatingSavedLocalEdit) {
-		indexAsNewItem();
+		addToSharedMediaIndex();
 	}
 	if (!edition.useSameReplies) {
 		if (!edition.replies.isNull) {
@@ -1633,7 +1633,7 @@ void HistoryItem::applySentMessage(const MTPDmessage &data) {
 	setPostAuthor(data.vpost_author().value_or_empty());
 	setIsPinned(data.is_pinned());
 	contributeToSlowmode(data.vdate().v);
-	indexAsNewItem();
+	addToSharedMediaIndex();
 	invalidateChatListEntry();
 	if (const auto period = data.vttl_period(); period && period->v > 0) {
 		applyTTL(data.vdate().v + period->v);
@@ -1657,7 +1657,7 @@ void HistoryItem::applySentMessage(
 		}, data.vmedia());
 	contributeToSlowmode(data.vdate().v);
 	if (!wasAlready) {
-		indexAsNewItem();
+		addToSharedMediaIndex();
 	}
 	invalidateChatListEntry();
 	if (const auto period = data.vttl_period(); period && period->v > 0) {
@@ -1819,6 +1819,12 @@ Storage::SharedMediaTypesMask HistoryItem::sharedMediaTypes() const {
 void HistoryItem::indexAsNewItem() {
 	if (isRegular()) {
 		addToUnreadThings(HistoryUnreadThings::AddType::New);
+	}
+	addToSharedMediaIndex();
+}
+
+void HistoryItem::addToSharedMediaIndex() {
+	if (isRegular()) {
 		if (const auto types = sharedMediaTypes()) {
 			_history->session().storage().add(Storage::SharedMediaAddNew(
 				_history->peer->id,
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 973141ba5..1b15d91e8 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -359,6 +359,7 @@ public:
 	[[nodiscard]] Storage::SharedMediaTypesMask sharedMediaTypes() const;
 
 	void indexAsNewItem();
+	void addToSharedMediaIndex();
 	void removeFromSharedMediaIndex();
 
 	struct NotificationTextOptions {

From 83eb35274788f394429c97a137c8d642f37972d2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 10:31:17 +0200
Subject: [PATCH 631/676] Fix archive open in single-column layout.

Regression was introduced in 16128d61c0.

Before we always force-closed the current filter,
which always force-closed the current opened chat.

Now we don't touch the filter if it is All Chats already,
so that it's scroll state isn't forgotten. In that case
we have to clear the stack in single-column layout explicitly.
---
 Telegram/SourceFiles/window/window_session_controller.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index d37fd7bd0..486087771 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1160,6 +1160,8 @@ void SessionController::openFolder(not_null<Data::Folder*> folder) {
 	}
 	if (activeChatsFilterCurrent() != 0) {
 		setActiveChatsFilter(0);
+	} else if (adaptive().isOneColumn()) {
+		clearSectionStack(SectionShow::Way::ClearStack);
 	}
 	closeForum();
 	_openedFolder = folder.get();

From fc47aa0da9b614befab329698c4bff51a9351684 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 10:51:10 +0200
Subject: [PATCH 632/676] Fix scheduled media editing.

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

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 495519c1e..27727f94d 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1472,6 +1472,7 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	if (!_savedLocalEditMediaData && edition.savePreviousMedia) {
 		savePreviousMedia();
 	}
+	Assert(!updatingSavedLocalEdit || !isLocalUpdateMedia());
 
 	if (edition.isEditHide) {
 		_flags |= MessageFlag::HideEdited;
@@ -1491,15 +1492,13 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	if (!edition.useSameMarkup) {
 		setReplyMarkup(base::take(edition.replyMarkup));
 	}
-	if (!isLocalUpdateMedia()) {
-		if (updatingSavedLocalEdit) {
-			_savedLocalEditMediaData->media = edition.mtpMedia
-				? CreateMedia(this, *edition.mtpMedia)
-				: nullptr;
-		} else {
-			removeFromSharedMediaIndex();
-			refreshMedia(edition.mtpMedia);
-		}
+	if (updatingSavedLocalEdit) {
+		_savedLocalEditMediaData->media = edition.mtpMedia
+			? CreateMedia(this, *edition.mtpMedia)
+			: nullptr;
+	} else {
+		removeFromSharedMediaIndex();
+		refreshMedia(edition.mtpMedia);
 	}
 	if (!edition.useSameReactions) {
 		updateReactions(edition.mtpReactions);
@@ -1520,8 +1519,6 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 		_savedLocalEditMediaData->text = std::move(updatedText);
 	} else {
 		setText(std::move(updatedText));
-	}
-	if (!isLocalUpdateMedia() && !updatingSavedLocalEdit) {
 		addToSharedMediaIndex();
 	}
 	if (!edition.useSameReplies) {

From 5dcca4482a9a3bbc2935328a2b587d71bf249e22 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 11:40:04 +0200
Subject: [PATCH 633/676] Fix copying photo while it is done uploading.

Fixes #26669.
---
 .../history/history_inner_widget.cpp          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 2f1dabec2..f5c2058f5 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2399,11 +2399,16 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					}, &st::menuIconForward);
 				}
 				if (item->canDelete()) {
-					_menu->addAction(Ui::DeleteMessageContextAction(
-						_menu->menu(),
-						[=] { deleteItem(itemId); },
-						item->ttlDestroyAt(),
-						[=] { _menu = nullptr; }));
+					const auto callback = [=] { deleteItem(itemId); };
+					if (item->isUploading()) {
+						_menu->addAction(tr::lng_context_cancel_upload(tr::now), callback, &st::menuIconCancel);
+					} else {
+						_menu->addAction(Ui::DeleteMessageContextAction(
+							_menu->menu(),
+							callback,
+							item->ttlDestroyAt(),
+							[=] { _menu = nullptr; }));
+					}
 				}
 				if (!blockSender && item->suggestReport()) {
 					_menu->addAction(tr::lng_context_report_msg(tr::now), [=] {
@@ -2744,9 +2749,12 @@ void HistoryInner::copyContextImage(
 		FullMsgId itemId) {
 	const auto item = session().data().message(itemId);
 	const auto media = photo->activeMediaView();
+	const auto restricted = item
+		? showCopyMediaRestriction(item)
+		: IsServerMsgId(itemId.msg);
 	if (photo->isNull() || !media || !media->loaded()) {
 		return;
-	} else if (!showCopyMediaRestriction(item)) {
+	} else if (!restricted) {
 		media->setToClipboard();
 	}
 }

From 4b0c4eee3048b6e8b13cbb44da5255ae898d0a6a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 12:31:57 +0200
Subject: [PATCH 634/676] Use name instead of "My Story" if it doesn't fit.

---
 .../SourceFiles/dialogs/ui/dialogs_stories_content.cpp   | 4 +---
 Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp | 9 ++++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index ed723b55e..f737d1615 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -347,9 +347,7 @@ Content State::next() {
 		}
 		result.elements.push_back({
 			.id = uint64(user->id.value),
-			.name = (user->isSelf()
-				? tr::lng_stories_my_name(tr::now)
-				: user->shortName()),
+			.name = user->shortName(),
 			.thumbnail = std::move(userpic),
 			.count = info.count,
 			.unreadCount = info.unreadCount,
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index 82854b90b..cda8da94d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -671,7 +671,14 @@ void List::validateName(not_null<Item*> item) {
 	const auto &full = _st.full;
 	const auto &font = full.nameStyle.font;
 	const auto available = AvailableNameWidth(_st);
-	const auto text = Ui::Text::String(full.nameStyle, element.name);
+	const auto my = element.skipSmall
+		? tr::lng_stories_my_name(tr::now)
+		: QString();
+	const auto use = (my.isEmpty()
+		|| full.nameStyle.font->width(my) > available)
+		? element.name
+		: my;
+	const auto text = Ui::Text::String(full.nameStyle, use);
 	const auto ratio = style::DevicePixelRatio();
 	item->nameCacheColor = color->c;
 	item->nameCache = QImage(

From 311691a3bc6bd4efc7397ad2952b1a52937e826f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 13:54:53 +0200
Subject: [PATCH 635/676] Use FlatLabel::textMaxWidth.

---
 .../boxes/peers/edit_peer_permissions_box.cpp      |  2 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp       |  4 ++--
 .../SourceFiles/calls/group/calls_group_panel.cpp  | 14 +++++++-------
 .../SourceFiles/dialogs/dialogs_inner_widget.cpp   |  9 +++------
 .../history/view/history_view_translate_bar.cpp    |  2 +-
 .../info/profile/info_profile_phone_menu.cpp       |  2 +-
 .../media/stories/media_stories_header.cpp         |  2 +-
 .../SourceFiles/payments/ui/payments_field.cpp     |  2 +-
 .../payments/ui/payments_form_summary.cpp          |  2 +-
 Telegram/lib_ui                                    |  2 +-
 10 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index 579049f28..4c33b38fc 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -403,7 +403,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 			(s.height() - label->height()) / 2);
 		arrow->moveToLeft(
 			std::min(
-				labelLeft + label->naturalWidth(),
+				labelLeft + label->textMaxWidth(),
 				labelRight - arrow->width()),
 			(s.height() - arrow->height()) / 2);
 	}, button->lifetime());
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index f06f78cfd..17f0008e8 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -731,14 +731,14 @@ void TopBar::updateControlsGeometry() {
 		width() - _mute->width() - _hangup->width(),
 		height());
 
-	auto fullWidth = _fullInfoLabel->naturalWidth();
+	auto fullWidth = _fullInfoLabel->textMaxWidth();
 	auto showFull = (left + fullWidth + right <= width());
 	_fullInfoLabel->setVisible(showFull);
 	_shortInfoLabel->setVisible(!showFull);
 
 	auto setInfoLabelGeometry = [this, left, right](auto &&infoLabel) {
 		auto minPadding = qMax(left, right);
-		auto infoWidth = infoLabel->naturalWidth();
+		auto infoWidth = infoLabel->textMaxWidth();
 		auto infoLeft = (width() - infoWidth) / 2;
 		if (infoLeft < minPadding) {
 			infoLeft = left;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index a240ce118..d07c748f4 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -2060,7 +2060,7 @@ void Panel::showNiceTooltip(
 			(normal ? widget().get() : container),
 			std::move(text),
 			st::groupCallNiceTooltipLabel);
-		label->resizeToNaturalWidth(label->naturalWidth());
+		label->resizeToWidth(label->textMaxWidth());
 		if (normal) {
 			return label;
 		}
@@ -2522,8 +2522,8 @@ void Panel::refreshTitleGeometry() {
 			fullRect.height())
 		: fullRect;
 	const auto sep = st::groupCallTitleSeparator;
-	const auto best = _title->naturalWidth() + (_viewers
-		? (_titleSeparator->width() + sep * 2 + _viewers->naturalWidth())
+	const auto best = _title->textMaxWidth() + (_viewers
+		? (_titleSeparator->width() + sep * 2 + _viewers->textMaxWidth())
 		: 0);
 	const auto from = (widget()->width() - best) / 2;
 	const auto shownTop = (mode() == PanelMode::Default)
@@ -2541,8 +2541,8 @@ void Panel::refreshTitleGeometry() {
 	const auto left = titleRect.x();
 
 	const auto notEnough = std::max(0, best - titleRect.width());
-	const auto titleMaxWidth = _title->naturalWidth();
-	const auto viewersMaxWidth = _viewers ? _viewers->naturalWidth() : 0;
+	const auto titleMaxWidth = _title->textMaxWidth();
+	const auto viewersMaxWidth = _viewers ? _viewers->textMaxWidth() : 0;
 	const auto viewersNotEnough = std::clamp(
 		viewersMaxWidth - titleMaxWidth,
 		0,
@@ -2551,9 +2551,9 @@ void Panel::refreshTitleGeometry() {
 		(notEnough - std::abs(viewersMaxWidth - titleMaxWidth)) / 2,
 		0);
 	_title->resizeToWidth(
-		_title->naturalWidth() - (notEnough - viewersNotEnough));
+		_title->textMaxWidth() - (notEnough - viewersNotEnough));
 	if (_viewers) {
-		_viewers->resizeToWidth(_viewers->naturalWidth() - viewersNotEnough);
+		_viewers->resizeToWidth(_viewers->textMaxWidth() - viewersNotEnough);
 	}
 	const auto layout = [&](int position) {
 		_title->moveToLeft(position, top);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index d0d01778b..697862166 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2818,12 +2818,9 @@ void InnerWidget::resizeEmptyLabel() {
 	if (!_empty) {
 		return;
 	}
-	const auto useWidth = std::min(
-		_empty->naturalWidth(),
-		width() - 2 * st::dialogsEmptySkip);
-	const auto left = (width() - useWidth) / 2;
-	_empty->resizeToWidth(useWidth);
-	_empty->move(left, (st::dialogsEmptyHeight - _empty->height()) / 2);
+	const auto skip = st::dialogsEmptySkip;
+	_empty->resizeToWidth(width() - 2 * skip);
+	_empty->move(skip, (st::dialogsEmptyHeight - _empty->height()) / 2);
 }
 
 void InnerWidget::clearMouseSelection(bool clearSelection) {
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
index 4207c59ca..92b4a4744 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
@@ -310,7 +310,7 @@ void TranslateBar::setup(not_null<History*> history) {
 	const auto updateLabelGeometry = [=] {
 		const auto full = _wrap.width() - icon->width();
 		const auto skip = st::semiboldFont->spacew * 2;
-		const auto natural = label->naturalWidth();
+		const auto natural = label->textMaxWidth();
 		const auto top = [&] {
 			return (_wrap.height() - label->height()) / 2;
 		};
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
index 54bf15735..1939dde64 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
@@ -52,7 +52,7 @@ private:
 		return label->height();
 	};
 	auto widthMin = basicWidth;
-	auto widthMax = label->naturalWidth();
+	auto widthMax = label->textMaxWidth();
 	if (height(widthMin) <= heightLimit || height(widthMax) > heightLimit) {
 		return basicWidth;
 	}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index ac85729ee..9156ac35d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -356,7 +356,7 @@ void Header::show(HeaderData data) {
 			_widget.get(),
 			std::move(counter),
 			st::storiesHeaderDate);
-		_counter->resizeToNaturalWidth(_counter->naturalWidth());
+		_counter->resizeToWidth(_counter->textMaxWidth());
 		_counter->setAttribute(Qt::WA_TransparentForMouseEvents);
 		_counter->setOpacity(kNameOpacity);
 		_counter->show();
diff --git a/Telegram/SourceFiles/payments/ui/payments_field.cpp b/Telegram/SourceFiles/payments/ui/payments_field.cpp
index 601b3629d..914cc1ccf 100644
--- a/Telegram/SourceFiles/payments/ui/payments_field.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_field.cpp
@@ -322,7 +322,7 @@ struct SimpleFieldState {
 		QString(),
 		st::paymentsFieldAdditional);
 	const auto leftSkip = state->left
-		? (state->left->naturalWidth() + state->currencySkip)
+		? (state->left->textMaxWidth() + state->currencySkip)
 		: 0;
 	const auto rightSkip = st::paymentsFieldAdditional.style.font->width(
 		QString(QChar(rule.decimal))
diff --git a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
index 4a9ab7e4c..4779e64be 100644
--- a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
@@ -305,7 +305,7 @@ void FormSummary::setupPrices(not_null<VerticalLayout*> layout) {
 				padding.left(),
 				padding.top(),
 				(padding.right()
-					+ right->naturalWidth()
+					+ right->textMaxWidth()
 					+ 2 * st.style.font->spacew),
 				padding.bottom()));
 		rpl::combine(
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 632626b19..b3580f798 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 632626b1921e99aaea6d02a9f7ebbb6354161365
+Subproject commit b3580f7987d81b0c7aecee99f7f70f7873f6b35c

From af3cf63e5fb5c23dc38f4f365316ab2c0cf56c01 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 14:22:04 +0200
Subject: [PATCH 636/676] Fix OpenGL rendering with precise HighDPI.

---
 .../calls/calls_video_incoming.cpp            |  8 +++--
 .../group/calls_group_viewport_opengl.cpp     | 34 +++++++++++--------
 .../calls/group/calls_group_viewport_opengl.h |  1 +
 .../media/view/media_view_overlay_opengl.cpp  | 27 ++++++++-------
 .../media/view/media_view_overlay_opengl.h    |  1 +
 .../media/view/media_view_pip_opengl.cpp      | 17 +++++-----
 .../media/view/media_view_pip_opengl.h        |  1 +
 7 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.cpp b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
index 916a058dd..9ea9fe41c 100644
--- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
@@ -73,6 +73,7 @@ private:
 
 	QSize _viewport;
 	float _factor = 1.;
+	int _ifactor = 1;
 	QVector2D _uniformViewport;
 
 	std::optional<QOpenGLBuffer> _contentBuffer;
@@ -189,9 +190,10 @@ void Panel::Incoming::RendererGL::paint(
 		return;
 	}
 
-	const auto factor = widget->devicePixelRatio();
+	const auto factor = widget->devicePixelRatioF();
 	if (_factor != factor) {
 		_factor = factor;
+		_ifactor = int(std::ceil(_factor));
 		_controlsShadowImage.invalidate();
 	}
 	_viewport = widget->size();
@@ -375,9 +377,9 @@ void Panel::Incoming::RendererGL::validateShadowImage() {
 		return;
 	}
 	const auto size = st::callTitleShadowLeft.size();
-	const auto full = QSize(size.width(), 2 * size.height()) * int(_factor);
+	const auto full = QSize(size.width(), 2 * size.height()) * _ifactor;
 	auto image = QImage(full, QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(_factor);
+	image.setDevicePixelRatio(_ifactor);
 	image.fill(Qt::transparent);
 	{
 		auto p = QPainter(&image);
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
index e4a04f7c5..26a9cbed0 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -414,16 +414,20 @@ void Viewport::RendererGL::deinit(
 }
 
 void Viewport::RendererGL::setDefaultViewport(QOpenGLFunctions &f) {
-	const auto size = _viewport * _factor;
-	f.glViewport(0, 0, size.width(), size.height());
+	f.glViewport(
+		0,
+		0,
+		_viewport.width() * _factor,
+		_viewport.height() * _factor);
 }
 
 void Viewport::RendererGL::paint(
 		not_null<QOpenGLWidget*> widget,
 		QOpenGLFunctions &f) {
-	const auto factor = widget->devicePixelRatio();
+	const auto factor = widget->devicePixelRatioF();
 	if (_factor != factor) {
 		_factor = factor;
+		_ifactor = int(std::ceil(_factor));
 		_buttons.invalidate();
 	}
 	_viewport = widget->size();
@@ -773,7 +777,7 @@ void Viewport::RendererGL::paintTile(
 	const auto program = _rgbaFrame
 		? &*_frameProgram.argb32
 		: &*_frameProgram.yuv420;
-	const auto uniformViewport = QSizeF(_viewport * _factor);
+	const auto uniformViewport = QSizeF(_viewport) * _factor;
 
 	program->setUniformValue("viewport", uniformViewport);
 	program->setUniformValue(
@@ -1122,18 +1126,18 @@ void Viewport::RendererGL::ensureButtonsImage() {
 			+ backSize.height()
 			+ muteSize.height()
 			+ pausedSize.height()));
-	const auto imageSize = fullSize * _factor;
+	const auto imageSize = fullSize * _ifactor;
 	auto image = _buttons.takeImage();
 	if (image.size() != imageSize) {
 		image = QImage(imageSize, QImage::Format_ARGB32_Premultiplied);
 	}
 	image.fill(Qt::transparent);
-	image.setDevicePixelRatio(_factor);
+	image.setDevicePixelRatio(_ifactor);
 	{
 		auto p = Painter(&image);
 		auto hq = PainterHighQualityEnabler(p);
 
-		_pinOn = QRect(QPoint(), pinOnSize * _factor);
+		_pinOn = QRect(QPoint(), pinOnSize * _ifactor);
 		VideoTile::PaintPinButton(
 			p,
 			true,
@@ -1145,8 +1149,8 @@ void Viewport::RendererGL::ensureButtonsImage() {
 
 		const auto pinOffTop = pinOnSize.height();
 		_pinOff = QRect(
-			QPoint(0, pinOffTop) * _factor,
-			pinOffSize * _factor);
+			QPoint(0, pinOffTop) * _ifactor,
+			pinOffSize * _ifactor);
 		VideoTile::PaintPinButton(
 			p,
 			false,
@@ -1157,7 +1161,7 @@ void Viewport::RendererGL::ensureButtonsImage() {
 			&_pinIcon);
 
 		const auto backTop = pinOffTop + pinOffSize.height();
-		_back = QRect(QPoint(0, backTop) * _factor, backSize * _factor);
+		_back = QRect(QPoint(0, backTop) * _ifactor, backSize * _ifactor);
 		VideoTile::PaintBackButton(
 			p,
 			0,
@@ -1166,18 +1170,18 @@ void Viewport::RendererGL::ensureButtonsImage() {
 			&_pinBackground);
 
 		const auto muteTop = backTop + backSize.height();
-		_muteOn = QRect(QPoint(0, muteTop) * _factor, muteSize * _factor);
+		_muteOn = QRect(QPoint(0, muteTop) * _ifactor, muteSize * _ifactor);
 		_muteIcon.paint(p, { 0, muteTop }, 1.);
 
 		_muteOff = QRect(
-			QPoint(muteSize.width(), muteTop) * _factor,
-			muteSize * _factor);
+			QPoint(muteSize.width(), muteTop) * _ifactor,
+			muteSize * _ifactor);
 		_muteIcon.paint(p, { muteSize.width(), muteTop }, 0.);
 
 		const auto pausedTop = muteTop + muteSize.height();
 		_paused = QRect(
-			QPoint(0, pausedTop) * _factor,
-			pausedSize * _factor);
+			QPoint(0, pausedTop) * _ifactor,
+			pausedSize * _ifactor);
 		st::groupCallPaused.paint(p, 0, pausedTop, fullSize.width());
 	}
 	_buttons.setImage(std::move(image));
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h
index aab98c6fd..848174f86 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h
@@ -130,6 +130,7 @@ private:
 	const not_null<Viewport*> _owner;
 
 	GLfloat _factor = 1.;
+	int _ifactor = 1;
 	QSize _viewport;
 	bool _rgbaFrame = false;
 	bool _userpicFrame;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 570eed0af..97b59fc72 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -263,9 +263,10 @@ void OverlayWidget::RendererGL::paint(
 	if (handleHideWorkaround(f)) {
 		return;
 	}
-	const auto factor = widget->devicePixelRatio();
+	const auto factor = widget->devicePixelRatioF();
 	if (_factor != factor) {
 		_factor = factor;
+		_ifactor = int(std::ceil(factor));
 		_controlsImage.invalidate();
 
 		// We use the fact that fade texture atlas
@@ -763,10 +764,10 @@ void OverlayWidget::RendererGL::validateControls() {
 	maxWidth = std::max(st::mediaviewIconOver, maxWidth);
 	fullHeight += st::mediaviewIconOver;
 	auto image = QImage(
-		QSize(maxWidth, fullHeight) * _factor,
+		QSize(maxWidth, fullHeight) * _ifactor,
 		QImage::Format_ARGB32_Premultiplied);
 	image.fill(Qt::transparent);
-	image.setDevicePixelRatio(_factor);
+	image.setDevicePixelRatio(_ifactor);
 	{
 		auto p = QPainter(&image);
 		auto index = 0;
@@ -774,8 +775,8 @@ void OverlayWidget::RendererGL::validateControls() {
 		for (const auto &meta : metas) {
 			meta.icon->paint(p, 0, height, maxWidth);
 			_controlsTextures[index++] = QRect(
-				QPoint(0, height) * _factor,
-				meta.icon->size() * _factor);
+				QPoint(0, height) * _ifactor,
+				meta.icon->size() * _ifactor);
 			height += meta.icon->height();
 		}
 		auto hq = PainterHighQualityEnabler(p);
@@ -784,8 +785,8 @@ void OverlayWidget::RendererGL::validateControls() {
 		p.drawEllipse(
 			QRect(0, height, st::mediaviewIconOver, st::mediaviewIconOver));
 		_controlsTextures[index++] = QRect(
-			QPoint(0, height) * _factor,
-			QSize(st::mediaviewIconOver, st::mediaviewIconOver) * _factor);
+			QPoint(0, height) * _ifactor,
+			QSize(st::mediaviewIconOver, st::mediaviewIconOver) * _ifactor);
 		height += st::mediaviewIconOver;
 	}
 	_controlsImage.setImage(std::move(image));
@@ -817,10 +818,10 @@ void OverlayWidget::RendererGL::validateControlsFade() {
 	const auto height = bottomTop + bottom.height();
 
 	auto image = QImage(
-		QSize(width, height) * _factor,
+		QSize(width, height) * _ifactor,
 		QImage::Format_ARGB32_Premultiplied);
 	image.fill(Qt::transparent);
-	image.setDevicePixelRatio(_factor);
+	image.setDevicePixelRatio(_ifactor);
 
 	auto p = QPainter(&image);
 	top.paint(p, 0, 0, width);
@@ -1007,18 +1008,18 @@ void OverlayWidget::RendererGL::paintUsingRaster(
 		int bufferOffset,
 		bool transparent) {
 	auto raster = image.takeImage();
-	const auto size = rect.size() * _factor;
+	const auto size = rect.size() * _ifactor;
 	if (raster.width() < size.width() || raster.height() < size.height()) {
 		raster = QImage(size, QImage::Format_ARGB32_Premultiplied);
 		Assert(!raster.isNull());
-		raster.setDevicePixelRatio(_factor);
+		raster.setDevicePixelRatio(_ifactor);
 		if (!transparent
 			&& (raster.width() > size.width()
 				|| raster.height() > size.height())) {
 			raster.fill(Qt::transparent);
 		}
-	} else if (raster.devicePixelRatio() != _factor) {
-		raster.setDevicePixelRatio(_factor);
+	} else if (raster.devicePixelRatio() != _ifactor) {
+		raster.setDevicePixelRatio(_ifactor);
 	}
 
 	if (transparent) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index f64fb7e58..0138a492d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -114,6 +114,7 @@ private:
 	QOpenGLFunctions *_f = nullptr;
 	QSize _viewport;
 	float _factor = 1.;
+	int _ifactor = 1;
 	QVector2D _uniformViewport;
 
 	std::optional<QOpenGLBuffer> _contentBuffer;
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
index a304578b2..8fa5f1d13 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
@@ -269,9 +269,10 @@ void Pip::RendererGL::createShadowTexture() {
 void Pip::RendererGL::paint(
 		not_null<QOpenGLWidget*> widget,
 		QOpenGLFunctions &f) {
-	const auto factor = widget->devicePixelRatio();
+	const auto factor = widget->devicePixelRatioF();
 	if (_factor != factor) {
 		_factor = factor;
+		_ifactor = int(std::ceil(_factor));
 		_controlsImage.invalidate();
 	}
 	_blendingEnabled = false;
@@ -667,10 +668,10 @@ void Pip::RendererGL::validateControls() {
 		fullHeight += 2 * meta.icon->height();
 	}
 	auto image = QImage(
-		QSize(maxWidth, fullHeight) * _factor,
+		QSize(maxWidth, fullHeight) * _ifactor,
 		QImage::Format_ARGB32_Premultiplied);
 	image.fill(Qt::transparent);
-	image.setDevicePixelRatio(_factor);
+	image.setDevicePixelRatio(_ifactor);
 	{
 		auto p = QPainter(&image);
 		auto index = 0;
@@ -678,8 +679,8 @@ void Pip::RendererGL::validateControls() {
 		const auto paint = [&](not_null<const style::icon*> icon) {
 			icon->paint(p, 0, height, maxWidth);
 			_controlsTextures[index++] = QRect(
-				QPoint(0, height) * _factor,
-				icon->size() * _factor);
+				QPoint(0, height) * _ifactor,
+				icon->size() * _ifactor);
 			height += icon->height();
 		};
 		for (const auto &meta : metas) {
@@ -702,7 +703,7 @@ void Pip::RendererGL::paintUsingRaster(
 		int bufferOffset,
 		bool transparent) {
 	auto raster = image.takeImage();
-	const auto size = rect.size() * _factor;
+	const auto size = rect.size() * _ifactor;
 	if (raster.width() < size.width() || raster.height() < size.height()) {
 		raster = QImage(size, QImage::Format_ARGB32_Premultiplied);
 		raster.setDevicePixelRatio(_factor);
@@ -711,8 +712,8 @@ void Pip::RendererGL::paintUsingRaster(
 				|| raster.height() > size.height())) {
 			raster.fill(Qt::transparent);
 		}
-	} else if (raster.devicePixelRatio() != _factor) {
-		raster.setDevicePixelRatio(_factor);
+	} else if (raster.devicePixelRatio() != _ifactor) {
+		raster.setDevicePixelRatio(_ifactor);
 	}
 
 	if (transparent) {
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.h b/Telegram/SourceFiles/media/view/media_view_pip_opengl.h
index 977240c50..21d9b521e 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.h
@@ -93,6 +93,7 @@ private:
 	QOpenGLFunctions *_f = nullptr;
 	QSize _viewport;
 	float _factor = 1.;
+	int _ifactor = 1;
 	QVector2D _uniformViewport;
 
 	std::optional<QOpenGLBuffer> _contentBuffer;

From b23420f7758d00dbcb9d5aaa4d688cb51048075e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 15:17:00 +0200
Subject: [PATCH 637/676] Fix call stream negotiation.

Fixes #26584.
---
 Telegram/ThirdParty/tgcalls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 258cf9b35..eb120ec4d 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 258cf9b352ee2afde7e08e431f5887cd13119931
+Subproject commit eb120ec4d347dd8ba561d8bbbf0858f20baae4ba

From f8c396e2cf54e61a17d124d533f01151c8c3f7bd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 15:36:27 +0200
Subject: [PATCH 638/676] Fix scheduled outgoing messages unread state.

Fixes #17079.
---
 Telegram/SourceFiles/history/history.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 5617a0991..fe5a1a41e 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1262,7 +1262,15 @@ void History::newItemAdded(not_null<HistoryItem*> item) {
 		Core::App().notifications().schedule(notification);
 	}
 	if (item->out()) {
-		destroyUnreadBar();
+		if (item->isFromScheduled() && unreadCountRefreshNeeded(item->id)) {
+			if (unreadCountKnown()) {
+				setUnreadCount(unreadCount() + 1);
+			} else if (!isForum()) {
+				owner().histories().requestDialogEntry(this);
+			}
+		} else {
+			destroyUnreadBar();
+		}
 		if (!item->unread(this)) {
 			outboxRead(item);
 		}

From ecaf3340f6aec2ac09d03a172f49291288e0d1e0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 10:47:58 +0200
Subject: [PATCH 639/676] Fix audio init crash on macOS.

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

diff --git a/cmake b/cmake
index ae0986c9e..3ffc5e6bf 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit ae0986c9efd28c61783cfe106f8bd1b0ba3b3920
+Subproject commit 3ffc5e6bf584d9b60e66d7c533f87e9276813863

From ed9028e1c4364264b7c4ce410f525274f4de01e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 19:08:29 +0200
Subject: [PATCH 640/676] Allow choosing emoji color for all emoji.

---
 Telegram/Resources/icons/emoji/emoji_skin.png | Bin 0 -> 412 bytes
 .../Resources/icons/emoji/emoji_skin@2x.png   | Bin 0 -> 698 bytes
 .../Resources/icons/emoji/emoji_skin@3x.png   | Bin 0 -> 952 bytes
 Telegram/Resources/langs/lang.strings         |   1 +
 .../chat_helpers/chat_helpers.style           |  24 ++
 .../chat_helpers/emoji_keywords.cpp           |  12 +-
 .../chat_helpers/emoji_list_widget.cpp        | 347 +++++++++++++-----
 .../chat_helpers/emoji_list_widget.h          |   8 +
 Telegram/SourceFiles/core/core_settings.cpp   |  29 ++
 Telegram/SourceFiles/core/core_settings.h     |   3 +
 Telegram/SourceFiles/core/ui_integration.cpp  |   9 +-
 .../SourceFiles/media/view/media_view.style   |  10 +
 12 files changed, 327 insertions(+), 116 deletions(-)
 create mode 100644 Telegram/Resources/icons/emoji/emoji_skin.png
 create mode 100644 Telegram/Resources/icons/emoji/emoji_skin@2x.png
 create mode 100644 Telegram/Resources/icons/emoji/emoji_skin@3x.png

diff --git a/Telegram/Resources/icons/emoji/emoji_skin.png b/Telegram/Resources/icons/emoji/emoji_skin.png
new file mode 100644
index 0000000000000000000000000000000000000000..776617ebe0876ca903e94dc039be94f5c414645b
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfjLp-<F~maf
zZO~pm7YB(F!Csezmsi;|xj3#D;$Qf|s_J}$(|W~u4y%JW=kl3ba(?{T*|Gc8wp%~T
z_WeyuZ%_R9I-PIBZBLu?(rt>KL7}0KE%G?0YjrJ}l6v#I?Ya}2d<0s&b9p{1?Xl=v
zcw&=IpvYtu&chcz+Z<wC^Lkh2tlZj_4=np0`&e`-y|@+Y8mMDC|L%1W+h>9)hm?IU
z?^<{Iv&_25>N1YMwkXTJ(mB0qRhMDrtfVuXpWkp;I!Gnhm?+5?G;AmrIl1Xfq0Gab
z>#}c~HQm~lE5H(vGE42@ng#1#@BVMg)BOIou;@<*udv+P4v&6Fx~81td0$~-KKZQi
hemA|phpqYcFdl!fZ>vn+rP-j6@pScbS?83{1OT>SmH7Yw

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/emoji/emoji_skin@2x.png b/Telegram/Resources/icons/emoji/emoji_skin@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a53f5c18e7f74a7db59f0177ed66ff71e630c4a9
GIT binary patch
literal 698
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2Neyz@*~o;usRa
z`8LdYJ)@(@HtE2%ZSxl>-#oJTq6dfW(j)N~I?lPhytwKQZ>N}G)_OPhNBkEQCRW_}
z{nT&MO`hxLW|i(VS~c@#@wu9P#n0xPe<)youpz<0KtV!)CnCuqX$v0<)5#Pg5w5k@
zUw^E)lec~QZQaG|&!*{3Umdk}p5Jo)!}(jIRE0Qa=O^)8&oL`i`Th4_josw8A1iuX
zlzJR<jJuCNo_?B@L#*3XM{IIxWT1%eWsWsJYu=Su<?eo?KEZQGj+wTn(5I;<QwnTj
z%67-D4f|ZR_h{0^_urp?{`s`%WXH<_3m!J+fYTZEhjUD%8s$O^zv{~Hy{_D{C1Yz;
zh(?xn@bBsQzCmnl4sEMeReV!PWhvB~uH5akFu^o6=Ks&M!0BE~pNnp_yz{;4+kxN5
zdoLb(;juL6U_!y>n+rC?Sz4W${OhLJ8qLk8nr^@KTYfo1^2N)^CzsrQE491rYQ~;#
z0!$N_kMZ?AWIoyO{h;(O#(ED1AMGZ#w_Hq)?rnUZ931q-dFq$2aWJs{6~4s4#Aw8r
z#Mmyt_hQR;eFI6^BbHLVi$vbBE5+B^$*VA2>vdZkw|?^BhXouP4Q8KZ5dXCB{`<`>
zzpgHe(R)2-vwpz25El=&9gEuopI`a5-?#d}`Vg(Xas9Tb9%6eG*n70Nk{Bm3K3~QY
z*zz&&XZI}egIoVs+g3OAFE_L+FKN*2KW;qN&wB1TZTI7)az{I%(OARBe4l&!SH|mN
RTc?B4ji;-h%Q~loCICof8pr?u

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/emoji/emoji_skin@3x.png b/Telegram/Resources/icons/emoji/emoji_skin@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd756d0a9f83770326f55c12aa1963d5f69244e0
GIT binary patch
literal 952
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}uH@<B7?Q#I
zHo~?)Gf+g9zd7y)vk_NSh_aASC(GH8$uFivwYnHuz129=AK)p#TXoULt;Qr+YlXVR
z$FQRKvUf6f&PaZ~XYoC^_08t<`<}nsdhYn$^w`*s{gMf6GZ@nvP$-93wl`(Fcb)8>
zX)V)NV|V{;S@`O!b^Gh9tE($3SB9;&oA1vPx<a=5Xk2`J<MR*OZ{{$ZPur}?^4x#b
z_wV0tzx^gK>E7j+B_h%DCwippjeBi)AWlbYhQ`6j_1CA)H0eHSB-P8oATZ5Kb^Ud2
z2EXOTa{c~l!mnBdxmvFrnC79P@&0aJd3Ck+lea}X+YT!pHId>~d@$ei>9z{1xy#PT
z$;-1hGn$$*rzh)8udb^*cIVJ!ucci_AN~HlTR`n9i|^;3dv4}<*{X`)dHprRY|+IR
zE8EjIOSaZd4_q1IxA)zO|JMWGYc9Y2cG<d@C0^SS7-l@M+&|MtZ7JJC=4~;0nI-%0
z`)^CQbLS4nyw9`WmPKa??6ftL>(69OGnxqugCCm`3_Omq?_+#g6xnFI?83^56FVjz
ze_-8qDe&QY35VI6KV3+>JZI~owzG4t?gbLx4SA*iYL_`L+;cO5&CfVtRcNmej}hk<
zg*#OR(hXKDy&PVG=aygQi7DeZk$13~BD&=?-xsBta6RdR8{cerwcw{j{EY=t3*{`n
zePR7QZ{9qXkQr7loSKABalP8Xee9#5=?j}GhJeNZXJ<htkt>QBE>*fbT$7fW*2p|o
zioQ_EA@N0ig@e<qfUX7NfjoIWP7Q^@?-s4>Z9V+z-Me#-KT7cDUg$Pvw(1vaxU%s7
z0~?V?3q`JGZFO3>;O9c+hbu&q_U*ixwYB5KXI|z;mhGid@>Y{Xcr4E{J4de#yBV4|
zXF{XKlJ}QhdmLlV+I#81hIjkRJtaDve(CM)`y!bTe>3@J&bL3d-#&aOsIBc42`pn_
zVw@t|{_>IQla@Z0Z?4kyzeD~QesJHP996jDTRBfp-M&v8?T78nnByx9zs<1Bb}dLe
z_iCQn&6e+mhuqp$=3Qv%;zdiWprrdxo~@3#X~j=TOHFBKP_FTG^>bP0l+XkKK?s$#

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2703e2c71..4253a9792 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1807,6 +1807,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_emoji_set_active" = "Current set";
 "lng_emoji_set_download" = "Download {size}";
 "lng_emoji_set_loading" = "{percent}, {progress}";
+"lng_emoji_color_all" = "Choose color for all emoji";
 
 "lng_recent_stickers" = "Frequently used";
 "lng_faved_stickers_add" = "Add to Favorites";
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 75fbfbbb0..fb85201eb 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -118,6 +118,8 @@ EmojiPan {
 	tabs: SettingsSlider;
 	search: TabbedSearch;
 	searchMargin: margins;
+	colorAll: IconButton;
+	colorAllLabel: FlatLabel;
 	removeSet: IconButton;
 	boxLabel: FlatLabel;
 	icons: ComposeIcons;
@@ -448,6 +450,7 @@ inlineResultsMaxHeight: 640px;
 emojiPanHeaderFont: semiboldFont;
 emojiPanRemoveSkip: 10px;
 emojiPanRemoveTop: 10px;
+emojiPanColorAllSkip: 9px;
 
 emojiColorsPadding: 5px;
 emojiColorsSep: 1px;
@@ -490,6 +493,25 @@ stickerIconMove: 400;
 stickerPreviewDuration: 150;
 stickerPreviewMin: 0.1;
 
+emojiPanColorAll: IconButton(stickerPanRemoveSet) {
+	width: 24px;
+	height: 24px;
+	rippleAreaSize: 24px;
+	icon: icon {{ "emoji/emoji_skin", smallCloseIconFg }};
+	iconOver: icon {{ "emoji/emoji_skin", smallCloseIconFgOver }};
+}
+emojiPanColorAllLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	align: align(top);
+	minWidth: 40px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+		linkFont: font(12px);
+		linkFontOver: font(12px);
+	}
+}
+emojiPanColorAllPadding: margins(10px, 6px, 10px, -1px);
+
 stickerGroupCategorySize: 28px;
 stickerGroupCategoryAbout: defaultTextStyle;
 stickerGroupCategoryAddMargin: margins(0px, 10px, 0px, 5px);
@@ -626,6 +648,8 @@ defaultEmojiPan: EmojiPan {
 	tabs: emojiTabs;
 	search: defaultTabbedSearch;
 	searchMargin: margins(1px, 11px, 2px, 5px);
+	colorAll: emojiPanColorAll;
+	colorAllLabel: emojiPanColorAllLabel;
 	removeSet: stickerPanRemoveSet;
 	boxLabel: boxLabel;
 	icons: defaultComposeIcons;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
index 684027624..500de20b6 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
@@ -672,17 +672,9 @@ std::vector<Result> EmojiKeywords::PrioritizeRecent(
 }
 
 std::vector<Result> EmojiKeywords::ApplyVariants(std::vector<Result> list) {
+	auto &settings = Core::App().settings();
 	for (auto &item : list) {
-		item.emoji = [&] {
-			const auto result = item.emoji;
-			const auto &variants = Core::App().settings().emojiVariants();
-			const auto i = result->hasVariants()
-				? variants.find(result->nonColoredId())
-				: end(variants);
-			return (i != end(variants))
-				? result->variant(i->second)
-				: result;
-		}();
+		item.emoji = settings.lookupEmojiVariant(item.emoji);
 	}
 	return list;
 }
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index f41482c19..11fa6b234 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -58,7 +58,7 @@ class EmojiColorPicker final : public Ui::RpWidget {
 public:
 	EmojiColorPicker(QWidget *parent, const style::EmojiPan &st);
 
-	void showEmoji(EmojiPtr emoji);
+	void showEmoji(EmojiPtr emoji, bool allLabel = false);
 
 	void clearSelection();
 	void handleMouseMove(QPoint globalPos);
@@ -79,8 +79,10 @@ protected:
 	void mouseMoveEvent(QMouseEvent *e) override;
 
 private:
+	void createAllLabel();
 	void animationCallback();
 	void updateSize();
+	[[nodiscard]] int topColorAllSkip() const;
 
 	void drawVariant(QPainter &p, int variant);
 
@@ -106,6 +108,8 @@ private:
 	QPixmap _cache;
 	Ui::Animations::Simple _a_opacity;
 
+	std::unique_ptr<Ui::FlatLabel> _allLabel;
+
 	rpl::event_stream<EmojiChosen> _chosen;
 	rpl::event_stream<> _hidden;
 
@@ -131,10 +135,15 @@ EmojiColorPicker::EmojiColorPicker(
 	setMouseTracking(true);
 }
 
-void EmojiColorPicker::showEmoji(EmojiPtr emoji) {
+void EmojiColorPicker::showEmoji(EmojiPtr emoji, bool allLabel) {
 	if (!emoji || !emoji->hasVariants()) {
 		return;
 	}
+	if (!allLabel) {
+		_allLabel = nullptr;
+	} else if (!_allLabel) {
+		createAllLabel();
+	}
 	_ignoreShow = false;
 
 	_variants.resize(emoji->variantsCount() + 1);
@@ -144,10 +153,21 @@ void EmojiColorPicker::showEmoji(EmojiPtr emoji) {
 
 	updateSize();
 
-	if (!_cache.isNull()) _cache = QPixmap();
+	if (!_cache.isNull()) {
+		_cache = QPixmap();
+	}
 	showAnimated();
 }
 
+void EmojiColorPicker::createAllLabel() {
+	_allLabel = std::make_unique<Ui::FlatLabel>(
+		this,
+		tr::lng_emoji_color_all(),
+		_st.colorAllLabel);
+	_allLabel->show();
+	_allLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+}
+
 void EmojiColorPicker::updateSize() {
 	auto width = st::emojiPanMargins.left()
 		+ _singleSize.width() * _variants.size()
@@ -158,6 +178,17 @@ void EmojiColorPicker::updateSize() {
 		+ 2 * st::emojiColorsPadding
 		+ _singleSize.height()
 		+ st::emojiPanMargins.bottom();
+	if (_allLabel) {
+		_allLabel->resizeToWidth(width
+			- st::emojiPanMargins.left()
+			- st::emojiPanMargins.right()
+			- st::emojiPanColorAllPadding.left()
+			- st::emojiPanColorAllPadding.right());
+		_allLabel->move(
+			st::emojiPanMargins.left() + st::emojiPanColorAllPadding.left(),
+			st::emojiPanMargins.top() + st::emojiPanColorAllPadding.top());
+		height += topColorAllSkip();
+	}
 	resize(width, height);
 	update();
 	updateSelected();
@@ -186,11 +217,15 @@ void EmojiColorPicker::paintEvent(QPaintEvent *e) {
 	Ui::Shadow::paint(p, inner, width(), _st.showAnimation.shadow);
 	_backgroundRect.paint(p, inner);
 
+	const auto skip = topColorAllSkip();
 	auto x = st::emojiPanMargins.left() + 2 * st::emojiColorsPadding + _singleSize.width();
 	if (rtl()) x = width() - x - st::emojiColorsSep;
-	p.fillRect(x, st::emojiPanMargins.top() + st::emojiColorsPadding, st::emojiColorsSep, inner.height() - st::emojiColorsPadding * 2, st::emojiColorsSepColor);
+	p.fillRect(x, st::emojiPanMargins.top() + skip + st::emojiColorsPadding, st::emojiColorsSep, inner.height() - st::emojiColorsPadding * 2 - skip, st::emojiColorsSepColor);
 
-	if (_variants.isEmpty()) return;
+	if (_variants.isEmpty()) {
+		return;
+	}
+	p.translate(0, skip);
 	for (auto i = 0, count = int(_variants.size()); i != count; ++i) {
 		drawVariant(p, i);
 	}
@@ -248,6 +283,9 @@ void EmojiColorPicker::animationCallback() {
 	update();
 	if (!_a_opacity.animating()) {
 		_cache = QPixmap();
+		if (_allLabel) {
+			_allLabel->show();
+		}
 		if (_hiding) {
 			hide();
 			_hidden.fire({});
@@ -276,10 +314,16 @@ rpl::producer<> EmojiColorPicker::hidden() const {
 
 void EmojiColorPicker::hideAnimated() {
 	if (_cache.isNull()) {
+		if (_allLabel) {
+			_allLabel->show();
+		}
 		_cache = Ui::GrabWidget(this);
 		clearSelection();
 	}
 	_hiding = true;
+	if (_allLabel) {
+		_allLabel->hide();
+	}
 	_a_opacity.start([this] { animationCallback(); }, 1., 0., st::emojiPanDuration);
 }
 
@@ -291,10 +335,16 @@ void EmojiColorPicker::showAnimated() {
 	}
 	_hiding = false;
 	if (_cache.isNull()) {
+		if (_allLabel) {
+			_allLabel->show();
+		}
 		_cache = Ui::GrabWidget(this);
 		clearSelection();
 	}
 	show();
+	if (_allLabel) {
+		_allLabel->hide();
+	}
 	_a_opacity.start([this] { animationCallback(); }, 0., 1., st::emojiPanDuration);
 }
 
@@ -304,10 +354,18 @@ void EmojiColorPicker::clearSelection() {
 	_lastMousePos = mapToGlobal(QPoint(-10, -10));
 }
 
+int EmojiColorPicker::topColorAllSkip() const {
+	return _allLabel
+		? (st::emojiPanColorAllPadding.top()
+			+ _allLabel->height()
+			+ st::emojiPanColorAllPadding.bottom())
+		: 0;
+}
+
 void EmojiColorPicker::updateSelected() {
 	auto newSelected = -1;
 	auto p = mapFromGlobal(_lastMousePos);
-	auto sx = rtl() ? (width() - p.x()) : p.x(), y = p.y() - st::emojiPanMargins.top() - st::emojiColorsPadding;
+	auto sx = rtl() ? (width() - p.x()) : p.x(), y = p.y() - st::emojiPanMargins.top() - topColorAllSkip() - st::emojiColorsPadding;
 	if (y >= 0 && y < _singleSize.height()) {
 		auto x = sx - st::emojiPanMargins.left() - st::emojiColorsPadding;
 		if (x >= 0 && x < _singleSize.width()) {
@@ -327,7 +385,8 @@ void EmojiColorPicker::setSelected(int newSelected) {
 	if (_selected == newSelected) {
 		return;
 	}
-	auto updateSelectedRect = [this] {
+	const auto skip = topColorAllSkip();
+	const auto updateSelectedRect = [&] {
 		if (_selected < 0) return;
 		auto addedSkip = (_selected > 0)
 			? (2 * st::emojiColorsPadding + st::emojiColorsSep)
@@ -338,7 +397,7 @@ void EmojiColorPicker::setSelected(int newSelected) {
 			+ addedSkip;
 		rtlupdate(
 			left,
-			st::emojiPanMargins.top() + st::emojiColorsPadding,
+			st::emojiPanMargins.top() + st::emojiColorsPadding + skip,
 			_singleSize.width(),
 			_singleSize.height());
 	};
@@ -851,6 +910,31 @@ void EmojiListWidget::setSingleSize(QSize size) {
 	_picker->setSingleSize(_singleSize);
 }
 
+void EmojiListWidget::setColorAllForceRippled(bool force) {
+	_colorAllRippleForced = force;
+	if (_colorAllRippleForced) {
+		_colorAllRippleForcedLifetime = style::PaletteChanged(
+		) | rpl::filter([=] {
+			return _colorAllRipple != nullptr;
+		}) | rpl::start_with_next([=] {
+			_colorAllRipple->forceRepaint();
+		});
+		if (!_colorAllRipple) {
+			_colorAllRipple = createButtonRipple(int(Section::People));
+		}
+		if (_colorAllRipple->empty()) {
+			_colorAllRipple->addFading();
+		} else {
+			_colorAllRipple->lastUnstop();
+		}
+	} else {
+		if (_colorAllRipple) {
+			_colorAllRipple->lastStop();
+		}
+		_colorAllRippleForcedLifetime.destroy();
+	}
+}
+
 int EmojiListWidget::countDesiredHeight(int newWidth) {
 	const auto fullWidth = st().margin.left()
 		+ newWidth
@@ -897,14 +981,9 @@ void EmojiListWidget::ensureLoaded(int section) {
 	_emoji[section] = Ui::Emoji::GetSection(static_cast<Section>(section));
 	_counts[section] = _emoji[section].size();
 
-	const auto &variants = Core::App().settings().emojiVariants();
+	const auto &settings = Core::App().settings();
 	for (auto &emoji : _emoji[section]) {
-		if (emoji->hasVariants()) {
-			const auto j = variants.find(emoji->nonColoredId());
-			if (j != end(variants)) {
-				emoji = emoji->variant(j->second);
-			}
-		}
+		emoji = settings.lookupEmojiVariant(emoji);
 	}
 }
 
@@ -1366,8 +1445,7 @@ void EmojiListWidget::mousePressEvent(QMouseEvent *e) {
 		if (emoji && emoji->hasVariants()) {
 			_pickerSelected = _selected;
 			setCursor(style::cur_default);
-			const auto &variants = Core::App().settings().emojiVariants();
-			if (!variants.contains(emoji->nonColoredId())) {
+			if (!Core::App().settings().hasChosenEmojiVariant(emoji)) {
 				showPicker();
 			} else {
 				_showPickerTimer.callOnce(500);
@@ -1385,12 +1463,11 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 			return _picker->handleMouseRelease(QCursor::pos());
 		} else if (const auto over = std::get_if<OverEmoji>(&_pickerSelected)) {
 			const auto emoji = lookupOverEmoji(over);
-			if (emoji && emoji->hasVariants()) {
-				const auto &variants = Core::App().settings().emojiVariants();
-				if (variants.contains(emoji->nonColoredId())) {
-					_picker->hideAnimated();
-					_pickerSelected = v::null;
-				}
+			if (emoji
+				&& emoji->hasVariants()
+				&& Core::App().settings().hasChosenEmojiVariant(emoji)) {
+				_picker->hideAnimated();
+				_pickerSelected = v::null;
 			}
 		}
 	}
@@ -1429,11 +1506,15 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 			&& set->section < _staticCount + _custom.size());
 		displaySet(_custom[set->section - _staticCount].id);
 	} else if (auto button = std::get_if<OverButton>(&pressed)) {
-		Assert(button->section >= _staticCount
-			&& button->section < _staticCount + _custom.size());
-		const auto id = _custom[button->section - _staticCount].id;
+		Assert(hasButton(button->section));
+		const auto id = hasColorButton(button->section)
+			? 0
+			: _custom[button->section - _staticCount].id;
 		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
-		if (hasRemoveButton(button->section)) {
+		if (hasColorButton(button->section)) {
+			_pickerSelected = pressed;
+			showPicker();
+		} else if (hasRemoveButton(button->section)) {
 			removeSet(id);
 		} else if (hasAddButton(button->section)) {
 			_localSetsManager->install(id);
@@ -1496,23 +1577,35 @@ void EmojiListWidget::showPicker() {
 	if (v::is_null(_pickerSelected)) {
 		return;
 	}
-
-	const auto over = std::get_if<OverEmoji>(&_pickerSelected);
-	const auto emoji = lookupOverEmoji(over);
-	if (emoji && emoji->hasVariants()) {
-		_picker->showEmoji(emoji);
-
-		auto y = emojiRect(over->section, over->index).y();
+	const auto showAt = [&](float64 xCoef, int y, int height) {
 		y -= _picker->height() - st::emojiPanRadius + getVisibleTop();
 		if (y < st().header) {
-			y += _picker->height() - st::emojiPanRadius + _singleSize.height() - st::emojiPanRadius;
+			y += _picker->height() + height;
 		}
 		auto xmax = width() - _picker->width();
-		auto coef = float64(over->index % _columnCount) / float64(_columnCount - 1);
-		if (rtl()) coef = 1. - coef;
-		_picker->move(qRound(xmax * coef), y);
+		if (rtl()) xCoef = 1. - xCoef;
+		_picker->move(qRound(xmax * xCoef), y);
 
 		disableScroll(true);
+	};
+	if (const auto button = std::get_if<OverButton>(&_pickerSelected)) {
+		const auto hand = QString::fromUtf8("\xF0\x9F\x91\x8B");
+		const auto emoji = Ui::Emoji::Find(hand);
+		Assert(emoji != nullptr && emoji->hasVariants());
+		_picker->showEmoji(emoji, true);
+		setColorAllForceRippled(true);
+		const auto rect = buttonRect(button->section);
+		showAt(1., rect.y(), rect.height() - 2 * st::emojiPanRadius);
+	} else if (const auto over = std::get_if<OverEmoji>(&_pickerSelected)) {
+		const auto emoji = lookupOverEmoji(over);
+		if (emoji && emoji->hasVariants()) {
+			_picker->showEmoji(emoji);
+
+			const auto coef = float64(over->index % _columnCount)
+				/ float64(_columnCount - 1);
+			const auto h = _singleSize.height() - 2 * st::emojiPanRadius;
+			showAt(coef, emojiRect(over->section, over->index).y(), h);
+		}
 	}
 }
 
@@ -1520,11 +1613,34 @@ void EmojiListWidget::pickerHidden() {
 	_pickerSelected = v::null;
 	update();
 	disableScroll(false);
+	setColorAllForceRippled(false);
 
 	_lastMousePos = QCursor::pos();
 	updateSelected();
 }
 
+bool EmojiListWidget::hasColorButton(int index) const {
+	return (_staticCount > int(Section::People))
+		&& (index == int(Section::People));
+}
+
+QRect EmojiListWidget::colorButtonRect(int index) const {
+	return colorButtonRect(sectionInfo(index));
+}
+
+QRect EmojiListWidget::colorButtonRect(const SectionInfo &info) const {
+	if (_mode != Mode::Full) {
+		return QRect();
+	}
+	const auto &colorSt = st().colorAll;
+	const auto buttonw = colorSt.rippleAreaPosition.x()
+		+ colorSt.rippleAreaSize;
+	const auto buttonh = colorSt.height;
+	const auto buttonx = emojiRight() - st::emojiPanColorAllSkip - buttonw;
+	const auto buttony = info.top + st::emojiPanRemoveTop;
+	return QRect(buttonx, buttony, buttonw, buttonh);
+}
+
 bool EmojiListWidget::hasRemoveButton(int index) const {
 	if (index < _staticCount
 		|| index >= _staticCount + _custom.size()) {
@@ -1581,15 +1697,18 @@ QRect EmojiListWidget::unlockButtonRect(int index) const {
 }
 
 bool EmojiListWidget::hasButton(int index) const {
-	if (index < _staticCount
-		|| index >= _staticCount + _custom.size()) {
-		return false;
+	if (hasColorButton(index)
+		|| (index >= _staticCount
+			&& index < _staticCount + _custom.size())) {
+		return true;
 	}
-	return true;
+	return false;
 }
 
 QRect EmojiListWidget::buttonRect(int index) const {
-	return hasRemoveButton(index)
+	return hasColorButton(index)
+		? colorButtonRect(index)
+		: hasRemoveButton(index)
 		? removeButtonRect(index)
 		: hasAddButton(index)
 		? addButtonRect(index)
@@ -1637,19 +1756,33 @@ QRect EmojiListWidget::emojiRect(int section, int index) const {
 }
 
 void EmojiListWidget::colorChosen(EmojiChosen data) {
+	Expects(data.emoji != nullptr && data.emoji->hasVariants());
+
 	const auto emoji = data.emoji;
-	if (emoji->hasVariants()) {
-		Core::App().settings().saveEmojiVariant(emoji);
+	auto &settings = Core::App().settings();
+	if (const auto button = std::get_if<OverButton>(&_pickerSelected)) {
+		settings.saveAllEmojiVariants(emoji);
+		for (auto section = int(Section::People)
+			; section < _staticCount
+			; ++section) {
+			for (auto &emoji : _emoji[section]) {
+				emoji = settings.lookupEmojiVariant(emoji);
+			}
+		}
+		update();
+	} else {
+		settings.saveEmojiVariant(emoji);
+
+		const auto over = std::get_if<OverEmoji>(&_pickerSelected);
+		if (over
+			&& over->section > int(Section::Recent)
+			&& over->section < _staticCount
+			&& over->index < _emoji[over->section].size()) {
+			_emoji[over->section][over->index] = emoji;
+			rtlupdate(emojiRect(over->section, over->index));
+		}
+		selectEmoji(data);
 	}
-	const auto over = std::get_if<OverEmoji>(&_pickerSelected);
-	if (over
-		&& over->section > int(Section::Recent)
-		&& over->section < _staticCount
-		&& over->index < _emoji[over->section].size()) {
-		_emoji[over->section][over->index] = emoji;
-		rtlupdate(emojiRect(over->section, over->index));
-	}
-	selectEmoji(data);
 	_picker->hideAnimated();
 }
 
@@ -1967,47 +2100,54 @@ int EmojiListWidget::paintButtonGetWidth(
 		const SectionInfo &info,
 		bool selected,
 		QRect clip) const {
-	if (info.section < _staticCount
-		|| info.section >= _staticCount + _custom.size()) {
+	if (!hasButton(info.section)) {
 		return 0;
 	}
-	auto &custom = _custom[info.section - _staticCount];
-	if (hasRemoveButton(info.section)) {
-		const auto remove = removeButtonRect(info);
-		if (remove.isEmpty()) {
+	auto &ripple = (info.section >= _staticCount)
+		? _custom[info.section - _staticCount].ripple
+		: _colorAllRipple;
+	const auto colorAll = hasColorButton(info.section);
+	if (colorAll || hasRemoveButton(info.section)) {
+		const auto rect = colorAll
+			? colorButtonRect(info)
+			: removeButtonRect(info);
+		if (rect.isEmpty()) {
 			return 0;
-		} else if (remove.intersects(clip)) {
-			const auto &removeSt = st().removeSet;
-			if (custom.ripple) {
-				custom.ripple->paint(
+		} else if (rect.intersects(clip)) {
+			const auto &bst = colorAll ? st().colorAll : st().removeSet;
+			if (colorAll && _colorAllRippleForced) {
+				selected = true;
+			}
+			if (ripple) {
+				ripple->paint(
 					p,
-					remove.x() + removeSt.rippleAreaPosition.x(),
-					remove.y() + removeSt.rippleAreaPosition.y(),
+					rect.x() + bst.rippleAreaPosition.x(),
+					rect.y() + bst.rippleAreaPosition.y(),
 					width());
-				if (custom.ripple->empty()) {
-					custom.ripple.reset();
+				if (ripple->empty()) {
+					ripple.reset();
 				}
 			}
-			const auto &icon = selected ? removeSt.iconOver : removeSt.icon;
+			const auto &icon = selected ? bst.iconOver : bst.icon;
 			icon.paint(
 				p,
-				(remove.topLeft()
+				(rect.topLeft()
 					+ QPoint(
-						remove.width() - icon.width(),
-						remove.height() - icon.height()) / 2),
+						rect.width() - icon.width(),
+						rect.height() - icon.height()) / 2),
 				width());
 		}
-		return emojiRight() - remove.x();
+		return emojiRight() - rect.x();
 	}
 	const auto canAdd = hasAddButton(info.section);
 	const auto &button = rightButton(info.section);
 	const auto rect = buttonRect(info, button);
 	p.drawImage(rect.topLeft(), selected ? button.backOver : button.back);
-	if (custom.ripple) {
-		const auto ripple = QColor(0, 0, 0, 36);
-		custom.ripple->paint(p, rect.x(), rect.y(), width(), &ripple);
-		if (custom.ripple->empty()) {
-			custom.ripple.reset();
+	if (ripple) {
+		const auto color = QColor(0, 0, 0, 36);
+		ripple->paint(p, rect.x(), rect.y(), width(), &color);
+		if (ripple->empty()) {
+			ripple.reset();
 		}
 	}
 	p.setPen(!canAdd
@@ -2108,22 +2248,28 @@ void EmojiListWidget::setSelected(OverState newSelected) {
 
 void EmojiListWidget::setPressed(OverState newPressed) {
 	if (auto button = std::get_if<OverButton>(&_pressed)) {
-		Assert(button->section >= _staticCount
-			&& button->section < _staticCount + _custom.size());
-		auto &set = _custom[button->section - _staticCount];
-		if (set.ripple) {
-			set.ripple->lastStop();
+		Assert(hasColorButton(button->section)
+			|| (button->section >= _staticCount
+				&& button->section < _staticCount + _custom.size()));
+		auto &ripple = (button->section >= _staticCount)
+			? _custom[button->section - _staticCount].ripple
+			: _colorAllRipple;
+		if (ripple) {
+			ripple->lastStop();
 		}
 	}
 	_pressed = newPressed;
 	if (auto button = std::get_if<OverButton>(&_pressed)) {
-		Assert(button->section >= _staticCount
-			&& button->section < _staticCount + _custom.size());
-		auto &set = _custom[button->section - _staticCount];
-		if (!set.ripple) {
-			set.ripple = createButtonRipple(button->section);
+		Assert(hasColorButton(button->section)
+			|| (button->section >= _staticCount
+				&& button->section < _staticCount + _custom.size()));
+		auto &ripple = (button->section >= _staticCount)
+			? _custom[button->section - _staticCount].ripple
+			: _colorAllRipple;
+		if (!ripple) {
+			ripple = createButtonRipple(button->section);
 		}
-		set.ripple->add(mapFromGlobal(QCursor::pos()) - buttonRippleTopLeft(button->section));
+		ripple->add(mapFromGlobal(QCursor::pos()) - buttonRippleTopLeft(button->section));
 	}
 }
 
@@ -2167,16 +2313,18 @@ void EmojiListWidget::initButton(
 
 std::unique_ptr<Ui::RippleAnimation> EmojiListWidget::createButtonRipple(
 		int section) {
-	Expects(section >= _staticCount
-		&& section < _staticCount + _custom.size());
+	Expects(hasButton(section));
 
+	const auto colorAll = hasColorButton(section);
 	const auto remove = hasRemoveButton(section);
-	const auto &removeSt = st().removeSet;
-	const auto &st = remove ? removeSt.ripple : st::emojiPanButton.ripple;
-	auto mask = remove
+	const auto &staticSt = colorAll ? st().colorAll : st().removeSet;
+	const auto &st = (colorAll || remove)
+		? staticSt.ripple
+		: st::emojiPanButton.ripple;
+	auto mask = (colorAll || remove)
 		? Ui::RippleAnimation::EllipseMask(QSize(
-			removeSt.rippleAreaSize,
-			removeSt.rippleAreaSize))
+			staticSt.rippleAreaSize,
+			staticSt.rippleAreaSize))
 		: rightButton(section).rippleMask;
 	return std::make_unique<Ui::RippleAnimation>(
 		st,
@@ -2185,11 +2333,12 @@ std::unique_ptr<Ui::RippleAnimation> EmojiListWidget::createButtonRipple(
 }
 
 QPoint EmojiListWidget::buttonRippleTopLeft(int section) const {
-	Expects(section >= _staticCount
-		&& section < _staticCount + _custom.size());
+	Expects(hasButton(section));
 
 	return myrtlrect(buttonRect(section)).topLeft()
-		+ (hasRemoveButton(section)
+		+ (hasColorButton(section)
+			? st().colorAll.rippleAreaPosition
+			: hasRemoveButton(section)
 			? st().removeSet.rippleAreaPosition
 			: QPoint());
 }
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index 374b6e7b3..b042a568e 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -247,6 +247,7 @@ private:
 	[[nodiscard]] SectionInfo sectionInfoByOffset(int yOffset) const;
 	[[nodiscard]] int sectionsCount() const;
 	void setSingleSize(QSize size);
+	void setColorAllForceRippled(bool force);
 
 	void showPicker();
 	void pickerHidden();
@@ -297,6 +298,9 @@ private:
 		int set,
 		int index);
 	void validateEmojiPaintContext(const ExpandingContext &context);
+	[[nodiscard]] bool hasColorButton(int index) const;
+	[[nodiscard]] QRect colorButtonRect(int index) const;
+	[[nodiscard]] QRect colorButtonRect(const SectionInfo &info) const;
 	[[nodiscard]] bool hasRemoveButton(int index) const;
 	[[nodiscard]] QRect removeButtonRect(int index) const;
 	[[nodiscard]] QRect removeButtonRect(const SectionInfo &info) const;
@@ -378,6 +382,10 @@ private:
 	Ui::RoundRect _overBg;
 	QImage _searchExpandCache;
 
+	mutable std::unique_ptr<Ui::RippleAnimation> _colorAllRipple;
+	bool _colorAllRippleForced = false;
+	rpl::lifetime _colorAllRippleForcedLifetime;
+
 	std::vector<QString> _nextSearchQuery;
 	std::vector<QString> _searchQuery;
 	base::flat_set<EmojiPtr> _searchEmoji;
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index cef0bd2e8..8abdd7496 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -1076,11 +1076,40 @@ void Settings::setLegacyRecentEmojiPreload(
 	}
 }
 
+EmojiPtr Settings::lookupEmojiVariant(EmojiPtr emoji) const {
+	if (emoji->hasVariants()) {
+		const auto i = _emojiVariants.find(emoji->nonColoredId());
+		if (i != end(_emojiVariants)) {
+			return emoji->variant(i->second);
+		}
+		const auto j = _emojiVariants.find(QString());
+		if (j != end(_emojiVariants)) {
+			return emoji->variant(j->second);
+		}
+	}
+	return emoji;
+}
+
+bool Settings::hasChosenEmojiVariant(EmojiPtr emoji) const {
+	return _emojiVariants.contains(QString())
+		|| _emojiVariants.contains(emoji->nonColoredId());
+}
+
 void Settings::saveEmojiVariant(EmojiPtr emoji) {
+	Expects(emoji->hasVariants());
+
 	_emojiVariants[emoji->nonColoredId()] = emoji->variantIndex(emoji);
 	_saveDelayed.fire({});
 }
 
+void Settings::saveAllEmojiVariants(EmojiPtr emoji) {
+	Expects(emoji->hasVariants());
+
+	_emojiVariants.clear();
+	_emojiVariants[QString()] = emoji->variantIndex(emoji);
+	_saveDelayed.fire({});
+}
+
 void Settings::setLegacyEmojiVariants(QMap<QString, int> data) {
 	if (!_emojiVariants.empty() || data.isEmpty()) {
 		return;
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 72468e755..bc7b74282 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -668,7 +668,10 @@ public:
 	[[nodiscard]] const base::flat_map<QString, uint8> &emojiVariants() const {
 		return _emojiVariants;
 	}
+	[[nodiscard]] EmojiPtr lookupEmojiVariant(EmojiPtr emoji) const;
+	[[nodiscard]] bool hasChosenEmojiVariant(EmojiPtr emoji) const;
 	void saveEmojiVariant(EmojiPtr emoji);
+	void saveAllEmojiVariants(EmojiPtr emoji);
 	void setLegacyEmojiVariants(QMap<QString, int> data);
 
 	[[nodiscard]] bool disableOpenGL() const {
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index e7351e8fd..ead942262 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -282,15 +282,10 @@ rpl::producer<> UiIntegration::forcePopupMenuHideRequests() {
 
 const Ui::Emoji::One *UiIntegration::defaultEmojiVariant(
 		const Ui::Emoji::One *emoji) {
-	if (!emoji || !emoji->hasVariants()) {
+	if (!emoji) {
 		return emoji;
 	}
-	const auto nonColored = emoji->nonColoredId();
-	const auto &variants = Core::App().settings().emojiVariants();
-	const auto i = variants.find(nonColored);
-	const auto result = (i != end(variants))
-		? emoji->variant(i->second)
-		: emoji;
+	const auto result = Core::App().settings().lookupEmojiVariant(emoji);
 	Core::App().settings().incrementRecentEmoji({ result });
 	return result;
 }
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index a2426a990..67e684764 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -479,6 +479,14 @@ storiesRemoveSet: IconButton(stickerPanRemoveSet) {
 	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};
 	ripple: storiesComposeRippleLight;
 }
+storiesColorAll: IconButton(emojiPanColorAll) {
+	icon: icon {{ "emoji/emoji_skin", storiesComposeGrayIcon }};
+	iconOver: icon {{ "emoji/emoji_skin", storiesComposeGrayIcon }};
+	ripple: storiesComposeRippleLight;
+}
+storiesColorAllLabel: FlatLabel(emojiPanColorAllLabel) {
+	textFg: storiesComposeGrayText;
+}
 storiesMenuSeparator: mediaviewMenuSeparator;
 storiesMenu: Menu(defaultMenu) {
 	itemBg: groupCallMenuBg;
@@ -588,6 +596,8 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 		rippleBgActive: storiesComposeBgOver;
 	}
 	search: storiesEmojiTabbedSearch;
+	colorAll: storiesColorAll;
+	colorAllLabel: storiesColorAllLabel;
 	removeSet: storiesRemoveSet;
 	boxLabel: storiesBoxLabel;
 	icons: ComposeIcons {

From 7d4c3766d5bad1de16c2be19bc30be754de610f7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 10:59:30 +0200
Subject: [PATCH 641/676] Move to the new autoupdate channel.

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 9c68fbe3c..0919789bf 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 9c68fbe3cc4242a5f5f76dfda8ceab511cc08c70
+Subproject commit 0919789bf555c651e32bdbcabc397dbacb6a2545

From 92fec8304e4bb14c36842e1c11d2c8ff22dc6608 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 17:03:50 +0200
Subject: [PATCH 642/676] Implement connected websites section.

---
 Telegram/CMakeLists.txt                       |   4 +
 Telegram/Resources/icons/menu/ip_address.png  | Bin 0 -> 701 bytes
 .../Resources/icons/menu/ip_address@2x.png    | Bin 0 -> 1274 bytes
 .../Resources/icons/menu/ip_address@3x.png    | Bin 0 -> 2002 bytes
 .../Resources/icons/menu/payment_address.png  | Bin 0 -> 584 bytes
 .../icons/menu/payment_address@2x.png         | Bin 0 -> 1195 bytes
 .../icons/menu/payment_address@3x.png         | Bin 0 -> 1834 bytes
 Telegram/Resources/langs/lang.strings         |  15 +-
 .../SourceFiles/api/api_authorizations.cpp    |  65 +-
 Telegram/SourceFiles/api/api_authorizations.h |   6 +-
 Telegram/SourceFiles/api/api_websites.cpp     | 138 +++
 Telegram/SourceFiles/api/api_websites.h       |  62 ++
 Telegram/SourceFiles/apiwrap.cpp              |   8 +-
 Telegram/SourceFiles/apiwrap.h                |   3 +
 Telegram/SourceFiles/boxes/sessions_box.cpp   | 121 +--
 Telegram/SourceFiles/boxes/sessions_box.h     |  25 +-
 Telegram/SourceFiles/settings/settings.style  |  34 +-
 .../settings/settings_privacy_security.cpp    |  49 +-
 .../settings/settings_websites.cpp            | 783 ++++++++++++++++++
 .../SourceFiles/settings/settings_websites.h  |  27 +
 Telegram/SourceFiles/ui/boxes/confirm_box.cpp |  16 +-
 Telegram/SourceFiles/ui/boxes/confirm_box.h   |   2 +
 .../ui/controls/userpic_button.cpp            |  26 +-
 .../SourceFiles/ui/controls/userpic_button.h  |   1 +
 Telegram/SourceFiles/ui/menu_icons.style      |   2 +
 25 files changed, 1261 insertions(+), 126 deletions(-)
 create mode 100644 Telegram/Resources/icons/menu/ip_address.png
 create mode 100644 Telegram/Resources/icons/menu/ip_address@2x.png
 create mode 100644 Telegram/Resources/icons/menu/ip_address@3x.png
 create mode 100644 Telegram/Resources/icons/menu/payment_address.png
 create mode 100644 Telegram/Resources/icons/menu/payment_address@2x.png
 create mode 100644 Telegram/Resources/icons/menu/payment_address@3x.png
 create mode 100644 Telegram/SourceFiles/api/api_websites.cpp
 create mode 100644 Telegram/SourceFiles/api/api_websites.h
 create mode 100644 Telegram/SourceFiles/settings/settings_websites.cpp
 create mode 100644 Telegram/SourceFiles/settings/settings_websites.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 10b47447d..f15f85198 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -167,6 +167,8 @@ PRIVATE
     api/api_user_privacy.h
     api/api_views.cpp
     api/api_views.h
+    api/api_websites.cpp
+    api/api_websites.h
     api/api_who_reacted.cpp
     api/api_who_reacted.h
     boxes/filters/edit_filter_box.cpp
@@ -1270,6 +1272,8 @@ PRIVATE
     settings/settings_scale_preview.cpp
     settings/settings_scale_preview.h
     settings/settings_type.h
+    settings/settings_websites.cpp
+    settings/settings_websites.h
     storage/details/storage_file_utilities.cpp
     storage/details/storage_file_utilities.h
     storage/details/storage_settings_scheme.cpp
diff --git a/Telegram/Resources/icons/menu/ip_address.png b/Telegram/Resources/icons/menu/ip_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..3aa87b0aa5c29c1ab9d6de18ab7751fa5ed2db6d
GIT binary patch
literal 701
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl1xd#WBP}
z@aYum?4&@ER%2r+ZPz2m8~lSJxs^PmE}pvNB^X`bnDLrlz<T3`4i;%?Z*4~w;YDUi
zk^=G{8*g=lDIKb*Xe)L-X>)64aLl!+>bJG$ZOh*mmw!LMPJe#w%&^tG?S~s34!r*Q
z=;ha{vuT^-*1!M$`+U&4(y3lkPo`|U{WfW%ME~)WO$-4pP7>>i^LECq&o_~hmzUod
zp)=7V$87fd=d2A%LWdgOnuP~eh%U?9o^3We@czAfmtJn+U|x{mB(dRdR(#HE@h&a3
z$uCQ+Y;9~hoES6~t!U-l%+a~L=!VtYJiGbfT2uX&JD+*~-Cb#7h?eTzoiXdeR`1=n
zZ_$sMeHAu&Tca%Zy>_~ou_Z*S*G*Y)Lxhf0Z<^KIQ%-#Cj|(i;glR9dn0qe8C~|Gs
z(ue9AV%`4!{y|GK76wcZVQ`(|wKGP|_0oEwn>pJ~rYLEuADur*ghBMUx{FkkNM-<+
zr)R_O-@hM!tk854)Sv3TMr796G`;EG$F9BJdNE@P$N;XiAeGRnEmyM&S>*cNk7PJ+
zjgsYITY5Eb`{tDg6BI-WZy2o-N$LxTkBd9<p1;+pzrX)yO<dIGn>oAhE)xy>@%N3#
z5|3skJ?Tqt%Pu#vH9NL22DoUr*WI4rC3@j%2T!~6E<X!~fWW8Um7CrdW&E60xBvg!
zJq#D@Wurb8eLHGil&mxT^xeGgb#V+Y;$xH-iTS(rFRZMqOY@3g(AYlL<d6LW_KUXa
UF}=034}g-6r>mdKI;Vst0M*+SvH$=8

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/ip_address@2x.png b/Telegram/Resources/icons/menu/ip_address@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1184e10b059654e377a4a6567bfcc9a982016163
GIT binary patch
literal 1274
zcmV<W1O@wvP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGWJyFpR9Fe^n9VD#Q543{J%#d-
zuTm}|3@D)#!bFUSOc|Pq3FUu~@?TsfWrz}GV8DQZiH{J)C8fw$K63Bxp4DAvxA%LT
z_nhN&@8ImgYwh(s>si~{``vrLClE-rR0UEMNNxqbB_dy5US3gA@jcYg`59`br>AFU
zXNkzh9NW^;GBq`|x3~8zLIZ*TEoSLh1Dczg*Vor048y|>nUGks_~Pg1=g-Z}Y0kU5
zyZQO~gM$O{{0KF%aRNb5GJ%BqO5>AMQ&V$zcqj?3udm0(#?sT%CnqPxGd?~pIvC;s
zf&dM&cnC+tXSyh~&d$!;+gs6{nVHGS$sr&&H}~e|2IunfvKdboClCbukO`4kM36Gc
z@!0%ZGMeY-=b@n?m6({AAkD|eM`L57Ix*<t1cIP`0tv^7R6=!P;$^0gYin!M1Q<Iz
zJ0w_JTQi+v;{<|WLWIkh5R894=_)pBLmK`|QqqQphs~^F;}p~?1|s4|){Tnp;dPaG
z7J<bc9UTRFe}9*SVxc&JAV9MqT~G1s1+w4pn#d|PrKNJ#q?iPmP`46D$$N*m$v189
zqk~O$b8{2k(a{m-ff;}envs!ladB~cd~89|t*WXjDJgk*dD+_9vIrbA)z#HFTU%RQ
z)FOwwZ2U4`$$OF_oX@blE5u>Ml4Q@_-rhFIe@vE0Z*MQg>gp=>w@~R86%}=NcVjOu
zF0y4?ocj9uy1Kgk{r%e7S_|^-a)wJ`1_uXSMt^_5pk-xcE-D@%;q>+Oxg2B#C6S8;
zT^BbBak}NfUr<mW=;h_5817S{!oorqRas4Bay$max)X-#ngQ9_*>qoDUwOApzi9(O
zz$0W6!d6*LWD+6{=;7hv{{G&iik+2}h4J|K=t8DP2tqdf*vKM|;dek*ywy!hOT+W_
z_GbC5t`LN5LE2>{sjY@bg=FKQ+U}M}*wfP!&&<qBmGCr#AY_YxtW2fOok@r|AV|f<
z#U@p3skYAn3E2`+S$E5Y=`kQ~=_1k8)MRPVmBkSZ20iO1d>{zeo&!=@O=M<?d1KT~
zZ)s_X`;Dokc3xgyPfrhB&&@ODjS->$?&$dZaP8>mU`9?(PR`HIwJN4jT3T9JS;^IL
zV`IbgW5;>868XvXgHxI}c41+`N~T>P2<~Cd+KPJpP!Zes<bo#mtgEXlJLYd6hyl4b
zyM!)ih)24@4h#&CkJix8@OKR1zc>Yj7WM`LiC$sRigd|mTjS*?>-6-rnNn<=KoHD>
zti8Sc3oiL2;8x`M88kaPOI8-ObvV%FCJ6*V$NFWTL89pSq1e^cMONC#$cQG!peud|
zbXmo^ZurN(;6qW8Q789PT3<sw3NZ8~O5&%qjEVK6Yn&QzF<n_%k<T42T<k713?Q69
z$^EfG#>A7oKnf%C67>l=o=-5%=hI*x=WI#R4_4lXtIv_iPkJ1d943TtQ0(sR{)3<N
kd=587OI09Mflvj00}WoTl551`CjbBd07*qoM6N<$g09|B!~g&Q

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/ip_address@3x.png b/Telegram/Resources/icons/menu/ip_address@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cee2b09df2b5f59617156c5add554993c268322
GIT binary patch
literal 2002
zcmV;@2QB!CP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?JV``BRA>e5np=oZUlhm9pBTnv
z-0#%5G$hYndEi03`sYD;lE`If)JQ4vFb}TNl=7xT35DVT5A!-o@*ua6OCgN={r~@D
z<=b-3{_S(df6n;%cjke0*8Z-wzH9&X*?aB1PoF;JU)cj?50pJn_CVPKWe-$c57ZRR
zsBhoC6DLj_I&|oeAw!7u`t|EquU<WT`0(r3uZ4y#B(WJYW-M5+VE+91bLY;THf>t}
z{{0g<eERh1_U+qOuU@@$>C(lE7jNFYnE+JR<ET-iHf`E;<;s<Ry7`9*hL~4ZKCr2)
ztJ}718)K}S8T|yu94EM{iuC&R>$hsvs>hEX|HSe8!?$nWzI^$T)|-YV0O?j-;SjgK
zGrgHJXI{H@EkW+%$B*aEo!hu^<Bc0P)O7v&^}oOWAxH@T7+_4KGy%6b|2?@aT)6PX
zix-{{Gv4;?+lLJs2BF=%cdMzhvvc_H;l>hyM>PRMj|qmDOOJqaLiBcS>({UM!|e0t
z&+YB)W5<p)9+M|e{_x?0vFz&VYG`Qi{CGrZt-t_VE9N-CmC_>wfxK<8@__>f6dQrj
zHEY%^AM((lLjtT>v&J`>j8Xu=9x!|MY(HFq5zYgOk~eJFAWjIpAvX3DZ``<X`Z4d`
zy_;UdK%%6{`~b#8<_I{%t&dXp@5Z1PX#(?xP*`|Q$UbxCw?wNRX%clzq&ES#d-m)R
zfS?7wZ%k8uwy^g;L5N4q4e#H-r;<toOhXd@qmD@s=4T*67cx(>u=tssp_2ZsAlKN~
zsBS)X>{yVllmG<AP<jc3@M97JJ-@#Bk;BWKc&|id^XARsx^(GM>4O3QfiVnX2;}FI
z$k+~=XDBIiR9i3|C+0wJeCpIG<H|ffV88(1l$HT#RlqO}Fb(sh)&OYqWX(khr><qG
zsl=eBrsmnRXNK(P=%@tqdSHfs`t&L0zRAl36#>Zjrb==}UoxQRzH{e}?WW$nd&g!3
z_G<OQ^y$;jpFeM!g9i_`wzm4#pxoTttkJb-(V|<oZUtd*V1qMg&>&hVP*~zCaR{1+
zm24=~TU8=JDa^H7+F#gT6`ennx|Koz%wD)?mcQm7Vgb5Nm9gz%hcEE)<Hswlq=s3$
zcI~7|laQZ0c~WWlmNyAaO-*CQjN$RYg9mMGZPKR&4jPs(Uv7Gc{ig$kqeqWgkFqJ8
zFkwPEnAd1ZJaguZ*T-eR79w*#fPnU<5R1G0E8a{e8Gu#)(W6HZaBXev$dMxrK!F=U
zCYl7s94CoZ{|EtSm`21rz{|13sAxE2GW5NB_q<tJ9z1xklrLYtl$<Geuy+zP6b*<4
zYdTrQ65~8jn+}$I*#re&5WIc+Hi!u-J=i-5f<*&j&<kQr8B5I9=J9ceFVD$yjl{Ml
z5B5%ihMtC}mj=fYvueX^yvMW`G@g^^8U%Z#2YV+TBiYmN^aPL)OH80Vf`9Khb;@I6
z7!S^@oAbMkB}P>yN11ayWu(9Z2M&~+DR?kj&p6)G@buDFvBWr<m4Wvtr5Cz2qP(FW
ze%^`4NcJ>5Jpm-d65~#U+XI7+A3t6;LBVtKT!Ub*^kDDAV<amvh(S;Kv=B>-n;z~&
z%x3D;scB=c@tizYj|s{i?41O`Q>IKYJ;dS{QL)5u!A*}jnlopPdMg<6&6_vUj~FpR
za;Bhq1*CV9HiQ5)OfO<-m}xSKV77P5mMsIy_IBUCeeoigx7ns(D%34owp0q4(6e(j
z4dxu>CtCd@Wt4W=5c5slmjB#sOLnS%=teW+9V73<hYx3G-@AxBl(G+VMvorN6qM&M
zXUUQ!d-v|O9M`Q|clPYr%zPIwUc7(*euHt)efsq2ph+QzIYi2N{Kk@?eZJ@hiAo7f
zCXp587mnW)A||lZ<UBCFfB(J_y?ps{%;S$XV1~!=hc5Ylfd{69%6Y_n<j4^t%Kb=u
zTY*miy1T(Jnb7y=Vvo29k@Hew_3G6cS}Rtp2y&GYfWR0^FQGRsB?y-18i`#km5$NX
zsj!G91OSG_B)A>+S7b$9BN?YW7k?KnTrj!}Gu=ujQsR*&jYCWl0DdcfIR>)8i$9Ca
zt*OQjLi(z9<;s-;w6wG&80&HC)~$kJB0a)yxT>}A@ym6l1Zr6${rvg!;1q(ACc^;s
z81AV2g&3G#x?H#1SWGpLh@JQxV%M%+Mw)+j?AYOd4U>27+$jKHQwBeWNMBE<z4fq$
zLGQ1mAxe2}AF$Nd*Xsu%=Xvwy`Pe+_A`ci~#$L62z+yz1C;i2={RsBS(aDo1^_y_Y
zse5q*9@TW>#0lQg>iXo!a$|jC?N(hP#tDH_8qVnX)0YAXfF5y$!=ArH_hTl%OwC0-
z`M>(C&nHg}UOgXTW^Y?O^_+4wd^%f5Vm^Or2+Ackb#@NJWWxsnz3{QK=TORJ50pJn
k_CVPKWe=1+P$fO^F8~~(3sjDF&Hw-a07*qoM6N<$g48<6O8@`>

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/payment_address.png b/Telegram/Resources/icons/menu/payment_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7cc0eb69f039d011f81cb271ee5ff4ab2385788
GIT binary patch
literal 584
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY?G&pV~B;|
z)hV|9jE*wx$9G=nnC`MVxHD?ugx_3x8e5%m6h-zi_V!&;pYTJ(WkrSvS72=6(qM&y
zw%diXbvDP8oA=&7{rUdZ&67nR-CyIOaw*3wee=!fI|U*R-M4kv8g(~s`{9QhB6Rl6
z<Ze`5QuQrrZCLi+IB_o4>8F>TOW<6|aOKawb16pchZU!K-Cf@bbn#_Id&}=JdeeK|
z4s!}Mon_km_x|dMDMlyte*CSQS!E-aW_PCbz$qC9o*!8erf*(U*lZJO3txS8H_*z}
zvwYMJOmp3{>e%zoxn|PZC!c?QTD0^2`_oJA=3ReXy3$hUfLLcmAg{k%uiI6Z<p&!|
z*LEC#eEhMY1do@~_Y8)F1Gl(8Dv5QsCQ3}YkZZ;;<8pNJzOdD2pBKMfdxnYO%uK<D
z1v7fjJT0>7<6`h(kNM=a^w3347N+Sh)^Mz3IM?`i{q48&{Fcx4dp=ER3Db_X@6<b8
zlD6ModO36JF`=N950hiHrrzj|&`}FyxmGqyKHgR6Zr=3kGF+_|794LjPc}RE`YRt>
zvwv}~oAMgofVWqdd+RPqvzUDrXlC5{?f2j3H`>psVP4w*c*4zjqSrvN=;`X`vd$@?
F2>^w2?e72p

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/payment_address@2x.png b/Telegram/Resources/icons/menu/payment_address@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..12daa492c6589410c131b693504ffe0f50c43044
GIT binary patch
literal 1195
zcmV;c1XTNpP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NG6-h)vR9Fe^m`x~jQ5eT(e3j&*
z*!YN)g_1Q%QHVlzN?EY55?edHl)_GWOARR-wo+0k8%1`CY$Vj1LdokR7QDaasWaoA
zJ9o~xb60P37Sp-U^Z)<ObI+Y~&fE!w(k(p$sm(yxpFJE7H#9W#_4PG2HkL&joIlZa
zbab@2xp{ni{Qdpy4{qnm$;lZXA7^OB^JoZ=A-1E3LUuFM+uOUixL8$HCBr;FKkx7F
zUtL`>JP~H9y1Kfpt*xM-Km^y<*JER2TU%SUWhK}1jHaijzrMa?R`&MxIy*aECx9R+
z1fs-(5qt76%oX4^Ha27c=A)yd!^DdWvAD1YS=0Rdyl}bi;^JbHYD9xrO%)JxqnC1U
za8Rn*-QCT~%JP!B<*;BB0w_0$O)Nh@|L*P%+}YV#VPT<-HKxUQetr%F6u?-*M{jm^
zR&K7TsmX_3S+ENSpbA=dST9dcPk`3f*R9Q(0SG97u4_}1y9K(tyXCgnj@|Mh7S71X
z2wU^tXrserqSXXMXkcAw$%88^D<E!fZ(YYIEiGkNlriEz36j$3KtQ2fUS8I-Mv=qA
zL;P!NYq}b`s)mXA6>W5+GE%Ph015$E9cUC`<HtWUGo!0{G%_}osIlpADRBh43lv$f
zddevB@$rG5!$?=lWbmn~5e=6rrMo}@1goc1Bt!M|&fD7?!MwaYJylm%M{s9nhXLZV
zToNQAg7_4DK?&B8QkPx@Jv=<1D=8^a>J&SI5^N%rS3#GTm)Pp->vc05H^Hv1F8z@a
zBqaieQBZ<)q>L`7rlxoVY-Jf4&bobkse#Bg3)X0OUBtao5KZ40nHbw;uQo=RLVdX8
z5p{GdEG+11+l>(j_m<MpK@qE~t57(lv$M1HnwTe^9qT;l(ScolH2~B(7LnH0RtlmG
z4Gme?G%0rB0MwF}fs>OHSp1-IEGTmfM)^Gi%G{Mu+27wUH#aaakWl2Az$gSzo<g%^
zW@hH;=_$mUo15I+Tr*Qlg#{yaAfRH2RC?|0?Q)Bglasa_EaC-X>-Ey}vIqD5{k^uf
z)=T#@hZqaS;NKN_C4G5$0nH*eoOxt&@?*sQv(zB2Mn^|w@+T%HOnAsdkI_VLtzq>Z
z92_vl=jW$>m^g3<kRit6d%tinT`nstD<2;p8HR=9@d`^yRu*C`E}#HIJv}}0m&5k<
zw*D)Cfe4bKXk>^396BLtZf=h8XmoUu`Xj(KtLp=Z@Vc)4LKq$%jwf;{wIcBGM?gHv
zu3uDCba8RP*nD%<dD+s^B41=u2<(Wdt7~d%<O|N$_dD8NUtcMaAgR>(ehAIY&G+~B
z@{Ht@J&<|w!wSk%QBkq9w8S&w?2JSr<>lo;k<*;?4E!%M@DC}iO=?%NbsYcz002ov
JPDHLkV1k{B7kK~x

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/menu/payment_address@3x.png b/Telegram/Resources/icons/menu/payment_address@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3172912c685a79d6efc975c7b8a6ed8a6dfdd656
GIT binary patch
literal 1834
zcmV+_2i5qAP)<h;3K|Lk000e1NJLTq002k;002k`0ssI2+K(g<00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>lu1NERA>e5noCGlTNKAN#hxaT
zL0u7p2*eN}d=Qirkq%4;PI{1*h$7X{iAfF(dO!msibNeYP?U><z=4JkL<6IU1|<&i
z7G*|+FVeg}+_&ZSob#QBXCE`}_l?%K_J95VYwhoR`>egsNl1u);xiDRf%pu>XJBOp
z5?4&4R$^jeQBhHOdHMeR`~Uj&LE)cYpLg%x4GauCd-iN;Y00Q^WMrkKr4JrF`0(Ka
z8GC+!0VX7}bW9K*J9g~p)2E)rI06VH+(Z`tahSOj^YZd;-n>~>R%Xv^W@ct$VnSVj
zjH;_LGc$ABwrzIs<HwJinwnm{dSxH_4W9Go&y&67cX<8!bz56oad9z!HhWGu83F*z
z5(pK9_K<b;Bqt}|xpT*o+2G({VPT>FJOC47A%PZh|0E`nTefVmBs4lYdh+DSwP_GY
zxLzLQNUV)*?NMAyj~+eJ^XTmC+`M`7+8GlP2!}-HM8fe(4x{1`d;R)#$>7J2A6Kqi
z@d)re3>Abzj*#!r(7=lqFN*NbpFhu>ITM<46#<0MiUe}2h9mm2YuB!?U%!fKOG`@>
zLePo?a)?HuvWoNW-Mb>$-QB%v%;*=$MF>%&+%~d<2M;bREGWHCpFX9frP(0H9FQZS
zv=Bww7`2_Kx3^bjv9Yny4lwIMLgbJ(OTNOkbLY<a`FW-E^5x5<q@<OxXe=ZUQi@2E
zfPbA${-KqXl_@DH3V-k3y~V{vKd~oHoS=Vy^XAR><qrm5ar%ix0wIM&ngskr1;+IC
z^{L52Z_l1Rp793`92goJl55FgFa*Gp1R>;9ED3nx0|V%8W@l%W!0_;}XZ+ElN2jKy
zEX7#90s!Vog`5f`0rO2(ety2B<$3Sor?6DThVt*_k7WZ2%=35C?`fprIT67Cr%#`j
z!m6vQ-GlWjkewI@1UjCtIE4+cK5Dm-6EJDm0iis!aKe84_;D9576w7G#mvaau!DE+
z-mTZ>zLp>-g#MdSzpG+uYO3V-{{4Hg?S?+74Gj&GlaqGL=g*((>+8j@hlo=QT~1F!
z0FH*=!npT4#@n4GB_+!F@#9C%q3i(VVF-Y-B_tMD{51YzyBmHB(<k2X>Jk~wGnD=O
z`EzkP8Um0IN0=`6<;xdGjNR$CFr86XvNIa@=yG}*?m~VGqaPKb?Cfl@?FI{mauyU6
z*hh7b03<{o6<e3n(-458;kPh)HtC@bA3p5JrJPTmJW&QsgJq%DqZpF*MM89d*dj*)
zq#=G|h8(txjg7gG8ei@?3|GrN3ApI4edzxE`*J^#$#$gEZ_r$3mftPV4H_X4B>_jd
zuui=LxOC}~3!TB13Lz=Xv*U3|$!&-&?cCg)k{KBpaf2o#m}-I%Qi@1NxM7!_3#Ul>
zV&zyQzngwd%ET*!A<y;~2|2EcWX~dbpFMk4^1F8Jn)qD|){-@EG+SF+MGk2fm9RtG
zw{QRU?VA$gma=v0*07AR;~|&B97K_hjWscH<Hik{#mkp3o1k>&fLw$Sbp{#q@_<W@
zbhx2Kbfg0<<f<^_5H(mrOe+1+L2YeqOk9WoXyxZZE(BAM(A?ZyIbdPGxMRnTAkp4f
z2xS|J5OUrzrVtMwK9m{d!K5i##RH*`BV?A`gN;syV?rg*;nBW*`#b`C4?`tw021!K
zn{U=2z^hlU%Dfu9drA)gITArKGKA%bZ+v`QYCCuCTzFzggb;G`r-(jNJay`n<iXxH
z<YhxRBtmG}6ZlNY7)*bP)!*MAhL>=uD$*x!zLHE&PnV^cv}$T<e1+LS1WHv9LTiJp
zyQ89_LULjq%gM<JngSuR#zF;QP==`RU0q#L8^;okuM@@62FyD~5)M@?<ZtlPdh0I_
z1xikz6i6cP;)6~P&xog|r)A>n>gxP30Fw~HqkYiqCm~17g$oxXOWF}$#B_v-6M#H(
zBam<z+HgikM~BqLqp+;3tXL^Bq(3VoFcxw{_}TVyA}_UZ66o0b<CIfMz=TA)88<UE
zYzlesBeikc-Lz@dc{5-2dokd3+DC@3@6e$``a*L1_HCW>)~#DoHZZ{Y=tj4zs;cDV
zj56rix$V+h_Vn~fRRDl(^h)gcH8(d)4UPr?d(@xd;eo%rdu6Guy}kX<s3BICymYR2
zOqBQb?b~QiKbKQUjFpgC|K7cOj~qF|`^&s?^y0+}{#|DI<81L6h|fTL2I4dDKb?Vp
Y0XzmU7gx}waR2}S07*qoM6N<$f(%_=!vFvP

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 4253a9792..2ac849314 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -646,13 +646,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_sensitive_about" = "Display sensitive media in public channels on all your Telegram devices.";
 "lng_settings_security_bots" = "Bots and websites";
 "lng_settings_clear_payment_info" = "Clear Payment and Shipping Info";
-"lng_settings_logged_in" = "Logged In with Telegram";
-"lng_settings_logged_in_about" = "Websites where you've used Telegram to log in.";
-"lng_settings_logged_in_title" = "Logged In with Telegram";
+"lng_settings_logged_in" = "Connected websites";
+"lng_settings_logged_in_title" = "Logged in with Telegram";
 "lng_settings_logged_in_description" = "You can log in on websites that support signing in with Telegram.";
-"lng_settings_disconnect_all" = "Disconnect All Websites";
+"lng_settings_disconnect_all" = "Disconnect all websites";
+"lng_settings_disconnect_title" = "Disconnect website";
+"lng_settings_disconnect_sure" = "Are you sure you want to disconnect {domain}?";
+"lng_settings_disconnect_block" = "Block {name}";
+"lng_settings_disconnect_all_title" = "Disconnect websites";
+"lng_settings_disconnect_all_sure" = "Are you sure you want to disconnect all websites where you logged in with Telegram?";
+"lng_settings_disconnect" = "Disconnect";
 "lng_settings_connected_title" = "Connected websites";
-"lng_settings_connected_about" = "Click to disconnect from your Telegram account.";
 
 "lng_settings_power_menu" = "Battery and Animations";
 "lng_settings_power_title" = "Power Usage";
@@ -962,6 +966,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sessions_terminate" = "Terminate Session";
 "lng_sessions_application" = "Application";
 "lng_sessions_system" = "System version";
+"lng_sessions_browser" = "Browser";
 "lng_sessions_ip" = "IP address";
 "lng_sessions_location" = "Location";
 "lng_sessions_location_about" = "This location is based only on the IP address and may not always be accurate.";
diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp
index 6d82a1d11..78e463c11 100644
--- a/Telegram/SourceFiles/api/api_authorizations.cpp
+++ b/Telegram/SourceFiles/api/api_authorizations.cpp
@@ -72,26 +72,9 @@ Authorizations::Entry ParseEntry(const MTPDauthorization &data) {
 		appName,
 		appVer.isEmpty() ? QString() : (' ' + appVer));
 	result.ip = qs(data.vip());
-	if (!result.hash) {
-		result.active = tr::lng_status_online(tr::now);
-	} else {
-		const auto now = QDateTime::currentDateTime();
-		const auto lastTime = base::unixtime::parse(result.activeTime);
-		const auto nowDate = now.date();
-		const auto lastDate = lastTime.date();
-		if (lastDate == nowDate) {
-			result.active = QLocale().toString(
-				lastTime.time(),
-				QLocale::ShortFormat);
-		} else if (lastDate.year() == nowDate.year()
-			&& lastDate.weekNumber() == nowDate.weekNumber()) {
-			result.active = langDayOfWeek(lastDate);
-		} else {
-			result.active = QLocale().toString(
-				lastDate,
-				QLocale::ShortFormat);
-		}
-	}
+	result.active = result.hash
+		? Authorizations::ActiveDateString(result.activeTime)
+		: tr::lng_status_online(tr::now);
 	result.location = country;
 
 	return result;
@@ -129,16 +112,15 @@ void Authorizations::reload() {
 	)).done([=](const MTPaccount_Authorizations &result) {
 		_requestId = 0;
 		_lastReceived = crl::now();
-		result.match([&](const MTPDaccount_authorizations &auths) {
-			_ttlDays = auths.vauthorization_ttl_days().v;
-			_list = (
-				auths.vauthorizations().v
-			) | ranges::views::transform([](const MTPAuthorization &d) {
-				return ParseEntry(d.c_authorization());
-			}) | ranges::to<List>;
-			refreshCallsDisabledHereFromCloud();
-			_listChanges.fire({});
-		});
+		const auto &data = result.data();
+		_ttlDays = data.vauthorization_ttl_days().v;
+		_list = ranges::views::all(
+			data.vauthorizations().v
+		) | ranges::views::transform([](const MTPAuthorization &auth) {
+			return ParseEntry(auth.data());
+		}) | ranges::to<List>;
+		refreshCallsDisabledHereFromCloud();
+		_listChanges.fire({});
 	}).fail([=] {
 		_requestId = 0;
 	}).send();
@@ -190,19 +172,21 @@ Authorizations::List Authorizations::list() const {
 	return _list;
 }
 
-auto Authorizations::listChanges() const
+auto Authorizations::listValue() const
 -> rpl::producer<Authorizations::List> {
 	return rpl::single(
 		list()
 	) | rpl::then(
-		_listChanges.events() | rpl::map([=] { return list(); }));
+		_listChanges.events() | rpl::map([=] { return list(); })
+	);
 }
 
-rpl::producer<int> Authorizations::totalChanges() const {
+rpl::producer<int> Authorizations::totalValue() const {
 	return rpl::single(
 		total()
 	) | rpl::then(
-		_listChanges.events() | rpl::map([=] { return total(); }));
+		_listChanges.events() | rpl::map([=] { return total(); })
+	);
 }
 
 void Authorizations::updateTTL(int days) {
@@ -254,6 +238,19 @@ rpl::producer<bool> Authorizations::callsDisabledHereChanges() const {
 	return _callsDisabledHere.changes();
 }
 
+QString Authorizations::ActiveDateString(TimeId active) {
+	const auto now = QDateTime::currentDateTime();
+	const auto lastTime = base::unixtime::parse(active);
+	const auto nowDate = now.date();
+	const auto lastDate = lastTime.date();
+	return (lastDate == nowDate)
+		? QLocale().toString(lastTime.time(), QLocale::ShortFormat)
+		: (lastDate.year() == nowDate.year()
+			&& lastDate.weekNumber() == nowDate.weekNumber())
+		? langDayOfWeek(lastDate)
+		: QLocale().toString(lastDate, QLocale::ShortFormat);
+}
+
 int Authorizations::total() const {
 	return ranges::count_if(
 		_list,
diff --git a/Telegram/SourceFiles/api/api_authorizations.h b/Telegram/SourceFiles/api/api_authorizations.h
index 96819edf1..5e2a41c9f 100644
--- a/Telegram/SourceFiles/api/api_authorizations.h
+++ b/Telegram/SourceFiles/api/api_authorizations.h
@@ -38,9 +38,9 @@ public:
 	[[nodiscard]] crl::time lastReceivedTime();
 
 	[[nodiscard]] List list() const;
-	[[nodiscard]] rpl::producer<List> listChanges() const;
+	[[nodiscard]] rpl::producer<List> listValue() const;
 	[[nodiscard]] int total() const;
-	[[nodiscard]] rpl::producer<int> totalChanges() const;
+	[[nodiscard]] rpl::producer<int> totalValue() const;
 
 	void updateTTL(int days);
 	[[nodiscard]] rpl::producer<int> ttlDays() const;
@@ -53,6 +53,8 @@ public:
 	[[nodiscard]] rpl::producer<bool> callsDisabledHereValue() const;
 	[[nodiscard]] rpl::producer<bool> callsDisabledHereChanges() const;
 
+	[[nodiscard]] static QString ActiveDateString(TimeId active);
+
 private:
 	void refreshCallsDisabledHereFromCloud();
 
diff --git a/Telegram/SourceFiles/api/api_websites.cpp b/Telegram/SourceFiles/api/api_websites.cpp
new file mode 100644
index 000000000..855056675
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_websites.cpp
@@ -0,0 +1,138 @@
+/*
+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_websites.h"
+
+#include "api/api_authorizations.h"
+#include "api/api_blocked_peers.h"
+#include "apiwrap.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "main/main_session.h"
+
+namespace Api {
+namespace {
+
+constexpr auto TestApiId = 17349;
+constexpr auto SnapApiId = 611335;
+constexpr auto DesktopApiId = 2040;
+
+Websites::Entry ParseEntry(
+		not_null<Data::Session*> owner,
+		const MTPDwebAuthorization &data) {
+	auto result = Websites::Entry{
+		.hash = data.vhash().v,
+		.bot = owner->user(data.vbot_id()),
+		.platform = qs(data.vplatform()),
+		.domain = qs(data.vdomain()),
+		.browser = qs(data.vbrowser()),
+		.ip = qs(data.vip()),
+		.location = qs(data.vregion()),
+	};
+	result.activeTime = data.vdate_active().v
+		? data.vdate_active().v
+		: data.vdate_created().v;
+	result.active = Authorizations::ActiveDateString(result.activeTime);
+	return result;
+}
+
+} // namespace
+
+Websites::Websites(not_null<ApiWrap*> api)
+: _session(&api->session())
+, _api(&api->instance()) {
+}
+
+void Websites::reload() {
+	if (_requestId) {
+		return;
+	}
+
+	_requestId = _api.request(MTPaccount_GetWebAuthorizations(
+	)).done([=](const MTPaccount_WebAuthorizations &result) {
+		_requestId = 0;
+		_lastReceived = crl::now();
+		const auto owner = &_session->data();
+		const auto &data = result.data();
+		owner->processUsers(data.vusers());
+		_list = ranges::views::all(
+			data.vauthorizations().v
+		) | ranges::views::transform([&](const MTPwebAuthorization &auth) {
+			return ParseEntry(owner, auth.data());
+		}) | ranges::to<List>;
+		_listChanges.fire({});
+	}).fail([=] {
+		_requestId = 0;
+	}).send();
+}
+
+void Websites::cancelCurrentRequest() {
+	_api.request(base::take(_requestId)).cancel();
+}
+
+void Websites::requestTerminate(
+		Fn<void(const MTPBool &result)> &&done,
+		Fn<void(const MTP::Error &error)> &&fail,
+		std::optional<uint64> hash,
+		UserData *botToBlock) {
+	const auto send = [&](auto request) {
+		_api.request(
+			std::move(request)
+		).done([=, done = std::move(done)](const MTPBool &result) {
+			done(result);
+			if (hash) {
+				_list.erase(
+					ranges::remove(_list, *hash, &Entry::hash),
+					end(_list));
+			} else {
+				_list.clear();
+			}
+			_listChanges.fire({});
+		}).fail(
+			std::move(fail)
+		).send();
+	};
+	if (hash) {
+		send(MTPaccount_ResetWebAuthorization(MTP_long(*hash)));
+		if (botToBlock) {
+			botToBlock->session().api().blockedPeers().block(botToBlock);
+		}
+	} else {
+		send(MTPaccount_ResetWebAuthorizations());
+	}
+}
+
+Websites::List Websites::list() const {
+	return _list;
+}
+
+auto Websites::listValue() const
+-> rpl::producer<Websites::List> {
+	return rpl::single(
+		list()
+	) | rpl::then(
+		_listChanges.events() | rpl::map([=] { return list(); })
+	);
+}
+
+rpl::producer<int> Websites::totalValue() const {
+	return rpl::single(
+		total()
+	) | rpl::then(
+		_listChanges.events() | rpl::map([=] { return total(); })
+	);
+}
+
+int Websites::total() const {
+	return _list.size();
+}
+
+crl::time Websites::lastReceivedTime() {
+	return _lastReceived;
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_websites.h b/Telegram/SourceFiles/api/api_websites.h
new file mode 100644
index 000000000..1551ae4d4
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_websites.h
@@ -0,0 +1,62 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+class ApiWrap;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+class Websites final {
+public:
+	explicit Websites(not_null<ApiWrap*> api);
+
+	struct Entry {
+		uint64 hash = 0;
+
+		not_null<UserData*> bot;
+		TimeId activeTime = 0;
+		QString active, platform, domain, browser, ip, location;
+	};
+	using List = std::vector<Entry>;
+
+	void reload();
+	void cancelCurrentRequest();
+	void requestTerminate(
+		Fn<void(const MTPBool &result)> &&done,
+		Fn<void(const MTP::Error &error)> &&fail,
+		std::optional<uint64> hash = std::nullopt,
+		UserData *botToBlock = nullptr);
+
+	[[nodiscard]] crl::time lastReceivedTime();
+
+	[[nodiscard]] List list() const;
+	[[nodiscard]] rpl::producer<List> listValue() const;
+	[[nodiscard]] int total() const;
+	[[nodiscard]] rpl::producer<int> totalValue() const;
+
+private:
+	not_null<Main::Session*> _session;
+
+	MTP::Sender _api;
+	mtpRequestId _requestId = 0;
+
+	List _list;
+	rpl::event_stream<> _listChanges;
+
+	crl::time _lastReceived = 0;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 5ee484778..e71e03953 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_transcribes.h"
 #include "api/api_premium.h"
 #include "api/api_user_names.h"
+#include "api/api_websites.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_drafts.h"
@@ -176,7 +177,8 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 , _ringtones(std::make_unique<Api::Ringtones>(this))
 , _transcribes(std::make_unique<Api::Transcribes>(this))
 , _premium(std::make_unique<Api::Premium>(this))
-, _usernames(std::make_unique<Api::Usernames>(this)) {
+, _usernames(std::make_unique<Api::Usernames>(this))
+, _websites(std::make_unique<Api::Websites>(this)) {
 	crl::on_main(session, [=] {
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
@@ -4290,3 +4292,7 @@ Api::Premium &ApiWrap::premium() {
 Api::Usernames &ApiWrap::usernames() {
 	return *_usernames;
 }
+
+Api::Websites &ApiWrap::websites() {
+	return *_websites;
+}
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 5815fd3c0..954500f76 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -80,6 +80,7 @@ class Ringtones;
 class Transcribes;
 class Premium;
 class Usernames;
+class Websites;
 
 namespace details {
 
@@ -383,6 +384,7 @@ public:
 	[[nodiscard]] Api::Transcribes &transcribes();
 	[[nodiscard]] Api::Premium &premium();
 	[[nodiscard]] Api::Usernames &usernames();
+	[[nodiscard]] Api::Websites &websites();
 
 	void updatePrivacyLastSeens();
 
@@ -693,6 +695,7 @@ private:
 	const std::unique_ptr<Api::Transcribes> _transcribes;
 	const std::unique_ptr<Api::Premium> _premium;
 	const std::unique_ptr<Api::Usernames> _usernames;
+	const std::unique_ptr<Api::Websites> _websites;
 
 	mtpRequestId _wallPaperRequestId = 0;
 	QString _wallPaperSlug;
diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
index 55b5f499c..5a45ca0de 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@@ -35,10 +35,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
+#include "styles/style_menu_icons.h"
 
 namespace {
 
-constexpr auto kSessionsShortPollTimeout = 60 * crl::time(1000);
+constexpr auto kShortPollTimeout = 60 * crl::time(1000);
 constexpr auto kMaxDeviceModelLength = 32;
 
 using EntryData = Api::Authorizations::Entry;
@@ -80,6 +81,14 @@ public:
 	PaintRoundImageCallback generatePaintUserpicCallback(
 		bool forceRound) override;
 
+	QSize rightActionSize() const override {
+		return elementGeometry(2, 0).size();
+	}
+	QMargins rightActionMargins() const override {
+		const auto rect = elementGeometry(2, 0);
+		return QMargins(0, rect.y(), -(rect.x() + rect.width()), 0);
+	}
+
 	int elementsCount() const override;
 	QRect elementGeometry(int element, int outerWidth) const override;
 	bool elementDisabled(int element) const override;
@@ -458,28 +467,27 @@ void SessionInfoBox(
 	AddSkip(container, st::sessionSubtitleSkip);
 	AddSubsectionTitle(container, tr::lng_sessions_info());
 
-	const auto add = [&](rpl::producer<QString> label, QString value) {
-		if (value.isEmpty()) {
-			return;
-		}
-		container->add(
-			object_ptr<Ui::FlatLabel>(
-				container,
-				rpl::single(value),
-				st::boxLabel),
-			st::boxRowPadding + st::sessionValuePadding);
-		container->add(
-			object_ptr<Ui::FlatLabel>(
-				container,
-				std::move(label),
-				st::sessionValueLabel),
-			(st::boxRowPadding
-				+ style::margins{ 0, 0, 0, st::sessionValueSkip }));
-	};
-	add(tr::lng_sessions_application(), data.info);
-	add(tr::lng_sessions_system(), data.system);
-	add(tr::lng_sessions_ip(), data.ip);
-	add(tr::lng_sessions_location(), data.location);
+	AddSessionInfoRow(
+		container,
+		tr::lng_sessions_application(),
+		data.info,
+		st::menuIconDevices);
+	AddSessionInfoRow(
+		container,
+		tr::lng_sessions_system(),
+		data.system,
+		st::menuIconInfo);
+	AddSessionInfoRow(
+		container,
+		tr::lng_sessions_ip(),
+		data.ip,
+		st::menuIconIpAddress);
+	AddSessionInfoRow(
+		container,
+		tr::lng_sessions_location(),
+		data.location,
+		st::menuIconAddress);
+
 	AddSkip(container, st::sessionValueSkip);
 	if (!data.location.isEmpty()) {
 		AddDividerText(container, tr::lng_sessions_location_about());
@@ -615,8 +623,6 @@ void Row::elementsPaint(
 		outerWidth);
 }
 
-} // namespace
-
 class SessionsContent : public Ui::RpWidget {
 public:
 	SessionsContent(
@@ -760,7 +766,7 @@ void SessionsContent::setupContent() {
 		_inner->setVisible(!value);
 	}, lifetime());
 
-	_authorizations->listChanges(
+	_authorizations->listValue(
 	) | rpl::start_with_next([=](const Api::Authorizations::List &list) {
 		parse(list);
 	}, lifetime());
@@ -791,7 +797,7 @@ void SessionsContent::parse(const Api::Authorizations::List &list) {
 
 	_inner->showData(_data);
 
-	_shortPollTimer.callOnce(kSessionsShortPollTimeout);
+	_shortPollTimer.callOnce(kShortPollTimeout);
 }
 
 void SessionsContent::resizeEvent(QResizeEvent *e) {
@@ -816,7 +822,7 @@ void SessionsContent::paintEvent(QPaintEvent *e) {
 }
 
 void SessionsContent::shortPollSessions() {
-	const auto left = kSessionsShortPollTimeout
+	const auto left = kShortPollTimeout
 		- (crl::now() - _authorizations->lastReceivedTime());
 	if (left > 0) {
 		parse(_authorizations->list());
@@ -1148,27 +1154,7 @@ auto SessionsContent::ListController::Add(
 	return controller;
 }
 
-SessionsBox::SessionsBox(
-	QWidget*,
-	not_null<Window::SessionController*> controller)
-: _controller(controller) {
-}
-
-void SessionsBox::prepare() {
-	setTitle(tr::lng_sessions_other_header());
-
-	addButton(tr::lng_close(), [=] { closeBox(); });
-
-	const auto w = st::boxWideWidth;
-
-	const auto content = setInnerWidget(
-		object_ptr<SessionsContent>(this, _controller),
-		st::sessionsScroll);
-	content->resize(w, st::noContactsHeight);
-	content->setupContent();
-
-	setDimensions(w, st::sessionsHeight);
-}
+} // namespace
 
 namespace Settings {
 
@@ -1193,4 +1179,41 @@ void Sessions::setupContent(not_null<Window::SessionController*> controller) {
 	Ui::ResizeFitChild(this, container);
 }
 
+void AddSessionInfoRow(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<QString> label,
+		const QString &value,
+		const style::icon &icon) {
+	if (value.isEmpty()) {
+		return;
+	}
+
+	const auto text = container->add(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			rpl::single(value),
+			st::boxLabel),
+		st::boxRowPadding + st::sessionValuePadding);
+	const auto left = st::sessionValuePadding.left();
+	container->add(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			std::move(label),
+			st::sessionValueLabel),
+		(st::boxRowPadding
+			+ style::margins{ left, 0, 0, st::sessionValueSkip }));
+
+	const auto widget = Ui::CreateChild<Ui::RpWidget>(container.get());
+	widget->resize(icon.size());
+
+	text->topValue() | rpl::start_with_next([=](int top) {
+		widget->move(st::sessionValueIconPosition + QPoint(0, top));
+	}, widget->lifetime());
+
+	widget->paintRequest() | rpl::start_with_next([=, &icon] {
+		auto p = QPainter(widget);
+		icon.paintInCenter(p, widget->rect());
+	}, widget->lifetime());
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/boxes/sessions_box.h b/Telegram/SourceFiles/boxes/sessions_box.h
index d735189a5..47d03de27 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.h
+++ b/Telegram/SourceFiles/boxes/sessions_box.h
@@ -7,12 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "boxes/abstract_box.h"
 #include "settings/settings_common.h"
 
-namespace Main {
-class Session;
-} // namespace Main
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
 
 namespace Settings {
 
@@ -29,16 +28,10 @@ private:
 
 };
 
+void AddSessionInfoRow(
+	not_null<Ui::VerticalLayout*> container,
+	rpl::producer<QString> label,
+	const QString &value,
+	const style::icon &icon);
+
 } // namespace Settings
-
-class SessionsBox : public Ui::BoxContent {
-public:
-	SessionsBox(QWidget*, not_null<Window::SessionController*> controller);
-
-protected:
-	void prepare() override;
-
-private:
-	const not_null<Window::SessionController*> _controller;
-
-};
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 4b95c2a5d..4f53c9a33 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -316,21 +316,15 @@ sessionLocationTop: 54px;
 sessionCurrentSkip: 8px;
 sessionSubtitleSkip: 14px;
 sessionInfoFg: windowSubTextFg;
-sessionTerminateTop: 9px;
-sessionTerminateSkip: 12px;
+sessionTerminateTop: 8px;
+sessionTerminateSkip: 11px;
 sessionTerminate: IconButton {
-	width: 20px;
-	height: 20px;
+	width: 34px;
+	height: 34px;
 
 	icon: smallCloseIcon;
 	iconOver: smallCloseIconOver;
-	iconPosition: point(5px, 5px);
-
-	rippleAreaPosition: point(0px, 0px);
-	rippleAreaSize: 20px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	iconPosition: point(12px, 12px);
 }
 sessionIconWindows: icon{{ "settings/devices/device_desktop_win", historyPeerUserpicFg }};
 sessionIconMac: icon{{ "settings/devices/device_desktop_mac", historyPeerUserpicFg }};
@@ -365,11 +359,12 @@ sessionDateLabel: FlatLabel(defaultFlatLabel) {
 	align: align(top);
 }
 sessionDateSkip: 19px;
-sessionValuePadding: margins(0px, 5px, 0px, 2px);
+sessionValuePadding: margins(37px, 5px, 0px, 0px);
 sessionValueLabel: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 }
 sessionValueSkip: 8px;
+sessionValueIconPosition: point(20px, 9px);
 
 sessionListItem: PeerListItem(defaultPeerListItem) {
 	button: OutlineButton(defaultPeerListButton) {
@@ -391,6 +386,21 @@ sessionList: PeerList(defaultPeerList) {
 	item: sessionListItem;
 	padding: margins(0px, 4px, 0px, 0px);
 }
+websiteListItem: PeerListItem(sessionListItem) {
+	height: 72px;
+	photoPosition: point(18px, 10px);
+	namePosition: point(64px, 6px);
+	statusPosition: point(64px, 26px);
+	photoSize: 32px;
+}
+websiteList: PeerList(sessionList) {
+	item: websiteListItem;
+}
+websiteLocationTop: 46px;
+websiteBigUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(70px, 70px);
+	photoSize: 70px;
+}
 
 settingsPhotoLeft: 22px;
 settingsPhotoTop: 8px;
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index e20d500db..25a17d3f9 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_self_destruct.h"
 #include "api/api_sensitive_content.h"
 #include "api/api_global_privacy.h"
+#include "api/api_websites.h"
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
 #include "settings/cloud_password/settings_cloud_password_input.h"
 #include "settings/cloud_password/settings_cloud_password_start.h"
@@ -22,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_local_passcode.h"
 #include "settings/settings_premium.h" // Settings::ShowPremium.
 #include "settings/settings_privacy_controllers.h"
+#include "settings/settings_websites.h"
 #include "base/timer_rpl.h"
 #include "boxes/edit_privacy_box.h"
 #include "boxes/passcode_box.h"
@@ -592,6 +594,44 @@ void SetupBlockedList(
 	}, blockedPeers->lifetime());
 }
 
+void SetupWebsitesList(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<> updateTrigger,
+		Fn<void(Type)> showOther) {
+	std::move(
+		updateTrigger
+	) | rpl::start_with_next([=] {
+		controller->session().api().websites().reload();
+	}, container->lifetime());
+
+	auto count = controller->session().api().websites().totalValue();
+	auto countText = rpl::duplicate(
+		count
+	) | rpl::filter(rpl::mappers::_1 > 0) | rpl::map([](int count) {
+		return QString::number(count);
+	});
+
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = wrap->entity();
+
+	AddButtonWithLabel(
+		inner,
+		tr::lng_settings_logged_in(),
+		std::move(countText),
+		st::settingsButton,
+		{ &st::menuIconIpAddress }
+	)->addClickHandler([=] {
+		showOther(Websites::Id());
+	});
+
+	wrap->toggleOn(std::move(count) | rpl::map(rpl::mappers::_1 > 0));
+	wrap->finishAnimating();
+}
+
 void SetupSessionsList(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
@@ -603,7 +643,7 @@ void SetupSessionsList(
 		controller->session().api().authorizations().reload();
 	}, container->lifetime());
 
-	auto count = controller->session().api().authorizations().totalChanges(
+	auto count = controller->session().api().authorizations().totalValue(
 	) | rpl::map([](int count) {
 		return count ? QString::number(count) : QString();
 	});
@@ -664,12 +704,17 @@ void SetupSecurity(
 		container,
 		rpl::duplicate(updateTrigger),
 		showOther);
+	SetupLocalPasscode(controller, container, showOther);
 	SetupBlockedList(
 		controller,
 		container,
 		rpl::duplicate(updateTrigger),
 		showOther);
-	SetupLocalPasscode(controller, container, showOther);
+	SetupWebsitesList(
+		controller,
+		container,
+		rpl::duplicate(updateTrigger),
+		showOther);
 	SetupSessionsList(
 		controller,
 		container,
diff --git a/Telegram/SourceFiles/settings/settings_websites.cpp b/Telegram/SourceFiles/settings/settings_websites.cpp
new file mode 100644
index 000000000..495ffd6ff
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_websites.cpp
@@ -0,0 +1,783 @@
+/*
+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_websites.h"
+
+#include "api/api_websites.h"
+#include "apiwrap.h"
+#include "boxes/peer_list_box.h"
+#include "boxes/sessions_box.h"
+#include "data/data_user.h"
+#include "ui/boxes/confirm_box.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "window/window_session_controller.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+#include "styles/style_menu_icons.h"
+
+namespace {
+
+constexpr auto kShortPollTimeout = 60 * crl::time(1000);
+constexpr auto kMaxDeviceModelLength = 32;
+
+using EntryData = Api::Websites::Entry;
+
+class Row;
+
+class RowDelegate {
+public:
+	virtual void rowUpdateRow(not_null<Row*> row) = 0;
+};
+
+class Row final : public PeerListRow {
+public:
+	Row(not_null<RowDelegate*> delegate, const EntryData &data);
+
+	void update(const EntryData &data);
+	void updateName(const QString &name);
+
+	[[nodiscard]] EntryData data() const;
+
+	QString generateName() override;
+	QString generateShortName() override;
+	PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+
+	QSize rightActionSize() const override {
+		return elementGeometry(2, 0).size();
+	}
+	QMargins rightActionMargins() const override {
+		const auto rect = elementGeometry(2, 0);
+		return QMargins(0, rect.y(), -(rect.x() + rect.width()), 0);
+	}
+
+	int elementsCount() const override;
+	QRect elementGeometry(int element, int outerWidth) const override;
+	bool elementDisabled(int element) const override;
+	bool elementOnlySelect(int element) const override;
+	void elementAddRipple(
+		int element,
+		QPoint point,
+		Fn<void()> updateCallback) override;
+	void elementsStopLastRipple() override;
+	void elementsPaint(
+		Painter &p,
+		int outerWidth,
+		bool selected,
+		int selectedElement) override;
+
+private:
+	const not_null<RowDelegate*> _delegate;
+	QImage _emptyUserpic;
+	Ui::PeerUserpicView _userpic;
+	Ui::Text::String _location;
+	EntryData _data;
+
+};
+
+[[nodiscard]] QString JoinNonEmpty(QStringList list) {
+	list.erase(ranges::remove(list, QString()), list.end());
+	return list.join(", ");
+}
+
+[[nodiscard]] QString LocationAndDate(const EntryData &entry) {
+	return (entry.location.isEmpty() ? entry.ip : entry.location)
+		+ (entry.hash
+			? (QString::fromUtf8(" \xE2\x80\xA2 ") + entry.active)
+			: QString());
+}
+
+void InfoBox(
+		not_null<Ui::GenericBox*> box,
+		const EntryData &data,
+		Fn<void(uint64)> terminate) {
+	box->setWidth(st::boxWideWidth);
+
+	const auto shown = box->lifetime().make_state<rpl::event_stream<>>();
+	box->setShowFinishedCallback([=] {
+		shown->fire({});
+	});
+
+	const auto userpic = box->addRow(
+		object_ptr<Ui::CenterWrap<Ui::UserpicButton>>(
+			box,
+			object_ptr<Ui::UserpicButton>(
+				box,
+				data.bot,
+				st::websiteBigUserpic)),
+		st::sessionBigCoverPadding)->entity();
+	userpic->forceForumShape(true);
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto nameWrap = box->addRow(
+		object_ptr<Ui::FixedHeightWidget>(
+			box,
+			st::sessionBigName.maxHeight));
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(
+		nameWrap,
+		rpl::single(data.bot->name()),
+		st::sessionBigName);
+	nameWrap->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		name->resizeToWidth(width);
+		name->move((width - name->width()) / 2, 0);
+	}, name->lifetime());
+
+	const auto domainWrap = box->addRow(
+		object_ptr<Ui::FixedHeightWidget>(
+			box,
+			st::sessionDateLabel.style.font->height),
+		style::margins(0, 0, 0, st::sessionDateSkip));
+	const auto domain = Ui::CreateChild<Ui::FlatLabel>(
+		domainWrap,
+		rpl::single(data.domain),
+		st::sessionDateLabel);
+	rpl::combine(
+		domainWrap->widthValue(),
+		domain->widthValue()
+	) | rpl::start_with_next([=](int outer, int inner) {
+		domain->move((outer - inner) / 2, 0);
+	}, domain->lifetime());
+
+	using namespace Settings;
+	const auto container = box->verticalLayout();
+	AddDivider(container);
+	AddSkip(container, st::sessionSubtitleSkip);
+	AddSubsectionTitle(container, tr::lng_sessions_info());
+
+	AddSessionInfoRow(
+		container,
+		tr::lng_sessions_browser(),
+		JoinNonEmpty({ data.browser, data.platform }),
+		st::menuIconDevices);
+	AddSessionInfoRow(
+		container,
+		tr::lng_sessions_ip(),
+		data.ip,
+		st::menuIconIpAddress);
+	AddSessionInfoRow(
+		container,
+		tr::lng_sessions_location(),
+		data.location,
+		st::menuIconAddress);
+
+	AddSkip(container, st::sessionValueSkip);
+	if (!data.location.isEmpty()) {
+		AddDividerText(container, tr::lng_sessions_location_about());
+	}
+
+	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
+	if (const auto hash = data.hash) {
+		box->addLeftButton(tr::lng_settings_disconnect(), [=] {
+			const auto weak = Ui::MakeWeak(box.get());
+			terminate(hash);
+			if (weak) {
+				box->closeBox();
+			}
+		}, st::attentionBoxButton);
+	}
+}
+
+Row::Row(not_null<RowDelegate*> delegate, const EntryData &data)
+: PeerListRow(data.hash)
+, _delegate(delegate)
+, _location(st::defaultTextStyle, LocationAndDate(data))
+, _data(data) {
+	setCustomStatus(_data.ip);
+}
+
+void Row::update(const EntryData &data) {
+	_data = data;
+	setCustomStatus(
+		JoinNonEmpty({ _data.domain, _data.browser, _data.platform }));
+	refreshName(st::websiteListItem);
+	_location.setText(st::defaultTextStyle, LocationAndDate(_data));
+	_delegate->rowUpdateRow(this);
+}
+
+EntryData Row::data() const {
+	return _data;
+}
+
+QString Row::generateName() {
+	return _data.bot->name();
+}
+
+QString Row::generateShortName() {
+	return _data.bot->shortName();
+}
+
+PaintRoundImageCallback Row::generatePaintUserpicCallback(bool forceRound) {
+	const auto peer = _data.bot;
+	auto userpic = _userpic = peer->createUserpicView();
+	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
+		const auto ratio = style::DevicePixelRatio();
+		if (const auto cloud = peer->userpicCloudImage(userpic)) {
+			Ui::ValidateUserpicCache(
+				userpic,
+				cloud,
+				nullptr,
+				size * ratio,
+				true);
+			p.drawImage(QRect(x, y, size, size), userpic.cached);
+		} else {
+			if (_emptyUserpic.isNull()) {
+				_emptyUserpic = peer->generateUserpicImage(
+					_userpic,
+					size * ratio,
+					size * ratio * Ui::ForumUserpicRadiusMultiplier());
+			}
+			p.drawImage(QRect(x, y, size, size), _emptyUserpic);
+		}
+	};
+}
+
+int Row::elementsCount() const {
+	return 2;
+}
+
+QRect Row::elementGeometry(int element, int outerWidth) const {
+	switch (element) {
+	case 1: {
+		return QRect(
+			st::websiteListItem.namePosition.x(),
+			st::websiteLocationTop,
+			outerWidth,
+			st::normalFont->height);
+	} break;
+	case 2: {
+		const auto size = QSize(
+			st::sessionTerminate.width,
+			st::sessionTerminate.height);
+		const auto right = st::sessionTerminateSkip;
+		const auto top = st::sessionTerminateTop;
+		const auto left = outerWidth - right - size.width();
+		return QRect(QPoint(left, top), size);
+	} break;
+	}
+	return QRect();
+}
+
+bool Row::elementDisabled(int element) const {
+	return !id() || (element == 1);
+}
+
+bool Row::elementOnlySelect(int element) const {
+	return false;
+}
+
+void Row::elementAddRipple(
+		int element,
+		QPoint point,
+		Fn<void()> updateCallback) {
+}
+
+void Row::elementsStopLastRipple() {
+}
+
+void Row::elementsPaint(
+		Painter &p,
+		int outerWidth,
+		bool selected,
+		int selectedElement) {
+	const auto geometry = elementGeometry(2, outerWidth);
+	const auto position = geometry.topLeft()
+		+ st::sessionTerminate.iconPosition;
+	const auto &icon = (selectedElement == 2)
+		? st::sessionTerminate.iconOver
+		: st::sessionTerminate.icon;
+	icon.paint(p, position.x(), position.y(), outerWidth);
+
+	p.setFont(st::normalFont);
+	p.setPen(st::sessionInfoFg);
+	const auto locationLeft = st::websiteListItem.namePosition.x();
+	const auto available = outerWidth - locationLeft;
+	_location.drawLeftElided(
+		p,
+		locationLeft,
+		st::websiteLocationTop,
+		available,
+		outerWidth);
+}
+
+class Content : public Ui::RpWidget {
+public:
+	Content(
+		QWidget*,
+		not_null<Window::SessionController*> controller);
+
+	void setupContent();
+
+protected:
+	void resizeEvent(QResizeEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	class Inner;
+	class ListController;
+
+	void shortPoll();
+	void parse(const Api::Websites::List &list);
+
+	void terminate(
+		Fn<void(bool block)> sendRequest,
+		rpl::producer<QString> title,
+		rpl::producer<QString> text,
+		QString blockText = QString());
+	void terminateOne(uint64 hash);
+	void terminateAll();
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<Api::Websites*> _websites;
+
+	rpl::variable<bool> _loading = false;
+	Api::Websites::List _data;
+
+	object_ptr<Inner> _inner;
+	QPointer<Ui::BoxContent> _terminateBox;
+
+	base::Timer _shortPollTimer;
+
+};
+
+class Content::ListController final
+	: public PeerListController
+	, public RowDelegate
+	, public base::has_weak_ptr {
+public:
+	explicit ListController(not_null<Main::Session*> session);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowElementClicked(not_null<PeerListRow*> row, int element) override;
+
+	void rowUpdateRow(not_null<Row*> row) override;
+
+	void showData(gsl::span<const EntryData> items);
+	rpl::producer<int> itemsCount() const;
+	rpl::producer<uint64> terminateRequests() const;
+	[[nodiscard]] rpl::producer<EntryData> showRequests() const;
+
+	[[nodiscard]] static std::unique_ptr<ListController> Add(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Main::Session*> session,
+		style::margins margins = {});
+
+private:
+	const not_null<Main::Session*> _session;
+
+	rpl::event_stream<uint64> _terminateRequests;
+	rpl::event_stream<int> _itemsCount;
+	rpl::event_stream<EntryData> _showRequests;
+
+};
+
+class Content::Inner : public Ui::RpWidget {
+public:
+	Inner(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	void showData(const Api::Websites::List &data);
+	[[nodiscard]] rpl::producer<EntryData> showRequests() const;
+	[[nodiscard]] rpl::producer<uint64> terminateOne() const;
+	[[nodiscard]] rpl::producer<> terminateAll() const;
+
+private:
+	void setupContent();
+
+	const not_null<Window::SessionController*> _controller;
+	QPointer<Ui::SettingsButton> _terminateAll;
+	std::unique_ptr<ListController> _list;
+
+};
+
+Content::Content(
+	QWidget*,
+	not_null<Window::SessionController*> controller)
+: _controller(controller)
+, _websites(&controller->session().api().websites())
+, _inner(this, controller)
+, _shortPollTimer([=] { shortPoll(); }) {
+}
+
+void Content::setupContent() {
+	_inner->heightValue(
+	) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](int height) {
+		resize(width(), height);
+	}, _inner->lifetime());
+
+	_inner->showRequests(
+	) | rpl::start_with_next([=](const EntryData &data) {
+		_controller->show(Box(
+			InfoBox,
+			data,
+			[=](uint64 hash) { terminateOne(hash); }));
+	}, lifetime());
+
+	_inner->terminateOne(
+	) | rpl::start_with_next([=](uint64 hash) {
+		terminateOne(hash);
+	}, lifetime());
+
+	_inner->terminateAll(
+	) | rpl::start_with_next([=] {
+		terminateAll();
+	}, lifetime());
+
+	_loading.changes(
+	) | rpl::start_with_next([=](bool value) {
+		_inner->setVisible(!value);
+	}, lifetime());
+
+	_websites->listValue(
+	) | rpl::start_with_next([=](const Api::Websites::List &list) {
+		parse(list);
+	}, lifetime());
+
+	_loading = true;
+	shortPoll();
+}
+
+void Content::parse(const Api::Websites::List &list) {
+	_loading = false;
+
+	_data = list;
+
+	ranges::sort(_data, std::greater<>(), &EntryData::activeTime);
+
+	_inner->showData(_data);
+
+	_shortPollTimer.callOnce(kShortPollTimeout);
+}
+
+void Content::resizeEvent(QResizeEvent *e) {
+	RpWidget::resizeEvent(e);
+
+	_inner->resize(width(), _inner->height());
+}
+
+void Content::paintEvent(QPaintEvent *e) {
+	RpWidget::paintEvent(e);
+
+	Painter p(this);
+
+	if (_loading.current()) {
+		p.setFont(st::noContactsFont);
+		p.setPen(st::noContactsColor);
+		p.drawText(
+			QRect(0, 0, width(), st::noContactsHeight),
+			tr::lng_contacts_loading(tr::now),
+			style::al_center);
+	}
+}
+
+void Content::shortPoll() {
+	const auto left = kShortPollTimeout
+		- (crl::now() - _websites->lastReceivedTime());
+	if (left > 0) {
+		parse(_websites->list());
+		_shortPollTimer.cancel();
+		_shortPollTimer.callOnce(left);
+	} else {
+		_websites->reload();
+	}
+	update();
+}
+
+void Content::terminate(
+		Fn<void(bool block)> sendRequest,
+		rpl::producer<QString> title,
+		rpl::producer<QString> text,
+		QString blockText) {
+	if (const auto strong = _terminateBox.data()) {
+		strong->deleteLater();
+	}
+	auto box = Box([=](not_null<Ui::GenericBox*> box) {
+		auto &lifetime = box->lifetime();
+		const auto block = lifetime.make_state<Ui::Checkbox*>(nullptr);
+		const auto callback = crl::guard(this, [=] {
+			const auto blocked = (*block) && (*block)->checked();
+			if (_terminateBox) {
+				_terminateBox->closeBox();
+				_terminateBox = nullptr;
+			}
+			sendRequest(blocked);
+		});
+		Ui::ConfirmBox(box, {
+			.text = rpl::duplicate(text),
+			.confirmed = callback,
+			.confirmText = tr::lng_settings_disconnect(),
+			.confirmStyle = &st::attentionBoxButton,
+			.title = rpl::duplicate(title),
+		});
+		if (!blockText.isEmpty()) {
+			*block = box->addRow(object_ptr<Ui::Checkbox>(box, blockText));
+		}
+	});
+	_terminateBox = Ui::MakeWeak(box.data());
+	_controller->show(std::move(box));
+}
+
+void Content::terminateOne(uint64 hash) {
+	const auto weak = Ui::MakeWeak(this);
+	const auto i = ranges::find(_data, hash, &EntryData::hash);
+	if (i == end(_data)) {
+		return;
+	}
+
+	const auto bot = i->bot;
+	auto callback = [=](bool block) {
+		auto done = crl::guard(weak, [=](const MTPBool &result) {
+			_data.erase(
+				ranges::remove(_data, hash, &EntryData::hash),
+				end(_data));
+			_inner->showData(_data);
+		});
+		auto fail = crl::guard(weak, [=](const MTP::Error &error) {
+		});
+		_websites->requestTerminate(
+			std::move(done),
+			std::move(fail),
+			hash,
+			block ? bot.get() : nullptr);
+	};
+	terminate(
+		std::move(callback),
+		tr::lng_settings_disconnect_title(),
+		tr::lng_settings_disconnect_sure(lt_domain, rpl::single(i->domain)),
+		tr::lng_settings_disconnect_block(tr::now, lt_name, bot->name()));
+}
+
+void Content::terminateAll() {
+	const auto weak = Ui::MakeWeak(this);
+	auto callback = [=](bool block) {
+		const auto reset = crl::guard(weak, [=] {
+			_websites->cancelCurrentRequest();
+			_websites->reload();
+		});
+		_websites->requestTerminate(
+			[=](const MTPBool &result) { reset(); },
+			[=](const MTP::Error &result) { reset(); });
+		_loading = true;
+	};
+	terminate(
+		std::move(callback),
+		tr::lng_settings_disconnect_all_title(),
+		tr::lng_settings_disconnect_all_sure());
+}
+
+Content::Inner::Inner(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: RpWidget(parent)
+, _controller(controller) {
+	resize(width(), st::noContactsHeight);
+	setupContent();
+}
+
+void Content::Inner::setupContent() {
+	using namespace Settings;
+	using namespace rpl::mappers;
+
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	const auto session = &_controller->session();
+	const auto terminateWrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)))->setDuration(0);
+	const auto terminateInner = terminateWrap->entity();
+	_terminateAll = terminateInner->add(
+		CreateButton(
+			terminateInner,
+			tr::lng_settings_disconnect_all(),
+			st::infoBlockButton,
+			{ .icon = &st::infoIconBlock }));
+	AddSkip(terminateInner);
+	AddDividerText(
+		terminateInner,
+		tr::lng_settings_logged_in_description());
+
+	const auto listWrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)))->setDuration(0);
+	const auto listInner = listWrap->entity();
+	AddSkip(listInner, st::sessionSubtitleSkip);
+	AddSubsectionTitle(listInner, tr::lng_settings_logged_in_title());
+	_list = ListController::Add(listInner, session);
+	AddSkip(listInner);
+
+	const auto skip = st::noContactsHeight / 2;
+	const auto placeholder = content->add(
+		object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
+			content,
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_settings_logged_in_description(),
+				st::boxDividerLabel),
+			st::settingsDividerLabelPadding + QMargins(0, skip, 0, skip))
+	)->setDuration(0);
+
+	terminateWrap->toggleOn(_list->itemsCount() | rpl::map(_1 > 0));
+	listWrap->toggleOn(_list->itemsCount() | rpl::map(_1 > 0));
+	placeholder->toggleOn(_list->itemsCount() | rpl::map(_1 == 0));
+
+	Ui::ResizeFitChild(this, content);
+}
+
+void Content::Inner::showData(const Api::Websites::List &data) {
+	_list->showData(data);
+}
+
+rpl::producer<> Content::Inner::terminateAll() const {
+	return _terminateAll->clicks() | rpl::to_empty;
+}
+
+rpl::producer<uint64> Content::Inner::terminateOne() const {
+	return _list->terminateRequests();
+}
+
+rpl::producer<EntryData> Content::Inner::showRequests() const {
+	return _list->showRequests();
+}
+
+Content::ListController::ListController(
+	not_null<Main::Session*> session)
+: _session(session) {
+}
+
+Main::Session &Content::ListController::session() const {
+	return *_session;
+}
+
+void Content::ListController::prepare() {
+}
+
+void Content::ListController::rowClicked(
+		not_null<PeerListRow*> row) {
+	_showRequests.fire_copy(static_cast<Row*>(row.get())->data());
+}
+
+void Content::ListController::rowElementClicked(
+		not_null<PeerListRow*> row,
+		int element) {
+	if (element == 2) {
+		if (const auto hash = static_cast<Row*>(row.get())->data().hash) {
+			_terminateRequests.fire_copy(hash);
+		}
+	}
+}
+
+void Content::ListController::rowUpdateRow(not_null<Row*> row) {
+	delegate()->peerListUpdateRow(row);
+}
+
+void Content::ListController::showData(
+		gsl::span<const EntryData> items) {
+	auto index = 0;
+	auto positions = base::flat_map<uint64, int>();
+	positions.reserve(items.size());
+	for (const auto &entry : items) {
+		const auto id = entry.hash;
+		positions.emplace(id, index++);
+		if (const auto row = delegate()->peerListFindRow(id)) {
+			static_cast<Row*>(row)->update(entry);
+		} else {
+			delegate()->peerListAppendRow(
+				std::make_unique<Row>(this, entry));
+		}
+	}
+	for (auto i = 0; i != delegate()->peerListFullRowsCount();) {
+		const auto row = delegate()->peerListRowAt(i);
+		if (positions.contains(row->id())) {
+			++i;
+			continue;
+		}
+		delegate()->peerListRemoveRow(row);
+	}
+	delegate()->peerListSortRows([&](
+			const PeerListRow &a,
+			const PeerListRow &b) {
+		return positions[a.id()] < positions[b.id()];
+	});
+	delegate()->peerListRefreshRows();
+	_itemsCount.fire(delegate()->peerListFullRowsCount());
+}
+
+rpl::producer<int> Content::ListController::itemsCount() const {
+	return _itemsCount.events_starting_with(
+		delegate()->peerListFullRowsCount());
+}
+
+rpl::producer<uint64> Content::ListController::terminateRequests() const {
+	return _terminateRequests.events();
+}
+
+rpl::producer<EntryData> Content::ListController::showRequests() const {
+	return _showRequests.events();
+}
+
+auto Content::ListController::Add(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Main::Session*> session,
+	style::margins margins)
+-> std::unique_ptr<ListController> {
+	auto &lifetime = container->lifetime();
+	const auto delegate = lifetime.make_state<
+		PeerListContentDelegateSimple
+	>();
+	auto controller = std::make_unique<ListController>(session);
+	controller->setStyleOverrides(&st::websiteList);
+	const auto content = container->add(
+		object_ptr<PeerListContent>(
+			container,
+			controller.get()),
+		margins);
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+	return controller;
+}
+
+} // namespace
+
+namespace Settings {
+
+Websites::Websites(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent) {
+	setupContent(controller);
+}
+
+rpl::producer<QString> Websites::title() {
+	return tr::lng_settings_connected_title();
+}
+
+void Websites::setupContent(not_null<Window::SessionController*> controller) {
+	const auto container = Ui::CreateChild<Ui::VerticalLayout>(this);
+	AddSkip(container);
+	const auto content = container->add(
+		object_ptr<Content>(container, controller));
+	content->setupContent();
+
+	Ui::ResizeFitChild(this, container);
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_websites.h b/Telegram/SourceFiles/settings/settings_websites.h
new file mode 100644
index 000000000..4b44bd8a9
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_websites.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_common.h"
+
+namespace Settings {
+
+class Websites : public Section<Websites> {
+public:
+	Websites(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+private:
+	void setupContent(not_null<Window::SessionController*> controller);
+
+};
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
index c048b2354..070f84b29 100644
--- a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
@@ -17,18 +17,26 @@ void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
 	const auto weak = Ui::MakeWeak(box);
 	const auto lifetime = box->lifetime().make_state<rpl::lifetime>();
 
-	v::match(args.text, [](v::null_t) {
-	}, [&](auto &&) {
+	const auto withTitle = !v::is_null(args.title);
+	if (withTitle) {
+		box->setTitle(v::text::take_marked(std::move(args.title)));
+	}
+
+	if (!v::is_null(args.text)) {
+		const auto padding = st::boxPadding;
+		const auto use = withTitle
+			? QMargins(padding.left(), 0, padding.right(), padding.bottom())
+			: padding;
 		const auto label = box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box.get(),
 				v::text::take_marked(std::move(args.text)),
 				args.labelStyle ? *args.labelStyle : st::boxLabel),
-			st::boxPadding);
+			use);
 		if (args.labelFilter) {
 			label->setClickHandlerFilter(std::move(args.labelFilter));
 		}
-	});
+	}
 
 	const auto prepareCallback = [&](ConfirmBoxArgs::Callback &callback) {
 		return [=, confirmed = std::move(callback)]() {
diff --git a/Telegram/SourceFiles/ui/boxes/confirm_box.h b/Telegram/SourceFiles/ui/boxes/confirm_box.h
index 297909f69..b66be3d3a 100644
--- a/Telegram/SourceFiles/ui/boxes/confirm_box.h
+++ b/Telegram/SourceFiles/ui/boxes/confirm_box.h
@@ -31,6 +31,8 @@ struct ConfirmBoxArgs {
 	const style::FlatLabel *labelStyle = nullptr;
 	Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)> labelFilter;
 
+	v::text::data title = v::null;
+
 	bool inform = false;
 	// If strict cancel is set the cancel.callback() is only called
 	// if the cancel button was pressed.
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index df5f98e04..439c94523 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -871,6 +871,11 @@ void UserpicButton::switchChangePhotoOverlay(
 	}
 }
 
+void UserpicButton::forceForumShape(bool force) {
+	_forceForumShape = force;
+	prepare();
+}
+
 void UserpicButton::showSavedMessagesOnSelf(bool enabled) {
 	if (_showSavedMessagesOnSelf != enabled) {
 		_showSavedMessagesOnSelf = enabled;
@@ -1003,7 +1008,26 @@ void UserpicButton::prepareUserpicPixmap() {
 	_userpic = CreateSquarePixmap(size, [&](Painter &p) {
 		if (_userpicHasImage) {
 			if (_showPeerUserpic) {
-				_peer->paintUserpic(p, _userpicView, 0, 0, size);
+				if (useForumShape()) {
+					const auto ratio = style::DevicePixelRatio();
+					if (const auto cloud = _peer->userpicCloudImage(_userpicView)) {
+						Ui::ValidateUserpicCache(
+							_userpicView,
+							cloud,
+							nullptr,
+							size * ratio,
+							true);
+						p.drawImage(QRect(0, 0, size, size), _userpicView.cached);
+					} else {
+						const auto empty = _peer->generateUserpicImage(
+							_userpicView,
+							size * ratio,
+							size * ratio * Ui::ForumUserpicRadiusMultiplier());
+						p.drawImage(QRect(0, 0, size, size), empty);
+					}
+				} else {
+					_peer->paintUserpic(p, _userpicView, 0, 0, size);
+				}
 			} else if (_nonPersonalView) {
 				using Size = Data::PhotoSize;
 				if (const auto full = _nonPersonalView->image(Size::Large)) {
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.h b/Telegram/SourceFiles/ui/controls/userpic_button.h
index ef0e8f800..8d2eb2adf 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.h
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.h
@@ -94,6 +94,7 @@ public:
 		bool enabled,
 		Fn<void(ChosenImage)> chosen);
 	void showSavedMessagesOnSelf(bool enabled);
+	void forceForumShape(bool force);
 
 	// Role::ChoosePhoto or Role::ChangePhoto
 	[[nodiscard]] rpl::producer<ChosenImage> chosenImages() const {
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 7aaf32213..5f19251c0 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -135,6 +135,8 @@ menuIconAntispam: icon {{ "menu/antispam", menuIconColor }};
 menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }};
 menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
 menuIconPremium: icon {{ "menu/premium", menuIconColor }};
+menuIconIpAddress: icon {{ "menu/ip_address", menuIconColor }};
+menuIconAddress: icon {{ "menu/payment_address", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);

From 07bbfd13537033d727e650dcc2c17e79a43d7486 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 18 Aug 2023 16:13:13 +0400
Subject: [PATCH 643/676] Make dark mode update go through Qt code on Linux

This makes the behavior consistent and is possible now thanks to a Qt patch
---
 Telegram/SourceFiles/platform/linux/integration_linux.cpp | 5 +++++
 Telegram/build/docker/centos_env/Dockerfile               | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index f13a96bce..f842fd808 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/random.h"
 
 #include <QtCore/QAbstractEventDispatcher>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <glibmm.h>
 #include <gio/gio.hpp>
@@ -212,6 +213,9 @@ LinuxIntegration::LinuxIntegration()
 	const Glib::VariantBase &value) {
 	if (group == "org.freedesktop.appearance"
 		&& key == "color-scheme") {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+		QWindowSystemInterface::handleThemeChange();
+#else // Qt >= 6.5.0
 		try {
 			const auto ivalue = value.get_dynamic<uint>();
 
@@ -220,6 +224,7 @@ LinuxIntegration::LinuxIntegration()
 			});
 		} catch (...) {
 		}
+#endif // Qt < 6.5.0
 	}
 }) {
 	LOG(("Icon theme: %1").arg(QIcon::themeName()));
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index e83f2df0e..49316a199 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -59,7 +59,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 edafe1a2484cd6ac9be357aa1e4cda61bf6a8b9a \
+	&& git fetch --depth=1 origin dbd8a5b00f5a0e7e09b11878b9e46afeb4b593c0 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 

From 96cef3957673cebdacad8b299147ac57ab1ec59f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 18 Aug 2023 19:07:42 +0400
Subject: [PATCH 644/676] Update cmake_helpers

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

diff --git a/cmake b/cmake
index 3ffc5e6bf..bd556e2a1 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 3ffc5e6bf584d9b60e66d7c533f87e9276813863
+Subproject commit bd556e2a16d34ad876054fb3ab25e83481af652a

From 95ea61cd413f12c5632141d30c382106edb92c38 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 18:06:26 +0200
Subject: [PATCH 645/676] Fix rare repaint glitch in main menu.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index b3580f798..a6d7e3f54 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit b3580f7987d81b0c7aecee99f7f70f7873f6b35c
+Subproject commit a6d7e3f5457b29b563941b24cd844ca26ac0d077

From 653d7aadb161668f054a6f3fdc55c581156209be Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 18:14:01 +0200
Subject: [PATCH 646/676] Don't close EditCaptionBox with changed media by
 click.

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

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index c9779b1f1..90a989ce7 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -517,7 +517,8 @@ void EditCaptionBox::setInitialText() {
 	_field->setTextCursor(cursor);
 
 	_checkChangedTimer.setCallback([=] {
-		if (_field->getTextWithAppliedMarkdown() == _initialText) {
+		if (_field->getTextWithAppliedMarkdown() == _initialText
+			&& _preparedList.files.empty()) {
 			setCloseByOutsideClick(true);
 		}
 	});
@@ -738,6 +739,7 @@ bool EditCaptionBox::setPreparedList(Ui::PreparedList &&list) {
 	const auto wasSpoiler = hasSpoiler();
 	_preparedList = std::move(list);
 	_preparedList.files.front().spoiler = wasSpoiler;
+	setCloseByOutsideClick(false);
 	rebuildPreview();
 	return true;
 }

From b610de30f43a6c332b3fc9eb36d775f1cdb4be98 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 19:25:25 +0200
Subject: [PATCH 647/676] Fix adding downloaded files to Downloads.

---
 .../data/data_file_click_handler.cpp          | 32 +++++++++++++------
 .../data/data_file_click_handler.h            |  6 ++--
 .../media/view/media_view_overlay_widget.cpp  | 27 ++++++++++------
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_file_click_handler.cpp b/Telegram/SourceFiles/data/data_file_click_handler.cpp
index ec746f566..e42397d19 100644
--- a/Telegram/SourceFiles/data/data_file_click_handler.cpp
+++ b/Telegram/SourceFiles/data/data_file_click_handler.cpp
@@ -74,7 +74,8 @@ void DocumentOpenClickHandler::onClickImpl() const {
 void DocumentSaveClickHandler::Save(
 		Data::FileOrigin origin,
 		not_null<DocumentData*> data,
-		Mode mode) {
+		Mode mode,
+		Fn<void()> started) {
 	if (data->isNull()) {
 		return;
 	}
@@ -89,6 +90,9 @@ void DocumentSaveClickHandler::Save(
 		// background thread timers from working which would
 		// stop audio playback in voice chats / live streams.
 		if (mode != Mode::ToNewFile && data->saveFromData()) {
+			if (started) {
+				started();
+			}
 			return;
 		}
 		const auto filepath = data->filepath(true);
@@ -107,6 +111,9 @@ void DocumentSaveClickHandler::Save(
 			filedir);
 		if (!savename.isEmpty()) {
 			data->save(origin, savename);
+			if (started) {
+				started();
+			}
 		}
 	}));
 }
@@ -114,16 +121,21 @@ void DocumentSaveClickHandler::Save(
 void DocumentSaveClickHandler::SaveAndTrack(
 		FullMsgId itemId,
 		not_null<DocumentData*> document,
-		Mode mode) {
-	Save(itemId ? itemId : Data::FileOrigin(), document, mode);
-	if (document->loading() && !document->loadingFilePath().isEmpty()) {
-		if (const auto item = document->owner().message(itemId)) {
-			Core::App().downloadManager().addLoading({
-				.item = item,
-				.document = document,
-			});
+		Mode mode,
+		Fn<void()> started) {
+	Save(itemId ? itemId : Data::FileOrigin(), document, mode, [=] {
+		if (document->loading() && !document->loadingFilePath().isEmpty()) {
+			if (const auto item = document->owner().message(itemId)) {
+				Core::App().downloadManager().addLoading({
+					.item = item,
+					.document = document,
+				});
+			}
 		}
-	}
+		if (started) {
+			started();
+		}
+	});
 }
 
 void DocumentSaveClickHandler::onClickImpl() const {
diff --git a/Telegram/SourceFiles/data/data_file_click_handler.h b/Telegram/SourceFiles/data/data_file_click_handler.h
index 472d04d15..46eaa5b82 100644
--- a/Telegram/SourceFiles/data/data_file_click_handler.h
+++ b/Telegram/SourceFiles/data/data_file_click_handler.h
@@ -53,11 +53,13 @@ public:
 	static void Save(
 		Data::FileOrigin origin,
 		not_null<DocumentData*> document,
-		Mode mode = Mode::ToCacheOrFile);
+		Mode mode = Mode::ToCacheOrFile,
+		Fn<void()> started = nullptr);
 	static void SaveAndTrack(
 		FullMsgId itemId,
 		not_null<DocumentData*> document,
-		Mode mode = Mode::ToCacheOrFile);
+		Mode mode = Mode::ToCacheOrFile,
+		Fn<void()> started = nullptr);
 
 protected:
 	void onClickImpl() const override;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 0a58cdb5e..d4c868617 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2512,19 +2512,26 @@ void OverlayWidget::downloadMedia() {
 		} else {
 			if (_document->filepath(true).isEmpty()
 				&& !_document->loading()) {
+				const auto document = _document;
+				const auto checkSaveStarted = [=] {
+					if (isHidden() || _document != document) {
+						return;
+					}
+					_documentLoadingTo = _document->loadingFilePath();
+					if (_stories && _documentLoadingTo.isEmpty()) {
+						const auto toName = _document->filepath(true);
+						if (!toName.isEmpty()) {
+							showSaveMsgToast(
+								toName,
+								tr::lng_mediaview_video_saved_to);
+						}
+					}
+				};
 				DocumentSaveClickHandler::SaveAndTrack(
 					_message ? _message->fullId() : FullMsgId(),
 					_document,
-					DocumentSaveClickHandler::Mode::ToFile);
-				_documentLoadingTo = _document->loadingFilePath();
-				if (_stories && _documentLoadingTo.isEmpty()) {
-					toName = _document->filepath(true);
-					if (!toName.isEmpty()) {
-						showSaveMsgToast(
-							toName,
-							tr::lng_mediaview_video_saved_to);
-					}
-				}
+					DocumentSaveClickHandler::Mode::ToFile,
+					crl::guard(_widget, checkSaveStarted));
 			} else {
 				_saveVisible = computeSaveButtonVisible();
 				update(_saveNavOver);

From ccc61028b8f4a2b11fe074d0f4e9576728985a14 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 19:39:22 +0200
Subject: [PATCH 648/676] Allow downloading files from webpage collages.

---
 .../data/data_download_manager.cpp            | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index 088dc0b92..c1a0719fe 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -86,6 +86,45 @@ constexpr auto ByDocument = [](const auto &entry) {
 	return nullptr;
 }
 
+[[nodiscard]] bool ItemContainsMedia(const DownloadObject &object) {
+	if (const auto photo = object.photo) {
+		if (const auto media = object.item->media()) {
+			if (const auto page = media->webpage()) {
+				if (page->photo == photo) {
+					return true;
+				}
+				for (const auto &item : page->collage.items) {
+					if (const auto v = std::get_if<PhotoData*>(&item)) {
+						if ((*v) == photo) {
+							return true;
+						}
+					}
+				}
+			} else {
+				return (media->photo() == photo);
+			}
+		}
+	} else if (const auto document = object.document) {
+		if (const auto media = object.item->media()) {
+			if (const auto page = media->webpage()) {
+				if (page->document == document) {
+					return true;
+				}
+				for (const auto &item : page->collage.items) {
+					if (const auto v = std::get_if<DocumentData*>(&item)) {
+						if ((*v) == document) {
+							return true;
+						}
+					}
+				}
+			} else {
+				return (media->document() == document);
+			}
+		}
+	}
+	return false;
+}
+
 struct DocumentDescriptor {
 	uint64 sessionUniqueId = 0;
 	DocumentId documentId = 0;
@@ -242,12 +281,12 @@ void DownloadManager::check(
 		std::vector<DownloadingId>::iterator i) {
 	auto &entry = *i;
 
-	const auto photo = ItemPhoto(entry.object.item);
-	const auto document = ItemDocument(entry.object.item);
-	if (entry.object.photo != photo || entry.object.document != document) {
+	if (!ItemContainsMedia(entry.object)) {
 		cancel(data, i);
 		return;
 	}
+	const auto document = entry.object.document;
+
 	// Load with progress only documents for now.
 	Assert(document != nullptr);
 

From a2fe91af03acfe9eb3f39b7eda5c7c6ad4abfb39 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 20:02:57 +0200
Subject: [PATCH 649/676] Disable zooming in full screen video view.

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

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index d4c868617..957679aba 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2055,7 +2055,7 @@ void OverlayWidget::zoomOut() {
 }
 
 void OverlayWidget::zoomReset() {
-	if (_stories) {
+	if (_stories || _fullScreenVideo) {
 		return;
 	}
 	auto newZoom = _zoom;
@@ -5179,7 +5179,9 @@ void OverlayWidget::handleWheelEvent(not_null<QWheelEvent*> e) {
 }
 
 void OverlayWidget::setZoomLevel(int newZoom, bool force) {
-	if (_stories || (!force && _zoom == newZoom)) {
+	if (_stories
+		|| (!force && _zoom == newZoom)
+		|| (_fullScreenVideo && newZoom != kZoomToScreenLevel)) {
 		return;
 	}
 

From c765c4198f3a12229416cf60494010044585753d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 23:03:05 +0200
Subject: [PATCH 650/676] Improve updates build script.

---
 .../SourceFiles/support/support_helper.cpp    | 42 ++++++++++++++-----
 Telegram/build/updates.py                     | 19 +++++----
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index bb0888d13..cb8fe49c5 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "dialogs/dialogs_key.h"
 #include "data/data_drafts.h"
+#include "data/data_forum.h"
+#include "data/data_forum_topic.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
@@ -555,6 +557,7 @@ QString InterpretSendPath(
 	f.close();
 	const auto lines = content.split('\n');
 	auto toId = PeerId(0);
+	auto topicRootId = MsgId(0);
 	auto filePath = QString();
 	auto caption = QString();
 	for (const auto &line : lines) {
@@ -570,6 +573,11 @@ QString InterpretSendPath(
 				line,
 				u"channel: "_q.size()).toULongLong();
 			toId = peerFromChannel(channelId);
+		} else if (line.startsWith(u"topic: "_q)) {
+			const auto topicId = base::StringViewMid(
+				line,
+				u"topic: "_q.size()).toULongLong();
+			topicRootId = MsgId(topicId);
 		} else if (line.startsWith(u"file: "_q)) {
 			const auto path = line.mid(u"file: "_q.size());
 			if (!QFile(path).exists()) {
@@ -585,21 +593,33 @@ QString InterpretSendPath(
 		}
 	}
 	const auto history = window->session().data().historyLoaded(toId);
+	const auto sendTo = [=](not_null<Data::Thread*> thread) {
+		window->showThread(thread);
+		const auto premium = thread->session().user()->isPremium();
+		thread->session().api().sendFiles(
+			Storage::PrepareMediaList(
+				QStringList(filePath),
+				st::sendMediaPreviewSize,
+				premium),
+			SendMediaType::File,
+			{ caption },
+			nullptr,
+			Api::SendAction(thread));
+	};
 	if (!history) {
 		return "App Error: Could not find channel with id: "
 			+ QString::number(peerToChannel(toId).bare);
+	} else if (const auto forum = history->asForum()) {
+		forum->requestTopic(topicRootId, [=] {
+			if (const auto forum = history->asForum()) {
+				if (const auto topic = forum->topicFor(topicRootId)) {
+					sendTo(topic);
+				}
+			}
+		});
+	} else if (!topicRootId) {
+		sendTo(history);
 	}
-	window->showPeerHistory(history);
-	const auto premium = window->session().user()->isPremium();
-	history->session().api().sendFiles(
-		Storage::PrepareMediaList(
-			QStringList(filePath),
-			st::sendMediaPreviewSize,
-			premium),
-		SendMediaType::File,
-		{ caption },
-		nullptr,
-		Api::SendAction(history));
 	return QString();
 }
 
diff --git a/Telegram/build/updates.py b/Telegram/build/updates.py
index 85dbda59a..2b5418605 100644
--- a/Telegram/build/updates.py
+++ b/Telegram/build/updates.py
@@ -11,6 +11,7 @@ nextDate = False
 nextUuid = False
 building = True
 composing = False
+conf = 'Release'
 for arg in sys.argv:
     if nextLast:
         lastCommit = arg
@@ -32,6 +33,8 @@ for arg in sys.argv:
         nextDate = True
     elif arg == 'request_uuid':
         nextUuid = True
+    elif arg == 'debug':
+        conf = 'Debug'
 
 def finish(code, error = ''):
     if error != '':
@@ -53,9 +56,9 @@ outputFolder = 'updates/' + today
 archive = 'tdesktop_macOS_' + today + '.zip'
 
 if building:
-    print('Building Release version for OS X 10.12+..')
+    print('Building ' + conf + ' version for OS X 10.12+..')
 
-    if os.path.exists('../out/Release/' + outputFolder):
+    if os.path.exists('../out/' + conf + '/' + outputFolder):
         finish(1, 'Todays updates version exists.')
 
     if uuid == '':
@@ -65,11 +68,11 @@ if building:
 
     os.chdir('../out')
     if uuid == '':
-        result = subprocess.call('cmake --build . --config Release --target Telegram', shell=True)
+        result = subprocess.call('cmake --build . --config ' + conf + ' --target Telegram', shell=True)
         if result != 0:
             finish(1, 'While building Telegram.')
 
-    os.chdir('Release')
+    os.chdir(conf);
     if uuid == '':
         if not os.path.exists('Telegram.app'):
             finish(1, 'Telegram.app not found.')
@@ -193,7 +196,7 @@ if building:
         print('NB! Notarization log not found.')
     finish(0)
 
-commandPath = scriptPath + '/../../out/Release/' + outputFolder + '/command.txt'
+commandPath = scriptPath + '/../../out/' + conf + '/' + outputFolder + '/command.txt'
 
 if composing:
     templatePath = scriptPath + '/../../../DesktopPrivate/updates_template.txt'
@@ -235,7 +238,7 @@ if composing:
             for line in template:
                 if line.startswith('//'):
                     continue
-                line = line.replace('{path}', scriptPath + '/../../out/Release/' + outputFolder + '/' + archive)
+                line = line.replace('{path}', scriptPath + '/../../out/' + conf + '/' + outputFolder + '/' + archive)
                 line = line.replace('{caption}', 'TDesktop at ' + today.replace('_', '.') + ':\n\n' + changelog)
                 f.write(line)
     print('\n\nEdit:\n')
@@ -262,9 +265,9 @@ if len(caption) > 1024:
     print('vi ' + commandPath)
     finish(1, 'Too large.')
 
-if not os.path.exists('../out/Release/' + outputFolder + '/' + archive):
+if not os.path.exists('../out/' + conf + '/' + outputFolder + '/' + archive):
     finish(1, 'Not built yet.')
 
-subprocess.call(scriptPath + '/../../out/Release/Telegram.app/Contents/MacOS/Telegram -sendpath interpret://' + scriptPath + '/../../out/Release/' + outputFolder + '/command.txt', shell=True)
+subprocess.call(scriptPath + '/../../out/' + conf + '/Telegram.app/Contents/MacOS/Telegram -sendpath interpret://' + scriptPath + '/../../out/' + conf + '/' + outputFolder + '/command.txt', shell=True)
 
 finish(0)

From e8e74e7ac7b7fc221c1f73e9a66a42a04105f589 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 7 Jun 2023 16:58:09 +0300
Subject: [PATCH 651/676] Updated Qt to 5.15.10 on Windows.

---
 CMakeLists.txt                    |  2 +-
 Telegram/build/prepare/prepare.py | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9248d33c7..7ec62b158 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ include(cmake/options.cmake)
 
 if (NOT DESKTOP_APP_USE_PACKAGED)
     if (WIN32)
-        set(qt_version 5.15.9)
+        set(qt_version 5.15.10)
     elseif (APPLE)
         set(qt_version 6.3.2)
     endif()
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 86f88dc49..a3632d906 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -404,7 +404,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 3fad86d684
+    git checkout b9361e74b2
 """)
 
 stage('msys64', """
@@ -1234,30 +1234,30 @@ release:
 """)
 
 if buildQt5:
-    stage('qt_5_15_9', """
-    git clone https://github.com/qt/qt5.git qt_5_15_9
-    cd qt_5_15_9
+    stage('qt_5_15_10', """
+    git clone https://github.com/qt/qt5.git qt_5_15_10
+    cd qt_5_15_10
     perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
-    git checkout v5.15.9-lts-lgpl
+    git checkout v5.15.10-lts-lgpl
     git submodule update qtbase qtimageformats qtsvg
-depends:patches/qtbase_5.15.9/*.patch
+depends:patches/qtbase_5.15.10/*.patch
     cd qtbase
 win:
-    for /r %%i in (..\\..\\patches\\qtbase_5.15.9\\*) do git apply %%i
+    for /r %%i in (..\\..\\patches\\qtbase_5.15.10\\*) do git apply %%i
     cd ..
 
     SET CONFIGURATIONS=-debug
 release:
     SET CONFIGURATIONS=-debug-and-release
 win:
-    """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.9\"") + """
+    """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.10\"") + """
     SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
     SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
     SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
     SET OPENSSL_DIR=%LIBS_DIR%\\openssl
     SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
     SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
-    configure -prefix "%LIBS_DIR%\\Qt-5.15.9" ^
+    configure -prefix "%LIBS_DIR%\\Qt-5.15.10" ^
         %CONFIGURATIONS% ^
         -force-debug-info ^
         -opensource ^
@@ -1289,14 +1289,14 @@ win:
     jom -j16
     jom -j16 install
 mac:
-    find ../../patches/qtbase_5.15.9 -type f -print0 | sort -z | xargs -0 git apply
+    find ../../patches/qtbase_5.15.10 -type f -print0 | sort -z | xargs -0 git apply
     cd ..
 
     CONFIGURATIONS=-debug
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-5.15.9" \
+    ./configure -prefix "$USED_PREFIX/Qt-5.15.10" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \

From 2f9ae75a654571dc4abc4b44aee882d9a165f4c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 11:00:38 +0200
Subject: [PATCH 652/676] Message edit: check changes correctly.

---
 .../chat_helpers/message_field.cpp            | 19 +++++++++-
 .../SourceFiles/chat_helpers/message_field.h  |  9 +++--
 .../SourceFiles/history/history_widget.cpp    | 24 +++++++++----
 .../history_view_compose_controls.cpp         | 36 ++++++++++++++++---
 .../controls/history_view_compose_controls.h  |  1 +
 5 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index b0e263c4a..304c7d3a0 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -279,6 +279,19 @@ TextWithTags PrepareEditText(not_null<HistoryItem*> item) {
 	};
 }
 
+bool EditTextChanged(
+		not_null<HistoryItem*> item,
+		const TextWithTags &updated) {
+	const auto original = PrepareEditText(item);
+
+	// 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));
+}
+
 Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
 	QString text,
@@ -595,6 +608,10 @@ void MessageLinksParser::parseNow() {
 	parse();
 }
 
+void MessageLinksParser::setDisabled(bool disabled) {
+	_disabled = disabled;
+}
+
 bool MessageLinksParser::eventFilter(QObject *object, QEvent *event) {
 	if (object == _field) {
 		if (event->type() == QEvent::KeyPress) {
@@ -625,7 +642,7 @@ void MessageLinksParser::parse() {
 	const auto &text = textWithTags.text;
 	const auto &tags = textWithTags.tags;
 	const auto &markdownTags = _field->getMarkdownTags();
-	if (text.isEmpty()) {
+	if (_disabled || text.isEmpty()) {
 		_list = QStringList();
 		return;
 	}
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 13012557b..acc2808a1 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -37,8 +37,11 @@ namespace Ui {
 class PopupMenu;
 } // namespace Ui
 
-QString PrepareMentionTag(not_null<UserData*> user);
-TextWithTags PrepareEditText(not_null<HistoryItem*> item);
+[[nodiscard]] QString PrepareMentionTag(not_null<UserData*> user);
+[[nodiscard]] TextWithTags PrepareEditText(not_null<HistoryItem*> item);
+[[nodiscard]] bool EditTextChanged(
+	not_null<HistoryItem*> item,
+	const TextWithTags &updated);
 
 Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
@@ -99,6 +102,7 @@ public:
 	MessageLinksParser(not_null<Ui::InputField*> field);
 
 	void parseNow();
+	void setDisabled(bool disabled);
 
 	[[nodiscard]] const rpl::variable<QStringList> &list() const;
 
@@ -126,6 +130,7 @@ private:
 	not_null<Ui::InputField*> _field;
 	rpl::variable<QStringList> _list;
 	int _lastLength = 0;
+	bool _disabled = false;
 	base::Timer _timer;
 	base::qt_connection _connection;
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 28b06d829..3be81b775 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1918,12 +1918,6 @@ bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	_textUpdateEvents = TextUpdateEvent::SaveDraft
 		| TextUpdateEvent::SendTyping;
 
-	// Save links from _field to _parsedLinks without generating preview.
-	_previewState = Data::PreviewState::Cancelled;
-	_fieldLinksParser->parseNow();
-	_parsedLinks = _fieldLinksParser->list().current();
-	_previewState = draft->previewState;
-
 	_processingReplyItem = _replyEditMsg = nullptr;
 	_processingReplyId = _replyToId = 0;
 	setEditMsgId(editMsgId);
@@ -1941,6 +1935,19 @@ bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		_processingReplyId = draft ? draft->msgId : MsgId();
 		processReply();
 	}
+
+	// Save links from _field to _parsedLinks without generating preview.
+	_previewState = Data::PreviewState::Cancelled;
+	if (_editMsgId) {
+		_fieldLinksParser->setDisabled(!_replyEditMsg
+			|| (_replyEditMsg->media()
+				&& !_replyEditMsg->media()->webpage()));
+	}
+	_fieldLinksParser->parseNow();
+	_parsedLinks = _fieldLinksParser->list().current();
+	_previewState = draft->previewState;
+	checkPreview();
+
 	return true;
 }
 
@@ -2473,6 +2480,9 @@ void HistoryWidget::registerDraftSource() {
 void HistoryWidget::setEditMsgId(MsgId msgId) {
 	unregisterDraftSources();
 	_editMsgId = msgId;
+	if (_fieldLinksParser && !_editMsgId) {
+		_fieldLinksParser->setDisabled(false);
+	}
 	if (!msgId) {
 		_canReplaceMedia = false;
 	}
@@ -7608,7 +7618,7 @@ void HistoryWidget::escape() {
 		cancelInlineBot();
 	} else if (_editMsgId) {
 		if (_replyEditMsg
-			&& PrepareEditText(_replyEditMsg) != _field->getTextWithTags()) {
+			&& EditTextChanged(_replyEditMsg, _field->getTextWithTags())) {
 			controller()->show(Ui::MakeConfirmBox({
 				.text = tr::lng_cancel_edit_post_sure(),
 				.confirmed = crl::guard(this, [this](Fn<void()> &&close) {
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 7ad07e755..e6a4717d8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -129,7 +129,7 @@ public:
 
 	[[nodiscard]] Data::PreviewState state() const;
 	void setState(Data::PreviewState value);
-	void refreshState(Data::PreviewState value);
+	void refreshState(Data::PreviewState value, bool disable);
 
 	[[nodiscard]] rpl::producer<> paintRequests() const;
 	[[nodiscard]] rpl::producer<QString> titleChanges() const;
@@ -219,12 +219,16 @@ void WebpageProcessor::setState(Data::PreviewState value) {
 	_previewState = value;
 }
 
-void WebpageProcessor::refreshState(Data::PreviewState value) {
+void WebpageProcessor::refreshState(
+		Data::PreviewState value,
+		bool disable) {
 	// Save links from _field to _parsedLinks without generating preview.
 	_previewState = Data::PreviewState::Cancelled;
+	_fieldLinksParser.setDisabled(disable);
 	_fieldLinksParser.parseNow();
 	_parsedLinks = _fieldLinksParser.list().current();
 	_previewState = value;
+	checkPreview();
 }
 
 void WebpageProcessor::cancel() {
@@ -2163,6 +2167,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		}
 		_header->editMessage({});
 		_header->replyToMessage({});
+		_preview->refreshState(Data::PreviewState::Allowed, false);
 		_canReplaceMedia = false;
 		_photoEditMedia = nullptr;
 		return;
@@ -2176,13 +2181,15 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	draft->cursor.applyTo(_field);
 	_textUpdateEvents = TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping;
 	if (_preview) {
-		_preview->refreshState(draft->previewState);
+		const auto disablePreview = (editDraft != nullptr);
+		_preview->refreshState(draft->previewState, disablePreview);
 	}
 
 	if (draft == editDraft) {
 		const auto resolve = [=] {
 			if (const auto item = _history->owner().message(editingId)) {
 				const auto media = item->media();
+				const auto disablePreview = media && !media->webpage();
 				_canReplaceMedia = media && media->allowsEditMedia();
 				_photoEditMedia = (_canReplaceMedia
 					&& _regularWindow
@@ -2196,6 +2203,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 						item->fullId());
 				}
 				_header->editMessage(editingId, _photoEditMedia != nullptr);
+				_preview->refreshState(_preview->state(), disablePreview);
 				return true;
 			}
 			_canReplaceMedia = false;
@@ -2937,6 +2945,26 @@ void ComposeControls::cancelEditMessage() {
 	saveDraft();
 }
 
+void ComposeControls::maybeCancelEditMessage() {
+	Expects(_history != nullptr);
+
+	const auto item = _history->owner().message(_header->editMsgId());
+	if (item && EditTextChanged(item, _field->getTextWithTags())) {
+		const auto guard = _field.get();
+		_show->show(Ui::MakeConfirmBox({
+			.text = tr::lng_cancel_edit_post_sure(),
+			.confirmed = crl::guard(guard, [this](Fn<void()> &&close) {
+				cancelEditMessage();
+				close();
+			}),
+			.confirmText = tr::lng_cancel_edit_post_yes(),
+			.cancelText = tr::lng_cancel_edit_post_no(),
+		}));
+	} else {
+		cancelEditMessage();
+	}
+}
+
 void ComposeControls::replyToMessage(FullMsgId id) {
 	Expects(_history != nullptr);
 	Expects(draftKeyCurrent() != Data::DraftKey::None());
@@ -3012,7 +3040,7 @@ bool ComposeControls::handleCancelRequest() {
 		_autocomplete->hideAnimated();
 		return true;
 	} else if (isEditingMessage()) {
-		cancelEditMessage();
+		maybeCancelEditMessage();
 		return true;
 	} else if (readyToForward()) {
 		cancelForward();
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 925555832..06d8ae9a8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -196,6 +196,7 @@ public:
 
 	void editMessage(FullMsgId id);
 	void cancelEditMessage();
+	void maybeCancelEditMessage(); // Confirm if changed and cancel.
 
 	void replyToMessage(FullMsgId id);
 	void cancelReplyMessage();

From 05b628da9ba1ad7db9dbad602fabfae666193569 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 11:03:55 +0200
Subject: [PATCH 653/676] Limit libvpx frame size.

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

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 49316a199..912fa52bf 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -232,6 +232,7 @@ RUN git clone -b v1.11.0 --depth=1 {{ GIT }}/webmproject/libvpx.git \
 		--enable-vp8 \
 		--enable-vp9 \
 		--enable-webm-io \
+		--size-limit=4096x4096 \
 	&& make -j$(nproc) \
 	&& make DESTDIR="{{ LibrariesPath }}/libvpx-cache" install \
 	&& cd .. \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index a3632d906..cb5a9cb62 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -404,7 +404,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout b9361e74b2
+    git checkout 24d8dc2bde
 """)
 
 stage('msys64', """
@@ -854,7 +854,8 @@ depends:yasm/yasm
     --disable-docs \
     --enable-vp8 \
     --enable-vp9 \
-    --enable-webm-io
+    --enable-webm-io \
+    --size-limit=4096x4096
 
     make $MAKE_THREADS_CNT
 

From 4e3db5b69314adb0a53104daf854adb4eca55d86 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 11:23:50 +0200
Subject: [PATCH 654/676] Fix build with GCC.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index f5c2058f5..35026b095 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1689,7 +1689,6 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
 				if (uponSelected) {
 					_mouseAction = MouseAction::PrepareDrag; // start text drag
 				} else if (!_pressWasInactive) {
-					const auto media = Element::Pressed()->media();
 					if (_mouseCursorState == CursorState::Date) {
 						_mouseAction = MouseAction::PrepareDrag; // start sticker drag or by-date drag
 					} else {

From 56555c330b78d4efdcd0a24a4fe725255f607b1e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 12:06:20 +0200
Subject: [PATCH 655/676] Don't cancel admin log files download on item
 destroy.

---
 Telegram/SourceFiles/data/data_download_manager.cpp | 11 +++++++----
 Telegram/SourceFiles/history/history.cpp            | 10 ++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index c1a0719fe..eaf124831 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -833,11 +833,14 @@ void DownloadManager::cancel(
 		SessionData &data,
 		std::vector<DownloadingId>::iterator i) {
 	const auto object = i->object;
+	const auto item = object.item;
 	remove(data, i);
-	if (const auto document = object.document) {
-		document->cancel();
-	} else if (const auto photo = object.photo) {
-		photo->cancel();
+	if (!item->isAdminLogEntry()) {
+		if (const auto document = object.document) {
+			document->cancel();
+		} else if (const auto photo = object.photo) {
+			photo->cancel();
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index fe5a1a41e..5b75925d8 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -495,8 +495,10 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 		session().api().cancelLocalItem(item);
 	}
 
-	const auto document = [&] {
-		const auto media = item->media();
+	const auto documentToCancel = [&] {
+		const auto media = item->isAdminLogEntry()
+			? nullptr
+			: item->media();
 		return media ? media->document() : nullptr;
 	}();
 
@@ -510,8 +512,8 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 	Assert(i != end(_messages));
 	_messages.erase(i);
 
-	if (document) {
-		session().data().documentMessageRemoved(document);
+	if (documentToCancel) {
+		session().data().documentMessageRemoved(documentToCancel);
 	}
 }
 

From d7e2046ef3ad734593267527e4126e8aa526d624 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 13:14:22 +0200
Subject: [PATCH 656/676] Fix maximize/fullscreen of pinned-to-top livestream.

---
 .../calls/group/calls_group_panel.cpp         | 25 +++++++++++++++++++
 .../calls/group/calls_group_panel.h           |  1 +
 2 files changed, 26 insertions(+)

diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index d07c748f4..210eb0dce 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -146,6 +146,23 @@ Main::Session &Show::session() const {
 	return panel->call()->peer()->session();
 }
 
+#ifdef Q_OS_WIN
+void UnpinMaximized(not_null<QWidget*> widget) {
+	SetWindowPos(
+		reinterpret_cast<HWND>(widget->window()->windowHandle()->winId()),
+		HWND_NOTOPMOST,
+		0,
+		0,
+		0,
+		0,
+		(SWP_NOMOVE
+			| SWP_NOSIZE
+			| SWP_NOOWNERZORDER
+			| SWP_FRAMECHANGED
+			| SWP_NOACTIVATE));
+}
+#endif // Q_OS_WIN
+
 } // namespace
 
 struct Panel::ControlsBackgroundNarrow {
@@ -1257,7 +1274,12 @@ void Panel::createPinOnTop() {
 
 		_pinOnTop->setVisible(!fullScreenOrMaximized);
 		if (fullScreenOrMaximized) {
+#ifdef Q_OS_WIN
+			UnpinMaximized(window());
+			_unpinnedMaximized = true;
+#else // Q_OS_WIN
 			pin(false);
+#endif // Q_OS_WIN
 
 			_viewport->rp()->events(
 			) | rpl::filter([](not_null<QEvent*> event) {
@@ -1269,6 +1291,9 @@ void Panel::createPinOnTop() {
 
 			_hideControlsTimer.callOnce(kHideControlsTimeout);
 		} else {
+			if (_unpinnedMaximized) {
+				pin(false);
+			}
 			_hideControlsTimerLifetime.destroy();
 			_hideControlsTimer.cancel();
 			refreshTitleGeometry();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.h b/Telegram/SourceFiles/calls/group/calls_group_panel.h
index 8fab14540..cf9352697 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.h
@@ -228,6 +228,7 @@ private:
 	const std::unique_ptr<Ui::LayerManager> _layerBg;
 	rpl::variable<PanelMode> _mode;
 	rpl::variable<bool> _fullScreenOrMaximized = false;
+	bool _unpinnedMaximized = false;
 
 #ifndef Q_OS_MAC
 	rpl::variable<int> _controlsTop = 0;

From 58d762f1308aa216dad1c50607aa4dca3f2f2a51 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 13:32:09 +0200
Subject: [PATCH 657/676] Fix web page video message with reactions.

---
 .../history/view/history_view_message.cpp     | 20 +++++++++++++++----
 .../view/media/history_view_web_page.cpp      |  4 ++++
 .../view/media/history_view_web_page.h        |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index a90580228..e6f7fbcad 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1027,9 +1027,13 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 
 		auto trect = inner.marginsRemoved(st::msgPadding);
 
-		const auto reactionsTop = (reactionsInBubble && !_viewButton)
-			? st::mediaInBubbleSkip
+		const auto additionalInfoSkip = (mediaDisplayed
+			&& !media->additionalInfoString().isEmpty())
+			? st::msgDateFont->height
 			: 0;
+		const auto reactionsTop = (reactionsInBubble && !_viewButton)
+			? (additionalInfoSkip + st::mediaInBubbleSkip)
+			: additionalInfoSkip;
 		const auto reactionsHeight = reactionsInBubble
 			? (reactionsTop + _reactions->height())
 			: 0;
@@ -2045,9 +2049,13 @@ TextState Message::textState(
 			return result;
 		}
 		auto trect = inner.marginsRemoved(st::msgPadding);
-		const auto reactionsTop = (reactionsInBubble && !_viewButton)
-			? st::mediaInBubbleSkip
+		const auto additionalInfoSkip = (mediaDisplayed
+			&& !media->additionalInfoString().isEmpty())
+			? st::msgDateFont->height
 			: 0;
+		const auto reactionsTop = (reactionsInBubble && !_viewButton)
+			? (additionalInfoSkip + st::mediaInBubbleSkip)
+			: additionalInfoSkip;
 		const auto reactionsHeight = reactionsInBubble
 			? (reactionsTop + _reactions->height())
 			: 0;
@@ -3783,6 +3791,10 @@ int Message::resizeContentGetHeight(int newWidth) {
 			if (reactionsInBubble) {
 				if (!mediaDisplayed || _viewButton) {
 					newHeight += st::mediaInBubbleSkip;
+				} else if (!media->additionalInfoString().isEmpty()) {
+					// In round videos in a web page status text is painted
+					// in the bottom left corner, reactions should be below.
+					newHeight += st::msgDateFont->height;
 				}
 				newHeight += _reactions->height();
 			}
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 cec353017..4fb1cef59 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -829,6 +829,10 @@ bool WebPage::isDisplayed() const {
 		&& !item->Has<HistoryMessageLogEntryOriginal>();
 }
 
+QString WebPage::additionalInfoString() const {
+	return _attach ? _attach->additionalInfoString() : QString();
+}
+
 TextForMimeData WebPage::selectedText(TextSelection selection) const {
 	auto siteNameResult = _siteName.toTextForMimeData(selection);
 	auto titleResult = _title.toTextForMimeData(
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 db7bea091..86005d13e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -40,6 +40,7 @@ public:
 	bool hasTextForCopy() const override {
 		return false; // we do not add _title and _description in FullSelection text copy.
 	}
+	QString additionalInfoString() const override;
 
 	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
 		return _attach && _attach->toggleSelectionByHandlerClick(p);

From 23dbe4742aeec4d24fddc9db4871ef2a2ac37507 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 16:24:12 +0200
Subject: [PATCH 658/676] Add recent emoji context menu.

---
 Telegram/Resources/langs/lang.strings         |   6 +
 Telegram/SourceFiles/boxes/sessions_box.cpp   |  14 ---
 .../chat_helpers/emoji_list_widget.cpp        | 104 ++++++++++++++++--
 .../chat_helpers/emoji_list_widget.h          |   9 ++
 Telegram/SourceFiles/core/core_settings.cpp   |  64 ++++++++++-
 Telegram/SourceFiles/core/core_settings.h     |   6 +-
 Telegram/SourceFiles/ui/menu_icons.style      |   2 +
 7 files changed, 180 insertions(+), 25 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2ac849314..31f384f0a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1813,6 +1813,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_emoji_set_download" = "Download {size}";
 "lng_emoji_set_loading" = "{percent}, {progress}";
 "lng_emoji_color_all" = "Choose color for all emoji";
+"lng_emoji_copy" = "Copy emoji";
+"lng_emoji_view_pack" = "View pack";
+"lng_emoji_remove_recent" = "Remove from recents";
+"lng_emoji_reset_recent" = "Reset recents";
+"lng_emoji_reset_recent_sure" = "Do you want to reset recent emoji?";
+"lng_emoji_reset_recent_button" = "Reset";
 
 "lng_recent_stickers" = "Frequently used";
 "lng_faved_stickers_add" = "Add to Favorites";
diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
index 5a45ca0de..f771587de 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@@ -689,8 +689,6 @@ public:
 		style::margins margins = {});
 
 private:
-	void subscribeToCustomDeviceModel();
-
 	const not_null<Main::Session*> _session;
 
 	rpl::event_stream<uint64> _terminateRequests;
@@ -1054,18 +1052,6 @@ Main::Session &SessionsContent::ListController::session() const {
 	return *_session;
 }
 
-void SessionsContent::ListController::subscribeToCustomDeviceModel() {
-	Core::App().settings().deviceModelChanges(
-	) | rpl::start_with_next([=](const QString &model) {
-		for (auto i = 0; i != delegate()->peerListFullRowsCount(); ++i) {
-			const auto row = delegate()->peerListRowAt(i);
-			if (!row->id()) {
-				static_cast<Row*>(row.get())->updateName(model);
-			}
-		}
-	}, lifetime());
-}
-
 void SessionsContent::ListController::prepare() {
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 11fa6b234..357d0485c 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -8,9 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/emoji_list_widget.h"
 
 #include "base/unixtime.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/controls/tabbed_search.h"
 #include "ui/text/format_values.h"
 #include "ui/effects/animations.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/shadow.h"
@@ -41,6 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_premium.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 
 namespace ChatHelpers {
 namespace {
@@ -1035,7 +1039,7 @@ void EmojiListWidget::fillRecentFrom(const std::vector<DocumentId> &list) {
 
 base::unique_qptr<Ui::PopupMenu> EmojiListWidget::fillContextMenu(
 		SendMenu::Type type) {
-	if (_mode != Mode::EmojiStatus || v::is_null(_selected)) {
+	if (v::is_null(_selected)) {
 		return nullptr;
 	}
 	const auto over = std::get_if<OverEmoji>(&_selected);
@@ -1044,13 +1048,99 @@ base::unique_qptr<Ui::PopupMenu> EmojiListWidget::fillContextMenu(
 	}
 	const auto section = over->section;
 	const auto index = over->index;
-	const auto chosen = lookupCustomEmoji(index, section);
-	if (!chosen) {
-		return nullptr;
-	}
 	auto menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
-		st::defaultPopupMenu);
+		(_mode == Mode::Full
+			? st::popupMenuWithIcons
+			: st::defaultPopupMenu));
+	if (_mode == Mode::Full) {
+		fillRecentMenu(menu, section, index);
+	} else if (_mode == Mode::EmojiStatus) {
+		fillEmojiStatusMenu(menu, section, index);
+	}
+	if (menu->empty()) {
+		return nullptr;
+	}
+	return menu;
+}
+
+void EmojiListWidget::fillRecentMenu(
+		not_null<Ui::PopupMenu*> menu,
+		int section,
+		int index) {
+	if (section != int(Section::Recent)) {
+		return;
+	}
+	const auto addAction = Ui::Menu::CreateAddActionCallback(menu);
+	const auto over = OverEmoji{ section, index };
+	const auto emoji = lookupOverEmoji(&over);
+	const auto custom = lookupCustomEmoji(index, section);
+	if (custom && custom->sticker()) {
+		const auto sticker = custom->sticker();
+		const auto emoji = sticker->alt;
+		const auto setId = sticker->set.id;
+		if (!emoji.isEmpty()) {
+			auto data = TextForMimeData{ emoji, { emoji } };
+			data.rich.entities.push_back({
+				EntityType::CustomEmoji,
+				0,
+				emoji.size(),
+				Data::SerializeCustomEmojiId(custom)
+			});
+			addAction(tr::lng_emoji_copy(tr::now), [=] {
+				TextUtilities::SetClipboardText(data);
+			}, &st::menuIconCopy);
+		}
+		if (setId && _features.openStickerSets) {
+			addAction(
+				tr::lng_emoji_view_pack(tr::now),
+				crl::guard(this, [=] { displaySet(setId); }),
+				&st::menuIconShowAll);
+		}
+	}
+	auto id = RecentEmojiId{ emoji };
+	if (custom) {
+		id.data = RecentEmojiDocument{
+			.id = custom->id,
+			.test = custom->session().isTestMode(),
+		};
+	}
+	addAction(tr::lng_emoji_remove_recent(tr::now), crl::guard(this, [=] {
+		Core::App().settings().hideRecentEmoji(id);
+		refreshRecent();
+	}), &st::menuIconCancel);
+
+	menu->addSeparator(&st().expandedSeparator);
+
+	const auto resetRecent = [=] {
+		const auto sure = [=](Fn<void()> &&close) {
+			Core::App().settings().resetRecentEmoji();
+			refreshRecent();
+			close();
+		};
+		checkHideWithBox(Ui::MakeConfirmBox({
+			.text = tr::lng_emoji_reset_recent_sure(),
+			.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),
+		.handler = crl::guard(this, resetRecent),
+		.icon = &st::menuIconRestoreAttention,
+		.isAttention = true,
+	});
+}
+
+void EmojiListWidget::fillEmojiStatusMenu(
+		not_null<Ui::PopupMenu*> menu,
+		int section,
+		int index) {
+	const auto chosen = lookupCustomEmoji(index, section);
+	if (!chosen) {
+		return;
+	}
 	const auto selectWith = [=](TimeId scheduled) {
 		selectCustom(
 			lookupChosen(chosen, nullptr, { .scheduled = scheduled }));
@@ -1068,7 +1158,6 @@ base::unique_qptr<Ui::PopupMenu> EmojiListWidget::fillContextMenu(
 		tr::lng_manage_messages_ttl_after_custom(tr::now),
 		crl::guard(this, [=] { selectWith(
 			TabbedSelector::kPickCustomTimeId); }));
-	return menu;
 }
 
 void EmojiListWidget::paintEvent(QPaintEvent *e) {
@@ -1884,6 +1973,7 @@ void EmojiListWidget::refreshRecent() {
 	clearSelection();
 	fillRecent();
 	resizeToWidth(width());
+	update();
 }
 
 void EmojiListWidget::refreshCustom() {
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index b042a568e..5cc197995 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -266,6 +266,15 @@ private:
 	void setSelected(OverState newSelected);
 	void setPressed(OverState newPressed);
 
+	void fillRecentMenu(
+		not_null<Ui::PopupMenu*> menu,
+		int section,
+		int index);
+	void fillEmojiStatusMenu(
+		not_null<Ui::PopupMenu*> menu,
+		int section,
+		int index);
+
 	[[nodiscard]] EmojiPtr lookupOverEmoji(const OverEmoji *over) const;
 	[[nodiscard]] DocumentData *lookupCustomEmoji(
 		int index,
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 8abdd7496..4a2cb3023 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -201,7 +201,10 @@ QByteArray Settings::serialize() const {
 		+ Serialize::bytearraySize(mediaViewPosition)
 		+ sizeof(qint32)
 		+ sizeof(quint64)
-		+ sizeof(qint32);
+		+ sizeof(qint32) * 2;
+	for (const auto &id : _recentEmojiSkip) {
+		size += Serialize::stringSize(id);
+	}
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -336,7 +339,11 @@ QByteArray Settings::serialize() const {
 			<< mediaViewPosition
 			<< qint32(_ignoreBatterySaving.current() ? 1 : 0)
 			<< quint64(_macRoundIconDigest.value_or(0))
-			<< qint32(_storiesClickTooltipHidden.current() ? 1 : 0);
+			<< qint32(_storiesClickTooltipHidden.current() ? 1 : 0)
+			<< qint32(_recentEmojiSkip.size());
+		for (const auto &id : _recentEmojiSkip) {
+			stream << id;
+		}
 	}
 	return result;
 }
@@ -443,6 +450,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 ignoreBatterySaving = _ignoreBatterySaving.current() ? 1 : 0;
 	quint64 macRoundIconDigest = _macRoundIconDigest.value_or(0);
 	qint32 storiesClickTooltipHidden = _storiesClickTooltipHidden.current() ? 1 : 0;
+	base::flat_set<QString> recentEmojiSkip;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -680,6 +688,19 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> storiesClickTooltipHidden;
 	}
+	if (!stream.atEnd()) {
+		auto count = qint32();
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto id = QString();
+				stream >> id;
+				if (stream.status() == QDataStream::Ok) {
+					recentEmojiSkip.emplace(id);
+				}
+			}
+		}
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -872,6 +893,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_ignoreBatterySaving = (ignoreBatterySaving == 1);
 	_macRoundIconDigest = macRoundIconDigest ? macRoundIconDigest : std::optional<uint64>();
 	_storiesClickTooltipHidden = (storiesClickTooltipHidden == 1);
+	_recentEmojiSkip = std::move(recentEmojiSkip);
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -964,7 +986,8 @@ rpl::producer<int> Settings::thirdColumnWidthChanges() const {
 }
 
 const std::vector<RecentEmoji> &Settings::recentEmoji() const {
-	if (_recentEmoji.empty()) {
+	if (!_recentEmojiResolved) {
+		_recentEmojiResolved = true;
 		resolveRecentEmoji();
 	}
 	return _recentEmoji;
@@ -1005,6 +1028,8 @@ void Settings::resolveRecentEmoji() const {
 	for (const auto emoji : Ui::Emoji::GetDefaultRecent()) {
 		if (_recentEmoji.size() >= specialCount + kRecentEmojiLimit) {
 			break;
+		} else if (_recentEmojiSkip.contains(emoji->id())) {
+			continue;
 		} else if (!haveAlready({ emoji })) {
 			_recentEmoji.push_back({ { emoji }, 1 });
 		}
@@ -1014,6 +1039,9 @@ void Settings::resolveRecentEmoji() const {
 void Settings::incrementRecentEmoji(RecentEmojiId id) {
 	resolveRecentEmoji();
 
+	if (const auto emoji = std::get_if<EmojiPtr>(&id.data)) {
+		_recentEmojiSkip.remove((*emoji)->id());
+	}
 	auto i = _recentEmoji.begin(), e = _recentEmoji.end();
 	for (; i != e; ++i) {
 		if (i->id == id) {
@@ -1065,6 +1093,36 @@ void Settings::incrementRecentEmoji(RecentEmojiId id) {
 	_saveDelayed.fire({});
 }
 
+void Settings::hideRecentEmoji(RecentEmojiId id) {
+	resolveRecentEmoji();
+
+	_recentEmoji.erase(
+		ranges::remove(_recentEmoji, id, &RecentEmoji::id),
+		end(_recentEmoji));
+	if (const auto emoji = std::get_if<EmojiPtr>(&id.data)) {
+		for (const auto always : Ui::Emoji::GetDefaultRecent()) {
+			if (always == *emoji) {
+				_recentEmojiSkip.emplace(always->id());
+				break;
+			}
+		}
+	}
+	_recentEmojiUpdated.fire({});
+	_saveDelayed.fire({});
+}
+
+void Settings::resetRecentEmoji() {
+	resolveRecentEmoji();
+
+	_recentEmoji.clear();
+	_recentEmojiSkip.clear();
+	_recentEmojiPreload.clear();
+	_recentEmojiResolved = false;
+
+	_recentEmojiUpdated.fire({});
+	_saveDelayed.fire({});
+}
+
 void Settings::setLegacyRecentEmojiPreload(
 		QVector<QPair<QString, ushort>> data) {
 	if (!_recentEmojiPreload.empty() || data.isEmpty()) {
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index bc7b74282..f25345da6 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -72,7 +72,7 @@ struct WindowTitleContent {
 		WindowTitleContent) = default;
 };
 
-constexpr auto kRecentEmojiLimit = 42;
+constexpr auto kRecentEmojiLimit = 54;
 
 struct RecentEmojiDocument {
 	DocumentId id = 0;
@@ -660,6 +660,8 @@ public:
 
 	[[nodiscard]] const std::vector<RecentEmoji> &recentEmoji() const;
 	void incrementRecentEmoji(RecentEmojiId id);
+	void hideRecentEmoji(RecentEmojiId id);
+	void resetRecentEmoji();
 	void setLegacyRecentEmojiPreload(QVector<QPair<QString, ushort>> data);
 	[[nodiscard]] rpl::producer<> recentEmojiUpdated() const {
 		return _recentEmojiUpdated.events();
@@ -894,6 +896,8 @@ private:
 	rpl::variable<bool> _mainMenuAccountsShown = true;
 	mutable std::vector<RecentEmojiPreload> _recentEmojiPreload;
 	mutable std::vector<RecentEmoji> _recentEmoji;
+	base::flat_set<QString> _recentEmojiSkip;
+	mutable bool _recentEmojiResolved = false;
 	base::flat_map<QString, uint8> _emojiVariants;
 	rpl::event_stream<> _recentEmojiUpdated;
 	bool _tabbedSelectorSectionEnabled = false; // per-window
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 5f19251c0..bfb508773 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -137,6 +137,7 @@ menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
 menuIconPremium: icon {{ "menu/premium", menuIconColor }};
 menuIconIpAddress: icon {{ "menu/ip_address", menuIconColor }};
 menuIconAddress: icon {{ "menu/payment_address", menuIconColor }};
+menuIconShowAll: icon {{ "menu/all_media", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
@@ -169,6 +170,7 @@ menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }};
 menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }};
 menuIconDisableAttention: icon {{ "menu/disable", menuIconAttentionColor }};
 menuIconReportAttention: icon {{ "menu/report", menuIconAttentionColor }};
+menuIconRestoreAttention: icon {{ "menu/restore", menuIconAttentionColor }};
 
 menuIconBlockSettings: icon {{ "menu/block", windowBgActive }};
 

From 2cb7d8ea772d1084d876e68f32efa3e0fc2cf738 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 21 Aug 2023 16:15:37 +0400
Subject: [PATCH 659/676] Revert "Log all Qt messages as usual in debug
 builds."

This reverts commit 52b9a1fcebdd1abecd16be6631992677e860c256.
---
 Telegram/SourceFiles/core/launcher.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index b18f0b541..436a28e66 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -466,22 +466,13 @@ void Launcher::initQtMessageLogging() {
 			QtMsgType type,
 			const QMessageLogContext &context,
 			const QString &msg) {
-		const auto InvokeOriginal = [&] {
-#ifndef _DEBUG
-			if (Logs::DebugEnabled()) {
-				return;
-			}
-#endif // _DEBUG
-			if (OriginalMessageHandler) {
-				OriginalMessageHandler(type, context, msg);
-			}
-		};
-		InvokeOriginal();
 		if (Logs::DebugEnabled() || !Logs::started()) {
 			if (!Logs::WritingEntry()) {
 				// Sometimes Qt logs something inside our own logging.
 				LOG((msg));
 			}
+		} else if (OriginalMessageHandler) {
+			OriginalMessageHandler(type, context, msg);
 		}
 	});
 }

From 0b115dedf5e0f200326c5895f16c87f09a9cd7ea Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 21 Aug 2023 16:16:21 +0400
Subject: [PATCH 660/676] Revert "Write Qt messages only to log in debug mode"

This reverts commit 1d2e34f5e95310e80d2a54bf91dcdf2fc63314b2.
---
 Telegram/SourceFiles/core/launcher.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 436a28e66..7eb611296 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -466,13 +466,14 @@ void Launcher::initQtMessageLogging() {
 			QtMsgType type,
 			const QMessageLogContext &context,
 			const QString &msg) {
+		if (OriginalMessageHandler) {
+			OriginalMessageHandler(type, context, msg);
+		}
 		if (Logs::DebugEnabled() || !Logs::started()) {
 			if (!Logs::WritingEntry()) {
 				// Sometimes Qt logs something inside our own logging.
 				LOG((msg));
 			}
-		} else if (OriginalMessageHandler) {
-			OriginalMessageHandler(type, context, msg);
 		}
 	});
 }

From bb4476890fb12070a497251b9a9093bcaf5b83eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 21:29:32 +0200
Subject: [PATCH 661/676] Version 4.9.2.

- Remove single recently used emoji or reset the list from context menu.
- Change all emoji skin colors from Emoji & People section.
- Connected Websites section in Settings > Advanced.
- Bug fixes and other minor improvements.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 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 42ecb47c1..51d86546e 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.9.1.0" />
+    Version="4.9.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 b875881fd..d53bde63b 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,9,1,0
- PRODUCTVERSION 4,9,1,0
+ FILEVERSION 4,9,2,0
+ PRODUCTVERSION 4,9,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.9.1.0"
+            VALUE "FileVersion", "4.9.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.9.1.0"
+            VALUE "ProductVersion", "4.9.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index bc11fbd4a..eb76ef096 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,9,1,0
- PRODUCTVERSION 4,9,1,0
+ FILEVERSION 4,9,2,0
+ PRODUCTVERSION 4,9,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.9.1.0"
+            VALUE "FileVersion", "4.9.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.9.1.0"
+            VALUE "ProductVersion", "4.9.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4dcb11ba6..298eb1b25 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 = 4009001;
-constexpr auto AppVersionStr = "4.9.1";
+constexpr auto AppVersion = 4009002;
+constexpr auto AppVersionStr = "4.9.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 97868a621..0ae2cca3d 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4009001
+AppVersion         4009002
 AppVersionStrMajor 4.9
-AppVersionStrSmall 4.9.1
-AppVersionStr      4.9.1
+AppVersionStrSmall 4.9.2
+AppVersionStr      4.9.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.9.1
+AppVersionOriginal 4.9.2
diff --git a/changelog.txt b/changelog.txt
index ae189b0d4..626258e47 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+4.9.2 (21.08.23)
+
+- Remove single recently used emoji or reset the list from context menu.
+- Change all emoji skin colors from Emoji & People section.
+- Connected Websites section in Settings > Advanced.
+- Bug fixes and other minor improvements.
+
 4.9.1 (15.08.23)
 
 - Fix a crash in reply area ripple animation.

From d14e32f63e12b72b07ec3010f8377435ed802869 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 21 Aug 2023 16:50:49 +0300
Subject: [PATCH 662/676] Guarded input for both directions in vertical drum
 picker.

---
 .../SourceFiles/ui/widgets/vertical_drum_picker.cpp   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
index 649c5129b..87950995a 100644
--- a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
+++ b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
@@ -101,9 +101,14 @@ VerticalDrumPicker::VerticalDrumPicker(
 }
 
 void VerticalDrumPicker::increaseShift(float64 by) {
-	// Guard input.
-	if (by >= 1.) {
-		by = .99;
+	{
+		// Guard input.
+		constexpr auto kAlmostIndex = .99;
+		if (by >= 1.) {
+			by = kAlmostIndex;
+		} else if (by <= -1.) {
+			by = -kAlmostIndex;
+		}
 	}
 
 	auto shift = _shift;

From 5ee7cb4dbfda1a10d78d398acb949fca392c6e61 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 21 Aug 2023 17:56:57 +0300
Subject: [PATCH 663/676] Improved mouse wheel handling in vertical drum picker
 without animation.

---
 Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
index 87950995a..9e546e004 100644
--- a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
+++ b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
@@ -12,8 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
-PickerAnimation::PickerAnimation() {
-}
+PickerAnimation::PickerAnimation() = default;
 
 void PickerAnimation::jumpToOffset(int offset) {
 	_result.from = _result.current;
@@ -95,8 +94,13 @@ VerticalDrumPicker::VerticalDrumPicker(
 	}, lifetime());
 
 	_animation.updates(
+	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](PickerAnimation::Shift shift) {
 		increaseShift(shift);
+		if (anim::Disabled()) {
+			animationDataFromIndex();
+			_animation.jumpToOffset(0);
+		}
 	}, lifetime());
 }
 

From 1d26a011445ad545e2224bf9d54e439c365af789 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 21:37:59 +0200
Subject: [PATCH 664/676] Version 4.9.2: Fix build Xcode.

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

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 357d0485c..823168554 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -1084,7 +1084,7 @@ void EmojiListWidget::fillRecentMenu(
 			data.rich.entities.push_back({
 				EntityType::CustomEmoji,
 				0,
-				emoji.size(),
+				int(emoji.size()),
 				Data::SerializeCustomEmojiId(custom)
 			});
 			addAction(tr::lng_emoji_copy(tr::now), [=] {

From 20ad39bdf9242e41675bba203f5c90129bf6a00e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Aug 2023 23:58:10 +0200
Subject: [PATCH 665/676] Version 4.9.2: Fix build with GCC.

---
 Telegram/SourceFiles/boxes/sessions_box.cpp   |  7 ------
 .../data/data_download_manager.cpp            | 22 -------------------
 2 files changed, 29 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
index f771587de..e30174be6 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@@ -72,7 +72,6 @@ public:
 	Row(not_null<RowDelegate*> delegate, const EntryData &data);
 
 	void update(const EntryData &data);
-	void updateName(const QString &name);
 
 	[[nodiscard]] EntryData data() const;
 
@@ -525,12 +524,6 @@ void Row::update(const EntryData &data) {
 	_delegate->rowUpdateRow(this);
 }
 
-void Row::updateName(const QString &name) {
-	_data.name = name;
-	refreshName(st::sessionListItem);
-	_delegate->rowUpdateRow(this);
-}
-
 EntryData Row::data() const {
 	return _data;
 }
diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index eaf124831..6b984e4cf 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -64,28 +64,6 @@ constexpr auto ByDocument = [](const auto &entry) {
 	return 0;
 }
 
-[[nodiscard]] PhotoData *ItemPhoto(not_null<HistoryItem*> item) {
-	if (const auto media = item->media()) {
-		if (const auto page = media->webpage()) {
-			return page->document ? nullptr : page->photo;
-		} else if (const auto photo = media->photo()) {
-			return photo;
-		}
-	}
-	return nullptr;
-}
-
-[[nodiscard]] DocumentData *ItemDocument(not_null<HistoryItem*> item) {
-	if (const auto media = item->media()) {
-		if (const auto page = media->webpage()) {
-			return page->document;
-		} else if (const auto document = media->document()) {
-			return document;
-		}
-	}
-	return nullptr;
-}
-
 [[nodiscard]] bool ItemContainsMedia(const DownloadObject &object) {
 	if (const auto photo = object.photo) {
 		if (const auto media = object.item->media()) {

From ed8c8aba1782190959b3d51bee459bc08ecefd5f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 22 Aug 2023 04:02:40 +0400
Subject: [PATCH 666/676] Add VA-API and VDPAU drivers to snap package

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 40a3ca637..eef34f5e3 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -234,6 +234,8 @@ parts:
       - libavutil56
       - libswresample3
       - libswscale5
+      - va-driver-all
+      - vdpau-driver-all
     override-build: |
       craftctl default
       mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET/blas/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET"

From 2af4b2b512f4074abf99ab6ea605dcd7cefb08f5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 22 Aug 2023 04:09:37 +0400
Subject: [PATCH 667/676] Move systemd to a separate snap part

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index eef34f5e3..476b6b7bb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -130,7 +130,6 @@ parts:
       - libxcb-screensaver0
       - zlib1g
       - glib-networking
-      - systemd
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -159,8 +158,6 @@ parts:
       rm -rf "$CRAFT_PART_INSTALL/usr/share/icons"
     stage:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
-    prime:
-      - -./lib/systemd
     after:
       - ffmpeg
       - libjxl
@@ -531,6 +528,13 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET/*.so
       - -./usr/share
 
+  systemd:
+    plugin: nil
+    stage-packages:
+      - systemd
+    stage:
+      - ./usr/bin/systemd-detect-virt
+
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1

From 12442009878ed91cb09406954f02e853b5a5e984 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 11:49:21 +0200
Subject: [PATCH 668/676] Improve edit group info box design.

---
 Telegram/SourceFiles/boxes/boxes.style        |  6 ++--
 .../boxes/peers/edit_peer_info_box.cpp        | 12 +++----
 Telegram/SourceFiles/info/info.style          | 32 +++++++++++++------
 Telegram/lib_ui                               |  2 +-
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 00862eada..b952e5a6e 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -53,12 +53,12 @@ boxPhotoCaptionSkip: 8px;
 defaultChangeUserpicIcon: icon {{ "new_chat_photo", activeButtonFg }};
 defaultUploadUserpicIcon: icon {{ "upload_chat_photo", msgDateImgFg }};
 defaultUserpicButton: UserpicButton {
-	size: size(76px, 76px);
-	photoSize: 76px;
+	size: size(72px, 72px);
+	photoSize: 72px;
 	photoPosition: point(-1px, -1px);
 	changeButton: defaultActiveButton;
 	changeIcon: defaultChangeUserpicIcon;
-	changeIconPosition: point(23px, 25px);
+	changeIconPosition: point(21px, 23px);
 	duration: 500;
 	uploadHeight: 24px;
 	uploadBg: msgDateImgBgOver;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 135fc46c9..01251e1f8 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1118,10 +1118,7 @@ void Controller::fillManageSection() {
 		//|| canEditInviteLinks
 		|| canViewOrEditLinkedChat
 		|| canEditType) {
-		AddSkip(
-			_controls.buttonsLayout,
-			st::editPeerTopButtonsLayoutSkip,
-			st::editPeerTopButtonsLayoutSkipCustomBottom);
+		AddSkip(_controls.buttonsLayout);
 	}
 
 	if (canEditReactions()) {
@@ -1291,8 +1288,7 @@ void Controller::fillManageSection() {
 	}
 
 	if (canEditStickers || canDeleteChannel) {
-		AddSkip(_controls.buttonsLayout,
-			st::editPeerTopButtonsLayoutSkipCustomTop);
+		AddSkip(_controls.buttonsLayout);
 	}
 
 	if (canEditStickers) {
@@ -1308,6 +1304,10 @@ void Controller::fillManageSection() {
 			[=]{ deleteWithConfirmation(); }
 		);
 	}
+
+	if (canEditStickers || canDeleteChannel) {
+		AddSkip(_controls.buttonsLayout);
+	}
 }
 
 void Controller::fillPendingRequestsButton() {
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index d54deb94b..ffd146b89 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -642,21 +642,35 @@ infoStoriesAboutArchivePadding: margins(22px, 12px, 22px, 12px);
 
 editPeerBottomButtonsLayoutMargins: margins(0px, 7px, 0px, 0px);
 
-editPeerTopButtonsLayoutSkip: 13px;
-editPeerTopButtonsLayoutSkipToBottom: 12px;
+editPeerTopButtonsLayoutSkip: 5px;
+editPeerTopButtonsLayoutSkipToBottom: 5px;
 
-editPeerTopButtonsLayoutSkipCustomTop: 14px;
-editPeerTopButtonsLayoutSkipCustomBottom: 11px;
+editPeerTopButtonsLayoutSkipCustomBottom: 5px;
 
 editPeerHistoryVisibilityTopSkip: 8px;
 
-editPeerPhotoMargins: margins(22px, 16px, 22px, 8px);
+editPeerPhotoMargins: margins(22px, 8px, 22px, 8px);
 editPeerTitle: defaultInputField;
-editPeerTitleMargins: margins(27px, 21px, 22px, 8px);
-editPeerDescription: InputField(newGroupDescription) {
-	borderFg: transparent;
+editPeerTitleMargins: margins(27px, 13px, 22px, 8px);
+editPeerDescription: InputField(defaultInputField) {
+	textBg: transparent;
+	textMargins: margins(0px, 7px, 0px, 7px);
+
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
+	placeholderScale: 0.;
+	placeholderFont: normalFont;
+
+	border: 0px;
+	borderActive: 0px;
+
+	heightMin: 32px;
+
+	font: boxTextFont;
 }
-editPeerDescriptionMargins: margins(22px, 5px, 22px, 16px);
+editPeerDescriptionMargins: margins(22px, 3px, 22px, 2px);
 editPeerPrivaciesMargins: margins(15px, 7px, 22px, 0px);
 editPeerPrivacyBottomSkip: 16px;
 editPeerPrivacyLabel: FlatLabel(defaultFlatLabel) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a6d7e3f54..a3c52c2cf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a6d7e3f5457b29b563941b24cd844ca26ac0d077
+Subproject commit a3c52c2cfe7ee5c3382ac0579eb96ec6962b7f47

From bb141b4268483a372f7eca3ed692acf5c9352b17 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 22 Aug 2023 06:11:50 +0400
Subject: [PATCH 669/676] Fix Windows action

---
 .github/workflows/win.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index a3f305ce4..3c86918f2 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -60,13 +60,10 @@ jobs:
     steps:
       - name: Prepare directories.
         run: |
-          mkdir %userprofile%\TBuild
+          mkdir %userprofile%\TBuild\Libraries
           mklink /d %GITHUB_WORKSPACE%\TBuild %userprofile%\TBuild
           echo TBUILD=%GITHUB_WORKSPACE%\TBuild>>%GITHUB_ENV%
 
-          mkdir %userprofile%\TBuild Libraries
-          mklink /d %userprofile%\TBuild\Libraries %GITHUB_WORKSPACE%\Libraries
-
       - name: Get repository name.
         shell: bash
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
@@ -100,7 +97,7 @@ jobs:
         id: cache-libs
         uses: actions/cache@v3.0.11
         with:
-          path: Libraries
+          path: ${{ env.TBUILD }}\Libraries
           key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}
           restore-keys: ${{ runner.OS }}-${{ matrix.arch }}-libs-
 
@@ -108,7 +105,9 @@ jobs:
         env:
           GYP_MSVS_OVERRIDE_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\'
           GYP_MSVS_VERSION: 2022
-        run: '%TBUILD%\%REPO_NAME%\Telegram\build\prepare\win.bat skip-release silent'
+        run: |
+          cd %TBUILD%
+          %REPO_NAME%\Telegram\build\prepare\win.bat skip-release silent
 
       - name: Read defines.
         shell: bash
@@ -132,6 +131,7 @@ jobs:
 
       - name: Free up some disk space.
         run: |
+          cd %TBUILD%
           del /S Libraries\*.pdb
           del /S Libraries\*.pch
           del /S Libraries\*.obj

From 89dd9c93ef1302bb904e0975df7f739e106814bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 15:06:50 +0200
Subject: [PATCH 670/676] Allow copying static emoji as well.

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

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 823168554..cb3b034ce 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -1097,6 +1097,11 @@ void EmojiListWidget::fillRecentMenu(
 				crl::guard(this, [=] { displaySet(setId); }),
 				&st::menuIconShowAll);
 		}
+	} else if (emoji) {
+		addAction(tr::lng_emoji_copy(tr::now), [=] {
+			const auto text = emoji->text();
+			TextUtilities::SetClipboardText({ text, { text } });
+		}, &st::menuIconCopy);
 	}
 	auto id = RecentEmojiId{ emoji };
 	if (custom) {

From eab91867902676ae7a55d0ae263b2521a7baf4a1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 15:07:26 +0200
Subject: [PATCH 671/676] Fix dividers in passport date input.

Fixes #26683.
---
 Telegram/SourceFiles/passport/passport.style | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/passport/passport.style b/Telegram/SourceFiles/passport/passport.style
index b8f77ff0d..66877542a 100644
--- a/Telegram/SourceFiles/passport/passport.style
+++ b/Telegram/SourceFiles/passport/passport.style
@@ -177,6 +177,7 @@ passportDetailsSeparator: FlatLabel(passportPasswordLabelBold) {
 		font: font(semibold 14px);
 	}
 	textFg: windowSubTextFg;
+	align: align(topleft);
 }
 passportDetailsSeparatorPadding: margins(5px, 8px, 5px, 0px);
 passportContactField: InputField(defaultInputField) {

From b03120d83a27807c8d5352ee7a74915f16b379b5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 15:08:39 +0200
Subject: [PATCH 672/676] Update OpenAL to 1.23.1 on macOS.

This (library rebuild, really) fixes #26694.
---
 Telegram/build/prepare/prepare.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index cb5a9cb62..6ef9833da 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -1076,7 +1076,7 @@ release:
 mac:
     git clone https://github.com/kcat/openal-soft.git
     cd openal-soft
-    git checkout 716f5373cb
+    git checkout 1.23.1
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -B build . \\
         -D CMAKE_BUILD_TYPE=RelWithDebInfo \\
         -D CMAKE_INSTALL_PREFIX:PATH=$USED_PREFIX \\

From 8245660c81ce75a164319a4440dca24c699a5c8a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 15:30:32 +0200
Subject: [PATCH 673/676] Fix inline result title over-optimized layout.

Fixes #26695.
---
 Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index 9cf84d338..e8b6181fb 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -1267,7 +1267,7 @@ Article::Article(
 , _url(getResultUrlHandler())
 , _link(getResultPreviewHandler())
 , _withThumb(withThumb)
-, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
+, _title(st::emojiPanWidth / 2)
 , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
 	if (!_link) {
 		if (const auto point = result->getLocationPoint()) {

From eeb8af3ca630e140340133771d97e78e20af697c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 16:08:52 +0200
Subject: [PATCH 674/676] Fix a glitch in history re-open while loading.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 3be81b775..e4dad4d47 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2031,12 +2031,19 @@ void HistoryWidget::showHistory(
 			}
 			const auto canShowNow = _history->isReadyFor(showAtMsgId);
 			if (!canShowNow) {
-				DEBUG_LOG(("JumpToEnd(%1, %2, %3): Showing delayed at %4."
-					).arg(_history->peer->name()
-					).arg(_history->inboxReadTillId().bare
-					).arg(Logs::b(_history->loadedAtBottom())
-					).arg(showAtMsgId.bare));
-				delayedShowAt(showAtMsgId);
+				if (!_firstLoadRequest) {
+					DEBUG_LOG(("JumpToEnd(%1, %2, %3): Showing delayed at %4."
+						).arg(_history->peer->name()
+						).arg(_history->inboxReadTillId().bare
+						).arg(Logs::b(_history->loadedAtBottom())
+						).arg(showAtMsgId.bare));
+					delayedShowAt(showAtMsgId);
+				} else if (_showAtMsgId != showAtMsgId) {
+					clearAllLoadRequests();
+					setMsgId(showAtMsgId);
+					firstLoadMessages();
+					doneShow();
+				}
 			} else {
 				_history->forgetScrollState();
 				if (_migrated) {

From ac15457961f53c6d02c9464a645e405e9d113016 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 22 Aug 2023 17:55:16 +0400
Subject: [PATCH 675/676] A better naming for API issue

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

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 014b25725..f73fc436f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
 blank_issues_enabled: false
 contact_links:
-  - name: API issue
+  - name: Platform-wide issue
     url: https://bugs.telegram.org
     about: Any bug report or feature request affecting more than only Telegram Desktop.
   - name: Issue of other client

From e7be8e1c600feda74b1e6014f089f8c4433a6ad0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 16:22:19 +0200
Subject: [PATCH 676/676] Version 4.9.3.

- Fix audio output 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                                | 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 51d86546e..15007bceb 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.9.2.0" />
+    Version="4.9.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 d53bde63b..1f7799c44 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,9,2,0
- PRODUCTVERSION 4,9,2,0
+ FILEVERSION 4,9,3,0
+ PRODUCTVERSION 4,9,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.9.2.0"
+            VALUE "FileVersion", "4.9.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.9.2.0"
+            VALUE "ProductVersion", "4.9.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index eb76ef096..a5c085ccb 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,9,2,0
- PRODUCTVERSION 4,9,2,0
+ FILEVERSION 4,9,3,0
+ PRODUCTVERSION 4,9,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.9.2.0"
+            VALUE "FileVersion", "4.9.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.9.2.0"
+            VALUE "ProductVersion", "4.9.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 298eb1b25..1ec86fab3 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 = 4009002;
-constexpr auto AppVersionStr = "4.9.2";
+constexpr auto AppVersion = 4009003;
+constexpr auto AppVersionStr = "4.9.3";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 0ae2cca3d..112140bad 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         4009002
+AppVersion         4009003
 AppVersionStrMajor 4.9
-AppVersionStrSmall 4.9.2
-AppVersionStr      4.9.2
+AppVersionStrSmall 4.9.3
+AppVersionStr      4.9.3
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 4.9.2
+AppVersionOriginal 4.9.3
diff --git a/changelog.txt b/changelog.txt
index 626258e47..0fc4f1217 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+4.9.3 (22.08.23)
+
+- Fix audio output on macOS.
+
 4.9.2 (21.08.23)
 
 - Remove single recently used emoji or reset the list from context menu.